Misc clean up and small improvements

This commit is contained in:
dannye 2021-03-28 02:23:54 -05:00
parent e8dd755e18
commit 459b5bd615
25 changed files with 326 additions and 160 deletions

View file

@ -1,29 +1,40 @@
; an alternate start for MeetRival which has a different first measure
Music_RivalAlternateStart::
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
jp PlayMusic
;ld hl, wChannelCommandPointers
;ld de, Music_MeetRival_branch_b1a2
;call Audio1_OverwriteChannelPointer
;ld de, Music_MeetRival_branch_b21d
;call Audio1_OverwriteChannelPointer
;ld de, Music_MeetRival_branch_b2b5
; call PlayMusic
; ld hl, wChannelCommandPointers
; ld de, Music_MeetRival_branch_b1a2
; call Audio1_OverwriteChannelPointer
; ld de, Music_MeetRival_branch_b21d
; call Audio1_OverwriteChannelPointer
; ld de, Music_MeetRival_branch_b2b5
;Audio1_OverwriteChannelPointer:
; ld a, e
; ld [hli], a
; ld a, d
; ld [hli], a
; ret
; an alternate tempo for MeetRival which is slightly slower
Music_RivalAlternateTempo::
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
jp PlayMusic
;ld hl, wChannelCommandPointers
;ld de, Music_MeetRival_branch_b119
;jp Audio1_OverwriteChannelPointer
; call PlayMusic
; ld hl, wChannelCommandPointers
; ld de, Music_MeetRival_branch_b119
; jp Audio1_OverwriteChannelPointer
; applies both the alternate start and alternate tempo
Music_RivalAlternateStartAndTempo::
jp Music_RivalAlternateStart
;ld hl, wChannelCommandPointers
;ld de, Music_MeetRival_branch_b19b
;jp Audio1_OverwriteChannelPointer
; call Music_RivalAlternateStart
; ld hl, wChannelCommandPointers
; ld de, Music_MeetRival_branch_b19b
; jp Audio1_OverwriteChannelPointer
; an alternate tempo for Cities1 which is used for the Hall of Fame room
Music_Cities1AlternateTempo::
@ -34,9 +45,10 @@ Music_Cities1AlternateTempo::
ld [wAudioFadeOutControl], a
ld c, 100
call DelayFrames ; wait for the fade-out to finish
ld c, BANK(Music_Cities1)
ld c, 0 ; BANK(Music_Cities1)
ld a, MUSIC_CITIES1
jp PlayMusic
;ld hl, wChannelCommandPointers
;ld de, Music_Cities1_branch_aa6f
;jp Audio1_OverwriteChannelPointer
; call PlayMusic
; ld hl, wChannelCommandPointers
; ld de, Music_Cities1_branch_aa6f
; jp Audio1_OverwriteChannelPointer