summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile14
-rwxr-xr-xengine/link.asm4
-rwxr-xr-xevent/photo.asm4
-rwxr-xr-xgfx/font.asm8
-rw-r--r--gfx/font/unused_bold_font.png (renamed from gfx/unknown/bold_font.png)bin575 -> 575 bytes
-rw-r--r--gfx/font/unused_weekday_kanji.png (renamed from gfx/font/weekday_kanji.png)bin142 -> 142 bytes
-rw-r--r--gfx/mobile/ascii_font.png (renamed from gfx/unknown/ascii_font.png)bin762 -> 762 bytes
-rw-r--r--gfx/mobile/down_arrow.png (renamed from gfx/unknown/down_arrow.png)bin77 -> 77 bytes
-rw-r--r--gfx/mobile/electro_ball.2bpp.lz.3eaf004f (renamed from gfx/unknown/electro_ball.2bpp.lz.3eaf004f)bin676 -> 676 bytes
-rw-r--r--gfx/mobile/electro_ball.png (renamed from gfx/unknown/electro_ball.png)bin692 -> 692 bytes
-rwxr-xr-xgfx/mobile/electro_ball_nonmatching.png (renamed from gfx/unknown/electro_ball_nonmatching.png)bin1422 -> 1422 bytes
-rw-r--r--gfx/mobile/mobile_splash.attrmap (renamed from gfx/unknown/mobile_splash.attrmap)bin360 -> 360 bytes
-rwxr-xr-xgfx/mobile/mobile_splash.png (renamed from gfx/unknown/mobile_splash.png)bin1681 -> 1681 bytes
-rw-r--r--gfx/mobile/mobile_splash.tilemap (renamed from gfx/unknown/mobile_splash.tilemap)bin360 -> 360 bytes
-rw-r--r--gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4 (renamed from gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4)bin2190 -> 2190 bytes
-rw-r--r--gfx/mobile/pichu_animated.png (renamed from gfx/unknown/pichu_animated.png)bin1939 -> 1939 bytes
-rw-r--r--gfx/mobile/up_arrow.png (renamed from gfx/unknown/up_arrow.png)bin77 -> 77 bytes
-rw-r--r--gfx/printer/bold_a.png (renamed from gfx/unknown/bold_a.png)bin85 -> 85 bytes
-rw-r--r--gfx/printer/bold_b.png (renamed from gfx/unknown/bold_b.png)bin77 -> 77 bytes
-rw-r--r--gfx/trade/unused_gen_1_border_tiles.png (renamed from gfx/unknown/unused_border.png)bin175 -> 175 bytes
-rwxr-xr-xmobile/mobile_12.asm16
-rwxr-xr-xmobile/mobile_5b.asm6
-rwxr-xr-xmobile/mobile_5c.asm8
23 files changed, 32 insertions, 28 deletions
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
index e02b91ce2..e02b91ce2 100644
--- a/gfx/unknown/bold_font.png
+++ b/gfx/font/unused_bold_font.png
Binary files differ
diff --git a/gfx/font/weekday_kanji.png b/gfx/font/unused_weekday_kanji.png
index 6eeb69b11..6eeb69b11 100644
--- a/gfx/font/weekday_kanji.png
+++ b/gfx/font/unused_weekday_kanji.png
Binary files differ
diff --git a/gfx/unknown/ascii_font.png b/gfx/mobile/ascii_font.png
index 1c32d2bda..1c32d2bda 100644
--- a/gfx/unknown/ascii_font.png
+++ b/gfx/mobile/ascii_font.png
Binary files differ
diff --git a/gfx/unknown/down_arrow.png b/gfx/mobile/down_arrow.png
index 9eaaadd2d..9eaaadd2d 100644
--- a/gfx/unknown/down_arrow.png
+++ b/gfx/mobile/down_arrow.png
Binary files differ
diff --git a/gfx/unknown/electro_ball.2bpp.lz.3eaf004f b/gfx/mobile/electro_ball.2bpp.lz.3eaf004f
index b4fabff15..b4fabff15 100644
--- a/gfx/unknown/electro_ball.2bpp.lz.3eaf004f
+++ b/gfx/mobile/electro_ball.2bpp.lz.3eaf004f
Binary files differ
diff --git a/gfx/unknown/electro_ball.png b/gfx/mobile/electro_ball.png
index 3e1c0bb46..3e1c0bb46 100644
--- a/gfx/unknown/electro_ball.png
+++ b/gfx/mobile/electro_ball.png
Binary files differ
diff --git a/gfx/unknown/electro_ball_nonmatching.png b/gfx/mobile/electro_ball_nonmatching.png
index 44ea166ef..44ea166ef 100755
--- a/gfx/unknown/electro_ball_nonmatching.png
+++ b/gfx/mobile/electro_ball_nonmatching.png
Binary files differ
diff --git a/gfx/unknown/mobile_splash.attrmap b/gfx/mobile/mobile_splash.attrmap
index 86666b3fd..86666b3fd 100644
--- a/gfx/unknown/mobile_splash.attrmap
+++ b/gfx/mobile/mobile_splash.attrmap
Binary files differ
diff --git a/gfx/unknown/mobile_splash.png b/gfx/mobile/mobile_splash.png
index d54b68cdf..d54b68cdf 100755
--- a/gfx/unknown/mobile_splash.png
+++ b/gfx/mobile/mobile_splash.png
Binary files differ
diff --git a/gfx/unknown/mobile_splash.tilemap b/gfx/mobile/mobile_splash.tilemap
index 81818e531..81818e531 100644
--- a/gfx/unknown/mobile_splash.tilemap
+++ b/gfx/mobile/mobile_splash.tilemap
Binary files differ
diff --git a/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 b/gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4
index 4d50c6bcf..4d50c6bcf 100644
--- a/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4
+++ b/gfx/mobile/pichu_animated.2bpp.lz.5d6d2ad4
Binary files differ
diff --git a/gfx/unknown/pichu_animated.png b/gfx/mobile/pichu_animated.png
index 2832fdb6a..2832fdb6a 100644
--- a/gfx/unknown/pichu_animated.png
+++ b/gfx/mobile/pichu_animated.png
Binary files differ
diff --git a/gfx/unknown/up_arrow.png b/gfx/mobile/up_arrow.png
index e8b43de99..e8b43de99 100644
--- a/gfx/unknown/up_arrow.png
+++ b/gfx/mobile/up_arrow.png
Binary files differ
diff --git a/gfx/unknown/bold_a.png b/gfx/printer/bold_a.png
index 56252c423..56252c423 100644
--- a/gfx/unknown/bold_a.png
+++ b/gfx/printer/bold_a.png
Binary files differ
diff --git a/gfx/unknown/bold_b.png b/gfx/printer/bold_b.png
index 8ce07a03c..8ce07a03c 100644
--- a/gfx/unknown/bold_b.png
+++ b/gfx/printer/bold_b.png
Binary files differ
diff --git a/gfx/unknown/unused_border.png b/gfx/trade/unused_gen_1_border_tiles.png
index d3ac169fc..d3ac169fc 100644
--- a/gfx/unknown/unused_border.png
+++ b/gfx/trade/unused_gen_1_border_tiles.png
Binary files differ
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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:01:43 +0000