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/PewterCity.asm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts/PewterCity.asm')

diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index d1f77b76..07c143d3 100644
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -57,8 +57,8 @@ PewterCitySuperNerd1ShowsPlayerMuseumScript:
 	ldh [hSpriteImageIndex], a
 	call SetSpriteImageIndexAfterSettingFacingDirection
 	call PlayDefaultMusic
-	ld hl, wFlags_0xcd60
-	set 4, [hl]
+	ld hl, wMiscFlags
+	set BIT_NO_SPRITE_UPDATES, [hl]
 	ld a, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -89,8 +89,8 @@ MovementData_PewterMuseumGuyExit:
 	db -1 ; end
 
 PewterCityHideSuperNerd1Script:
-	ld a, [wd730]
-	bit 0, a
+	ld a, [wStatusFlags5]
+	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
 	ld a, HS_MUSEUM_GUY
 	ld [wMissableObjectIndex], a
@@ -125,8 +125,8 @@ PewterCityYoungsterShowsPlayerGymScript:
 	ldh [hSpriteImageIndex], a
 	call SetSpriteImageIndexAfterSettingFacingDirection
 	call PlayDefaultMusic
-	ld hl, wFlags_0xcd60
-	set 4, [hl]
+	ld hl, wMiscFlags
+	set BIT_NO_SPRITE_UPDATES, [hl]
 	ld a, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -158,8 +158,8 @@ MovementData_PewterGymGuyExit:
 	db -1 ; end
 
 PewterCityHideYoungsterScript:
-	ld a, [wd730]
-	bit 0, a
+	ld a, [wStatusFlags5]
+	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
 	ld a, HS_GYM_GUY
 	ld [wMissableObjectIndex], a
-- 
cgit v1.3.1-sl0p