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

58
engine/billspc.asm
View File

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