45 files changed, 56 insertions, 55 deletions
diff --git a/Makefile b/Makefile
index 824ededb8..be1ca99c7 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,8 @@ gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace
 gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$<
 gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
 
+gfx/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace
+
 gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
 gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
 gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace
@@ -200,7 +202,6 @@ gfx/misc/unknown_egg.2bpp: rgbgfx += -h
 gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
 
-gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace
 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
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index eeac2ebd7..1a556f9f1 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -813,7 +813,7 @@ EggHatch_CrackShell: ; 1736d (5:736d)
 ; 17393 (5:7393)
 
 EggHatchGFX: ; 17393
-INCBIN "gfx/unknown/017393.2bpp"
+INCBIN "gfx/evo/egg_hatch.2bpp"
 ; 173b3
 
 Hatch_InitShellFragments: ; 173b3 (5:73b3)
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index cdf2be010..cf3f8ecba 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -1712,19 +1712,19 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
 ; e0cdb
 
 CardFlipLZ03: ; e0cdb
-INCBIN "gfx/unknown/0e0cdb.2bpp.lz"
+INCBIN "gfx/card_flip/card_flip_3.2bpp.lz"
 
 CardFlipOffButtonGFX: ; e0cf6
-INCBIN "gfx/unknown/0e0cf6.2bpp"
+INCBIN "gfx/card_flip/off.2bpp"
 
 CardFlipOnButtonGFX: ; e0d06
-INCBIN "gfx/unknown/0e0d06.2bpp"
+INCBIN "gfx/card_flip/on.2bpp"
 
 CardFlipLZ01: ; e0d16
-INCBIN "gfx/unknown/0e0d16.2bpp.lz"
+INCBIN "gfx/card_flip/card_flip_1.2bpp.lz"
 
 CardFlipLZ02: ; e0ea8
-INCBIN "gfx/unknown/0e0ea8.2bpp.lz"
+INCBIN "gfx/card_flip/card_flip_2.2bpp.lz"
 
 CardFlipTilemap: ; e110c
 	db $ef, $15, $27, $2a, $2a, $06, $27, $2a, $2a, $06, $27
diff --git a/engine/diploma.asm b/engine/diploma.asm
index c446ff86b..582d0cd1c 100644
--- a/engine/diploma.asm
+++ b/engine/diploma.asm
@@ -85,10 +85,10 @@ PrintDiplomaPage2: ; 1dd7ae
 ; 1dd805
 
 DiplomaGFX: ; 1dd805
-INCBIN "gfx/unknown/1dd805.2bpp.lz"
+INCBIN "gfx/diploma/diploma.2bpp.lz"
 
 DiplomaPage1Tilemap: ; 1ddc4b
-INCBIN "gfx/unknown/1ddc4b.tilemap"
+INCBIN "gfx/diploma/page1.tilemap"
 
 DiplomaPage2Tilemap: ; 1dddb3
-INCBIN "gfx/unknown/1dddb3.tilemap"
+INCBIN "gfx/diploma/page2.tilemap"
diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm
index edda3d02e..3ff1888dc 100755
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -609,4 +609,4 @@ DummyGame_InterpretJoypad_AnimateCursor: ; e21a1 (38:61a1)
 ; e2221 (38:6221)
 
 LZ_e2221: ; e2221
-INCBIN "gfx/unknown/0e2221.2bpp.lz"
+INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"
diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm
index 5162b3830..bea580dcd 100755
--- a/engine/healmachineanim.asm
+++ b/engine/healmachineanim.asm
@@ -137,7 +137,7 @@ HealMachineAnim: ; 12324
 ; 123fc
 
 .HealMachineGFX: ; 123fc
-INCBIN "gfx/unknown/0123fc.2bpp"
+INCBIN "gfx/ow_fx/heal_machine.2bpp"
 ; 1241c
 
 .HOF_OAM: ; 1241c
diff --git a/engine/link_trade.asm b/engine/link_trade.asm
index 96401f188..3983dfd1d 100755
--- a/engine/link_trade.asm
+++ b/engine/link_trade.asm
@@ -1,5 +1,5 @@
 LinkCommsBorderGFX:
-INCBIN "gfx/unknown/16cfc1.2bpp"
+INCBIN "gfx/trade/border_tiles.2bpp"
 ; 16d421
 
 __LoadTradeScreenBorder: ; 16d421
@@ -35,13 +35,13 @@ Function16d43b: ; 16d43b
 ; 16d465
 
 Tilemap_16d465:
-INCBIN "gfx/unknown/16d465.tilemap"
+INCBIN "gfx/trade/border_mobile_fullscreen.tilemap"
 
 Tilemap_16d5cd:
-INCBIN "gfx/unknown/16d5cd.tilemap"
+INCBIN "gfx/trade/border_cable_top.tilemap"
 
 Tilemap_16d5f5:
-INCBIN "gfx/unknown/16d5f5.tilemap"
+INCBIN "gfx/trade/border_cable_bottom.tilemap"
 
 _LinkTextbox: ; 16d61d
 	ld h, d
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 19859d96e..d4f11cb8c 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -946,11 +946,11 @@ LoadNamingScreenGFX: ; 11c51
 ; 11cb7
 
 NamingScreenGFX_Border: ; 11cb7
-INCBIN "gfx/unknown/011cb7.2bpp"
+INCBIN "gfx/namingscreen/border.2bpp"
 ; 11cc7
 
 NamingScreenGFX_Cursor: ; 11cc7
-INCBIN "gfx/unknown/011cc7.2bpp"
+INCBIN "gfx/namingscreen/cursor.2bpp"
 ; 11ce7
 
 NameInputLower:
@@ -985,16 +985,16 @@ BoxNameInputUpper:
 
 ; 11e5d
 
-GFX_11e5d: ; ????
-INCBIN "gfx/unknown/011e5d.1bpp"
+NamingScreenGFX_End: ; unused
+INCBIN "gfx/namingscreen/end.1bpp"
 ; 11e6d
 
 NamingScreenGFX_MiddleLine:
-INCBIN "gfx/unknown/011e65.1bpp"
+INCBIN "gfx/namingscreen/middle_line.1bpp"
 ; 11e6d
 
 NamingScreenGFX_UnderLine: ; 11e6d
-INCBIN "gfx/unknown/011e6d.1bpp"
+INCBIN "gfx/namingscreen/underline.1bpp"
 ; 11e75
 
 _ComposeMailMessage: ; 11e75 (mail?)
diff --git a/engine/timeset.asm b/engine/timeset.asm
index 77ee5a0dd..ca5d9b85a 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -23,17 +23,17 @@ InitClock: ; 90672 (24:4672)
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardFont
-	ld de, GFX_908fb
+	ld de, TimeSetBackgroundGFX
 	ld hl, VTiles2 tile $00
-	lb bc, BANK(GFX_908fb), 1
+	lb bc, BANK(TimeSetBackgroundGFX), 1
 	call Request1bpp
-	ld de, GFX_90903
+	ld de, TimeSetUpArrowGFX
 	ld hl, VTiles2 tile $01
-	lb bc, BANK(GFX_90903), 1
+	lb bc, BANK(TimeSetUpArrowGFX), 1
 	call Request1bpp
-	ld de, GFX_9090b
+	ld de, TimeSetDownArrowGFX
 	ld hl, VTiles2 tile $02
-	lb bc, BANK(GFX_9090b), 1
+	lb bc, BANK(TimeSetDownArrowGFX), 1
 	call Request1bpp
 	call .ClearScreen
 	call WaitBGMap
@@ -396,12 +396,12 @@ OakText_ResponseToSetTime: ; 0x908b8
 	db "@"
 ; 0x908fb
 
-GFX_908fb: ; 908fb
-INCBIN "gfx/unknown/0908fb.1bpp"
-GFX_90903: ; 90903
-INCBIN "gfx/unknown/090903.1bpp"
-GFX_9090b: ; 9090b
-INCBIN "gfx/unknown/09090b.1bpp"
+TimeSetBackgroundGFX: ; 908fb
+INCBIN "gfx/timeset/background.1bpp"
+TimeSetUpArrowGFX: ; 90903
+INCBIN "gfx/timeset/up_arrow.1bpp"
+TimeSetDownArrowGFX: ; 9090b
+INCBIN "gfx/timeset/down_arrow.1bpp"
 ; 90913
 
 Special_SetDayOfWeek: ; 90913
@@ -409,13 +409,13 @@ Special_SetDayOfWeek: ; 90913
 	push af
 	ld a, $1
 	ld [hInMenu], a
-	ld de, GFX_90903
+	ld de, TimeSetUpArrowGFX
 	ld hl, VTiles1 tile $6f
-	lb bc, BANK(GFX_90903), 1
+	lb bc, BANK(TimeSetUpArrowGFX), 1
 	call Request1bpp
-	ld de, GFX_9090b
+	ld de, TimeSetDownArrowGFX
 	ld hl, VTiles1 tile $75
-	lb bc, BANK(GFX_9090b), 1
+	lb bc, BANK(TimeSetDownArrowGFX), 1
 	call Request1bpp
 	xor a
 	ld [wTempDayOfWeek], a
diff --git a/event/magikarp.asm b/event/magikarp.asm
index 450a68df8..e18d087dd 100644
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -87,7 +87,7 @@ Magikarp_LoadFeetInchesChars: ; fbbae
 ; fbbbb
 
 .feetinchchars ; fbbb
-INCBIN "gfx/unknown/0fbbbb.2bpp"
+INCBIN "gfx/font/feet_inches.2bpp"
 ; fbbdb
 
 PrintMagikarpLength: ; fbbdb
diff --git a/gfx/unknown/0e0d16.2bpp.lz.86f267e8 b/gfx/card_flip/card_flip_1.2bpp.lz.86f267e8
index 8a60b966b..8a60b966b 100644
--- a/gfx/unknown/0e0d16.2bpp.lz.86f267e8
+++ b/gfx/card_flip/card_flip_1.2bpp.lz.86f267e8
diff --git a/gfx/unknown/0e0d16.png b/gfx/card_flip/card_flip_1.png
index ab3c6594f..ab3c6594f 100644
--- a/gfx/unknown/0e0d16.png
+++ b/gfx/card_flip/card_flip_1.png
diff --git a/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d b/gfx/card_flip/card_flip_2.2bpp.lz.6a6c671d
index f238c797c..f238c797c 100644
--- a/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d
+++ b/gfx/card_flip/card_flip_2.2bpp.lz.6a6c671d
diff --git a/gfx/unknown/0e0ea8.png b/gfx/card_flip/card_flip_2.png
index 531417385..531417385 100755..100644
--- a/gfx/unknown/0e0ea8.png
+++ b/gfx/card_flip/card_flip_2.png
diff --git a/gfx/unknown/0e0cdb.2bpp.lz.53679db7 b/gfx/card_flip/card_flip_3.2bpp.lz.53679db7
index 12baf9a8f..12baf9a8f 100644
--- a/gfx/unknown/0e0cdb.2bpp.lz.53679db7
+++ b/gfx/card_flip/card_flip_3.2bpp.lz.53679db7
diff --git a/gfx/unknown/0e0cdb.png b/gfx/card_flip/card_flip_3.png
index 227450963..227450963 100644
--- a/gfx/unknown/0e0cdb.png
+++ b/gfx/card_flip/card_flip_3.png
diff --git a/gfx/unknown/0e0cf6.png b/gfx/card_flip/off.png
index ac5885644..ac5885644 100644
--- a/gfx/unknown/0e0cf6.png
+++ b/gfx/card_flip/off.png
diff --git a/gfx/unknown/0e0d06.png b/gfx/card_flip/on.png
index cea1577ef..cea1577ef 100644
--- a/gfx/unknown/0e0d06.png
+++ b/gfx/card_flip/on.png
diff --git a/gfx/unknown/1dd805.2bpp.lz.7b56f7e5 b/gfx/diploma/diploma.2bpp.lz.7b56f7e5
index 5c35bb6e1..5c35bb6e1 100644
--- a/gfx/unknown/1dd805.2bpp.lz.7b56f7e5
+++ b/gfx/diploma/diploma.2bpp.lz.7b56f7e5
diff --git a/gfx/unknown/1dd805.png b/gfx/diploma/diploma.png
index 768bbf913..768bbf913 100644
--- a/gfx/unknown/1dd805.png
+++ b/gfx/diploma/diploma.png
diff --git a/gfx/unknown/1ddc4b.tilemap b/gfx/diploma/page1.tilemap
index fb5d79891..fb5d79891 100644
--- a/gfx/unknown/1ddc4b.tilemap
+++ b/gfx/diploma/page1.tilemap
diff --git a/gfx/unknown/1dddb3.tilemap b/gfx/diploma/page2.tilemap
index e37c6b27d..e37c6b27d 100644
--- a/gfx/unknown/1dddb3.tilemap
+++ b/gfx/diploma/page2.tilemap
diff --git a/gfx/unknown/0e2221.2bpp.lz.821ba441 b/gfx/dummy_game/dummy_game.2bpp.lz.821ba441
index b01fe34df..b01fe34df 100644
--- a/gfx/unknown/0e2221.2bpp.lz.821ba441
+++ b/gfx/dummy_game/dummy_game.2bpp.lz.821ba441
diff --git a/gfx/unknown/0e2221.png b/gfx/dummy_game/dummy_game.png
index e0f1d3256..e0f1d3256 100644
--- a/gfx/unknown/0e2221.png
+++ b/gfx/dummy_game/dummy_game.png
diff --git a/gfx/unknown/017393.png b/gfx/evo/egg_hatch.png
index e45921e1f..e45921e1f 100644
--- a/gfx/unknown/017393.png
+++ b/gfx/evo/egg_hatch.png
diff --git a/gfx/font.asm b/gfx/font.asm
index b61fc1e23..8d7186e4c 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -19,19 +19,19 @@ INCBIN "gfx/frames/8.1bpp"
 INCBIN "gfx/frames/9.1bpp"
 ; f89b0
 
-; TODO: Various misc graphics here.
+; Various misc graphics here.
 
 StatsScreenPageTilesGFX: ; f89b0
-INCBIN "gfx/unknown/0f89b0.2bpp"
+INCBIN "gfx/stats/stats_tiles.2bpp"
 ; f8a90
 
-ShinyIcon: ; f8a90
+ShinyIconGFX: ; f8a90
 ; also part of StatsScreenPageTilesGFX
 INCBIN "gfx/stats/shiny.2bpp"
 
-StatsScreenPageTilesGFX_Part2: ; f8aa0
+ExpBarEndsGFX: ; f8aa0
 ; not referenced on its own, but part of StatsScreenPageTilesGFX
-INCBIN "gfx/unknown/0f8aa0.2bpp"
+INCBIN "gfx/stats/exp_bar_ends.2bpp"
 ; f8ac0
 
 EnemyHPBarBorderGFX: ; f8ac0
@@ -75,7 +75,7 @@ INCBIN "gfx/frames/map_entry_sign.2bpp"
 ; f9424
 
 FontsExtra2_UpArrowGFX: ; f9424
-INCBIN "gfx/unknown/0f9424.2bpp"
+INCBIN "gfx/font/up_arrow.2bpp"
 ; f9434
 
 Footprints: ; f9434
diff --git a/gfx/unknown/0fbbbb.png b/gfx/font/feet_inches.png
index 60f319eb3..60f319eb3 100644
--- a/gfx/unknown/0fbbbb.png
+++ b/gfx/font/feet_inches.png
diff --git a/gfx/unknown/0f9424.png b/gfx/font/up_arrow.png
index 6f2b957f0..6f2b957f0 100644
--- a/gfx/unknown/0f9424.png
+++ b/gfx/font/up_arrow.png
diff --git a/gfx/unknown/011cb7.png b/gfx/namingscreen/border.png
index 36935ab82..36935ab82 100644
--- a/gfx/unknown/011cb7.png
+++ b/gfx/namingscreen/border.png
diff --git a/gfx/unknown/011cc7.png b/gfx/namingscreen/cursor.png
index a0429a3ad..a0429a3ad 100644
--- a/gfx/unknown/011cc7.png
+++ b/gfx/namingscreen/cursor.png
diff --git a/gfx/unknown/011e5d.png b/gfx/namingscreen/end.png
index c8e132b92..c8e132b92 100644
--- a/gfx/unknown/011e5d.png
+++ b/gfx/namingscreen/end.png
diff --git a/gfx/unknown/011e65.png b/gfx/namingscreen/middle_line.png
index a34e82bf1..a34e82bf1 100644
--- a/gfx/unknown/011e65.png
+++ b/gfx/namingscreen/middle_line.png
diff --git a/gfx/unknown/011e6d.png b/gfx/namingscreen/underline.png
index e92cd4d6a..e92cd4d6a 100644
--- a/gfx/unknown/011e6d.png
+++ b/gfx/namingscreen/underline.png
diff --git a/gfx/unknown/0123fc.png b/gfx/ow_fx/heal_machine.png
index dbf513487..dbf513487 100644
--- a/gfx/unknown/0123fc.png
+++ b/gfx/ow_fx/heal_machine.png
diff --git a/gfx/unknown/0f8aa0.png b/gfx/stats/exp_bar_ends.png
index 252bdd990..252bdd990 100644
--- a/gfx/unknown/0f8aa0.png
+++ b/gfx/stats/exp_bar_ends.png
diff --git a/gfx/unknown/0f89b0.png b/gfx/stats/stats_tiles.png
index 151704af5..151704af5 100644
--- a/gfx/unknown/0f89b0.png
+++ b/gfx/stats/stats_tiles.png
diff --git a/gfx/unknown/0908fb.png b/gfx/timeset/background.png
index e2bd6299c..e2bd6299c 100644
--- a/gfx/unknown/0908fb.png
+++ b/gfx/timeset/background.png
diff --git a/gfx/unknown/09090b.png b/gfx/timeset/down_arrow.png
index 33803e197..33803e197 100644
--- a/gfx/unknown/09090b.png
+++ b/gfx/timeset/down_arrow.png
diff --git a/gfx/unknown/090903.png b/gfx/timeset/up_arrow.png
index d8cfc7f3f..d8cfc7f3f 100644
--- a/gfx/unknown/090903.png
+++ b/gfx/timeset/up_arrow.png
diff --git a/gfx/unknown/16d5f5.tilemap b/gfx/trade/border_cable_bottom.tilemap
index 9d5bda9f3..9d5bda9f3 100644
--- a/gfx/unknown/16d5f5.tilemap
+++ b/gfx/trade/border_cable_bottom.tilemap
diff --git a/gfx/unknown/16d5cd.tilemap b/gfx/trade/border_cable_top.tilemap
index eab0f6c88..eab0f6c88 100644
--- a/gfx/unknown/16d5cd.tilemap
+++ b/gfx/trade/border_cable_top.tilemap
diff --git a/gfx/unknown/16d465.tilemap b/gfx/trade/border_mobile_fullscreen.tilemap
index 495e01e4d..495e01e4d 100644
--- a/gfx/unknown/16d465.tilemap
+++ b/gfx/trade/border_mobile_fullscreen.tilemap
diff --git a/gfx/unknown/16cfc1.png b/gfx/trade/border_tiles.png
index 390b107fd..390b107fd 100644
--- a/gfx/unknown/16cfc1.png
+++ b/gfx/trade/border_tiles.png
diff --git a/macros/charmap.asm b/macros/charmap.asm
index 2cbd07225..b936b0953 100644
--- a/macros/charmap.asm
+++ b/macros/charmap.asm
@@ -79,17 +79,17 @@
 
 ; Actual characters (from other graphics files)
 
-	charmap "|",        $31 ; StatsScreenPageTilesGFX
+	charmap "|",        $31 ; from gfx/stats/stats_tiles
 
-	charmap "<SHINY>",  $3f ; ShinyIcon
+	charmap "<SHINY>",  $3f ; gfx/stats/shiny
 
-	charmap "<BLACK>",  $60 ; MobilePhoneTilesGFX
-	charmap "▲",        $61 ; FontsExtra2_UpArrowGFX
-	charmap "<PHONE>",  $62 ; OverworldPhoneIconGFX
-	charmap "_",        $62 ; HPExpBarBorderGFX
+	charmap "<BLACK>",  $60 ; from gfx/mobile/phone_tiles.2bpp
+	charmap "▲",        $61 ; gfx/font/up_arrow.png
+	charmap "<PHONE>",  $62 ; gfx/mobile/overworld_phone_icon.2bpp
+	charmap "_",        $62 ; from gfx/battle/hp_exp_bar_border.1bpp
 
-	charmap "′",        $6e ; Magikarp_LoadFeetInchesChars.feetinchchars
-	charmap "″",        $6f ; Magikarp_LoadFeetInchesChars.feetinchchars
+	charmap "′",        $6e ; gfx/font/feet_inches.png
+	charmap "″",        $6f ; gfx/font/feet_inches.png
 
 ; Actual characters (from gfx/misc/font.png)
 
diff --git a/misc/printer_77.asm b/misc/printer_77.asm
index c36c21463..4f67909b0 100755
--- a/misc/printer_77.asm
+++ b/misc/printer_77.asm
@@ -150,9 +150,9 @@ PrintPartyMonPage1: ; 1dc381
 	lb bc, BANK(MobileLvIcon), 1
 	call Request1bpp
 
-	ld de, ShinyIcon
+	ld de, ShinyIconGFX
 	ld hl, VTiles2 tile $3f
-	lb bc, BANK(ShinyIcon), 1
+	lb bc, BANK(ShinyIconGFX), 1
 	call Get2bpp
 
 	xor a