diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index e8f85a8db..390d3921c 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -1,4 +1,4 @@ -; MenuDataHeader flags +; MenuHeader flags const_def shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set. shift_const MENU_UNUSED_1 @@ -9,7 +9,7 @@ shift_const MENU_BACKUP_TILES shift_const MENU_BACKUP_TILES_2 -; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuDataHeader2 flags +; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags ; Per flag the comment specifies which menus actually implement it const_def shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu @@ -21,7 +21,7 @@ shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu -; ScrollingMenu MenuDataHeader2 flags +; ScrollingMenu MenuData flags const_def shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 952837065..cfab61c87 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -267,7 +267,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 NUM_UNOWN_PUZZLES EQU const_value ; Special_DisplayUnownWords writebyte arguments -; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm) +; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_LIGHT ; 1 diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm index b16724cdc..87165fa5a 100644 --- a/data/items/rooftop_sale.asm +++ b/data/items/rooftop_sale.asm @@ -1,4 +1,4 @@ -RooftopSaleData1: ; 15aee +RooftopSaleMart1: ; 15aee db 5 dbw POKE_BALL, 150 dbw GREAT_BALL, 500 @@ -7,7 +7,7 @@ RooftopSaleData1: ; 15aee dbw REVIVE, 1200 db -1 -RooftopSaleData2: ; 15aff +RooftopSaleMart2: ; 15aff db 5 dbw HYPER_POTION, 1000 dbw FULL_RESTORE, 2000 diff --git a/data/player_names.asm b/data/player_names.asm index 04eac7508..3c5a34c77 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,4 +1,4 @@ -ChrisNameMenuDataHeader: ; 882b5 +ChrisNameMenuHeader: ; 882b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames @@ -17,7 +17,7 @@ MalePlayerNameArray: ; 882c9 db 2 ; displacement db " NAME @" ; title -KrisNameMenuDataHeader: ; 882e5 +KrisNameMenuHeader: ; 882e5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames diff --git a/data/unown_walls.asm b/data/unown_walls.asm index eae376730..c05d37004 100644 --- a/data/unown_walls.asm +++ b/data/unown_walls.asm @@ -38,7 +38,7 @@ UnownWalls: ; 8aebc unownwall "H", "O", "-", "O", "H" ; 8aed5 -MenuDataHeaders_UnownWalls: ; 0x8aed5 +MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_ESCAPE db MENU_BACKUP_TILES ; flags menu_coords 3, 4, 16, 9 diff --git a/docs/event_commands.md b/docs/event_commands.md index 91486ad06..90e7864cb 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -165,7 +165,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s ## `$4E`: `yesorno` -## `$4F`: loadmenudata data_pointer +## `$4F`: loadmenuheader menu_header ## `$50`: `closewindow` diff --git a/docs/menu.md b/docs/menu.md index 71186a905..80d64ada1 100644 --- a/docs/menu.md +++ b/docs/menu.md @@ -19,13 +19,13 @@ This is the only menu that does scrolling. It doesn't draw any `TextBox` around Structure: ```asm -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 2, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db 0 ; flags db 5, 0 ; rows, columns db 1 ; horizontal spacing @@ -35,7 +35,7 @@ Structure: dba Function3 ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Select is functional @@ -48,9 +48,9 @@ Structure: 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. +If the columns entry in `MenuData` 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`: +Call state for functions in `MenuData` of `ScrollingMenu`: ``` All of them: @@ -68,7 +68,7 @@ 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. +The `; horizontal spacing` item in each `MenuData` is a misnomer. It changes how the `Items` struct looks. If it's 1: @@ -99,14 +99,14 @@ This, like is implied by the name, is a 2-dimensional menu, where you can move y Structure: ```asm -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags db 12, 08 ; start coords db 17, 19 ; end coords - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags dn 2, 2 ; rows, columns db 6 ; spacing @@ -114,7 +114,7 @@ Structure: dba Function ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Leave one tile of spacing between the left textbox border and the text, enabling the cursor. @@ -141,13 +141,13 @@ These are like the regular `VerticalMenu`, except they allow for creating slight Structure: ``` -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 0 ; items dw Items @@ -155,7 +155,7 @@ Structure: dw StringPointers ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Unused @@ -219,20 +219,20 @@ This is the simplest menu. Like, the most boring. Nothing special. Just normal. Structure: ```asm -.MenuDataHeader: +.MenuHeader: db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 2 ; # items db "GIVE@" db "TAKE@" ``` -`wMenuData2Flags`: +`wMenuDataFlags`: ``` 7: Leave one tile of spacing between the left textbox border and the text @@ -259,7 +259,7 @@ This is used in the menu for selecting the character's name. ## Misc/Generic -`MenuDataHeader` flags (`wMenuFlags`): +`MenuHeader` flags (`wMenuFlags`): ``` 7: Save a backup of the tiles diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fd3125420..cd2424769 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2781,7 +2781,7 @@ AskUseNextPokemon: ; 3d1f8 ForcePlayerMonChoice: ; 3d227 call EmptyBattleTextBox - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call SetUpBattlePartyMenu_NoLoop call ForcePickPartyMonInBattle ld a, [wLinkMode] @@ -3300,7 +3300,7 @@ ResetEnemyBattleVars: ; 3d557 ld a, 8 call SlideBattlePicOut call EmptyBattleTextBox - jp LoadStandardMenuDataHeader + jp LoadStandardMenuHeader ; 3d57a ResetBattleParticipants: ; 3d57a @@ -5107,7 +5107,7 @@ BattleMenu_Pack: ; 3e1c7 and a jp nz, .ItemsCantBeUsed - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld a, [BattleType] cp BATTLETYPE_TUTORIAL @@ -5202,10 +5202,10 @@ BattleMenu_Pack: ; 3e1c7 ; 3e28d BattleMenu_PKMN: ; 3e28d - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader BattleMenuPKMN_ReturnFromStats: call ExitMenu - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearBGPalettes BattleMenuPKMN_Loop: call SetUpBattlePartyMenu @@ -5345,7 +5345,7 @@ PlayerSwitch: ; 3e3ad ld a, [wLinkMode] and a jr z, .not_linked - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call LinkBattleSendReceiveAction call CloseWindow diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index ba4dc72f8..166904472 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -8973,7 +8973,7 @@ BattleCommand_BatonPass: ; 379c9 call DelayFrames ; Transition into switchmon menu - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall SetUpBattlePartyMenu_NoLoop farcall ForcePickSwitchMonInBattle @@ -9048,7 +9048,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ld a, 1 ld [wPlayerAction], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, LinkBattleSendReceiveAction call CallBattleCore call CloseWindow @@ -9065,7 +9065,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 and a ret z - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, LinkBattleSendReceiveAction call CallBattleCore diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index c97cd7854..705df3729 100755 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -1,6 +1,6 @@ LoadBattleMenu: ; 24ef2 - ld hl, BattleMenuDataHeader - call LoadMenuDataHeader + ld hl, BattleMenuHeader + call LoadMenuHeader ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a call InterpretBattleMenu @@ -12,14 +12,14 @@ LoadBattleMenu: ; 24ef2 SafariBattleMenu: ; 24f0b ; untranslated - ld hl, MenuDataHeader_0x24f4e - call LoadMenuDataHeader + ld hl, MenuHeader_0x24f4e + call LoadMenuHeader jr Function24f19 ; 24f13 ContestBattleMenu: ; 24f13 - ld hl, MenuDataHeader_0x24f89 - call LoadMenuDataHeader + ld hl, MenuHeader_0x24f89 + call LoadMenuHeader ; 24f19 Function24f19: ; 24f19 @@ -32,7 +32,7 @@ Function24f19: ; 24f19 ret ; 24f2c -BattleMenuDataHeader: ; 24f2c +BattleMenuHeader: ; 24f2c db MENU_BACKUP_TILES ; flags menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData_0x24f34 @@ -54,7 +54,7 @@ Strings24f3d: ; 0x24f3d db "RUN@" ; 24f4e -MenuDataHeader_0x24f4e: ; 24f4e +MenuHeader_0x24f4e: ; 24f4e db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData_0x24f56 @@ -84,7 +84,7 @@ Function24f7c: ; 24f7c ret ; 24f89 -MenuDataHeader_0x24f89: ; 24f89 +MenuHeader_0x24f89: ; 24f89 db MENU_BACKUP_TILES ; flags menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData_0x24f91 diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index e6e33f900..417f29ab1 100644 --- a/engine/battle/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm @@ -14,6 +14,6 @@ _ReturnToBattle_UseBall: ; 2715c farcall _LoadBattleFontsHPBar call GetMemSGBLayout call CloseWindow - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call WaitBGMap jp SetPalettes diff --git a/engine/billspc.asm b/engine/billspc.asm index 5fa590c41..53f2c176e 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -128,8 +128,8 @@ _DepositPKMN: ; e2391 (38:6391) ret .Submenu: ; e247d (38:647d) - ld hl, BillsPCDepositMenuDataHeader - call CopyMenuDataHeader + ld hl, BillsPCDepositMenuHeader + call CopyMenuHeader ld a, [wMenuCursorY] call StoreTo_wMenuCursorBuffer call VerticalMenu @@ -172,7 +172,7 @@ BillsPCDepositFuncDeposit: ; e24a9 (38:64a9) ret BillsPCDepositFuncStats: ; e24c8 (38:64c8) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_StatsScreen call ExitMenu call PCMonInfo @@ -191,7 +191,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) push af ld de, PCString_ReleasePKMN call BillsPC_PlaceString - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader lb bc, 14, 11 call PlaceYesNoBox ld a, [wMenuCursorY] @@ -228,14 +228,14 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537) ret ; e253d (38:653d) -BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d) +BillsPCDepositMenuHeader: ; 0xe253d (38:653d) db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0xe2545 -.MenuData2: ; 0xe2545 (38:6545) +.MenuData: ; 0xe2545 (38:6545) db STATICMENU_CURSOR ; flags db 4 ; items db "DEPOSIT@" @@ -391,8 +391,8 @@ _WithdrawPKMN: ; e2583 (38:6583) ret BillsPC_Withdraw: ; e2675 (38:6675) - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [wMenuCursorY] call StoreTo_wMenuCursorBuffer call VerticalMenu @@ -434,7 +434,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ret .stats ; e26c0 (38:66c0) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_StatsScreen call ExitMenu call PCMonInfo @@ -451,7 +451,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) jr c, .FailedRelease ld de, PCString_ReleasePKMN call BillsPC_PlaceString - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader lb bc, 14, 11 call PlaceYesNoBox ld a, [wMenuCursorY] @@ -487,7 +487,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ret ; e2731 (38:6731) -.MenuDataHeader: ; 0xe2731 +.MenuHeader: ; 0xe2731 db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 dw .MenuData @@ -652,8 +652,8 @@ _MovePKMNWithoutMail: ; e2759 ; e285d .MoveMonWOMailSubmenu: ; e285d - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [wMenuCursorY] call StoreTo_wMenuCursorBuffer call VerticalMenu @@ -693,7 +693,7 @@ _MovePKMNWithoutMail: ; e2759 ; e28a5 .Stats: ; e28a5 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_StatsScreen call ExitMenu call PCMonInfo @@ -710,14 +710,14 @@ _MovePKMNWithoutMail: ; e2759 ret ; e28c3 -.MenuDataHeader: ; 0xe28c3 +.MenuHeader: ; 0xe28c3 db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0xe28cb -.MenuData2: ; 0xe28cb +.MenuData: ; 0xe28cb db STATICMENU_CURSOR ; flags db 3 ; items db "MOVE@" @@ -2293,15 +2293,15 @@ PCString_NoReleasingEGGS: db "No releasing EGGS!@" _ChangeBox: ; e35aa (38:75aa) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call BillsPC_ClearTilemap .loop xor a ld [hBGMapMode], a call BillsPC_PrintBoxName call BillsPC_PlaceChooseABoxString - ld hl, _ChangeBox_menudataheader - call CopyMenuDataHeader + ld hl, _ChangeBox_MenuHeader + call CopyMenuHeader xor a ld [wMenuScrollPosition], a hlcoord 0, 4 @@ -2328,14 +2328,14 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2) ret ; e35f1 (38:75f1) -_ChangeBox_menudataheader: ; 0xe35f1 +_ChangeBox_MenuHeader: ; 0xe35f1 db MENU_BACKUP_TILES ; flags menu_coords 1, 5, 9, 12 - dw .menudata2 + dw .MenuData db 1 ; default option ; 0xe35f9 -.menudata2 ; 0xe35f9 +.MenuData ; 0xe35f9 db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags db 4, 0 db 1 @@ -2487,8 +2487,8 @@ BillsPC_PrintBoxName: ; e36cf (38:76cf) ; e36f9 BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu ret c @@ -2556,14 +2556,14 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) hlcoord 11, 7 ; unused -.MenuDataHeader: ; 0xe377b +.MenuHeader: ; 0xe377b db MENU_BACKUP_TILES ; flags menu_coords 11, 4, SCREEN_WIDTH - 1, 13 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0xe3783 -.MenuData2: ; 0xe3783 +.MenuData: ; 0xe3783 db STATICMENU_CURSOR ; flags db 4 ; items db "SWITCH@" diff --git a/engine/billspctop.asm b/engine/billspctop.asm index ac70082d6..cad479d9e 100755 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -22,7 +22,7 @@ _BillsPC: ; e3fd .LogIn: ; e41c (3:641c) xor a ld [hBGMapMode], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearPCItemScreen ld hl, Options ld a, [hl] @@ -45,8 +45,8 @@ _BillsPC: ; e3fd ret .UseBillsPC: ; e443 (3:6443) - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader ld a, $1 .loop ld [wMenuCursorBuffer], a @@ -68,13 +68,13 @@ _BillsPC: ; e3fd call CloseWindow ret -.MenuDataHeader: ; 0xe46f +.MenuHeader: ; 0xe46f db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: ; 0xe477 +.MenuData: ; 0xe477 db STATICMENU_CURSOR ; flags db 0 ; items dw .items @@ -109,7 +109,7 @@ BillsPC_SeeYa: ; e4cb ret BillsPC_MovePKMNMenu: ; e4cd - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall IsAnyMonHoldingMail jr nc, .no_mail ld hl, .Text_MonHoldingMail @@ -134,7 +134,7 @@ BillsPC_MovePKMNMenu: ; e4cd db "@" BillsPC_DepositMenu: ; e4fe (3:64fe) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall _DepositPKMN call ReturnToMapFromSubmenu call ClearPCItemScreen @@ -203,7 +203,7 @@ CheckCurPartyMonFainted: ; e538 ret BillsPC_WithdrawMenu: ; e559 (3:6559) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall _WithdrawPKMN call ReturnToMapFromSubmenu call ClearPCItemScreen diff --git a/engine/breeding.asm b/engine/breeding.asm index b379ec195..a03eda082 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -202,7 +202,7 @@ DoEggStep:: ; 16f3e OverworldHatchEgg:: ; 16f5e call RefreshScreen - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call HatchEggs call ExitAllMenus call RestartMapMusic diff --git a/engine/buy_sell_toss.asm b/engine/buy_sell_toss.asm index ff2bd2967..d16a52ed6 100755 --- a/engine/buy_sell_toss.asm +++ b/engine/buy_sell_toss.asm @@ -1,6 +1,6 @@ SelectQuantityToToss: ; 24fbf - ld hl, TossItem_MenuDataHeader - call LoadMenuDataHeader + ld hl, TossItem_MenuHeader + call LoadMenuHeader call Toss_Sell_Loop ret ; 24fc9 @@ -12,8 +12,8 @@ RooftopSale_SelectQuantityToBuy: ; 24fcf ld [Buffer1], a ld a, e ld [Buffer2], a - ld hl, BuyItem_MenuDataHeader - call LoadMenuDataHeader + ld hl, BuyItem_MenuHeader + call LoadMenuHeader call Toss_Sell_Loop ret ; 24fe1 @@ -24,8 +24,8 @@ SelectQuantityToSell: ; 24fe1 ld [Buffer1], a ld a, e ld [Buffer2], a - ld hl, SellItem_MenuDataHeader - call LoadMenuDataHeader + ld hl, SellItem_MenuHeader + call LoadMenuHeader call Toss_Sell_Loop ret ; 24ff9 @@ -138,9 +138,9 @@ BuySellToss_UpdateQuantityDisplay: ; 25072 ld de, wItemQuantityChangeBuffer lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum - ld a, [wMenuData2Pointer] + ld a, [wMenuDataPointer] ld e, a - ld a, [wMenuData2Pointer + 1] + ld a, [wMenuDataPointer + 1] ld d, a ld a, [wMenuDataBank] call FarCall_de @@ -213,21 +213,21 @@ BuySell_DisplaySubtotal: ; 250d1 ret ; 250ed -TossItem_MenuDataHeader: ; 0x250ed +TossItem_MenuHeader: ; 0x250ed 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 +BuyItem_MenuHeader: ; 0x250f5 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 +SellItem_MenuHeader: ; 0x250fd db MENU_BACKUP_TILES ; flags menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw DisplaySellingPrice diff --git a/engine/clock_reset.asm b/engine/clock_reset.asm index 82b81b85c..12bdf41e7 100755 --- a/engine/clock_reset.asm +++ b/engine/clock_reset.asm @@ -38,7 +38,7 @@ RestartClock: ; 20021 (8:4021) ld a, [hl] push af set NO_TEXT_SCROLL, [hl] - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearTileMap ld hl, .Text_SetWithControlPad call PrintText diff --git a/engine/decorations.asm b/engine/decorations.asm index 9c00f51b1..e004febc3 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -8,8 +8,8 @@ InitDecorations: ; 26751 (9:6751) _PlayerDecorationMenu: ; 0x2675c ld a, [wWhichIndexSet] push af - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader xor a ld [Buffer5], a ld a, $1 @@ -36,14 +36,14 @@ _PlayerDecorationMenu: ; 0x2675c ret ; 0x2679a -.MenuDataHeader: ; 0x2679a +.MenuHeader: ; 0x2679a db MENU_BACKUP_TILES ; flags menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x267a2 -.MenuData2: ; 0x267a2 +.MenuData: ; 0x267a2 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; items dw wd002 @@ -374,8 +374,8 @@ PopulateDecoCategoryMenu: ; 2695b jr nc, .beyond_eight xor a ld [wWhichIndexSet], a - ld hl, .NonscrollingMenuDataHeader - call LoadMenuDataHeader + ld hl, .NonscrollingMenuHeader + call LoadMenuHeader call DoNthMenu jr c, .no_action_1 call DoDecorationAction2 @@ -391,9 +391,9 @@ PopulateDecoCategoryMenu: ; 2695b ld d, 0 add hl, de ld [hl], -1 - call LoadStandardMenuDataHeader - ld hl, .ScrollingMenuDataHeader - call CopyMenuDataHeader + call LoadStandardMenuHeader + ld hl, .ScrollingMenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call InitScrollingMenu @@ -421,14 +421,14 @@ PopulateDecoCategoryMenu: ; 2695b db "@" ; 0x269b5 -.NonscrollingMenuDataHeader: ; 0x269b5 +.NonscrollingMenuHeader: ; 0x269b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .NonscrollingMenuData2 + dw .NonscrollingMenuData db 1 ; default option ; 0x269bd -.NonscrollingMenuData2: ; 0x269bd +.NonscrollingMenuData: ; 0x269bd db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; items dw wd002 @@ -436,14 +436,14 @@ PopulateDecoCategoryMenu: ; 2695b dw DecorationAttributes ; 0x269c5 -.ScrollingMenuDataHeader: ; 0x269c5 +.ScrollingMenuHeader: ; 0x269c5 db MENU_BACKUP_TILES ; flags menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2 - dw .ScrollingMenuData2 + dw .ScrollingMenuData db 1 ; default option ; 0x269cd -.ScrollingMenuData2: ; 0x269cd +.ScrollingMenuData: ; 0x269cd db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 8, 0 ; rows, columns db 1 ; horizontal spacing @@ -912,10 +912,10 @@ DecoText_WhichSide: ; 0x26e6b DecoAction_AskWhichSide: ; 26e70 call MenuTextBox - ld hl, MenuDataHeader_0x26eab + ld hl, MenuHeader_0x26eab call GetMenu2 call ExitMenu - call CopyMenuData2 + call CopyMenuData jr c, .nope ld a, [wMenuCursorY] cp 3 @@ -947,14 +947,14 @@ QueryWhichSide: ; 26e9a ret ; 26eab -MenuDataHeader_0x26eab: ; 0x26eab +MenuHeader_0x26eab: ; 0x26eab db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 13, 7 - dw MenuData2_0x26eb3 + dw MenuData_0x26eb3 db 1 ; default option ; 0x26eb3 -MenuData2_0x26eb3: ; 0x26eb3 +MenuData_0x26eb3: ; 0x26eb3 db STATICMENU_CURSOR ; flags db 3 ; items db "RIGHT SIDE@" diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index 8a711cc5e..d419234ba 100755 --- a/engine/delete_save_change_clock.asm +++ b/engine/delete_save_change_clock.asm @@ -8,8 +8,8 @@ _ResetClock: ; 4d3b1 call PlayMusic ld hl, .text_askreset call PrintText - ld hl, .NoYes_MenuDataHeader - call CopyMenuDataHeader + ld hl, .NoYes_MenuHeader + call CopyMenuHeader call VerticalMenu ret c ld a, [wMenuCursorY] @@ -46,13 +46,13 @@ _ResetClock: ; 4d3b1 text_jump UnknownText_0x1c561c db "@" -.NoYes_MenuDataHeader: ; 0x4d40d +.NoYes_MenuHeader: ; 0x4d40d db 0 ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .NoYes_MenuData2 + dw .NoYes_MenuData db 1 ; default option -.NoYes_MenuData2: ; 0x4d415 +.NoYes_MenuData: ; 0x4d415 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "NO@" @@ -268,8 +268,8 @@ _DeleteSaveData: ; 4d54c call PlayMusic ld hl, .Text_ClearAllSaveData call PrintText - ld hl, .NoYesMenuDataHeader - call CopyMenuDataHeader + ld hl, .NoYesMenuHeader + call CopyMenuHeader call VerticalMenu ret c ld a, [wMenuCursorY] @@ -283,13 +283,13 @@ _DeleteSaveData: ; 4d54c text_jump UnknownText_0x1c564a db "@" -.NoYesMenuDataHeader: ; 0x4d585 +.NoYesMenuHeader: ; 0x4d585 db 0 ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: ; 0x4d58d +.MenuData: ; 0x4d58d db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "NO@" diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 96290a882..26043b534 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -1,8 +1,8 @@ Special_BuenasPassword: ; 8af6b xor a ld [wWhichIndexSet], a - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [wBuenasPassword] ld c, a farcall GetBuenasPassword @@ -28,16 +28,16 @@ Special_BuenasPassword: ; 8af6b ret ; 8afa9 -.MenuDataHeader: ; 0x8afa9 +.MenuHeader: ; 0x8afa9 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x8afb1 db 0 -.MenuData2: ; 0x8afb2 +.MenuData: ; 0x8afb2 db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 0 ; items dw .PasswordIndices @@ -187,8 +187,8 @@ Special_BuenaPrize: ; 8afd4 ; 0x8b090 Buena_DisplayBlueCardBalance: ; 8b090 - ld hl, BlueCardBalanceMenuDataHeader - call LoadMenuDataHeader + ld hl, BlueCardBalanceMenuHeader + call LoadMenuHeader ret ; 8b097 @@ -202,8 +202,8 @@ PrintBlueCardBalance: ; 8b097 push de xor a ld [hBGMapMode], a - ld hl, BlueCardBalanceMenuDataHeader - call CopyMenuDataHeader + ld hl, BlueCardBalanceMenuHeader + call CopyMenuHeader call MenuBox call UpdateSprites call MenuBoxCoord2Tile @@ -227,25 +227,25 @@ PrintBlueCardBalance: ; 8b097 db "Points@" ; 8b0d1 -BlueCardBalanceMenuDataHeader: ; 0x8b0d1 +BlueCardBalanceMenuHeader: ; 0x8b0d1 db MENU_BACKUP_TILES ; flags menu_coords 0, 11, 11, 13 ; 8b0d6 Buena_PlacePrizeMenuBox: ; 8b0d6 - ld hl, .menudataheader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader ret ; 8b0dd -.menudataheader ; 0x8b0dd +.MenuHeader ; 0x8b0dd db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 17, TEXTBOX_Y - 1 ; 8b0e2 Buena_PrizeMenu: ; 8b0e2 - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [MenuSelection] ld [wMenuCursorBuffer], a xor a @@ -270,16 +270,16 @@ Buena_PrizeMenu: ; 8b0e2 ret ; 8b113 -.MenuDataHeader: ; 0x8b113 +.MenuHeader: ; 0x8b113 db MENU_BACKUP_TILES ; flags menu_coords 1, 1, 16, 9 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x8b11b db 0 -.MenuData2: ; 0x8b11c +.MenuData: ; 0x8b11c db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 13 ; rows, columns db 1 ; spacing diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm index cf6fecf72..5436b590e 100644 --- a/engine/events/buena_menu.asm +++ b/engine/events/buena_menu.asm @@ -11,8 +11,8 @@ Special_AskRememberPassword: ; 4ae12 .DoMenu: ; 4ae1f lb bc, 14, 7 push bc - ld hl, YesNoMenuDataHeader - call CopyMenuDataHeader + ld hl, YesNoMenuHeader + call CopyMenuHeader pop bc ld a, b ld [wMenuBorderLeftCoord], a diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index e0426c5bd..fba2cb0ef 100755 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -119,12 +119,12 @@ Elevator_GoToFloor: ; 134c0 ; 134dd Elevator_AskWhichFloor: ; 134dd - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Elevator_WhichFloorText call PrintText call Elevator_GetCurrentFloorText - ld hl, Elevator_MenuDataHeader - call CopyMenuDataHeader + ld hl, Elevator_MenuHeader + call CopyMenuHeader call InitScrollingMenu call UpdateSprites xor a @@ -187,14 +187,14 @@ Elevator_GetCurrentFloorString: ; 1353f ret ; 13550 -Elevator_MenuDataHeader: ; 0x13550 +Elevator_MenuHeader: ; 0x13550 db MENU_BACKUP_TILES ; flags menu_coords 12, 1, 18, 9 - dw Elevator_MenuData2 + dw Elevator_MenuData db 1 ; default option ; 0x13558 -Elevator_MenuData2: ; 0x13558 +Elevator_MenuData: ; 0x13558 db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows, columns db 1 ; horizontal spacing diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 13bde6f7e..6547a7f30 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -23,7 +23,7 @@ Kurt_PrintTextHowMany: ; 8800c ; 0x88018 Special_SelectApricornForKurt: ; 88018 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld c, $1 xor a ld [wMenuScrollPosition], a @@ -59,8 +59,8 @@ Special_SelectApricornForKurt: ; 88018 Kurt_SelectApricorn: ; 88055 farcall FindApricornsInBag jr c, .nope - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader ld a, [MenuSelection] ld [wMenuCursorBuffer], a xor a @@ -83,16 +83,16 @@ Kurt_SelectApricorn: ; 88055 ret ; 88086 -.MenuDataHeader: ; 0x88086 +.MenuHeader: ; 0x88086 db MENU_BACKUP_TILES ; flags menu_coords 1, 1, 13, 10 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x8808e db 0 ; XXX -.MenuData2: ; 0x8808f +.MenuData: ; 0x8808f db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 7 db 1 @@ -129,8 +129,8 @@ Kurt_SelectQuantity: ; 880c2 ld [wItemQuantityBuffer], a ld a, $1 ld [wItemQuantityChangeBuffer], a - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader .loop xor a ld [hBGMapMode], a @@ -157,7 +157,7 @@ Kurt_SelectQuantity: ; 880c2 ret ; 8810d -.MenuDataHeader: ; 0x8810d +.MenuHeader: ; 0x8810d db MENU_BACKUP_TILES ; flags menu_coords 6, 9, SCREEN_WIDTH - 1, 12 dw NULL diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 31350ed0e..d8719e58d 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -103,9 +103,9 @@ Special_BankOfMom: ; 16218 .AccessBankOfMom: ; 162a8 ld hl, UnknownText_0x1665d call PrintText - call LoadStandardMenuDataHeader - ld hl, MenuDataHeader_0x166b5 - call CopyMenuDataHeader + call LoadStandardMenuHeader + ld hl, MenuHeader_0x166b5 + call CopyMenuHeader call VerticalMenu call CloseWindow jr c, .cancel @@ -147,7 +147,7 @@ Special_BankOfMom: ; 16218 ld [hl], a ld a, 5 ld [wMomBankDigitCursorPosition], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Mom_SetUpDepositMenu call Mom_Wait10Frames call Mom_WithdrawDepositMenuJoypad @@ -214,7 +214,7 @@ Special_BankOfMom: ; 16218 ld [hl], a ld a, 5 ld [wMomBankDigitCursorPosition], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Mom_SetUpWithdrawMenu call Mom_Wait10Frames call Mom_WithdrawDepositMenuJoypad @@ -727,14 +727,14 @@ Mom_HeldString: ; 166b0 db "HELD@" ; 166b5 -MenuDataHeader_0x166b5: ; 0x166b5 +MenuHeader_0x166b5: ; 0x166b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, 10 - dw MenuData2_0x166bd + dw MenuData_0x166bd db 1 ; default option ; 0x166bd -MenuData2_0x166bd: ; 0x166bd +MenuData_0x166bd: ; 0x166bd db STATICMENU_CURSOR ; flags db 4 ; items db "GET@" diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 3e06113ae..d5e4c56bf 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -19,7 +19,7 @@ Special_MoveDeletion: jr z, .onlyonemove ld hl, .AskWhichMoveText call PrintText - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall ChooseMoveToDelete push af call ReturnToMapWithSpeechTextbox diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index be5f37564..31cb20bbb 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -52,8 +52,8 @@ Special_MoveTutor: ; 4925b ret CheckCanLearnMoveTutorMove: ; 492b9 - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader predef CanLearnTMHMMove @@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: ; 492b9 scf ret -.MenuDataHeader: ; 0x4930a +.MenuHeader: ; 0x4930a db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 44a50034a..686f8560d 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -578,7 +578,7 @@ FlyFunction: ; ca3b .outdoors xor a ld [hMapAnims], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearSprites farcall _FlyMap ld a, e diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 213427119..ce50e80ac 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -7,7 +7,7 @@ Special_PokemonCenterPC: ; 1559a ld hl, PokecenterPCText_AccessWhosePC call PC_DisplayTextWaitMenu ld hl, .TopMenu - call LoadMenuDataHeader + call LoadMenuHeader .loop xor a ld [hBGMapMode], a @@ -29,10 +29,10 @@ Special_PokemonCenterPC: ; 1559a .TopMenu: db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags menu_coords 0, 0, 15, 12 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; items dw .WhichPC @@ -213,7 +213,7 @@ Function15715: ; 15715 ld [wPCItemsCursor], a ld [wPCItemsScrollPosition], a ld hl, PlayersPCMenuData - call LoadMenuDataHeader + call LoadMenuHeader .asm_15722 call UpdateTimePals call DoNthMenu @@ -234,10 +234,10 @@ PlayersPCMenuData: ; 0x15736 db MENU_BACKUP_TILES ; flags db 0, 0 ; top left corner coords (y, x) db 12, 15 ; bottom right corner coords (y, x) - dw .PlayersPCMenuData2 + dw .PlayersPCMenuData db 1 ; default selected option -.PlayersPCMenuData2: +.PlayersPCMenuData: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 0 ; # items? dw .PlayersPCMenuList1 @@ -306,7 +306,7 @@ UnknownText_0x157cc: ; 0x157cc ; 0x157d1 PlayerWithdrawItemMenu: ; 0x157d1 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall ClearPCItemScreen .loop call PCItemsJoypad @@ -382,7 +382,7 @@ PlayerWithdrawItemMenu: ; 0x157d1 db "@" PlayerTossItemMenu: ; 0x1585f - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall ClearPCItemScreen .loop call PCItemsJoypad @@ -416,7 +416,7 @@ PlayerDepositItemMenu: ; 0x1588b call .CheckItemsInBag jr c, .nope call DisableSpriteUpdates - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall DepositSellInitPackBuffers .loop farcall DepositSellPack @@ -558,7 +558,7 @@ PCItemsJoypad: ; 0x15985 ld a, $0 ld [wSpriteUpdatesEnabled], a ld hl, .PCItemsMenuData - call CopyMenuDataHeader + call CopyMenuHeader hlcoord 0, 0 ld b, 10 ld c, 18 @@ -621,10 +621,10 @@ PCItemsJoypad: ; 0x15985 .PCItemsMenuData: db MENU_BACKUP_TILES ; flags menu_coords 4, 1, 18, 10 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 8 ; rows/cols? db 2 ; horizontal spacing? diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index e9e14bbf4..be1cad82a 100755 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -1,6 +1,6 @@ Pokepic:: ; 244e3 - ld hl, PokepicMenuDataHeader - call CopyMenuDataHeader + ld hl, PokepicMenuHeader + call CopyMenuHeader call MenuBox call UpdateSprites call ApplyTilemap @@ -28,8 +28,8 @@ Pokepic:: ; 244e3 ret ClosePokepic:: ; 24528 - ld hl, PokepicMenuDataHeader - call CopyMenuDataHeader + ld hl, PokepicMenuHeader + call CopyMenuHeader call ClearMenuBoxInterior call WaitBGMap call GetMemSGBLayout @@ -41,7 +41,7 @@ ClosePokepic:: ; 24528 call LoadStandardFont ret -PokepicMenuDataHeader: ; 0x24547 +PokepicMenuHeader: ; 0x24547 db MENU_BACKUP_TILES ; flags menu_coords 6, 4, 14, 13 dw NULL diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index eff1ab8f6..42dce7c65 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0 .loop ; 0xbcde4 special Special_DisplayMoneyAndCoinBalance - loadmenudata .MenuDataHeader + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .Buy50 @@ -1869,13 +1869,13 @@ CoinVendor_IntroScript: ; 0xbcde0 ; 0xbce54 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 4, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db " 50 : ¥1000@" diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 4d59a2f7a..903b7bb2b 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -105,7 +105,7 @@ SpecialKabutoChamber: ; 8ae4e Special_DisplayUnownWords: ; 8ae68 ld a, [ScriptVar] - ld hl, MenuDataHeaders_UnownWalls + ld hl, MenuHeaders_UnownWalls and a jr z, .load @@ -117,7 +117,7 @@ Special_DisplayUnownWords: ; 8ae68 jr nz, .loop .load - call LoadMenuDataHeader + call LoadMenuHeader xor a ld [hBGMapMode], a call MenuBox diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 76b1640d9..8837ebc72 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -30,8 +30,8 @@ InitGender: ; 48dcb (12:4dcb) call SetPalettes ld hl, TextJump_AreYouABoyOrAreYouAGirl call PrintText - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call WaitBGMap2 call VerticalMenu call CloseWindow @@ -43,14 +43,14 @@ InitGender: ; 48dcb (12:4dcb) ret ; 48dfc (12:4dfc) -.MenuDataHeader: ; 0x48dfc +.MenuHeader: ; 0x48dfc db MENU_BACKUP_TILES ; flags menu_coords 6, 4, 12, 9 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x48e04 -.MenuData2: ; 0x48e04 +.MenuData: ; 0x48e04 db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags db 2 ; items db "Boy@" diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index e8a3f221a..dc640c4dc 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -352,7 +352,7 @@ Continue: ; 5d65 farcall TryLoadSaveFile jr c, .FailToLoad farcall _LoadData - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call DisplaySaveInfoOnContinue ld a, $1 ld [hBGMapMode], a @@ -539,27 +539,27 @@ DisplayContinueDataWithRTCError: ; 5eaf Continue_LoadMenuHeader: ; 5ebf xor a ld [hBGMapMode], a - ld hl, .MenuDataHeader_Dex + ld hl, .MenuHeader_Dex ld a, [wStatusFlags] bit STATUSFLAGS_POKEDEX_F, a jr nz, .show_menu - ld hl, .MenuDataHeader_NoDex + ld hl, .MenuHeader_NoDex .show_menu - call _OffsetMenuDataHeader + call _OffsetMenuHeader call MenuBox call PlaceVerticalMenuItems ret ; 5ed9 -.MenuDataHeader_Dex: ; 5ed9 +.MenuHeader_Dex: ; 5ed9 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 9 - dw .MenuData2_Dex + dw .MenuData_Dex db 1 ; default option ; 5ee1 -.MenuData2_Dex: ; 5ee1 +.MenuData_Dex: ; 5ee1 db 0 ; flags db 4 ; items db "PLAYER@" @@ -568,14 +568,14 @@ Continue_LoadMenuHeader: ; 5ebf db "TIME@" ; 5efb -.MenuDataHeader_NoDex: ; 5efb +.MenuHeader_NoDex: ; 5efb db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 9 - dw .MenuData2_NoDex + dw .MenuData_NoDex db 1 ; default option ; 5f03 -.MenuData2_NoDex: ; 5f03 +.MenuData_NoDex: ; 5f03 db 0 ; flags db 4 ; items db "PLAYER @" @@ -826,7 +826,7 @@ NamePlayer: ; 0x6074 ; 60e9 Unreferenced_Function60e9: - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu ld a, [wMenuCursorY] dec a diff --git a/engine/link.asm b/engine/link.asm index 86a593284..be9d68c9e 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1670,7 +1670,7 @@ LinkTrade: ; 28b87 ld hl, UnknownText_0x28eb8 bccoord 1, 14 call PlaceHLTextAtBC - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader hlcoord 10, 7 ld b, 3 ld c, 7 diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 504dc6d95..fdabb01a2 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -19,7 +19,7 @@ Function16d42e: ; 16d42e ; 16d43b Function16d43b: ; 16d43b - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearBGPalettes call ClearTileMap call ClearSprites @@ -169,7 +169,7 @@ LinkTextbox: ; 16d6ca ; 16d6ce Function16d6ce: ; 16d6ce - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function16d6e1 farcall WaitLinkTransfer call Call_ExitMenu diff --git a/engine/mail.asm b/engine/mail.asm index d2649bdc5..b0da3580e 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -313,7 +313,7 @@ IsAnyMonHoldingMail: ; 44781 _PlayerMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call MailboxPC jp CloseWindow @@ -388,8 +388,8 @@ MailboxPC: ; 0x44806 ld [wCurMessageIndex], a .loop call InitMail - ld hl, .TopMenuDataHeader - call CopyMenuDataHeader + ld hl, .TopMenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call InitScrollingMenu @@ -417,8 +417,8 @@ MailboxPC: ; 0x44806 ; 0x4484a .Submenu: ; 0x4484a - ld hl, .SubMenuDataHeader - call LoadMenuDataHeader + ld hl, .SubMenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .subexit @@ -557,13 +557,13 @@ MailboxPC: ; 0x44806 .Cancel: ret -.TopMenuDataHeader: ; 0x4494c +.TopMenuHeader: ; 0x4494c db MENU_BACKUP_TILES ; flags menu_coords 8, 1, SCREEN_WIDTH - 2, 10 - dw .TopMenuData2 + dw .TopMenuData db 1 ; default option -.TopMenuData2: +.TopMenuData: db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows/columns? db 1 ; horizontal spacing? @@ -572,13 +572,13 @@ MailboxPC: ; 0x44806 dba NULL dba NULL -.SubMenuDataHeader: ; 0x44964 +.SubMenuHeader: ; 0x44964 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 13, 9 - dw .SubMenuData2 + dw .SubMenuData db 1 ; default option -.SubMenuData2: +.SubMenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "READ MAIL@" diff --git a/engine/main_menu.asm b/engine/main_menu.asm index ff2d187d2..25235de8f 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -14,8 +14,8 @@ MainMenu: ; 49cdc call MainMenu_GetWhichMenu ld [wWhichIndexSet], a call MainMenu_PrintCurrentTimeAndDay - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call MainMenuJoypadLoop call CloseWindow jr c, .quit @@ -29,14 +29,14 @@ MainMenu: ; 49cdc ret ; 49d14 -.MenuDataHeader: ; 49d14 +.MenuHeader: ; 49d14 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 16, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 49d1c -.MenuData2: ; 49d1c +.MenuData: ; 49d1c db STATICMENU_CURSOR ; flags db 0 ; items dw MainMenuItems diff --git a/engine/mart.asm b/engine/mart.asm index 0306a3e49..8385cf0ad 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -36,7 +36,7 @@ MartDialog: ; 15a61 HerbShop: ; 15a6e call FarReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_HerbShop_Intro call MartTextBox call BuyMenu @@ -50,7 +50,7 @@ BargainShop: ; 15a84 ld de, BargainShopData call LoadMartPointer call ReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_BargainShop_Intro call MartTextBox call BuyMenu @@ -69,7 +69,7 @@ BargainShop: ; 15a84 Pharmacist: ; 15aae call FarReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Pharmacist_Intro call MartTextBox call BuyMenu @@ -79,18 +79,18 @@ Pharmacist: ; 15aae ; 15ac4 RooftopSale: ; 15ac4 - ld b, BANK(RooftopSaleData1) - ld de, RooftopSaleData1 + ld b, BANK(RooftopSaleMart1) + ld de, RooftopSaleMart1 ld hl, wStatusFlags bit STATUSFLAGS_HALL_OF_FAME_F, [hl] jr z, .ok - ld b, BANK(RooftopSaleData2) - ld de, RooftopSaleData2 + ld b, BANK(RooftopSaleMart2) + ld de, RooftopSaleMart2 .ok call LoadMartPointer call ReadMart - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Mart_HowMayIHelpYou call MartTextBox call BuyMenu @@ -158,7 +158,7 @@ StandardMart: ; 15b47 ; 15b62 .HowMayIHelpYou: ; 15b62 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Mart_HowMayIHelpYou call PrintText ld a, $1 ; top menu @@ -166,8 +166,8 @@ StandardMart: ; 15b47 ; 15b6e .TopMenu: ; 15b6e - ld hl, MenuDataHeader_BuySell - call CopyMenuDataHeader + ld hl, MenuHeader_BuySell + call CopyMenuHeader call VerticalMenu jr c, .quit ld a, [wMenuCursorY] @@ -211,7 +211,7 @@ StandardMart: ; 15b47 ; 15baf .AnythingElse: ; 15baf - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, Text_Mart_AnythingElse call PrintText ld a, $1 ; top menu @@ -445,8 +445,8 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef farcall Special_PlaceMoneyTopRight call UpdateSprites - ld hl, MenuDataHeader_Buy - call CopyMenuDataHeader + ld hl, MenuHeader_Buy + call CopyMenuHeader ld a, [wMenuCursorBufferBackup] ld [wMenuCursorBuffer], a ld a, [wMenuScrollPositionBackup] @@ -616,14 +616,14 @@ Text_Mart_CostsThisMuch: ; 0x15e13 db "@" ; 0x15e18 -MenuDataHeader_Buy: ; 0x15e18 +MenuHeader_Buy: ; 0x15e18 db MENU_BACKUP_TILES ; flags menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .menudata2 + dw .MenuData db 1 ; default option ; 0x15e20 -.menudata2 ; 0x15e20 +.MenuData ; 0x15e20 db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db 4, 8 ; rows, columns db 1 ; horizontal spacing @@ -900,14 +900,14 @@ Text_Mart_HowMayIHelpYou: ; 0x15f83 db "@" ; 0x15f88 -MenuDataHeader_BuySell: ; 0x15f88 +MenuHeader_BuySell: ; 0x15f88 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 7, 8 - dw .menudata2 + dw .MenuData db 1 ; default option ; 0x15f90 -.menudata2 ; 0x15f90 +.MenuData ; 0x15f90 db STATICMENU_CURSOR ; strings db 3 ; items db "BUY@" diff --git a/engine/menu.asm b/engine/menu.asm index 802bece08..a4515b414 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -1,6 +1,6 @@ _2DMenu_:: ; 2400e - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall call Draw2DMenu @@ -11,8 +11,8 @@ _2DMenu_:: ; 2400e ; 24022 _InterpretBattleMenu:: ; 24022 - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall call Draw2DMenu @@ -24,8 +24,8 @@ _InterpretBattleMenu:: ; 24022 ; 2403c _InterpretMobileMenu:: ; 2403c - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall call Draw2DMenu @@ -73,7 +73,7 @@ Get2DMenuSelection: ; 2408f call StaticMenuJoypad call MenuClickSound Mobile_GetMenuSelection: ; 24098 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 1, a jr z, .skip call GetMenuJoypad @@ -81,7 +81,7 @@ Mobile_GetMenuSelection: ; 24098 jr nz, .quit1 .skip - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 0, a jr nz, .skip2 call GetMenuJoypad @@ -111,20 +111,20 @@ Mobile_GetMenuSelection: ; 24098 ; 240cd Get2DMenuNumberOfColumns: ; 240cd - ld a, [wMenuData2_2DMenuDimensions] + ld a, [wMenuData_2DMenuDimensions] and $f ret ; 240d3 Get2DMenuNumberOfRows: ; 240d3 - ld a, [wMenuData2_2DMenuDimensions] + ld a, [wMenuData_2DMenuDimensions] swap a and $f ret ; 240db Place2DMenuItemStrings: ; 240db - ld hl, wMenuData2_2DMenuItemStringsAddr + ld hl, wMenuData_2DMenuItemStringsAddr ld e, [hl] inc hl ld d, [hl] @@ -139,10 +139,10 @@ Place2DMenuItemStrings: ; 240db ld c, a .col push bc - ld a, [wMenuData2_2DMenuItemStringsBank] + ld a, [wMenuData_2DMenuItemStringsBank] call Place2DMenuItemName inc de - ld a, [wMenuData2_2DMenuSpacing] + ld a, [wMenuData_2DMenuSpacing] ld c, a ld b, 0 add hl, bc @@ -155,13 +155,13 @@ Place2DMenuItemStrings: ; 240db pop bc dec b jr nz, .row - ld hl, wMenuData2_2DMenuFunctionAddr + ld hl, wMenuData_2DMenuFunctionAddr ld a, [hli] ld h, [hl] ld l, a or h ret z - ld a, [wMenuData2_2DMenuFunctionBank] + ld a, [wMenuData_2DMenuFunctionBank] rst FarCall ret ; 2411a @@ -229,7 +229,7 @@ Init2DMenuCursorPosition: ; 2411a (9:411a) ld hl, w2DMenuFlags1 ld [hli], a ld [hld], a - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 5, a ret z set 5, [hl] @@ -238,14 +238,14 @@ Init2DMenuCursorPosition: ; 2411a (9:411a) ; 2418a .InitFlags_b: ; 2418a - ld a, [wMenuData2_2DMenuSpacing] + ld a, [wMenuData_2DMenuSpacing] or $20 ld [w2DMenuCursorOffsets], a ret ; 24193 .InitFlags_c: ; 24193 - ld hl, wMenuData2Flags + ld hl, wMenuDataFlags ld a, A_BUTTON bit 0, [hl] jr nz, .skip @@ -771,7 +771,7 @@ Error_Cant_ExitMenu: ; 2445d ; 2446d _InitVerticalMenuCursor:: ; 2446d - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] ld b, a ld hl, w2DMenuCursorInitY ld a, [wMenuBorderTopCoord] @@ -786,7 +786,7 @@ _InitVerticalMenuCursor:: ; 2446d inc a ld [hli], a ; w2DMenuNumRows - ld a, [wMenuData2Items] + ld a, [wMenuDataItems] ld [hli], a ; w2DMenuNumCols ld a, 1 @@ -821,7 +821,7 @@ _InitVerticalMenuCursor:: ; 2446d and a jr z, .load_at_the_top ld c, a - ld a, [wMenuData2Items] + ld a, [wMenuDataItems] cp c jr nc, .load_position .load_at_the_top diff --git a/engine/menu_2.asm b/engine/menu_2.asm index c8c4ebf5d..84cc9ca5f 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -28,21 +28,21 @@ PlaceMenuItemQuantity: ; 0x24ac3 ret Special_PlaceMoneyTopRight: ; 24ae8 - ld hl, MenuDataHeader_0x24b15 - call CopyMenuDataHeader - jr PlaceMoneyDataHeader + ld hl, MenuHeader_0x24b15 + call CopyMenuHeader + jr PlaceMoneyTextBox PlaceMoneyBottomLeft: ; 24af0 - ld hl, MenuDataHeader_0x24b1d - call CopyMenuDataHeader - jr PlaceMoneyDataHeader + ld hl, MenuHeader_0x24b1d + call CopyMenuHeader + jr PlaceMoneyTextBox PlaceMoneyAtTopLeftOfTextbox: ; 24af8 - ld hl, MenuDataHeader_0x24b15 + ld hl, MenuHeader_0x24b15 lb de, 0, 11 - call OffsetMenuDataHeader + call OffsetMenuHeader -PlaceMoneyDataHeader: ; 24b01 +PlaceMoneyTextBox: ; 24b01 call MenuBox call MenuBoxCoord2Tile ld de, SCREEN_WIDTH + 1 @@ -52,13 +52,13 @@ PlaceMoneyDataHeader: ; 24b01 call PrintNum ret -MenuDataHeader_0x24b15: ; 0x24b15 +MenuHeader_0x24b15: ; 0x24b15 db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, 2 dw NULL db 1 ; default option -MenuDataHeader_0x24b1d: ; 0x24b1d +MenuHeader_0x24b1d: ; 0x24b1d db MENU_BACKUP_TILES ; flags menu_coords 0, 11, 8, 13 dw NULL diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index cb070e555..8749f0df6 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -5,8 +5,8 @@ MonSubmenu: ; 24d19 ld [hBGMapMode], a call GetMonSubmenuItems farcall FreezeMonIcons - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call .GetTopCoord call PopulateMonMenu @@ -19,7 +19,7 @@ MonSubmenu: ; 24d19 ret ; 24d3f -.MenuDataHeader: ; 24d3f +.MenuHeader: ; 24d3f db MENU_BACKUP_TILES ; flags menu_coords 6, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw 0 @@ -43,9 +43,9 @@ MonSubmenu: ; 24d19 MonMenuLoop: ; 24d59 .loop ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags - ld [wMenuData2Flags], a + ld [wMenuDataFlags], a ld a, [Buffer1] ; items - ld [wMenuData2Items], a + ld [wMenuDataItems], a call InitVerticalMenuCursor ld hl, w2DMenuFlags1 set 6, [hl] @@ -256,16 +256,16 @@ AddMonMenuItem: ; 24e83 ; 24e99 BattleMonMenu: ; 24e99 - ld hl, MenuDataHeader_0x24ed4 - call CopyMenuDataHeader + ld hl, MenuHeader_0x24ed4 + call CopyMenuHeader xor a ld [hBGMapMode], a call MenuBox call UpdateSprites call PlaceVerticalMenuItems call WaitBGMap - call CopyMenuData2 - ld a, [wMenuData2Flags] + call CopyMenuData + ld a, [wMenuDataFlags] bit 7, a jr z, .set_carry call InitVerticalMenuCursor @@ -288,14 +288,14 @@ BattleMonMenu: ; 24e99 ret ; 24ed4 -MenuDataHeader_0x24ed4: ; 24ed4 +MenuHeader_0x24ed4: ; 24ed4 db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw MenuData2_0x24edc + dw MenuData_0x24edc db 1 ; default option ; 24edc -MenuData2_0x24edc: ; 24edc +MenuData_0x24edc: ; 24edc db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "SWITCH@" diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 52894359e..8c1dddd59 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1786,7 +1786,7 @@ TextJump_WasSentToBillsPC: ; 0xe3d9 InitNickname: ; e3de push de - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call DisableSpriteUpdates pop de push de diff --git a/engine/pack.asm b/engine/pack.asm index da75b71b1..2f369fb54 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -74,8 +74,8 @@ Pack: ; 10000 ret .ItemsPocketMenu: ; 10067 (4:4067) - ld hl, ItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, ItemsPocketMenuHeader + call CopyMenuHeader ld a, [wItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wItemsPocketScrollPosition] @@ -102,8 +102,8 @@ Pack: ; 10000 ret .KeyItemsPocketMenu: ; 100a6 (4:40a6) - ld hl, KeyItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, KeyItemsPocketMenuHeader + call CopyMenuHeader ld a, [wKeyItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wKeyItemsPocketScrollPosition] @@ -141,16 +141,16 @@ Pack: ; 10000 ld a, [wItemAttributeParamBuffer] and a jr nz, .use_quit - ld hl, .MenuDataHeader2 + ld hl, .MenuHeader2 ld de, .Jumptable2 jr .load_jump .use_quit - ld hl, .MenuDataHeader1 + ld hl, .MenuHeader1 ld de, .Jumptable1 .load_jump push de - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu pop hl @@ -161,14 +161,14 @@ Pack: ; 10000 jp hl ; 10124 (4:4124) -.MenuDataHeader1: ; 0x10124 +.MenuHeader1: ; 0x10124 db MENU_BACKUP_TILES ; flags menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2_1 + dw .MenuData_1 db 1 ; default option ; 0x1012c -.MenuData2_1: ; 0x1012c +.MenuData_1: ; 0x1012c db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" @@ -181,14 +181,14 @@ Pack: ; 10000 ; 1013b -.MenuDataHeader2: ; 0x1013b +.MenuHeader2: ; 0x1013b db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2_2 + dw .MenuData_2 db 1 ; default option ; 0x10143 -.MenuData2_2: ; 0x10143 +.MenuData_2: ; 0x10143 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "USE@" @@ -232,8 +232,8 @@ Pack: ; 10000 ret .BallsPocketMenu: ; 10198 (4:4198) - ld hl, BallsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, BallsPocketMenuHeader + call CopyMenuHeader ld a, [wBallsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wBallsPocketScrollPosition] @@ -280,36 +280,36 @@ Pack: ; 10000 jr .tossable_unselectable .usable - ld hl, MenuDataHeader_UsableKeyItem + ld hl, MenuHeader_UsableKeyItem ld de, Jumptable_UseGiveTossRegisterQuit jr .build_menu .selectable_usable - ld hl, MenuDataHeader_UsableItem + ld hl, MenuHeader_UsableItem ld de, Jumptable_UseGiveTossQuit jr .build_menu .tossable_selectable - ld hl, MenuDataHeader_UnusableItem + ld hl, MenuHeader_UnusableItem ld de, Jumptable_UseQuit jr .build_menu .tossable_unselectable - ld hl, MenuDataHeader_UnusableKeyItem + ld hl, MenuHeader_UnusableKeyItem ld de, Jumptable_UseRegisterQuit jr .build_menu .unusable - ld hl, MenuDataHeader_HoldableKeyItem + ld hl, MenuHeader_HoldableKeyItem ld de, Jumptable_GiveTossRegisterQuit jr .build_menu .selectable_unusable - ld hl, MenuDataHeader_HoldableItem + ld hl, MenuHeader_HoldableItem ld de, Jumptable_GiveTossQuit .build_menu push de - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu pop hl @@ -320,14 +320,14 @@ Pack: ; 10000 jp hl ; 10249 (4:4249) -MenuDataHeader_UsableKeyItem: ; 0x10249 +MenuHeader_UsableKeyItem: ; 0x10249 db MENU_BACKUP_TILES ; flags menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10251 -.MenuData2: ; 0x10251 +.MenuData: ; 0x10251 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 5 ; items db "USE@" @@ -345,14 +345,14 @@ Jumptable_UseGiveTossRegisterQuit: ; 1026a dw QuitItemSubmenu ; 10274 -MenuDataHeader_UsableItem: ; 0x10274 +MenuHeader_UsableItem: ; 0x10274 db MENU_BACKUP_TILES ; flags menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x1027c -.MenuData2: ; 0x1027c +.MenuData: ; 0x1027c db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 4 ; items db "USE@" @@ -368,14 +368,14 @@ Jumptable_UseGiveTossQuit: ; 10291 dw QuitItemSubmenu ; 10299 -MenuDataHeader_UnusableItem: ; 0x10299 +MenuHeader_UnusableItem: ; 0x10299 db MENU_BACKUP_TILES ; flags menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102a1 -.MenuData2: ; 0x102a1 +.MenuData: ; 0x102a1 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" @@ -387,14 +387,14 @@ Jumptable_UseQuit: ; 102ac dw QuitItemSubmenu ; 102b0 -MenuDataHeader_UnusableKeyItem: ; 0x102b0 +MenuHeader_UnusableKeyItem: ; 0x102b0 db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102b8 -.MenuData2: ; 0x102b8 +.MenuData: ; 0x102b8 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "USE@" @@ -408,14 +408,14 @@ Jumptable_UseRegisterQuit: ; 102c7 dw QuitItemSubmenu ; 102cd -MenuDataHeader_HoldableKeyItem: ; 0x102cd +MenuHeader_HoldableKeyItem: ; 0x102cd db MENU_BACKUP_TILES ; flags menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102d5 -.MenuData2: ; 0x102d5 +.MenuData: ; 0x102d5 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 4 ; items db "GIVE@" @@ -431,14 +431,14 @@ Jumptable_GiveTossRegisterQuit: ; 102ea dw QuitItemSubmenu ; 102f2 -MenuDataHeader_HoldableItem: ; 0x102f2 +MenuHeader_HoldableItem: ; 0x102f2 db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x102fa -.MenuData2: ; 0x102fa +.MenuData: ; 0x102fa db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "GIVE@" @@ -724,8 +724,8 @@ BattlePack: ; 10493 ret .ItemsPocketMenu: ; 104fa (4:44fa) - ld hl, ItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, ItemsPocketMenuHeader + call CopyMenuHeader ld a, [wItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wItemsPocketScrollPosition] @@ -752,8 +752,8 @@ BattlePack: ; 10493 ret .KeyItemsPocketMenu: ; 10539 (4:4539) - ld hl, KeyItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, KeyItemsPocketMenuHeader + call CopyMenuHeader ld a, [wKeyItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wKeyItemsPocketScrollPosition] @@ -803,8 +803,8 @@ BattlePack: ; 10493 ret .BallsPocketMenu: ; 105a6 (4:45a6) - ld hl, BallsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, BallsPocketMenuHeader + call CopyMenuHeader ld a, [wBallsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wBallsPocketScrollPosition] @@ -827,16 +827,16 @@ ItemSubmenu: ; 105d3 (4:45d3) TMHMSubmenu: ; 105dc (4:45dc) and a jr z, .NoUse - ld hl, .UsableMenuDataHeader + ld hl, .UsableMenuHeader ld de, .UsableJumptable jr .proceed .NoUse: - ld hl, .UnusableMenuDataHeader + ld hl, .UnusableMenuHeader ld de, .UnusableJumptable .proceed push de - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu pop hl @@ -847,14 +847,14 @@ TMHMSubmenu: ; 105dc (4:45dc) jp hl ; 10601 (4:4601) -.UsableMenuDataHeader: ; 0x10601 +.UsableMenuHeader: ; 0x10601 db MENU_BACKUP_TILES ; flags menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .UsableMenuData2 + dw .UsableMenuData db 1 ; default option ; 0x10609 -.UsableMenuData2: ; 0x10609 +.UsableMenuData: ; 0x10609 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "USE@" @@ -866,14 +866,14 @@ TMHMSubmenu: ; 105dc (4:45dc) dw .Quit ; 10618 -.UnusableMenuDataHeader: ; 0x10618 +.UnusableMenuHeader: ; 0x10618 db MENU_BACKUP_TILES ; flags menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .UnusableMenuData2 + dw .UnusableMenuData db 1 ; default option ; 0x10620 -.UnusableMenuData2: ; 0x10620 +.UnusableMenuData: ; 0x10620 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 1 ; items db "QUIT@" @@ -1006,8 +1006,8 @@ DepositSellPack: ; 106be .ItemsPocket: ; 106d9 (4:46d9) xor a ; ITEM_POCKET call InitPocket - ld hl, PC_Mart_ItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, PC_Mart_ItemsPocketMenuHeader + call CopyMenuHeader ld a, [wItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wItemsPocketScrollPosition] @@ -1022,8 +1022,8 @@ DepositSellPack: ; 106be .KeyItemsPocket: ; 106ff (4:46ff) ld a, KEY_ITEM_POCKET call InitPocket - ld hl, PC_Mart_KeyItemsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, PC_Mart_KeyItemsPocketMenuHeader + call CopyMenuHeader ld a, [wKeyItemsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wKeyItemsPocketScrollPosition] @@ -1047,8 +1047,8 @@ DepositSellPack: ; 106be .BallsPocket: ; 1073b (4:473b) ld a, BALL_POCKET call InitPocket - ld hl, PC_Mart_BallsPocketMenuDataHeader - call CopyMenuDataHeader + ld hl, PC_Mart_BallsPocketMenuHeader + call CopyMenuHeader ld a, [wBallsPocketCursor] ld [wMenuCursorBuffer], a ld a, [wBallsPocketScrollPosition] @@ -1153,18 +1153,18 @@ TutorialPack: ; 107bb .Items: ; 107e9 (4:47e9) xor a ; ITEM_POCKET - ld hl, .ItemsMenuDataHeader + ld hl, .ItemsMenuHeader jr .DisplayPocket ; 107ef (4:47ef) -.ItemsMenuDataHeader: ; 0x107ef +.ItemsMenuHeader: ; 0x107ef db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .ItemsMenuData2 + dw .ItemsMenuData db 1 ; default option ; 0x107f7 -.ItemsMenuData2: ; 0x107f7 +.ItemsMenuData: ; 0x107f7 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1176,18 +1176,18 @@ TutorialPack: ; 107bb .KeyItems: ; 10807 (4:4807) ld a, KEY_ITEM_POCKET - ld hl, .KeyItemsMenuDataHeader + ld hl, .KeyItemsMenuHeader jr .DisplayPocket ; 1080e (4:480e) -.KeyItemsMenuDataHeader: ; 0x1080e +.KeyItemsMenuHeader: ; 0x1080e db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .KeyItemsMenuData2 + dw .KeyItemsMenuData db 1 ; default option ; 0x10816 -.KeyItemsMenuData2: ; 0x10816 +.KeyItemsMenuData: ; 0x10816 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 1 ; horizontal spacing @@ -1208,18 +1208,18 @@ TutorialPack: ; 107bb .Balls: ; 1083b (4:483b) ld a, BALL_POCKET - ld hl, .BallsMenuDataHeader + ld hl, .BallsMenuHeader jr .DisplayPocket ; 10842 (4:4842) -.BallsMenuDataHeader: ; 0x10842 +.BallsMenuHeader: ; 0x10842 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .BallsMenuData2 + dw .BallsMenuData db 1 ; default option ; 0x1084a -.BallsMenuData2: ; 0x1084a +.BallsMenuData: ; 0x1084a db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1233,7 +1233,7 @@ TutorialPack: ; 107bb push hl call InitPocket pop hl - call CopyMenuDataHeader + call CopyMenuHeader call ScrollingMenu ret @@ -1536,14 +1536,14 @@ Pack_InitColors: ; 10a40 ret ; 10a4f -ItemsPocketMenuDataHeader: ; 0x10a4f +ItemsPocketMenuHeader: ; 0x10a4f db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a57 -.MenuData2: ; 0x10a57 +.MenuData: ; 0x10a57 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1553,14 +1553,14 @@ ItemsPocketMenuDataHeader: ; 0x10a4f dba UpdateItemDescription ; 10a67 -PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67 +PC_Mart_ItemsPocketMenuHeader: ; 0x10a67 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a6f -.MenuData2: ; 0x10a6f +.MenuData: ; 0x10a6f db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1570,14 +1570,14 @@ PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67 dba UpdateItemDescription ; 10a7f -KeyItemsPocketMenuDataHeader: ; 0x10a7f +KeyItemsPocketMenuHeader: ; 0x10a7f db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a87 -.MenuData2: ; 0x10a87 +.MenuData: ; 0x10a87 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 1 ; horizontal spacing @@ -1587,14 +1587,14 @@ KeyItemsPocketMenuDataHeader: ; 0x10a7f dba UpdateItemDescription ; 10a97 -PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97 +PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10a9f -.MenuData2: ; 0x10a9f +.MenuData: ; 0x10a9f db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags db 5, 8 ; rows, columns db 1 ; horizontal spacing @@ -1604,14 +1604,14 @@ PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97 dba UpdateItemDescription ; 10aaf -BallsPocketMenuDataHeader: ; 0x10aaf +BallsPocketMenuHeader: ; 0x10aaf db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10ab7 -.MenuData2: ; 0x10ab7 +.MenuData: ; 0x10ab7 db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing @@ -1621,14 +1621,14 @@ BallsPocketMenuDataHeader: ; 0x10aaf dba UpdateItemDescription ; 10ac7 -PC_Mart_BallsPocketMenuDataHeader: ; 0x10ac7 +PC_Mart_BallsPocketMenuHeader: ; 0x10ac7 db MENU_BACKUP_TILES ; flags menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x10acf -.MenuData2: ; 0x10acf +.MenuData: ; 0x10acf db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags db 5, 8 ; rows, columns db 2 ; horizontal spacing diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 28441e700..109e28168 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -56,13 +56,13 @@ MovePlayerPic: ; 88266 jr .loop ShowPlayerNamingChoices: ; 88297 - ld hl, ChrisNameMenuDataHeader + ld hl, ChrisNameMenuHeader ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a jr z, .GotGender - ld hl, KrisNameMenuDataHeader + ld hl, KrisNameMenuHeader .GotGender: - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu ld a, [wMenuCursorY] dec a diff --git a/engine/save.asm b/engine/save.asm index 4291754e9..98be64ee6 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,5 +1,5 @@ SaveMenu: ; 14a1a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall DisplaySaveInfoOnSave call SpeechTextBox call UpdateSprites diff --git a/engine/scripting.asm b/engine/scripting.asm index a3c906a83..8ffdb9fcd 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -144,7 +144,7 @@ ScriptCommandTable: dw Script_writetext ; 4c dw Script_repeattext ; 4d dw Script_yesorno ; 4e - dw Script_loadmenudata ; 4f + dw Script_loadmenuheader ; 4f dw Script_closewindow ; 50 dw Script_jumptextfaceplayer ; 51 if _CRYSTAL @@ -432,15 +432,15 @@ Script_yesorno: ld [ScriptVar], a ret -Script_loadmenudata: +Script_loadmenuheader: ; script command 0x4f -; parameters: data +; parameters: menu_header call GetScriptByte ld l, a call GetScriptByte ld h, a - ld de, LoadMenuDataHeader + ld de, LoadMenuHeader ld a, [ScriptBank] call Call_a_de call UpdateSprites diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index 32acf2def..6704942ec 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -118,7 +118,7 @@ ScrollingMenuJoyAction: ; 24609 ; 24673 .select ; 24673 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 7, a jp z, xor_a_dec_a ld a, [wMenuCursorY] @@ -136,7 +136,7 @@ ScrollingMenuJoyAction: ; 24609 ; 24695 .start ; 24695 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 6, a jp z, xor_a_dec_a ld a, START @@ -148,7 +148,7 @@ ScrollingMenuJoyAction: ; 24609 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 3, a jp z, xor_a_dec_a ld a, D_LEFT @@ -160,7 +160,7 @@ ScrollingMenuJoyAction: ; 24609 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 2, a jp z, xor_a_dec_a ld a, D_RIGHT @@ -188,7 +188,7 @@ ScrollingMenuJoyAction: ; 24609 bit 7, [hl] jp z, xor_a ld hl, wMenuScrollPosition - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] add [hl] ld b, a ld a, [wScrollingMenuListSize] @@ -215,7 +215,7 @@ ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706) ld de, SCREEN_WIDTH add hl, de ld de, 2 * SCREEN_WIDTH - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] .loop ld [hl], " " add hl, de @@ -224,14 +224,14 @@ ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706) ret InitScrollingMenuCursor: ; 2471a - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a - ld a, [wMenuData2_ItemsPointerBank] + ld a, [wMenuData_ItemsPointerBank] call GetFarByte ld [wScrollingMenuListSize], a - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] ld c, a ld a, [wMenuScrollPosition] add c @@ -240,7 +240,7 @@ InitScrollingMenuCursor: ; 2471a inc a cp c jr nc, .skip - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] ld c, a ld a, [wScrollingMenuListSize] inc a @@ -274,7 +274,7 @@ InitScrollingMenuCursor: ; 2471a ; 24764 ScrollingMenu_InitFlags: ; 24764 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] ld c, a ld a, [wScrollingMenuListSize] ld b, a @@ -284,7 +284,7 @@ ScrollingMenu_InitFlags: ; 24764 ld a, [wMenuBorderLeftCoord] add 0 ld [w2DMenuCursorInitX], a - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] cp b jr c, .no_extra_row jr z, .no_extra_row @@ -363,7 +363,7 @@ ScrollingMenu_ValidateSwitchItem: ; 247dd ScrollingMenu_UpdateDisplay: ; 247f0 call ClearWholeMenuBox - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ; place arrows jr z, .okay ld a, [wMenuScrollPosition] @@ -380,7 +380,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 call MenuBoxCoord2Tile ld bc, SCREEN_WIDTH + 1 add hl, bc - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] ld b, a ld c, $0 .loop @@ -403,7 +403,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 ld a, c cp b jr nz, .loop - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ; place arrows jr z, .done ld a, [wMenuBorderBottomCoord] @@ -417,7 +417,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 ret .cancel - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 0, a ; call function on cancel jr nz, .call_function ld de, .string_2485f @@ -430,7 +430,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0 .call_function ld d, h ld e, l - ld hl, wMenuData2_ScrollingMenuFunction1 + ld hl, wMenuData_ScrollingMenuFunction1 jp CallPointerAt ; 2486e @@ -438,10 +438,10 @@ ScrollingMenu_CallFunctions1and2: ; 2486e push hl ld d, h ld e, l - ld hl, wMenuData2_ScrollingMenuFunction1 + ld hl, wMenuData_ScrollingMenuFunction1 call CallPointerAt pop hl - ld a, [wMenuData2_ScrollingMenuWidth] + ld a, [wMenuData_ScrollingMenuWidth] and a jr z, .done ld e, a @@ -449,7 +449,7 @@ ScrollingMenu_CallFunctions1and2: ; 2486e add hl, de ld d, h ld e, l - ld hl, wMenuData2_ScrollingMenuFunction2 + ld hl, wMenuData_ScrollingMenuFunction2 call CallPointerAt .done @@ -465,7 +465,7 @@ ScrollingMenu_PlaceCursor: ; 2488b cp b jr nc, .done ld c, a - ld a, [wMenuData2_ScrollingMenuHeight] + ld a, [wMenuData_ScrollingMenuHeight] add c cp b jr c, .done @@ -489,7 +489,7 @@ ScrollingMenu_PlaceCursor: ; 2488b ; 248b8 ScrollingMenu_CheckCallFunction3: ; 248b8 - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 5, a ; call function 3 ret z bit 1, a ; call function 3 if not switching items @@ -502,7 +502,7 @@ ScrollingMenu_CheckCallFunction3: ; 248b8 ld a, [wMenuCursorY] dec a call ScrollingMenu_GetListItemCoordAndFunctionArgs - ld hl, wMenuData2_ScrollingMenuFunction3 + ld hl, wMenuData_ScrollingMenuFunction3 call CallPointerAt ret ; 248d5 @@ -515,12 +515,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5 add e ld e, a ld d, $0 - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a inc hl ; items - ld a, [wMenuData2_ScrollingMenuSpacing] + ld a, [wMenuData_ScrollingMenuSpacing] cp 1 jr z, .got_spacing cp 2 @@ -529,12 +529,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5 add hl, de .got_spacing add hl, de - ld a, [wMenuData2_ItemsPointerBank] + ld a, [wMenuData_ItemsPointerBank] call GetFarByte ld [MenuSelection], a ld [CurItem], a inc hl - ld a, [wMenuData2_ItemsPointerBank] + ld a, [wMenuData_ItemsPointerBank] call GetFarByte ld [MenuSelectionQuantity], a pop hl diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index cfec11091..68df631e4 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -1809,8 +1809,8 @@ Slots_AskBet: ; 9307c (24:707c) .loop ld hl, .Text_BetHowManyCoins call PrintText - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call VerticalMenu call CloseWindow ret c @@ -1867,14 +1867,14 @@ Slots_AskBet: ; 9307c (24:707c) db "@" ; 0x930d6 -.MenuDataHeader: ; 0x930d6 +.MenuHeader: ; 0x930d6 db MENU_BACKUP_TILES ; flags menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x930de -.MenuData2: ; 0x930de +.MenuData: ; 0x930de db STATICMENU_CURSOR ; flags db 3 ; items db " 3@" diff --git a/engine/start_menu.asm b/engine/start_menu.asm index 8784c6bb6..23302e701 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -22,12 +22,12 @@ StartMenu:: ; 125cd ld hl, wStatusFlags2 bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] - ld hl, .MenuDataHeader + ld hl, .MenuHeader jr z, .GotMenuData - ld hl, .ContestMenuDataHeader + ld hl, .ContestMenuHeader .GotMenuData: - call LoadMenuDataHeader + call LoadMenuHeader call .SetUpMenuItems ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a @@ -164,13 +164,13 @@ StartMenu:: ; 125cd ; 126d3 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw .MenuData db 1 ; default selection -.ContestMenuDataHeader: +.ContestMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 10, 2, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw .MenuData @@ -289,7 +289,7 @@ endr .GetMenuAccountTextPointer: ; 12819 ld e, a ld d, 0 - ld hl, wMenuData2PointerTableAddr + ld hl, wMenuDataPointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -813,7 +813,7 @@ GiveTakePartyMonItem: ; 12b60 jr z, .cancel ld hl, GiveTakeItemMenuData - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .cancel @@ -827,7 +827,7 @@ GiveTakePartyMonItem: ; 12b60 cp 1 jr nz, .take - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearPalettes call .GiveItem call ClearPalettes @@ -1121,8 +1121,8 @@ MonMailAction: ; 12d45 jr z, .read ; Show the READ/TAKE/QUIT menu. - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu @@ -1184,14 +1184,14 @@ MonMailAction: ; 12d45 ; 12dc9 -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 0x12dd1 -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "READ@" @@ -1238,7 +1238,7 @@ MonMailAction: ; 12d45 OpenPartyStats: ; 12e00 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call ClearSprites ; PartyMon xor a diff --git a/engine/switch_items.asm b/engine/switch_items.asm index b699d4719..77b635246 100755 --- a/engine/switch_items.asm +++ b/engine/switch_items.asm @@ -145,7 +145,7 @@ Function249d1: ; 249d1 (9:49d1) inc hl pop af ld [hl], a - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a @@ -199,7 +199,7 @@ Function24a4d: ; 24a4d (9:4a4d) ItemSwitch_GetNthItem: ; 24a5c (9:4a5c) push af call ItemSwitch_ConvertSpacingToDW - ld hl, wMenuData2_ItemsPointerAddr + ld hl, wMenuData_ItemsPointerAddr ld a, [hli] ld h, [hl] ld l, a @@ -227,7 +227,7 @@ Function24a6c: ; 24a6c (9:4a6c) ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80) ; This function is absolutely idiotic. push hl - ld a, [wMenuData2_ScrollingMenuSpacing] + ld a, [wMenuData_ScrollingMenuSpacing] ld c, a ld b, 0 ld hl, .spacing_dws diff --git a/engine/timeset.asm b/engine/timeset.asm index 67aa9973e..c2ba14ef4 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -426,7 +426,7 @@ Special_SetDayOfWeek: ; 90913 hlcoord 0, 12 lb bc, 4, 18 call TextBox - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld hl, .WhatDayIsItText call PrintText hlcoord 9, 3 diff --git a/home.asm b/home.asm index 35968744d..b375b8d5b 100644 --- a/home.asm +++ b/home.asm @@ -773,7 +773,7 @@ INCLUDE "home/pokedex_flags.asm" INCLUDE "home/names.asm" ScrollingMenu:: ; 350c - call CopyMenuData2 + call CopyMenuData ld a, [hROMBank] push af diff --git a/home/map.asm b/home/map.asm index 1ed0e5ca8..402b7f4ec 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1983,7 +1983,7 @@ CheckCurrentMapCoordEvents:: ; 2ad4 FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall Special_FadeOutPalettes call ClearSprites call DisableSpriteUpdates diff --git a/home/menu.asm b/home/menu.asm index f8ade3f58..a43e05757 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -1,14 +1,14 @@ ; Functions used in displaying and handling menus. -LoadMenuDataHeader:: - call CopyMenuDataHeader +LoadMenuHeader:: + call CopyMenuHeader call PushWindow ret -CopyMenuDataHeader:: - ld de, wMenuDataHeader - ld bc, wMenuDataHeaderEnd - wMenuDataHeader +CopyMenuHeader:: + ld de, wMenuHeader + ld bc, wMenuHeaderEnd - wMenuHeader call CopyBytes ld a, [hROMBank] ld [wMenuDataBank], a @@ -33,12 +33,12 @@ MenuTextBox:: ; 1d4f ; 1d58 LoadMenuTextBox:: ; 1d58 - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader ret ; 1d5f -.MenuDataHeader: ; 1d5f +.MenuHeader: ; 1d5f db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw vTiles0 @@ -51,13 +51,13 @@ MenuTextBoxBackup:: ; 1d67 ret ; 1d6e -LoadStandardMenuDataHeader:: ; 1d6e - ld hl, .MenuDataHeader - call LoadMenuDataHeader +LoadStandardMenuHeader:: ; 1d6e + ld hl, .MenuHeader + call LoadMenuHeader ret ; 1d75 -.MenuDataHeader: ; 1d75 +.MenuHeader: ; 1d75 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw 0 @@ -76,8 +76,8 @@ VerticalMenu:: call UpdateSprites call PlaceVerticalMenuItems call ApplyTilemap - call CopyMenuData2 - ld a, [wMenuData2Flags] + call CopyMenuData + ld a, [wMenuDataFlags] bit 7, a jr z, .cancel call InitVerticalMenuCursor @@ -95,7 +95,7 @@ VerticalMenu:: ; 0x1dab GetMenu2:: ; 1dab - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu call CloseWindow ld a, [wMenuCursorY] @@ -106,7 +106,7 @@ CopyNameFromMenu:: push hl push bc push af - ld hl, wMenuData2Pointer + ld hl, wMenuDataPointer ld a, [hli] ld h, [hl] ld l, a @@ -130,14 +130,14 @@ PlaceYesNoBox:: ; 1dd2 jr _YesNoBox PlaceGenericTwoOptionBox:: ; 1dd4 - call LoadMenuDataHeader + call LoadMenuHeader jr InterpretTwoOptionMenu _YesNoBox:: ; 1dd9 ; Return nc (yes) or c (no). push bc - ld hl, YesNoMenuDataHeader - call CopyMenuDataHeader + ld hl, YesNoMenuHeader + call CopyMenuHeader pop bc ; This seems to be an overflow prevention, but ; it was coded wrong. @@ -179,29 +179,29 @@ InterpretTwoOptionMenu:: ; 1dfe ret ; 1e1d -YesNoMenuDataHeader:: ; 1e1d +YesNoMenuHeader:: ; 1e1d db MENU_BACKUP_TILES ; flags menu_coords 10, 5, 15, 9 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 1e25 -.MenuData2: ; 1e25 +.MenuData: ; 1e25 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "YES@" db "NO@" ; 1e2e -OffsetMenuDataHeader:: ; 1e2e - call _OffsetMenuDataHeader +OffsetMenuHeader:: ; 1e2e + call _OffsetMenuHeader call PushWindow ret ; 1e35 -_OffsetMenuDataHeader:: ; 1e35 +_OffsetMenuHeader:: ; 1e35 push de - call CopyMenuDataHeader + call CopyMenuHeader pop de ld a, [wMenuBorderLeftCoord] ld h, a @@ -243,7 +243,7 @@ SetUpMenu:: ; 1e70 ret DrawVariableLengthMenuBox:: - call CopyMenuData2 + call CopyMenuData call GetMenuIndexSet call AutomaticGetMenuBottomCoord call MenuBox @@ -271,7 +271,7 @@ AutomaticGetMenuBottomCoord:: ; 1ea6 ld a, [wMenuBorderRightCoord] sub c ld c, a - ld a, [wMenuData2Items] + ld a, [wMenuDataItems] add a inc a ld b, a @@ -282,7 +282,7 @@ AutomaticGetMenuBottomCoord:: ; 1ea6 ; 1ebd GetMenuIndexSet:: ; 1ebd - ld hl, wMenuData2IndicesPointer + ld hl, wMenuDataIndicesPointer ld a, [hli] ld h, [hl] ld l, a @@ -302,7 +302,7 @@ GetMenuIndexSet:: ; 1ebd ld d, h ld e, l ld a, [hl] - ld [wMenuData2Items], a + ld [wMenuDataItems], a ret ; 1eda @@ -320,7 +320,7 @@ RunMenuItemPrintingFunction:: ; 1eda push hl ld d, h ld e, l - ld hl, wMenuData2DisplayFunctionPointer + ld hl, wMenuDataDisplayFunctionPointer call ._hl_ pop hl ld de, 2 * SCREEN_WIDTH @@ -339,13 +339,13 @@ RunMenuItemPrintingFunction:: ; 1eda InitMenuCursorAndButtonPermissions:: ; 1eff call InitVerticalMenuCursor ld hl, wMenuJoypadFilter - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 3, a jr z, .disallow_select set START_F, [hl] .disallow_select - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 2, a jr z, .disallow_left_right set D_LEFT_F, [hl] @@ -422,7 +422,7 @@ ContinueGettingMenuJoypad: PlaceMenuStrings:: ; 1f79 push de - ld hl, wMenuData2PointerTableAddr + ld hl, wMenuDataPointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -471,7 +471,7 @@ MenuJumptable:: ; 1fa7 GetMenuDataPointerTableEntry:: ; 1fb1 ld e, a ld d, $0 - ld hl, wMenuData2PointerTableAddr + ld hl, wMenuDataPointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -485,9 +485,9 @@ GetMenuDataPointerTableEntry:: ; 1fb1 ClearWindowData:: ; 1fbf ld hl, wWindowStackPointer call .bytefill - ld hl, wMenuDataHeader + ld hl, wMenuHeader call .bytefill - ld hl, wMenuData2Flags + ld hl, wMenuDataFlags call .bytefill ld hl, w2DMenuCursorInitY call .bytefill @@ -563,7 +563,7 @@ Place2DMenuItemName:: ; 201c _2DMenu:: ; 202a ld a, [hROMBank] - ld [wMenuData2_2DMenuItemStringsBank], a + ld [wMenuData_2DMenuItemStringsBank], a farcall _2DMenu_ ld a, [wMenuCursorBuffer] ret @@ -571,7 +571,7 @@ _2DMenu:: ; 202a InterpretBattleMenu:: ; 2039 ld a, [hROMBank] - ld [wMenuData2_2DMenuItemStringsBank], a + ld [wMenuData_2DMenuItemStringsBank], a farcall _InterpretBattleMenu ld a, [wMenuCursorBuffer] ret @@ -579,7 +579,7 @@ InterpretBattleMenu:: ; 2039 InterpretMobileMenu:: ; 2048 ld a, [hROMBank] - ld [wMenuData2_2DMenuItemStringsBank], a + ld [wMenuData_2DMenuItemStringsBank], a farcall _InterpretMobileMenu ld a, [wMenuCursorBuffer] ret diff --git a/home/tilemap.asm b/home/tilemap.asm index 9e15ed85b..2831558a8 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -79,17 +79,17 @@ GetMenuBoxDims:: ; 0x1c53 ret ; 0x1c66 -CopyMenuData2:: ; 1c66 +CopyMenuData:: ; 1c66 push hl push de push bc push af - ld hl, wMenuData2Pointer + ld hl, wMenuDataPointer ld a, [hli] ld h, [hl] ld l, a - ld de, wMenuData2Flags - ld bc, wMenuData2End - wMenuData2Flags + ld de, wMenuDataFlags + ld bc, wMenuDataEnd - wMenuDataFlags call CopyBytes pop af pop bc @@ -111,8 +111,8 @@ GetWindowStackTop:: ; 1c7e ; 1c89 PlaceVerticalMenuItems:: ; 1c89 - call CopyMenuData2 - ld hl, wMenuData2Pointer + call CopyMenuData + ld hl, wMenuDataPointer ld e, [hl] inc hl ld d, [hl] @@ -132,7 +132,7 @@ PlaceVerticalMenuItems:: ; 1c89 dec b jr nz, .loop - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ret z @@ -161,14 +161,14 @@ GetMenuTextStartCoord:: ; 1cc6 ld c, a inc c ; bit 6: if not set, leave extra room on top - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 6, a jr nz, .bit_6_set inc b .bit_6_set ; bit 7: if set, leave extra room on the left - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 7, a jr z, .bit_7_clear inc c diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 9bca1c004..6b17f5d94 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -520,10 +520,10 @@ yesorno: MACRO db yesorno_command ENDM - enum loadmenudata_command ; $4f -loadmenudata: MACRO - db loadmenudata_command - dw \1 ; data + enum loadmenuheader_command ; $4f +loadmenuheader: MACRO + db loadmenuheader_command + dw \1 ; menu_header ENDM enum closewindow_command ; $50 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 5a5e37afc..188f977bb 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -25,7 +25,7 @@ CeladonDeptStore6FVendingMachine: writetext CeladonVendingText .Start: special Special_PlaceMoneyTopRight - loadmenudata .MenuData + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .FreshWater @@ -79,13 +79,13 @@ CeladonDeptStore6FVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 1caed4b19..b8d3ce032 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -25,7 +25,7 @@ CeladonGameCornerPrizeRoomTMVendor: writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: special Special_DisplayCoinCaseBalance - loadmenudata CeladonPrizeRoom_TMMenuDataHeader + loadmenuheader CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow if_equal 1, .doubleteam @@ -102,13 +102,13 @@ CeladonPrizeRoom_NoCoinCase: closetext end -CeladonPrizeRoom_TMMenuDataHeader: +CeladonPrizeRoom_TMMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" @@ -126,7 +126,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: .loop writetext CeladonPrizeRoom_AskWhichPrizeText special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .pikachu @@ -188,13 +188,13 @@ CeladonGameCornerPrizeRoomPokemonVendor: takecoins 8888 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 8be52840d..54797c90f 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -30,7 +30,7 @@ DragonShrine_MapScripts: setevent EVENT_RECEIVED_BALLS_FROM_KURT writetext DragonShrineQuestion1Text buttonsound - loadmenudata DragonShrineQuestion1_MenuDataHeader + loadmenuheader DragonShrineQuestion1_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -42,7 +42,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_2 writetext DragonShrineQuestion2Text buttonsound - loadmenudata DragonShrineQuestion2_MenuDataHeader + loadmenuheader DragonShrineQuestion2_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -52,7 +52,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext DragonShrineQuestion3Text buttonsound - loadmenudata DragonShrineQuestion3_MenuDataHeader + loadmenuheader DragonShrineQuestion3_MenuHeader verticalmenu closewindow if_equal 1, .WrongAnswer @@ -62,7 +62,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext DragonShrineQuestion4Text buttonsound - loadmenudata DragonShrineQuestion4_MenuDataHeader + loadmenuheader DragonShrineQuestion4_MenuHeader verticalmenu closewindow if_equal 1, .RightAnswer @@ -72,7 +72,7 @@ DragonShrine_MapScripts: setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext DragonShrineQuestion5Text buttonsound - loadmenudata DragonShrineQuestion5_MenuDataHeader + loadmenuheader DragonShrineQuestion5_MenuHeader verticalmenu closewindow if_equal 1, .WrongAnswer @@ -265,65 +265,65 @@ DragonShrineElder3Script: closetext end -DragonShrineQuestion1_MenuDataHeader: +DragonShrineQuestion1_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" db "Friend@" -DragonShrineQuestion2_MenuDataHeader: +DragonShrineQuestion2_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" db "Cheating@" -DragonShrineQuestion3_MenuDataHeader: +DragonShrineQuestion3_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" db "Anybody@" -DragonShrineQuestion4_MenuDataHeader: +DragonShrineQuestion4_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" db "Knowledge@" -DragonShrineQuestion5_MenuDataHeader: +DragonShrineQuestion5_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 1936858dd..9f2d40ad5 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -66,7 +66,7 @@ AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .BlackboardMenuData + loadmenuheader .BlackboardMenuHeader _2dmenu closewindow if_equal 1, .Poison @@ -102,13 +102,13 @@ AcademyBlackboard: waitbutton jump .Loop -.BlackboardMenuData: +.BlackboardMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 11, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8b64a4435..f8be7e5ca 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -65,7 +65,7 @@ MoveTutor: checkcoins 4000 if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata .MoveMenuDataHeader + loadmenuheader .MoveMenuHeader verticalmenu closewindow if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower @@ -94,13 +94,13 @@ MoveTutor: if_equal FALSE, .TeachMove jump .Incompatible -.MoveMenuDataHeader: +.MoveMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 73cb0f17e..49cd09ebd 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -14,7 +14,7 @@ GoldenrodVendingMachine: writetext GoldenrodVendingText .Start: special Special_PlaceMoneyTopRight - loadmenudata .MenuData + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .FreshWater @@ -68,13 +68,13 @@ GoldenrodVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index d467e84c3..cc04df7fb 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -61,7 +61,7 @@ GoldenrodGmeCornerTMVendorScript: writetext GoldenrodGameCornerPrizeVendorWhichPrizeText GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 special Special_DisplayCoinCaseBalance - loadmenudata GoldenrodGameCornerTMVendorMenuData + loadmenuheader GoldenrodGameCornerTMVendorMenuHeader verticalmenu closewindow if_equal 1, .Thunder @@ -138,13 +138,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end -GoldenrodGameCornerTMVendorMenuData: +GoldenrodGameCornerTMVendorMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" @@ -162,7 +162,7 @@ GoldenrodGameCornerPrizeMonVendorScript: .loop writetext GoldenrodGameCornerPrizeVendorWhichPrizeText special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + loadmenuheader .MenuHeader verticalmenu closewindow if_equal 1, .abra @@ -224,13 +224,13 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 1500 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index 53a1043f8..063d4b2ac 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -25,7 +25,7 @@ PokecomCenterAdminRoomMobileSignpost0Script: waitbutton UnknownScript_0x625df: reloadmappart - loadmenudata MenuDataHeader_0x62602 + loadmenuheader MenuHeader_0x62602 verticalmenu closewindow if_equal 1, UnknownScript_0x625f0 @@ -48,13 +48,13 @@ UnknownScript_0x62600: closetext end -MenuDataHeader_0x62602: +MenuHeader_0x62602: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "#　つうしん　クラブ@" ; # COM CLUB @@ -67,7 +67,7 @@ PokecomCenterAdminRoomMobileSignpost1Script: waitbutton UnknownScript_0x62629: reloadmappart - loadmenudata MenuDataHeader_0x6264c + loadmenuheader MenuHeader_0x6264c verticalmenu closewindow if_equal 1, UnknownScript_0x6263a @@ -90,13 +90,13 @@ UnknownScript_0x6264a: closetext end -MenuDataHeader_0x6264c: +MenuHeader_0x6264c: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "でんわつかうとき@" ; Use phone diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 9d08c9284..cfad0f8d4 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -284,8 +284,8 @@ asm_4828d: ; 4828d (12:428d) hlcoord 1, 16 ld de, MobileDesc_Gender call PlaceString - ld hl, MenuDataHeader_0x484f1 - call LoadMenuDataHeader + ld hl, MenuHeader_0x484f1 + call LoadMenuHeader call Function4873c hlcoord 11, 2 ld b, $4 @@ -336,10 +336,10 @@ Function48304: ; 48304 (12:4304) hlcoord 1, 16 ld de, MobileDesc_Address call PlaceString - ld hl, MenuDataHeader_0x48504 - call LoadMenuDataHeader - ld hl, MenuDataHeader_0x48513 - call LoadMenuDataHeader + ld hl, MenuHeader_0x48504 + call LoadMenuHeader + ld hl, MenuHeader_0x48513 + call LoadMenuHeader hlcoord 10, 0 ld b, $c ld c, $8 @@ -562,14 +562,14 @@ MobileDesc_Address: db "Where do you live?@" MobileDesc_ZipCode: db "Your zip code?@" ; 484f1 -MenuDataHeader_0x484f1: ; 0x484f1 +MenuHeader_0x484f1: ; 0x484f1 db MENU_BACKUP_TILES ; flags menu_coords 11, 2, SCREEN_WIDTH - 1, 7 - dw MenuData2_0x484f9 + dw MenuData_0x484f9 db 1 ; default option ; 0x484f9 -MenuData2_0x484f9: ; 0x484f9 +MenuData_0x484f9: ; 0x484f9 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 2 ; items Strings_484fb: @@ -577,26 +577,26 @@ String_484fb: db "Boy@" String_484ff: db "Girl@" ; 0x48504 -MenuDataHeader_0x48504: ; 0x48504 +MenuHeader_0x48504: ; 0x48504 db MENU_BACKUP_TILES ; flags menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -MenuDataHeader_0x48509: ; 0x48509 +MenuHeader_0x48509: ; 0x48509 db MENU_BACKUP_TILES ; flags menu_coords 10, 5, SCREEN_WIDTH - 1, 7 -MenuDataHeader_0x4850e: ; 0x4850e +MenuHeader_0x4850e: ; 0x4850e db MENU_BACKUP_TILES ; flags menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 -MenuDataHeader_0x48513: ; 0x48513 +MenuHeader_0x48513: ; 0x48513 db MENU_BACKUP_TILES ; flags menu_coords 11, 1, 18, 12 - dw MenuData2_0x4851b + dw MenuData_0x4851b db 1 ; default option ; 0x4851b -MenuData2_0x4851b: ; 0x4851b +MenuData_0x4851b: ; 0x4851b db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags db 6 ; items @@ -825,8 +825,8 @@ Function4876f: ; 4876f (12:476f) hlcoord 1, 16 ld de, MobileDesc_Age call PlaceString - ld hl, MenuDataHeader_0x48509 - call LoadMenuDataHeader + ld hl, MenuHeader_0x48509 + call LoadMenuHeader ld a, [hInMenu] push af ld a, $1 @@ -1028,8 +1028,8 @@ Function488d3: ; 488d3 (12:48d3) call PlaceString call Function48a3a jp c, Function4840c - ld hl, MenuDataHeader_0x4850e - call LoadMenuDataHeader + ld hl, MenuHeader_0x4850e + call LoadMenuHeader ld a, [hInMenu] push af ld a, $1 @@ -1225,8 +1225,8 @@ String_48a38: ; 48a38 ; 48a3a Function48a3a: ; 48a3a (12:4a3a) - ld hl, MenuDataHeader_0x48a9c - call LoadMenuDataHeader + ld hl, MenuHeader_0x48a9c + call LoadMenuHeader call Function4873c ld a, $a ld [w2DMenuCursorInitY], a @@ -1271,7 +1271,7 @@ Function48a9a: ; 48a9a (12:4a9a) ret ; 48a9c (12:4a9c) -MenuDataHeader_0x48a9c: ; 0x48a9c +MenuHeader_0x48a9c: ; 0x48a9c db MENU_BACKUP_TILES ; flags menu_coords 10, 8, SCREEN_WIDTH - 1, 13 diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 5553d66fb..14d8c6e65 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -684,8 +684,8 @@ Function4ac58: ; 4ac58 hlcoord 1, 15 call ClearBox farcall FreezeMonIcons - ld hl, MenuDataHeader_0x4aca2 - call LoadMenuDataHeader + ld hl, MenuHeader_0x4aca2 + call LoadMenuHeader ld hl, wd019 bit 1, [hl] jr z, .asm_4ac89 @@ -714,7 +714,7 @@ Function4ac58: ; 4ac58 ret ; 4aca2 -MenuDataHeader_0x4aca2: ; 0x4aca2 +MenuHeader_0x4aca2: ; 0x4aca2 db MENU_BACKUP_TILES ; flags menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL @@ -724,19 +724,19 @@ MenuDataHeader_0x4aca2: ; 0x4aca2 Function4acaa: ; 4acaa .asm_4acaa ld a, $a0 - ld [wMenuData2Flags], a + ld [wMenuDataFlags], a ld a, [wd019] bit 1, a jr z, .asm_4acc2 ld a, $2 - ld [wMenuData2Items], a + ld [wMenuDataItems], a ld a, $c ld [wMenuBorderTopCoord], a jr .asm_4accc .asm_4acc2 ld a, $4 - ld [wMenuData2Items], a + ld [wMenuDataItems], a ld a, $8 ld [wMenuBorderTopCoord], a diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 779d8964b..a4e0a8fb6 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -238,8 +238,8 @@ Function8925e: ; 8925e Function89261: ; 89261 push af push bc - ld hl, MenuDataHeader_0x892a3 - call CopyMenuDataHeader + ld hl, MenuHeader_0x892a3 + call CopyMenuHeader pop bc ld hl, wMenuBorderTopCoord ld a, c @@ -276,14 +276,14 @@ Function89261: ; 89261 ret ; 892a3 -MenuDataHeader_0x892a3: ; 0x892a3 +MenuHeader_0x892a3: ; 0x892a3 db MENU_BACKUP_TILES ; flags menu_coords 10, 5, 15, 9 - dw MenuData2_0x892ab + dw MenuData_0x892ab db 1 ; default option ; 0x892ab -MenuData2_0x892ab: ; 0x892ab +MenuData_0x892ab: ; 0x892ab db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "はい@" @@ -2203,7 +2203,7 @@ Function89d0d: ; 89d0d (22:5d0d) Function89d5e: ; 89d5e (22:5d5e) push af - call CopyMenuDataHeader + call CopyMenuHeader pop af ld [wMenuCursorBuffer], a call Mobile22_SetBGMapMode0 @@ -2786,8 +2786,8 @@ UnknownText_0x8a111: ; 0x8a111 Function8a116: ; 8a116 (22:6116) ld a, $1 ld [wd030], a - ld hl, MenuDataHeader_0x8a176 - call LoadMenuDataHeader + ld hl, MenuHeader_0x8a176 + call LoadMenuHeader .asm_8a121 call Mobile22_SetBGMapMode0 call Function8a17b @@ -2830,7 +2830,7 @@ Function8a116: ; 8a116 (22:6116) ret ; 8a176 (22:6176) -MenuDataHeader_0x8a176: ; 0x8a176 +MenuHeader_0x8a176: ; 0x8a176 db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 ; 8a17b @@ -2840,7 +2840,7 @@ Function8a17b: ; 8a17b (22:617b) ld b, $5 ld c, $4 call Function89b3b - ld hl, MenuDataHeader_0x8a19a + ld hl, MenuHeader_0x8a19a ld a, [wd030] call Function89d5e ld hl, Function8a1b0 @@ -2852,14 +2852,14 @@ Function8a17b: ; 8a17b (22:617b) ret ; 8a19a (22:619a) -MenuDataHeader_0x8a19a: ; 0x8a19a +MenuHeader_0x8a19a: ; 0x8a19a db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 - dw MenuData2_0x8a1a2 + dw MenuData_0x8a1a2 db 1 ; default option ; 0x8a1a2 -MenuData2_0x8a1a2: ; 0x8a1a2 +MenuData_0x8a1a2: ; 0x8a1a2 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 3 ; items db "ひらく@" @@ -2935,7 +2935,7 @@ UnknownText_0x8a23c: ; 0x8a23c ; 0x8a241 Function8a241: ; 8a241 (22:6241) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function891fe call Function8a262 jr nc, .asm_8a254 @@ -2978,8 +2978,8 @@ Function8a262: ; 8a262 (22:6262) ret Function8a2aa: ; 8a2aa (22:62aa) - ld hl, MenuDataHeader_0x8a2ef - call LoadMenuDataHeader + ld hl, MenuHeader_0x8a2ef + call LoadMenuHeader ld hl, UnknownText_0x8a2f4 call PrintText ld a, $1 @@ -3011,7 +3011,7 @@ Function8a2aa: ; 8a2aa (22:62aa) ret ; 8a2ef (22:62ef) -MenuDataHeader_0x8a2ef: ; 0x8a2ef +MenuHeader_0x8a2ef: ; 0x8a2ef db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 ; 8a2f4 @@ -3131,16 +3131,16 @@ Function8a3b2: ; 8a3b2 (22:63b2) ld b, $6 ld c, $9 call Function89b3b - ld hl, MenuDataHeader_0x8a435 + ld hl, MenuHeader_0x8a435 jr .asm_8a3db .asm_8a3ce decoord 0, 2 ld b, $8 ld c, $9 call Function89b3b - ld hl, MenuDataHeader_0x8a40f + ld hl, MenuHeader_0x8a40f .asm_8a3db - call CopyMenuDataHeader + call CopyMenuHeader ret Function8a3df: ; 8a3df (22:63df) @@ -3172,14 +3172,14 @@ Function8a400: ; 8a400 (22:6400) Unknown_8a408: db 1, 2, -1 Unknown_8a40b: db 1, 2, 3, -1 -MenuDataHeader_0x8a40f: ; 0x8a40f +MenuHeader_0x8a40f: ; 0x8a40f db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 10, TEXTBOX_Y - 1 - dw MenuData2_0x8a417 + dw MenuData_0x8a417 db 1 ; default option ; 0x8a417 -MenuData2_0x8a417: ; 0x8a417 +MenuData_0x8a417: ; 0x8a417 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 ; items db "めいしりスト@" @@ -3188,14 +3188,14 @@ MenuData2_0x8a417: ; 0x8a417 db "やめる@" ; 0x8a435 -MenuDataHeader_0x8a435: ; 0x8a435 +MenuHeader_0x8a435: ; 0x8a435 db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 10, 9 - dw MenuData2_0x8a43d + dw MenuData_0x8a43d db 1 ; default option ; 0x8a43d -MenuData2_0x8a43d: ; 0x8a43d +MenuData_0x8a43d: ; 0x8a43d db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "めいしりスト@" @@ -3462,7 +3462,7 @@ Palette_8a624: ; 8a624 ; 8a62c Function8a62c: ; 8a62c (22:662c) - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function891fe xor a call Function8b94a @@ -3884,15 +3884,15 @@ Function8a930: ; 8a930 (22:6930) ret Function8a999: ; 8a999 (22:6999) - ld hl, MenuDataHeader_0x8a9c9 - call LoadMenuDataHeader + ld hl, MenuHeader_0x8a9c9 + call LoadMenuHeader ld c, $1 .asm_8a9a1 call Function8a9ce jr c, .asm_8a9bb push bc push de - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader pop de dec e ld a, e @@ -3913,7 +3913,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5) dw Function8ab3b ; 8a9c9 (22:69c9) -MenuDataHeader_0x8a9c9: ; 0x8a9c9 +MenuHeader_0x8a9c9: ; 0x8a9c9 db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 ; 8a9ce @@ -3926,7 +3926,7 @@ Function8a9ce: ; 8a9ce (22:69ce) call Function89b3b pop bc ld a, c - ld hl, MenuDataHeader_0x8a9f2 + ld hl, MenuHeader_0x8a9f2 call Function89d5e ld hl, Function8aa09 call Function89d85 @@ -3942,14 +3942,14 @@ Function8a9ce: ; 8a9ce (22:69ce) ret ; 8a9f2 (22:69f2) -MenuDataHeader_0x8a9f2: ; 0x8a9f2 +MenuHeader_0x8a9f2: ; 0x8a9f2 db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 - dw MenuData2_0x8a9fa + dw MenuData_0x8a9fa db 1 ; default option ; 0x8a9fa -MenuData2_0x8a9fa: ; 0x8a9fa +MenuData_0x8a9fa: ; 0x8a9fa db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" @@ -4148,7 +4148,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) Function8ab93: ; 8ab93 (22:6b93) call ClearBGPalettes - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall Function105688 call ClearSprites call Function891fe diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 6354da146..059a0b405 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -808,8 +808,8 @@ Function8b79e: ; 8b79e Function8b7bd: ; 8b7bd call Function8b855 - ld hl, MenuDataHeader_0x8b867 - call CopyMenuDataHeader + ld hl, MenuHeader_0x8b867 + call CopyMenuHeader ld a, [wd030] ld [wMenuCursorBuffer], a ld a, [wd031] @@ -871,7 +871,7 @@ Function8b7bd: ; 8b7bd Function8b832: ; 8b832 ld a, [wMenuScrollPosition] - ld hl, wMenuData2Items + ld hl, wMenuDataItems sub [hl] jr nc, Function8b84b xor a @@ -880,7 +880,7 @@ Function8b832: ; 8b832 Function8b83e: ; 8b83e ld a, [wMenuScrollPosition] - ld hl, wMenuData2Items + ld hl, wMenuDataItems add [hl] cp $24 jr c, Function8b84b @@ -909,16 +909,16 @@ Function8b855: ; 8b855 ret ; 8b867 -MenuDataHeader_0x8b867: ; 0x8b867 +MenuHeader_0x8b867: ; 0x8b867 db MENU_BACKUP_TILES ; flags menu_coords 1, 3, 18, 13 - dw MenuData2_0x8b870 + dw MenuData_0x8b870 db 1 ; default option ; 0x8b86f db 0 -MenuData2_0x8b870: ; 0x8b870 +MenuData_0x8b870: ; 0x8b870 db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags db 5 ; items db 3, 1 @@ -1035,22 +1035,22 @@ Function8b94a: ; 8b94a Function8b960: ; 8b960 (22:7960) - ld hl, MenuDataHeader_0x8b9ac - call LoadMenuDataHeader + ld hl, MenuHeader_0x8b9ac + call LoadMenuHeader call Function8b9e9 jr c, .asm_8b97a hlcoord 11, 0 ld b, $6 ld c, $7 call Function8b703 - ld hl, MenuDataHeader_0x8b9b1 + ld hl, MenuHeader_0x8b9b1 jr .asm_8b987 .asm_8b97a hlcoord 11, 0 ld b, $a ld c, $7 call Function8b703 - ld hl, MenuDataHeader_0x8b9ca + ld hl, MenuHeader_0x8b9ca .asm_8b987 ld a, $1 call Function89d5e @@ -1081,18 +1081,18 @@ Function8b9ab: ; 8b9ab ret ; 8b9ac -MenuDataHeader_0x8b9ac: ; 0x8b9ac +MenuHeader_0x8b9ac: ; 0x8b9ac db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 -MenuDataHeader_0x8b9b1: ; 0x8b9b1 +MenuHeader_0x8b9b1: ; 0x8b9b1 db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, 7 - dw MenuData2_0x8b9b9 + dw MenuData_0x8b9b9 db 1 ; default option ; 0x8b9b9 -MenuData2_0x8b9b9: ; 0x8b9b9 +MenuData_0x8b9b9: ; 0x8b9b9 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" ; EDIT @@ -1100,14 +1100,14 @@ MenuData2_0x8b9b9: ; 0x8b9b9 db "やめる@" ; QUIT ; 0x8b9ca -MenuDataHeader_0x8b9ca: ; 0x8b9ca +MenuHeader_0x8b9ca: ; 0x8b9ca db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_0x8b9d2 + dw MenuData_0x8b9d2 db 1 ; default option ; 0x8b9d2 -MenuData2_0x8b9d2: ; 0x8b9d2 +MenuData_0x8b9d2: ; 0x8b9d2 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 5 ; items db "みる@" ; VIEW diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 3dc3f2682..0ef0079e5 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -898,8 +898,8 @@ Jumptable_100581: ; 100581 ; 100585 Function100585: ; 100585 - ld hl, MenuDataHeader_1005b2 - call LoadMenuDataHeader + ld hl, MenuHeader_1005b2 + call LoadMenuHeader ld a, 0 ld [wcd28], a ld a, [wcd26] @@ -923,14 +923,14 @@ Function100597: ; 100597 ret ; 1005b2 -MenuDataHeader_1005b2: ; 1005b2 +MenuHeader_1005b2: ; 1005b2 db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 - dw MenuData2_1005ba + dw MenuData_1005ba db 1 ; default option -MenuData2_1005ba: +MenuData_1005ba: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "はい@" @@ -950,8 +950,8 @@ Jumptable_1005cb: ; 1005cb ; 1005cf Function1005cf: ; 1005cf - ld hl, MenuDataHeader_1005fc - call LoadMenuDataHeader + ld hl, MenuHeader_1005fc + call LoadMenuHeader ld a, 0 ld [wcd28], a ld a, [wcd26] @@ -974,14 +974,14 @@ Function1005e1: ; 1005e1 ret ; 1005fc -MenuDataHeader_1005fc: ; 1005fc +MenuHeader_1005fc: ; 1005fc db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 - dw MenuData2_100604 + dw MenuData_100604 db 1 ; default option -MenuData2_100604: ; 100604 +MenuData_100604: ; 100604 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "かける@" @@ -1800,12 +1800,12 @@ SECTION "bank40_2", ROMX Function100b12: ; 100b12 call Function100dd8 ret c - ld hl, BattleMenuDataHeader - ld a, BANK(BattleMenuDataHeader) - ld de, LoadMenuDataHeader + ld hl, BattleMenuHeader + ld a, BANK(BattleMenuHeader) + ld de, LoadMenuHeader call FarCall_de - ld a, BANK(BattleMenuDataHeader) - ld [wMenuData2_2DMenuItemStringsBank], a + ld a, BANK(BattleMenuHeader) + ld [wMenuData_2DMenuItemStringsBank], a ld a, [wBattleMenuCursorBuffer] ld [wMenuCursorBuffer], a call Function100e72 @@ -1845,8 +1845,8 @@ Function100b45: ; 100b45 ; 100b7a Function100b7a: ; 100b7a - ld hl, CopyMenuData2 - ld a, [wMenuData2_2DMenuItemStringsBank] + ld hl, CopyMenuData + ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall farcall Draw2DMenu farcall MobileTextBorder @@ -2103,28 +2103,28 @@ MobileBattleMonMenu: ; 100d22 ; 100d67 Function100d67: ; 100d67 - ld hl, .MenuDataHeader - call CopyMenuDataHeader + ld hl, .MenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call MenuBox call UpdateSprites call PlaceVerticalMenuItems call WaitBGMap - call CopyMenuData2 + call CopyMenuData call InitVerticalMenuCursor ld hl, w2DMenuFlags1 set 6, [hl] ret ; 100d88 -.MenuDataHeader: ; 100d88 +.MenuHeader: ; 100d88 db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: ; 100d90 +.MenuData: ; 100d90 db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "いれかえる@" ; TRADE @@ -4535,7 +4535,7 @@ Unknown_101d8d: ; 101d8d Function101d95: ; 101d95 call Function101ee2 - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld e, $0e call Function101ee4 ld hl, wcd29 @@ -6200,8 +6200,8 @@ Jumptable_10292f: ; 10292f ; 102933 Function102933: ; 102933 - ld hl, MenuDataHeader_1029bb - call LoadMenuDataHeader + ld hl, MenuHeader_1029bb + call LoadMenuHeader call Function102e07 ld a, $32 ld [TextDelayFrames], a @@ -6285,7 +6285,7 @@ Function1029af: ; 1029af ret ; 1029bb -MenuDataHeader_1029bb: ; 1029bb +MenuHeader_1029bb: ; 1029bb db MENU_BACKUP_TILES ; flags menu_coords 3, 10, 15, 12 dw NULL @@ -6305,7 +6305,7 @@ Jumptable_1029cb: ; 1029cb ; 1029cf Function1029cf: ; 1029cf - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader hlcoord 10, 7 ld b, 3 ld c, 8 @@ -7756,8 +7756,8 @@ Unknown_103608: ; 103608 ; 103612 Special_AskMobileOrCable: ; 103612 - ld hl, MenuDataHeader_103640 - call LoadMenuDataHeader + ld hl, MenuHeader_103640 + call LoadMenuHeader ld a, [wMobileOrCable_LastSelection] and $0f jr z, .skip_load @@ -7782,13 +7782,13 @@ Special_AskMobileOrCable: ; 103612 ret ; 103640 -MenuDataHeader_103640: ; 103640 +MenuHeader_103640: ; 103640 db MENU_BACKUP_TILES ; flags menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_103648 + dw MenuData_103648 db 1 ; default option -MenuData2_103648: ; 103648 +MenuData_103648: ; 103648 db STATICMENU_CURSOR ; flags db 2 db "モバイル@" @@ -7849,8 +7849,8 @@ Special_Mobile_SelectThreeMons: ; 10366e .asm_1036b5 call Function103700 jr c, .asm_1036f4 - ld hl, MenuDataHeader_103747 - call LoadMenuDataHeader + ld hl, MenuHeader_103747 + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .asm_1036f4 @@ -7936,13 +7936,13 @@ Function103700: ; 103700 ret ; 103747 -MenuDataHeader_103747: ; 103747 +MenuHeader_103747: ; 103747 db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_10374f + dw MenuData_10374f db 1 ; default option -MenuData2_10374f: ; 10374f +MenuData_10374f: ; 10374f db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "はい@" diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index af9bdb633..ac0292862 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7168,12 +7168,12 @@ Function117764_a_button: ; 11784c (45:784c) jp Function117764_start Function1178aa: ; 1178aa (45:78aa) - ld hl, MenuDataHeader_1179b5 - call LoadMenuDataHeader + ld hl, MenuHeader_1179b5 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile - ld hl, MenuDataHeader_1179bd - call LoadMenuDataHeader + ld hl, MenuHeader_1179bd + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -7274,8 +7274,8 @@ asm_11797e: ; 11797e (45:797e) ret Function117984: ; 117984 (45:7984) - ld hl, MenuDataHeader_1179b5 - call LoadMenuDataHeader + ld hl, MenuHeader_1179b5 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -7297,14 +7297,14 @@ Function1179a7: ; 1179a7 (45:79a7) ; 1179b5 (45:79b5) -MenuDataHeader_1179b5: ; 1179b5 +MenuHeader_1179b5: ; 1179b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option ; 1179bd -MenuDataHeader_1179bd: ; 1179bd +MenuHeader_1179bd: ; 1179bd db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -7438,8 +7438,8 @@ Function117b14: ld hl, wcf64 dec [hl] ret nz - ld hl, MenuDataHeader_117cbc - call LoadMenuDataHeader + ld hl, MenuHeader_117cbc + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile jp MobileStudium_JumptableIncrement @@ -7450,8 +7450,8 @@ Function117b28: jp MobileStudium_JumptableIncrement Function117b31: - ld hl, MenuDataHeader_117cc4 - call LoadMenuDataHeader + ld hl, MenuHeader_117cc4 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile hlcoord 16, 8 @@ -7595,8 +7595,8 @@ Function117bb6: jp MobileStudium_JumptableIncrement Function117c4a: - ld hl, MenuDataHeader_117cbc - call LoadMenuDataHeader + ld hl, MenuHeader_117cbc + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -7656,13 +7656,13 @@ Function117c89: call CloseSRAM ret -MenuDataHeader_117cbc: ; 0x117cbc +MenuHeader_117cbc: ; 0x117cbc db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -MenuDataHeader_117cc4: ; 0x117cc4 +MenuHeader_117cc4: ; 0x117cc4 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 8f66da8cd..9a9df1309 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -506,7 +506,7 @@ Function1161d5: ; 1161d5 ; 11628c -MenuDataHeader_11628c: ; 11628c +MenuHeader_11628c: ; 11628c db MENU_BACKUP_TILES ; flags menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 51ae92703..01c505601 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1184,8 +1184,8 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, [$c31a] and a ret nz - ld hl, MenuDataHeader_119cf7 - call LoadMenuDataHeader + ld hl, MenuHeader_119cf7 + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile call ApplyTilemap @@ -3953,7 +3953,7 @@ BattleTowerRoomMenu_UpdateYesNoMenu: ret ; 119cf7 -MenuDataHeader_119cf7: ; 119cf7 +MenuHeader_119cf7: ; 119cf7 db MENU_BACKUP_TILES ; flags menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -4635,8 +4635,8 @@ Function11a1ff: ; 11a1ff ; 11a207 BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207 - ld hl, MenuDataHeader_11a2de - call LoadMenuDataHeader + ld hl, MenuHeader_11a2de + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile call ApplyTilemap @@ -4751,14 +4751,14 @@ String_11a2d3: ; 11a2d3 db "NO@" ; 11a2d6 -MenuDataHeader_11a2d6: ; 11a2d6 +MenuHeader_11a2d6: ; 11a2d6 db MENU_BACKUP_TILES ; flags menu_coords 14, 6, SCREEN_WIDTH - 1, 10 dw NULL db 0 ; default option ; 11a2de -MenuDataHeader_11a2de: ; 11a2de +MenuHeader_11a2de: ; 11a2de db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -5321,7 +5321,7 @@ String_11a7f4: ; 11a7f4 db "　　　　　　　　　　　　　　　@" ; 11a804 -MenuDataHeader_11a804: ; 11a804 +MenuHeader_11a804: ; 11a804 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, 5 dw NULL @@ -5900,8 +5900,8 @@ Function11ad8f: ; 11ad8f ; 11ad95 Function11ad95: ; 11ad95 - ld hl, MenuDataHeader_11ae38 - call LoadMenuDataHeader + ld hl, MenuHeader_11ae38 + call LoadMenuHeader call MenuBox hlcoord 12, 12 ld de, String_11ae40 @@ -5992,7 +5992,7 @@ Function11adc4: ret ; 11ae38 -MenuDataHeader_11ae38: ; 11ae38 +MenuHeader_11ae38: ; 11ae38 db MENU_BACKUP_TILES ; flags menu_coords 10, 10, 17, SCREEN_HEIGHT - 1 dw NULL @@ -6007,14 +6007,14 @@ String_11ae40: ; 11ae40 ; 11ae4e Function11ae4e: ; 11ae4e - ld hl, MenuDataHeader_11afe8 - call LoadMenuDataHeader + ld hl, MenuHeader_11afe8 + call LoadMenuHeader call MenuBox hlcoord 10, 14 ld de, String_11aff0 call PlaceString - ld hl, MenuDataHeader_11b013 - call LoadMenuDataHeader + ld hl, MenuHeader_11b013 + call LoadMenuHeader call MenuBox hlcoord 16, 8 ld de, String_11b01b @@ -6098,14 +6098,14 @@ Function11ae98: ; 11af04 Function11af04: ; 11af04 - ld hl, MenuDataHeader_11afe8 - call LoadMenuDataHeader + ld hl, MenuHeader_11afe8 + call LoadMenuHeader call MenuBox hlcoord 10, 14 ld de, String_11b003 call PlaceString - ld hl, MenuDataHeader_11b013 - call LoadMenuDataHeader + ld hl, MenuHeader_11b013 + call LoadMenuHeader call MenuBox hlcoord 16, 8 ld de, String_11b01b @@ -6238,7 +6238,7 @@ Function11afd6: ; 11afd6 ret ; 11afe8 -MenuDataHeader_11afe8: ; 11afe8 +MenuHeader_11afe8: ; 11afe8 db MENU_BACKUP_TILES ; flags menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL @@ -6255,7 +6255,7 @@ String_11b003: ; 11b003 next "ちゅうししますか？@" ; 11b013 -MenuDataHeader_11b013: ; 11b013 +MenuHeader_11b013: ; 11b013 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index f973c2378..b0d2e00e3 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -615,8 +615,8 @@ Function171beb: ; 171beb (5c:5beb) ld a, [wcd4a] ld [$aa4a], a call CloseSRAM - ld hl, MenuDataHeader_171c6b - call LoadMenuDataHeader + ld hl, MenuHeader_171c6b + call LoadMenuHeader call MenuBox call MenuBoxCoord2Tile farcall ReloadMapPart @@ -671,7 +671,7 @@ Function171c66: ; 171c66 (5c:5c66) ; 171c6b (5c:5c6b) -MenuDataHeader_171c6b: ; 171c6b +MenuHeader_171c6b: ; 171c6b db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index a736182cf..d4ad45fc0 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -424,7 +424,7 @@ Function17a91e: ; 17a91e (5e:691e) ret .asm_17a92c - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call Function17a99e ld hl, $d088 set 7, [hl] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 2d9ccf847..9d9a674dd 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -441,16 +441,16 @@ Special_Menu_ChallengeExplanationCancel: ; 17d224 jr nz, .English ld a, $4 ld [ScriptVar], a - ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option + ld hl, MenuHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option jr .Load_Interpret .English: ld a, $4 ld [ScriptVar], a - ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu + ld hl, MenuHeader_ChallengeExplanationCancel ; English Menu .Load_Interpret: - call LoadMenuDataHeader + call LoadMenuHeader call Function17d246 call CloseWindow ret @@ -482,13 +482,13 @@ Function17d246: ; 17d246 ret ; 17d26a -MenuDataHeader_17d26a: ; 17d26a +MenuHeader_17d26a: ; 17d26a db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 14, 9 - dw MenuData2_17d272 + dw MenuData_17d272 db 1 ; default option -MenuData2_17d272: ; 17d272 +MenuData_17d272: ; 17d272 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 db "ニュース¯よみこむ@" @@ -497,13 +497,13 @@ MenuData2_17d272: ; 17d272 db "やめる@" ; 17d28f -MenuDataHeader_ChallengeExplanationCancel: ; 17d28f +MenuHeader_ChallengeExplanationCancel: ; 17d28f db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 14, 7 - dw MenuData2_ChallengeExplanationCancel + dw MenuData_ChallengeExplanationCancel db 1 ; default option -MenuData2_ChallengeExplanationCancel: ; 17d297 +MenuData_ChallengeExplanationCancel: ; 17d297 db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 db "Challenge@" @@ -1907,7 +1907,7 @@ Function17dc1f: ; 17dc1f ld a, $1 ld [$c70f], a ld hl, $c708 - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu jr nc, .asm_17dc6e ld a, $2 @@ -1940,7 +1940,7 @@ Function17dc1f: ; 17dc1f ret ; 17dc96 -MenuData2_17dc96: +MenuData_17dc96: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 db "はい@" diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 8c5786eb0..4c7a20b3d 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -171,7 +171,7 @@ Function4a098: ; 4a098 (12:6098) call MenuClickSound call PlaceHollowCursor call WaitBGMap - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader farcall Function89de0 call Call_ExitMenu call MG_Mobile_Layout_LoadPals @@ -389,7 +389,7 @@ Function4a28a: ; 4a28a (12:628a) call Function4a6d8 call PlaceHollowCursor call WaitBGMap - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader ld a, $5 call GetSRAMBank ld a, [$aa4b] @@ -433,8 +433,8 @@ Function4a28a: ; 4a28a (12:628a) ld c, 4 call TextBox farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap - ld hl, DeletePassword_YesNo_MenuDataHeader - call LoadMenuDataHeader + ld hl, DeletePassword_YesNo_MenuHeader + call LoadMenuHeader call VerticalMenu bit B_BUTTON_F, a jr nz, .dont_delete_password @@ -460,7 +460,7 @@ Function4a28a: ; 4a28a (12:628a) ret ; 4a346 (12:6346) -MenuDataHeader_0x4a346: ; 0x4a346 +MenuHeader_0x4a346: ; 0x4a346 db MENU_BACKUP_TILES ; flags menu_coords 12, 0, SCREEN_WIDTH - 1, 6 @@ -482,14 +482,14 @@ UnknownText_0x4a35d: ; 0x4a35d db "@" ; 0x4a362 -DeletePassword_YesNo_MenuDataHeader: ; 0x4a362 +DeletePassword_YesNo_MenuHeader: ; 0x4a362 db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw MenuData2_0x4a36a + dw MenuData_0x4a36a db 2 ; default option ; 0x4a36a -MenuData2_0x4a36a: ; 0x4a36a +MenuData_0x4a36a: ; 0x4a36a db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 ; items db "はい@" diff --git a/wram.asm b/wram.asm index 37f951e5b..9d167ab28 100644 --- a/wram.asm +++ b/wram.asm @@ -1405,52 +1405,52 @@ wWindowStackSize:: db ; cf78 ds 8 -; menu data header -wMenuDataHeader:: ; cf81 +; menu header +wMenuHeader:: ; cf81 wMenuFlags:: db wMenuBorderTopCoord:: db wMenuBorderLeftCoord:: db wMenuBorderBottomCoord:: db wMenuBorderRightCoord:: db -wMenuData2Pointer:: dw +wMenuDataPointer:: dw wMenuCursorBuffer:: dw wMenuDataBank:: db ds 6 -wMenuDataHeaderEnd:: +wMenuHeaderEnd:: -wMenuData2:: -; MenuData2 +wMenuData:: +; MenuData -wMenuData2Flags:: db ; cf91 +wMenuDataFlags:: db ; cf91 UNION ; cf92 ; Vertical Menu/DoNthMenu/SetUpMenu -wMenuData2Items:: db ; cf92 -wMenuData2IndicesPointer:: dw ; cf94 -wMenuData2DisplayFunctionPointer:: dw ; cf96 -wMenuData2PointerTableAddr:: dw ; cf97 +wMenuDataItems:: db ; cf92 +wMenuDataIndicesPointer:: dw ; cf94 +wMenuDataDisplayFunctionPointer:: dw ; cf96 +wMenuDataPointerTableAddr:: dw ; cf97 NEXTU ; cf92 ; 2D Menu -wMenuData2_2DMenuDimensions:: db ; cf92 -wMenuData2_2DMenuSpacing:: db ; cf93 -wMenuData2_2DMenuItemStringsBank:: db ; cf94 -wMenuData2_2DMenuItemStringsAddr:: dw ; cf96 -wMenuData2_2DMenuFunctionBank:: db ; cf97 -wMenuData2_2DMenuFunctionAddr:: dw ; cf98 +wMenuData_2DMenuDimensions:: db ; cf92 +wMenuData_2DMenuSpacing:: db ; cf93 +wMenuData_2DMenuItemStringsBank:: db ; cf94 +wMenuData_2DMenuItemStringsAddr:: dw ; cf96 +wMenuData_2DMenuFunctionBank:: db ; cf97 +wMenuData_2DMenuFunctionAddr:: dw ; cf98 NEXTU ; cf92 ; Scrolling Menu -wMenuData2_ScrollingMenuHeight:: db ; cf92 -wMenuData2_ScrollingMenuWidth:: db ; cf93 -wMenuData2_ScrollingMenuSpacing:: db ; cf94 -wMenuData2_ItemsPointerBank:: db ; cf95 -wMenuData2_ItemsPointerAddr:: dw ; cf97 -wMenuData2_ScrollingMenuFunction1:: ds 3 ; cf98 -wMenuData2_ScrollingMenuFunction2:: ds 3 ; cf9b -wMenuData2_ScrollingMenuFunction3:: ds 3 ; cf9e +wMenuData_ScrollingMenuHeight:: db ; cf92 +wMenuData_ScrollingMenuWidth:: db ; cf93 +wMenuData_ScrollingMenuSpacing:: db ; cf94 +wMenuData_ItemsPointerBank:: db ; cf95 +wMenuData_ItemsPointerAddr:: dw ; cf97 +wMenuData_ScrollingMenuFunction1:: ds 3 ; cf98 +wMenuData_ScrollingMenuFunction2:: ds 3 ; cf9b +wMenuData_ScrollingMenuFunction3:: ds 3 ; cf9e ENDU ; cfa1 -wMenuData2End:: +wMenuDataEnd:: wMenuData3:: w2DMenuCursorInitY:: db ; cfa1