MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)

This commit is contained in:
Rangi 2018-01-23 16:08:43 -05:00
parent 8f2878c37e
commit ead103d2c6
76 changed files with 774 additions and 774 deletions

View File

@ -1,4 +1,4 @@
; MenuDataHeader flags ; MenuHeader flags
const_def const_def
shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set. shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set.
shift_const MENU_UNUSED_1 shift_const MENU_UNUSED_1
@ -9,7 +9,7 @@
shift_const MENU_BACKUP_TILES shift_const MENU_BACKUP_TILES
shift_const MENU_BACKUP_TILES_2 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 ; Per flag the comment specifies which menus actually implement it
const_def const_def
shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu
@ -21,7 +21,7 @@
shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu
shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu
; ScrollingMenu MenuDataHeader2 flags ; ScrollingMenu MenuData flags
const_def const_def
shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL
shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH

View File

@ -267,7 +267,7 @@ NUM_FRUIT_TREES EQU const_value +- 1
NUM_UNOWN_PUZZLES EQU const_value NUM_UNOWN_PUZZLES EQU const_value
; Special_DisplayUnownWords writebyte arguments ; 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_def
const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_ESCAPE ; 0
const UNOWNWORDS_LIGHT ; 1 const UNOWNWORDS_LIGHT ; 1

View File

@ -1,4 +1,4 @@
RooftopSaleData1: ; 15aee RooftopSaleMart1: ; 15aee
db 5 db 5
dbw POKE_BALL, 150 dbw POKE_BALL, 150
dbw GREAT_BALL, 500 dbw GREAT_BALL, 500
@ -7,7 +7,7 @@ RooftopSaleData1: ; 15aee
dbw REVIVE, 1200 dbw REVIVE, 1200
db -1 db -1
RooftopSaleData2: ; 15aff RooftopSaleMart2: ; 15aff
db 5 db 5
dbw HYPER_POTION, 1000 dbw HYPER_POTION, 1000
dbw FULL_RESTORE, 2000 dbw FULL_RESTORE, 2000

View File

@ -1,4 +1,4 @@
ChrisNameMenuDataHeader: ; 882b5 ChrisNameMenuHeader: ; 882b5
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, TEXTBOX_Y - 1 menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .MaleNames dw .MaleNames
@ -17,7 +17,7 @@ MalePlayerNameArray: ; 882c9
db 2 ; displacement db 2 ; displacement
db " NAME @" ; title db " NAME @" ; title
KrisNameMenuDataHeader: ; 882e5 KrisNameMenuHeader: ; 882e5
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, TEXTBOX_Y - 1 menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .FemaleNames dw .FemaleNames

View File

@ -38,7 +38,7 @@ UnownWalls: ; 8aebc
unownwall "H", "O", "-", "O", "H" unownwall "H", "O", "-", "O", "H"
; 8aed5 ; 8aed5
MenuDataHeaders_UnownWalls: ; 0x8aed5 MenuHeaders_UnownWalls: ; 0x8aed5
; UNOWNWORDS_ESCAPE ; UNOWNWORDS_ESCAPE
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 3, 4, 16, 9 menu_coords 3, 4, 16, 9

View File

@ -165,7 +165,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
## `$4E`: `yesorno` ## `$4E`: `yesorno`
## `$4F`: <code>loadmenudata <i>data_pointer</i></code> ## `$4F`: <code>loadmenuheader <i>menu_header</i></code>
## `$50`: `closewindow` ## `$50`: `closewindow`

View File

@ -19,13 +19,13 @@ This is the only menu that does scrolling. It doesn't draw any `TextBox` around
Structure: Structure:
```asm ```asm
.MenuDataHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 2, 4, SCREEN_WIDTH - 1, 13 menu_coords 2, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData2: .MenuData:
db 0 ; flags db 0 ; flags
db 5, 0 ; rows, columns db 5, 0 ; rows, columns
db 1 ; horizontal spacing db 1 ; horizontal spacing
@ -35,7 +35,7 @@ Structure:
dba Function3 dba Function3
``` ```
`wMenuData2Flags`: `wMenuDataFlags`:
``` ```
7: Select is functional 7: Select is functional
@ -48,9 +48,9 @@ Structure:
0: Call Function1 to display the cancel entry 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: 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. 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: 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: Structure:
```asm ```asm
.MenuDataHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
db 12, 08 ; start coords db 12, 08 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData2: .MenuData:
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
dn 2, 2 ; rows, columns dn 2, 2 ; rows, columns
db 6 ; spacing db 6 ; spacing
@ -114,7 +114,7 @@ Structure:
dba Function dba Function
``` ```
`wMenuData2Flags`: `wMenuDataFlags`:
``` ```
7: Leave one tile of spacing between the left textbox border and the text, enabling the cursor. 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: Structure:
``` ```
.MenuDataHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 7 menu_coords 0, 0, 10, 7
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData2: .MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 0 ; items db 0 ; items
dw Items dw Items
@ -155,7 +155,7 @@ Structure:
dw StringPointers dw StringPointers
``` ```
`wMenuData2Flags`: `wMenuDataFlags`:
``` ```
7: Unused 7: Unused
@ -219,20 +219,20 @@ This is the simplest menu. Like, the most boring. Nothing special. Just normal.
Structure: Structure:
```asm ```asm
.MenuDataHeader: .MenuHeader:
db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags
menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData2: .MenuData:
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 2 ; # items db 2 ; # items
db "GIVE@" db "GIVE@"
db "TAKE@" db "TAKE@"
``` ```
`wMenuData2Flags`: `wMenuDataFlags`:
``` ```
7: Leave one tile of spacing between the left textbox border and the text 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 ## Misc/Generic
`MenuDataHeader` flags (`wMenuFlags`): `MenuHeader` flags (`wMenuFlags`):
``` ```
7: Save a backup of the tiles 7: Save a backup of the tiles

View File

@ -2781,7 +2781,7 @@ AskUseNextPokemon: ; 3d1f8
ForcePlayerMonChoice: ; 3d227 ForcePlayerMonChoice: ; 3d227
call EmptyBattleTextBox call EmptyBattleTextBox
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call SetUpBattlePartyMenu_NoLoop call SetUpBattlePartyMenu_NoLoop
call ForcePickPartyMonInBattle call ForcePickPartyMonInBattle
ld a, [wLinkMode] ld a, [wLinkMode]
@ -3300,7 +3300,7 @@ ResetEnemyBattleVars: ; 3d557
ld a, 8 ld a, 8
call SlideBattlePicOut call SlideBattlePicOut
call EmptyBattleTextBox call EmptyBattleTextBox
jp LoadStandardMenuDataHeader jp LoadStandardMenuHeader
; 3d57a ; 3d57a
ResetBattleParticipants: ; 3d57a ResetBattleParticipants: ; 3d57a
@ -5107,7 +5107,7 @@ BattleMenu_Pack: ; 3e1c7
and a and a
jp nz, .ItemsCantBeUsed jp nz, .ItemsCantBeUsed
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
@ -5202,10 +5202,10 @@ BattleMenu_Pack: ; 3e1c7
; 3e28d ; 3e28d
BattleMenu_PKMN: ; 3e28d BattleMenu_PKMN: ; 3e28d
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
BattleMenuPKMN_ReturnFromStats: BattleMenuPKMN_ReturnFromStats:
call ExitMenu call ExitMenu
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call ClearBGPalettes call ClearBGPalettes
BattleMenuPKMN_Loop: BattleMenuPKMN_Loop:
call SetUpBattlePartyMenu call SetUpBattlePartyMenu
@ -5345,7 +5345,7 @@ PlayerSwitch: ; 3e3ad
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jr z, .not_linked jr z, .not_linked
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call LinkBattleSendReceiveAction call LinkBattleSendReceiveAction
call CloseWindow call CloseWindow

View File

@ -8973,7 +8973,7 @@ BattleCommand_BatonPass: ; 379c9
call DelayFrames call DelayFrames
; Transition into switchmon menu ; Transition into switchmon menu
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
farcall SetUpBattlePartyMenu_NoLoop farcall SetUpBattlePartyMenu_NoLoop
farcall ForcePickSwitchMonInBattle farcall ForcePickSwitchMonInBattle
@ -9048,7 +9048,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
ld a, 1 ld a, 1
ld [wPlayerAction], a ld [wPlayerAction], a
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction ld hl, LinkBattleSendReceiveAction
call CallBattleCore call CallBattleCore
call CloseWindow call CloseWindow
@ -9065,7 +9065,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
and a and a
ret z ret z
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction ld hl, LinkBattleSendReceiveAction
call CallBattleCore call CallBattleCore

View File

@ -1,6 +1,6 @@
LoadBattleMenu: ; 24ef2 LoadBattleMenu: ; 24ef2
ld hl, BattleMenuDataHeader ld hl, BattleMenuHeader
call LoadMenuDataHeader call LoadMenuHeader
ld a, [wBattleMenuCursorBuffer] ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
call InterpretBattleMenu call InterpretBattleMenu
@ -12,14 +12,14 @@ LoadBattleMenu: ; 24ef2
SafariBattleMenu: ; 24f0b SafariBattleMenu: ; 24f0b
; untranslated ; untranslated
ld hl, MenuDataHeader_0x24f4e ld hl, MenuHeader_0x24f4e
call LoadMenuDataHeader call LoadMenuHeader
jr Function24f19 jr Function24f19
; 24f13 ; 24f13
ContestBattleMenu: ; 24f13 ContestBattleMenu: ; 24f13
ld hl, MenuDataHeader_0x24f89 ld hl, MenuHeader_0x24f89
call LoadMenuDataHeader call LoadMenuHeader
; 24f19 ; 24f19
Function24f19: ; 24f19 Function24f19: ; 24f19
@ -32,7 +32,7 @@ Function24f19: ; 24f19
ret ret
; 24f2c ; 24f2c
BattleMenuDataHeader: ; 24f2c BattleMenuHeader: ; 24f2c
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f34 dw MenuData_0x24f34
@ -54,7 +54,7 @@ Strings24f3d: ; 0x24f3d
db "RUN@" db "RUN@"
; 24f4e ; 24f4e
MenuDataHeader_0x24f4e: ; 24f4e MenuHeader_0x24f4e: ; 24f4e
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f56 dw MenuData_0x24f56
@ -84,7 +84,7 @@ Function24f7c: ; 24f7c
ret ret
; 24f89 ; 24f89
MenuDataHeader_0x24f89: ; 24f89 MenuHeader_0x24f89: ; 24f89
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f91 dw MenuData_0x24f91

View File

@ -14,6 +14,6 @@ _ReturnToBattle_UseBall: ; 2715c
farcall _LoadBattleFontsHPBar farcall _LoadBattleFontsHPBar
call GetMemSGBLayout call GetMemSGBLayout
call CloseWindow call CloseWindow
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call WaitBGMap call WaitBGMap
jp SetPalettes jp SetPalettes

View File

@ -128,8 +128,8 @@ _DepositPKMN: ; e2391 (38:6391)
ret ret
.Submenu: ; e247d (38:647d) .Submenu: ; e247d (38:647d)
ld hl, BillsPCDepositMenuDataHeader ld hl, BillsPCDepositMenuHeader
call CopyMenuDataHeader call CopyMenuHeader
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
call StoreTo_wMenuCursorBuffer call StoreTo_wMenuCursorBuffer
call VerticalMenu call VerticalMenu
@ -172,7 +172,7 @@ BillsPCDepositFuncDeposit: ; e24a9 (38:64a9)
ret ret
BillsPCDepositFuncStats: ; e24c8 (38:64c8) BillsPCDepositFuncStats: ; e24c8 (38:64c8)
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call BillsPC_StatsScreen call BillsPC_StatsScreen
call ExitMenu call ExitMenu
call PCMonInfo call PCMonInfo
@ -191,7 +191,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
push af push af
ld de, PCString_ReleasePKMN ld de, PCString_ReleasePKMN
call BillsPC_PlaceString call BillsPC_PlaceString
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
lb bc, 14, 11 lb bc, 14, 11
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@ -228,14 +228,14 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537)
ret ret
; e253d (38:653d) ; e253d (38:653d)
BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d) BillsPCDepositMenuHeader: ; 0xe253d (38:653d)
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13 menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0xe2545 ; 0xe2545
.MenuData2: ; 0xe2545 (38:6545) .MenuData: ; 0xe2545 (38:6545)
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 4 ; items db 4 ; items
db "DEPOSIT@" db "DEPOSIT@"
@ -391,8 +391,8 @@ _WithdrawPKMN: ; e2583 (38:6583)
ret ret
BillsPC_Withdraw: ; e2675 (38:6675) BillsPC_Withdraw: ; e2675 (38:6675)
ld hl, .MenuDataHeader ld hl, .MenuHeader
call CopyMenuDataHeader call CopyMenuHeader
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
call StoreTo_wMenuCursorBuffer call StoreTo_wMenuCursorBuffer
call VerticalMenu call VerticalMenu
@ -434,7 +434,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
ret ret
.stats ; e26c0 (38:66c0) .stats ; e26c0 (38:66c0)
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call BillsPC_StatsScreen call BillsPC_StatsScreen
call ExitMenu call ExitMenu
call PCMonInfo call PCMonInfo
@ -451,7 +451,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
jr c, .FailedRelease jr c, .FailedRelease
ld de, PCString_ReleasePKMN ld de, PCString_ReleasePKMN
call BillsPC_PlaceString call BillsPC_PlaceString
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
lb bc, 14, 11 lb bc, 14, 11
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@ -487,7 +487,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
ret ret
; e2731 (38:6731) ; e2731 (38:6731)
.MenuDataHeader: ; 0xe2731 .MenuHeader: ; 0xe2731
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13 menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData dw .MenuData
@ -652,8 +652,8 @@ _MovePKMNWithoutMail: ; e2759
; e285d ; e285d
.MoveMonWOMailSubmenu: ; e285d .MoveMonWOMailSubmenu: ; e285d
ld hl, .MenuDataHeader ld hl, .MenuHeader
call CopyMenuDataHeader call CopyMenuHeader
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
call StoreTo_wMenuCursorBuffer call StoreTo_wMenuCursorBuffer
call VerticalMenu call VerticalMenu
@ -693,7 +693,7 @@ _MovePKMNWithoutMail: ; e2759
; e28a5 ; e28a5
.Stats: ; e28a5 .Stats: ; e28a5
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call BillsPC_StatsScreen call BillsPC_StatsScreen
call ExitMenu call ExitMenu
call PCMonInfo call PCMonInfo
@ -710,14 +710,14 @@ _MovePKMNWithoutMail: ; e2759
ret ret
; e28c3 ; e28c3
.MenuDataHeader: ; 0xe28c3 .MenuHeader: ; 0xe28c3
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13 menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0xe28cb ; 0xe28cb
.MenuData2: ; 0xe28cb .MenuData: ; 0xe28cb
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 3 ; items db 3 ; items
db "MOVE@" db "MOVE@"
@ -2293,15 +2293,15 @@ PCString_NoReleasingEGGS: db "No releasing EGGS!@"
_ChangeBox: ; e35aa (38:75aa) _ChangeBox: ; e35aa (38:75aa)
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call BillsPC_ClearTilemap call BillsPC_ClearTilemap
.loop .loop
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call BillsPC_PrintBoxName call BillsPC_PrintBoxName
call BillsPC_PlaceChooseABoxString call BillsPC_PlaceChooseABoxString
ld hl, _ChangeBox_menudataheader ld hl, _ChangeBox_MenuHeader
call CopyMenuDataHeader call CopyMenuHeader
xor a xor a
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
hlcoord 0, 4 hlcoord 0, 4
@ -2328,14 +2328,14 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2)
ret ret
; e35f1 (38:75f1) ; e35f1 (38:75f1)
_ChangeBox_menudataheader: ; 0xe35f1 _ChangeBox_MenuHeader: ; 0xe35f1
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 1, 5, 9, 12 menu_coords 1, 5, 9, 12
dw .menudata2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0xe35f9 ; 0xe35f9
.menudata2 ; 0xe35f9 .MenuData ; 0xe35f9
db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
db 4, 0 db 4, 0
db 1 db 1
@ -2487,8 +2487,8 @@ BillsPC_PrintBoxName: ; e36cf (38:76cf)
; e36f9 ; e36f9
BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
ld hl, .MenuDataHeader ld hl, .MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
call VerticalMenu call VerticalMenu
call ExitMenu call ExitMenu
ret c ret c
@ -2556,14 +2556,14 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
hlcoord 11, 7 ; unused hlcoord 11, 7 ; unused
.MenuDataHeader: ; 0xe377b .MenuHeader: ; 0xe377b
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, SCREEN_WIDTH - 1, 13 menu_coords 11, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0xe3783 ; 0xe3783
.MenuData2: ; 0xe3783 .MenuData: ; 0xe3783
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 4 ; items db 4 ; items
db "SWITCH@" db "SWITCH@"

View File

@ -22,7 +22,7 @@ _BillsPC: ; e3fd
.LogIn: ; e41c (3:641c) .LogIn: ; e41c (3:641c)
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call ClearPCItemScreen call ClearPCItemScreen
ld hl, Options ld hl, Options
ld a, [hl] ld a, [hl]
@ -45,8 +45,8 @@ _BillsPC: ; e3fd
ret ret
.UseBillsPC: ; e443 (3:6443) .UseBillsPC: ; e443 (3:6443)
ld hl, .MenuDataHeader ld hl, .MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
ld a, $1 ld a, $1
.loop .loop
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
@ -68,13 +68,13 @@ _BillsPC: ; e3fd
call CloseWindow call CloseWindow
ret ret
.MenuDataHeader: ; 0xe46f .MenuHeader: ; 0xe46f
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData2: ; 0xe477 .MenuData: ; 0xe477
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 0 ; items db 0 ; items
dw .items dw .items
@ -109,7 +109,7 @@ BillsPC_SeeYa: ; e4cb
ret ret
BillsPC_MovePKMNMenu: ; e4cd BillsPC_MovePKMNMenu: ; e4cd
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
farcall IsAnyMonHoldingMail farcall IsAnyMonHoldingMail
jr nc, .no_mail jr nc, .no_mail
ld hl, .Text_MonHoldingMail ld hl, .Text_MonHoldingMail
@ -134,7 +134,7 @@ BillsPC_MovePKMNMenu: ; e4cd
db "@" db "@"
BillsPC_DepositMenu: ; e4fe (3:64fe) BillsPC_DepositMenu: ; e4fe (3:64fe)
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
farcall _DepositPKMN farcall _DepositPKMN
call ReturnToMapFromSubmenu call ReturnToMapFromSubmenu
call ClearPCItemScreen call ClearPCItemScreen
@ -203,7 +203,7 @@ CheckCurPartyMonFainted: ; e538
ret ret
BillsPC_WithdrawMenu: ; e559 (3:6559) BillsPC_WithdrawMenu: ; e559 (3:6559)
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
farcall _WithdrawPKMN farcall _WithdrawPKMN
call ReturnToMapFromSubmenu call ReturnToMapFromSubmenu
call ClearPCItemScreen call ClearPCItemScreen

View File

@ -202,7 +202,7 @@ DoEggStep:: ; 16f3e
OverworldHatchEgg:: ; 16f5e OverworldHatchEgg:: ; 16f5e
call RefreshScreen call RefreshScreen
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call HatchEggs call HatchEggs
call ExitAllMenus call ExitAllMenus
call RestartMapMusic call RestartMapMusic

View File

@ -1,6 +1,6 @@
SelectQuantityToToss: ; 24fbf SelectQuantityToToss: ; 24fbf
ld hl, TossItem_MenuDataHeader ld hl, TossItem_MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
call Toss_Sell_Loop call Toss_Sell_Loop
ret ret
; 24fc9 ; 24fc9
@ -12,8 +12,8 @@ RooftopSale_SelectQuantityToBuy: ; 24fcf
ld [Buffer1], a ld [Buffer1], a
ld a, e ld a, e
ld [Buffer2], a ld [Buffer2], a
ld hl, BuyItem_MenuDataHeader ld hl, BuyItem_MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
call Toss_Sell_Loop call Toss_Sell_Loop
ret ret
; 24fe1 ; 24fe1
@ -24,8 +24,8 @@ SelectQuantityToSell: ; 24fe1
ld [Buffer1], a ld [Buffer1], a
ld a, e ld a, e
ld [Buffer2], a ld [Buffer2], a
ld hl, SellItem_MenuDataHeader ld hl, SellItem_MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
call Toss_Sell_Loop call Toss_Sell_Loop
ret ret
; 24ff9 ; 24ff9
@ -138,9 +138,9 @@ BuySellToss_UpdateQuantityDisplay: ; 25072
ld de, wItemQuantityChangeBuffer ld de, wItemQuantityChangeBuffer
lb bc, PRINTNUM_LEADINGZEROS | 1, 2 lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum call PrintNum
ld a, [wMenuData2Pointer] ld a, [wMenuDataPointer]
ld e, a ld e, a
ld a, [wMenuData2Pointer + 1] ld a, [wMenuDataPointer + 1]
ld d, a ld d, a
ld a, [wMenuDataBank] ld a, [wMenuDataBank]
call FarCall_de call FarCall_de
@ -213,21 +213,21 @@ BuySell_DisplaySubtotal: ; 250d1
ret ret
; 250ed ; 250ed
TossItem_MenuDataHeader: ; 0x250ed TossItem_MenuHeader: ; 0x250ed
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw ret_25097 dw ret_25097
db 0 ; default option db 0 ; default option
; 0x250f5 ; 0x250f5
BuyItem_MenuDataHeader: ; 0x250f5 BuyItem_MenuHeader: ; 0x250f5
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplayPurchasePrice dw DisplayPurchasePrice
db -1 ; default option db -1 ; default option
; 0x250fd ; 0x250fd
SellItem_MenuDataHeader: ; 0x250fd SellItem_MenuHeader: ; 0x250fd
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplaySellingPrice dw DisplaySellingPrice

View File

@ -38,7 +38,7 @@ RestartClock: ; 20021 (8:4021)
ld a, [hl] ld a, [hl]
push af push af
set NO_TEXT_SCROLL, [hl] set NO_TEXT_SCROLL, [hl]
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
call ClearTileMap call ClearTileMap
ld hl, .Text_SetWithControlPad ld hl, .Text_SetWithControlPad
call PrintText call PrintText

View File

@ -8,8 +8,8 @@ InitDecorations: ; 26751 (9:6751)
_PlayerDecorationMenu: ; 0x2675c _PlayerDecorationMenu: ; 0x2675c
ld a, [wWhichIndexSet] ld a, [wWhichIndexSet]
push af push af
ld hl, .MenuDataHeader ld hl, .MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
xor a xor a
ld [Buffer5], a ld [Buffer5], a
ld a, $1 ld a, $1
@ -36,14 +36,14 @@ _PlayerDecorationMenu: ; 0x2675c
ret ret
; 0x2679a ; 0x2679a
.MenuDataHeader: ; 0x2679a .MenuHeader: ; 0x2679a
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0x267a2 ; 0x267a2
.MenuData2: ; 0x267a2 .MenuData: ; 0x267a2
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; items db 0 ; items
dw wd002 dw wd002
@ -374,8 +374,8 @@ PopulateDecoCategoryMenu: ; 2695b
jr nc, .beyond_eight jr nc, .beyond_eight
xor a xor a
ld [wWhichIndexSet], a ld [wWhichIndexSet], a
ld hl, .NonscrollingMenuDataHeader ld hl, .NonscrollingMenuHeader
call LoadMenuDataHeader call LoadMenuHeader
call DoNthMenu call DoNthMenu
jr c, .no_action_1 jr c, .no_action_1
call DoDecorationAction2 call DoDecorationAction2
@ -391,9 +391,9 @@ PopulateDecoCategoryMenu: ; 2695b
ld d, 0 ld d, 0
add hl, de add hl, de
ld [hl], -1 ld [hl], -1
call LoadStandardMenuDataHeader call LoadStandardMenuHeader
ld hl, .ScrollingMenuDataHeader ld hl, .ScrollingMenuHeader
call CopyMenuDataHeader call CopyMenuHeader
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call InitScrollingMenu call InitScrollingMenu
@ -421,14 +421,14 @@ PopulateDecoCategoryMenu: ; 2695b
db "@" db "@"
; 0x269b5 ; 0x269b5
.NonscrollingMenuDataHeader: ; 0x269b5 .NonscrollingMenuHeader: ; 0x269b5
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .NonscrollingMenuData2 dw .NonscrollingMenuData
db 1 ; default option db 1 ; default option
; 0x269bd ; 0x269bd
.NonscrollingMenuData2: ; 0x269bd .NonscrollingMenuData: ; 0x269bd
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; items db 0 ; items
dw wd002 dw wd002
@ -436,14 +436,14 @@ PopulateDecoCategoryMenu: ; 2695b
dw DecorationAttributes dw DecorationAttributes
; 0x269c5 ; 0x269c5
.ScrollingMenuDataHeader: ; 0x269c5 .ScrollingMenuHeader: ; 0x269c5
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2 menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
dw .ScrollingMenuData2 dw .ScrollingMenuData
db 1 ; default option db 1 ; default option
; 0x269cd ; 0x269cd
.ScrollingMenuData2: ; 0x269cd .ScrollingMenuData: ; 0x269cd
db SCROLLINGMENU_DISPLAY_ARROWS ; flags db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 8, 0 ; rows, columns db 8, 0 ; rows, columns
db 1 ; horizontal spacing db 1 ; horizontal spacing
@ -912,10 +912,10 @@ DecoText_WhichSide: ; 0x26e6b
DecoAction_AskWhichSide: ; 26e70 DecoAction_AskWhichSide: ; 26e70
call MenuTextBox call MenuTextBox
ld hl, MenuDataHeader_0x26eab ld hl, MenuHeader_0x26eab
call GetMenu2 call GetMenu2
call ExitMenu call ExitMenu
call CopyMenuData2 call CopyMenuData
jr c, .nope jr c, .nope
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
cp 3 cp 3
@ -947,14 +947,14 @@ QueryWhichSide: ; 26e9a
ret ret
; 26eab ; 26eab
MenuDataHeader_0x26eab: ; 0x26eab MenuHeader_0x26eab: ; 0x26eab
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 13, 7 menu_coords 0, 0, 13, 7
dw MenuData2_0x26eb3 dw MenuData_0x26eb3
db 1 ; default option db 1 ; default option
; 0x26eb3 ; 0x26eb3
MenuData2_0x26eb3: ; 0x26eb3 MenuData_0x26eb3: ; 0x26eb3
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 3 ; items db 3 ; items
db "RIGHT SIDE@" db "RIGHT SIDE@"

View File

@ -8,8 +8,8 @@ _ResetClock: ; 4d3b1
call PlayMusic call PlayMusic
ld hl, .text_askreset ld hl, .text_askreset
call PrintText call PrintText
ld hl, .NoYes_MenuDataHeader ld hl, .NoYes_MenuHeader
call CopyMenuDataHeader call CopyMenuHeader
call VerticalMenu call VerticalMenu
ret c ret c
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@ -46,13 +46,13 @@ _ResetClock: ; 4d3b1
text_jump UnknownText_0x1c561c text_jump UnknownText_0x1c561c
db "@" db "@"
.NoYes_MenuDataHeader: ; 0x4d40d .NoYes_MenuHeader: ; 0x4d40d
db 0 ; flags db 0 ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .NoYes_MenuData2 dw .NoYes_MenuData
db 1 ; default option db 1 ; default option
.NoYes_MenuData2: ; 0x4d415 .NoYes_MenuData: ; 0x4d415
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items db 2 ; items
db "NO@" db "NO@"
@ -268,8 +268,8 @@ _DeleteSaveData: ; 4d54c
call PlayMusic call PlayMusic
ld hl, .Text_ClearAllSaveData ld hl, .Text_ClearAllSaveData
call PrintText call PrintText
ld hl, .NoYesMenuDataHeader ld hl, .NoYesMenuHeader
call CopyMenuDataHeader call CopyMenuHeader
call VerticalMenu call VerticalMenu
ret c ret c
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@ -283,13 +283,13 @@ _DeleteSaveData: ; 4d54c
text_jump UnknownText_0x1c564a text_jump UnknownText_0x1c564a
db "@" db "@"
.NoYesMenuDataHeader: ; 0x4d585 .NoYesMenuHeader: ; 0x4d585
db 0 ; flags db 0 ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
.MenuData2: ; 0x4d58d .MenuData: ; 0x4d58d
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items db 2 ; items
db "NO@" db "NO@"

View File

@ -1,8 +1,8 @@
Special_BuenasPassword: ; 8af6b Special_BuenasPassword: ; 8af6b
xor a xor a
ld [wWhichIndexSet], a ld [wWhichIndexSet], a
ld hl, .MenuDataHeader ld hl, .MenuHeader
call CopyMenuDataHeader call CopyMenuHeader
ld a, [wBuenasPassword] ld a, [wBuenasPassword]
ld c, a ld c, a
farcall GetBuenasPassword farcall GetBuenasPassword
@ -28,16 +28,16 @@ Special_BuenasPassword: ; 8af6b
ret ret
; 8afa9 ; 8afa9
.MenuDataHeader: ; 0x8afa9 .MenuHeader: ; 0x8afa9
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 7 menu_coords 0, 0, 10, 7
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0x8afb1 ; 0x8afb1
db 0 db 0
.MenuData2: ; 0x8afb2 .MenuData: ; 0x8afb2
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 0 ; items db 0 ; items
dw .PasswordIndices dw .PasswordIndices
@ -187,8 +187,8 @@ Special_BuenaPrize: ; 8afd4
; 0x8b090 ; 0x8b090
Buena_DisplayBlueCardBalance: ; 8b090 Buena_DisplayBlueCardBalance: ; 8b090
ld hl, BlueCardBalanceMenuDataHeader ld hl, BlueCardBalanceMenuHeader
call LoadMenuDataHeader call LoadMenuHeader
ret ret
; 8b097 ; 8b097
@ -202,8 +202,8 @@ PrintBlueCardBalance: ; 8b097
push de push de
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld hl, BlueCardBalanceMenuDataHeader ld hl, BlueCardBalanceMenuHeader
call CopyMenuDataHeader call CopyMenuHeader
call MenuBox call MenuBox
call UpdateSprites call UpdateSprites
call MenuBoxCoord2Tile call MenuBoxCoord2Tile
@ -227,25 +227,25 @@ PrintBlueCardBalance: ; 8b097
db "Points@" db "Points@"
; 8b0d1 ; 8b0d1
BlueCardBalanceMenuDataHeader: ; 0x8b0d1 BlueCardBalanceMenuHeader: ; 0x8b0d1
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 11, 13 menu_coords 0, 11, 11, 13
; 8b0d6 ; 8b0d6
Buena_PlacePrizeMenuBox: ; 8b0d6 Buena_PlacePrizeMenuBox: ; 8b0d6
ld hl, .menudataheader ld hl, .MenuHeader
call LoadMenuDataHeader call LoadMenuHeader
ret ret
; 8b0dd ; 8b0dd
.menudataheader ; 0x8b0dd .MenuHeader ; 0x8b0dd
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 17, TEXTBOX_Y - 1 menu_coords 0, 0, 17, TEXTBOX_Y - 1
; 8b0e2 ; 8b0e2
Buena_PrizeMenu: ; 8b0e2 Buena_PrizeMenu: ; 8b0e2
ld hl, .MenuDataHeader ld hl, .MenuHeader
call CopyMenuDataHeader call CopyMenuHeader
ld a, [MenuSelection] ld a, [MenuSelection]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
xor a xor a
@ -270,16 +270,16 @@ Buena_PrizeMenu: ; 8b0e2
ret ret
; 8b113 ; 8b113
.MenuDataHeader: ; 0x8b113 .MenuHeader: ; 0x8b113
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, 16, 9 menu_coords 1, 1, 16, 9
dw .MenuData2 dw .MenuData
db 1 ; default option db 1 ; default option
; 0x8b11b ; 0x8b11b
db 0 db 0
.MenuData2: ; 0x8b11c .MenuData: ; 0x8b11c
db SCROLLINGMENU_DISPLAY_ARROWS ; flags db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 13 ; rows, columns db 4, 13 ; rows, columns
db 1 ; spacing db 1 ; spacing

View File

@ -11,8 +11,8 @@ Special_AskRememberPassword: ; 4ae12
.DoMenu: ; 4ae1f .DoMenu: ; 4ae1f
lb bc, 14, 7 lb bc, 14, 7
push bc push bc
ld hl, YesNoMenuDataHeader ld hl, YesNoMenuHeader
call CopyMenuDataHeader call CopyMenuHeader
pop bc pop bc
ld a, b ld a, b
ld [wMenuBorderLeftCoord], a ld [wMenuBorderLeftCoord], a

Some files were not shown because too many files have changed in this diff Show More