diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 15:16:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 19:44:31 -0500 |
| commit | aae999f72bd81a3156c7e00da4ebf499f52da5a6 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /audio/alternate_tempo.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.gz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.xz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.zip | |
Start reorganizing pokeyellow
Diffstat (limited to 'audio/alternate_tempo.asm')
| -rw-r--r-- | audio/alternate_tempo.asm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm index 87d08e18..eb47d62d 100644 --- a/audio/alternate_tempo.asm +++ b/audio/alternate_tempo.asm @@ -23,18 +23,17 @@ Music_RivalAlternateTempo:: ld a, MUSIC_MEET_RIVAL call PlayMusic ld de, Music_MeetRival_branch_b119 - jr asm_99ed + jr FinishAlternateRivalMusic ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: call Music_RivalAlternateStart ld de, Music_MeetRival_branch_b19b -asm_99ed: +FinishAlternateRivalMusic: ld hl, wChannelCommandPointers jp Audio1_OverwriteChannelPointer -; XXX - ret + ret ; unused ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: |