ref: 2cf5cc1dc7f0dcc4651cdacaefb28d1b607f444c
parent: 59fe4078124f0fa8d1613a3f715861d9c6f2d449
author: Remy Oukaour <[email protected]>
date: Fri Dec 15 12:50:45 EST 2017
Move more unknown graphics into real subfolders
--- a/Makefile
+++ b/Makefile
@@ -196,15 +196,17 @@
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
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -2577,7 +2577,7 @@
ret
; 29f54
-GFX_29f54: ; 29f54
+UnusedGen1LinkCommsBorderGFX: ; 29f54
; unreferenced
-INCBIN "gfx/unknown/unused_border.2bpp"
+INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp"
; 29fe4
--- a/event/photo.asm
+++ b/event/photo.asm
@@ -214,9 +214,9 @@
; 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
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -50,8 +50,8 @@
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
@@ -58,8 +58,8 @@
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
binary files /dev/null b/gfx/font/unused_bold_font.png differ
binary files /dev/null b/gfx/font/unused_weekday_kanji.png differ
binary files a/gfx/font/weekday_kanji.png /dev/null differ
binary files /dev/null b/gfx/mobile/ascii_font.png differ
binary files /dev/null b/gfx/mobile/down_arrow.png differ
binary files /dev/null b/gfx/mobile/electro_ball.2bpp.lz.3eaf004f differ
binary files /dev/null b/gfx/mobile/electro_ball.png differ
binary files /dev/null b/gfx/mobile/electro_ball_nonmatching.png differ
binary files /dev/null b/gfx/mobile/mobile_splash.attrmap differ
binary files /dev/null b/gfx/mobile/mobile_splash.png differ
binary files /dev/null b/gfx/mobile/mobile_splash.tilemap differ
binary files /dev/null b/gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4 differ
binary files /dev/null b/gfx/mobile/pichu_animated.png differ
binary files /dev/null b/gfx/mobile/up_arrow.png differ
binary files /dev/null b/gfx/printer/bold_a.png differ
binary files /dev/null b/gfx/printer/bold_b.png differ
binary files /dev/null b/gfx/trade/unused_gen_1_border_tiles.png differ
binary files a/gfx/unknown/ascii_font.png /dev/null differ
binary files a/gfx/unknown/bold_a.png /dev/null differ
binary files a/gfx/unknown/bold_b.png /dev/null differ
binary files a/gfx/unknown/bold_font.png /dev/null differ
binary files a/gfx/unknown/down_arrow.png /dev/null differ
binary files a/gfx/unknown/electro_ball.2bpp.lz.3eaf004f /dev/null differ
binary files a/gfx/unknown/electro_ball.png /dev/null differ
binary files a/gfx/unknown/electro_ball_nonmatching.png /dev/null differ
binary files a/gfx/unknown/mobile_splash.attrmap /dev/null differ
binary files a/gfx/unknown/mobile_splash.png /dev/null differ
binary files a/gfx/unknown/mobile_splash.tilemap /dev/null differ
binary files a/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 /dev/null differ
binary files a/gfx/unknown/pichu_animated.png /dev/null differ
binary files a/gfx/unknown/unused_border.png /dev/null differ
binary files a/gfx/unknown/up_arrow.png /dev/null differ
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -21,13 +21,13 @@
.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 @@
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
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -221,13 +221,13 @@
; 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"
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -305,10 +305,10 @@
; 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 @@
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 @@
INCBIN "gfx/unknown/1727ed.attrmap"
Attrmap_172955:
INCBIN "gfx/unknown/172955.attrmap"
+
LZ_172abd:
INCBIN "gfx/pokedex/slowpoke.2bpp.lz"