thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix alternate starts/tempos

Browse source
This commit is contained in:
dannye 2021-03-29 22:30:01 -05:00
parent 3508dc8e1d
commit 37d3ba4b39
2 changed files with 28 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
audio/alternate_tempo.asm
View file

@ -2,53 +2,48 @@
Music_RivalAlternateStart:: Music_RivalAlternateStart::
ld c, 0 ; BANK(Music_MeetRival) ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
jp PlayMusic call PlayMusic
; call PlayMusic ld hl, wChannel1MusicAddress
; ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b1a2
; ld de, Music_MeetRival_branch_b1a2 call Audio1_OverwriteChannelPointer
; call Audio1_OverwriteChannelPointer ld hl, wChannel2MusicAddress
; ld de, Music_MeetRival_branch_b21d ld de, Music_MeetRival_branch_b21d
; call Audio1_OverwriteChannelPointer call Audio1_OverwriteChannelPointer
; ld de, Music_MeetRival_branch_b2b5 ld hl, wChannel3MusicAddress
ld de, Music_MeetRival_branch_b2b5
;Audio1_OverwriteChannelPointer: Audio1_OverwriteChannelPointer:
; ld a, e ld a, e
; ld [hli], a ld [hli], a
; ld a, d ld a, d
; ld [hli], a ld [hli], a
; ret ret
; an alternate tempo for MeetRival which is slightly slower ; an alternate tempo for MeetRival which is slightly slower
Music_RivalAlternateTempo:: Music_RivalAlternateTempo::
ld c, 0 ; BANK(Music_MeetRival) ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
jp PlayMusic call PlayMusic
; call PlayMusic ld hl, wChannel1MusicAddress
; ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b119
; ld de, Music_MeetRival_branch_b119 jp Audio1_OverwriteChannelPointer
; jp Audio1_OverwriteChannelPointer
; applies both the alternate start and alternate tempo ; applies both the alternate start and alternate tempo
Music_RivalAlternateStartAndTempo:: Music_RivalAlternateStartAndTempo::
jp Music_RivalAlternateStart call Music_RivalAlternateStart
; call Music_RivalAlternateStart ld hl, wChannel1MusicAddress
; ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b19b
; ld de, Music_MeetRival_branch_b19b jp Audio1_OverwriteChannelPointer
; jp Audio1_OverwriteChannelPointer
; an alternate tempo for Cities1 which is used for the Hall of Fame room ; an alternate tempo for Cities1 which is used for the Hall of Fame room
Music_Cities1AlternateTempo:: Music_Cities1AlternateTempo::
ld a, 10 ld a, 10
ld [wAudioFadeOutCounterReloadValue], a call StopMusic
ld [wAudioFadeOutCounter], a
ld a, $ff ; stop playing music after the fade-out is finished
ld [wAudioFadeOutControl], a
ld c, 100 ld c, 100
call DelayFrames ; wait for the fade-out to finish call DelayFrames ; wait for the fade-out to finish
ld c, 0 ; BANK(Music_Cities1) ld c, 0 ; BANK(Music_Cities1)
ld a, MUSIC_CITIES1 ld a, MUSIC_CITIES1
jp PlayMusic call PlayMusic
; call PlayMusic ld hl, wChannel1MusicAddress
; ld hl, wChannelCommandPointers ld de, Music_Cities1_branch_aa6f
; ld de, Music_Cities1_branch_aa6f jp Audio1_OverwriteChannelPointer
; jp Audio1_OverwriteChannelPointer

6
crysaudio/music/RBY/meetrival.asm
View file

@ -4,12 +4,6 @@ Music_MeetRival::
channel 2, Music_MeetRival_Ch2 channel 2, Music_MeetRival_Ch2
channel 3, Music_MeetRival_Ch3 channel 3, Music_MeetRival_Ch3
Music_FarewellRival:
channel_count 3
channel 1, Music_MeetRival_branch_b1a2
channel 2, Music_MeetRival_branch_b21d
channel 3, Music_MeetRival_branch_b2b5
Music_MeetRival_branch_b119:: Music_MeetRival_branch_b119::
tempo 100 tempo 100
sound_loop 0, Music_MeetRival_branch_b123 sound_loop 0, Music_MeetRival_branch_b123