ref: 0197e6f23c0db6baf11aa1e610521f78b6352605
parent: 3db107b72159e991a08248be7e32d74cfb723289
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Sat Jan 13 10:22:16 EST 2018
Don't split stats gfx in three
--- a/charmap.asm
+++ b/charmap.asm
@@ -89,6 +89,9 @@
charmap "′", $6e ; gfx/font/feet_inches.png
charmap "″", $6f ; gfx/font/feet_inches.png
+ ; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1
+ charmap "<SHINY>", $3f ; gfx/stats/stats_tiles.png, tile 14
+
; Actual characters (from gfx/font/font.png)
charmap "A", $80
--- 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 @@
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 @@
farcall CheckShininess
ret nc
hlcoord 18, 2
- ld [hl], PRINTPARTY_SHINY
+ ld [hl], "<SHINY>"
ret
; 1dc550
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -489,7 +489,7 @@
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 @@
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 @@
; unreferenced
Unknown_4e32a: ; 4e32a
-; A blank tile?
+; An unused space tile?
ds 16
; 4e33a
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -23,15 +23,6 @@
StatsScreenPageTilesGFX: ; f89b0
INCBIN "gfx/stats/stats_tiles.2bpp"
-; f8a90
-
-ShinyIconGFX: ; f8a90
-; also part of StatsScreenPageTilesGFX
-INCBIN "gfx/stats/shiny.2bpp"
-
-ExpBarEndsGFX: ; f8aa0
-; not referenced on its own, but part of StatsScreenPageTilesGFX
-INCBIN "gfx/stats/exp_bar_ends.2bpp"
; f8ac0
EnemyHPBarBorderGFX: ; f8ac0
binary files a/gfx/stats/exp_bar_ends.png /dev/null differ
binary files a/gfx/stats/shiny.png /dev/null differ
binary files a/gfx/stats/stats_tiles.png b/gfx/stats/stats_tiles.png differ