Use constants for menu flags

Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.

constants.asm

@@ -47,3 +47,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"

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

data/default_names.asm

@@ -1,5 +1,5 @@
 ChrisNameMenuHeader: ; 882b5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 11, 10 ; end coords
 	dw .MaleNames
@@ -7,7 +7,7 @@ ChrisNameMenuHeader: ; 882b5
 	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
@@ -19,7 +19,7 @@ MalePlayerNameArray: ; 882c9
 	db " NAME @" ; title
 
 KrisNameMenuHeader: ; 882e5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 11, 10 ; end coords
 	dw .FemaleNames
@@ -27,7 +27,7 @@ KrisNameMenuHeader: ; 882e5
 	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

engine/battle/menu.asm

@@ -33,7 +33,7 @@ Function24f19: ; 24f19
 ; 24f2c
 
 BattleMenuDataHeader: ; 24f2c
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 12, 08 ; start coords
 	db 17, 19 ; end coords
 	dw MenuData_0x24f34
@@ -41,7 +41,7 @@ BattleMenuDataHeader: ; 24f2c
 ; 24f34
 
 MenuData_0x24f34: ; 0x24f34
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 6 ; spacing
 	dba Strings24f3d
@@ -56,7 +56,7 @@ Strings24f3d: ; 0x24f3d
 ; 24f4e
 
 MenuDataHeader_0x24f4e: ; 24f4e
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 12, 00 ; start coords
 	db 17, 19 ; end coords
 	dw MenuData_0x24f56
@@ -64,7 +64,7 @@ MenuDataHeader_0x24f4e: ; 24f4e
 ; 24f56
 
 MenuData_0x24f56: ; 24f56
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 11 ; spacing
 	dba Strings24f5f
@@ -87,7 +87,7 @@ Function24f7c: ; 24f7c
 ; 24f89
 
 MenuDataHeader_0x24f89: ; 24f89
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 12, 02 ; start coords
 	db 17, 19 ; end coords
 	dw MenuData_0x24f91
@@ -95,7 +95,7 @@ MenuDataHeader_0x24f89: ; 24f89
 ; 24f91
 
 MenuData_0x24f91: ; 24f91
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 12 ; spacing
 	dba Strings24f9a

engine/billspc.asm

@@ -229,7 +229,7 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537)
 ; e253d (38:653d)
 
 BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 09 ; start coords
 	db 13, 19 ; end coords
 	dw .MenuData2
@@ -237,7 +237,7 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
 ; 0xe2545
 
 .MenuData2: ; 0xe2545 (38:6545)
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "DEPOSIT@"
 	db "STATS@"
@@ -490,7 +490,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 ; e2731 (38:6731)
 
 .MenuDataHeader: ; 0xe2731
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 09 ; start coords
 	db 13, 19 ; end coords
 	dw .MenuData
@@ -498,7 +498,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 ; 0xe2739
 
 .MenuData: ; 0xe2739
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "WITHDRAW@"
 	db "STATS@"
@@ -714,7 +714,7 @@ _MovePKMNWithoutMail: ; e2759
 ; e28c3
 
 .MenuDataHeader: ; 0xe28c3
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 09 ; start coords
 	db 13, 19 ; end coords
 	dw .MenuData2
@@ -722,7 +722,7 @@ _MovePKMNWithoutMail: ; e2759
 ; 0xe28cb
 
 .MenuData2: ; 0xe28cb
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "MOVE@"
 	db "STATS@"
@@ -2562,7 +2562,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 	hlcoord 11, 7 ; XXX
 
 .MenuDataHeader: ; 0xe377b
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 11 ; start coords
 	db 13, 19 ; end coords
 	dw .MenuData2
@@ -2570,7 +2570,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 ; 0xe3783
 
 .MenuData2: ; 0xe3783
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "SWITCH@"
 	db "NAME@"

engine/billspctop.asm

@@ -69,14 +69,14 @@ _BillsPC: ; e3fd
 	ret
 
 .MenuDataHeader: ; 0xe46f
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 17, 19 ; end coords
 	dw .MenuData2
 	db 1 ; default option
 
 .MenuData2: ; 0xe477
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 0 ; items
 	dw .items
 	dw PlaceMenuStrings

engine/buy_sell_toss.asm

@@ -214,7 +214,7 @@ BuySell_DisplaySubtotal: ; 250d1
 ; 250ed
 
 TossItem_MenuDataHeader: ; 0x250ed
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 09, 15 ; start coords
 	db 11, 19 ; end coords
 	dw ret_25097
@@ -222,7 +222,7 @@ TossItem_MenuDataHeader: ; 0x250ed
 ; 0x250f5
 
 BuyItem_MenuDataHeader: ; 0x250f5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 15, 07 ; start coords
 	db 17, 19 ; end coords
 	dw DisplayPurchasePrice
@@ -230,7 +230,7 @@ BuyItem_MenuDataHeader: ; 0x250f5
 ; 0x250fd
 
 SellItem_MenuDataHeader: ; 0x250fd
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 15, 07 ; start coords
 	db 17, 19 ; end coords
 	dw DisplaySellingPrice

engine/decorations.asm

@@ -37,7 +37,7 @@ _KrisDecorationMenu: ; 0x2675c
 ; 0x2679a
 
 .MenuDataHeader: ; 0x2679a
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 05 ; start coords
 	db 17, 19 ; end coords
 	dw .MenuData2
@@ -45,7 +45,7 @@ _KrisDecorationMenu: ; 0x2675c
 ; 0x267a2
 
 .MenuData2: ; 0x267a2
-	db $a0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw PlaceNthMenuStrings
@@ -423,7 +423,7 @@ PopulateDecoCategoryMenu: ; 2695b
 ; 0x269b5
 
 .NonscrollingMenuDataHeader: ; 0x269b5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 17, 19 ; end coords
 	dw .NonscrollingMenuData2
@@ -431,7 +431,7 @@ PopulateDecoCategoryMenu: ; 2695b
 ; 0x269bd
 
 .NonscrollingMenuData2: ; 0x269bd
-	db $a0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw DecorationMenuFunction
@@ -439,7 +439,7 @@ PopulateDecoCategoryMenu: ; 2695b
 ; 0x269c5
 
 .ScrollingMenuDataHeader: ; 0x269c5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 01, 01 ; start coords
 	db 16, 18 ; end coords
 	dw .ScrollingMenuData2
@@ -447,7 +447,7 @@ PopulateDecoCategoryMenu: ; 2695b
 ; 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
@@ -951,7 +951,7 @@ QueryWhichSide: ; 26e9a
 ; 26eab
 
 MenuDataHeader_0x26eab: ; 0x26eab
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 07, 13 ; end coords
 	dw MenuData2_0x26eb3
@@ -959,7 +959,7 @@ MenuDataHeader_0x26eab: ; 0x26eab
 ; 0x26eb3
 
 MenuData2_0x26eb3: ; 0x26eb3
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "RIGHT SIDE@"
 	db "LEFT SIDE@"

engine/delete_save_change_clock.asm

@@ -47,14 +47,14 @@ _ResetClock: ; 4d3b1
 	db "@"
 
 .NoYes_MenuDataHeader: ; 0x4d40d
-	db $00 ; flags
+	db 0 ; flags
 	db 07, 14 ; start coords
 	db 11, 19 ; end coords
 	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@"
@@ -285,14 +285,14 @@ _DeleteSaveData: ; 4d54c
 	db "@"
 
 .NoYesMenuDataHeader: ; 0x4d585
-	db $00 ; flags
+	db 0 ; flags
 	db 07, 14 ; start coords
 	db 11, 19 ; end coords
 	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@"

engine/events/buena.asm

@@ -29,7 +29,7 @@ SpecialBuenasPassword: ; 8af6b
 ; 8afa9
 
 .MenuDataHeader: ; 0x8afa9
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 07, 10 ; end coords
 	dw .MenuData2
@@ -39,7 +39,7 @@ SpecialBuenasPassword: ; 8af6b
 	db 0
 
 .MenuData2: ; 0x8afb2
-	db $81 ; flags
+	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 0 ; items
 	dw .PasswordIndices
 	dw .PlacePasswordChoices
@@ -225,7 +225,7 @@ PrintBlueCardBalance: ; 8b097
 ; 8b0d1
 
 BlueCardBalanceMenuDataHeader: ; 0x8b0d1
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 11, 00 ; start coords
 	db 13, 11 ; end coords
 ; 8b0d6
@@ -237,7 +237,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
 ; 8b0dd
 
 .menudataheader ; 0x8b0dd
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 11, 17 ; end coords
 ; 8b0e2
@@ -270,7 +270,7 @@ Buena_PrizeMenu: ; 8b0e2
 ; 8b113
 
 .MenuDataHeader: ; 0x8b113
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 01, 01 ; start coords
 	db 09, 16 ; end coords
 	dw .MenuData2
@@ -280,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

engine/events/crystal_unown.asm

@@ -195,19 +195,19 @@ ENDM
 
 .MenuDataHeaders_UnownWalls: ; 0x8aed5
 ;.MenuDataHeader_Escape:
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 03 ; start coords
 	db 09, 16 ; end coords
 ;.MenuDataHeader_Light:
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 04 ; start coords
 	db 09, 15 ; end coords
 ;.MenuDataHeader_Water:
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 04 ; start coords
 	db 09, 15 ; end coords
 ;.MenuDataHeader_Ho_Oh:
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 04 ; start coords
 	db 09, 15 ; end coords
 ; 8aee9

engine/events/elevator.asm

@@ -188,7 +188,7 @@ Elevator_GetCurrentFloorString: ; 1353f
 ; 13550
 
 Elevator_MenuDataHeader: ; 0x13550
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 01, 12 ; start coords
 	db 09, 18 ; end coords
 	dw Elevator_MenuData2
@@ -196,7 +196,7 @@ Elevator_MenuDataHeader: ; 0x13550
 ; 0x13558
 
 Elevator_MenuData2: ; 0x13558
-	db $10 ; flags
+	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows, columns
 	db 1 ; horizontal spacing
 	dbw 0, CurElevator

engine/events/kurt.asm

@@ -84,7 +84,7 @@ Kurt_SelectApricorn: ; 88055
 ; 88086
 
 .MenuDataHeader: ; 0x88086
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 01, 01 ; start coords
 	db 10, 13 ; end coords
 	dw .MenuData2
@@ -94,7 +94,7 @@ Kurt_SelectApricorn: ; 88055
 	db 0
 
 .MenuData2: ; 0x8808f
-	db $10 ; flags
+	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7
 	db 1
 	dbw 0, Buffer1
@@ -159,11 +159,12 @@ Kurt_SelectQuantity: ; 880c2
 ; 8810d
 
 .MenuDataHeader: ; 0x8810d
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 09, 06 ; start coords
 	db 12, 19 ; end coords
-
-	db 0, 0, -1, 0 ; XXX
+	dw NULL
+	db -1 ; default option
+	db 0
 
 .PlaceApricornName: ; 88116
 	call MenuBoxCoord2Tile

engine/events/mom.asm

@@ -728,7 +728,7 @@ Mom_HeldString: ; 166b0
 ; 166b5
 
 MenuDataHeader_0x166b5: ; 0x166b5
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 10, 10 ; end coords
 	dw MenuData2_0x166bd
@@ -736,7 +736,7 @@ MenuDataHeader_0x166b5: ; 0x166b5
 ; 0x166bd
 
 MenuData2_0x166bd: ; 0x166bd
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "GET@"
 	db "SAVE@"

engine/events/move_tutor.asm

@@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	ret
 
 .MenuDataHeader: ; 0x4930a
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 12, 00 ; start coords
 	db 17, 19 ; end coords

engine/events/pokecenter_pc.asm

@@ -27,14 +27,14 @@ PokemonCenterPC: ; 1559a
 	ret
 
 .TopMenu:
-	db $48 ; flags
+	db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags
 	db 00, 00 ; start coords
 	db 12, 15 ; end coords
 	dw .MenuData2
 	db 1 ; default option
 
 .MenuData2:
-	db $a0 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw .WhichPC
 	dw PlaceNthMenuStrings
@@ -232,14 +232,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
@@ -620,14 +620,14 @@ PCItemsJoypad: ; 0x15985
 	ret
 
 .PCItemsMenuData:
-	db %01000000
+	db MENU_BACKUP_TILES
 	db  1,  4 ; start coords
 	db 10, 18 ; end coords
 	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

engine/events/pokepic.asm

@@ -42,7 +42,7 @@ ClosePokepic:: ; 24528
 	ret
 
 PokepicMenuDataHeader: ; 0x24547
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 06 ; start coords
 	db 13, 14 ; end coords
 	dw NULL

engine/events/std_scripts.asm

@@ -1868,14 +1868,14 @@ CoinVendor_IntroScript: ; 0xbcde0
 
 
 .MenuDataHeader:
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 00 ; start coords
 	db 11, 15 ; end coords
 	dw .MenuData2
 	db 1 ; default option
 
 .MenuData2:
-	db $80 ; flags
+	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db " 50 :  ¥1000@"
 	db "500 : ¥10000@"

engine/init_gender.asm

@@ -44,7 +44,7 @@ InitGender: ; 48dcb (12:4dcb)
 ; 48dfc (12:4dfc)
 
 .MenuDataHeader: ; 0x48dfc
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 04, 06 ; start coords
 	db 09, 12 ; end coords
 	dw .MenuData2
@@ -52,7 +52,7 @@ InitGender: ; 48dcb (12:4dcb)
 ; 0x48e04
 
 .MenuData2: ; 0x48e04
-	db $a1 ; flags
+	db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags
 	db 2 ; items
 	db "Boy@"
 	db "Girl@"

engine/intro_menu.asm

@@ -553,7 +553,7 @@ Continue_LoadMenuHeader: ; 5ebf
 ; 5ed9
 
 .MenuDataHeader_Dex: ; 5ed9
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 09, 15 ; end coords
 	dw .MenuData2_Dex
@@ -561,7 +561,7 @@ Continue_LoadMenuHeader: ; 5ebf
 ; 5ee1
 
 .MenuData2_Dex: ; 5ee1
-	db $00 ; flags
+	db 0 ; flags
 	db 4 ; items
 	db "PLAYER@"
 	db "BADGES@"
@@ -570,7 +570,7 @@ Continue_LoadMenuHeader: ; 5ebf
 ; 5efb
 
 .MenuDataHeader_NoDex: ; 5efb
-	db $40 ; flags
+	db MENU_BACKUP_TILES ; flags
 	db 00, 00 ; start coords
 	db 09, 15 ; end coords
 	dw .MenuData2_NoDex
@@ -578,7 +578,7 @@ Continue_LoadMenuHeader: ; 5ebf
 ; 5f03
 
 .MenuData2_NoDex: ; 5f03
-	db $00 ; flags
+	db 0 ; flags
 	db 4 ; items
 	db "PLAYER <PLAYER>@"
 	db "BADGES@"