From 2d644f5077fa9ec43009ea5ec072e6ade9a1f61b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 18:04:23 -0500 Subject: [PATCH] Name some gfx/unknown/ files --- Makefile | 12 ++++++------ engine/link.asm | 2 +- event/photo.asm | 4 ++-- gfx/font.asm | 2 +- gfx/unknown/{171db1.png => ascii_font.png} | Bin gfx/unknown/{016d9c.png => bold_a.png} | Bin gfx/unknown/{016da4.png => bold_b.png} | Bin gfx/unknown/{0f8f34.png => bold_font.png} | Bin gfx/unknown/{0488cb.png => down_arrow.png} | Bin ...pp.lz.3eaf004f => egg_animated.2bpp.lz.3eaf004f} | Bin gfx/unknown/{1715a4.png => egg_animated.png} | Bin ...nonmatching.png => egg_animated_nonmatching.png} | Bin .../{16c79b.tilemap => mobile_splash.attrmap} | Bin gfx/unknown/{16c173.png => mobile_splash.png} | Bin .../{16c633.tilemap => mobile_splash.tilemap} | Bin ....lz.5d6d2ad4 => pichu_animated.2bpp.lz.5d6d2ad4} | Bin gfx/unknown/{170d16.png => pichu_animated.png} | Bin gfx/unknown/{029f54.png => unused_border.png} | Bin gfx/unknown/{0488c3.png => up_arrow.png} | Bin misc/mobile_12.asm | 4 ++-- misc/mobile_5b.asm | 6 +++--- misc/mobile_5c.asm | 7 ++++--- 22 files changed, 19 insertions(+), 18 deletions(-) rename gfx/unknown/{171db1.png => ascii_font.png} (100%) rename gfx/unknown/{016d9c.png => bold_a.png} (100%) rename gfx/unknown/{016da4.png => bold_b.png} (100%) rename gfx/unknown/{0f8f34.png => bold_font.png} (100%) rename gfx/unknown/{0488cb.png => down_arrow.png} (100%) rename gfx/unknown/{1715a4.2bpp.lz.3eaf004f => egg_animated.2bpp.lz.3eaf004f} (100%) rename gfx/unknown/{1715a4.png => egg_animated.png} (100%) rename gfx/unknown/{1715a4_nonmatching.png => egg_animated_nonmatching.png} (100%) rename gfx/unknown/{16c79b.tilemap => mobile_splash.attrmap} (100%) rename gfx/unknown/{16c173.png => mobile_splash.png} (100%) rename gfx/unknown/{16c633.tilemap => mobile_splash.tilemap} (100%) rename gfx/unknown/{170d16.2bpp.lz.5d6d2ad4 => pichu_animated.2bpp.lz.5d6d2ad4} (100%) rename gfx/unknown/{170d16.png => pichu_animated.png} (100%) rename gfx/unknown/{029f54.png => unused_border.png} (100%) rename gfx/unknown/{0488c3.png => up_arrow.png} (100%) diff --git a/Makefile b/Makefile index 6979e7ce9..d3158c341 100644 --- a/Makefile +++ b/Makefile @@ -200,13 +200,13 @@ gfx/battle/dude.2bpp: rgbgfx += -h gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/ascii_font.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/bold_font.1bpp: tools/gfx += --trim-whitespace +gfx/unknown/egg_animated.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/egg_animated_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/pichu_animated.2bpp: tools/gfx += --trim-whitespace gfx/unknown/unknown_egg.2bpp: rgbgfx += -h -gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace -gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace %.bin: ; diff --git a/engine/link.asm b/engine/link.asm index f7e0b2ad4..b57e49e1e 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2579,5 +2579,5 @@ Special_CableClubCheckWhichChris: ; 29f47 GFX_29f54: ; 29f54 ; unreferenced -INCBIN "gfx/unknown/029f54.2bpp" +INCBIN "gfx/unknown/unused_border.2bpp" ; 29fe4 diff --git a/event/photo.asm b/event/photo.asm index c47445fc5..fea57a368 100755 --- a/event/photo.asm +++ b/event/photo.asm @@ -214,9 +214,9 @@ UnownDexVacantString: ; 16d9c UnownDexATile: ; 16d9c -INCBIN "gfx/unknown/016d9c.1bpp" +INCBIN "gfx/unknown/bold_a.1bpp" UnownDexBTile: ; 16da4 -INCBIN "gfx/unknown/016da4.1bpp" +INCBIN "gfx/unknown/bold_b.1bpp" ; 16dac PlaceUnownPrinterFrontpic: ; 16dac diff --git a/gfx/font.asm b/gfx/font.asm index 99e8505b7..f2efefd37 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -59,7 +59,7 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp" ; f8f34 GFX_f8f34: ; unused bold letters + unown chars -INCBIN "gfx/unknown/0f8f34.1bpp" +INCBIN "gfx/unknown/bold_font.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 diff --git a/gfx/unknown/171db1.png b/gfx/unknown/ascii_font.png similarity index 100% rename from gfx/unknown/171db1.png rename to gfx/unknown/ascii_font.png diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/bold_a.png similarity index 100% rename from gfx/unknown/016d9c.png rename to gfx/unknown/bold_a.png diff --git a/gfx/unknown/016da4.png b/gfx/unknown/bold_b.png similarity index 100% rename from gfx/unknown/016da4.png rename to gfx/unknown/bold_b.png diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/bold_font.png similarity index 100% rename from gfx/unknown/0f8f34.png rename to gfx/unknown/bold_font.png diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/down_arrow.png similarity index 100% rename from gfx/unknown/0488cb.png rename to gfx/unknown/down_arrow.png diff --git a/gfx/unknown/1715a4.2bpp.lz.3eaf004f b/gfx/unknown/egg_animated.2bpp.lz.3eaf004f similarity index 100% rename from gfx/unknown/1715a4.2bpp.lz.3eaf004f rename to gfx/unknown/egg_animated.2bpp.lz.3eaf004f diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/egg_animated.png similarity index 100% rename from gfx/unknown/1715a4.png rename to gfx/unknown/egg_animated.png diff --git a/gfx/unknown/1715a4_nonmatching.png b/gfx/unknown/egg_animated_nonmatching.png similarity index 100% rename from gfx/unknown/1715a4_nonmatching.png rename to gfx/unknown/egg_animated_nonmatching.png diff --git a/gfx/unknown/16c79b.tilemap b/gfx/unknown/mobile_splash.attrmap similarity index 100% rename from gfx/unknown/16c79b.tilemap rename to gfx/unknown/mobile_splash.attrmap diff --git a/gfx/unknown/16c173.png b/gfx/unknown/mobile_splash.png similarity index 100% rename from gfx/unknown/16c173.png rename to gfx/unknown/mobile_splash.png diff --git a/gfx/unknown/16c633.tilemap b/gfx/unknown/mobile_splash.tilemap similarity index 100% rename from gfx/unknown/16c633.tilemap rename to gfx/unknown/mobile_splash.tilemap diff --git a/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 b/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 similarity index 100% rename from gfx/unknown/170d16.2bpp.lz.5d6d2ad4 rename to gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 diff --git a/gfx/unknown/170d16.png b/gfx/unknown/pichu_animated.png similarity index 100% rename from gfx/unknown/170d16.png rename to gfx/unknown/pichu_animated.png diff --git a/gfx/unknown/029f54.png b/gfx/unknown/unused_border.png similarity index 100% rename from gfx/unknown/029f54.png rename to gfx/unknown/unused_border.png diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/up_arrow.png similarity index 100% rename from gfx/unknown/0488c3.png rename to gfx/unknown/up_arrow.png diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index ea1e25bb8..efe138162 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -1021,10 +1021,10 @@ Function488b9: ; 488b9 (12:48b9) ; 488c3 (12:48c3) GFX_488c3: ; 488c3 -INCBIN "gfx/unknown/0488c3.2bpp" +INCBIN "gfx/unknown/up_arrow.2bpp" GFX_488cb: ; 488cb -INCBIN "gfx/unknown/0488cb.2bpp" +INCBIN "gfx/unknown/down_arrow.2bpp" Function488d3: ; 488d3 (12:48d3) call Function48283 diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index d317f2af3..679f04342 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -221,13 +221,13 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ; 16c173 .Tiles: -INCBIN "gfx/unknown/16c173.2bpp" +INCBIN "gfx/unknown/mobile_splash.2bpp" .TileMap: -INCBIN "gfx/unknown/16c633.tilemap" +INCBIN "gfx/unknown/mobile_splash.tilemap" .AttrMap: -INCBIN "gfx/unknown/16c79b.tilemap" +INCBIN "gfx/unknown/mobile_splash.attrmap" UnknownMobilePalettes_16c903: ; 16c903 INCLUDE "gfx/unknown/16c903.pal" diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 2f1f1555c..5b7418a0f 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -305,10 +305,10 @@ Function170d02: ; 170d02 ; 170d16 LZ_170d16: -INCBIN "gfx/unknown/170d16.2bpp.lz" +INCBIN "gfx/unknown/pichu_animated.2bpp.lz" LZ_1715a4: -INCBIN "gfx/unknown/1715a4.2bpp.lz" +INCBIN "gfx/unknown/egg_animated.2bpp.lz" GFX_171848: INCBIN "gfx/unknown/171848.2bpp" @@ -817,8 +817,9 @@ Palette_171d71: RGB 21, 21, 20 RGB 11, 11, 10 RGB 0, 0, 0 + GFX_171db1: -INCBIN "gfx/unknown/171db1.2bpp" +INCBIN "gfx/unknown/ascii_font.2bpp" Tilemap_172491: INCBIN "gfx/unknown/172491.tilemap" Tilemap_17251d: