Prefix wram labels with w, part 2.

1 files changed, 195 insertions, 195 deletions

diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index 52894359e..0c0694851 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1,11 +1,11 @@
 TryAddMonToParty: ; d88c
 ; Check if to copy wild Pkmn or generate new Pkmn
 	; Whose is it?
-	ld de, PartyCount
-	ld a, [MonType]
+	ld de, wPartyCount
+	ld a, [wMonType]
 	and $f
 	jr z, .getpartylocation ; PARTYMON
-	ld de, OTPartyCount
+	ld de, wOTPartyCount
 
 .getpartylocation
 	; Do we have room for it?
@@ -25,18 +25,18 @@ TryAddMonToParty: ; d88c
 .loadspecies
 	; Load the species of the Pokemon into the party list.
 	; The terminator is usually here, but it'll be back.
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [de], a
 	; Load the terminator into the next slot.
 	inc de
 	ld a, -1
 	ld [de], a
 	; Now let's load the OT name.
-	ld hl, PartyMonOT
-	ld a, [MonType]
+	ld hl, wPartyMonOT
+	ld a, [wMonType]
 	and $f
 	jr z, .loadOTname
-	ld hl, OTPartyMonOT
+	ld hl, wOTPartyMonOT
 
 .loadOTname
 	ld a, [hMoveMon] ; Restore index from backup
@@ -44,31 +44,31 @@ TryAddMonToParty: ; d88c
 	call SkipNames
 	ld d, h
 	ld e, l
-	ld hl, PlayerName
+	ld hl, wPlayerName
 	ld bc, NAME_LENGTH
 	call CopyBytes
-	ld a, [MonType]
+	ld a, [wMonType]
 	and a
 	jr nz, .skipnickname
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	call GetPokemonName
-	ld hl, PartyMonNicknames
+	ld hl, wPartyMonNicknames
 	ld a, [hMoveMon]
 	dec a
 	call SkipNames
 	ld d, h
 	ld e, l
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
 .skipnickname
-	ld hl, PartyMon1Species
-	ld a, [MonType]
+	ld hl, wPartyMon1Species
+	ld a, [wMonType]
 	and $f
 	jr z, .initializeStats
-	ld hl, OTPartyMon1Species
+	ld hl, wOTPartyMon1Species
 
 .initializeStats
 	ld a, [hMoveMon]
@@ -79,17 +79,17 @@ GeneratePartyMonStats: ; d906
 	ld e, l
 	ld d, h
 	push hl
-	ld a, [CurPartySpecies]
-	ld [CurSpecies], a
+	ld a, [wCurPartySpecies]
+	ld [wCurSpecies], a
 	call GetBaseData
-	ld a, [BaseDexNo]
+	ld a, [wBaseDexNo]
 	ld [de], a
 	inc de
 	ld a, [wBattleMode]
 	and a
 	ld a, $0
 	jr z, .skipitem
-	ld a, [EnemyMonItem]
+	ld a, [wEnemyMonItem]
 
 .skipitem
 	ld [de], a
@@ -100,10 +100,10 @@ GeneratePartyMonStats: ; d906
 	ld a, [wBattleMode]
 	and a
 	jr z, .randomlygeneratemoves
-	ld a, [MonType]
+	ld a, [wMonType]
 	and a
 	jr nz, .randomlygeneratemoves
-	ld de, EnemyMonMoves
+	ld de, wEnemyMonMoves
 	rept NUM_MOVES + -1
 	ld a, [de]
 	inc de
@@ -119,7 +119,7 @@ GeneratePartyMonStats: ; d906
 	ld [hli], a
 	endr
 	ld [hl], a
-	ld [Buffer1], a
+	ld [wBuffer1], a
 	predef FillMoves
 
 .next
@@ -127,14 +127,14 @@ GeneratePartyMonStats: ; d906
 rept 4
 	inc de
 endr
-	ld a, [PlayerID]
+	ld a, [wPlayerID]
 	ld [de], a
 	inc de
-	ld a, [PlayerID + 1]
+	ld a, [wPlayerID + 1]
 	ld [de], a
 	inc de
 	push de
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld d, a
 	callfar CalcExpAtLevel
 	pop de
@@ -156,7 +156,7 @@ endr
 	jr nz, .loop
 	pop hl
 	push hl
-	ld a, [MonType]
+	ld a, [wMonType]
 	and $f
 	jr z, .generateDVs
 	push hl
@@ -165,7 +165,7 @@ endr
 	jr .initializetrainermonstats
 
 .generateDVs
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	dec a
 	push de
@@ -211,7 +211,7 @@ endr
 	inc de
 	ld [de], a
 	inc de
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld [de], a
 	inc de
 	xor a
@@ -234,15 +234,15 @@ endr
 	jr .next2
 
 .copywildmonstats
-	ld a, [EnemyMonDVs]
+	ld a, [wEnemyMonDVs]
 	ld [de], a
 	inc de
-	ld a, [EnemyMonDVs + 1]
+	ld a, [wEnemyMonDVs + 1]
 	ld [de], a
 	inc de
 
 	push hl
-	ld hl, EnemyMonPP
+	ld hl, wEnemyMonPP
 	ld b, NUM_MOVES
 .wildmonpploop
 	ld a, [hli]
@@ -262,11 +262,11 @@ endr
 	inc de
 	ld [de], a
 	inc de
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld [de], a
 	inc de
-	ld hl, EnemyMonStatus
-	; Copy EnemyMonStatus
+	ld hl, wEnemyMonStatus
+	; Copy wEnemyMonStatus
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -274,7 +274,7 @@ endr
 	ld a, [hli]
 	ld [de], a
 	inc de
-	; Copy EnemyMonHP
+	; Copy wEnemyMonHP
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -286,7 +286,7 @@ endr
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .generatestats
-	ld hl, EnemyMonMaxHP
+	ld hl, wEnemyMonMaxHP
 	ld bc, 2 * 6 ; MaxHP + 5 Stats
 	call CopyBytes
 	pop hl
@@ -300,14 +300,14 @@ endr
 	call CalcPkmnStats
 
 .next3
-	ld a, [MonType]
+	ld a, [wMonType]
 	and $f
 	jr nz, .done
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr nz, .done
-	ld hl, PartyMon1DVs
-	ld a, [PartyCount]
+	ld hl, wPartyMon1DVs
+	ld a, [wPartyCount]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
@@ -333,13 +333,13 @@ FillPP: ; da6d
 	ld hl, Moves
 	ld bc, MOVE_LENGTH
 	call AddNTimes
-	ld de, StringBuffer1
+	ld de, wStringBuffer1
 	ld a, BANK(Moves)
 	call FarCopyBytes
 	pop bc
 	pop de
 	pop hl
-	ld a, [StringBuffer1 + MOVE_PP]
+	ld a, [wStringBuffer1 + MOVE_PP]
 
 .next
 	ld [de], a
@@ -351,7 +351,7 @@ FillPP: ; da6d
 ; da96
 
 AddTempmonToParty: ; da96
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
 	scf
@@ -362,63 +362,63 @@ AddTempmonToParty: ; da96
 	ld c, a
 	ld b, 0
 	add hl, bc
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [hli], a
 	ld [hl], $ff
 
-	ld hl, PartyMon1Species
-	ld a, [PartyCount]
+	ld hl, wPartyMon1Species
+	ld a, [wPartyCount]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld e, l
 	ld d, h
-	ld hl, TempMonSpecies
+	ld hl, wTempMonSpecies
 	call CopyBytes
 
-	ld hl, PartyMonOT
-	ld a, [PartyCount]
+	ld hl, wPartyMonOT
+	ld a, [wPartyCount]
 	dec a
 	call SkipNames
 	ld d, h
 	ld e, l
-	ld hl, OTPartyMonOT
-	ld a, [CurPartyMon]
+	ld hl, wOTPartyMonOT
+	ld a, [wCurPartyMon]
 	call SkipNames
 	ld bc, NAME_LENGTH
 	call CopyBytes
 
-	ld hl, PartyMonNicknames
-	ld a, [PartyCount]
+	ld hl, wPartyMonNicknames
+	ld a, [wPartyCount]
 	dec a
 	call SkipNames
 	ld d, h
 	ld e, l
-	ld hl, OTPartyMonNicknames
-	ld a, [CurPartyMon]
+	ld hl, wOTPartyMonNicknames
+	ld a, [wCurPartyMon]
 	call SkipNames
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [wNamedObjectIndexBuffer], a
 	cp EGG
 	jr z, .egg
 	dec a
 	call SetSeenAndCaughtMon
-	ld hl, PartyMon1Happiness
-	ld a, [PartyCount]
+	ld hl, wPartyMon1Happiness
+	ld a, [wPartyCount]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld [hl], BASE_HAPPINESS
 .egg
 
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr nz, .done
-	ld hl, PartyMon1DVs
-	ld a, [PartyCount]
+	ld hl, wPartyMon1DVs
+	ld a, [wPartyCount]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
@@ -427,7 +427,7 @@ AddTempmonToParty: ; da96
 	ld a, [wFirstUnownSeen]
 	and a
 	jr nz, .done
-	ld a, [UnownLetter]
+	ld a, [wUnownLetter]
 	ld [wFirstUnownSeen], a
 .done
 
@@ -461,7 +461,7 @@ SendGetPkmnIntoFromBox: ; db3f
 	jp CloseSRAM_And_SetCarryFlag
 
 .check_IfPartyIsFull
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
 	jp z, CloseSRAM_And_SetCarryFlag
@@ -476,23 +476,23 @@ SendGetPkmnIntoFromBox: ; db3f
 	cp DAY_CARE_WITHDRAW
 	ld a, [wBreedMon1Species]
 	jr z, .okay1
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 
 .okay1
 	ld [hli], a
 	ld [hl], $ff
 	ld a, [wPokemonWithdrawDepositParameter]
 	dec a
-	ld hl, PartyMon1Species
+	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	jr nz, .okay2
 	ld hl, sBoxMon1Species
 	ld bc, BOXMON_STRUCT_LENGTH
 	ld a, [sBoxCount]
 
 .okay2
-	dec a ; PartyCount - 1
+	dec a ; wPartyCount - 1
 	call AddNTimes
 
 .breedmon
@@ -507,11 +507,11 @@ SendGetPkmnIntoFromBox: ; db3f
 	cp DAY_CARE_WITHDRAW
 	ld hl, wBreedMon1Species
 	jr z, .okay4
-	ld hl, PartyMon1Species
+	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 
 .okay3
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call AddNTimes
 
 .okay4
@@ -522,8 +522,8 @@ SendGetPkmnIntoFromBox: ; db3f
 	ld de, wBreedMon1OT
 	jr z, .okay5
 	dec a
-	ld hl, PartyMonOT
-	ld a, [PartyCount]
+	ld hl, wPartyMonOT
+	ld a, [wPartyCount]
 	jr nz, .okay6
 	ld hl, sBoxMonOT
 	ld a, [sBoxCount]
@@ -542,10 +542,10 @@ SendGetPkmnIntoFromBox: ; db3f
 	ld hl, wBreedMon1OT
 	cp DAY_CARE_WITHDRAW
 	jr z, .okay8
-	ld hl, PartyMonOT
+	ld hl, wPartyMonOT
 
 .okay7
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call SkipNames
 
 .okay8
@@ -556,8 +556,8 @@ SendGetPkmnIntoFromBox: ; db3f
 	ld de, wBreedMon1Nick
 	jr z, .okay9
 	dec a
-	ld hl, PartyMonNicknames
-	ld a, [PartyCount]
+	ld hl, wPartyMonNicknames
+	ld a, [wPartyCount]
 	jr nz, .okay10
 	ld hl, sBoxMonNicknames
 	ld a, [sBoxCount]
@@ -576,10 +576,10 @@ SendGetPkmnIntoFromBox: ; db3f
 	ld hl, wBreedMon1Nick
 	cp DAY_CARE_WITHDRAW
 	jr z, .okay12
-	ld hl, PartyMonNicknames
+	ld hl, wPartyMonNicknames
 
 .okay11
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call SkipNames
 
 .okay12
@@ -596,11 +596,11 @@ SendGetPkmnIntoFromBox: ; db3f
 	push hl
 	srl a
 	add $2
-	ld [MonType], a
+	ld [wMonType], a
 	predef CopyPkmnToTempMon
 	callfar CalcLevel
 	ld a, d
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	pop hl
 
 	ld b, h
@@ -631,7 +631,7 @@ SendGetPkmnIntoFromBox: ; db3f
 	add hl, bc
 	ld d, h
 	ld e, l
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
 	inc hl
@@ -678,14 +678,14 @@ RestorePPofDepositedPokemon: ; dcb6
 	add hl, bc
 	push hl
 	push bc
-	ld de, TempMonPP
+	ld de, wTempMonPP
 	ld bc, NUM_MOVES
 	call CopyBytes
 	pop bc
 	ld hl, MON_MOVES
 	add hl, bc
 	push hl
-	ld de, TempMonMoves
+	ld de, wTempMonMoves
 	ld bc, NUM_MOVES
 	call CopyBytes
 	pop hl
@@ -693,16 +693,16 @@ RestorePPofDepositedPokemon: ; dcb6
 
 	ld a, [wMenuCursorY]
 	push af
-	ld a, [MonType]
+	ld a, [wMonType]
 	push af
 	ld b, 0
 .loop
 	ld a, [hli]
 	and a
 	jr z, .done
-	ld [TempMonMoves], a
+	ld [wTempMonMoves], a
 	ld a, BOXMON
-	ld [MonType], a
+	ld [wMonType], a
 	ld a, b
 	ld [wMenuCursorY], a
 	push bc
@@ -726,7 +726,7 @@ RestorePPofDepositedPokemon: ; dcb6
 
 .done
 	pop af
-	ld [MonType], a
+	ld [wMonType], a
 	pop af
 	ld [wMenuCursorY], a
 	ret
@@ -734,7 +734,7 @@ RestorePPofDepositedPokemon: ; dcb6
 
 RetrievePokemonFromDayCareMan: ; dd21
 	ld a, [wBreedMon1Species]
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld de, SFX_TRANSACTION
 	call PlaySFX
 	call WaitSFX
@@ -742,7 +742,7 @@ RetrievePokemonFromDayCareMan: ; dd21
 	ld a, b
 	ld [wd002], a
 	ld a, e
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
 	jp Functiondd64
@@ -750,7 +750,7 @@ RetrievePokemonFromDayCareMan: ; dd21
 
 RetrievePokemonFromDayCareLady: ; dd42
 	ld a, [wBreedMon2Species]
-	ld [CurPartySpecies], a
+	ld [wCurPartySpecies], a
 	ld de, SFX_TRANSACTION
 	call PlaySFX
 	call WaitSFX
@@ -758,14 +758,14 @@ RetrievePokemonFromDayCareLady: ; dd42
 	ld a, b
 	ld [wd002], a
 	ld a, e
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
 	jp Functiondd64
 ; dd64
 
 Functiondd64: ; dd64
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
 	jr nz, .room_in_party
@@ -788,11 +788,11 @@ Functiondd64: ; dd64
 
 .okay
 	ld [hli], a
-	ld [CurSpecies], a
+	ld [wCurSpecies], a
 	ld a, $ff
 	ld [hl], a
-	ld hl, PartyMonNicknames
-	ld a, [PartyCount]
+	ld hl, wPartyMonNicknames
+	ld a, [wPartyCount]
 	dec a
 	call SkipNames
 	push hl
@@ -801,8 +801,8 @@ Functiondd64: ; dd64
 	pop de
 	call CopyBytes
 	push hl
-	ld hl, PartyMonOT
-	ld a, [PartyCount]
+	ld hl, wPartyMonOT
+	ld a, [wPartyCount]
 	dec a
 	call SkipNames
 	ld d, h
@@ -820,7 +820,7 @@ Functiondd64: ; dd64
 	ld c, e
 	ld hl, MON_LEVEL
 	add hl, bc
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld [hl], a
 	ld hl, MON_MAXHP
 	add hl, bc
@@ -831,21 +831,21 @@ Functiondd64: ; dd64
 	push bc
 	ld b, $1
 	call CalcPkmnStats
-	ld hl, PartyMon1Moves
-	ld a, [PartyCount]
+	ld hl, wPartyMon1Moves
+	ld a, [wPartyCount]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld a, $1
-	ld [Buffer1], a
+	ld [wBuffer1], a
 	predef FillMoves
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	dec a
-	ld [CurPartyMon], a
+	ld [wCurPartyMon], a
 	farcall HealPartyMon
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld d, a
 	callfar CalcExpAtLevel
 	pop bc
@@ -862,9 +862,9 @@ Functiondd64: ; dd64
 ; de1a
 
 Functionde1a: ; de1a
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	dec a
-	ld hl, PartyMon1Species
+	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
@@ -889,16 +889,16 @@ DepositMonWithDayCareLady: ; de37
 ; de44
 
 DepositBreedmon: ; de44
-	ld a, [CurPartyMon]
-	ld hl, PartyMonNicknames
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMonNicknames
 	call SkipNames
 	call CopyBytes
-	ld a, [CurPartyMon]
-	ld hl, PartyMonOT
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMonOT
 	call SkipNames
 	call CopyBytes
-	ld a, [CurPartyMon]
-	ld hl, PartyMon1Species
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -906,7 +906,7 @@ DepositBreedmon: ; de44
 
 SendPkmnIntoBox: ; de6e
 ; Sends the Pkmn into one of Bills Boxes
-; the data comes mainly from 'EnemyMon:'
+; the data comes mainly from 'wEnemyMon:'
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld de, sBoxCount
@@ -916,8 +916,8 @@ SendPkmnIntoBox: ; de6e
 	inc a
 	ld [de], a
 
-	ld a, [CurPartySpecies]
-	ld [CurSpecies], a
+	ld a, [wCurPartySpecies]
+	ld [wCurSpecies], a
 	ld c, a
 .loop
 	inc de
@@ -932,26 +932,26 @@ SendPkmnIntoBox: ; de6e
 	call GetBaseData
 	call ShiftBoxMon
 
-	ld hl, PlayerName
+	ld hl, wPlayerName
 	ld de, sBoxMonOT
 	ld bc, NAME_LENGTH
 	call CopyBytes
 
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	call GetPokemonName
 
 	ld de, sBoxMonNicknames
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
-	ld hl, EnemyMon
+	ld hl, wEnemyMon
 	ld de, sBoxMon1
 	ld bc, 1 + 1 + NUM_MOVES ; species + item + moves
 	call CopyBytes
 
-	ld hl, PlayerID
+	ld hl, wPlayerID
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -959,7 +959,7 @@ SendPkmnIntoBox: ; de6e
 	ld [de], a
 	inc de
 	push de
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld d, a
 	callfar CalcExpAtLevel
 	pop de
@@ -982,8 +982,8 @@ SendPkmnIntoBox: ; de6e
 	dec b
 	jr nz, .loop2
 
-	ld hl, EnemyMonDVs
-	ld b, 2 + NUM_MOVES ; DVs and PP ; EnemyMonHappiness - EnemyMonDVs
+	ld hl, wEnemyMonDVs
+	ld b, 2 + NUM_MOVES ; DVs and PP ; wEnemyMonHappiness - wEnemyMonDVs
 .loop3
 	ld a, [hli]
 	ld [de], a
@@ -1001,12 +1001,12 @@ SendPkmnIntoBox: ; de6e
 	inc de
 	ld [de], a
 	inc de
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld [de], a
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	dec a
 	call SetSeenAndCaughtMon
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr nz, .not_unown
 	ld hl, sBoxMon1DVs
@@ -1015,12 +1015,12 @@ SendPkmnIntoBox: ; de6e
 
 .not_unown
 	ld hl, sBoxMon1Moves
-	ld de, TempMonMoves
+	ld de, wTempMonMoves
 	ld bc, NUM_MOVES
 	call CopyBytes
 
 	ld hl, sBoxMon1PP
-	ld de, TempMonPP
+	ld de, wTempMonPP
 	ld bc, NUM_MOVES
 	call CopyBytes
 
@@ -1087,11 +1087,11 @@ ShiftBoxMon: ; df47
 ; df8c
 
 GiveEgg:: ; df8c
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	push af
 	callfar GetPreEvolution
 	callfar GetPreEvolution
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	dec a
 
 ; TryAddMonToParty sets Seen and Caught flags
@@ -1113,11 +1113,11 @@ GiveEgg:: ; df8c
 	ld a, c
 	and a
 	jr nz, .skip_caught_flag
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	dec a
 	ld c, a
 	ld d, $0
-	ld hl, PokedexCaught
+	ld hl, wPokedexCaught
 	ld b, RESET_FLAG
 	predef SmallFarFlagAction
 
@@ -1129,53 +1129,53 @@ GiveEgg:: ; df8c
 	ld a, c
 	and a
 	jr nz, .skip_seen_flag
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	dec a
 	ld c, a
 	ld d, $0
-	ld hl, PokedexSeen
+	ld hl, wPokedexSeen
 	ld b, RESET_FLAG
 	predef SmallFarFlagAction
 
 .skip_seen_flag
 	pop af
-	ld [CurPartySpecies], a
-	ld a, [PartyCount]
+	ld [wCurPartySpecies], a
+	ld a, [wPartyCount]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
-	ld hl, PartyMon1Species
+	ld hl, wPartyMon1Species
 	call AddNTimes
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [hl], a
-	ld hl, PartyCount
+	ld hl, wPartyCount
 	ld a, [hl]
 	ld b, 0
 	ld c, a
 	add hl, bc
 	ld a, EGG
 	ld [hl], a
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	dec a
-	ld hl, PartyMonNicknames
+	ld hl, wPartyMonNicknames
 	call SkipNames
 	ld de, String_Egg
 	call CopyName2
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	dec a
-	ld hl, PartyMon1Happiness
+	ld hl, wPartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [wMonStatusFlags]
 	bit 1, a
 	ld a, 1
 	jr nz, .got_init_happiness
-	ld a, [BaseEggSteps]
+	ld a, [wBaseEggSteps]
 
 .got_init_happiness
 	ld [hl], a
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	dec a
-	ld hl, PartyMon1HP
+	ld hl, wPartyMon1HP
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
@@ -1190,7 +1190,7 @@ String_Egg: ; e035
 ; e039
 
 RemoveMonFromPartyOrBox: ; e039
-	ld hl, PartyCount
+	ld hl, wPartyCount
 
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
@@ -1204,7 +1204,7 @@ RemoveMonFromPartyOrBox: ; e039
 	ld a, [hl]
 	dec a
 	ld [hli], a
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	ld c, a
 	ld b, 0
 	add hl, bc
@@ -1217,7 +1217,7 @@ RemoveMonFromPartyOrBox: ; e039
 	ld [hli], a
 	inc a
 	jr nz, .loop
-	ld hl, PartyMonOT
+	ld hl, wPartyMonOT
 	ld d, PARTY_LENGTH - 1
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
@@ -1228,9 +1228,9 @@ RemoveMonFromPartyOrBox: ; e039
 .party
 	; If this is the last mon in our party (box),
 	; shift all the other mons up to close the gap.
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call SkipNames
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	cp d
 	jr nz, .delete_inside
 	ld [hl], -1
@@ -1242,7 +1242,7 @@ RemoveMonFromPartyOrBox: ; e039
 	ld e, l
 	ld bc, MON_NAME_LENGTH
 	add hl, bc
-	ld bc, PartyMonNicknames
+	ld bc, wPartyMonNicknames
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .party2
@@ -1250,7 +1250,7 @@ RemoveMonFromPartyOrBox: ; e039
 .party2
 	call CopyDataUntil
 	; Shift the struct
-	ld hl, PartyMons
+	ld hl, wPartyMons
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
@@ -1258,7 +1258,7 @@ RemoveMonFromPartyOrBox: ; e039
 	ld hl, sBoxMons
 	ld bc, BOXMON_STRUCT_LENGTH
 .party4
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -1273,24 +1273,24 @@ RemoveMonFromPartyOrBox: ; e039
 .party5
 	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
-	ld bc, PartyMonOT
+	ld bc, wPartyMonOT
 .copy
 	call CopyDataUntil
 	; Shift the nicknames
-	ld hl, PartyMonNicknames
+	ld hl, wPartyMonNicknames
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .party6
 	ld hl, sBoxMonNicknames
 .party6
 	ld bc, MON_NAME_LENGTH
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld bc, MON_NAME_LENGTH
 	add hl, bc
-	ld bc, PartyMonNicknamesEnd
+	ld bc, wPartyMonNicknamesEnd
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .party7
@@ -1309,8 +1309,8 @@ RemoveMonFromPartyOrBox: ; e039
 	ld a, BANK(sPartyMail)
 	call GetSRAMBank
 	; If this is the last mon in our party, no need to shift mail.
-	ld hl, PartyCount
-	ld a, [CurPartyMon]
+	ld hl, wPartyCount
+	ld a, [wCurPartyMon]
 	cp [hl]
 	jr z, .close_sram
 	; Shift our mail messages up.
@@ -1320,7 +1320,7 @@ RemoveMonFromPartyOrBox: ; e039
 	push hl
 	add hl, bc
 	pop de
-	ld a, [CurPartyMon]
+	ld a, [wCurPartyMon]
 	ld b, a
 .loop2
 	push bc
@@ -1334,7 +1334,7 @@ RemoveMonFromPartyOrBox: ; e039
 	pop de
 	pop bc
 	inc b
-	ld a, [PartyCount]
+	ld a, [wPartyCount]
 	cp b
 	jr nz, .loop2
 .close_sram
@@ -1350,7 +1350,7 @@ ComputeNPCTrademonStats: ; e134
 	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld a, [hl]
-	ld [CurSpecies], a
+	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, MON_MAXHP
 	call GetPartyParamLocation
@@ -1375,7 +1375,7 @@ ComputeNPCTrademonStats: ; e134
 CalcPkmnStats: ; e167
 ; Calculates all 6 Stats of a Pkmn
 ; b: Take into account stat EXP if TRUE
-; 'c' counts from 1-6 and points with 'BaseStats' to the base value
+; 'c' counts from 1-6 and points with 'wBaseStats' to the base value
 ; hl is the path to the Stat EXP
 ; results in $ffb5 and $ffb6 are saved in [de]
 
@@ -1409,7 +1409,7 @@ CalcPkmnStatC: ; e17b
 	ld a, b
 	ld d, a
 	push hl
-	ld hl, BaseStats
+	ld hl, wBaseStats
 	dec hl ; has to be decreased, because 'c' begins with 1
 	ld b, $0
 	add hl, bc
@@ -1527,7 +1527,7 @@ CalcPkmnStatC: ; e17b
 	ld [hMultiplicand + 1], a
 	xor a
 	ld [hMultiplicand + 0], a
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld [hMultiplier], a
 	call Multiply
 	ld a, [hProduct + 1]
@@ -1545,7 +1545,7 @@ CalcPkmnStatC: ; e17b
 	cp STAT_HP
 	ld a, STAT_MIN_NORMAL
 	jr nz, .not_hp
-	ld a, [CurPartyLevel]
+	ld a, [wCurPartyLevel]
 	ld b, a
 	ld a, [hQuotient + 2]
 	add b
@@ -1595,13 +1595,13 @@ GivePoke:: ; e277
 	push de
 	push bc
 	xor a ; PARTYMON
-	ld [MonType], a
+	ld [wMonType], a
 	call TryAddMonToParty
 	jr nc, .failed
-	ld hl, PartyMonNicknames
-	ld a, [PartyCount]
+	ld hl, wPartyMonNicknames
+	ld a, [wPartyCount]
 	dec a
-	ld [CurPartyMon], a
+	ld [wCurPartyMon], a
 	call SkipNames
 	ld d, h
 	ld e, l
@@ -1611,27 +1611,27 @@ GivePoke:: ; e277
 	push bc
 	push de
 	push af
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	and a
 	jr z, .done
-	ld a, [CurPartyMon]
-	ld hl, PartyMon1Item
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMon1Item
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	ld [hl], a
 	jr .done
 
 .failed
-	ld a, [CurPartySpecies]
-	ld [TempEnemyMonSpecies], a
+	ld a, [wCurPartySpecies]
+	ld [wTempEnemyMonSpecies], a
 	callfar LoadEnemyMon
 	call SendPkmnIntoBox
 	jp nc, .FailedToGiveMon
 	ld a, BOXMON
-	ld [MonType], a
+	ld [wMonType], a
 	xor a
-	ld [CurPartyMon], a
+	ld [wCurPartyMon], a
 	ld de, wMonOrItemNameBuffer
 	pop bc
 	ld a, b
@@ -1639,18 +1639,18 @@ GivePoke:: ; e277
 	push bc
 	push de
 	push af
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	and a
 	jr z, .done
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	ld [sBoxMon1Item], a
 
 .done
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld [wd265], a
-	ld [TempEnemyMonSpecies], a
+	ld [wTempEnemyMonSpecies], a
 	call GetPokemonName
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	ld de, wMonOrItemNameBuffer
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
@@ -1662,15 +1662,15 @@ GivePoke:: ; e277
 	pop hl
 	push bc
 	push hl
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call GetFarHalfword
 	ld bc, MON_NAME_LENGTH
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call FarCopyBytes
 	pop hl
 	inc hl
 	inc hl
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call GetFarHalfword
 	pop bc
 	ld a, b
@@ -1680,26 +1680,26 @@ GivePoke:: ; e277
 	jr nz, .send_to_box
 
 	push hl
-	ld a, [CurPartyMon]
-	ld hl, PartyMonOT
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMonOT
 	call SkipNames
 	ld d, h
 	ld e, l
 	pop hl
 .otnameloop
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call GetFarByte
 	ld [de], a
 	inc hl
 	inc de
 	cp "@"
 	jr nz, .otnameloop
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call GetFarByte
 	ld b, a
 	push bc
-	ld a, [CurPartyMon]
-	ld hl, PartyMon1ID
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMon1ID
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, HIGH(01001)
@@ -1714,14 +1714,14 @@ GivePoke:: ; e277
 	call GetSRAMBank
 	ld de, sBoxMonOT
 .loop
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call GetFarByte
 	ld [de], a
 	inc hl
 	inc de
 	cp "@"
 	jr nz, .loop
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	call GetFarByte
 	ld b, a
 	ld hl, sBoxMon1ID
@@ -1793,7 +1793,7 @@ InitNickname: ; e3de
 	ld b, $0
 	farcall NamingScreen
 	pop hl
-	ld de, StringBuffer1
+	ld de, wStringBuffer1
 	call InitName
 	ld a, $4 ; ExitAllMenus is in bank 0, XXX could this be in bank 4 in pokered?
 	ld hl, ExitAllMenus