From 8fafca714c07500d1d87bba224f12cf9cc2c8789 Mon Sep 17 00:00:00 2001
From: Sylvie <35663410+Rangi42@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:02:54 -0400
Subject: Identify various flag labels and bit constants (#454)

---
 scripts/GameCorner.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'scripts/GameCorner.asm')

diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index 68cdc333..b2ef1206 100644
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -102,8 +102,8 @@ GameCornerMovement_Rocket_WalkDirect:
 	db -1 ; end
 
 GameCornerRocketExitScript:
-	ld a, [wd730]
-	bit 0, a
+	ld a, [wStatusFlags5]
+	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
@@ -422,9 +422,9 @@ GameCornerRocketText:
 	text_asm
 	ld hl, .ImGuardingThisPosterText
 	call PrintText
-	ld hl, wd72d
-	set 6, [hl]
-	set 7, [hl]
+	ld hl, wStatusFlags3
+	set BIT_TALKED_TO_TRAINER, [hl]
+	set BIT_PRINT_END_BATTLE_TEXT, [hl]
 	ld hl, .BattleEndText
 	ld de, .BattleEndText
 	call SaveEndBattleTextPointers
@@ -482,8 +482,8 @@ GameCornerOopsForgotCoinCaseText:
 	text_end
 
 GameCornerDrawCoinBox:
-	ld hl, wd730
-	set 6, [hl]
+	ld hl, wStatusFlags5
+	set BIT_NO_TEXT_DELAY, [hl]
 	hlcoord 11, 0
 	ld b, 5
 	ld c, 7
@@ -513,8 +513,8 @@ GameCornerDrawCoinBox:
 	ld de, wPlayerCoins
 	ld c, $82
 	call PrintBCDNumber
-	ld hl, wd730
-	res 6, [hl]
+	ld hl, wStatusFlags5
+	res BIT_NO_TEXT_DELAY, [hl]
 	ret
 
 GameCornerMoneyText:
-- 
cgit v1.3.1-sl0p