shithub: pokered

Download patch

ref: 83023cda1927525d942f53f87a11b642b979ea96
parent: c9b778fb008ebc845219a2b787ea6beb04ae29f8
author: YamaArashi <shadow962@live.com>
date: Sat Feb 7 07:27:36 EST 2015 

commented menu stuff


--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -28,6 +28,26 @@
 NPC_MOVEMENT_LEFT  EQU $80
 NPC_MOVEMENT_RIGHT EQU $C0
 
+; text box IDs
+MESSAGE_BOX                       EQU $01
+FIELD_MOVE_MON_MENU               EQU $04
+JP_MOCHIMONO_MENU_TEMPLATE        EQU $05
+USE_TOSS_MENU_TEMPLATE            EQU $06
+JP_SAVE_MESSAGE_MENU_TEMPLATE     EQU $08
+JP_SPEED_OPTIONS_MENU_TEMPLATE    EQU $09
+BATTLE_MENU_TEMPLATE              EQU $0b
+SWITCH_STATS_CANCEL_MENU_TEMPLATE EQU $0c
+LIST_MENU_BOX                     EQU $0d
+BUY_SELL_QUIT_MENU_TEMPLATE       EQU $0e
+MONEY_BOX_TEMPLATE                EQU $0f
+MON_SPRITE_POPUP                  EQU $11
+JP_AH_MENU_TEMPLATE               EQU $12
+MONEY_BOX                         EQU $13
+TWO_OPTION_MENU                   EQU $14
+BUY_SELL_QUIT_MENU                EQU $15
+JP_POKEDEX_MENU_TEMPLATE          EQU $1a
+SAFARI_BATTLE_MENU_TEMPLATE       EQU $1b
+
 ; two option menu constants
 YES_NO_MENU       EQU 0
 NORTH_WEST_MENU   EQU 1
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -98,7 +98,7 @@
 
 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 @@
 .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 @@
 	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 @@
 .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 @@
 	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
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -716,7 +716,7 @@
 	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
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -9,10 +9,10 @@
 	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
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -66,7 +66,7 @@
 	xor a
 	ld [hWY], a
 	call SaveScreenTilesToBuffer1
-	ld a, $11
+	ld a, MON_SPRITE_POPUP
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	call UpdateSprites
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -2097,7 +2097,7 @@
 	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 @@
 	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]
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -2,7 +2,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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,15 +99,15 @@
 	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
@@ -114,7 +114,7 @@
 	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 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,23 +295,23 @@
 	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
@@ -318,7 +318,7 @@
 	ret nz
 	ld a, $1
 .asm_6755
-	ld [wTopMenuItemX], a ; wTopMenuItemX
+	ld [wTopMenuItemX], a
 	jp EraseMenuCursor
 
 LoadEDTile: ; 675b (1:675b)
@@ -402,9 +402,9 @@
 	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 @@
 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 @@
 	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
 
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -29,8 +29,8 @@
 	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 @@
 	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
--- 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 @@
 	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 @@
 	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
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -11,10 +11,10 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	jp .buyMenuLoop
 .returnToMainPokemartMenu
 	call LoadScreenTilesFromBuffer1
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; draw money text box
 	ld hl,PokemartAnythingElseText
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -173,10 +173,10 @@
 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
 
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -137,7 +137,7 @@
 	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]
--- a/home.asm
+++ b/home.asm
@@ -1325,7 +1325,7 @@
 	ld hl,$ffa1 ; total price of items
 	ld c,3 ; length of money in bytes
 	predef AddBCDPredef ; add total price to money
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; redraw money text box
 	ld a, (SFX_02_5a - SFX_Headers_02) / 3
@@ -1398,7 +1398,7 @@
 	ld h,a ; hl = address of the list
 	ld a,[hl]
 	ld [wd12a],a ; [wd12a] = number of list entries
-	ld a,$0d ; list menu text box ID
+	ld a,LIST_MENU_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; draw the menu text box
 	call UpdateSprites ; disable sprites behind the text box
@@ -2996,7 +2996,7 @@
 	jr DisplayYesNoChoice
 
 Func_35f4:: ; 35f4 (0:35f4)
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call InitYesNoTextBoxParameters
 	jp DisplayTextBoxID
@@ -3023,7 +3023,7 @@
 	hlCoord 12, 7
 	ld bc, $080d
 DisplayYesNoChoice:: ; 3628 (0:3628)
-	ld a, $14
+	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	jp LoadScreenTilesFromBuffer1
@@ -4193,7 +4193,7 @@
 PrintText:: ; 3c49 (0:3c49)
 ; Print text hl at (1, 14).
 	push hl
-	ld a,1
+	ld a,MESSAGE_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID
 	call UpdateSprites
--- a/main.asm
+++ b/main.asm
@@ -797,7 +797,7 @@
 	ld hl,$ffa1 ; total price of items
 	ld c,3 ; length of money in bytes
 	predef SubBCDPredef ; subtract total price from money
-	ld a,$13
+	ld a,MONEY_BOX
 	ld [wTextBoxID],a
 	call DisplayTextBoxID ; redraw money text box
 	and a
@@ -1166,7 +1166,7 @@
 ; function to draw various text boxes
 DisplayTextBoxID_: ; 72ea (1:72ea)
 	ld a,[wTextBoxID]
-	cp a,$14
+	cp a,TWO_OPTION_MENU
 	jp z,DisplayTwoOptionMenu
 	ld c,a
 	ld hl,TextBoxFunctionTable
@@ -1294,9 +1294,9 @@
 ; 00: text box ID
 ; 01-02: function address
 TextBoxFunctionTable: ; 7387 (1:7387)
-	dbw $13, Func_74ba
-	dbw $15, Func_74ea
-	dbw $04, Func_76e1
+	dbw MONEY_BOX, DisplayMoneyBox
+	dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu
+	dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu
 	db $ff ; terminator
 
 ; Format:
@@ -1306,12 +1306,12 @@
 ; 03: column of lower right corner
 ; 04: row of lower right corner
 TextBoxCoordTable: ; 7391 (1:7391)
-	db $01,  0, 12, 19, 17
-	db $03,  0,  0, 19, 14
-	db $07,  0,  0, 11,  6
-	db $0d,  4,  2, 19, 12
-	db $10,  7,  0, 19, 17
-	db $11,  6,  4, 14, 13
+	db MESSAGE_BOX,       0, 12, 19, 17
+	db $03,               0,  0, 19, 14
+	db $07,               0,  0, 11,  6
+	db LIST_MENU_BOX,     4,  2, 19, 12
+	db $10,               7,  0, 19, 17
+	db MON_SPRITE_POPUP,  6,  4, 14, 13
 	db $ff ; terminator
 
 ; Format:
@@ -1325,57 +1325,57 @@
 ; 08: row of beginning of text
 ; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row]
 TextBoxTextAndCoordTable: ; 73b0 (1:73b0)
-	db $05 ; text box ID
+	db JP_MOCHIMONO_MENU_TEMPLATE
 	db 0,0,14,17   ; text box coordinates
 	dw JapaneseMochimonoText
 	db 3,0   ; text coordinates
 
-	db $06 ; text box ID
+	db USE_TOSS_MENU_TEMPLATE
 	db 13,10,19,14 ; text box coordinates
 	dw UseTossText
 	db 15,11 ; text coordinates
 
-	db $08 ; text box ID
+	db JP_SAVE_MESSAGE_MENU_TEMPLATE
 	db 0,0,7,5     ; text box coordinates
 	dw JapaneseSaveMessageText
 	db 2,2   ; text coordinates
 
-	db $09 ; text box ID
+	db JP_SPEED_OPTIONS_MENU_TEMPLATE
 	db 0,6,5,10    ; text box coordinates
 	dw JapaneseSpeedOptionsText
 	db 2,7   ; text coordinates
 
-	db $0b ; text box ID
+	db BATTLE_MENU_TEMPLATE
 	db 8,12,19,17  ; text box coordinates
 	dw BattleMenuText
 	db 10,14 ; text coordinates
 
-	db $1b ; text box ID
+	db SAFARI_BATTLE_MENU_TEMPLATE
 	db 0,12,19,17  ; text box coordinates
 	dw SafariZoneBattleMenuText
 	db 2,14  ; text coordinates
 
-	db $0c ; text box ID
+	db SWITCH_STATS_CANCEL_MENU_TEMPLATE
 	db 11,11,19,17 ; text box coordinates
 	dw SwitchStatsCancelText
 	db 13,12 ; text coordinates
 
-	db $0e ; text box ID
+	db BUY_SELL_QUIT_MENU_TEMPLATE
 	db 0,0,10,6    ; text box coordinates
 	dw BuySellQuitText
 	db 2,1   ; text coordinates
 
-	db $0f ; text box ID
+	db MONEY_BOX_TEMPLATE
 	db 11,0,19,2   ; text box coordinates
 	dw MoneyText
 	db 13,0  ; text coordinates
 
-	db $12 ; text box ID
+	db JP_AH_MENU_TEMPLATE
 	db 7,6,11,10   ; text box coordinates
 	dw JapaneseAhText
 	db 8,8   ; text coordinates
 
-	db $1a ; text box ID
+	db JP_POKEDEX_MENU_TEMPLATE
 	db 11,8,19,17  ; text box coordinates
 	dw JapanesePokedexMenu
 	db 12,10 ; text coordinates
@@ -1431,10 +1431,10 @@
 	next "ぶんぷをみる"
 	next "キャンセル@"
 
-Func_74ba: ; 74ba (1:74ba)
+DisplayMoneyBox: ; 74ba (1:74ba)
 	ld hl, wd730
 	set 6, [hl]
-	ld a, $f
+	ld a, MONEY_BOX_TEMPLATE
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	hlCoord 13, 1
@@ -1442,7 +1442,7 @@
 	ld c, $6
 	call ClearScreenArea
 	hlCoord 12, 1
-	ld de, wPlayerMoney ; wPlayerMoney
+	ld de, wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
 	ld hl, wd730
@@ -1452,26 +1452,26 @@
 CurrencyString: ; 74e2 (1:74e2)
 	db "      ¥@"
 
-Func_74ea: ; 74ea (1:74ea)
+DoBuySellQuitMenu: ; 74ea (1:74ea)
 	ld a, [wd730]
 	set 6, a ; no printing delay
 	ld [wd730], a
 	xor a
 	ld [wd12d], a
-	ld a, $e
+	ld a, BUY_SELL_QUIT_MENU_TEMPLATE
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
-	ld a, $3
-	ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
+	ld a, A_BUTTON | B_BUTTON
+	ld [wMenuWatchedKeys], a
 	ld a, $2
-	ld [wMaxMenuItem], a ; wMaxMenuItem
+	ld [wMaxMenuItem], a
 	ld a, $1
-	ld [wTopMenuItemY], a ; wTopMenuItemY
+	ld [wTopMenuItemY], a
 	ld a, $1
-	ld [wTopMenuItemX], a ; wTopMenuItemX
+	ld [wTopMenuItemX], a
 	xor a
-	ld [wCurrentMenuItem], a ; wCurrentMenuItem
-	ld [wLastMenuItem], a ; wLastMenuItem
+	ld [wCurrentMenuItem], a
+	ld [wLastMenuItem], a
 	ld [wcc37], a
 	ld a, [wd730]
 	res 6, a ; turn on the printing delay
@@ -1478,27 +1478,27 @@
 	ld [wd730], a
 	call HandleMenuInput
 	call PlaceUnfilledArrowMenuCursor
-	bit 0, a
-	jr nz, .asm_7539
-	bit 1, a
-	jr z, .asm_7539
+	bit 0, a ; was A pressed?
+	jr nz, .pressedA
+	bit 1, a ; was B pressed? (always true since only A/B are watched)
+	jr z, .pressedA
 	ld a, $2
 	ld [wd12e], a
-	jr .asm_754c
-.asm_7539
+	jr .quit
+.pressedA
 	ld a, $1
 	ld [wd12e], a
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	ld [wd12d], a
 	ld b, a
-	ld a, [wMaxMenuItem] ; wMaxMenuItem
+	ld a, [wMaxMenuItem]
 	cp b
-	jr z, .asm_754c
+	jr z, .quit
 	ret
-.asm_754c
+.quit
 	ld a, $2
 	ld [wd12e], a
-	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+	ld a, [wCurrentMenuItem]
 	ld [wd12d], a
 	scf
 	ret
@@ -1716,9 +1716,9 @@
 .HealCancelMenu ; 76d5 (1:36d5)
 	db "HEAL",$4E,"CANCEL@"
 
-Func_76e1: ; 76e1 (1:36e1)
+DisplayFieldMoveMonMenu: ; 76e1 (1:36e1)
 	xor a
-	ld hl, wWhichTrade ; wWhichTrade
+	ld hl, wWhichTrade
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -1737,7 +1737,7 @@
 	ld a, $c
 	ld [$fff7], a
 	hlCoord 13, 12
-	ld de, PokemonMenuEntries ; $77c2
+	ld de, PokemonMenuEntries
 	jp PlaceString
 .asm_770f
 	push af
@@ -1778,10 +1778,10 @@
 	jr nz, .asm_7747
 	xor a
 	ld [wTrainerScreenX], a
-	ld de, wWhichTrade ; wWhichTrade
+	ld de, wWhichTrade
 .asm_7752
 	push hl
-	ld hl, FieldMoveNames ; $778d
+	ld hl, FieldMoveNames
 	ld a, [de]
 	and a
 	jr z, .asm_7776
@@ -1817,7 +1817,7 @@
 	ld e, a
 	ld d, $0
 	add hl, de
-	ld de, PokemonMenuEntries ; $77c2
+	ld de, PokemonMenuEntries
 	jp PlaceString
 
 FieldMoveNames: ; 778d (1:778d)
@@ -1837,14 +1837,14 @@
 	next "CANCEL@"
 
 GetMonFieldMoves: ; 77d6 (1:77d6)
-	ld a, [wWhichPokemon] ; wWhichPokemon
-	ld hl, wPartyMon1Moves ; wPartyMon1Moves
+	ld a, [wWhichPokemon]
+	ld hl, wPartyMon1Moves
 	ld bc, $2c
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ld c, $5
-	ld hl, wWhichTrade ; wWhichTrade
+	ld hl, wWhichTrade
 .asm_77e9
 	push hl
 .asm_77ea
@@ -1855,7 +1855,7 @@
 	jr z, .asm_7821
 	ld b, a
 	inc de ; go to next move
-	ld hl, FieldMoveDisplayData ; $7823
+	ld hl, FieldMoveDisplayData
 .asm_77f6
 	ld a, [hli]
 	cp $ff