Prefix engine_flags wram addresses with w

9 files changed, 17 insertions, 17 deletions

diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 1c21f4995..6171eea07 100755
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -8,7 +8,7 @@ PlayWhirlpoolSound: ; 8c7d4
 
 BlindingFlash: ; 8c7e1
 	farcall FadeOutPalettes
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	set 2, [hl] ; Flash
 	farcall ReplaceTimeOfDayPals
 	farcall UpdateTimeOfDayPal
diff --git a/engine/events/fish.asm b/engine/events/fish.asm
index c571bba56..9d1ea63ae 100644
--- a/engine/events/fish.asm
+++ b/engine/events/fish.asm
@@ -97,7 +97,7 @@ GetFishGroupIndex: ; 9245b
 ; Return the index of fishgroup d in de.
 
 	push hl
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	bit 2, [hl]
 	pop hl
 	jr z, .done
diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm
index 595e41824..d0b0bac15 100644
--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041
 ; 4404c
 
 TryResetFruitTrees: ; 4404c
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	bit 4, [hl]
 	ret nz
 	jp ResetFruitTrees
@@ -70,7 +70,7 @@ ResetFruitTrees: ; 4406a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	set 4, [hl]
 	ret
 ; 44078
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index 5fa1dc270..5108306d9 100755
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -2,7 +2,7 @@ HALLOFFAME_COLON EQU $63
 
 HallOfFame:: ; 0x8640e
 	call HallOfFame_FadeOutMusic
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	push af
 	ld a, 1
 	ld [wGameLogicPaused], a
@@ -11,7 +11,7 @@ HallOfFame:: ; 0x8640e
 	ld [wSpawnAfterChampion], a
 
 	; Enable the Pokégear map to cycle through all of Kanto
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	set 6, [hl] ; hall of fame
 
 	farcall HallOfFame_InitSaveIfNeeded
@@ -52,7 +52,7 @@ RedCredits:: ; 86455
 	call DisableSpriteUpdates
 	ld a, SPAWN_RED
 	ld [wSpawnAfterChampion], a
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	ld b, a
 	farcall Credits
 	ret
diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
index 3a2f902c2..ba15f6525 100755
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -328,7 +328,7 @@ MagnetTrain_Jumptable: ; 8cdf7
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 370162fa9..8c238cb9c 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -358,7 +358,7 @@ SurfFunction: ; c909
 	ld de, ENGINE_FOGBADGE
 	call CheckBadge
 	jr c, .asm_c956
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 1, [hl] ; always on bike
 	jr nz, .cannotsurf
 	ld a, [PlayerState]
@@ -520,7 +520,7 @@ TrySurfOW:: ; c9e7
 	call CheckPartyMove
 	jr c, .quit
 
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 1, [hl] ; always on bike (can't surf)
 	jr nz, .quit
 
@@ -1008,7 +1008,7 @@ StrengthFunction: ; cce5
 	ret
 
 SetStrengthFlag: ; cd12
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	set 0, [hl]
 	ld a, [CurPartyMon]
 	ld e, a
@@ -1086,7 +1086,7 @@ TryStrengthOW: ; cd78
 	call CheckEngineFlag
 	jr c, .nope
 
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 0, [hl]
 	jr z, .already_using
 
@@ -1683,7 +1683,7 @@ BikeFunction: ; d0b3
 	ret
 
 .GetOffBike:
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 1, [hl]
 	jr nz, .CantGetOffBike
 	ld hl, Script_GetOffBike
diff --git a/engine/events/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm
index 3e5e094e4..d47bcb6c1 100644
--- a/engine/events/pokerus/pokerus.asm
+++ b/engine/events/pokerus/pokerus.asm
@@ -18,7 +18,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 
 ; If we haven't been to Goldenrod City at least once,
 ; prevent the contraction of Pokerus.
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 6, [hl]
 	ret z
 	call Random
@@ -123,7 +123,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 
 ; any berry held by a Shuckle may be converted to berry juice
 ConvertBerriesToBerryJuice: ; 2ede6
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 6, [hl]
 	ret z
 	call Random
diff --git a/engine/events/special.asm b/engine/events/special.asm
index d28d0de64..939db4a25 100755
--- a/engine/events/special.asm
+++ b/engine/events/special.asm
@@ -53,7 +53,7 @@ SpecialGiveShuckle: ; 7305
 	call CopyName2
 
 ; Engine flag for this event.
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	set 5, [hl]
 ; setflag ENGINE_SHUCKLE_GIVEN
 	ld a, 1
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index 77567488c..9b75eb9b8 100755
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -36,7 +36,7 @@ SweetScentNothing: ; 0x506e9
 SweetScentEncounter: ; 506ef
 	farcall CanUseSweetScent
 	jr nc, .no_battle
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl]
 	jr nz, .not_in_bug_contest
 	farcall GetMapEncounterRate