aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SeafoamIslandsB4F.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/SeafoamIslandsB4F.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/SeafoamIslandsB4F.asm')
-rw-r--r--scripts/SeafoamIslandsB4F.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm
index 5fe805f0..91ba9669 100644
--- a/scripts/SeafoamIslandsB4F.asm
+++ b/scripts/SeafoamIslandsB4F.asm
@@ -46,7 +46,7 @@ SeafoamIslandsB4FDefaultScript:
ld a, 1
.forcePlayerUpFromSurfExit
ld [wSimulatedJoypadStatesIndex], a
- ld a, D_UP
+ ld a, PAD_UP
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
ld hl, wStatusFlags7
@@ -104,15 +104,15 @@ SeafoamIslandsB4FMoveObjectScript:
db -1 ; end
.RLEList_StrongCurrentNearRightBoulder:
- db D_UP, 3
- db D_RIGHT, 2
- db D_UP, 1
+ db PAD_UP, 3
+ db PAD_RIGHT, 2
+ db PAD_UP, 1
db -1 ; end
.RLEList_StrongCurrentNearLeftBoulder:
- db D_UP, 3
- db D_RIGHT, 3
- db D_UP, 1
+ db PAD_UP, 3
+ db PAD_RIGHT, 3
+ db PAD_UP, 1
db -1 ; end
SeafoamIslandsB4FObjectMoving2Script: