Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)

# Conflicts: # data/player_names.asm # engine/battle/menu.asm # engine/billspc.asm # engine/billspctop.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/delete_save_change_clock.asm # engine/events/buena.asm # engine/events/elevator.asm # engine/events/kurt.asm # engine/events/mom.asm # engine/events/move_tutor.asm # engine/events/pokecenter_pc.asm # engine/events/pokepic.asm # engine/events/std_scripts.asm # engine/events/unown_walls.asm # engine/init_gender.asm # engine/intro_menu.asm # engine/mail.asm # engine/main_menu.asm # engine/mart.asm # engine/menu_2.asm # engine/mon_menu.asm # engine/pack.asm # engine/slot_machine.asm # engine/start_menu.asm # home/menu.asm # maps/CeladonDeptStore6F.asm # maps/CeladonGameCornerPrizeRoom.asm # maps/DragonShrine.asm # maps/EarlsPokemonAcademy.asm # maps/GoldenrodCity.asm # maps/GoldenrodDeptStore6F.asm # maps/GoldenrodGameCorner.asm # maps/GoldenrodPokeComCenter2FMobile.asm # mobile/mobile_12.asm # mobile/mobile_12_2.asm # mobile/mobile_22.asm # mobile/mobile_22_2.asm # mobile/mobile_40.asm # mobile/mobile_45.asm # mobile/mobile_45_sprite_engine.asm # mobile/mobile_46.asm # mobile/mobile_5c.asm # mobile/mobile_5f.asm # mobile/mobile_menu.asm
2025-04-09 05:44:44 -07:00 · 2018-01-14 23:43:51 -05:00 · 2018-01-14 23:43:51 -05:00 · 14c8cf5b48
commit 14c8cf5b48
parent dfcca93b45 d38ed29a46
51 changed files with 571 additions and 266 deletions
--- a/constants.asm
+++ b/constants.asm
@ -49,3 +49,4 @@ INCLUDE "constants/battle_tower_constants.asm"
 INCLUDE "constants/cry_constants.asm"
 INCLUDE "constants/audio_constants.asm"
 INCLUDE "constants/printer_constants.asm"
+INCLUDE "constants/menu_constants.asm"
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@ -0,0 +1,33 @@
+; MenuDataHeader flags
+	const_def
+	shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set.
+	shift_const MENU_UNUSED_1
+	shift_const MENU_UNUSED_2
+	shift_const MENU_NO_CLICK_SFX
+	shift_const MENU_SPRITE_ANIMS
+	shift_const MENU_UNUSED_3
+	shift_const MENU_BACKUP_TILES
+	shift_const MENU_BACKUP_TILES_2
+
+; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuDataHeader2 flags
+; Per flag the comment specifies which menus actually implement it
+	const_def
+	shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu
+	shift_const STATICMENU_ENABLE_SELECT ; VerticalMenu/_2DMenu
+	shift_const STATICMENU_ENABLE_LEFT_RIGHT ; DoNthMenu/SetUpMenu
+	shift_const STATICMENU_ENABLE_START ; DoNthMenu/SetUpMenu
+	shift_const STATICMENU_PLACE_TITLE ; VerticalMenu
+	shift_const STATICMENU_WRAP ; All
+	shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu
+	shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu
+
+; ScrollingMenu MenuDataHeader2 flags
+	const_def
+	shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL
+	shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH
+	shift_const SCROLLINGMENU_ENABLE_LEFT
+	shift_const SCROLLINGMENU_ENABLE_RIGHT
+	shift_const SCROLLINGMENU_DISPLAY_ARROWS
+	shift_const SCROLLINGMENU_ENABLE_FUNCTION3
+	shift_const SCROLLINGMENU_ENABLE_START
+	shift_const SCROLLINGMENU_ENABLE_SELECT
--- a/data/player_names.asm
+++ b/data/player_names.asm
@ -1,12 +1,12 @@
 ChrisNameMenuHeader: ; 882b5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .MaleNames
 	db 1 ; ????
 	db 0 ; default option

 .MaleNames: ; 882be
-	db $91 ; flags
+	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
 	db 5 ; items
 	db "NEW NAME@"
 MalePlayerNameArray: ; 882c9
@ -18,14 +18,14 @@ MalePlayerNameArray: ; 882c9
 	db " NAME @" ; title

 KrisNameMenuHeader: ; 882e5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .FemaleNames
 	db 1 ; ????
 	db 0 ; default option

 .FemaleNames: ; 882ee
-	db $91 ; flags
+	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
 	db 5 ; items
 	db "NEW NAME@"
 FemalePlayerNameArray: ; 882f9
--- a/data/unown_walls.asm
+++ b/data/unown_walls.asm
@ -40,15 +40,15 @@ UnownWalls: ; 8aebc

 MenuDataHeaders_UnownWalls: ; 0x8aed5
 ; UNOWNWORDS_ESCAPE
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 3, 4, 16, 9
 ; UNOWNWORDS_LIGHT
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 4, 15, 9
 ; UNOWNWORDS_WATER
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 4, 15, 9
 ; UNOWNWORDS_HO_OH
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 4, 15, 9
 ; 8aee9
--- a/docs/menu.md
+++ b/docs/menu.md
@ -0,0 +1,269 @@
+### Everything you've ever wanted to know about menus*
+
+##### *but were afraid to ask
+
+## Contents
+
+- [ScrollingMenu](#scrollingmenu)
+- [\_2DMenu](#_2dmenu)
+- [DoNthMenu/SetUpMenu](#donthmenusetupmenu)
+- [VerticalMenu](#verticalmenu)
+- [Misc/Generic](#miscgeneric)
+
+## ScrollingMenu
+
+This is the only menu that does scrolling. It doesn't draw any TextBox around the menu.
+
+Structure:
+```
+.MenuDataHeader:
+	db MENU_BACKUP_TILES ; flags
+	menu_coords 2, 4, SCREEN_WIDTH - 1, 13
+	dw .MenuData2
+	db 1 ; default option
+
+.MenuData2:
+	db 0 ; flags
+	db 5, 0 ; rows, columns
+	db 1 ; horizontal spacing
+	dba Items
+	dba Function1
+	dba Function2
+	dba Function3
+```
+
+wMenuData2Flags:
+```
+7: Select is functional
+6: Start is functional
+5: Call Function3
+4: Show arrows on the right-hand side
+3: D-Left is functional
+2: D-Right is functional
+1: Call Function3 only if [wSwitchItem] is 0
+0: Call Function1 to display the cancel entry
+```
+
+If the columns entry in MenuDataHeader2 of a scrolling menu is 0, Function2 isn't called either. It doesn't affect the position of the arrows.
+
+Call state for functions in MenuDataHeader2 of ScrollingMenu:
+```
+All of them:
+[MenuSelection] = Current item. -1 is the CANCEL item.
+[MenuSelectionQuantity] = Quantity of the current item.
+
+Function1: Called to display a menu entry.
+de = Cursor position in TileMap
+
+Function2: Called to display the quantity of a menu entry.
+de = Cursor position in TileMap + columns
+
+Function3: Called to display anything else, whenever the cursor is moved.
+```
+There is no register of importance that should be preserved in any of these functions.
+
+The `; horizontal spacing` item in each MenuData2 is a misnomer. It changes how the Items struct looks.
+If it's 1:
+```
+db entries not including cancel
+db entry1
+db entry2
+db -1 ; cancel
+...
+```
+If it's 2:
+```
+db entries not including cancel
+db entry1, quantity1
+db entry2, quantity2
+db -1 ; cancel
+...
+```
+In case it's 1, [MenuSelectionQuantity] will simply contain the next entry.
+
+## \_2DMenu
+
+This, like is implied by the name, is a 2-dimensional menu, where you can move your cursor in all 4 directions. It's only used for the battle menus as well as earl's academy.
+
+Structure:
+```
+.MenuDataHeader:
+	db MENU_BACKUP_TILES ; flags
+	db 12, 08 ; start coords
+	db 17, 19 ; end coords
+	dw .MenuData2
+	db 1 ; default option
+
+.MenuData2:
+	db STATICMENU_CURSOR ; flags
+	dn 2, 2 ; rows, columns
+	db 6 ; spacing
+	dba Strings
+	dba Function
+```
+
+wMenuData2Flags:
+```
+7: Leave one tile of spacing between the left textbox border and the text, enabling the cursor.
+6: Don't leave one tile of spacing between the top textbox border and the text
+5: Set bits 4 and 5 in w2DMenuFlags1 (Wrap around horizontally and vertically)
+4: Unused
+3: Unused
+2: Unused
+1: Select is functional
+0: Disable B button
+```
+
+The bank for the Strings is generated when you call `_2DMenu`, and as such it doesn't really matter what bank you specify there (unless you callba `_2DMenu_` directly, of course).
+`; spacing` is not a misnomer here, it's used to define how much space there is between columns.
+`Function` is called after printing all the strings. `hl` will be pointed at the row below the last in the menu in TileMap. We don't know of its purpose, since it's never actually used anywhere. Only the bank number is always set to the same bank as the menu, but not used otherwise, since the address is 0.
+
+## DoNthMenu/SetUpMenu
+
+These are like the regular VerticalMenu, except they allow for creating slightly more "dynamic" menus, where the options aren't predefined, much like the ScrollingMenu.
+
+Structure:
+```
+.MenuDataHeader:
+	db MENU_BACKUP_TILES ; flags
+	menu_coords 0, 0, 10, 7
+	dw .MenuData2
+	db 1 ; default option
+
+.MenuData2:
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
+	db 0 ; items
+	dw Items
+	dw DisplayFunction
+	dw StringPointers
+```
+
+wMenuData2Flags:
+```
+7: Unused
+6: Unused
+5: Set bit 5 in w2DMenuFlags1 (Wrap around vertically)
+4: Unused
+3: Start is functional
+2: D-left and D-right are functional
+1: Unused
+0: Unused
+```
+
+The `; items` entry should be left empty, as it's autogenerated with the `Items` array in `GetMenuIndexSet`.
+The bottom coord (`07` in the example) is autogenerated regardless of what you specify when building the MenuBox in `AutomaticGetMenuBottomCoord`, which also calculates the `bc` passed to MenuBox, which is useless because it's calculated again by MenuBox in `GetMenuBoxDims`.
+[wWhichIndexSet] decides which menu is used through `GetMenuIndexSet`. You can define multiple menus at the Items pointer as such:
+```
+Items:
+db entries not including cancel
+db entry1, entry2, entry3
+db -1 ; cancel
+db entries not including cancel for 2nd menu
+db entry1, entry2, entry3, entry4
+db -1 ; cancel
+```
+This is actively used in MainMenu.
+
+StringPointers isn't handled by DoNthMenu internally. It's handled by different `DisplayFunction`s.
+A custom one could choose to completely ignore it.
+
+StringPointers struct handled through `PlaceNthMenuStrings` as DisplayFunction and `MenuJumptable`:
+```
+StringPointers:
+dw FunctionToCall, PointerToString ; index 1
+dw FunctionToCall, PointerToString ; index 2
+...
+```
+
+StringPointers struct handled through `PlaceMenuStrings`:
+```
+StringPointers:
+db "STRING1@"
+db "STRING2@"
+...
+```
+
+Call state for DisplayFunction:
+```
+[MenuSelection] = Current item. -1 is the CANCEL item.
+de = Cursor position in TileMap
+```
+
+## VerticalMenu
+
+This is the simplest menu. Like, the most boring. Nothing special. Just normal. ...nooooooormal...
+
+Structure:
+```
+.MenuDataHeader:
+	db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags
+	menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
+	dw .MenuData2
+	db 1 ; default option
+
+.MenuData2:
+	db STATICMENU_CURSOR ; flags
+	db 2 ; # items
+	db "GIVE@"
+	db "TAKE@"
+```
+
+wMenuData2Flags:
+```
+7: Leave one tile of spacing between the left textbox border and the text
+6: Don't leave one tile of spacing between the top textbox border and the text
+5: Set bit 5 in w2DMenuFlags1 (Wrap around vertically)
+4: Place menubox "title". See notes.
+3: Unused
+2: Unused
+1: Select is functional
+0: Disable B button
+```
+
+If bit 4 is set, a string at the end of the items array will be put at an offset from the start coord of the menu box. This string is defined like this:
+```
+	db 2 ; # items
+	db "GIVE@"
+	db "TAKE@"
+	db 2 ; x offset
+	db "TEST@"
+```
+This is used in the menu for selecting the character's name.
+
+## Misc/Generic
+
+MenuDataHeader flags (wMenuFlags):
+```
+7: Save a backup of the tiles
+6: Save a backup of the tiles
+5: Unused
+4: Set bit 6 in w2DMenuFlags1 (Enable sprite animations)
+3: Disable click sound
+2: Unused
+1: Unused
+0: Call RestoreTileBackup when exiting the menu. This bit depends on whether bit 6 or 7 are set.
+```
+
+w2DMenuFlags1:
+```
+7: Disable checking of wMenuJoypadFilter
+6: Enable sprite animations
+5: Wrap around vertically
+4: Wrap around horizontally
+3: Set bit 7 in w2DMenuFlags2 and exit the loop if bit 5 is disabled and we tried to go too far down
+2: Set bit 7 in w2DMenuFlags2 and exit the loop if bit 5 is disabled and we tried to go too far up
+1: Set bit 7 in w2DMenuFlags2 and exit the loop if bit 4 is disabled and we tried to go too far left
+0: Set bit 7 in w2DMenuFlags2 and exit the loop if bit 4 is disabled and we tried to go too far right
+```
+
+w2DMenuFlags2:
+```
+7: ?????
+6: ?????
+5: ?????
+4: ?????
+3: ?????
+2: ?????
+1: ?????
+0: ?????
+```
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@ -33,14 +33,14 @@ Function24f19: ; 24f19
 ; 24f2c

 BattleMenuDataHeader: ; 24f2c
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24f34
 	db 1 ; default option
 ; 24f34

 MenuData_0x24f34: ; 0x24f34
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 6 ; spacing
 	dba Strings24f3d
@ -55,14 +55,14 @@ Strings24f3d: ; 0x24f3d
 ; 24f4e

 MenuDataHeader_0x24f4e: ; 24f4e
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24f56
 	db 1 ; default option
 ; 24f56

 MenuData_0x24f56: ; 24f56
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 11 ; spacing
 	dba Strings24f5f
@ -85,14 +85,14 @@ Function24f7c: ; 24f7c
 ; 24f89

 MenuDataHeader_0x24f89: ; 24f89
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24f91
 	db 1 ; default option
 ; 24f91

 MenuData_0x24f91: ; 24f91
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 12 ; spacing
 	dba Strings24f9a
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@ -229,14 +229,14 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537)
 ; e253d (38:653d)

 BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData2
 	db 1 ; default option
 ; 0xe2545

 .MenuData2: ; 0xe2545 (38:6545)
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "DEPOSIT@"
 	db "STATS@"
@ -488,14 +488,14 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 ; e2731 (38:6731)

 .MenuDataHeader: ; 0xe2731
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
 ; 0xe2739

 .MenuData: ; 0xe2739
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "WITHDRAW@"
 	db "STATS@"
@ -711,14 +711,14 @@ _MovePKMNWithoutMail: ; e2759
 ; e28c3

 .MenuDataHeader: ; 0xe28c3
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData2
 	db 1 ; default option
 ; 0xe28cb

 .MenuData2: ; 0xe28cb
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "MOVE@"
 	db "STATS@"
@ -2329,14 +2329,14 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2)
 ; e35f1 (38:75f1)

 _ChangeBox_menudataheader: ; 0xe35f1
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 5, 9, 12
 	dw .menudata2
 	db 1 ; default option
 ; 0xe35f9

 .menudata2 ; 0xe35f9
-	db $22 ; flags
+	db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
 	db 4, 0
 	db 1
 	dba .boxes
@ -2557,14 +2557,14 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 	hlcoord 11, 7 ; unused

 .MenuDataHeader: ; 0xe377b
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData2
 	db 1 ; default option
 ; 0xe3783

 .MenuData2: ; 0xe3783
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "SWITCH@"
 	db "NAME@"
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@ -69,13 +69,13 @@ _BillsPC: ; e3fd
 	ret

 .MenuDataHeader: ; 0xe46f
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData2
 	db 1 ; default option

 .MenuData2: ; 0xe477
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 0 ; items
 	dw .items
 	dw PlaceMenuStrings
--- a/engine/buy_sell_toss.asm
+++ b/engine/buy_sell_toss.asm
@ -214,21 +214,21 @@ BuySell_DisplaySubtotal: ; 250d1
 ; 250ed

 TossItem_MenuDataHeader: ; 0x250ed
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw ret_25097
 	db 0 ; default option
 ; 0x250f5

 BuyItem_MenuDataHeader: ; 0x250f5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw DisplayPurchasePrice
 	db -1 ; default option
 ; 0x250fd

 SellItem_MenuDataHeader: ; 0x250fd
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw DisplaySellingPrice
 	db 0 ; default option
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@ -37,14 +37,14 @@ _KrisDecorationMenu: ; 0x2675c
 ; 0x2679a

 .MenuDataHeader: ; 0x2679a
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData2
 	db 1 ; default option
 ; 0x267a2

 .MenuData2: ; 0x267a2
-	db $a0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw PlaceNthMenuStrings
@ -422,14 +422,14 @@ PopulateDecoCategoryMenu: ; 2695b
 ; 0x269b5

 .NonscrollingMenuDataHeader: ; 0x269b5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .NonscrollingMenuData2
 	db 1 ; default option
 ; 0x269bd

 .NonscrollingMenuData2: ; 0x269bd
-	db $a0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw DecorationMenuFunction
@ -437,14 +437,14 @@ PopulateDecoCategoryMenu: ; 2695b
 ; 0x269c5

 .ScrollingMenuDataHeader: ; 0x269c5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
 	dw .ScrollingMenuData2
 	db 1 ; default option
 ; 0x269cd

 .ScrollingMenuData2: ; 0x269cd
-	db $10 ; flags
+	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 8, 0 ; rows, columns
 	db 1 ; horizontal spacing
 	dbw 0, wd002 ; text pointer
@ -948,14 +948,14 @@ QueryWhichSide: ; 26e9a
 ; 26eab

 MenuDataHeader_0x26eab: ; 0x26eab
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 13, 7
 	dw MenuData2_0x26eb3
 	db 1 ; default option
 ; 0x26eb3

 MenuData2_0x26eb3: ; 0x26eb3
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "RIGHT SIDE@"
 	db "LEFT SIDE@"
--- a/engine/delete_save_change_clock.asm
+++ b/engine/delete_save_change_clock.asm
@ -47,13 +47,13 @@ _ResetClock: ; 4d3b1
 	db "@"

 .NoYes_MenuDataHeader: ; 0x4d40d
-	db $00 ; flags
+	db 0 ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .NoYes_MenuData2
 	db 1 ; default option

 .NoYes_MenuData2: ; 0x4d415
-	db $c0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "NO@"
 	db "YES@"
@ -284,13 +284,13 @@ _DeleteSaveData: ; 4d54c
 	db "@"

 .NoYesMenuDataHeader: ; 0x4d585
-	db $00 ; flags
+	db 0 ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData2
 	db 1 ; default option

 .MenuData2: ; 0x4d58d
-	db $c0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "NO@"
 	db "YES@"
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@ -29,7 +29,7 @@ Special_BuenasPassword: ; 8af6b
 ; 8afa9

 .MenuDataHeader: ; 0x8afa9
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 7
 	dw .MenuData2
 	db 1 ; default option
@ -38,7 +38,7 @@ Special_BuenasPassword: ; 8af6b
 	db 0

 .MenuData2: ; 0x8afb2
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 0 ; items
 	dw .PasswordIndices
 	dw .PlacePasswordChoices
@ -46,7 +46,11 @@ Special_BuenasPassword: ; 8af6b

 .PasswordIndices: ; 8afb8
 	db NUM_PASSWORDS_PER_CATEGORY
-	db 0, 1, 2
+x = 0
+rept NUM_PASSWORDS_PER_CATEGORY
+	db x
+x = x + 1
+endr
 	db -1

 .PlacePasswordChoices: ; 8afbd
@ -224,7 +228,7 @@ PrintBlueCardBalance: ; 8b097
 ; 8b0d1

 BlueCardBalanceMenuDataHeader: ; 0x8b0d1
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 11, 13
 ; 8b0d6

@ -235,7 +239,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
 ; 8b0dd

 .menudataheader ; 0x8b0dd
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 17, TEXTBOX_Y - 1
 ; 8b0e2

@ -267,7 +271,7 @@ Buena_PrizeMenu: ; 8b0e2
 ; 8b113

 .MenuDataHeader: ; 0x8b113
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 16, 9
 	dw .MenuData2
 	db 1 ; default option
@ -276,7 +280,7 @@ Buena_PrizeMenu: ; 8b0e2
 	db 0

 .MenuData2: ; 0x8b11c
-	db $10 ; flags
+	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 13 ; rows, columns
 	db 1 ; spacing
 	dba .indices
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@ -188,14 +188,14 @@ Elevator_GetCurrentFloorString: ; 1353f
 ; 13550

 Elevator_MenuDataHeader: ; 0x13550
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 1, 18, 9
 	dw Elevator_MenuData2
 	db 1 ; default option
 ; 0x13558

 Elevator_MenuData2: ; 0x13558
-	db $10 ; flags
+	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows, columns
 	db 1 ; horizontal spacing
 	dbw 0, CurElevator
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@ -84,7 +84,7 @@ Kurt_SelectApricorn: ; 88055
 ; 88086

 .MenuDataHeader: ; 0x88086
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 13, 10
 	dw .MenuData2
 	db 1 ; default option
@ -93,7 +93,7 @@ Kurt_SelectApricorn: ; 88055
 	db 0 ; XXX

 .MenuData2: ; 0x8808f
-	db $10 ; flags
+	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7
 	db 1
 	dbw 0, Buffer1
@ -158,12 +158,10 @@ Kurt_SelectQuantity: ; 880c2
 ; 8810d

 .MenuDataHeader: ; 0x8810d
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12
-
-	; unused
-	dw 0
-	db -1
+	dw NULL
+	db -1 ; default option
 	db 0

 .PlaceApricornName: ; 88116
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@ -728,14 +728,14 @@ Mom_HeldString: ; 166b0
 ; 166b5

 MenuDataHeader_0x166b5: ; 0x166b5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 10
 	dw MenuData2_0x166bd
 	db 1 ; default option
 ; 0x166bd

 MenuData2_0x166bd: ; 0x166bd
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "GET@"
 	db "SAVE@"
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@ -99,5 +99,5 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	ret

 .MenuDataHeader: ; 0x4930a
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@ -27,13 +27,13 @@ Special_PokemonCenterPC: ; 1559a
 	ret

 .TopMenu:
-	db $48 ; flags
+	db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags
 	menu_coords 0, 0, 15, 12
 	dw .MenuData2
 	db 1 ; default option

 .MenuData2:
-	db $a0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw .WhichPC
 	dw PlaceNthMenuStrings
@ -231,14 +231,14 @@ Function15715: ; 15715
 ; 15736

 KrissPCMenuData: ; 0x15736
-	db %01000000
+	db MENU_BACKUP_TILES ; flags
 	db  0,  0 ; top left corner coords (y, x)
 	db 12, 15 ; bottom right corner coords (y, x)
 	dw .KrissPCMenuData2
 	db 1 ; default selected option

 .KrissPCMenuData2:
-	db %10100000 ; bit7
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; # items?
 	dw .KrissPCMenuList1
 	dw PlaceNthMenuStrings
@ -619,13 +619,13 @@ PCItemsJoypad: ; 0x15985
 	ret

 .PCItemsMenuData:
-	db %01000000
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 1, 18, 10
 	dw .MenuData2
 	db 1 ; default option

 .MenuData2:
-	db %10110000
+	db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 8 ; rows/cols?
 	db 2 ; horizontal spacing?
 	dbw 0, PCItems
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@ -42,7 +42,7 @@ ClosePokepic:: ; 24528
 	ret

 PokepicMenuDataHeader: ; 0x24547
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 14, 13
 	dw NULL
 	db 1 ; default option
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@ -1870,13 +1870,13 @@ CoinVendor_IntroScript: ; 0xbcde0


 .MenuDataHeader:
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 4, 15, TEXTBOX_Y - 1
 	dw .MenuData2
 	db 1 ; default option

 .MenuData2:
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db " 50 :  ¥1000@"
 	db "500 : ¥10000@"
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@ -44,14 +44,14 @@ InitGender: ; 48dcb (12:4dcb)
 ; 48dfc (12:4dfc)

 .MenuDataHeader: ; 0x48dfc
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 12, 9
 	dw .MenuData2
 	db 1 ; default option
 ; 0x48e04

 .MenuData2: ; 0x48e04
-	db $a1 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags
 	db 2 ; items
 	db "Boy@"
 	db "Girl@"
--- a/Show More
+++ b/Show More