diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /home/audio.asm | |
| parent | b8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (diff) | |
Sync with pokered
Diffstat (limited to 'home/audio.asm')
| -rw-r--r-- | home/audio.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/audio.asm b/home/audio.asm index 3cd2ffd0..fa7020ee 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -73,11 +73,11 @@ CheckForNoBikingMusicMap:: ld a, [wCurMap] cp ROUTE_23 jr z, .found - cp VICTORY_ROAD_1 + cp VICTORY_ROAD_1F jr z, .found - cp VICTORY_ROAD_2 + cp VICTORY_ROAD_2F jr z, .found - cp VICTORY_ROAD_3 + cp VICTORY_ROAD_3F jr z, .found cp INDIGO_PLATEAU jr z, .found @@ -140,10 +140,10 @@ PlayMusic:: Func_2223:: xor a - ld [wChannelSoundIDs + CH4], a - ld [wChannelSoundIDs + CH5], a - ld [wChannelSoundIDs + CH6], a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + Ch6], a + ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a ld [rNR10], a ret @@ -160,10 +160,10 @@ PlaySound:: and a jr z, .next xor a - ld [wChannelSoundIDs + CH4], a - ld [wChannelSoundIDs + CH5], a - ld [wChannelSoundIDs + CH6], a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + Ch6], a + ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .next ld a, [wAudioFadeOutControl] and a ; has a fade-out length been specified? |