aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SSAnneCaptainsRoom.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/SSAnneCaptainsRoom.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/SSAnneCaptainsRoom.asm')
-rw-r--r--scripts/SSAnneCaptainsRoom.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm
index da094261..bac424e8 100644
--- a/scripts/SSAnneCaptainsRoom.asm
+++ b/scripts/SSAnneCaptainsRoom.asm
@@ -5,8 +5,8 @@ SSAnneCaptainsRoom_Script:
SSAnneCaptainsRoomEventScript:
CheckEvent EVENT_RUBBED_CAPTAINS_BACK
ret nz
- ld hl, wd72d
- set 5, [hl]
+ ld hl, wStatusFlags3
+ set BIT_NO_NPC_FACE_PLAYER, [hl]
ret
SSAnneCaptainsRoom_TextPointers:
@@ -33,8 +33,8 @@ SSAnneCaptainsRoomCaptainText:
.bag_full
ld hl, SSAnneCaptainsRoomCaptainHM01NoRoomText
call PrintText
- ld hl, wd72d
- set 5, [hl]
+ ld hl, wStatusFlags3
+ set BIT_NO_NPC_FACE_PLAYER, [hl]
jr .done
.got_item
ld hl, SSAnneCaptainsRoomCaptainNotSickAnymoreText
@@ -64,8 +64,8 @@ SSAnneCaptainsRoomRubCaptainsBackText:
jr z, .loop
call PlayDefaultMusic
SetEvent EVENT_RUBBED_CAPTAINS_BACK
- ld hl, wd72d
- res 5, [hl]
+ ld hl, wStatusFlags3
+ res BIT_NO_NPC_FACE_PLAYER, [hl]
jp TextScriptEnd
SSAnneCaptainsRoomCaptainIFeelMuchBetterText: