ref: 32ea595c47d84cf6759f15c0d82fcad35ac4dcbd
parent: 31901f73b0cb0c516962975c323df06d73263486
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Sat Dec 9 18:37:08 EST 2017
Move some gfx/unknown/ files into meaningful directories
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,8 @@
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/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
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -813,7 +813,7 @@
; 17393 (5:7393)
EggHatchGFX: ; 17393
-INCBIN "gfx/unknown/017393.2bpp"
+INCBIN "gfx/evo/egg_hatch.2bpp"
; 173b3
Hatch_InitShellFragments: ; 173b3 (5:73b3)
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -1712,19 +1712,19 @@
; 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
--- a/engine/diploma.asm
+++ b/engine/diploma.asm
@@ -85,10 +85,10 @@
; 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"
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -609,4 +609,4 @@
; e2221 (38:6221)
LZ_e2221: ; e2221
-INCBIN "gfx/unknown/0e2221.2bpp.lz"
+INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"
--- a/engine/healmachineanim.asm
+++ b/engine/healmachineanim.asm
@@ -137,7 +137,7 @@
; 123fc
.HealMachineGFX: ; 123fc
-INCBIN "gfx/unknown/0123fc.2bpp"
+INCBIN "gfx/ow_fx/heal_machine.2bpp"
; 1241c
.HOF_OAM: ; 1241c
--- 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 @@
; 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
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -946,11 +946,11 @@
; 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 @@
; 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?)
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -23,17 +23,17 @@
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 @@
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 @@
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
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -87,7 +87,7 @@
; fbbbb
.feetinchchars ; fbbb
-INCBIN "gfx/unknown/0fbbbb.2bpp"
+INCBIN "gfx/font/feet_inches.2bpp"
; fbbdb
PrintMagikarpLength: ; fbbdb
binary files /dev/null b/gfx/card_flip/card_flip_1.2bpp.lz.86f267e8 differ
binary files /dev/null b/gfx/card_flip/card_flip_1.png differ
binary files /dev/null b/gfx/card_flip/card_flip_2.2bpp.lz.6a6c671d differ
binary files /dev/null b/gfx/card_flip/card_flip_2.png differ
binary files /dev/null b/gfx/card_flip/card_flip_3.2bpp.lz.53679db7 differ
binary files /dev/null b/gfx/card_flip/card_flip_3.png differ
binary files /dev/null b/gfx/card_flip/off.png differ
binary files /dev/null b/gfx/card_flip/on.png differ
binary files /dev/null b/gfx/diploma/diploma.2bpp.lz.7b56f7e5 differ
binary files /dev/null b/gfx/diploma/diploma.png differ
binary files /dev/null b/gfx/diploma/page1.tilemap differ
binary files /dev/null b/gfx/diploma/page2.tilemap differ
binary files /dev/null b/gfx/dummy_game/dummy_game.2bpp.lz.821ba441 differ
binary files /dev/null b/gfx/dummy_game/dummy_game.png differ
binary files /dev/null b/gfx/evo/egg_hatch.png differ
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -19,19 +19,19 @@
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 @@
; f9424
FontsExtra2_UpArrowGFX: ; f9424
-INCBIN "gfx/unknown/0f9424.2bpp"
+INCBIN "gfx/font/up_arrow.2bpp"
; f9434
Footprints: ; f9434
binary files /dev/null b/gfx/font/feet_inches.png differ
binary files /dev/null b/gfx/font/up_arrow.png differ
binary files /dev/null b/gfx/namingscreen/border.png differ
binary files /dev/null b/gfx/namingscreen/cursor.png differ
binary files /dev/null b/gfx/namingscreen/end.png differ
binary files /dev/null b/gfx/namingscreen/middle_line.png differ
binary files /dev/null b/gfx/namingscreen/underline.png differ
binary files /dev/null b/gfx/ow_fx/heal_machine.png differ
binary files /dev/null b/gfx/stats/exp_bar_ends.png differ
binary files /dev/null b/gfx/stats/stats_tiles.png differ
binary files /dev/null b/gfx/timeset/background.png differ
binary files /dev/null b/gfx/timeset/down_arrow.png differ
binary files /dev/null b/gfx/timeset/up_arrow.png differ
--- /dev/null
+++ b/gfx/trade/border_cable_bottom.tilemap
@@ -1,0 +1,1 @@
+/'()/>??????????@*+,-.DE
\ No newline at end of file
--- /dev/null
+++ b/gfx/trade/border_cable_top.tilemap
@@ -1,0 +1,1 @@
+?@ E
\ No newline at end of file
--- /dev/null
+++ b/gfx/trade/border_mobile_fullscreen.tilemap
@@ -1,0 +1,1 @@
+?@ EEEEEEEE EEEEEEBC/$%&/>??????????@89:;<=DE
\ No newline at end of file
binary files /dev/null b/gfx/trade/border_tiles.png differ
binary files a/gfx/unknown/011cb7.png /dev/null differ
binary files a/gfx/unknown/011cc7.png /dev/null differ
binary files a/gfx/unknown/011e5d.png /dev/null differ
binary files a/gfx/unknown/011e65.png /dev/null differ
binary files a/gfx/unknown/011e6d.png /dev/null differ
binary files a/gfx/unknown/0123fc.png /dev/null differ
binary files a/gfx/unknown/017393.png /dev/null differ
binary files a/gfx/unknown/0908fb.png /dev/null differ
binary files a/gfx/unknown/090903.png /dev/null differ
binary files a/gfx/unknown/09090b.png /dev/null differ
binary files a/gfx/unknown/0e0cdb.2bpp.lz.53679db7 /dev/null differ
binary files a/gfx/unknown/0e0cdb.png /dev/null differ
binary files a/gfx/unknown/0e0cf6.png /dev/null differ
binary files a/gfx/unknown/0e0d06.png /dev/null differ
binary files a/gfx/unknown/0e0d16.2bpp.lz.86f267e8 /dev/null differ
binary files a/gfx/unknown/0e0d16.png /dev/null differ
binary files a/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d /dev/null differ
binary files a/gfx/unknown/0e0ea8.png /dev/null differ
binary files a/gfx/unknown/0e2221.2bpp.lz.821ba441 /dev/null differ
binary files a/gfx/unknown/0e2221.png /dev/null differ
binary files a/gfx/unknown/0f89b0.png /dev/null differ
binary files a/gfx/unknown/0f8aa0.png /dev/null differ
binary files a/gfx/unknown/0f9424.png /dev/null differ
binary files a/gfx/unknown/0fbbbb.png /dev/null differ
binary files a/gfx/unknown/16cfc1.png /dev/null differ
--- a/gfx/unknown/16d465.tilemap
+++ /dev/null
@@ -1,1 +1,0 @@
-?@ EEEEEEEE EEEEEEBC/$%&/>??????????@89:;<=DE
\ No newline at end of file
--- a/gfx/unknown/16d5cd.tilemap
+++ /dev/null
@@ -1,1 +1,0 @@
-?@ E
\ No newline at end of file
--- a/gfx/unknown/16d5f5.tilemap
+++ /dev/null
@@ -1,1 +1,0 @@
-/'()/>??????????@*+,-.DE
\ No newline at end of file
binary files a/gfx/unknown/1dd805.2bpp.lz.7b56f7e5 /dev/null differ
binary files a/gfx/unknown/1dd805.png /dev/null differ
binary files a/gfx/unknown/1ddc4b.tilemap /dev/null differ
binary files a/gfx/unknown/1dddb3.tilemap /dev/null differ
--- 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)
--- a/misc/printer_77.asm
+++ b/misc/printer_77.asm
@@ -150,9 +150,9 @@
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