7 files changed, 36 insertions, 36 deletions
diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm
index a48322488..efee45e59 100644
--- a/engine/menus/debug.asm
+++ b/engine/menus/debug.asm
@@ -311,9 +311,9 @@ Function81adb:
 	ld a, [wcf66]
 	inc a
 	ld [wCurPartySpecies], a
-	ld [wd265], a
+	ld [wDeciramBuffer], a
 	hlcoord 0, 1
-	ld de, wd265
+	ld de, wDeciramBuffer
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 3
 	call PrintNum
 	ld a, [wd002]
@@ -353,7 +353,7 @@ Function81adb:
 	jr .asm_81ba9
 
 .asm_81b7a
-	ld a, [wd265]
+	ld a, [wDeciramBuffer]
 	ld [wTrainerClass], a
 	callfar GetTrainerAttributes
 	ld de, wStringBuffer1
@@ -738,9 +738,9 @@ Function81df4:
 	call Function81e5e
 	ld a, [wd004]
 	inc a
-	ld [wd265], a
+	ld [wTempTMHM], a
 	predef GetTMHMMove
-	ld a, [wd265]
+	ld a, [wTempTMHM]
 	ld [wPutativeTMHMMove], a
 	call GetMoveName
 	hlcoord 10, 12
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 9652dd73e..4e145664a 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -593,7 +593,7 @@ Continue_DisplayBadgeCount:
 	ld b, 2
 	call CountSetBits
 	pop hl
-	ld de, wd265
+	ld de, wNumSetBits
 	lb bc, 1, 2
 	jp PrintNum
 
@@ -610,7 +610,7 @@ else
 endc
 	call CountSetBits
 	pop hl
-	ld de, wd265
+	ld de, wNumSetBits
 	lb bc, 1, 3
 	jp PrintNum
 
diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm
index b039b590f..94732d60b 100644
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -170,7 +170,7 @@ StartMenu_PrintBugContestStatus:
 	and a
 	ld de, .None
 	jr z, .no_contest_mon
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 
 .no_contest_mon
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 8a8303067..aa8ccddf8 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -84,13 +84,13 @@ NamingScreen:
 
 .Pokemon:
 	ld a, [wCurPartySpecies]
-	ld [wd265], a
+	ld [wTempIconSpecies], a
 	ld hl, LoadMenuMonIcon
 	ld a, BANK(LoadMenuMonIcon)
-	ld e, $1
-	rst FarCall ;  ; indirect jump to LoadMenuMonIcon (8e83f (23:683f))
+	ld e, MONICON_NAMINGSCREEN
+	rst FarCall
 	ld a, [wCurPartySpecies]
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	hlcoord 5, 2
 	call PlaceString
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 3813cd55a..ad9f0b5b2 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -133,12 +133,12 @@ StartMoveMonWOMail_SaveGame:
 	ret
 
 PauseGameLogic:
-	ld a, $1
+	ld a, TRUE
 	ld [wGameLogicPaused], a
 	ret
 
 ResumeGameLogic:
-	xor a
+	xor a ; FALSE
 	ld [wGameLogicPaused], a
 	ret
 
@@ -230,13 +230,13 @@ _SavingDontTurnOffThePower:
 SavedTheGame:
 	call _SaveGameData
 	; wait 32 frames
-	ld c, $20
+	ld c, 32
 	call DelayFrames
 	; copy the original text speed setting to the stack
 	ld a, [wOptions]
 	push af
-	; set text speed super slow
-	ld a, 3
+	; set text speed to medium
+	ld a, TEXT_DELAY_MED
 	ld [wOptions], a
 	; <PLAYER> saved the game!
 	ld hl, Text_PlayerSavedTheGame
@@ -248,7 +248,7 @@ SavedTheGame:
 	call WaitPlaySFX
 	call WaitSFX
 	; wait 30 frames
-	ld c, $1e
+	ld c, 30
 	call DelayFrames
 	ret
 
@@ -332,8 +332,8 @@ SavingDontTurnOffThePower:
 	; Save the text speed setting to the stack
 	ld a, [wOptions]
 	push af
-	; Set the text speed to super slow
-	ld a, $3
+	; Set the text speed to medium
+	ld a, TEXT_DELAY_MED
 	ld [wOptions], a
 	; SAVING... DON'T TURN OFF THE POWER.
 	ld hl, Text_SavingDontTurnOffThePower
@@ -342,7 +342,7 @@ SavingDontTurnOffThePower:
 	pop af
 	ld [wOptions], a
 	; Wait for 16 frames
-	ld c, $10
+	ld c, 16
 	call DelayFrames
 	ret
 
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 54f468497..f6854740e 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -639,7 +639,7 @@ CantUseItemText:
 
 PartyMonItemName:
 	ld a, [wCurItem]
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
 	call CopyName1
 	ret
@@ -842,17 +842,17 @@ TryGiveItemToPartymon:
 	ret
 
 .already_holding_item
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
 	ld hl, SwitchAlreadyHoldingText
 	call StartMenuYesNo
 	jr c, .abort
 
 	call GiveItemToPokemon
-	ld a, [wd265]
+	ld a, [wNamedObjectIndexBuffer]
 	push af
 	ld a, [wCurItem]
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	pop af
 	ld [wCurItem], a
 	call ReceiveItemFromPokemon
@@ -860,13 +860,13 @@ TryGiveItemToPartymon:
 
 	ld hl, TookAndMadeHoldText
 	call MenuTextBoxBackup
-	ld a, [wd265]
+	ld a, [wNamedObjectIndexBuffer]
 	ld [wCurItem], a
 	call GivePartyItem
 	ret
 
 .bag_full
-	ld a, [wd265]
+	ld a, [wNamedObjectIndexBuffer]
 	ld [wCurItem], a
 	call ReceiveItemFromPokemon
 	ld hl, ItemStorageIsFullText
@@ -901,7 +901,7 @@ TakePartyItem:
 	farcall ItemIsMail
 	call GetPartyItemLocation
 	ld a, [hl]
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	ld [hl], NO_ITEM
 	call GetItemName
 	ld hl, TookFromText
@@ -1654,8 +1654,8 @@ SetUpMoveScreenBG:
 	ld hl, wPartySpecies
 	add hl, de
 	ld a, [hl]
-	ld [wd265], a
-	ld e, $2
+	ld [wTempIconSpecies], a
+	ld e, MONICON_MOVES
 	farcall LoadMenuMonIcon
 	hlcoord 0, 1
 	ld b, 9
@@ -1724,7 +1724,7 @@ PrepareToPlaceMoveData:
 	ld b, $0
 	add hl, bc
 	ld a, [hl]
-	ld [wCurMove], a
+	ld [wCurSpecies], a
 	hlcoord 1, 12
 	lb bc, 5, 18
 	jp ClearBox
@@ -1741,11 +1741,11 @@ PlaceMoveData:
 	hlcoord 12, 12
 	ld de, String_MoveAtk
 	call PlaceString
-	ld a, [wCurMove]
+	ld a, [wCurSpecies]
 	ld b, a
 	hlcoord 2, 12
 	predef PrintMoveType
-	ld a, [wCurMove]
+	ld a, [wCurSpecies]
 	dec a
 	ld hl, Moves + MOVE_POWER
 	ld bc, MOVE_LENGTH
@@ -1755,8 +1755,8 @@ PlaceMoveData:
 	hlcoord 16, 12
 	cp 2
 	jr c, .no_power
-	ld [wd265], a
-	ld de, wd265
+	ld [wDeciramBuffer], a
+	ld de, wDeciramBuffer
 	lb bc, 1, 3
 	call PrintNum
 	jr .description
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index f48636f67..a1b7fcd64 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -276,7 +276,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime:
 	ld hl, wPokedexCaught
 	ld b, wEndPokedexCaught - wPokedexCaught
 	call CountSetBits
-	ld de, wd265
+	ld de, wNumSetBits
 	hlcoord 15, 10
 	lb bc, 1, 3
 	call PrintNum