Prefix wram labels with w, part 2.

1 files changed, 76 insertions, 76 deletions

diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index 84fb6c9de..1c2dfb7aa 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -10,7 +10,7 @@ LoadSGBLayoutCGB: ; 8d59
 	ld a, b
 	cp SCGB_RAM
 	jr nz, .not_ram
-	ld a, [SGBPredef]
+	ld a, [wSGBPredef]
 .not_ram
 	cp SCGB_PARTY_MENU_HP_PALS
 	jp z, CGB_ApplyPartyMenuHPPals
@@ -89,7 +89,7 @@ _CGB_BattleColors: ; 8ddb
 	call GetEnemyFrontpicPalettePointer
 	push hl
 	call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY
-	ld a, [EnemyHPPal]
+	ld a, [wEnemyHPPal]
 	ld l, a
 	ld h, $0
 	add hl, hl
@@ -97,7 +97,7 @@ _CGB_BattleColors: ; 8ddb
 	ld bc, HPBarPals
 	add hl, bc
 	call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY_HP
-	ld a, [PlayerHPPal]
+	ld a, [wPlayerHPPal]
 	ld l, a
 	ld h, $0
 	add hl, hl
@@ -113,35 +113,35 @@ _CGB_BattleColors: ; 8ddb
 	pop hl
 	call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_PLAYER
 	ld a, SCGB_BATTLE_COLORS
-	ld [SGBPredef], a
+	ld [wSGBPredef], a
 	call ApplyPals
 _CGB_FinishBattleScreenLayout: ; 8e23
 	call InitPartyMenuBGPal7
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, PAL_BATTLE_BG_ENEMY_HP
 	call ByteFill
-	hlcoord 0, 4, AttrMap
+	hlcoord 0, 4, wAttrMap
 	lb bc, 8, 10
 	ld a, PAL_BATTLE_BG_PLAYER
 	call FillBoxCGB
-	hlcoord 10, 0, AttrMap
+	hlcoord 10, 0, wAttrMap
 	lb bc, 7, 10
 	ld a, PAL_BATTLE_BG_ENEMY
 	call FillBoxCGB
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	lb bc, 4, 10
 	ld a, PAL_BATTLE_BG_ENEMY_HP
 	call FillBoxCGB
-	hlcoord 10, 7, AttrMap
+	hlcoord 10, 7, wAttrMap
 	lb bc, 5, 10
 	ld a, PAL_BATTLE_BG_PLAYER_HP
 	call FillBoxCGB
-	hlcoord 10, 11, AttrMap
+	hlcoord 10, 11, wAttrMap
 	lb bc, 1, 9
 	ld a, PAL_BATTLE_BG_EXP
 	call FillBoxCGB
-	hlcoord 0, 12, AttrMap
+	hlcoord 0, 12, wAttrMap
 	ld bc, 6 * SCREEN_WIDTH
 	ld a, PAL_BATTLE_BG_TEXT
 	call ByteFill
@@ -212,8 +212,8 @@ _CGB_StatsScreenHPPals: ; 8edb
 	ld bc, HPBarPals
 	add hl, bc
 	call LoadPalette_White_Col1_Col2_Black ; hp palette
-	ld a, [CurPartySpecies]
-	ld bc, TempMonDVs
+	ld a, [wCurPartySpecies]
+	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black ; mon palette
 	ld hl, ExpBarPalette
@@ -225,27 +225,27 @@ _CGB_StatsScreenHPPals: ; 8edb
 	call FarCopyWRAM
 	call WipeAttrMap
 
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	lb bc, 8, SCREEN_WIDTH
 	ld a, $1 ; mon palette
 	call FillBoxCGB
 
-	hlcoord 10, 16, AttrMap
+	hlcoord 10, 16, wAttrMap
 	ld bc, 10
 	ld a, $2 ; exp palette
 	call ByteFill
 
-	hlcoord 13, 5, AttrMap
+	hlcoord 13, 5, wAttrMap
 	lb bc, 2, 2
 	ld a, $3 ; pink page palette
 	call FillBoxCGB
 
-	hlcoord 15, 5, AttrMap
+	hlcoord 15, 5, wAttrMap
 	lb bc, 2, 2
 	ld a, $4 ; green page palette
 	call FillBoxCGB
 
-	hlcoord 17, 5, AttrMap
+	hlcoord 17, 5, wAttrMap
 	lb bc, 2, 2
 	ld a, $5 ; blue page palette
 	call FillBoxCGB
@@ -270,7 +270,7 @@ _CGB_Pokedex: ; 8f70
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
 	call LoadHLPaletteIntoDE ; dex interface palette
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp $ff
 	jr nz, .is_pokemon
 	ld hl, .PokedexQuestionMarkPalette
@@ -282,7 +282,7 @@ _CGB_Pokedex: ; 8f70
 	call LoadPalette_White_Col1_Col2_Black ; mon palette
 .got_palette
 	call WipeAttrMap
-	hlcoord 1, 1, AttrMap
+	hlcoord 1, 1, wAttrMap
 	lb bc, 7, 7
 	ld a, $1 ; green question mark palette
 	call FillBoxCGB
@@ -312,7 +312,7 @@ _CGB_BillsPC: ; 8fca
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp $ff
 	jr nz, .GetMonPalette
 	ld hl, .BillsPCOrangePalette
@@ -320,12 +320,12 @@ _CGB_BillsPC: ; 8fca
 	jr .Resume
 
 .GetMonPalette:
-	ld bc, TempMonDVs
+	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 .Resume:
 	call WipeAttrMap
-	hlcoord 1, 4, AttrMap
+	hlcoord 1, 4, wAttrMap
 	lb bc, 7, 7
 	ld a, $1
 	call FillBoxCGB
@@ -343,12 +343,12 @@ _CGB_BillsPC: ; 8fca
 	jr .asm_901a
 
 .unused
-	ld bc, TempMonDVs
+	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 .asm_901a
 	call WipeAttrMap
-	hlcoord 1, 1, AttrMap
+	hlcoord 1, 1, wAttrMap
 	lb bc, 7, 7
 	ld a, $1
 	call FillBoxCGB
@@ -369,11 +369,11 @@ _CGB_PokedexUnownMode: ; 903e
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	call GetMonPalettePointer_
 	call LoadPalette_White_Col1_Col2_Black
 	call WipeAttrMap
-	hlcoord 7, 5, AttrMap
+	hlcoord 7, 5, wAttrMap
 	lb bc, 7, 7
 	ld a, $1
 	call FillBoxCGB
@@ -392,43 +392,43 @@ _CGB_SlotMachine: ; 906e
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call WipeAttrMap
-	hlcoord 0, 2, AttrMap
+	hlcoord 0, 2, wAttrMap
 	lb bc, 10, 3
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 17, 2, AttrMap
+	hlcoord 17, 2, wAttrMap
 	lb bc, 10, 3
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 0, 4, AttrMap
+	hlcoord 0, 4, wAttrMap
 	lb bc, 6, 3
 	ld a, $3
 	call FillBoxCGB
-	hlcoord 17, 4, AttrMap
+	hlcoord 17, 4, wAttrMap
 	lb bc, 6, 3
 	ld a, $3
 	call FillBoxCGB
-	hlcoord 0, 6, AttrMap
+	hlcoord 0, 6, wAttrMap
 	lb bc, 2, 3
 	ld a, $4
 	call FillBoxCGB
-	hlcoord 17, 6, AttrMap
+	hlcoord 17, 6, wAttrMap
 	lb bc, 2, 3
 	ld a, $4
 	call FillBoxCGB
-	hlcoord 4, 2, AttrMap
+	hlcoord 4, 2, wAttrMap
 	lb bc, 2, 12
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 3, 2, AttrMap
+	hlcoord 3, 2, wAttrMap
 	lb bc, 10, 1
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 16, 2, AttrMap
+	hlcoord 16, 2, wAttrMap
 	lb bc, 10, 1
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 0, 12, AttrMap
+	hlcoord 0, 12, wAttrMap
 	ld bc, $78
 	ld a, $7
 	call ByteFill
@@ -447,7 +447,7 @@ _CGB06: ; 90f8
 	ld a, PREDEFPAL_PACK
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	hlcoord 0, 6, AttrMap
+	hlcoord 0, 6, wAttrMap
 	lb bc, 12, SCREEN_WIDTH
 	ld a, $1
 	call FillBoxCGB
@@ -560,7 +560,7 @@ _CGB_Diploma: ; 91ad
 _CGB_MapPals: ; 91c8
 	call LoadMapPals
 	ld a, SCGB_MAPPALS
-	ld [SGBPredef], a
+	ld [wSGBPredef], a
 	ret
 ; 91d1
 
@@ -585,13 +585,13 @@ _CGB_Evolution: ; 91e4
 	jr .got_palette
 
 .pokemon
-	ld hl, PartyMon1DVs
+	ld hl, wPartyMon1DVs
 	ld bc, PARTYMON_STRUCT_LENGTH
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld c, l
 	ld b, h
-	ld a, [PlayerHPPal]
+	ld a, [wPlayerHPPal]
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 	ld hl, BattleObjectPals
@@ -621,7 +621,7 @@ _CGB_GSTitleScreen: ; 9228
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
 	ld a, SCGB_DIPLOMA
-	ld [SGBPredef], a
+	ld [wSGBPredef], a
 	call ApplyPals
 	ld a, $1
 	ld [hCGBPalUpdate], a
@@ -690,7 +690,7 @@ _CGB_TrainerCard: ; 9289
 	call LoadHLPaletteIntoDE
 
 	; fill screen with opposite-gender palette for the card border
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, [wPlayerGender]
 	and a
@@ -700,7 +700,7 @@ _CGB_TrainerCard: ; 9289
 .got_gender
 	call ByteFill
 	; fill trainer sprite area with same-gender palette
-	hlcoord 14, 1, AttrMap
+	hlcoord 14, 1, wAttrMap
 	lb bc, 7, 5
 	ld a, [wPlayerGender]
 	and a
@@ -710,33 +710,33 @@ _CGB_TrainerCard: ; 9289
 .got_gender2
 	call FillBoxCGB
 	; top-right corner still uses the border's palette
-	hlcoord 18, 1, AttrMap
+	hlcoord 18, 1, wAttrMap
 	ld [hl], $1
-	hlcoord 2, 11, AttrMap
+	hlcoord 2, 11, wAttrMap
 	lb bc, 2, 4
 	ld a, $1 ; falkner
 	call FillBoxCGB
-	hlcoord 6, 11, AttrMap
+	hlcoord 6, 11, wAttrMap
 	lb bc, 2, 4
 	ld a, $2 ; bugsy
 	call FillBoxCGB
-	hlcoord 10, 11, AttrMap
+	hlcoord 10, 11, wAttrMap
 	lb bc, 2, 4
 	ld a, $3 ; whitney
 	call FillBoxCGB
-	hlcoord 14, 11, AttrMap
+	hlcoord 14, 11, wAttrMap
 	lb bc, 2, 4
 	ld a, $4 ; morty
 	call FillBoxCGB
-	hlcoord 2, 14, AttrMap
+	hlcoord 2, 14, wAttrMap
 	lb bc, 2, 4
 	ld a, $5 ; chuck
 	call FillBoxCGB
-	hlcoord 6, 14, AttrMap
+	hlcoord 6, 14, wAttrMap
 	lb bc, 2, 4
 	ld a, $6 ; jasmine
 	call FillBoxCGB
-	hlcoord 10, 14, AttrMap
+	hlcoord 10, 14, wAttrMap
 	lb bc, 2, 4
 	ld a, $7 ; pryce
 	call FillBoxCGB
@@ -745,7 +745,7 @@ _CGB_TrainerCard: ; 9289
 	and a
 	push af
 	jr z, .got_gender3
-	hlcoord 14, 14, AttrMap
+	hlcoord 14, 14, wAttrMap
 	lb bc, 2, 4
 	ld a, $1
 	call FillBoxCGB
@@ -756,7 +756,7 @@ _CGB_TrainerCard: ; 9289
 	inc c
 .got_gender4
 	ld a, c
-	hlcoord 18, 1, AttrMap
+	hlcoord 18, 1, wAttrMap
 	ld [hl], a
 	call ApplyAttrMap
 	call ApplyPals
@@ -770,7 +770,7 @@ _CGB_MoveList: ; 9373
 	ld a, PREDEFPAL_GOLDENROD
 	call GetPredefPal
 	call LoadHLPaletteIntoDE
-	ld a, [PlayerHPPal]
+	ld a, [wPlayerHPPal]
 	ld l, a
 	ld h, 0
 	add hl, hl
@@ -779,7 +779,7 @@ _CGB_MoveList: ; 9373
 	add hl, bc
 	call LoadPalette_White_Col1_Col2_Black
 	call WipeAttrMap
-	hlcoord 11, 1, AttrMap
+	hlcoord 11, 1, wAttrMap
 	lb bc, 2, 9
 	ld a, $1
 	call FillBoxCGB
@@ -816,7 +816,7 @@ _CGB_PokedexSearchOption: ; 93ba
 
 _CGB_PackPals: ; 93d3
 ; pack pals
-	ld a, [BattleType]
+	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
 	jr z, .tutorial_male
 
@@ -836,23 +836,23 @@ _CGB_PackPals: ; 93d3
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	call WipeAttrMap
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	lb bc, 1, 10
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 10, 0, AttrMap
+	hlcoord 10, 0, wAttrMap
 	lb bc, 1, 10
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 7, 2, AttrMap
+	hlcoord 7, 2, wAttrMap
 	lb bc, 9, 1
 	ld a, $3
 	call FillBoxCGB
-	hlcoord 0, 7, AttrMap
+	hlcoord 0, 7, wAttrMap
 	lb bc, 3, 5
 	ld a, $4
 	call FillBoxCGB
-	hlcoord 0, 3, AttrMap
+	hlcoord 0, 3, wAttrMap
 	lb bc, 3, 5
 	ld a, $5
 	call FillBoxCGB
@@ -874,7 +874,7 @@ INCLUDE "gfx/pack/pack_f.pal"
 _CGB_Pokepic: ; 9499
 	call _CGB_MapPals
 	ld de, SCREEN_WIDTH
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	ld a, [wMenuBorderTopCoord]
 .loop
 	and a
@@ -910,11 +910,11 @@ _CGB13: ; 94d0
 	ld hl, PalPacket_SCGB_13 + 1
 	call CopyFourPalettes
 	call WipeAttrMap
-	hlcoord 0, 4, AttrMap
+	hlcoord 0, 4, wAttrMap
 	lb bc, 10, SCREEN_WIDTH
 	ld a, $2
 	call FillBoxCGB
-	hlcoord 0, 6, AttrMap
+	hlcoord 0, 6, wAttrMap
 	lb bc, 6, SCREEN_WIDTH
 	ld a, $1
 	call FillBoxCGB
@@ -948,8 +948,8 @@ INCLUDE "gfx/splash/logo.pal"
 
 _CGB_PlayerOrMonFrontpicPals: ; 9529
 	ld de, wBGPals1
-	ld a, [CurPartySpecies]
-	ld bc, TempMonDVs
+	ld a, [wCurPartySpecies]
+	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 	call WipeAttrMap
@@ -960,7 +960,7 @@ _CGB_PlayerOrMonFrontpicPals: ; 9529
 
 _CGB1e: ; 9542
 	ld de, wBGPals1
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	call GetMonPalettePointer_
 	call LoadPalette_White_Col1_Col2_Black
 	call WipeAttrMap
@@ -986,8 +986,8 @@ _CGB_TradeTube: ; 9555
 
 _CGB_TrainerOrMonFrontpicPals: ; 9578
 	ld de, wBGPals1
-	ld a, [CurPartySpecies]
-	ld bc, TempMonDVs
+	ld a, [wCurPartySpecies]
+	ld bc, wTempMonDVs
 	call GetFrontpicPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
 	call WipeAttrMap
@@ -1004,23 +1004,23 @@ _CGB_MysteryGift: ; 9591
 	call FarCopyWRAM
 	call ApplyPals
 	call WipeAttrMap
-	hlcoord 3, 7, AttrMap
+	hlcoord 3, 7, wAttrMap
 	lb bc, 8, 14
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 1, 5, AttrMap
+	hlcoord 1, 5, wAttrMap
 	lb bc, 1, 18
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 1, 16, AttrMap
+	hlcoord 1, 16, wAttrMap
 	lb bc, 1, 18
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 0, 0, AttrMap
+	hlcoord 0, 0, wAttrMap
 	lb bc, 17, 2
 	ld a, $1
 	call FillBoxCGB
-	hlcoord 18, 5, AttrMap
+	hlcoord 18, 5, wAttrMap
 	lb bc, 12, 1
 	ld a, $1
 	call FillBoxCGB