From 2cf5cc1dc7f0dcc4651cdacaefb28d1b607f444c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 17:50:45 -0500 Subject: [PATCH] Move more unknown graphics into real subfolders --- Makefile | 14 ++++++++------ engine/link.asm | 4 ++-- event/photo.asm | 4 ++-- gfx/font.asm | 8 ++++---- .../bold_font.png => font/unused_bold_font.png} | Bin ...ekday_kanji.png => unused_weekday_kanji.png} | Bin gfx/{unknown => mobile}/ascii_font.png | Bin gfx/{unknown => mobile}/down_arrow.png | Bin .../electro_ball.2bpp.lz.3eaf004f | Bin gfx/{unknown => mobile}/electro_ball.png | Bin .../electro_ball_nonmatching.png | Bin gfx/{unknown => mobile}/mobile_splash.attrmap | Bin gfx/{unknown => mobile}/mobile_splash.png | Bin gfx/{unknown => mobile}/mobile_splash.tilemap | Bin .../pichu_animated.2bpp.lz.5d6d2ad4 | Bin gfx/{unknown => mobile}/pichu_animated.png | Bin gfx/{unknown => mobile}/up_arrow.png | Bin gfx/{unknown => printer}/bold_a.png | Bin gfx/{unknown => printer}/bold_b.png | Bin .../unused_gen_1_border_tiles.png} | Bin mobile/mobile_12.asm | 16 ++++++++-------- mobile/mobile_5b.asm | 6 +++--- mobile/mobile_5c.asm | 8 +++++--- 23 files changed, 32 insertions(+), 28 deletions(-) rename gfx/{unknown/bold_font.png => font/unused_bold_font.png} (100%) rename gfx/font/{weekday_kanji.png => unused_weekday_kanji.png} (100%) rename gfx/{unknown => mobile}/ascii_font.png (100%) rename gfx/{unknown => mobile}/down_arrow.png (100%) rename gfx/{unknown => mobile}/electro_ball.2bpp.lz.3eaf004f (100%) rename gfx/{unknown => mobile}/electro_ball.png (100%) rename gfx/{unknown => mobile}/electro_ball_nonmatching.png (100%) rename gfx/{unknown => mobile}/mobile_splash.attrmap (100%) rename gfx/{unknown => mobile}/mobile_splash.png (100%) rename gfx/{unknown => mobile}/mobile_splash.tilemap (100%) rename gfx/{unknown => mobile}/pichu_animated.2bpp.lz.5d6d2ad4 (100%) rename gfx/{unknown => mobile}/pichu_animated.png (100%) rename gfx/{unknown => mobile}/up_arrow.png (100%) rename gfx/{unknown => printer}/bold_a.png (100%) rename gfx/{unknown => printer}/bold_b.png (100%) rename gfx/{unknown/unused_border.png => trade/unused_gen_1_border_tiles.png} (100%) diff --git a/Makefile b/Makefile index 63d1177e8..83667441a 100644 --- a/Makefile +++ b/Makefile @@ -196,15 +196,17 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h gfx/battle/dude.2bpp: rgbgfx += -h +gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace + 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/electro_ball.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/electro_ball_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/mobile/ascii_font.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/electro_ball.2bpp: tools/gfx += --trim-whitespace +gfx/mobile/electro_ball_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace + gfx/unknown/unknown_egg.2bpp: rgbgfx += -h diff --git a/engine/link.asm b/engine/link.asm index 5be841394..7f71f4880 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2577,7 +2577,7 @@ Special_CableClubCheckWhichChris: ; 29f47 ret ; 29f54 -GFX_29f54: ; 29f54 +UnusedGen1LinkCommsBorderGFX: ; 29f54 ; unreferenced -INCBIN "gfx/unknown/unused_border.2bpp" +INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp" ; 29fe4 diff --git a/event/photo.asm b/event/photo.asm index fea57a368..55ac8e7d1 100755 --- a/event/photo.asm +++ b/event/photo.asm @@ -214,9 +214,9 @@ UnownDexVacantString: ; 16d9c UnownDexATile: ; 16d9c -INCBIN "gfx/unknown/bold_a.1bpp" +INCBIN "gfx/printer/bold_a.1bpp" UnownDexBTile: ; 16da4 -INCBIN "gfx/unknown/bold_b.1bpp" +INCBIN "gfx/printer/bold_b.1bpp" ; 16dac PlaceUnownPrinterFrontpic: ; 16dac diff --git a/gfx/font.asm b/gfx/font.asm index 8d17722f4..867619a9c 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -50,16 +50,16 @@ TownMapGFX: ; f8ba0 INCBIN "gfx/pokegear/town_map.2bpp.lz" ; f8ea4 -WeekdayKanjiGFX: ; unused kanji -INCBIN "gfx/font/weekday_kanji.2bpp" +UnusedWeekdayKanjiGFX: ; unused kanji +INCBIN "gfx/font/unused_weekday_kanji.2bpp" ; f8f24 OverworldPhoneIconGFX: ; f8f24 INCBIN "gfx/font/overworld_phone_icon.2bpp" ; f8f34 -GFX_f8f34: ; unused bold letters + unown chars -INCBIN "gfx/unknown/bold_font.1bpp" +UnusedBoldFontGFX: ; unused bold letters + unown chars +INCBIN "gfx/font/unused_bold_font.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 diff --git a/gfx/unknown/bold_font.png b/gfx/font/unused_bold_font.png similarity index 100% rename from gfx/unknown/bold_font.png rename to gfx/font/unused_bold_font.png diff --git a/gfx/font/weekday_kanji.png b/gfx/font/unused_weekday_kanji.png similarity index 100% rename from gfx/font/weekday_kanji.png rename to gfx/font/unused_weekday_kanji.png diff --git a/gfx/unknown/ascii_font.png b/gfx/mobile/ascii_font.png similarity index 100% rename from gfx/unknown/ascii_font.png rename to gfx/mobile/ascii_font.png diff --git a/gfx/unknown/down_arrow.png b/gfx/mobile/down_arrow.png similarity index 100% rename from gfx/unknown/down_arrow.png rename to gfx/mobile/down_arrow.png diff --git a/gfx/unknown/electro_ball.2bpp.lz.3eaf004f b/gfx/mobile/electro_ball.2bpp.lz.3eaf004f similarity index 100% rename from gfx/unknown/electro_ball.2bpp.lz.3eaf004f rename to gfx/mobile/electro_ball.2bpp.lz.3eaf004f diff --git a/gfx/unknown/electro_ball.png b/gfx/mobile/electro_ball.png similarity index 100% rename from gfx/unknown/electro_ball.png rename to gfx/mobile/electro_ball.png diff --git a/gfx/unknown/electro_ball_nonmatching.png b/gfx/mobile/electro_ball_nonmatching.png similarity index 100% rename from gfx/unknown/electro_ball_nonmatching.png rename to gfx/mobile/electro_ball_nonmatching.png diff --git a/gfx/unknown/mobile_splash.attrmap b/gfx/mobile/mobile_splash.attrmap similarity index 100% rename from gfx/unknown/mobile_splash.attrmap rename to gfx/mobile/mobile_splash.attrmap diff --git a/gfx/unknown/mobile_splash.png b/gfx/mobile/mobile_splash.png similarity index 100% rename from gfx/unknown/mobile_splash.png rename to gfx/mobile/mobile_splash.png diff --git a/gfx/unknown/mobile_splash.tilemap b/gfx/mobile/mobile_splash.tilemap similarity index 100% rename from gfx/unknown/mobile_splash.tilemap rename to gfx/mobile/mobile_splash.tilemap diff --git a/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 b/gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4 similarity index 100% rename from gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 rename to gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4 diff --git a/gfx/unknown/pichu_animated.png b/gfx/mobile/pichu_animated.png similarity index 100% rename from gfx/unknown/pichu_animated.png rename to gfx/mobile/pichu_animated.png diff --git a/gfx/unknown/up_arrow.png b/gfx/mobile/up_arrow.png similarity index 100% rename from gfx/unknown/up_arrow.png rename to gfx/mobile/up_arrow.png diff --git a/gfx/unknown/bold_a.png b/gfx/printer/bold_a.png similarity index 100% rename from gfx/unknown/bold_a.png rename to gfx/printer/bold_a.png diff --git a/gfx/unknown/bold_b.png b/gfx/printer/bold_b.png similarity index 100% rename from gfx/unknown/bold_b.png rename to gfx/printer/bold_b.png diff --git a/gfx/unknown/unused_border.png b/gfx/trade/unused_gen_1_border_tiles.png similarity index 100% rename from gfx/unknown/unused_border.png rename to gfx/trade/unused_gen_1_border_tiles.png diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index efe138162..8b21bb6a6 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -21,13 +21,13 @@ InitMobileProfile: ; 4802f (12:402f) .not_yet_initialized call Function486bf call LoadFontsExtra - ld de, GFX_488c3 + ld de, MobileUpArrowGFX ld hl, VTiles2 tile $10 - lb bc, BANK(GFX_488c3), 1 + lb bc, BANK(MobileUpArrowGFX), 1 call Request1bpp - ld de, GFX_488cb + ld de, MobileDownArrowGFX ld hl, VTiles2 tile $11 - lb bc, BANK(GFX_488cb), 1 + lb bc, BANK(MobileDownArrowGFX), 1 call Request1bpp call Function4a3a7 call ClearBGPalettes @@ -1020,11 +1020,11 @@ Function488b9: ; 488b9 (12:48b9) ret ; 488c3 (12:48c3) -GFX_488c3: ; 488c3 -INCBIN "gfx/unknown/up_arrow.2bpp" +MobileUpArrowGFX: ; 488c3 +INCBIN "gfx/mobile/up_arrow.2bpp" -GFX_488cb: ; 488cb -INCBIN "gfx/unknown/down_arrow.2bpp" +MobileDownArrowGFX: ; 488cb +INCBIN "gfx/mobile/down_arrow.2bpp" Function488d3: ; 488d3 (12:48d3) call Function48283 diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 679f04342..041c071b4 100755 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -221,13 +221,13 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ; 16c173 .Tiles: -INCBIN "gfx/unknown/mobile_splash.2bpp" +INCBIN "gfx/mobile/mobile_splash.2bpp" .TileMap: -INCBIN "gfx/unknown/mobile_splash.tilemap" +INCBIN "gfx/mobile/mobile_splash.tilemap" .AttrMap: -INCBIN "gfx/unknown/mobile_splash.attrmap" +INCBIN "gfx/mobile/mobile_splash.attrmap" UnknownMobilePalettes_16c903: ; 16c903 INCLUDE "gfx/unknown/16c903.pal" diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 48f9cace9..f33ff7af4 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -305,10 +305,10 @@ Function170d02: ; 170d02 ; 170d16 LZ_170d16: -INCBIN "gfx/unknown/pichu_animated.2bpp.lz" +INCBIN "gfx/mobile/pichu_animated.2bpp.lz" LZ_1715a4: -INCBIN "gfx/unknown/egg_animated.2bpp.lz" +INCBIN "gfx/mobile/electro_ball.2bpp.lz" GFX_171848: INCBIN "gfx/unknown/171848.2bpp" @@ -819,7 +819,8 @@ Palette_171d71: RGB 0, 0, 0 GFX_171db1: -INCBIN "gfx/unknown/ascii_font.2bpp" +INCBIN "gfx/mobile/ascii_font.2bpp" + Tilemap_172491: INCBIN "gfx/unknown/172491.tilemap" Tilemap_17251d: @@ -832,6 +833,7 @@ Attrmap_1727ed: INCBIN "gfx/unknown/1727ed.attrmap" Attrmap_172955: INCBIN "gfx/unknown/172955.attrmap" + LZ_172abd: INCBIN "gfx/pokedex/slowpoke.2bpp.lz"