aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/PewterCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/PewterCity.asm')
-rw-r--r--scripts/PewterCity.asm16
1 files changed, 8 insertions, 8 deletions
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