diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-05 11:24:47 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-05 12:02:56 -0400 |
| commit | ff2d8502197934e07a45903102560e8eb81d2b5b (patch) | |
| tree | 0595b564244f303aadd76f7af07d7d6b9ac8384d /engine/battle | |
| parent | d9603e3e331655bb7e061b612730b68cd4378f96 (diff) | |
Identify some more unnamed labels
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/menu.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 12d65476b..a4955ec6a 100644 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -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 |