commented menu stuff

12 files changed, 93 insertions, 93 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 64a8d44e..c6cc5734 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -98,7 +98,7 @@ SpecialEffectsCont: ; 3c049 (f:4049)
 
 SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c)
 	call LoadPlayerBackPic
-	ld a, $1 ; the usual text box at the bottom of the screen
+	ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	hlCoord 1, 5
@@ -1137,7 +1137,7 @@ DoUseNextMonDialogue: ; 3c79b (f:479b)
 .displayYesNoBox
 	hlCoord 13, 9
 	ld bc, $a0e
-	ld a, $14 ; yes/no text box
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	ld a, [wd12e]
@@ -1454,7 +1454,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a)
 	call PrintText
 	hlCoord 0, 7
 	ld bc,$0801
-	ld a,$14
+	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID
 	ld a,[wCurrentMenuItem]
@@ -2080,9 +2080,9 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
 .nonstandardbattle
 	ld a, [W_BATTLETYPE]
 	cp $2 ; safari
-	ld a, $b ; safari menu id
+	ld a, BATTLE_MENU_TEMPLATE
 	jr nz, .menuselected
-	ld a, $1b ; regular menu id
+	ld a, SAFARI_BATTLE_MENU_TEMPLATE
 .menuselected
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
@@ -2402,7 +2402,7 @@ PartyMenuOrRockOrRun:
 	call GoBackToPartyMenu
 	jr .checkIfPartyMonWasSelected
 .partyMonWasSelected
-	ld a, $c ; switch/stats/cancel menu
+	ld a, SWITCH_STATS_CANCEL_MENU_TEMPLATE
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	ld hl, wTopMenuItemY
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index f1278c83..92a4e33b 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -716,7 +716,7 @@ TradeCenter_Trade:
 	ld bc, $080b
 	ld a, TRADE_CANCEL_MENU
 	ld [wTwoOptionMenuID], a
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	call LoadScreenTilesFromBuffer1
diff --git a/engine/clear_save.asm b/engine/clear_save.asm
index 8fde1f0c..c1140531 100755
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -9,10 +9,10 @@ Func_1c98a: ; 1c98a (7:498a)
 	ld bc, $80f
 	ld a, NO_YES_MENU
 	ld [wTwoOptionMenuID], a
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	and a
 	jp z, Init
 	callba Func_73b6a
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index e0e38a2a..9dbcbf98 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -66,7 +66,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
 	xor a
 	ld [hWY], a
 	call SaveScreenTilesToBuffer1
-	ld a, $11
+	ld a, MON_SPRITE_POPUP
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	call UpdateSprites
diff --git a/engine/items/items.asm b/engine/items/items.asm
index d8b7f9e3..05f77175 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -2097,7 +2097,7 @@ ItemUseTMHM: ; e479 (3:6479)
 	call PrintText
 	hlCoord 14, 7
 	ld bc,$080f
-	ld a,$14
+	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; yes/no menu
 	ld a,[wCurrentMenuItem]
@@ -2488,7 +2488,7 @@ TossItem_: ; e6f1 (3:66f1)
 	call PrintText
 	hlCoord 14, 7
 	ld bc,$080f
-	ld a,$14
+	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; yes/no menu
 	ld a,[wd12e]
diff --git a/engine/learn_move.asm b/engine/learn_move.asm
index 5dab5748..f96c1aeb 100755
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -1,7 +1,7 @@
 LearnMove: ; 6e43 (1:6e43)
 	call SaveScreenTilesToBuffer1
-	ld a, [wWhichPokemon] ; wWhichPokemon
-	ld hl, wPartyMonNicks ; wPartyMonNicks
+	ld a, [wWhichPokemon]
+	ld hl, wPartyMonNicks
 	call GetPartyMonName
 	ld hl, wcd6d
 	ld de, wd036
@@ -9,9 +9,9 @@ LearnMove: ; 6e43 (1:6e43)
 	call CopyData
 
 DontAbandonLearning: ; 6e5b (1:6e5b)
-	ld hl, wPartyMon1Moves ; wPartyMon1Moves
+	ld hl, wPartyMon1Moves
 	ld bc, $2c
-	ld a, [wWhichPokemon] ; wWhichPokemon
+	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -43,7 +43,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
 	push hl
 	push de
 	dec a
-	ld hl, Moves ; $4000
+	ld hl, Moves
 	ld bc, $6
 	call AddNTimes
 	ld de, wHPBarMaxHP
@@ -53,12 +53,12 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
 	pop de
 	pop hl
 	ld [hl], a
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	and a
 	jp z, PrintLearnedMove
-	ld a, [wWhichPokemon] ; wWhichPokemon
+	ld a, [wWhichPokemon]
 	ld b, a
-	ld a, [wPlayerMonNumber] ; wPlayerMonNumber
+	ld a, [wPlayerMonNumber]
 	cp b
 	jp nz, PrintLearnedMove
 	ld h, d
@@ -68,7 +68,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
 	call CopyData
 	ld bc, $11
 	add hl, bc
-	ld de, wBattleMonPP ; wBattleMonPP
+	ld de, wBattleMonPP
 	ld bc, $4
 	call CopyData
 	jp PrintLearnedMove
@@ -78,10 +78,10 @@ AbandonLearning: ; 6eda (1:6eda)
 	call PrintText
 	hlCoord 14, 7
 	ld bc, $80f
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
-	call DisplayTextBoxID
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	call DisplayTextBoxID ; yes/no menu
+	ld a, [wCurrentMenuItem]
 	and a
 	jp nz, DontAbandonLearning
 	ld hl, DidNotLearnText
@@ -101,11 +101,11 @@ TryingToLearn: ; 6f07 (1:6f07)
 	call PrintText
 	hlCoord 14, 7
 	ld bc, $80f
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
-	call DisplayTextBoxID
+	call DisplayTextBoxID ; yes/no menu
 	pop hl
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	rra
 	ret c
 	ld bc, $fffc
@@ -133,7 +133,7 @@ TryingToLearn: ; 6f07 (1:6f07)
 	ld a, [$fff6]
 	res 2, a
 	ld [$fff6], a
-	ld hl, wTopMenuItemY ; wTopMenuItemY
+	ld hl, wTopMenuItemY
 	ld a, $8
 	ld [hli], a
 	ld a, $5
@@ -158,7 +158,7 @@ TryingToLearn: ; 6f07 (1:6f07)
 	bit 1, a
 	jr nz, .asm_6fab
 	push hl
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	ld c, a
 	ld b, $0
 	add hl, bc
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 5d338628..7506c849 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -2,7 +2,7 @@ AskName: ; 64eb (1:64eb)
 	call SaveScreenTilesToBuffer1
 	call GetPredefRegisters
 	push hl
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	dec a
 	ld hl, wTileMap
 	ld b, $4
@@ -15,11 +15,11 @@ AskName: ; 64eb (1:64eb)
 	call PrintText
 	hlCoord 14, 7
 	ld bc, $80f
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	pop hl
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .asm_654c
 	ld a, [wUpdateSpritesEnabled]
@@ -30,7 +30,7 @@ AskName: ; 64eb (1:64eb)
 	ld a, $2
 	ld [wd07d], a
 	call DisplayNamingScreen
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	and a
 	jr nz, .asm_653e
 	call ReloadMapSpriteTilePatterns
@@ -66,9 +66,9 @@ Func_655c: ; 655c (1:655c)
 	ld a, [wcf4b]
 	cp $50
 	jr z, .asm_6594
-	ld hl, wPartyMonNicks ; wPartyMonNicks
+	ld hl, wPartyMonNicks
 	ld bc, $b
-	ld a, [wWhichPokemon] ; wWhichPokemon
+	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld e, l
 	ld d, h
@@ -99,22 +99,22 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call TextBoxBorder
 	call PrintNamingText
 	ld a, $3
-	ld [wTopMenuItemY], a ; wTopMenuItemY
+	ld [wTopMenuItemY], a
 	ld a, $1
-	ld [wTopMenuItemX], a ; wTopMenuItemX
-	ld [wLastMenuItem], a ; wLastMenuItem
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wTopMenuItemX], a
+	ld [wLastMenuItem], a
+	ld [wCurrentMenuItem], a
 	ld a, $ff
-	ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
+	ld [wMenuWatchedKeys], a
 	ld a, $7
-	ld [wMaxMenuItem], a ; wMaxMenuItem
+	ld [wMaxMenuItem], a
 	ld a, $50
 	ld [wcf4b], a
 	xor a
 	ld hl, wHPBarMaxHP + 1
 	ld [hli], a
 	ld [hli], a
-	ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
+	ld [W_SUBANIMTRANSFORM], a
 .asm_65ed
 	call PrintAlphabet
 	call GBPalNormal
@@ -126,16 +126,16 @@ DisplayNamingScreen: ; 6596 (1:6596)
 .asm_65fc
 	call PlaceMenuCursor
 .asm_65ff
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	push af
 	callba AnimatePartyMon_ForceSpeed1
 	pop af
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wCurrentMenuItem], a
 	call JoypadLowSensitivity
 	ld a, [hJoyPressed]
 	and a
 	jr z, .asm_65ff
-	ld hl, .unknownPointerTable_665e ; $665e
+	ld hl, .unknownPointerTable_665e
 .asm_661a
 	sla a
 	jr c, .asm_6624
@@ -165,10 +165,10 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call GoPAL_SET_CF1C
 	call GBPalNormal
 	xor a
-	ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
+	ld [W_SUBANIMTRANSFORM], a
 	ld hl, wd730
 	res 6, [hl]
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	and a
 	jp z, LoadTextBoxTilePatterns
 	ld hl, LoadHudTilePatterns
@@ -207,21 +207,21 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld [wHPBarMaxHP + 1], a
 	ret
 .asm_6692
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	cp $5
 	jr nz, .asm_66a0
-	ld a, [wTopMenuItemX] ; wTopMenuItemX
+	ld a, [wTopMenuItemX]
 	cp $11
 	jr z, .asm_668c
 .asm_66a0
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	cp $6
 	jr nz, .asm_66ae
-	ld a, [wTopMenuItemX] ; wTopMenuItemX
+	ld a, [wTopMenuItemX]
 	cp $1
 	jr z, .asm_667e
 .asm_66ae
-	ld hl, wMenuCursorLocation ; wMenuCursorLocation
+	ld hl, wMenuCursorLocation
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -270,10 +270,10 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld [hl], $50
 	ret
 .asm_6702
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	cp $6
 	ret z
-	ld a, [wTopMenuItemX] ; wTopMenuItemX
+	ld a, [wTopMenuItemX]
 	cp $11
 	jp z, .asm_6714
 	inc a
@@ -283,10 +283,10 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld a, $1
 	jr .asm_6755
 .asm_6718
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	cp $6
 	ret z
-	ld a, [wTopMenuItemX] ; wTopMenuItemX
+	ld a, [wTopMenuItemX]
 	dec a
 	jp z, .asm_6728
 	dec a
@@ -295,30 +295,30 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld a, $11
 	jr .asm_6755
 .asm_672c
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	dec a
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wCurrentMenuItem], a
 	and a
 	ret nz
 	ld a, $6
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wCurrentMenuItem], a
 	ld a, $1
 	jr .asm_6755
 .asm_673e
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	inc a
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wCurrentMenuItem], a
 	cp $7
 	jr nz, .asm_6750
 	ld a, $1
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wCurrentMenuItem], a
 	jr .asm_6755
 .asm_6750
 	cp $6
 	ret nz
 	ld a, $1
 .asm_6755
-	ld [wTopMenuItemX], a ; wTopMenuItemX
+	ld [wTopMenuItemX], a
 	jp EraseMenuCursor
 
 LoadEDTile: ; 675b (1:675b)
@@ -402,9 +402,9 @@ Func_680e: ; 680e (1:680e)
 	jr nz, .asm_6867
 	call EraseMenuCursor
 	ld a, $11
-	ld [wTopMenuItemX], a ; wTopMenuItemX
+	ld [wTopMenuItemX], a
 	ld a, $5
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
+	ld [wCurrentMenuItem], a
 	ld a, [wd07d]
 	cp $2
 	ld a, $9
@@ -463,10 +463,10 @@ CalcStringLength: ; 68eb (1:68eb)
 PrintNamingText: ; 68f8 (1:68f8)
 	hlCoord 0, 1
 	ld a, [wd07d]
-	ld de, YourTextString ; $693f
+	ld de, YourTextString
 	and a
 	jr z, .notNickname
-	ld de, RivalsTextString ; $6945
+	ld de, RivalsTextString
 	dec a
 	jr z, .notNickname
 	ld a, [wcf91]
@@ -482,13 +482,13 @@ PrintNamingText: ; 68f8 (1:68f8)
 	add hl, bc
 	ld [hl], $c9
 	hlCoord 1, 3
-	ld de, NicknameTextString ; $6953
+	ld de, NicknameTextString
 	jr .placeString
 .notNickname
 	call PlaceString
 	ld l, c
 	ld h, b
-	ld de, NameTextString ; $694d
+	ld de, NameTextString
 .placeString
 	jp PlaceString
 
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index cdd93875..1bedb0ea 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -29,8 +29,8 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
 	call LoadGBPal
 	jp RedisplayStartMenu
 .chosePokemon
-	call SaveScreenTilesToBuffer1 ; save screen
-	ld a,$04
+	call SaveScreenTilesToBuffer1
+	ld a,FIELD_MOVE_MON_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; display pokemon menu options
 	ld hl,wWhichTrade
@@ -341,7 +341,7 @@ StartMenu_Item: ; 13302 (4:7302)
 	cp a,BICYCLE
 	jp z,.useOrTossItem
 .notBicycle1
-	ld a,$06 ; use/toss menu
+	ld a,USE_TOSS_MENU_TEMPLATE
 	ld [wTextBoxID],a
 	call DisplayTextBoxID
 	ld hl,wTopMenuItemY
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 1eba782b..88cfcf65 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -1,20 +1,20 @@
 VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld hl, VendingMachineText1
 	call PrintText
-	ld a, $13
+	ld a, MONEY_BOX
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	xor a
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
-	ld [wLastMenuItem], a ; wLastMenuItem
+	ld [wCurrentMenuItem], a
+	ld [wLastMenuItem], a
 	ld a, $3
-	ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
+	ld [wMenuWatchedKeys], a
 	ld a, $3
-	ld [wMaxMenuItem], a ; wMaxMenuItem
+	ld [wMaxMenuItem], a
 	ld a, $5
-	ld [wTopMenuItemY], a ; wTopMenuItemY
+	ld [wTopMenuItemY], a
 	ld a, $1
-	ld [wTopMenuItemX], a ; wTopMenuItemX
+	ld [wTopMenuItemX], a
 	ld hl, wd730
 	set 6, [hl]
 	hlCoord 0, 3
@@ -33,7 +33,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	call HandleMenuInput
 	bit 1, a
 	jr nz, .asm_74f93
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	cp $3
 	jr z, .asm_74f93
 	xor a
@@ -66,10 +66,10 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld hl, VendingMachineText5
 	call PrintText
 	ld hl, $ffde
-	ld de, wPlayerMoney + 2 ; wd349
+	ld de, wPlayerMoney + 2
 	ld c, $3
 	predef SubBCDPredef
-	ld a, $13
+	ld a, MONEY_BOX
 	ld [wTextBoxID], a
 	jp DisplayTextBoxID
 .BagFull
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index 644c155b..4bc4c341 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -11,10 +11,10 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	ld [wPlayerMonNumber],a
 	inc a
 	ld [wcf93],a
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; draw money text box
-	ld a,$15
+	ld a,BUY_SELL_QUIT_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; do buy/sell/quit menu
 	ld hl,wd128 ; pointer to this pokemart's inventory
@@ -45,7 +45,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	call SaveScreenTilesToBuffer1 ; save screen
 .sellMenuLoop
 	call LoadScreenTilesFromBuffer1 ; restore saved screen
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; draw money text box
 	ld hl,wNumBagItems
@@ -79,7 +79,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	call PrintText
 	hlCoord 14, 7
 	ld bc,$080f
-	ld a,$14
+	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; yes/no menu
 	ld a,[wd12e]
@@ -119,7 +119,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	call SaveScreenTilesToBuffer1 ; save screen
 .buyMenuLoop
 	call LoadScreenTilesFromBuffer1 ; restore saved screen
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; draw money text box
 	ld hl,wStringBuffer2 + 11
@@ -150,7 +150,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	call PrintText
 	hlCoord 14, 7
 	ld bc,$080f
-	ld a,$14
+	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; yes/no menu
 	ld a,[wd12e]
@@ -180,7 +180,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	jp .buyMenuLoop
 .returnToMainPokemartMenu
 	call LoadScreenTilesFromBuffer1
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; draw money text box
 	ld hl,PokemartAnythingElseText
diff --git a/engine/save.asm b/engine/save.asm
index 7b1db4c7..29c839f3 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -173,10 +173,10 @@ NowSavingString:
 SaveSAVConfirm: ; 73768 (1c:7768)
 	call PrintText
 	hlCoord 0, 7
-	ld bc,$0801     ;arrow's coordinates |b = Y|c = X|
-	ld a,$14        ;one line shifting ($28 = 2 lines)
+	ld bc,$0801
+	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
-	call DisplayTextBoxID      ;handle Yes/No KeyPress
+	call DisplayTextBoxID ; yes/no menu
 	ld a,[wCurrentMenuItem]
 	ret
 
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 2444155c..e3e452f3 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -137,7 +137,7 @@ MainSlotMachineLoop: ; 37395 (d:7395)
 	ld bc, $0d0f
 	xor a ; YES_NO_MENU
 	ld [wTwoOptionMenuID], a
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	ld a, [wCurrentMenuItem]