diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-05 16:57:54 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-05 16:57:54 -0400 |
| commit | ea4e4353ca8d0eba6f3bb66bb2be370e0e854f2d (patch) | |
| tree | 41ad629e2435db7a08985a8ad16b5e6eea748c84 /engine/surfing_minigame.asm | |
| parent | Split bank 3e (diff) | |
| download | pokeyellow-ea4e4353ca8d0eba6f3bb66bb2be370e0e854f2d.tar.gz pokeyellow-ea4e4353ca8d0eba6f3bb66bb2be370e0e854f2d.tar.xz pokeyellow-ea4e4353ca8d0eba6f3bb66bb2be370e0e854f2d.zip | |
Resolve hardcoded WRAM labels in engine/printer.asm
Diffstat (limited to 'engine/surfing_minigame.asm')
| -rwxr-xr-x | engine/surfing_minigame.asm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm index 0e64444a..d7c7816e 100755 --- a/engine/surfing_minigame.asm +++ b/engine/surfing_minigame.asm @@ -1697,8 +1697,8 @@ Func_f8b92: jr nz, .asm_f8bb0 .asm_f8ba6 call WaitForSoundToFinish - ld e, $1b - call Func_f8bcb + ldpikacry e, PikachuCry28 + call SurfingMinigame_PlayPikaCryIfSurfingPikaInParty and a ret @@ -1708,14 +1708,14 @@ Func_f8b92: ld a, [wc5dd] ld [wd496], a call WaitForSoundToFinish - ld e, $21 - call Func_f8bcb + ldpikacry e, PikachuCry34 + call SurfingMinigame_PlayPikaCryIfSurfingPikaInParty ld a, SFX_GET_ITEM2_4_2 call PlaySound scf ret -Func_f8bcb: ; f8bcb (3e:4bcb) +SurfingMinigame_PlayPikaCryIfSurfingPikaInParty: ; f8bcb (3e:4bcb) push de callab IsSurfingPikachuInThePlayersParty pop de @@ -2734,6 +2734,7 @@ Func_f9404: INCLUDE "data/animated_objects_3e_1.asm" Unkn_f96c5: +; a sine wave with amplitude 2 db 0, 0, 0, 1, 1, 1, 1, 2 db 2, 2, 1, 1, 1, 1, 0, 0 db 0, 0, 0, -1, -1, -1, -1, -2 |