summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 18:04:23 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 18:04:23 -0500
commit2d644f5077fa9ec43009ea5ec072e6ade9a1f61b (patch)
tree436edae0806f115d64f5e5d0c36d1a888c8d5664
parente6f6a753306865b2b4522850fd98665dc9546876 (diff)
Name some gfx/unknown/ files
-rw-r--r--Makefile12
-rwxr-xr-xengine/link.asm2
-rwxr-xr-xevent/photo.asm4
-rwxr-xr-xgfx/font.asm2
-rw-r--r--gfx/unknown/ascii_font.png (renamed from gfx/unknown/171db1.png)bin762 -> 762 bytes
-rw-r--r--gfx/unknown/bold_a.png (renamed from gfx/unknown/016d9c.png)bin85 -> 85 bytes
-rw-r--r--gfx/unknown/bold_b.png (renamed from gfx/unknown/016da4.png)bin77 -> 77 bytes
-rw-r--r--gfx/unknown/bold_font.png (renamed from gfx/unknown/0f8f34.png)bin575 -> 575 bytes
-rw-r--r--gfx/unknown/down_arrow.png (renamed from gfx/unknown/0488cb.png)bin77 -> 77 bytes
-rw-r--r--gfx/unknown/egg_animated.2bpp.lz.3eaf004f (renamed from gfx/unknown/1715a4.2bpp.lz.3eaf004f)bin676 -> 676 bytes
-rw-r--r--gfx/unknown/egg_animated.png (renamed from gfx/unknown/1715a4.png)bin692 -> 692 bytes
-rwxr-xr-xgfx/unknown/egg_animated_nonmatching.png (renamed from gfx/unknown/1715a4_nonmatching.png)bin1422 -> 1422 bytes
-rw-r--r--gfx/unknown/mobile_splash.attrmap (renamed from gfx/unknown/16c79b.tilemap)bin360 -> 360 bytes
-rwxr-xr-xgfx/unknown/mobile_splash.png (renamed from gfx/unknown/16c173.png)bin1681 -> 1681 bytes
-rw-r--r--gfx/unknown/mobile_splash.tilemap (renamed from gfx/unknown/16c633.tilemap)bin360 -> 360 bytes
-rw-r--r--gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 (renamed from gfx/unknown/170d16.2bpp.lz.5d6d2ad4)bin2190 -> 2190 bytes
-rw-r--r--gfx/unknown/pichu_animated.png (renamed from gfx/unknown/170d16.png)bin1939 -> 1939 bytes
-rw-r--r--gfx/unknown/unused_border.png (renamed from gfx/unknown/029f54.png)bin175 -> 175 bytes
-rw-r--r--gfx/unknown/up_arrow.png (renamed from gfx/unknown/0488c3.png)bin77 -> 77 bytes
-rwxr-xr-xmisc/mobile_12.asm4
-rwxr-xr-xmisc/mobile_5b.asm6
-rwxr-xr-xmisc/mobile_5c.asm7
22 files changed, 19 insertions, 18 deletions
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
index 1c32d2bda..1c32d2bda 100644
--- a/gfx/unknown/171db1.png
+++ b/gfx/unknown/ascii_font.png
Binary files differ
diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/bold_a.png
index 56252c423..56252c423 100644
--- a/gfx/unknown/016d9c.png
+++ b/gfx/unknown/bold_a.png
Binary files differ
diff --git a/gfx/unknown/016da4.png b/gfx/unknown/bold_b.png
index 8ce07a03c..8ce07a03c 100644
--- a/gfx/unknown/016da4.png
+++ b/gfx/unknown/bold_b.png
Binary files differ
diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/bold_font.png
index e02b91ce2..e02b91ce2 100644
--- a/gfx/unknown/0f8f34.png
+++ b/gfx/unknown/bold_font.png
Binary files differ
diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/down_arrow.png
index 9eaaadd2d..9eaaadd2d 100644
--- a/gfx/unknown/0488cb.png
+++ b/gfx/unknown/down_arrow.png
Binary files differ
diff --git a/gfx/unknown/1715a4.2bpp.lz.3eaf004f b/gfx/unknown/egg_animated.2bpp.lz.3eaf004f
index b4fabff15..b4fabff15 100644
--- a/gfx/unknown/1715a4.2bpp.lz.3eaf004f
+++ b/gfx/unknown/egg_animated.2bpp.lz.3eaf004f
Binary files differ
diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/egg_animated.png
index 3e1c0bb46..3e1c0bb46 100644
--- a/gfx/unknown/1715a4.png
+++ b/gfx/unknown/egg_animated.png
Binary files differ
diff --git a/gfx/unknown/1715a4_nonmatching.png b/gfx/unknown/egg_animated_nonmatching.png
index 44ea166ef..44ea166ef 100755
--- a/gfx/unknown/1715a4_nonmatching.png
+++ b/gfx/unknown/egg_animated_nonmatching.png
Binary files differ
diff --git a/gfx/unknown/16c79b.tilemap b/gfx/unknown/mobile_splash.attrmap
index 86666b3fd..86666b3fd 100644
--- a/gfx/unknown/16c79b.tilemap
+++ b/gfx/unknown/mobile_splash.attrmap
Binary files differ
diff --git a/gfx/unknown/16c173.png b/gfx/unknown/mobile_splash.png
index d54b68cdf..d54b68cdf 100755
--- a/gfx/unknown/16c173.png
+++ b/gfx/unknown/mobile_splash.png
Binary files differ
diff --git a/gfx/unknown/16c633.tilemap b/gfx/unknown/mobile_splash.tilemap
index 81818e531..81818e531 100644
--- a/gfx/unknown/16c633.tilemap
+++ b/gfx/unknown/mobile_splash.tilemap
Binary files differ
diff --git a/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 b/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4
index 4d50c6bcf..4d50c6bcf 100644
--- a/gfx/unknown/170d16.2bpp.lz.5d6d2ad4
+++ b/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4
Binary files differ
diff --git a/gfx/unknown/170d16.png b/gfx/unknown/pichu_animated.png
index 2832fdb6a..2832fdb6a 100644
--- a/gfx/unknown/170d16.png
+++ b/gfx/unknown/pichu_animated.png
Binary files differ
diff --git a/gfx/unknown/029f54.png b/gfx/unknown/unused_border.png
index d3ac169fc..d3ac169fc 100644
--- a/gfx/unknown/029f54.png
+++ b/gfx/unknown/unused_border.png
Binary files differ
diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/up_arrow.png
index e8b43de99..e8b43de99 100644
--- a/gfx/unknown/0488c3.png
+++ b/gfx/unknown/up_arrow.png
Binary files differ
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: