diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-13 15:22:16 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-13 15:22:16 -0500 |
| commit | 0197e6f23c0db6baf11aa1e610521f78b6352605 (patch) | |
| tree | 33ebeff742a50c9a3cd5a83e85fda4164ef0906e /engine | |
| parent | 3db107b72159e991a08248be7e32d74cfb723289 (diff) | |
Don't split stats gfx in three
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/print_party.asm | 11 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/engine/print_party.asm b/engine/print_party.asm index ce624b013..819f38759 100755 --- a/engine/print_party.asm +++ b/engine/print_party.asm @@ -1,5 +1,4 @@ -PRINTPARTY_HP EQUS "\"◀\"" ; $71 -PRINTPARTY_SHINY EQUS "\"<ENEMY>\"" ; $3f +PRINTPARTY_HP EQUS "\"◀\"" ; $71 PrintPage1: ; 1dc1b0 hlcoord 0, 0 @@ -153,9 +152,9 @@ PrintPartyMonPage1: ; 1dc381 lb bc, BANK(GBPrinterLvIcon), 1 call Request1bpp - ld de, ShinyIconGFX - ld hl, vTiles2 tile PRINTPARTY_SHINY - lb bc, BANK(ShinyIconGFX), 1 + ld de, StatsScreenPageTilesGFX + 14 tiles ; shiny icon + ld hl, vTiles2 tile "<SHINY>" + lb bc, BANK(StatsScreenPageTilesGFX), 1 call Get2bpp xor a @@ -333,7 +332,7 @@ Function1dc52c: ; 1dc52c farcall CheckShininess ret nc hlcoord 18, 2 - ld [hl], PRINTPARTY_SHINY + ld [hl], "<SHINY>" ret ; 1dc550 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index fbe562d9c..c0963d766 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -489,7 +489,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6) farcall CheckShininess ret nc hlcoord 19, 0 - ld [hl], $3f ; shiny icon + ld [hl], "<SHINY>" ret StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) @@ -958,7 +958,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307) ld [rVBK], a ld de, TextBoxSpaceGFX lb bc, BANK(TextBoxSpaceGFX), 1 - ld hl, vTiles2 tile $7f + ld hl, vTiles2 tile " " call Get2bpp pop af ld [rVBK], a @@ -971,7 +971,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307) ; unreferenced Unknown_4e32a: ; 4e32a -; A blank tile? +; An unused space tile? ds 16 ; 4e33a |