aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/RocketHideoutB2F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
committerdannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
commita02a98ee7ada1a658e28698484058be2796dc0df (patch)
tree945986054565bd8b5212fc755415096050d1d3a8 /scripts/RocketHideoutB2F.asm
parentUse long option flags for rgbgfx, same as tools/gfx (diff)
parentUse `const_skip` (diff)
downloadpokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/RocketHideoutB2F.asm')
-rw-r--r--scripts/RocketHideoutB2F.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm
index 3a7ffa9b..7a5c2e4a 100644
--- a/scripts/RocketHideoutB2F.asm
+++ b/scripts/RocketHideoutB2F.asm
@@ -23,8 +23,8 @@ RocketHideoutB2FDefaultScript:
call DecodeArrowMovementRLE
cp $ff
jp z, CheckFightingMapTrainers
- ld hl, wd736
- set 7, [hl]
+ ld hl, wMovementFlags
+ set BIT_SPINNING, [hl]
call StartSimulatingJoypadStates
ld a, SFX_ARROW_TILES
call PlaySound
@@ -262,8 +262,8 @@ RocketHideoutB2FPlayerSpinningScript:
jr nz, LoadSpinnerArrowTiles
xor a
ld [wJoyIgnore], a
- ld hl, wd736
- res 7, [hl]
+ ld hl, wMovementFlags
+ res BIT_SPINNING, [hl]
ld a, SCRIPT_ROCKETHIDEOUTB2F_DEFAULT
ld [wCurMapScript], a
ret