Prefix engine_flags wram addresses with w

38 files changed, 111 insertions, 111 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index a62b70d72..d9f660a41 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6695,7 +6695,7 @@ CheckSleepingTreeMon: ; 3eb38
 CheckUnownLetter: ; 3eb75
 ; Return carry if the Unown letter hasn't been unlocked yet
 
-	ld a, [UnlockedUnowns]
+	ld a, [wUnlockedUnowns]
 	ld c, a
 	ld de, 0
 
@@ -7074,7 +7074,7 @@ BadgeStatBoosts: ; 3ed45
 	and a
 	ret nz
 
-	ld a, [JohtoBadges]
+	ld a, [wJohtoBadges]
 
 ; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
 	ld d, a
@@ -9349,7 +9349,7 @@ GetTrainerBackpic: ; 3fbff
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a ; transformed to male
 	jr nz, .Chris
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .Chris
 
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 5922afea3..f86f90479 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -726,7 +726,7 @@ BattleCommand_CheckObedience: ; 343db
 
 .obeylevel
 	; The maximum obedience level is constrained by owned badges:
-	ld hl, JohtoBadges
+	ld hl, wJohtoBadges
 
 	; risingbadge
 	bit RISINGBADGE, [hl]
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index b05dc8071..c78e9fd84 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -176,9 +176,9 @@ DoBadgeTypeBoosts: ; fbe24
 
 	ld hl, .BadgeTypes
 
-	ld a, [KantoBadges]
+	ld a, [wKantoBadges]
 	ld b, a
-	ld a, [JohtoBadges]
+	ld a, [wJohtoBadges]
 	ld c, a
 
 .CheckBadge:
diff --git a/engine/caught_data.asm b/engine/caught_data.asm
index 961782908..1f8b8cac4 100644
--- a/engine/caught_data.asm
+++ b/engine/caught_data.asm
@@ -193,7 +193,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
 .NotPokecenter2F:
 	call GetWorldMapLocation
 	ld b, a
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	rrca
 	or b
 	ld [hl], a
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index 93e2c4434..715e41847 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -183,7 +183,7 @@ InitPartyMenuBGPal0: ; 8e9f
 ; 8eb9
 
 _CGB_PokegearPals: ; 8eb9
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .male
 	ld hl, FemalePokegearPals
@@ -719,7 +719,7 @@ _CGB_TrainerCard: ; 9289
 	; fill screen with opposite-gender palette for the card border
 	hlcoord 0, 0, AttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	ld a, $1 ; kris
 	jr z, .got_gender
@@ -729,7 +729,7 @@ _CGB_TrainerCard: ; 9289
 	; fill trainer sprite area with same-gender palette
 	hlcoord 14, 1, AttrMap
 	lb bc, 7, 5
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	ld a, $0 ; chris
 	jr z, .got_gender2
@@ -768,7 +768,7 @@ _CGB_TrainerCard: ; 9289
 	ld a, $7 ; pryce
 	call FillBoxCGB
 	; clair uses kris's palette
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	push af
 	jr z, .got_gender3
@@ -847,7 +847,7 @@ _CGB_PackPals: ; 93d3
 	cp BATTLETYPE_TUTORIAL
 	jr z, .tutorial_male
 
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .tutorial_male
 
diff --git a/engine/color.asm b/engine/color.asm
index 3eafbad70..7e43ea0d4 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -718,7 +718,7 @@ GetPlayerOrMonPalettePointer:
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a ; transformed to male
 	jr nz, .male
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	and a
 	jr z, .male
 	ld hl, KrisPalette
diff --git a/engine/events.asm b/engine/events.asm
index 9b26893e7..55d02ee93 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -491,7 +491,7 @@ CheckTimeEvents: ; 9693a
 	and a
 	jr nz, .nothing
 
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug contest
 	jr z, .do_daily
 
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
diff --git a/engine/events_2.asm b/engine/events_2.asm
index cab6b8bd0..cac736bab 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -2,7 +2,7 @@
 
 
 WarpToSpawnPoint:: ; 97c28
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	res 1, [hl] ; safari zone?
 	res 2, [hl] ; bug contest
 	ret
@@ -108,7 +108,7 @@ RandomEncounter:: ; 97cc0
 	jr c, .nope
 	call CanUseSweetScent
 	jr nc, .nope
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug contest
 	jr nz, .bug_contest
 	farcall TryWildEncounter
@@ -149,7 +149,7 @@ WildBattleScript: ; 97cf9
 ; 97cfd
 
 CanUseSweetScent:: ; 97cfd
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	bit 5, [hl]
 	jr nz, .no
 	ld a, [wEnvironment]
@@ -263,7 +263,7 @@ DoBikeStep:: ; 97db3
 	; If the bike shop owner doesn't have our number, or
 	; if we've already gotten the call, we don't have to
 	; be here.
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 4, [hl] ; bike shop call
 	jr z, .NoCall
 
@@ -314,7 +314,7 @@ DoBikeStep:: ; 97db3
 	ld [wSpecialPhoneCallID], a
 	xor a
 	ld [wSpecialPhoneCallID + 1], a
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	res 4, [hl] ; bike shop call
 	scf
 	ret
diff --git a/engine/events_3.asm b/engine/events_3.asm
index 3d662c332..78628aaea 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -648,7 +648,7 @@ LoadFishingGFX: ; b84b3
 	ld [rVBK], a
 
 	ld de, FishingGFX
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .got_gender
 	ld de, KrisFishingGFX
diff --git a/engine/init_gender.asm b/engine/init_gender.asm
index 092a1c9ea..1f30f774c 100755
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@@ -3,7 +3,7 @@ InitCrystalData: ; 48000
 	ld [wd474], a
 	xor a
 	ld [wd473], a
-	ld [PlayerGender], a
+	ld [wPlayerGender], a
 	ld [wd475], a
 	ld [wd476], a
 	ld [wd477], a
@@ -37,7 +37,7 @@ InitGender: ; 48dcb (12:4dcb)
 	call CloseWindow
 	ld a, [wMenuCursorY]
 	dec a
-	ld [PlayerGender], a
+	ld [wPlayerGender], a
 	ld c, 10
 	call DelayFrames
 	ret
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 77d1af6f9..94deb1112 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -193,8 +193,8 @@ _ResetWRAM: ; 5bae
 	xor a
 	ld [MonType], a
 
-	ld [JohtoBadges], a
-	ld [KantoBadges], a
+	ld [wJohtoBadges], a
+	ld [wKantoBadges], a
 
 	ld [Coins], a
 	ld [Coins + 1], a
@@ -483,7 +483,7 @@ FinishContinueFunction: ; 5e5d
 	xor a
 	ld [wDontPlayMapMusicOnReload], a
 	ld [wLinkMode], a
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	set 0, [hl]
 	res 7, [hl]
 	ld hl, wEnteredMapFromContinue
@@ -540,7 +540,7 @@ Continue_LoadMenuHeader: ; 5ebf
 	xor a
 	ld [hBGMapMode], a
 	ld hl, .MenuDataHeader_Dex
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 0, a ; pokedex
 	jr nz, .pokedex_header
 	ld hl, .MenuDataHeader_NoDex
@@ -631,7 +631,7 @@ Continue_UnknownGameTime: ; 5f48
 
 Continue_DisplayBadgeCount: ; 5f58
 	push hl
-	ld hl, JohtoBadges
+	ld hl, wJohtoBadges
 	ld b, 2
 	call CountSetBits
 	pop hl
@@ -641,7 +641,7 @@ Continue_DisplayBadgeCount: ; 5f58
 ; 5f6b
 
 Continue_DisplayPokedexNumCaught: ; 5f6b
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 0, a ; Pokedex
 	ret z
 	push hl
@@ -813,7 +813,7 @@ NamePlayer: ; 0x6074
 
 	ld hl, PlayerName
 	ld de, .Chris
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .Male
 	ld de, .Kris
@@ -989,7 +989,7 @@ Intro_PlacePlayerSprite: ; 61cd
 	ld [hli], a
 
 	ld b, 0
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .male
 	ld b, 1
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 92a16f5b6..a88f60bbf 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -9,7 +9,7 @@ MainMenu: ; 49cdc
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	res 0, [hl]
 	call MainMenu_GetWhichMenu
 	ld [wWhichIndexSet], a
@@ -168,7 +168,7 @@ MainMenu_GetWhichMenu: ; 49da4
 	cp -1
 	call CloseSRAM
 	jr nz, .mystery_gift
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 7, a
 	ld a, $1 ; Continue
 	jr z, .ok
@@ -182,7 +182,7 @@ MainMenu_GetWhichMenu: ; 49da4
 	ret
 
 .mystery_gift
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 7, a
 	jr z, .ok3
 	jr .ok3
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 562916442..078e6a2fd 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -168,7 +168,7 @@ CheckReplaceKrisSprite: ; 154f7
 
 .CheckBiking: ; 1550c (5:550c)
 	and a
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 1, [hl]
 	ret z
 	ld a, PLAYER_BIKE
diff --git a/engine/mart.asm b/engine/mart.asm
index 55c184737..4a8d9e17b 100755
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -58,7 +58,7 @@ BargainShop: ; 15a84
 	ld a, [hli]
 	or [hl]
 	jr z, .skip_set
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	set 6, [hl]
 
 .skip_set
@@ -81,7 +81,7 @@ Pharmacist: ; 15aae
 RooftopSale: ; 15ac4
 	ld b, BANK(RooftopSaleData1)
 	ld de, RooftopSaleData1
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	bit 6, [hl] ; hall of fame
 	jr z, .ok
 	ld b, BANK(RooftopSaleData2)
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 7941b74d7..14e36a41d 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -64,7 +64,7 @@ GetPlayerSprite: ; 14183
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a
 	jr nz, .go
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .go
 	ld hl, .Kris
diff --git a/engine/pack.asm b/engine/pack.asm
index 2b0d04aba..221ca51e0 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1294,7 +1294,7 @@ DrawPackGFX: ; 1089d
 	ld a, [BattleType]
 	cp BATTLETYPE_TUTORIAL
 	jr z, .male_dude
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr nz, .female
 .male_dude
diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm
index 6ffaa77c8..50483eec9 100644
--- a/engine/player_gfx.asm
+++ b/engine/player_gfx.asm
@@ -1,7 +1,7 @@
 Function88248: ; 88248
 ; XXX
 	ld c, CAL
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .okay
 	ld c, KAREN
@@ -58,7 +58,7 @@ MovePlayerPic: ; 88266
 
 ShowPlayerNamingChoices: ; 88297
 	ld hl, ChrisNameMenuHeader
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotGender
 	ld hl, KrisNameMenuHeader
@@ -76,7 +76,7 @@ INCLUDE "data/default_names.asm"
 GetPlayerNameArray: ; 88318 This Function is never called
 	ld hl, PlayerName
 	ld de, MalePlayerNameArray
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .done
 	ld de, FemalePlayerNameArray
@@ -92,7 +92,7 @@ GetPlayerIcon: ; 8832c
 	ld de, ChrisSpriteGFX
 	ld b, BANK(ChrisSpriteGFX)
 
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .done
 
@@ -105,7 +105,7 @@ GetPlayerIcon: ; 8832c
 
 GetCardPic: ; 8833e
 	ld hl, ChrisCardPic
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotClass
 	ld hl, KrisCardPic
@@ -131,7 +131,7 @@ CardGFX: ; 887c5
 INCBIN "gfx/trainer_card/trainer_card.2bpp"
 
 GetPlayerBackpic: ; 88825
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, GetChrisBackpic
 	call GetKrisBackpic
@@ -150,7 +150,7 @@ HOF_LoadTrainerFrontpic: ; 88840
 	xor a
 	ld [hBGMapMode], a
 	ld e, 0
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotClass
 	ld e, 1
@@ -159,7 +159,7 @@ HOF_LoadTrainerFrontpic: ; 88840
 	ld a, e
 	ld [TrainerClass], a
 	ld de, ChrisPic
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotPic
 	ld de, KrisPic
@@ -179,7 +179,7 @@ DrawIntroPlayerPic: ; 88874
 
 ; Get class
 	ld e, CHRIS
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotClass
 	ld e, KRIS
@@ -189,7 +189,7 @@ DrawIntroPlayerPic: ; 88874
 
 ; Load pic
 	ld de, ChrisPic
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotPic
 	ld de, KrisPic
diff --git a/engine/player_movement.asm b/engine/player_movement.asm
index db0c07801..fa7cc84a5 100755
--- a/engine/player_movement.asm
+++ b/engine/player_movement.asm
@@ -18,7 +18,7 @@ DoPlayerMovement:: ; 80000
 
 ; Standing downhill instead moves down.
 
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 2, [hl] ; downhill
 	ret z
 
@@ -285,7 +285,7 @@ DoPlayerMovement:: ; 80000
 	call .BikeCheck
 	jr nz, .walk
 
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 2, [hl] ; downhill
 	jr z, .fast
 
@@ -672,7 +672,7 @@ DoPlayerMovement:: ; 80000
 
 .CheckStrengthBoulder: ; 8036f
 
-	ld hl, BikeFlags
+	ld hl, wBikeFlags
 	bit 0, [hl] ; using strength
 	jr z, .not_boulder
 
diff --git a/engine/player_object.asm b/engine/player_object.asm
index fe19d15b5..e11a30036 100755
--- a/engine/player_object.asm
+++ b/engine/player_object.asm
@@ -33,7 +33,7 @@ SpawnPlayer: ; 8029
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a
 	jr nz, .ok
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .ok
 	ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 12b5b2cd6..8beb9e5df 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -103,7 +103,7 @@ InitPokedex: ; 40063
 	ret
 
 Pokedex_CheckUnlockedUnownMode: ; 400a2
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 1, a
 	jr nz, .unlocked
 
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index a3e43cebf..48ab6855b 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -657,7 +657,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
 	push af
 	depixel 0, 0
 	ld b, SPRITE_ANIM_INDEX_RED_WALK
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_BLUE_WALK
@@ -734,7 +734,7 @@ PokegearMap_UpdateCursorPosition: ; 910d4
 ; 910e8
 
 TownMap_GetKantoLandmarkLimits: ; 910e8
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 6, a
 	jr z, .not_hof
 	ld d, ROUTE_28
@@ -1583,7 +1583,7 @@ RadioChannels:
 
 .EvolutionRadio:
 ; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 4, a
 	jr z, .NoSignal
 	ld a, [wPokegearMapPlayerIconLandmark]
@@ -1669,7 +1669,7 @@ LoadStation_BuenasPassword: ; 917a5 (24:57a5)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
 	ld de, NotBuenasPasswordName
-	ld a, [StatusFlags2]
+	ld a, [wStatusFlags2]
 	bit 0, a
 	ret z
 	ld de, BuenasPasswordName
@@ -2329,7 +2329,7 @@ CheckIfVisitedFlypoint: ; 91c3c
 
 HasVisitedSpawn: ; 91c50
 ; Check if spawn point c has been visited.
-	ld hl, VisitedSpawns
+	ld hl, wVisitedSpawns
 	ld b, CHECK_FLAG
 	ld d, 0
 	predef FlagPredef
@@ -2530,7 +2530,7 @@ _Area: ; 91d11
 	ret
 
 .right
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 6, a ; hall of fame
 	ret z
 	ld a, [hWY]
@@ -2659,7 +2659,7 @@ _Area: ; 91d11
 	inc de
 	push bc
 	ld c, 0 ; RED
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .got_gender
 	inc c   ; BLUE
@@ -2886,7 +2886,7 @@ TownMapPlayerIcon: ; 91fa6
 ; Animation/palette
 	depixel 0, 0
 	ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
-	ld a, [PlayerGender]
+	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
diff --git a/engine/radio.asm b/engine/radio.asm
index b5c1e075f..42db63ab0 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -4,7 +4,7 @@ PlayRadioShow:
 	cp POKE_FLUTE_RADIO
 	jr nc, .ok
 ; If Team Rocket is not occupying the radio tower, we don't need to be here.
-	ld a, [StatusFlags2]
+	ld a, [wStatusFlags2]
 	bit 0, a ; checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	jr z, .ok
 ; If we're in Kanto, we don't need to be here.
@@ -1176,11 +1176,11 @@ PeoplePlaces4: ; People
 	jr nc, PeoplePlaces4
 	push af
 	ld hl, .E4Names
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 6, a ; ENGINE_CREDITS_SKIP
 	jr z, .ok
 	ld hl, .KantoLeaderNames
-	ld a, [KantoBadges]
+	ld a, [wKantoBadges]
 	cp %11111111
 	jr nz, .ok
 	ld hl, .MiscNames
@@ -1571,7 +1571,7 @@ BuenasPassword4:
 	jp c, BuenasPassword8
 	ld a, [wBuenasPassword]
 ; If we already generated the password today, we don't need to generate a new one.
-	ld hl, WeeklyFlags
+	ld hl, wWeeklyFlags
 	bit 7, [hl]
 	jr nz, .AlreadyGotIt
 ; There are only 11 groups to choose from.
@@ -1593,7 +1593,7 @@ BuenasPassword4:
 	add e
 	ld [wBuenasPassword], a
 ; Set the flag so that we don't generate a new password this week.
-	ld hl, WeeklyFlags
+	ld hl, wWeeklyFlags
 	set 7, [hl]
 .AlreadyGotIt:
 	ld c, a
@@ -1737,14 +1737,14 @@ BuenasPassword7:
 
 BuenasPasswordAfterMidnight:
 	push hl
-	ld hl, WeeklyFlags
+	ld hl, wWeeklyFlags
 	res 7, [hl]
 	pop hl
 	ld a, BUENAS_PASSWORD_8
 	jp NextRadioLine
 
 BuenasPassword8:
-	ld hl, WeeklyFlags
+	ld hl, wWeeklyFlags
 	res 7, [hl]
 	ld hl, BuenaRadioMidnightText10
 	ld a, BUENAS_PASSWORD_9
@@ -1812,7 +1812,7 @@ BuenasPassword20:
 	farcall NoRadioName
 	pop af
 	ld [hBGMapMode], a
-	ld hl, WeeklyFlags
+	ld hl, wWeeklyFlags
 	res 7, [hl]
 	ld a, BUENAS_PASSWORD
 	ld [wCurrentRadioLine], a
diff --git a/engine/save.asm b/engine/save.asm
index 69bbaee82..af24b4d2f 100644
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -691,8 +691,8 @@ TryLoadSaveData: ; 14f1c
 	ld de, StartDay
 	ld bc, 8
 	call CopyBytes
-	ld hl, sPlayerData + StatusFlags - wPlayerData
-	ld de, StatusFlags
+	ld hl, sPlayerData + wStatusFlags - wPlayerData
+	ld de, wStatusFlags
 	ld a, [hl]
 	ld [de], a
 	call CloseSRAM
@@ -710,8 +710,8 @@ TryLoadSaveData: ; 14f1c
 	ld de, StartDay
 	ld bc, 8
 	call CopyBytes
-	ld hl, sBackupPlayerData + StatusFlags - wPlayerData
-	ld de, StatusFlags
+	ld hl, sBackupPlayerData + wStatusFlags - wPlayerData
+	ld de, wStatusFlags
 	ld a, [hl]
 	ld [de], a
 	call CloseSRAM
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 826267f6b..7512bdc06 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2609,14 +2609,14 @@ _EngineFlagAction:
 Script_wildoff:
 ; script command 0x38
 
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	set 5, [hl]
 	ret
 
 Script_wildon:
 ; script command 0x37
 
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	res 5, [hl]
 	ret
 
@@ -2991,12 +2991,12 @@ Script_end_all:
 Script_halloffame:
 ; script command 0xa1
 
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	res 0, [hl]
 	farcall TrainerRankings_HallOfFame
 	farcall TrainerRankings_HallOfFame2
 	farcall HallOfFame
-	ld hl, GameTimerPause
+	ld hl, wGameTimerPause
 	set 0, [hl]
 	jr ReturnFromCredits
 
diff --git a/engine/start_menu.asm b/engine/start_menu.asm
index d8fbad82d..913bf3780 100755
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -7,7 +7,7 @@ StartMenu:: ; 125cd
 
 	farcall ReanchorBGMap_NoOAMUpdate
 
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug catching contest
 	ld hl, .MenuDataHeader
 	jr z, .GotMenuData
@@ -284,7 +284,7 @@ endr
 	ld [wWhichIndexSet], a
 	call .FillMenuList
 
-	ld hl, StatusFlags
+	ld hl, wStatusFlags
 	bit 0, [hl]
 	jr z, .no_pokedex
 	ld a, 0 ; pokedex
@@ -301,7 +301,7 @@ endr
 	ld a, [wLinkMode]
 	and a
 	jr nz, .no_pack
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug catching contest
 	jr nz, .no_pack
 	ld a, 2 ; pack
@@ -321,7 +321,7 @@ endr
 	ld a, [wLinkMode]
 	and a
 	jr nz, .no_save
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug catching contest
 	ld a, 8 ; quit
 	jr nz, .write
@@ -390,7 +390,7 @@ endr
 ; 128d1
 
 .DrawBugContestStatusBox: ; 128d1
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug catching contest
 	ret z
 	farcall StartMenu_DrawBugContestStatusBox
@@ -398,7 +398,7 @@ endr
 ; 128de
 
 .DrawBugContestStatus: ; 128de
-	ld hl, StatusFlags2
+	ld hl, wStatusFlags2
 	bit 2, [hl] ; bug catching contest
 	jr nz, .contest
 	ret
diff --git a/engine/time.asm b/engine/time.asm
index 61ef614c3..799a24f49 100755
--- a/engine/time.asm
+++ b/engine/time.asm
@@ -101,7 +101,7 @@ CheckDailyResetTimer:: ; 11452
 	call CheckDayDependentEventHL
 	ret nc
 	xor a
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -226,14 +226,14 @@ CheckUnusedTwoDayTimer: ; 1150c
 ; 1151c
 
 ; XXX
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	set 2, [hl]
 	ret
 ; 11522
 
 ; XXX
 	and a
-	ld hl, DailyFlags
+	ld hl, wDailyFlags
 	bit 2, [hl]
 	ret nz
 	scf
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index 7fc364f70..56a874264 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -215,7 +215,7 @@ ReplaceTimeOfDayPals: ; 8c0e5
 	ret
 
 .DarkCave:
-	ld a, [StatusFlags]
+	ld a, [wStatusFlags]
 	bit 2, a ; Flash
 	jr nz, .UsedFlash
 	ld a, %11111111 ; 3, 3, 3, 3
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index 01a033650..c4f8e15a6 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -120,7 +120,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
 
 .KantoCheck:
 ; unreferenced
-	ld a, [KantoBadges]
+	ld a, [wKantoBadges]
 	and a
 	ret z
 	ld a, $4
@@ -166,7 +166,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
 
 .KantoCheck:
 ; unreferenced
-	ld a, [KantoBadges]
+	ld a, [wKantoBadges]
 	and a
 	ret z
 	ld a, $4
@@ -281,7 +281,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
 	hlcoord 2, 8
 	ld de, .StatusTilemap
 	call TrainerCardSetup_PlaceTilemapString
-	ld a, [StatusFlags] ; pokedex
+	ld a, [wStatusFlags]
 	bit 0, a
 	ret nz
 	hlcoord 1, 9
@@ -562,7 +562,7 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
 	; cycle 1: face tile, in1 tile, in2 tile, in3 tile
 	; cycle 2: face tile, in1 tile, in2 tile, in3 tile
 
-	dw JohtoBadges
+	dw wJohtoBadges
 
 	; Zephyrbadge
 	db $68, $18, 0
diff --git a/engine/wildmons.asm b/engine/wildmons.asm
index 9aed7017a..dc62093b8 100755
--- a/engine/wildmons.asm
+++ b/engine/wildmons.asm
@@ -336,7 +336,7 @@ ChooseWildEncounter: ; 2a14f
 	cp UNOWN
 	jr nz, .done
 
-	ld a, [UnlockedUnowns]
+	ld a, [wUnlockedUnowns]
 	and a
 	jr z, .nowildbattle
 
@@ -428,7 +428,7 @@ _JohtoWildmonCheck
 _SwarmWildmonCheck
 	call CopyCurrMapDE
 	push hl
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	bit 2, [hl]
 	pop hl
 	jr z, .CheckYanma
@@ -445,7 +445,7 @@ _SwarmWildmonCheck
 
 .CheckYanma:
 	push hl
-	ld hl, SwarmFlags
+	ld hl, wSwarmFlags
 	bit 3, [hl]
 	pop hl
 	jr z, _NoSwarmWildmon