pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Don't split stats gfx in three

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-13 15:22:16 -05:00
parent 3db107b721
commit 0197e6f23c
7 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charmap.asm
View File

@ -89,6 +89,9 @@
charmap "′", $6e ; gfx/font/feet_inches.png charmap "′", $6e ; gfx/font/feet_inches.png
charmap "″", $6f ; 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) ; Actual characters (from gfx/font/font.png)
charmap "A", $80 charmap "A", $80

9
engine/print_party.asm
View File

@ -1,5 +1,4 @@
PRINTPARTY_HP EQUS "\"◀\"" ; $71 PRINTPARTY_HP EQUS "\"◀\"" ; $71
PRINTPARTY_SHINY EQUS "\"<ENEMY>\"" ; $3f
PrintPage1: ; 1dc1b0 PrintPage1: ; 1dc1b0
hlcoord 0, 0 hlcoord 0, 0
@ -153,9 +152,9 @@ PrintPartyMonPage1: ; 1dc381
lb bc, BANK(GBPrinterLvIcon), 1 lb bc, BANK(GBPrinterLvIcon), 1
call Request1bpp call Request1bpp
ld de, ShinyIconGFX ld de, StatsScreenPageTilesGFX + 14 tiles ; shiny icon
ld hl, vTiles2 tile PRINTPARTY_SHINY ld hl, vTiles2 tile "<SHINY>"
lb bc, BANK(ShinyIconGFX), 1 lb bc, BANK(StatsScreenPageTilesGFX), 1
call Get2bpp call Get2bpp
xor a xor a
@ -333,7 +332,7 @@ Function1dc52c: ; 1dc52c
farcall CheckShininess farcall CheckShininess
ret nc ret nc
hlcoord 18, 2 hlcoord 18, 2
ld [hl], PRINTPARTY_SHINY ld [hl], "<SHINY>"
ret ret
; 1dc550 ; 1dc550

6
engine/stats_screen.asm
View File

@ -489,7 +489,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6)
farcall CheckShininess farcall CheckShininess
ret nc ret nc
hlcoord 19, 0 hlcoord 19, 0
ld [hl], $3f ; shiny icon ld [hl], "<SHINY>"
ret ret
StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
@ -958,7 +958,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
ld [rVBK], a ld [rVBK], a
ld de, TextBoxSpaceGFX ld de, TextBoxSpaceGFX
lb bc, BANK(TextBoxSpaceGFX), 1 lb bc, BANK(TextBoxSpaceGFX), 1
ld hl, vTiles2 tile $7f ld hl, vTiles2 tile " "
call Get2bpp call Get2bpp
pop af pop af
ld [rVBK], a ld [rVBK], a
@ -971,7 +971,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
; unreferenced ; unreferenced
Unknown_4e32a: ; 4e32a Unknown_4e32a: ; 4e32a
; A blank tile? ; An unused space tile?
ds 16 ds 16
; 4e33a ; 4e33a

9
gfx/font.asm
View File

@ -23,15 +23,6 @@ INCBIN "gfx/frames/9.1bpp"
StatsScreenPageTilesGFX: ; f89b0 StatsScreenPageTilesGFX: ; f89b0
INCBIN "gfx/stats/stats_tiles.2bpp" 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 ; f8ac0
EnemyHPBarBorderGFX: ; f8ac0 EnemyHPBarBorderGFX: ; f8ac0

BIN
gfx/stats/exp_bar_ends.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 76 B

BIN
gfx/stats/shiny.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 89 B

BIN
gfx/stats/stats_tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 201 B