summaryrefslogtreecommitdiff
path: root/home/audio.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/audio.asm')
-rw-r--r--home/audio.asm22
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?