aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/BillsHouse.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/BillsHouse.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/BillsHouse.asm')
-rw-r--r--scripts/BillsHouse.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm
index b6257d4f..cf87ea64 100644
--- a/scripts/BillsHouse.asm
+++ b/scripts/BillsHouse.asm
@@ -46,8 +46,8 @@ BillsHousePokemonWalkToMachineScript:
db -1 ; end
BillsHousePokemonEntersMachineScript:
- ld a, [wd730]
- bit 0, a
+ ld a, [wStatusFlags5]
+ bit BIT_SCRIPTED_NPC_MOVEMENT, a
ret nz
ld a, HS_BILL_POKEMON
ld [wMissableObjectIndex], a
@@ -97,8 +97,8 @@ BillExitMachineMovement:
db -1 ; end
BillsHouseCleanupScript:
- ld a, [wd730]
- bit 0, a
+ ld a, [wStatusFlags5]
+ bit BIT_SCRIPTED_NPC_MOVEMENT, a
ret nz
xor a
ld [wJoyIgnore], a