From 32ea595c47d84cf6759f15c0d82fcad35ac4dcbd Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 9 Dec 2017 23:37:08 -0500 Subject: [PATCH] Move some gfx/unknown/ files into meaningful directories --- Makefile | 3 +- engine/breeding/egg.asm | 2 +- engine/card_flip.asm | 10 +++--- engine/diploma.asm | 6 ++-- engine/dummy_game.asm | 2 +- engine/healmachineanim.asm | 2 +- engine/link_trade.asm | 8 ++--- engine/namingscreen.asm | 12 +++---- engine/timeset.asm | 32 +++++++++--------- event/magikarp.asm | 2 +- .../card_flip_1.2bpp.lz.86f267e8} | Bin .../0e0d16.png => card_flip/card_flip_1.png} | Bin .../card_flip_2.2bpp.lz.6a6c671d} | Bin .../0e0ea8.png => card_flip/card_flip_2.png} | Bin .../card_flip_3.2bpp.lz.53679db7} | Bin .../0e0cdb.png => card_flip/card_flip_3.png} | Bin gfx/{unknown/0e0cf6.png => card_flip/off.png} | Bin gfx/{unknown/0e0d06.png => card_flip/on.png} | Bin .../diploma.2bpp.lz.7b56f7e5} | Bin .../1dd805.png => diploma/diploma.png} | Bin .../1ddc4b.tilemap => diploma/page1.tilemap} | Bin .../1dddb3.tilemap => diploma/page2.tilemap} | Bin .../dummy_game.2bpp.lz.821ba441} | Bin .../0e2221.png => dummy_game/dummy_game.png} | Bin gfx/{unknown/017393.png => evo/egg_hatch.png} | Bin gfx/font.asm | 12 +++---- .../0fbbbb.png => font/feet_inches.png} | Bin gfx/{unknown/0f9424.png => font/up_arrow.png} | Bin .../011cb7.png => namingscreen/border.png} | Bin .../011cc7.png => namingscreen/cursor.png} | Bin .../011e5d.png => namingscreen/end.png} | Bin .../middle_line.png} | Bin .../011e6d.png => namingscreen/underline.png} | Bin .../0123fc.png => ow_fx/heal_machine.png} | Bin .../0f8aa0.png => stats/exp_bar_ends.png} | Bin .../0f89b0.png => stats/stats_tiles.png} | Bin .../0908fb.png => timeset/background.png} | Bin .../09090b.png => timeset/down_arrow.png} | Bin .../090903.png => timeset/up_arrow.png} | Bin .../border_cable_bottom.tilemap} | 0 .../border_cable_top.tilemap} | 0 .../border_mobile_fullscreen.tilemap} | 0 .../16cfc1.png => trade/border_tiles.png} | Bin macros/charmap.asm | 16 ++++----- misc/printer_77.asm | 4 +-- 45 files changed, 56 insertions(+), 55 deletions(-) rename gfx/{unknown/0e0d16.2bpp.lz.86f267e8 => card_flip/card_flip_1.2bpp.lz.86f267e8} (100%) rename gfx/{unknown/0e0d16.png => card_flip/card_flip_1.png} (100%) rename gfx/{unknown/0e0ea8.2bpp.lz.6a6c671d => card_flip/card_flip_2.2bpp.lz.6a6c671d} (100%) rename gfx/{unknown/0e0ea8.png => card_flip/card_flip_2.png} (100%) mode change 100755 => 100644 rename gfx/{unknown/0e0cdb.2bpp.lz.53679db7 => card_flip/card_flip_3.2bpp.lz.53679db7} (100%) rename gfx/{unknown/0e0cdb.png => card_flip/card_flip_3.png} (100%) rename gfx/{unknown/0e0cf6.png => card_flip/off.png} (100%) rename gfx/{unknown/0e0d06.png => card_flip/on.png} (100%) rename gfx/{unknown/1dd805.2bpp.lz.7b56f7e5 => diploma/diploma.2bpp.lz.7b56f7e5} (100%) rename gfx/{unknown/1dd805.png => diploma/diploma.png} (100%) rename gfx/{unknown/1ddc4b.tilemap => diploma/page1.tilemap} (100%) rename gfx/{unknown/1dddb3.tilemap => diploma/page2.tilemap} (100%) rename gfx/{unknown/0e2221.2bpp.lz.821ba441 => dummy_game/dummy_game.2bpp.lz.821ba441} (100%) rename gfx/{unknown/0e2221.png => dummy_game/dummy_game.png} (100%) rename gfx/{unknown/017393.png => evo/egg_hatch.png} (100%) rename gfx/{unknown/0fbbbb.png => font/feet_inches.png} (100%) rename gfx/{unknown/0f9424.png => font/up_arrow.png} (100%) rename gfx/{unknown/011cb7.png => namingscreen/border.png} (100%) rename gfx/{unknown/011cc7.png => namingscreen/cursor.png} (100%) rename gfx/{unknown/011e5d.png => namingscreen/end.png} (100%) rename gfx/{unknown/011e65.png => namingscreen/middle_line.png} (100%) rename gfx/{unknown/011e6d.png => namingscreen/underline.png} (100%) rename gfx/{unknown/0123fc.png => ow_fx/heal_machine.png} (100%) rename gfx/{unknown/0f8aa0.png => stats/exp_bar_ends.png} (100%) rename gfx/{unknown/0f89b0.png => stats/stats_tiles.png} (100%) rename gfx/{unknown/0908fb.png => timeset/background.png} (100%) rename gfx/{unknown/09090b.png => timeset/down_arrow.png} (100%) rename gfx/{unknown/090903.png => timeset/up_arrow.png} (100%) rename gfx/{unknown/16d5f5.tilemap => trade/border_cable_bottom.tilemap} (100%) rename gfx/{unknown/16d5cd.tilemap => trade/border_cable_top.tilemap} (100%) rename gfx/{unknown/16d465.tilemap => trade/border_mobile_fullscreen.tilemap} (100%) rename gfx/{unknown/16cfc1.png => trade/border_tiles.png} (100%) 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 similarity index 100% rename from gfx/unknown/0e0d16.2bpp.lz.86f267e8 rename to gfx/card_flip/card_flip_1.2bpp.lz.86f267e8 diff --git a/gfx/unknown/0e0d16.png b/gfx/card_flip/card_flip_1.png similarity index 100% rename from gfx/unknown/0e0d16.png rename to 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 similarity index 100% rename from gfx/unknown/0e0ea8.2bpp.lz.6a6c671d rename to gfx/card_flip/card_flip_2.2bpp.lz.6a6c671d diff --git a/gfx/unknown/0e0ea8.png b/gfx/card_flip/card_flip_2.png old mode 100755 new mode 100644 similarity index 100% rename from gfx/unknown/0e0ea8.png rename to 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 similarity index 100% rename from gfx/unknown/0e0cdb.2bpp.lz.53679db7 rename to gfx/card_flip/card_flip_3.2bpp.lz.53679db7 diff --git a/gfx/unknown/0e0cdb.png b/gfx/card_flip/card_flip_3.png similarity index 100% rename from gfx/unknown/0e0cdb.png rename to gfx/card_flip/card_flip_3.png diff --git a/gfx/unknown/0e0cf6.png b/gfx/card_flip/off.png similarity index 100% rename from gfx/unknown/0e0cf6.png rename to gfx/card_flip/off.png diff --git a/gfx/unknown/0e0d06.png b/gfx/card_flip/on.png similarity index 100% rename from gfx/unknown/0e0d06.png rename to gfx/card_flip/on.png diff --git a/gfx/unknown/1dd805.2bpp.lz.7b56f7e5 b/gfx/diploma/diploma.2bpp.lz.7b56f7e5 similarity index 100% rename from gfx/unknown/1dd805.2bpp.lz.7b56f7e5 rename to gfx/diploma/diploma.2bpp.lz.7b56f7e5 diff --git a/gfx/unknown/1dd805.png b/gfx/diploma/diploma.png similarity index 100% rename from gfx/unknown/1dd805.png rename to gfx/diploma/diploma.png diff --git a/gfx/unknown/1ddc4b.tilemap b/gfx/diploma/page1.tilemap similarity index 100% rename from gfx/unknown/1ddc4b.tilemap rename to gfx/diploma/page1.tilemap diff --git a/gfx/unknown/1dddb3.tilemap b/gfx/diploma/page2.tilemap similarity index 100% rename from gfx/unknown/1dddb3.tilemap rename to gfx/diploma/page2.tilemap diff --git a/gfx/unknown/0e2221.2bpp.lz.821ba441 b/gfx/dummy_game/dummy_game.2bpp.lz.821ba441 similarity index 100% rename from gfx/unknown/0e2221.2bpp.lz.821ba441 rename to gfx/dummy_game/dummy_game.2bpp.lz.821ba441 diff --git a/gfx/unknown/0e2221.png b/gfx/dummy_game/dummy_game.png similarity index 100% rename from gfx/unknown/0e2221.png rename to gfx/dummy_game/dummy_game.png diff --git a/gfx/unknown/017393.png b/gfx/evo/egg_hatch.png similarity index 100% rename from gfx/unknown/017393.png rename to 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 similarity index 100% rename from gfx/unknown/0fbbbb.png rename to gfx/font/feet_inches.png diff --git a/gfx/unknown/0f9424.png b/gfx/font/up_arrow.png similarity index 100% rename from gfx/unknown/0f9424.png rename to gfx/font/up_arrow.png diff --git a/gfx/unknown/011cb7.png b/gfx/namingscreen/border.png similarity index 100% rename from gfx/unknown/011cb7.png rename to gfx/namingscreen/border.png diff --git a/gfx/unknown/011cc7.png b/gfx/namingscreen/cursor.png similarity index 100% rename from gfx/unknown/011cc7.png rename to gfx/namingscreen/cursor.png diff --git a/gfx/unknown/011e5d.png b/gfx/namingscreen/end.png similarity index 100% rename from gfx/unknown/011e5d.png rename to gfx/namingscreen/end.png diff --git a/gfx/unknown/011e65.png b/gfx/namingscreen/middle_line.png similarity index 100% rename from gfx/unknown/011e65.png rename to gfx/namingscreen/middle_line.png diff --git a/gfx/unknown/011e6d.png b/gfx/namingscreen/underline.png similarity index 100% rename from gfx/unknown/011e6d.png rename to gfx/namingscreen/underline.png diff --git a/gfx/unknown/0123fc.png b/gfx/ow_fx/heal_machine.png similarity index 100% rename from gfx/unknown/0123fc.png rename to gfx/ow_fx/heal_machine.png diff --git a/gfx/unknown/0f8aa0.png b/gfx/stats/exp_bar_ends.png similarity index 100% rename from gfx/unknown/0f8aa0.png rename to gfx/stats/exp_bar_ends.png diff --git a/gfx/unknown/0f89b0.png b/gfx/stats/stats_tiles.png similarity index 100% rename from gfx/unknown/0f89b0.png rename to gfx/stats/stats_tiles.png diff --git a/gfx/unknown/0908fb.png b/gfx/timeset/background.png similarity index 100% rename from gfx/unknown/0908fb.png rename to gfx/timeset/background.png diff --git a/gfx/unknown/09090b.png b/gfx/timeset/down_arrow.png similarity index 100% rename from gfx/unknown/09090b.png rename to gfx/timeset/down_arrow.png diff --git a/gfx/unknown/090903.png b/gfx/timeset/up_arrow.png similarity index 100% rename from gfx/unknown/090903.png rename to gfx/timeset/up_arrow.png diff --git a/gfx/unknown/16d5f5.tilemap b/gfx/trade/border_cable_bottom.tilemap similarity index 100% rename from gfx/unknown/16d5f5.tilemap rename to gfx/trade/border_cable_bottom.tilemap diff --git a/gfx/unknown/16d5cd.tilemap b/gfx/trade/border_cable_top.tilemap similarity index 100% rename from gfx/unknown/16d5cd.tilemap rename to gfx/trade/border_cable_top.tilemap diff --git a/gfx/unknown/16d465.tilemap b/gfx/trade/border_mobile_fullscreen.tilemap similarity index 100% rename from gfx/unknown/16d465.tilemap rename to gfx/trade/border_mobile_fullscreen.tilemap diff --git a/gfx/unknown/16cfc1.png b/gfx/trade/border_tiles.png similarity index 100% rename from gfx/unknown/16cfc1.png rename to 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 "", $3f ; ShinyIcon + charmap "", $3f ; gfx/stats/shiny - charmap "", $60 ; MobilePhoneTilesGFX - charmap "▲", $61 ; FontsExtra2_UpArrowGFX - charmap "", $62 ; OverworldPhoneIconGFX - charmap "_", $62 ; HPExpBarBorderGFX + charmap "", $60 ; from gfx/mobile/phone_tiles.2bpp + charmap "▲", $61 ; gfx/font/up_arrow.png + charmap "", $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