aboutsummaryrefslogtreecommitdiffstats
path: root/engine/minigame
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2022-09-11 23:34:59 -0500
committerdannye <33dannye@gmail.com>2022-09-12 00:53:37 -0500
commitecab35295aefb44227ba38f257dc40c8c10474e3 (patch)
treed04160bc19180ee50a941d121f90cc7071e7a672 /engine/minigame
parentReplace Hard-Coded Number With Constant (diff)
parentAdd `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff)
downloadpokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz
pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz
pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/minigame')
-rw-r--r--engine/minigame/surfing_pikachu.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm
index 3d0ed892..9e93d970 100644
--- a/engine/minigame/surfing_pikachu.asm
+++ b/engine/minigame/surfing_pikachu.asm
@@ -715,7 +715,7 @@ Func_f848d:
ld [wSurfingMinigameRadnessMeter], a
ld [wSurfingMinigameTrickFlags], a
xor a
- ld [wChannelSoundIDs + Ch8], a
+ ld [wChannelSoundIDs + CHAN8], a
ld a, SFX_SURFING_JUMP
call PlaySound
ret
@@ -751,7 +751,7 @@ SurfingMinigame_ScoreCurrentWave:
ld a, $10
call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters
xor a
- ld [wChannelSoundIDs + Ch8], a
+ ld [wChannelSoundIDs + CHAN8], a
ld a, SFX_SURFING_CRASH
call PlaySound
ret
@@ -1010,7 +1010,7 @@ SurfingMinigame_TileInteraction:
call SufingMinigame_ReduceSpeedBy64
.action_3
xor a
- ld [wChannelSoundIDs + Ch8], a
+ ld [wChannelSoundIDs + CHAN8], a
ld a, SFX_SURFING_LAND
call PlaySound
and a