aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/RocketHideoutB3F.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/RocketHideoutB3F.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/RocketHideoutB3F.asm')
-rw-r--r--scripts/RocketHideoutB3F.asm46
1 files changed, 23 insertions, 23 deletions
diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm
index 0c0e02ea..eb1073d4 100644
--- a/scripts/RocketHideoutB3F.asm
+++ b/scripts/RocketHideoutB3F.asm
@@ -28,7 +28,7 @@ RocketHideoutB3FDefaultScript:
call StartSimulatingJoypadStates
ld a, SFX_ARROW_TILES
call PlaySound
- ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+ ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_ROCKETHIDEOUTB3F_PLAYER_SPINNING
ld [wCurMapScript], a
@@ -56,61 +56,61 @@ RocketHideout3ArrowTilePlayerMovement:
;format: direction, count
;each list is read starting from the $FF and working backwards
RocketHideout3ArrowMovement1:
- db D_RIGHT, 4
- db D_UP, 4
- db D_RIGHT, 4
+ db PAD_RIGHT, 4
+ db PAD_UP, 4
+ db PAD_RIGHT, 4
db -1 ; end
RocketHideout3ArrowMovement2:
- db D_DOWN, 4
- db D_RIGHT, 4
+ db PAD_DOWN, 4
+ db PAD_RIGHT, 4
db -1 ; end
RocketHideout3ArrowMovement3:
- db D_LEFT, 2
+ db PAD_LEFT, 2
db -1 ; end
RocketHideout3ArrowMovement4:
- db D_RIGHT, 4
- db D_UP, 2
- db D_RIGHT, 2
+ db PAD_RIGHT, 4
+ db PAD_UP, 2
+ db PAD_RIGHT, 2
db -1 ; end
RocketHideout3ArrowMovement5:
- db D_RIGHT, 4
- db D_UP, 2
- db D_RIGHT, 2
- db D_UP, 3
+ db PAD_RIGHT, 4
+ db PAD_UP, 2
+ db PAD_RIGHT, 2
+ db PAD_UP, 3
db -1 ; end
RocketHideout3ArrowMovement6:
- db D_RIGHT, 4
+ db PAD_RIGHT, 4
db -1 ; end
RocketHideout3ArrowMovement7:
- db D_RIGHT, 2
+ db PAD_RIGHT, 2
db -1 ; end
RocketHideout3ArrowMovement8:
- db D_RIGHT, 4
- db D_UP, 2
+ db PAD_RIGHT, 4
+ db PAD_UP, 2
db -1 ; end
RocketHideout3ArrowMovement9:
- db D_RIGHT, 4
- db D_UP, 4
+ db PAD_RIGHT, 4
+ db PAD_UP, 4
db -1 ; end
RocketHideout3ArrowMovement10:
- db D_DOWN, 4
+ db PAD_DOWN, 4
db -1 ; end
RocketHideout3ArrowMovement11:
- db D_UP, 2
+ db PAD_UP, 2
db -1 ; end
RocketHideout3ArrowMovement12:
- db D_UP, 1
+ db PAD_UP, 1
db -1 ; end
RocketHideoutB3FPlayerSpinningScript: