Identify some more unnamed labels

This commit is contained in:
Rangi
2020-10-05 11:24:47 -04:00
parent d9603e3e33
commit ff2d850219
6 changed files with 100 additions and 100 deletions

View File

@@ -11,15 +11,15 @@ LoadBattleMenu:
SafariBattleMenu:
; untranslated
ld hl, MenuHeader_0x24f4e
ld hl, SafariBattleMenuHeader
call LoadMenuHeader
jr Function24f19
jr CommonBattleMenu
ContestBattleMenu:
ld hl, MenuHeader_0x24f89
ld hl, ContestBattleMenuHeader
call LoadMenuHeader
Function24f19:
; fallthrough
CommonBattleMenu:
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call _2DMenu
@@ -31,68 +31,68 @@ Function24f19:
BattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f34
dw .MenuData
db 1 ; default option
MenuData_0x24f34:
.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 6 ; spacing
dba Strings24f3d
dbw BANK(MenuData_0x24f34), 0
dba .Text
dbw BANK(@), NULL
Strings24f3d:
.Text:
db "FIGHT@"
db "<PKMN>@"
db "PACK@"
db "RUN@"
MenuHeader_0x24f4e:
SafariBattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f56
dw .MenuData
db 1 ; default option
MenuData_0x24f56:
.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 11 ; spacing
dba Strings24f5f
dba Function24f7c
dba .Text
dba .PrintSafariBallsRemaining
Strings24f5f:
.Text:
db "サファりボール×  @" ; "SAFARI BALL× @"
db "エサをなげる@" ; "THROW BAIT"
db "いしをなげる@" ; "THROW ROCK"
db "にげる@" ; "RUN"
Function24f7c:
.PrintSafariBallsRemaining:
hlcoord 17, 13
ld de, wSafariBallsRemaining
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret
MenuHeader_0x24f89:
ContestBattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f91
dw .MenuData
db 1 ; default option
MenuData_0x24f91:
.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 12 ; spacing
dba Strings24f9a
dba Function24fb2
dba .Text
dba .PrintParkBallsRemaining
Strings24f9a:
.Text:
db "FIGHT@"
db "<PKMN>@"
db "PARKBALL× @"
db "RUN@"
Function24fb2:
.PrintParkBallsRemaining:
hlcoord 13, 16
ld de, wParkBallsRemaining
lb bc, PRINTNUM_LEADINGZEROS | 1, 2