aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/RocketHideoutB3F.asm
diff options
context:
space:
mode:
authorSylvie <35663410+Rangi42@users.noreply.github.com>2024-07-16 13:02:54 -0400
committerGitHub <noreply@github.com>2024-07-16 13:02:54 -0400
commit8fafca714c07500d1d87bba224f12cf9cc2c8789 (patch)
tree273ca88fcfcd80df9c318c9cb8d17a1f7aa240cb /scripts/RocketHideoutB3F.asm
parentBuild with RGBDS 0.8.0, though it is not yet required (diff)
downloadpokeyellow-8fafca714c07500d1d87bba224f12cf9cc2c8789.tar.gz
pokeyellow-8fafca714c07500d1d87bba224f12cf9cc2c8789.tar.xz
pokeyellow-8fafca714c07500d1d87bba224f12cf9cc2c8789.zip
Identify various flag labels and bit constants (#454)
Diffstat (limited to 'scripts/RocketHideoutB3F.asm')
-rw-r--r--scripts/RocketHideoutB3F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm
index 03681bef..0c0e02ea 100644
--- a/scripts/RocketHideoutB3F.asm
+++ b/scripts/RocketHideoutB3F.asm
@@ -23,8 +23,8 @@ RocketHideoutB3FDefaultScript:
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
@@ -119,8 +119,8 @@ RocketHideoutB3FPlayerSpinningScript:
jp nz, LoadSpinnerArrowTiles
xor a
ld [wJoyIgnore], a
- ld hl, wd736
- res 7, [hl]
+ ld hl, wMovementFlags
+ res BIT_SPINNING, [hl]
ld a, SCRIPT_ROCKETHIDEOUTB3F_DEFAULT
ld [wCurMapScript], a
ret
@@ -165,7 +165,7 @@ RocketHideoutB3FRocket2Text:
jp TextScriptEnd
RocketHideoutB3FRocket2BattleText:
- text_far _RocketHideout3BattleTxt
+ text_far _RocketHideout3BattleText
text_end
RocketHideoutB3FRocket2EndBattleText: