Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

42
engine/decorations.asm
View File

@@ -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@"