Move some gfx/unknown/ files into meaningful directories

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

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)

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

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"

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"

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

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

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?)

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

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

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

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)
 

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