diff options
48 files changed, 238 insertions, 203 deletions
diff --git a/constants.asm b/constants.asm index 7de20dfe2..16bd4be08 100644 --- a/constants.asm +++ b/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" diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm new file mode 100644 index 000000000..9174159ea --- /dev/null +++ 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 diff --git a/data/default_names.asm b/data/default_names.asm index 87c341652..25fb95d0e 100644 --- a/data/default_names.asm +++ b/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 diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 07d3e6081..ccca4402a 100755 --- a/engine/battle/menu.asm +++ b/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 diff --git a/engine/billspc.asm b/engine/billspc.asm index f94f495c6..10034c806 100755 --- a/engine/billspc.asm +++ b/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@" diff --git a/engine/billspctop.asm b/engine/billspctop.asm index c36cbe45d..f5ee3d7d8 100755 --- a/engine/billspctop.asm +++ b/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 diff --git a/engine/buy_sell_toss.asm b/engine/buy_sell_toss.asm index 37bee86b1..358ef4f30 100755 --- a/engine/buy_sell_toss.asm +++ b/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 diff --git a/engine/decorations.asm b/engine/decorations.asm index c1b703fb6..72a4d1aee 100755 --- a/engine/decorations.asm +++ b/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@" diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index e77874e1c..b00c1ccc4 100755 --- a/engine/delete_save_change_clock.asm +++ b/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@" diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 1227593eb..6070895fe 100644 --- a/engine/events/buena.asm +++ b/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 diff --git a/engine/events/crystal_unown.asm b/engine/events/crystal_unown.asm index 09d44bb9a..54196498b 100644 --- a/engine/events/crystal_unown.asm +++ b/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 diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 9170b642d..e936976bb 100755 --- a/engine/events/elevator.asm +++ b/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 diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 9bc06a613..4f3343dd1 100644 --- 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 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 diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 6e3c7b320..061c12f8f 100644 --- a/engine/events/mom.asm +++ b/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@" diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index a15ecaf93..5082364e0 100644 --- a/engine/events/move_tutor.asm +++ b/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 diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 7045dc1c8..5d2dd35df 100755 --- a/engine/events/pokecenter_pc.asm +++ b/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 diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index 82016403b..854e73d01 100755 --- 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 db 04, 06 ; start coords db 13, 14 ; end coords dw NULL diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 297725c60..315e80d17 100644 --- a/engine/events/std_scripts.asm +++ b/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@" diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 588709b88..92be6c371 100755 --- a/engine/init_gender.asm +++ b/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@" diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7d17b62e5..a91327b1c 100755 --- a/engine/intro_menu.asm +++ b/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@" diff --git a/engine/mail.asm b/engine/mail.asm index 0335a6dfe..04c31af17 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -558,14 +558,14 @@ MailboxPC: ; 0x44806 ret .TopMenuDataHeader: ; 0x4494c - db %01000000 ; flags + db MENU_BACKUP_TILES ; flags db 1, 8 ; start coords db 10, 18 ; end coords dw .TopMenuData2 db 1 ; default option .TopMenuData2: - db %00010000 ; flags + db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows/columns? db 1 ; horizontal spacing? dbw 0, wMailboxCount ; text pointer @@ -574,14 +574,14 @@ MailboxPC: ; 0x44806 dba NULL .SubMenuDataHeader: ; 0x44964 - db %01000000 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 9, 13 ; end coords dw .SubMenuData2 db 1 ; default option .SubMenuData2: - db %10000000 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "READ MAIL@" db "PUT IN PACK@" diff --git a/engine/main_menu.asm b/engine/main_menu.asm index cbd516cd7..1f6686d1f 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -30,7 +30,7 @@ MainMenu: ; 49cdc ; 49d14 .MenuDataHeader: ; 49d14 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 07, 16 ; end coords dw .MenuData2 @@ -38,7 +38,7 @@ MainMenu: ; 49cdc ; 49d1c .MenuData2: ; 49d1c - db $80 ; flags + db STATICMENU_CURSOR ; flags db 0 ; items dw MainMenuItems dw PlaceMenuStrings diff --git a/engine/mart.asm b/engine/mart.asm index 4a8d9e17b..44f3b087b 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -617,7 +617,7 @@ Text_Mart_CostsThisMuch: ; 0x15e13 ; 0x15e18 MenuDataHeader_Buy: ; 0x15e18 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 03, 01 ; start coords db 11, 19 ; end coords dw .menudata2 @@ -625,7 +625,7 @@ MenuDataHeader_Buy: ; 0x15e18 ; 0x15e20 .menudata2 ; 0x15e20 - db $30 ; pointers + db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db 4, 8 ; rows, columns db 1 ; horizontal spacing dbw 0, CurMart @@ -902,7 +902,7 @@ Text_Mart_HowMayIHelpYou: ; 0x15f83 ; 0x15f88 MenuDataHeader_BuySell: ; 0x15f88 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 07 ; end coords dw .menudata2 @@ -910,7 +910,7 @@ MenuDataHeader_BuySell: ; 0x15f88 ; 0x15f90 .menudata2 ; 0x15f90 - db $80 ; strings + db STATICMENU_CURSOR ; strings db 3 ; items db "BUY@" db "SELL@" diff --git a/engine/menu_2.asm b/engine/menu_2.asm index d88b75152..d3eb499bf 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -53,14 +53,14 @@ PlaceMoneyDataHeader: ; 24b01 ret MenuDataHeader_0x24b15: ; 0x24b15 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 02, 19 ; end coords dw NULL db 1 ; default option MenuDataHeader_0x24b1d: ; 0x24b1d - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 11, 00 ; start coords db 13, 08 ; end coords dw NULL diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index e3570ab70..dfd11e42a 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -55,7 +55,7 @@ MonSubmenu: ; 24d19 ; 24d3f .MenuDataHeader: ; 24d3f - db $40 ; tile backup + db MENU_BACKUP_TILES ; tile backup db 00, 06 ; start coords db 17, 19 ; end coords dw 0 @@ -325,7 +325,7 @@ BattleMonMenu: ; 24e99 ; 24ed4 MenuDataHeader_0x24ed4: ; 24ed4 - db $00 ; flags + db 0 ; flags db 11, 11 ; start coords db 17, 19 ; end coords dw MenuData2_0x24edc @@ -333,7 +333,7 @@ MenuDataHeader_0x24ed4: ; 24ed4 ; 24edc MenuData2_0x24edc: ; 24edc - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "SWITCH@" db "STATS@" diff --git a/engine/pack.asm b/engine/pack.asm index 047924cb0..3e6470faf 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -147,7 +147,7 @@ Pack: ; 10000 ; 10124 (4:4124) .MenuDataHeader1: ; 0x10124 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 07, 13 ; start coords db 11, 19 ; end coords dw .MenuData2_1 @@ -155,7 +155,7 @@ Pack: ; 10000 ; 0x1012c .MenuData2_1: ; 0x1012c - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" db "QUIT@" @@ -169,7 +169,7 @@ Pack: ; 10000 ; 1013b .MenuDataHeader2: ; 0x1013b - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 05, 13 ; start coords db 11, 19 ; end coords dw .MenuData2_2 @@ -177,7 +177,7 @@ Pack: ; 10000 ; 0x10143 .MenuData2_2: ; 0x10143 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "USE@" db "GIVE@" @@ -309,7 +309,7 @@ Pack: ; 10000 ; 10249 (4:4249) MenuDataHeader_UsableKeyItem: ; 0x10249 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 01, 13 ; start coords db 11, 19 ; end coords dw .MenuData2 @@ -317,7 +317,7 @@ MenuDataHeader_UsableKeyItem: ; 0x10249 ; 0x10251 .MenuData2: ; 0x10251 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 5 ; items db "USE@" db "GIVE@" @@ -336,7 +336,7 @@ Jumptable_UseGiveTossRegisterQuit: ; 1026a ; 10274 MenuDataHeader_UsableItem: ; 0x10274 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 03, 13 ; start coords db 11, 19 ; end coords dw .MenuData2 @@ -344,7 +344,7 @@ MenuDataHeader_UsableItem: ; 0x10274 ; 0x1027c .MenuData2: ; 0x1027c - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 4 ; items db "USE@" db "GIVE@" @@ -361,7 +361,7 @@ Jumptable_UseGiveTossQuit: ; 10291 ; 10299 MenuDataHeader_UnusableItem: ; 0x10299 - db %01000000 ; flags + db MENU_BACKUP_TILES ; flags db 07, 13 ; start coords db 11, 19 ; end coords dw .MenuData2 @@ -369,7 +369,7 @@ MenuDataHeader_UnusableItem: ; 0x10299 ; 0x102a1 .MenuData2: ; 0x102a1 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" db "QUIT@" @@ -382,7 +382,7 @@ Jumptable_UseQuit: ; 102ac ; 102b0 MenuDataHeader_UnusableKeyItem: ; 0x102b0 - db %01000000 ; flags + db MENU_BACKUP_TILES ; flags db 05, 13 ; start coords db 11, 19 ; end coords dw .MenuData2 @@ -390,7 +390,7 @@ MenuDataHeader_UnusableKeyItem: ; 0x102b0 ; 0x102b8 .MenuData2: ; 0x102b8 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "USE@" db "SEL@" @@ -405,7 +405,7 @@ Jumptable_UseRegisterQuit: ; 102c7 ; 102cd MenuDataHeader_HoldableKeyItem: ; 0x102cd - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 03, 13 ; start coords db 11, 19 ; end coords dw .MenuData2 @@ -413,7 +413,7 @@ MenuDataHeader_HoldableKeyItem: ; 0x102cd ; 0x102d5 .MenuData2: ; 0x102d5 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 4 ; items db "GIVE@" db "TOSS@" @@ -430,7 +430,7 @@ Jumptable_GiveTossRegisterQuit: ; 102ea ; 102f2 MenuDataHeader_HoldableItem: ; 0x102f2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 05, 13 ; start coords db 11, 19 ; end coords dw .MenuData2 @@ -438,7 +438,7 @@ MenuDataHeader_HoldableItem: ; 0x102f2 ; 0x102fa .MenuData2: ; 0x102fa - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "GIVE@" db "TOSS@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index aea08f16a..17552878d 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -1868,7 +1868,7 @@ Slots_AskBet: ; 9307c (24:707c) ; 0x930d6 .MenuDataHeader: ; 0x930d6 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 10, 14 ; start coords db 17, 19 ; end coords dw .MenuData2 @@ -1876,7 +1876,7 @@ Slots_AskBet: ; 9307c (24:707c) ; 0x930de .MenuData2: ; 0x930de - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db " 3@" db " 2@" diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 913bf3780..a07e8ff4a 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -152,21 +152,21 @@ StartMenu:: ; 125cd .MenuDataHeader: - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 0, 10 ; start coords db 17, 19 ; end coords dw .MenuData db 1 ; default selection .ContestMenuDataHeader: - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 2, 10 ; start coords db 17, 19 ; end coords dw .MenuData db 1 ; default selection .MenuData: - db %10101000 ; x padding, wrap around, start can close + db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_ENABLE_START ; flags dn 0, 0 ; rows, columns dw MenuItemsList dw .MenuString @@ -1165,7 +1165,7 @@ MonMailAction: ; 12d45 .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 10, 12 ; start coords db 17, 19 ; end coords dw .MenuData2 @@ -1173,7 +1173,7 @@ MonMailAction: ; 12d45 ; 0x12dd1 .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db "READ@" db "TAKE@" diff --git a/home/menu.asm b/home/menu.asm index 03cec64df..1495b3f36 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -40,7 +40,7 @@ LoadMenuTextBox:: ; 1d58 ; 1d5f .MenuDataHeader: ; 1d5f - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw vTiles0 @@ -60,7 +60,7 @@ LoadStandardMenuDataHeader:: ; 1d6e ; 1d75 .MenuDataHeader: ; 1d75 - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 17, 19 ; end coords dw 0 @@ -183,7 +183,7 @@ InterpretTwoOptionMenu:: ; 1dfe ; 1e1d YesNoMenuDataHeader:: ; 1e1d - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 5, 10 ; start coords db 9, 15 ; end coords dw .MenuData2 @@ -191,7 +191,7 @@ YesNoMenuDataHeader:: ; 1e1d ; 1e25 .MenuData2: ; 1e25 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "YES@" db "NO@" diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..01dfa6642 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -80,14 +80,14 @@ CeladonDeptStore6FVendingMachine: jump .Start .MenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 7f74c684f..681d144b4 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -104,14 +104,14 @@ CeladonPrizeRoom_NoCoinCase: CeladonPrizeRoom_TMMenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" db "TM29 3500@" @@ -193,14 +193,14 @@ GoldenrodGameCornerPokemonVendor: .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 17 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" db "PORYGON 5555@" diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1df424ca1..98b57b4de 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -267,14 +267,14 @@ ElderScript_0x18d20d: MenuDataHeader_0x18d215: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 08 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" @@ -282,14 +282,14 @@ MenuDataHeader_0x18d215: MenuDataHeader_0x18d234: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 09 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" @@ -297,14 +297,14 @@ MenuDataHeader_0x18d234: MenuDataHeader_0x18d258: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 05 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" @@ -312,14 +312,14 @@ MenuDataHeader_0x18d258: MenuDataHeader_0x18d283: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 08 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" @@ -327,14 +327,14 @@ MenuDataHeader_0x18d283: MenuDataHeader_0x18d2a5: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 12 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" db "Both@" diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 3ed66a713..fcaab3039 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -103,14 +103,14 @@ AcademyBlackboard: jump .Loop .BlackboardMenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 11 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing dba .Text diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8e324a9bb..a2b3f676b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -96,14 +96,14 @@ MoveTutor: .MoveMenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" db "THUNDERBOLT@" diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..b9ccc3663 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -69,14 +69,14 @@ GoldenrodVendingMachine: jump .Start .MenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index fc0216504..9314207fa 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -140,14 +140,14 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: GoldenrodGameCornerTMVendorMenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" db "TM14 5500@" @@ -229,14 +229,14 @@ GoldenrodGameCornerPrizeMonVendorScript: .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 17 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" db "CUBONE 800@" diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index a3e639409..1cf7e6f6d 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -50,14 +50,14 @@ UnknownScript_0x62600: MenuDataHeader_0x62602: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER @@ -95,14 +95,14 @@ UnknownScript_0x6264a: MenuDataHeader_0x6264c: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db "でんわ", $1f,"つかうとき@" ; Use phone db "でんわ", $4a,"つながらないとき@" ; Don't use phone diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 14b787645..238d8a3f7 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -563,7 +563,7 @@ MobileDesc_ZipCode: db "Your zip code?@" ; 484f1 MenuDataHeader_0x484f1: ; 0x484f1 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 11 ; start coords db 07, 19 ; end coords dw MenuData2_0x484f9 @@ -571,7 +571,7 @@ MenuDataHeader_0x484f1: ; 0x484f1 ; 0x484f9 MenuData2_0x484f9: ; 0x484f9 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 2 ; items Strings_484fb: String_484fb: db "Boy@" @@ -579,22 +579,22 @@ String_484ff: db "Girl@" ; 0x48504 MenuDataHeader_0x48504: ; 0x48504 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 10 ; start coords db 17, 19 ; end coords MenuDataHeader_0x48509: ; 0x48509 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 05, 10 ; start coords db 07, 19 ; end coords MenuDataHeader_0x4850e: ; 0x4850e - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 09, 10 ; start coords db 11, 19 ; end coords MenuDataHeader_0x48513: ; 0x48513 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 01, 11 ; start coords db 12, 18 ; end coords dw MenuData2_0x4851b @@ -602,7 +602,7 @@ MenuDataHeader_0x48513: ; 0x48513 ; 0x4851b MenuData2_0x4851b: ; 0x4851b - db $1d ; flags + db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags db 6 ; items Unknown_4851d: ; 4851d @@ -1277,7 +1277,7 @@ Function48a9a: ; 48a9a (12:4a9a) ; 48a9c (12:4a9c) MenuDataHeader_0x48a9c: ; 0x48a9c - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 08, 10 ; start coords db 13, 19 ; end coord diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index ba663cf86..94eeb6a7a 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -715,7 +715,7 @@ Function4ac58: ; 4ac58 ; 4aca2 MenuDataHeader_0x4aca2: ; 0x4aca2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 09, 11 ; start coords db 17, 19 ; end coords dw NULL diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 9180c29e0..70de1f767 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -277,7 +277,7 @@ Function89261: ; 89261 ; 892a3 MenuDataHeader_0x892a3: ; 0x892a3 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 05, 10 ; start coords db 09, 15 ; end coords dw MenuData2_0x892ab @@ -285,7 +285,7 @@ MenuDataHeader_0x892a3: ; 0x892a3 ; 0x892ab MenuData2_0x892ab: ; 0x892ab - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "はい@" db "いいえ@" @@ -2832,7 +2832,7 @@ Function8a116: ; 8a116 (22:6116) ; 8a176 (22:6176) MenuDataHeader_0x8a176: ; 0x8a176 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 14 ; start coords db 06, 19 ; end coords ; 8a17b @@ -2855,7 +2855,7 @@ Function8a17b: ; 8a17b (22:617b) ; 8a19a (22:619a) MenuDataHeader_0x8a19a: ; 0x8a19a - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 14 ; start coords db 06, 19 ; end coords dw MenuData2_0x8a1a2 @@ -2863,7 +2863,7 @@ MenuDataHeader_0x8a19a: ; 0x8a19a ; 0x8a1a2 MenuData2_0x8a1a2: ; 0x8a1a2 - db $e0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 3 ; items db "ひらく@" db "すてる@" @@ -3015,7 +3015,7 @@ Function8a2aa: ; 8a2aa (22:62aa) ; 8a2ef (22:62ef) MenuDataHeader_0x8a2ef: ; 0x8a2ef - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 00 ; start coords db 17, 19 ; end coords ; 8a2f4 @@ -3177,7 +3177,7 @@ Unknown_8a408: db 1, 2, -1 Unknown_8a40b: db 1, 2, 3, -1 MenuDataHeader_0x8a40f: ; 0x8a40f - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 10 ; end coords dw MenuData2_0x8a417 @@ -3185,7 +3185,7 @@ MenuDataHeader_0x8a40f: ; 0x8a40f ; 0x8a417 MenuData2_0x8a417: ; 0x8a417 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 ; items db "めいしりスト@" db "じぶんの めいし@" @@ -3194,7 +3194,7 @@ MenuData2_0x8a417: ; 0x8a417 ; 0x8a435 MenuDataHeader_0x8a435: ; 0x8a435 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 09, 10 ; end coords dw MenuData2_0x8a43d @@ -3202,7 +3202,7 @@ MenuDataHeader_0x8a435: ; 0x8a435 ; 0x8a43d MenuData2_0x8a43d: ; 0x8a43d - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "めいしりスト@" db "じぶんの めいし@" @@ -3920,7 +3920,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5) ; 8a9c9 (22:69c9) MenuDataHeader_0x8a9c9: ; 0x8a9c9 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 11 ; start coords db 11, 18 ; end coords ; 8a9ce @@ -3950,7 +3950,7 @@ Function8a9ce: ; 8a9ce (22:69ce) ; 8a9f2 (22:69f2) MenuDataHeader_0x8a9f2: ; 0x8a9f2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 11 ; start coords db 11, 18 ; end coords dw MenuData2_0x8a9fa @@ -3958,7 +3958,7 @@ MenuDataHeader_0x8a9f2: ; 0x8a9f2 ; 0x8a9fa MenuData2_0x8a9fa: ; 0x8a9fa - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" db "みる@" diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 37b3d60b8..e30e52ee7 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -910,7 +910,7 @@ Function8b855: ; 8b855 ; 8b867 MenuDataHeader_0x8b867: ; 0x8b867 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 03, 01 ; start coords db 13, 18 ; end coords dw MenuData2_0x8b870 @@ -920,7 +920,7 @@ MenuDataHeader_0x8b867: ; 0x8b867 db 0 MenuData2_0x8b870: ; 0x8b870 - db $3c ; flags + db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags db 5 ; items db 3, 1 dbw 0, wd002 @@ -1083,12 +1083,12 @@ Function8b9ab: ; 8b9ab ; 8b9ac MenuDataHeader_0x8b9ac: ; 0x8b9ac - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 11, 19 ; end coords MenuDataHeader_0x8b9b1: ; 0x8b9b1 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 07, 19 ; end coords dw MenuData2_0x8b9b9 @@ -1096,7 +1096,7 @@ MenuDataHeader_0x8b9b1: ; 0x8b9b1 ; 0x8b9b9 MenuData2_0x8b9b9: ; 0x8b9b9 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" ; EDIT db "いれかえ@" ; REPLACE @@ -1104,7 +1104,7 @@ MenuData2_0x8b9b9: ; 0x8b9b9 ; 0x8b9ca MenuDataHeader_0x8b9ca: ; 0x8b9ca - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 11 ; start coords db 11, 19 ; end coords dw MenuData2_0x8b9d2 @@ -1112,7 +1112,7 @@ MenuDataHeader_0x8b9ca: ; 0x8b9ca ; 0x8b9d2 MenuData2_0x8b9d2: ; 0x8b9d2 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 5 ; items db "みる@" ; VIEW db "へんしゅう@" ; EDIT diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 84be87ce4..d4ade0eb7 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -924,14 +924,14 @@ Function100597: ; 100597 ; 1005b2 MenuDataHeader_1005b2: ; 1005b2 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 dw MenuData2_1005ba db 1 ; default option MenuData2_1005ba: - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "はい@" db "いいえ@" @@ -975,14 +975,14 @@ Function1005e1: ; 1005e1 ; 1005fc MenuDataHeader_1005fc: ; 1005fc - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 dw MenuData2_100604 db 1 ; default option MenuData2_100604: ; 100604 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "かける@" db "まつ@" @@ -2126,7 +2126,7 @@ Function100d67: ; 100d67 db 1 ; default option .MenuData2: ; 100d90 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "いれかえる@" ; TRADE db "つよさをみる@" ; STATS @@ -6287,7 +6287,7 @@ Function1029af: ; 1029af ; 1029bb MenuDataHeader_1029bb: ; 1029bb - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 10, 3 ; start coords db 12, 15 ; end coords dw NULL @@ -7785,14 +7785,14 @@ AskMobileOrCable: ; 103612 ; 103640 MenuDataHeader_103640: ; 103640 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 13 ; start coords db 11, 19 ; end coords dw MenuData2_103648 db 1 ; default option MenuData2_103648: ; 103648 - db $80 ; flags + db STATICMENU_CURSOR ; flags db 2 db "モバイル@" db "ケーブル@" @@ -7940,14 +7940,14 @@ Function103700: ; 103700 ; 103747 MenuDataHeader_103747: ; 103747 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 5, 13 ; start coords db 11, 19 ; end coords dw MenuData2_10374f db 1 ; default option MenuData2_10374f: ; 10374f - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "はい@" db "やめる@" diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 5fc5eaa7e..811a27592 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7297,7 +7297,7 @@ Function1179a7: ; 1179a7 (45:79a7) ; 1179b5 (45:79b5) MenuDataHeader_1179b5: ; 1179b5 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw NULL @@ -7305,7 +7305,7 @@ MenuDataHeader_1179b5: ; 1179b5 ; 1179bd MenuDataHeader_1179bd: ; 1179bd - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL @@ -7658,14 +7658,14 @@ Function117c89: ret MenuDataHeader_117cbc: ; 0x117cbc - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw NULL ; menu data 2 db 0 ; default option MenuDataHeader_117cc4: ; 0x117cc4 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL ; menu data 2 diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index b114e5166..4ddc2b13a 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -507,7 +507,7 @@ Function1161d5: ; 1161d5 ; 11628c MenuDataHeader_11628c: ; 11628c - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 0 ; start coords db 17, 19 ; end coords dw NULL diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 10a97e426..31eda9b6a 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3955,7 +3955,7 @@ BattleTowerRoomMenu_UpdateYesNoMenu: ; 119cf7 MenuDataHeader_119cf7: ; 119cf7 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 12 ; start coords db 11, 19 ; end coords dw NULL @@ -3963,7 +3963,7 @@ MenuDataHeader_119cf7: ; 119cf7 ; 119cff MenuData_119cff: ; 119cff - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 15 ; start coords db 11, 19 ; end coords dw NULL @@ -4757,7 +4757,7 @@ String_11a2d3: ; 11a2d3 ; 11a2d6 MenuDataHeader_11a2d6: ; 11a2d6 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 6, 14 ; start coords db 10, 19 ; end coords dw NULL @@ -4765,7 +4765,7 @@ MenuDataHeader_11a2d6: ; 11a2d6 ; 11a2de MenuDataHeader_11a2de: ; 11a2de - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL @@ -5329,7 +5329,7 @@ String_11a7f4: ; 11a7f4 ; 11a804 MenuDataHeader_11a804: ; 11a804 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 5, 19 ; end coords dw NULL @@ -6001,7 +6001,7 @@ Function11adc4: ; 11ae38 MenuDataHeader_11ae38: ; 11ae38 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 10, 10 ; start coords db 17, 17 ; end coords dw NULL @@ -6248,7 +6248,7 @@ Function11afd6: ; 11afd6 ; 11afe8 MenuDataHeader_11afe8: ; 11afe8 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 9 ; start coords db 17, 19 ; end coords dw NULL @@ -6266,7 +6266,7 @@ String_11b003: ; 11b003 ; 11b013 MenuDataHeader_11b013: ; 11b013 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 7, 14 ; start coords db 11, 19 ; end coords dw NULL diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 0e2f7d024..b9b368e1f 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -672,7 +672,7 @@ Function171c66: ; 171c66 (5c:5c66) ; 171c6b (5c:5c6b) MenuDataHeader_171c6b: ; 171c6b - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw NULL diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 5731f01fc..a4861be28 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -483,14 +483,14 @@ Function17d246: ; 17d246 ; 17d26a MenuDataHeader_17d26a: ; 17d26a - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 9, 14 ; end coords dw MenuData2_17d272 db 1 ; default option MenuData2_17d272: ; 17d272 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 db "ニュース¯よみこむ@" db "ニュース¯みる@" @@ -499,14 +499,14 @@ MenuData2_17d272: ; 17d272 ; 17d28f MenuDataHeader_ChallengeExplanationCancel: ; 17d28f - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 7, 14 ; end coords dw MenuData2_ChallengeExplanationCancel db 1 ; default option MenuData2_ChallengeExplanationCancel: ; 17d297 - db $a0 ; flags + db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 db "Challenge@" db "Explanation@" @@ -1943,7 +1943,7 @@ Function17dc1f: ; 17dc1f ; 17dc96 MenuData2_17dc96: - db $e0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 db "はい@" db "いいえ@" diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index e36e779ae..513b0bf82 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -461,7 +461,7 @@ Function4a28a: ; 4a28a (12:628a) ; 4a346 (12:6346) MenuDataHeader_0x4a346: ; 0x4a346 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 12 ; start coords db 06, 19 ; end coords @@ -484,7 +484,7 @@ UnknownText_0x4a35d: ; 0x4a35d ; 0x4a362 DeletePassword_YesNo_MenuDataHeader: ; 0x4a362 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 07, 14 ; start coords db 11, 19 ; end coords dw MenuData2_0x4a36a @@ -492,7 +492,7 @@ DeletePassword_YesNo_MenuDataHeader: ; 0x4a362 ; 0x4a36a MenuData2_0x4a36a: ; 0x4a36a - db $e0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 ; items db "はい@" db "いいえ@" |