Identify wcd6d as wNameBuffer and others (#455)

21 files changed, 52 insertions, 50 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index ab4d1c56..ae399a01 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2878,7 +2878,7 @@ PrintMenuItem:
 	add hl, bc
 	ld a, [hl]
 	and $3f
-	ld [wcd6d], a
+	ld [wBattleMenuCurrentPP], a
 ; print TYPE/<type> and <curPP>/<maxPP>
 	hlcoord 1, 9
 	ld de, TypeText
@@ -2888,7 +2888,7 @@ PrintMenuItem:
 	hlcoord 5, 9
 	ld [hl], "/"
 	hlcoord 5, 11
-	ld de, wcd6d
+	ld de, wBattleMenuCurrentPP
 	lb bc, 1, 2
 	call PrintNumber
 	hlcoord 8, 11
@@ -5631,7 +5631,7 @@ EnemyCanExecuteChargingMove:
 	ld a, MOVE_NAME
 	ld [wNameListType], a
 	call GetName
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call CopyToStringBuffer
 EnemyCanExecuteMove:
 	xor a
@@ -6111,7 +6111,7 @@ GetCurrentMove:
 	ld a, MOVE_NAME
 	ld [wNameListType], a
 	call GetName
-	ld de, wcd6d
+	ld de, wNameBuffer
 	jp CopyToStringBuffer
 
 LoadEnemyMonData:
@@ -6247,7 +6247,7 @@ LoadEnemyMonData:
 	ld a, [wEnemyMonSpecies2]
 	ld [wd11e], a
 	call GetMonName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld de, wEnemyMonNick
 	ld bc, NAME_LENGTH
 	call CopyData
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm
index b2daebfe..82be49e0 100644
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -17,8 +17,8 @@ GetTrainerName_::
 	ld a, BANK(TrainerNames)
 	ld [wPredefBank], a
 	call GetName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 .foundName
 	ld de, wTrainerName
-	ld bc, $d
+	ld bc, ITEM_NAME_LENGTH
 	jp CopyData
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 4feef343..fe784dd6 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -14,10 +14,10 @@ FormatMovesString:
 	ld a, MOVE_NAME
 	ld [wNameListType], a
 	call GetName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 .copyNameLoop
 	ld a, [hli]
-	cp $50
+	cp "@"
 	jr z, .doneCopyingName
 	ld [de], a
 	inc de
@@ -26,7 +26,7 @@ FormatMovesString:
 	ld a, b
 	ld [wNumMovesMinusOne], a
 	inc b
-	ld a, $4e ; line break
+	ld a, "<NEXT>"
 	ld [de], a
 	inc de
 	pop hl
@@ -42,7 +42,7 @@ FormatMovesString:
 	ld a, b
 	cp NUM_MOVES
 	jr z, .done
-	ld a, $4e ; line break
+	ld a, "<NEXT>"
 	ld [de], a
 	inc de
 	jr .printDashLoop
diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm
index fa373038..9aab3feb 100644
--- a/engine/battle/move_effects/pay_day.asm
+++ b/engine/battle/move_effects/pay_day.asm
@@ -1,6 +1,6 @@
 PayDayEffect_:
 	xor a
-	ld hl, wcd6d
+	ld hl, wPayDayMoney
 	ld [hli], a
 	ldh a, [hWhoseTurn]
 	and a
@@ -21,7 +21,7 @@ PayDayEffect_:
 	ld b, $4
 	call Divide
 	ldh a, [hQuotient + 3]
-	ld [hli], a
+	ld [hli], a ; wPayDayMoney + 1
 	ldh a, [hRemainder]
 	ldh [hDividend + 3], a
 	ld a, 10
@@ -33,7 +33,7 @@ PayDayEffect_:
 	ld b, a
 	ldh a, [hRemainder]
 	add b
-	ld [hl], a
+	ld [hl], a ; wPayDayMoney + 2
 	ld de, wTotalPayDayMoney + 2
 	ld c, $3
 	predef AddBCDPredef
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 4d40fd82..b25d5a11 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -9,7 +9,7 @@ SaveTrainerName::
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wcd6d
+	ld de, wNameBuffer
 .CopyCharacter
 	ld a, [hli]
 	ld [de], a
diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm
index eb82a5b1..171fa99a 100644
--- a/engine/events/cinnabar_lab.asm
+++ b/engine/events/cinnabar_lab.asm
@@ -104,7 +104,7 @@ PrintFossilsInBag:
 	ldh a, [hItemCounter]
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call PlaceString
 	ld hl, hItemCounter
 	inc [hl]
diff --git a/engine/events/heal_party.asm b/engine/events/heal_party.asm
index b26bc90f..0c6ec1ea 100644
--- a/engine/events/heal_party.asm
+++ b/engine/events/heal_party.asm
@@ -37,10 +37,10 @@ HealParty:
 	ld hl, Moves
 	ld bc, MOVE_LENGTH
 	call AddNTimes
-	ld de, wcd6d
+	ld de, wMoveData
 	ld a, BANK(Moves)
 	call FarCopyData
-	ld a, [wcd6d + 5] ; PP is byte 5 of move data
+	ld a, [wMoveData + MOVE_PP]
 
 	pop bc
 	pop de
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index 54588e7d..c62225ba 100644
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
@@ -79,7 +79,7 @@ InGameTrade_GetMonName:
 	push de
 	ld [wd11e], a
 	call GetMonName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	pop de
 	ld bc, NAME_LENGTH
 	jp CopyData
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index e771504d..0c339451 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -2493,10 +2493,10 @@ GetMaxPP:
 	ld hl, Moves
 	ld bc, MOVE_LENGTH
 	call AddNTimes
-	ld de, wcd6d
+	ld de, wMoveData
 	ld a, BANK(Moves)
 	call FarCopyData
-	ld de, wcd6d + 5 ; PP is byte 5 of move data
+	ld de, wMoveData + MOVE_PP
 	ld a, [de]
 	ld b, a ; b = normal max PP
 	pop hl
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index ccbe0225..a9840268 100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -1,5 +1,7 @@
 DEF NOT_VISITED EQU $fe
 
+DEF BIRD_BASE_TILE EQU $04
+
 DisplayTownMap:
 	call LoadTownMap
 	ld hl, wUpdateSpritesEnabled
@@ -12,15 +14,15 @@ DisplayTownMap:
 	ld a, [wCurMap]
 	push af
 	ld b, $0
-	call DrawPlayerOrBirdSprite ; player sprite
+	call DrawPlayerOrBirdSprite
 	hlcoord 1, 0
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call PlaceString
 	ld hl, wShadowOAM
 	ld de, wTileMapBackup
 	ld bc, $10
 	call CopyData
-	ld hl, vSprites tile $04
+	ld hl, vSprites tile BIRD_BASE_TILE
 	ld de, TownMapCursor
 	lb bc, BANK(TownMapCursor), (TownMapCursorEnd - TownMapCursor) / $8
 	call CopyVideoDataDouble
@@ -50,15 +52,15 @@ DisplayTownMap:
 	ld hl, wShadowOAMSprite04
 	call WriteTownMapSpriteOAM ; town map cursor sprite
 	pop hl
-	ld de, wcd6d
+	ld de, wNameBuffer
 .copyMapName
 	ld a, [hli]
 	ld [de], a
 	inc de
-	cp $50
+	cp "@"
 	jr nz, .copyMapName
 	hlcoord 1, 0
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call PlaceString
 	ld hl, wShadowOAMSprite04
 	ld de, wTileMapBackup + 16
@@ -142,7 +144,7 @@ LoadTownMap_Fly::
 	call LoadPlayerSpriteGraphics
 	call LoadFontTilePatterns
 	ld de, BirdSprite
-	ld hl, vSprites tile $04
+	ld hl, vSprites tile BIRD_BASE_TILE
 	lb bc, BANK(BirdSprite), 12
 	call CopyVideoData
 	ld de, TownMapUpArrow
@@ -173,10 +175,10 @@ LoadTownMap_Fly::
 	call ClearScreenArea
 	pop hl
 	ld a, [hl]
-	ld b, $4
-	call DrawPlayerOrBirdSprite ; draw bird sprite
+	ld b, BIRD_BASE_TILE
+	call DrawPlayerOrBirdSprite
 	hlcoord 3, 0
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call PlaceString
 	ld c, 15
 	call DelayFrames
@@ -356,7 +358,7 @@ DrawPlayerOrBirdSprite:
 	call TownMapCoordsToOAMCoords
 	call WritePlayerOrBirdSpriteOAM
 	pop hl
-	ld de, wcd6d
+	ld de, wNameBuffer
 .loop
 	ld a, [hli]
 	ld [de], a
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index e5796e53..9dd66de5 100644
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -699,7 +699,7 @@ TradeCenter_Trade:
 	ld a, [hl]
 	ld [wd11e], a
 	call GetMonName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld de, wNameOfPlayerMonToBeTraded
 	ld bc, NAME_LENGTH
 	call CopyData
diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm
index 08ff22e4..27bccbb5 100644
--- a/engine/menus/league_pc.asm
+++ b/engine/menus/league_pc.asm
@@ -89,7 +89,7 @@ LeaguePCShowMon:
 	ld [wWholeScreenPaletteMonSpecies], a
 	ld a, [hli]
 	ld [wHoFMonLevel], a
-	ld de, wcd6d
+	ld de, wNameBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
 	ld b, SET_PAL_POKEMON_WHOLE_SCREEN
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index f5120518..85447300 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -45,7 +45,7 @@ AskName:
 .declinedNickname
 	ld d, h
 	ld e, l
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld bc, NAME_LENGTH
 	jp CopyData
 
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 50a9838c..6c8cd6eb 100644
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -121,19 +121,19 @@ RedrawPartyMenu_::
 	rl b
 	ld c, a
 	add hl, bc
-	ld de, wcd6d
+	ld de, wEvoDataBuffer
 	ld a, BANK(EvosMovesPointerTable)
 	ld bc, 2
 	call FarCopyData
-	ld hl, wcd6d
+	ld hl, wEvoDataBuffer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wcd6d
+	ld de, wEvoDataBuffer
 	ld a, BANK(EvosMovesPointerTable)
 	ld bc, 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
 	call FarCopyData
-	ld hl, wcd6d
+	ld hl, wEvoDataBuffer
 	ld de, .notAbleToEvolveText
 ; loop through the pokemon's evolution entries
 .checkEvolutionsLoop
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index d37d95f8..6dd9aab1 100644
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -165,7 +165,7 @@ HoFDisplayMonInfo:
 	ld de, HoFMonInfoText
 	call PlaceString
 	hlcoord 1, 4
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call PlaceString
 	ld a, [wHoFMonLevel]
 	hlcoord 8, 7
@@ -275,7 +275,7 @@ HoFRecordMonInfo:
 	ld [hli], a
 	ld e, l
 	ld d, h
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld bc, NAME_LENGTH
 	jp CopyData
 
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 95ebcabe..40c75f62 100644
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -72,7 +72,7 @@ OakSpeechSlidePicLeft:
 	ld c, 10
 	call DelayFrames
 	pop de
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
 	call Delay3
@@ -209,7 +209,7 @@ GetDefaultName:
 .foundName
 	ld h, d
 	ld l, e
-	ld de, wcd6d
+	ld de, wNameBuffer
 	ld bc, NAME_BUFFER_LENGTH
 	jp CopyData
 
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index 9d168cc7..931538c0 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -188,7 +188,7 @@ LoadTradingGFXAndMonNames:
 	ld a, [wTradedPlayerMonSpecies]
 	ld [wd11e], a
 	call GetMonName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld de, wStringBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm
index 98d1158e..a564862b 100644
--- a/engine/movie/trade2.asm
+++ b/engine/movie/trade2.asm
@@ -32,7 +32,7 @@ Trade_PrintEnemyMonInfoText:
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	hlcoord 5, 12
-	ld de, wcd6d
+	ld de, wNameBuffer
 	call PlaceString
 	hlcoord 8, 14
 	ld de, wTradedEnemyMonOT
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm
index 0b7fb96c..73ba8071 100644
--- a/engine/pokemon/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
@@ -261,13 +261,13 @@ AddPartyMon_WriteMovePP:
 	ld hl, Moves
 	ld bc, MOVE_LENGTH
 	call AddNTimes
-	ld de, wcd6d
+	ld de, wMoveData
 	ld a, BANK(Moves)
 	call FarCopyData
 	pop bc
 	pop de
 	pop hl
-	ld a, [wcd6d + 5] ; PP is byte 5 of move data
+	ld a, [wMoveData + MOVE_PP]
 .empty
 	inc de
 	ld [de], a
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index fa6930c1..1c7c328c 100644
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -267,7 +267,7 @@ RenameEvolvedMon:
 	call GetName
 	pop af
 	ld [wd0b5], a
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld de, wStringBuffer
 .compareNamesLoop
 	ld a, [de]
@@ -283,7 +283,7 @@ RenameEvolvedMon:
 	call AddNTimes
 	push hl
 	call GetName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	pop de
 	jp CopyData
 
diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm
index 0377caa4..981fe13a 100644
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -3,7 +3,7 @@ LearnMove:
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks
 	call GetPartyMonName
-	ld hl, wcd6d
+	ld hl, wNameBuffer
 	ld de, wLearnMoveMonName
 	ld bc, NAME_LENGTH
 	call CopyData