aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PokemonTower5F.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/PokemonTower5F.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/PokemonTower5F.asm')
-rw-r--r--scripts/PokemonTower5F.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm
index 6482993d..8e256b1e 100644
--- a/scripts/PokemonTower5F.asm
+++ b/scripts/PokemonTower5F.asm
@@ -17,8 +17,8 @@ PokemonTower5FDefaultScript:
ld hl, PokemonTower5FPurifiedZoneCoords
call ArePlayerCoordsInArray
jr c, .in_purified_zone
- ld hl, wd72e
- res 4, [hl]
+ ld hl, wStatusFlags4
+ res BIT_NO_BATTLES, [hl]
ResetEvent EVENT_IN_PURIFIED_ZONE
jp CheckFightingMapTrainers
.in_purified_zone
@@ -28,8 +28,8 @@ PokemonTower5FDefaultScript:
ldh [hJoyHeld], a
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a
- ld hl, wd72e
- set 4, [hl]
+ ld hl, wStatusFlags4
+ set BIT_NO_BATTLES, [hl]
predef HealParty
call GBFadeOutToWhite
call Delay3