diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/minigame | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/minigame')
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index f30d567c..79e5bc3e 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -89,12 +89,12 @@ SurfingPikachu_CheckPressedSelect: bit 1, [hl] ret z ldh a, [hJoyPressed] - and SELECT + and PAD_SELECT ret Func_f80b7: ldh a, [hJoyPressed] - and START + and PAD_START ret z ld hl, wc5e2 ld a, [hl] @@ -600,7 +600,7 @@ SurfingMinigame_WaitLast: SurfingMinigame_ExitOnPressA: call SurfingMinigame_UpdateLYOverrides ldh a, [hJoyPressed] - and A_BUTTON + and PAD_A ret z ld hl, wSurfingMinigameRoutineNumber set 7, [hl] @@ -621,7 +621,7 @@ SurfingMinigame_GameOver: .wait_press_a ldh a, [hJoyPressed] - and A_BUTTON + and PAD_A ret z ld hl, wSurfingMinigameRoutineNumber set 7, [hl] @@ -846,10 +846,10 @@ Func_f8579: SurfingMinigame_DPadAction: ld de, hJoy5 ld a, [de] - and D_LEFT + and PAD_LEFT jr nz, .d_left ld a, [de] - and D_RIGHT + and PAD_RIGHT jr nz, .d_right ret |