aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route16Gate1F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
committerdannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
commitca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch)
tree209a500e3bda6c2109e5acec60448e9e52f8c2af /scripts/Route16Gate1F.asm
parentUse more ldpikacry (diff)
parentRequire RGBDS 0.9.3 for its DMG palette specs (#513) (diff)
downloadpokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/Route16Gate1F.asm')
-rw-r--r--scripts/Route16Gate1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm
index a8bf2f0f..8f02a616 100644
--- a/scripts/Route16Gate1F.asm
+++ b/scripts/Route16Gate1F.asm
@@ -32,7 +32,7 @@ Route16Gate1FDefaultScript:
ld [wSimulatedJoypadStatesIndex], a
ld b, $0
ld c, a
- ld a, D_UP
+ ld a, PAD_UP
ld hl, wSimulatedJoypadStatesEnd
call FillMemory
call StartSimulatingJoypadStates
@@ -55,7 +55,7 @@ Route16Gate1FPlayerMovingUpScript:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
- ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+ ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
Route16Gate1FGuardScript:
@@ -64,7 +64,7 @@ Route16Gate1FGuardScript:
call DisplayTextID
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
- ld a, D_RIGHT
+ ld a, PAD_RIGHT
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
ld a, SCRIPT_ROUTE16GATE1F_PLAYER_MOVING_RIGHT