From 31901f73b0cb0c516962975c323df06d73263486 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 9 Dec 2017 22:57:41 -0500 Subject: [PATCH] Move some gfx/misc/ files into meaningful directories --- Makefile | 36 ++++++++++-------- engine/battle_start.asm | 2 +- engine/billspc.asm | 4 +- engine/events_3.asm | 4 +- engine/overworld.asm | 5 ++- engine/pack.asm | 4 +- engine/pokegear.asm | 8 ++-- engine/slot_machine.asm | 8 ++-- engine/trainer_card.asm | 12 +++--- event/field_moves.asm | 6 +-- gfx/{misc => battle}/dude.2bpp.lz.d13fb490 | Bin gfx/{misc => battle}/dude.png | Bin gfx/font.asm | 10 ++--- gfx/{misc => font}/font.png | Bin gfx/{misc => font}/font_battle_extra.png | Bin gfx/{misc => font}/font_extra.png | Bin gfx/{misc => font}/font_inversed.png | Bin gfx/{misc => font}/unown_font.png | Bin .../boulder_dust.png} | Bin gfx/{overworld => ow_fx}/chris_fish.png | Bin gfx/{misc => ow_fx}/cut_grass.png | Bin gfx/{misc => ow_fx}/cut_tree.png | Bin .../fishing2.png => ow_fx/fishing_rod.png} | Bin .../fishing4.png => ow_fx/grass_rustle.png} | Bin gfx/{overworld => ow_fx}/headbutt_tree.png | Bin gfx/{overworld => ow_fx}/kris_fish.png | Bin gfx/{misc => ow_fx}/shadow.png | Bin .../trainer_battle_pokeball_tiles.png | Bin gfx/{misc => pack}/pack.png | Bin gfx/{misc => pack}/pack_f.png | Bin gfx/{misc => pack}/pack_menu.png | Bin gfx/{ => pc}/pc.2bpp.lz.2201c1aa | Bin gfx/{ => pc}/pc.png | Bin gfx/{ => pc}/pc_mail.png | Bin gfx/{misc => player}/chris.png | Bin .../chris_back.2bpp.lz.0312ddce} | Bin .../player.png => player/chris_back.png} | Bin gfx/{misc => player}/kris.png | Bin gfx/{misc => player}/kris_back.png | Bin gfx/{misc => pokedex}/footprints.png | Bin gfx/pokegear/dexmap_nest_icon.2bpp | 1 + gfx/{misc => pokegear}/fast_ship.png | Bin gfx/pokegear/flymap_label_border.1bpp | Bin 0 -> 48 bytes gfx/{misc => pokegear}/johto.bin | Bin gfx/{misc => pokegear}/kanto.bin | Bin .../pokegear.2bpp.lz.42315ab4 | Bin gfx/{misc => pokegear}/pokegear.png | Bin .../pokegear_sprites.2bpp.lz.7a3cc91f | Bin gfx/{misc => pokegear}/pokegear_sprites.png | Bin .../town_map.2bpp.lz.c0587c86 | Bin gfx/{misc => pokegear}/town_map.png | Bin gfx/{ => shrink}/shrink1.2bpp.lz.d4443930 | Bin gfx/{ => shrink}/shrink1.png | Bin gfx/{ => shrink}/shrink2.2bpp.lz.3f58480a | Bin gfx/{ => shrink}/shrink2.png | Bin gfx/{ => slots}/slots.tilemap | Bin gfx/{ => slots}/slots_1.2bpp.lz.b22ddc13 | Bin gfx/{ => slots}/slots_1.png | Bin gfx/{ => slots}/slots_2.2bpp.lz.b28f76e3 | Bin gfx/{ => slots}/slots_2.png | Bin gfx/{ => slots}/slots_3.2bpp.lz.70c2984c | Bin gfx/{ => slots}/slots_3.png | Bin gfx/{misc => splash}/copyright.png | Bin gfx/tilesets/{ => water}/water.png | Bin gfx/{misc => trainer_card}/badges.png | Bin .../card_right_corner.png | Bin gfx/{misc => trainer_card}/card_status.png | Bin gfx/{misc => trainer_card}/chris_card.png | Bin gfx/{misc => trainer_card}/kris_card.png | Bin gfx/{misc => trainer_card}/leaders.png | Bin gfx/{misc => trainer_card}/trainer_card.png | Bin main.asm | 30 +++++++-------- misc/gfx_41.asm | 8 ++-- tilesets/animations.asm | 2 +- 74 files changed, 73 insertions(+), 67 deletions(-) rename gfx/{misc => battle}/dude.2bpp.lz.d13fb490 (100%) rename gfx/{misc => battle}/dude.png (100%) rename gfx/{misc => font}/font.png (100%) rename gfx/{misc => font}/font_battle_extra.png (100%) rename gfx/{misc => font}/font_extra.png (100%) rename gfx/{misc => font}/font_inversed.png (100%) rename gfx/{misc => font}/unown_font.png (100%) rename gfx/{misc/boulderdust.png => ow_fx/boulder_dust.png} (100%) rename gfx/{overworld => ow_fx}/chris_fish.png (100%) rename gfx/{misc => ow_fx}/cut_grass.png (100%) rename gfx/{misc => ow_fx}/cut_tree.png (100%) rename gfx/{misc/fishing2.png => ow_fx/fishing_rod.png} (100%) rename gfx/{misc/fishing4.png => ow_fx/grass_rustle.png} (100%) rename gfx/{overworld => ow_fx}/headbutt_tree.png (100%) rename gfx/{overworld => ow_fx}/kris_fish.png (100%) rename gfx/{misc => ow_fx}/shadow.png (100%) rename gfx/{overworld => ow_fx}/trainer_battle_pokeball_tiles.png (100%) rename gfx/{misc => pack}/pack.png (100%) rename gfx/{misc => pack}/pack_f.png (100%) rename gfx/{misc => pack}/pack_menu.png (100%) rename gfx/{ => pc}/pc.2bpp.lz.2201c1aa (100%) rename gfx/{ => pc}/pc.png (100%) rename gfx/{ => pc}/pc_mail.png (100%) rename gfx/{misc => player}/chris.png (100%) rename gfx/{misc/player.2bpp.lz.0312ddce => player/chris_back.2bpp.lz.0312ddce} (100%) rename gfx/{misc/player.png => player/chris_back.png} (100%) rename gfx/{misc => player}/kris.png (100%) rename gfx/{misc => player}/kris_back.png (100%) rename gfx/{misc => pokedex}/footprints.png (100%) create mode 100644 gfx/pokegear/dexmap_nest_icon.2bpp rename gfx/{misc => pokegear}/fast_ship.png (100%) create mode 100644 gfx/pokegear/flymap_label_border.1bpp rename gfx/{misc => pokegear}/johto.bin (100%) rename gfx/{misc => pokegear}/kanto.bin (100%) rename gfx/{misc => pokegear}/pokegear.2bpp.lz.42315ab4 (100%) rename gfx/{misc => pokegear}/pokegear.png (100%) rename gfx/{misc => pokegear}/pokegear_sprites.2bpp.lz.7a3cc91f (100%) rename gfx/{misc => pokegear}/pokegear_sprites.png (100%) rename gfx/{misc => pokegear}/town_map.2bpp.lz.c0587c86 (100%) rename gfx/{misc => pokegear}/town_map.png (100%) rename gfx/{ => shrink}/shrink1.2bpp.lz.d4443930 (100%) rename gfx/{ => shrink}/shrink1.png (100%) rename gfx/{ => shrink}/shrink2.2bpp.lz.3f58480a (100%) rename gfx/{ => shrink}/shrink2.png (100%) rename gfx/{ => slots}/slots.tilemap (100%) rename gfx/{ => slots}/slots_1.2bpp.lz.b22ddc13 (100%) rename gfx/{ => slots}/slots_1.png (100%) rename gfx/{ => slots}/slots_2.2bpp.lz.b28f76e3 (100%) rename gfx/{ => slots}/slots_2.png (100%) rename gfx/{ => slots}/slots_3.2bpp.lz.70c2984c (100%) rename gfx/{ => slots}/slots_3.png (100%) mode change 100755 => 100644 rename gfx/{misc => splash}/copyright.png (100%) rename gfx/tilesets/{ => water}/water.png (100%) rename gfx/{misc => trainer_card}/badges.png (100%) rename gfx/{misc => trainer_card}/card_right_corner.png (100%) rename gfx/{misc => trainer_card}/card_status.png (100%) rename gfx/{misc => trainer_card}/chris_card.png (100%) rename gfx/{misc => trainer_card}/kris_card.png (100%) rename gfx/{misc => trainer_card}/leaders.png (100%) rename gfx/{misc => trainer_card}/trainer_card.png (100%) diff --git a/Makefile b/Makefile index 6cbc1e1df..824ededb8 100644 --- a/Makefile +++ b/Makefile @@ -140,8 +140,8 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens ### Misc file-specific graphics rules -gfx/shrink1.2bpp: rgbgfx += -h -gfx/shrink2.2bpp: rgbgfx += -h +gfx/shrink/shrink1.2bpp: rgbgfx += -h +gfx/shrink/shrink2.2bpp: rgbgfx += -h gfx/trainers/%.2bpp: rgbgfx += -h gfx/trainers/%.pal: gfx/trainers/%.gbcpal @@ -153,7 +153,9 @@ gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace -gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace +gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace +gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace +gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$< gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$< @@ -162,10 +164,8 @@ gfx/title/logo.2bpp: rgbgfx += -x 4 gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace -gfx/slots_2.2bpp: tools/gfx += --interleave --png=$< -gfx/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip -gfx/slots_3a.2bpp: tools/gfx += --interleave --png=$< -gfx/slots_3b.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip +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/fx/angels.2bpp: tools/gfx += --trim-whitespace gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace @@ -185,16 +185,20 @@ gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace gfx/fx/status.2bpp: tools/gfx += --remove-whitespace -gfx/misc/chris.2bpp: rgbgfx += -h -gfx/misc/chris_card.2bpp: rgbgfx += -h -gfx/misc/kris.2bpp: rgbgfx += -h -gfx/misc/kris_card.2bpp: rgbgfx += -h -gfx/misc/kris_back.2bpp: rgbgfx += -h -gfx/misc/dude.2bpp: rgbgfx += -h +gfx/player/chris.2bpp: rgbgfx += -h +gfx/player/chris_back.2bpp: rgbgfx += -h +gfx/player/kris.2bpp: rgbgfx += -h +gfx/player/kris_back.2bpp: rgbgfx += -h + +gfx/trainer_card/chris_card.2bpp: rgbgfx += -h +gfx/trainer_card/kris_card.2bpp: rgbgfx += -h + +gfx/battle/dude.2bpp: rgbgfx += -h + gfx/misc/unknown_egg.2bpp: rgbgfx += -h -gfx/misc/player.2bpp: rgbgfx += -h -gfx/misc/pokegear.2bpp: rgbgfx += -x2 -gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace + +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 diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 627519daa..9097e74ed 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf ; 8c2f4 TrainerBattlePokeballTiles: ; 8c2f4 -INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" +INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp" FlashyTransitionToBattle: ; 8c314 diff --git a/engine/billspc.asm b/engine/billspc.asm index 4d8bf1c48..85f01af37 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -2280,8 +2280,8 @@ BillsPC_InitGFX: ; e33e8 (38:73e8) ret ; e3419 (38:7419) -PCSelectLZ: INCBIN "gfx/pc.2bpp.lz" -PCMailGFX: INCBIN "gfx/pc_mail.2bpp" +PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz" +PCMailGFX: INCBIN "gfx/pc/pc_mail.2bpp" ; e34dd PCString_ChooseaPKMN: db "Choose a .@" diff --git a/engine/events_3.asm b/engine/events_3.asm index b6aaea3b7..cff4eefb9 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3 ; b84f2 FishingGFX: ; b84f2 -INCBIN "gfx/overworld/chris_fish.2bpp" +INCBIN "gfx/ow_fx/chris_fish.2bpp" ; b8582 KrisFishingGFX: ; b8582 -INCBIN "gfx/overworld/kris_fish.2bpp" +INCBIN "gfx/ow_fx/kris_fish.2bpp" ; b8612 diff --git a/engine/overworld.asm b/engine/overworld.asm index 330dd3893..5bbd70a85 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -723,6 +723,7 @@ emote_header: MACRO ENDM EmotesPointers: ; 144d +; entries correspond to EMOTE_* constants ; graphics address, length, starting tile emote_header ShockEmote, 4, $78 emote_header QuestionEmote, 4, $78 @@ -733,9 +734,9 @@ EmotesPointers: ; 144d emote_header SleepEmote, 4, $78 emote_header FishEmote, 4, $78 emote_header JumpShadowGFX, 1, $7c - emote_header FishingRodGFX2, 2, $7c + emote_header FishingRodGFX, 2, $7c emote_header BoulderDustGFX, 2, $7e - emote_header FishingRodGFX4, 1, $7e + emote_header GrassRustleGFX, 1, $7e ; 14495 diff --git a/engine/pack.asm b/engine/pack.asm index dad9a799d..e10b70e12 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1716,6 +1716,6 @@ TextJump_YouCantUseItInABattle: ; 0x10b11 ; 0x10b16 PackMenuGFX: -INCBIN "gfx/misc/pack_menu.2bpp" +INCBIN "gfx/pack/pack_menu.2bpp" PackGFX: -INCBIN "gfx/misc/pack.2bpp" +INCBIN "gfx/pack/pack.2bpp" diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 948589639..901053c9f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -136,7 +136,7 @@ Pokegear_LoadGFX: ; 90c4e ; 90cb2 FastShipGFX: ; 90cb2 -INCBIN "gfx/misc/fast_ship.2bpp" +INCBIN "gfx/pokegear/fast_ship.2bpp" ; 90d32 InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32) @@ -1407,7 +1407,7 @@ PokegearText_DeleteStoredNumber: ; 0x914d8 ; 0x914dd PokegearSpritesGFX: ; 914dd -INCBIN "gfx/misc/pokegear_sprites.2bpp.lz" +INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz" ; 9150d RadioTilemapRLE: ; 9150d @@ -2970,11 +2970,11 @@ LoadTownMapGFX: ; 91ff2 ; 91fff JohtoMap: ; 91fff -INCBIN "gfx/misc/johto.bin" +INCBIN "gfx/pokegear/johto.bin" ; 92168 KantoMap: ; 92168 -INCBIN "gfx/misc/kanto.bin" +INCBIN "gfx/pokegear/kanto.bin" ; 922d1 PokedexNestIconGFX: ; 922d1 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index c131e584f..e23b760cd 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -2211,17 +2211,17 @@ Reel3Tilemap: ; 9334b ; 9335d SlotsTilemap: ; 9335d -INCBIN "gfx/slots.tilemap" +INCBIN "gfx/slots/slots.tilemap" ; 9344d Slots1LZ: ; 9344d -INCBIN "gfx/slots_1.2bpp.lz" +INCBIN "gfx/slots/slots_1.2bpp.lz" ; 935cd Slots2LZ: ; 935cd -INCBIN "gfx/slots_2.2bpp.lz" +INCBIN "gfx/slots/slots_2.2bpp.lz" ; 9382d Slots3LZ: ; 9382d -INCBIN "gfx/slots_3.2bpp.lz" +INCBIN "gfx/slots/slots_3.2bpp.lz" ; 93a3d diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 497d81ae6..499891fb0 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -606,11 +606,11 @@ TrainerCard_JohtoBadgesOAM: ; 254c9 db $1c | $80, $20, $24, $20 | $80 ; 25523 -CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" +CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp" -LeaderGFX: INCBIN "gfx/misc/leaders.2bpp" -LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp" -BadgeGFX: INCBIN "gfx/misc/badges.2bpp" -BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" +LeaderGFX: INCBIN "gfx/trainer_card/leaders.2bpp" +LeaderGFX2: INCBIN "gfx/trainer_card/leaders.2bpp" +BadgeGFX: INCBIN "gfx/trainer_card/badges.2bpp" +BadgeGFX2: INCBIN "gfx/trainer_card/badges.2bpp" -CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp" +CardRightCornerGFX: INCBIN "gfx/trainer_card/card_right_corner.2bpp" diff --git a/event/field_moves.asm b/event/field_moves.asm index 158f65598..2869f9be9 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a ; 8c893 HeadbuttTreeGFX: ; 8c893 -INCBIN "gfx/overworld/headbutt_tree.2bpp" +INCBIN "gfx/ow_fx/headbutt_tree.2bpp" ; 8c913 HideHeadbuttTree: ; 8c913 @@ -152,11 +152,11 @@ OWCutAnimation: ; 8c940 ; 8c98c CutTreeGFX: ; c898c -INCBIN "gfx/misc/cut_tree.2bpp" +INCBIN "gfx/ow_fx/cut_tree.2bpp" ; c89cc CutGrassGFX: ; 8c9cc -INCBIN "gfx/misc/cut_grass.2bpp" +INCBIN "gfx/ow_fx/cut_grass.2bpp" ; 8ca0c OWCutJumptable: ; 8ca0c diff --git a/gfx/misc/dude.2bpp.lz.d13fb490 b/gfx/battle/dude.2bpp.lz.d13fb490 similarity index 100% rename from gfx/misc/dude.2bpp.lz.d13fb490 rename to gfx/battle/dude.2bpp.lz.d13fb490 diff --git a/gfx/misc/dude.png b/gfx/battle/dude.png similarity index 100% rename from gfx/misc/dude.png rename to gfx/battle/dude.png diff --git a/gfx/font.asm b/gfx/font.asm index 578085ddf..b61fc1e23 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -1,11 +1,11 @@ FontExtra: -INCBIN "gfx/misc/font_extra.2bpp" +INCBIN "gfx/font/font_extra.2bpp" Font: -INCBIN "gfx/misc/font.1bpp" +INCBIN "gfx/font/font.1bpp" FontBattleExtra: -INCBIN "gfx/misc/font_battle_extra.2bpp" +INCBIN "gfx/font/font_battle_extra.2bpp" Frames: ; f8800 INCBIN "gfx/frames/1.1bpp" @@ -47,7 +47,7 @@ INCBIN "gfx/battle/expbar.2bpp" ; f8ba0 TownMapGFX: ; f8ba0 -INCBIN "gfx/misc/town_map.2bpp.lz" +INCBIN "gfx/pokegear/town_map.2bpp.lz" ; f8ea4 WeekdayKanjiGFX: ; unused kanji @@ -79,7 +79,7 @@ INCBIN "gfx/unknown/0f9424.2bpp" ; f9434 Footprints: ; f9434 -INCBIN "gfx/misc/footprints.1bpp" +INCBIN "gfx/pokedex/footprints.1bpp" ; fb434 ; This and the following two functions are unreferenced. diff --git a/gfx/misc/font.png b/gfx/font/font.png similarity index 100% rename from gfx/misc/font.png rename to gfx/font/font.png diff --git a/gfx/misc/font_battle_extra.png b/gfx/font/font_battle_extra.png similarity index 100% rename from gfx/misc/font_battle_extra.png rename to gfx/font/font_battle_extra.png diff --git a/gfx/misc/font_extra.png b/gfx/font/font_extra.png similarity index 100% rename from gfx/misc/font_extra.png rename to gfx/font/font_extra.png diff --git a/gfx/misc/font_inversed.png b/gfx/font/font_inversed.png similarity index 100% rename from gfx/misc/font_inversed.png rename to gfx/font/font_inversed.png diff --git a/gfx/misc/unown_font.png b/gfx/font/unown_font.png similarity index 100% rename from gfx/misc/unown_font.png rename to gfx/font/unown_font.png diff --git a/gfx/misc/boulderdust.png b/gfx/ow_fx/boulder_dust.png similarity index 100% rename from gfx/misc/boulderdust.png rename to gfx/ow_fx/boulder_dust.png diff --git a/gfx/overworld/chris_fish.png b/gfx/ow_fx/chris_fish.png similarity index 100% rename from gfx/overworld/chris_fish.png rename to gfx/ow_fx/chris_fish.png diff --git a/gfx/misc/cut_grass.png b/gfx/ow_fx/cut_grass.png similarity index 100% rename from gfx/misc/cut_grass.png rename to gfx/ow_fx/cut_grass.png diff --git a/gfx/misc/cut_tree.png b/gfx/ow_fx/cut_tree.png similarity index 100% rename from gfx/misc/cut_tree.png rename to gfx/ow_fx/cut_tree.png diff --git a/gfx/misc/fishing2.png b/gfx/ow_fx/fishing_rod.png similarity index 100% rename from gfx/misc/fishing2.png rename to gfx/ow_fx/fishing_rod.png diff --git a/gfx/misc/fishing4.png b/gfx/ow_fx/grass_rustle.png similarity index 100% rename from gfx/misc/fishing4.png rename to gfx/ow_fx/grass_rustle.png diff --git a/gfx/overworld/headbutt_tree.png b/gfx/ow_fx/headbutt_tree.png similarity index 100% rename from gfx/overworld/headbutt_tree.png rename to gfx/ow_fx/headbutt_tree.png diff --git a/gfx/overworld/kris_fish.png b/gfx/ow_fx/kris_fish.png similarity index 100% rename from gfx/overworld/kris_fish.png rename to gfx/ow_fx/kris_fish.png diff --git a/gfx/misc/shadow.png b/gfx/ow_fx/shadow.png similarity index 100% rename from gfx/misc/shadow.png rename to gfx/ow_fx/shadow.png diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/ow_fx/trainer_battle_pokeball_tiles.png similarity index 100% rename from gfx/overworld/trainer_battle_pokeball_tiles.png rename to gfx/ow_fx/trainer_battle_pokeball_tiles.png diff --git a/gfx/misc/pack.png b/gfx/pack/pack.png similarity index 100% rename from gfx/misc/pack.png rename to gfx/pack/pack.png diff --git a/gfx/misc/pack_f.png b/gfx/pack/pack_f.png similarity index 100% rename from gfx/misc/pack_f.png rename to gfx/pack/pack_f.png diff --git a/gfx/misc/pack_menu.png b/gfx/pack/pack_menu.png similarity index 100% rename from gfx/misc/pack_menu.png rename to gfx/pack/pack_menu.png diff --git a/gfx/pc.2bpp.lz.2201c1aa b/gfx/pc/pc.2bpp.lz.2201c1aa similarity index 100% rename from gfx/pc.2bpp.lz.2201c1aa rename to gfx/pc/pc.2bpp.lz.2201c1aa diff --git a/gfx/pc.png b/gfx/pc/pc.png similarity index 100% rename from gfx/pc.png rename to gfx/pc/pc.png diff --git a/gfx/pc_mail.png b/gfx/pc/pc_mail.png similarity index 100% rename from gfx/pc_mail.png rename to gfx/pc/pc_mail.png diff --git a/gfx/misc/chris.png b/gfx/player/chris.png similarity index 100% rename from gfx/misc/chris.png rename to gfx/player/chris.png diff --git a/gfx/misc/player.2bpp.lz.0312ddce b/gfx/player/chris_back.2bpp.lz.0312ddce similarity index 100% rename from gfx/misc/player.2bpp.lz.0312ddce rename to gfx/player/chris_back.2bpp.lz.0312ddce diff --git a/gfx/misc/player.png b/gfx/player/chris_back.png similarity index 100% rename from gfx/misc/player.png rename to gfx/player/chris_back.png diff --git a/gfx/misc/kris.png b/gfx/player/kris.png similarity index 100% rename from gfx/misc/kris.png rename to gfx/player/kris.png diff --git a/gfx/misc/kris_back.png b/gfx/player/kris_back.png similarity index 100% rename from gfx/misc/kris_back.png rename to gfx/player/kris_back.png diff --git a/gfx/misc/footprints.png b/gfx/pokedex/footprints.png similarity index 100% rename from gfx/misc/footprints.png rename to gfx/pokedex/footprints.png diff --git a/gfx/pokegear/dexmap_nest_icon.2bpp b/gfx/pokegear/dexmap_nest_icon.2bpp new file mode 100644 index 000000000..48a4938e6 --- /dev/null +++ b/gfx/pokegear/dexmap_nest_icon.2bpp @@ -0,0 +1 @@ +BBffÿÿ½ÿ™ÿÿÿZZ$$ \ No newline at end of file diff --git a/gfx/misc/fast_ship.png b/gfx/pokegear/fast_ship.png similarity index 100% rename from gfx/misc/fast_ship.png rename to gfx/pokegear/fast_ship.png diff --git a/gfx/pokegear/flymap_label_border.1bpp b/gfx/pokegear/flymap_label_border.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..671aab1d756b16f834cca87c4fff021e0a5afed5 GIT binary patch literal 48 tcmezI;6OtI0|SFRJ2N9AkOqQ=h64|N0BJ@>W_EcAn>q%DIvWWX4FD_-3eNxl literal 0 HcmV?d00001 diff --git a/gfx/misc/johto.bin b/gfx/pokegear/johto.bin similarity index 100% rename from gfx/misc/johto.bin rename to gfx/pokegear/johto.bin diff --git a/gfx/misc/kanto.bin b/gfx/pokegear/kanto.bin similarity index 100% rename from gfx/misc/kanto.bin rename to gfx/pokegear/kanto.bin diff --git a/gfx/misc/pokegear.2bpp.lz.42315ab4 b/gfx/pokegear/pokegear.2bpp.lz.42315ab4 similarity index 100% rename from gfx/misc/pokegear.2bpp.lz.42315ab4 rename to gfx/pokegear/pokegear.2bpp.lz.42315ab4 diff --git a/gfx/misc/pokegear.png b/gfx/pokegear/pokegear.png similarity index 100% rename from gfx/misc/pokegear.png rename to gfx/pokegear/pokegear.png diff --git a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f similarity index 100% rename from gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f rename to gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f diff --git a/gfx/misc/pokegear_sprites.png b/gfx/pokegear/pokegear_sprites.png similarity index 100% rename from gfx/misc/pokegear_sprites.png rename to gfx/pokegear/pokegear_sprites.png diff --git a/gfx/misc/town_map.2bpp.lz.c0587c86 b/gfx/pokegear/town_map.2bpp.lz.c0587c86 similarity index 100% rename from gfx/misc/town_map.2bpp.lz.c0587c86 rename to gfx/pokegear/town_map.2bpp.lz.c0587c86 diff --git a/gfx/misc/town_map.png b/gfx/pokegear/town_map.png similarity index 100% rename from gfx/misc/town_map.png rename to gfx/pokegear/town_map.png diff --git a/gfx/shrink1.2bpp.lz.d4443930 b/gfx/shrink/shrink1.2bpp.lz.d4443930 similarity index 100% rename from gfx/shrink1.2bpp.lz.d4443930 rename to gfx/shrink/shrink1.2bpp.lz.d4443930 diff --git a/gfx/shrink1.png b/gfx/shrink/shrink1.png similarity index 100% rename from gfx/shrink1.png rename to gfx/shrink/shrink1.png diff --git a/gfx/shrink2.2bpp.lz.3f58480a b/gfx/shrink/shrink2.2bpp.lz.3f58480a similarity index 100% rename from gfx/shrink2.2bpp.lz.3f58480a rename to gfx/shrink/shrink2.2bpp.lz.3f58480a diff --git a/gfx/shrink2.png b/gfx/shrink/shrink2.png similarity index 100% rename from gfx/shrink2.png rename to gfx/shrink/shrink2.png diff --git a/gfx/slots.tilemap b/gfx/slots/slots.tilemap similarity index 100% rename from gfx/slots.tilemap rename to gfx/slots/slots.tilemap diff --git a/gfx/slots_1.2bpp.lz.b22ddc13 b/gfx/slots/slots_1.2bpp.lz.b22ddc13 similarity index 100% rename from gfx/slots_1.2bpp.lz.b22ddc13 rename to gfx/slots/slots_1.2bpp.lz.b22ddc13 diff --git a/gfx/slots_1.png b/gfx/slots/slots_1.png similarity index 100% rename from gfx/slots_1.png rename to gfx/slots/slots_1.png diff --git a/gfx/slots_2.2bpp.lz.b28f76e3 b/gfx/slots/slots_2.2bpp.lz.b28f76e3 similarity index 100% rename from gfx/slots_2.2bpp.lz.b28f76e3 rename to gfx/slots/slots_2.2bpp.lz.b28f76e3 diff --git a/gfx/slots_2.png b/gfx/slots/slots_2.png similarity index 100% rename from gfx/slots_2.png rename to gfx/slots/slots_2.png diff --git a/gfx/slots_3.2bpp.lz.70c2984c b/gfx/slots/slots_3.2bpp.lz.70c2984c similarity index 100% rename from gfx/slots_3.2bpp.lz.70c2984c rename to gfx/slots/slots_3.2bpp.lz.70c2984c diff --git a/gfx/slots_3.png b/gfx/slots/slots_3.png old mode 100755 new mode 100644 similarity index 100% rename from gfx/slots_3.png rename to gfx/slots/slots_3.png diff --git a/gfx/misc/copyright.png b/gfx/splash/copyright.png similarity index 100% rename from gfx/misc/copyright.png rename to gfx/splash/copyright.png diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water/water.png similarity index 100% rename from gfx/tilesets/water.png rename to gfx/tilesets/water/water.png diff --git a/gfx/misc/badges.png b/gfx/trainer_card/badges.png similarity index 100% rename from gfx/misc/badges.png rename to gfx/trainer_card/badges.png diff --git a/gfx/misc/card_right_corner.png b/gfx/trainer_card/card_right_corner.png similarity index 100% rename from gfx/misc/card_right_corner.png rename to gfx/trainer_card/card_right_corner.png diff --git a/gfx/misc/card_status.png b/gfx/trainer_card/card_status.png similarity index 100% rename from gfx/misc/card_status.png rename to gfx/trainer_card/card_status.png diff --git a/gfx/misc/chris_card.png b/gfx/trainer_card/chris_card.png similarity index 100% rename from gfx/misc/chris_card.png rename to gfx/trainer_card/chris_card.png diff --git a/gfx/misc/kris_card.png b/gfx/trainer_card/kris_card.png similarity index 100% rename from gfx/misc/kris_card.png rename to gfx/trainer_card/kris_card.png diff --git a/gfx/misc/leaders.png b/gfx/trainer_card/leaders.png similarity index 100% rename from gfx/misc/leaders.png rename to gfx/trainer_card/leaders.png diff --git a/gfx/misc/trainer_card.png b/gfx/trainer_card/trainer_card.png similarity index 100% rename from gfx/misc/trainer_card.png rename to gfx/trainer_card/trainer_card.png diff --git a/main.asm b/main.asm index 40bfa7cbe..c50cef618 100644 --- a/main.asm +++ b/main.asm @@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm" INCLUDE "battle/link_result.asm" ChrisBackpic: ; 2ba1a -INCBIN "gfx/misc/player.2bpp.lz" +INCBIN "gfx/player/chris_back.2bpp.lz" DudeBackpic: ; 2bbaa -INCBIN "gfx/misc/dude.2bpp.lz" +INCBIN "gfx/battle/dude.2bpp.lz" SECTION "bankB", ROMX @@ -1969,7 +1969,7 @@ PackFGFXPointers: ; 48e93 dw PackFGFX + (15 tiles) * 2 PackFGFX: ; 48e9b -INCBIN "gfx/misc/pack_f.2bpp" +INCBIN "gfx/pack/pack_f.2bpp" Special_MoveTutor: ; 4925b call FadeToMenu @@ -2487,10 +2487,10 @@ endr ret Shrink1Pic: ; 4d249 -INCBIN "gfx/shrink1.2bpp.lz" +INCBIN "gfx/shrink/shrink1.2bpp.lz" Shrink2Pic: ; 4d2d9 -INCBIN "gfx/shrink2.2bpp.lz" +INCBIN "gfx/shrink/shrink2.2bpp.lz" LinkMonStatsScreen: ; 4d319 ld a, [wMenuCursorY] @@ -4857,13 +4857,13 @@ GetCardPic: ; 8833e ret ChrisCardPic: ; 88365 -INCBIN "gfx/misc/chris_card.2bpp" +INCBIN "gfx/trainer_card/chris_card.2bpp" KrisCardPic: ; 88595 -INCBIN "gfx/misc/kris_card.2bpp" +INCBIN "gfx/trainer_card/kris_card.2bpp" CardGFX: ; 887c5 -INCBIN "gfx/misc/trainer_card.2bpp" +INCBIN "gfx/trainer_card/trainer_card.2bpp" GetPlayerBackpic: ; 88825 ld a, [PlayerGender] @@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874 ret ChrisPic: ; 888a9 -INCBIN "gfx/misc/chris.2bpp" +INCBIN "gfx/player/chris.2bpp" KrisPic: ; 88bb9 -INCBIN "gfx/misc/kris.2bpp" +INCBIN "gfx/player/kris.2bpp" GetKrisBackpic: ; 88ec9 ; Kris's backpic is uncompressed. @@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9 ret KrisBackpic: ; 88ed6 -INCBIN "gfx/misc/kris_back.2bpp" +INCBIN "gfx/player/kris_back.2bpp" String_89116: db "-----@" @@ -5310,7 +5310,7 @@ INCLUDE "gfx/pics/kanto_frames.asm" SECTION "bank36", ROMX -FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" +FontInversed: INCBIN "gfx/font/font_inversed.1bpp" SECTION "Pic Animations 3", ROMX @@ -5452,7 +5452,7 @@ INCLUDE "engine/billspc.asm" SECTION "bank39", ROMX CopyrightGFX:: ; e4000 -INCBIN "gfx/misc/copyright.2bpp" +INCBIN "gfx/splash/copyright.2bpp" INCLUDE "engine/options_menu.asm" INCLUDE "engine/crystal_intro.asm" @@ -5595,7 +5595,7 @@ INCLUDE "engine/landmarks.asm" SECTION "bank77", ROMX UnownFont: ; 1dc000 -INCBIN "gfx/misc/unown_font.2bpp" +INCBIN "gfx/font/unown_font.2bpp" INCLUDE "misc/printer_77.asm" @@ -5908,7 +5908,7 @@ TownMap_ConvertLineBreakCharacters: ; 1de2c5 ret PokegearGFX: ; 1de2e4 -INCBIN "gfx/misc/pokegear.2bpp.lz" +INCBIN "gfx/pokegear/pokegear.2bpp.lz" IsMailEuropean: ; 1de5c8 ; return 1 if French diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index 952742ec1..8f128a7bd 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -632,7 +632,7 @@ HeartEmote: INCBIN "gfx/emotes/heart.2bpp" BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" FishEmote: INCBIN "gfx/emotes/fish.2bpp" -JumpShadowGFX: INCBIN "gfx/misc/shadow.2bpp" -FishingRodGFX2: INCBIN "gfx/misc/fishing2.2bpp" -BoulderDustGFX: INCBIN "gfx/misc/boulderdust.2bpp" -FishingRodGFX4: INCBIN "gfx/misc/fishing4.2bpp" +JumpShadowGFX: INCBIN "gfx/ow_fx/shadow.2bpp" +FishingRodGFX: INCBIN "gfx/ow_fx/fishing_rod.2bpp" +BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp" +GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp" diff --git a/tilesets/animations.asm b/tilesets/animations.asm index 76b3c65f8..124c84b58 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -492,7 +492,7 @@ AnimateWaterTile: ; fc402 ; fc41c WaterTileFrames: ; fc41c - INCBIN "gfx/tilesets/water.2bpp" + INCBIN "gfx/tilesets/water/water.2bpp" ; fc45c