diff options
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/main_menu.asm | 9 | ||||
| -rw-r--r-- | engine/menus/menu_2.asm | 18 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 3 | ||||
| -rw-r--r-- | engine/menus/trainer_card.asm | 12 |
4 files changed, 22 insertions, 20 deletions
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 6f8727a7..20c74336 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -218,20 +218,19 @@ MainMenu_PrintCurrentTimeAndDay: call PrintNum ret -.min -; unused +.minString: ; unreferenced db "min.@" .PrintTimeNotSet: hlcoord 1, 14 - ld de, .TimeNotSet + ld de, .TimeNotSetString call PlaceString ret -.TimeNotSet: +.TimeNotSetString: db "TIME NOT SET@" -.MainMenuTimeUnknownText: +.MainMenuTimeUnknownText: ; unreferenced text_far _MainMenuTimeUnknownText text_end diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 6566e48d..99a0f74b 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -157,18 +157,18 @@ StartMenu_PrintBugContestStatus: set NO_TEXT_SCROLL, [hl] call StartMenu_DrawBugContestStatusBox hlcoord 1, 5 - ld de, .Balls_EN + ld de, .BallsString call PlaceString hlcoord 8, 5 ld de, wParkBallsRemaining lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum hlcoord 1, 1 - ld de, .CAUGHT + ld de, .CaughtString call PlaceString ld a, [wContestMon] and a - ld de, .None + ld de, .NoneString jr z, .no_contest_mon ld [wNamedObjectIndexBuffer], a call GetPokemonName @@ -180,7 +180,7 @@ StartMenu_PrintBugContestStatus: and a jr z, .skip_level hlcoord 1, 3 - ld de, .LEVEL + ld de, .LevelString call PlaceString ld a, [wContestMonLevel] ld h, b @@ -194,15 +194,15 @@ StartMenu_PrintBugContestStatus: ld [wOptions], a ret -.Balls_JP: +.BallsJPString: ; unreferenced db "ボール こ@" -.CAUGHT: +.CaughtString: db "CAUGHT@" -.Balls_EN: +.BallsString: db "BALLS:@" -.None: +.NoneString: db "None@" -.LEVEL: +.LevelString: db "LEVEL@" Kurt_SelectApricorn: diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index a0b5cba3..39d930ab 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -253,6 +253,7 @@ NamingScreen_InitText: NamingScreen_ApplyTextInputMode: call NamingScreen_IsTargetBox jr nz, .not_box + assert BoxNameInputLower - NameInputLower == BoxNameInputUpper - NameInputUpper ld hl, BoxNameInputLower - NameInputLower add hl, de ld d, h @@ -865,7 +866,7 @@ INCBIN "gfx/naming_screen/cursor.2bpp" INCLUDE "data/text/name_input_chars.asm" -NamingScreenGFX_End: ; unused +NamingScreenGFX_End: ; unreferenced INCBIN "gfx/naming_screen/end.1bpp" NamingScreenGFX_MiddleLine: diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 6f2ef316..de34057f 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -44,10 +44,10 @@ TrainerCard: call ClearTilemap call DisableLCD - ld hl, ChrisCardPic + ld hl, ChrisPicAndTrainerCardGFX ld de, vTiles2 - ld bc, 41 tiles - ld a, BANK(ChrisCardPic) + ld bc, (35 + 6) tiles + ld a, BANK(ChrisPicAndTrainerCardGFX) call FarCopyBytes ld hl, CardStatusGFX @@ -619,8 +619,10 @@ TrainerCard_JohtoBadgesOAM: db $1c, $20, $24, $20 | (1 << 7) db $1c | (1 << 7), $20, $24, $20 | (1 << 7) -ChrisCardPic: INCBIN "gfx/trainer_card/chris_card.2bpp" -CardGFX: INCBIN "gfx/trainer_card/trainer_card.2bpp" +ChrisPicAndTrainerCardGFX: +INCBIN "gfx/trainer_card/chris_card.2bpp" +INCBIN "gfx/trainer_card/trainer_card.2bpp" + CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp" LeaderGFX: INCBIN "gfx/trainer_card/leaders.2bpp" |