From 31901f73b0cb0c516962975c323df06d73263486 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 9 Dec 2017 22:57:41 -0500 Subject: 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/battle/dude.2bpp.lz.d13fb490 | Bin 0 -> 320 bytes gfx/battle/dude.png | Bin 0 -> 375 bytes gfx/font.asm | 10 +++---- gfx/font/font.png | Bin 0 -> 770 bytes gfx/font/font_battle_extra.png | Bin 0 -> 280 bytes gfx/font/font_extra.png | Bin 0 -> 293 bytes gfx/font/font_inversed.png | Bin 0 -> 736 bytes gfx/font/unown_font.png | Bin 0 -> 294 bytes gfx/misc/badges.png | Bin 517 -> 0 bytes gfx/misc/boulderdust.png | Bin 106 -> 0 bytes gfx/misc/card_right_corner.png | Bin 90 -> 0 bytes gfx/misc/card_status.png | Bin 121 -> 0 bytes gfx/misc/chris.png | Bin 417 -> 0 bytes gfx/misc/chris_card.png | Bin 412 -> 0 bytes gfx/misc/copyright.png | Bin 262 -> 0 bytes gfx/misc/cut_grass.png | Bin 134 -> 0 bytes gfx/misc/cut_tree.png | Bin 140 -> 0 bytes gfx/misc/dude.2bpp.lz.d13fb490 | Bin 320 -> 0 bytes gfx/misc/dude.png | Bin 375 -> 0 bytes gfx/misc/fast_ship.png | Bin 154 -> 0 bytes gfx/misc/fishing2.png | Bin 103 -> 0 bytes gfx/misc/fishing4.png | Bin 88 -> 0 bytes gfx/misc/font.png | Bin 770 -> 0 bytes gfx/misc/font_battle_extra.png | Bin 280 -> 0 bytes gfx/misc/font_extra.png | Bin 293 -> 0 bytes gfx/misc/font_inversed.png | Bin 736 -> 0 bytes gfx/misc/footprints.png | Bin 3012 -> 0 bytes gfx/misc/johto.bin | Bin 361 -> 0 bytes gfx/misc/kanto.bin | Bin 361 -> 0 bytes gfx/misc/kris.png | Bin 418 -> 0 bytes gfx/misc/kris_back.png | Bin 484 -> 0 bytes gfx/misc/kris_card.png | Bin 414 -> 0 bytes gfx/misc/leaders.png | Bin 958 -> 0 bytes gfx/misc/pack.png | Bin 282 -> 0 bytes gfx/misc/pack_f.png | Bin 356 -> 0 bytes gfx/misc/pack_menu.png | Bin 360 -> 0 bytes gfx/misc/player.2bpp.lz.0312ddce | Bin 400 -> 0 bytes gfx/misc/player.png | Bin 458 -> 0 bytes gfx/misc/pokegear.2bpp.lz.42315ab4 | Bin 740 -> 0 bytes gfx/misc/pokegear.png | Bin 388 -> 0 bytes gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f | Bin 48 -> 0 bytes gfx/misc/pokegear_sprites.png | Bin 133 -> 0 bytes gfx/misc/shadow.png | Bin 84 -> 0 bytes gfx/misc/town_map.2bpp.lz.c0587c86 | Bin 772 -> 0 bytes gfx/misc/town_map.png | Bin 464 -> 0 bytes gfx/misc/trainer_card.png | Bin 135 -> 0 bytes gfx/misc/unown_font.png | Bin 294 -> 0 bytes gfx/overworld/chris_fish.png | Bin 190 -> 0 bytes gfx/overworld/headbutt_tree.png | Bin 197 -> 0 bytes gfx/overworld/kris_fish.png | Bin 193 -> 0 bytes gfx/overworld/trainer_battle_pokeball_tiles.png | Bin 89 -> 0 bytes gfx/ow_fx/boulder_dust.png | Bin 0 -> 106 bytes gfx/ow_fx/chris_fish.png | Bin 0 -> 190 bytes gfx/ow_fx/cut_grass.png | Bin 0 -> 134 bytes gfx/ow_fx/cut_tree.png | Bin 0 -> 140 bytes gfx/ow_fx/fishing_rod.png | Bin 0 -> 103 bytes gfx/ow_fx/grass_rustle.png | Bin 0 -> 88 bytes gfx/ow_fx/headbutt_tree.png | Bin 0 -> 197 bytes gfx/ow_fx/kris_fish.png | Bin 0 -> 193 bytes gfx/ow_fx/shadow.png | Bin 0 -> 84 bytes gfx/ow_fx/trainer_battle_pokeball_tiles.png | Bin 0 -> 89 bytes gfx/pack/pack.png | Bin 0 -> 282 bytes gfx/pack/pack_f.png | Bin 0 -> 356 bytes gfx/pack/pack_menu.png | Bin 0 -> 360 bytes gfx/pc.2bpp.lz.2201c1aa | Bin 132 -> 0 bytes gfx/pc.png | Bin 115 -> 0 bytes gfx/pc/pc.2bpp.lz.2201c1aa | Bin 0 -> 132 bytes gfx/pc/pc.png | Bin 0 -> 115 bytes gfx/pc/pc_mail.png | Bin 0 -> 114 bytes gfx/pc_mail.png | Bin 114 -> 0 bytes gfx/player/chris.png | Bin 0 -> 417 bytes gfx/player/chris_back.2bpp.lz.0312ddce | Bin 0 -> 400 bytes gfx/player/chris_back.png | Bin 0 -> 458 bytes gfx/player/kris.png | Bin 0 -> 418 bytes gfx/player/kris_back.png | Bin 0 -> 484 bytes gfx/pokedex/footprints.png | Bin 0 -> 3012 bytes gfx/pokegear/dexmap_nest_icon.2bpp | 1 + gfx/pokegear/fast_ship.png | Bin 0 -> 154 bytes gfx/pokegear/flymap_label_border.1bpp | Bin 0 -> 48 bytes gfx/pokegear/johto.bin | Bin 0 -> 361 bytes gfx/pokegear/kanto.bin | Bin 0 -> 361 bytes gfx/pokegear/pokegear.2bpp.lz.42315ab4 | Bin 0 -> 740 bytes gfx/pokegear/pokegear.png | Bin 0 -> 388 bytes gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f | Bin 0 -> 48 bytes gfx/pokegear/pokegear_sprites.png | Bin 0 -> 133 bytes gfx/pokegear/town_map.2bpp.lz.c0587c86 | Bin 0 -> 772 bytes gfx/pokegear/town_map.png | Bin 0 -> 464 bytes gfx/shrink/shrink1.2bpp.lz.d4443930 | Bin 0 -> 144 bytes gfx/shrink/shrink1.png | Bin 0 -> 188 bytes gfx/shrink/shrink2.2bpp.lz.3f58480a | Bin 0 -> 64 bytes gfx/shrink/shrink2.png | Bin 0 -> 156 bytes gfx/shrink1.2bpp.lz.d4443930 | Bin 144 -> 0 bytes gfx/shrink1.png | Bin 188 -> 0 bytes gfx/shrink2.2bpp.lz.3f58480a | Bin 64 -> 0 bytes gfx/shrink2.png | Bin 156 -> 0 bytes gfx/slots.tilemap | Bin 240 -> 0 bytes gfx/slots/slots.tilemap | Bin 0 -> 240 bytes gfx/slots/slots_1.2bpp.lz.b22ddc13 | Bin 0 -> 384 bytes gfx/slots/slots_1.png | Bin 0 -> 446 bytes gfx/slots/slots_2.2bpp.lz.b28f76e3 | Bin 0 -> 608 bytes gfx/slots/slots_2.png | Bin 0 -> 664 bytes gfx/slots/slots_3.2bpp.lz.70c2984c | Bin 0 -> 528 bytes gfx/slots/slots_3.png | Bin 0 -> 1916 bytes gfx/slots_1.2bpp.lz.b22ddc13 | Bin 384 -> 0 bytes gfx/slots_1.png | Bin 446 -> 0 bytes gfx/slots_2.2bpp.lz.b28f76e3 | Bin 608 -> 0 bytes gfx/slots_2.png | Bin 664 -> 0 bytes gfx/slots_3.2bpp.lz.70c2984c | Bin 528 -> 0 bytes gfx/slots_3.png | Bin 1916 -> 0 bytes gfx/splash/copyright.png | Bin 0 -> 262 bytes gfx/tilesets/water.png | Bin 100 -> 0 bytes gfx/tilesets/water/water.png | Bin 0 -> 100 bytes gfx/trainer_card/badges.png | Bin 0 -> 517 bytes gfx/trainer_card/card_right_corner.png | Bin 0 -> 90 bytes gfx/trainer_card/card_status.png | Bin 0 -> 121 bytes gfx/trainer_card/chris_card.png | Bin 0 -> 412 bytes gfx/trainer_card/kris_card.png | Bin 0 -> 414 bytes gfx/trainer_card/leaders.png | Bin 0 -> 958 bytes gfx/trainer_card/trainer_card.png | Bin 0 -> 135 bytes main.asm | 30 ++++++++++---------- misc/gfx_41.asm | 8 +++--- tilesets/animations.asm | 2 +- 132 files changed, 73 insertions(+), 67 deletions(-) create mode 100644 gfx/battle/dude.2bpp.lz.d13fb490 create mode 100644 gfx/battle/dude.png create mode 100644 gfx/font/font.png create mode 100644 gfx/font/font_battle_extra.png create mode 100644 gfx/font/font_extra.png create mode 100644 gfx/font/font_inversed.png create mode 100644 gfx/font/unown_font.png delete mode 100644 gfx/misc/badges.png delete mode 100644 gfx/misc/boulderdust.png delete mode 100644 gfx/misc/card_right_corner.png delete mode 100644 gfx/misc/card_status.png delete mode 100644 gfx/misc/chris.png delete mode 100644 gfx/misc/chris_card.png delete mode 100644 gfx/misc/copyright.png delete mode 100644 gfx/misc/cut_grass.png delete mode 100644 gfx/misc/cut_tree.png delete mode 100644 gfx/misc/dude.2bpp.lz.d13fb490 delete mode 100644 gfx/misc/dude.png delete mode 100644 gfx/misc/fast_ship.png delete mode 100644 gfx/misc/fishing2.png delete mode 100644 gfx/misc/fishing4.png delete mode 100644 gfx/misc/font.png delete mode 100644 gfx/misc/font_battle_extra.png delete mode 100644 gfx/misc/font_extra.png delete mode 100644 gfx/misc/font_inversed.png delete mode 100644 gfx/misc/footprints.png delete mode 100644 gfx/misc/johto.bin delete mode 100644 gfx/misc/kanto.bin delete mode 100644 gfx/misc/kris.png delete mode 100644 gfx/misc/kris_back.png delete mode 100644 gfx/misc/kris_card.png delete mode 100644 gfx/misc/leaders.png delete mode 100644 gfx/misc/pack.png delete mode 100644 gfx/misc/pack_f.png delete mode 100644 gfx/misc/pack_menu.png delete mode 100644 gfx/misc/player.2bpp.lz.0312ddce delete mode 100644 gfx/misc/player.png delete mode 100644 gfx/misc/pokegear.2bpp.lz.42315ab4 delete mode 100644 gfx/misc/pokegear.png delete mode 100644 gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f delete mode 100644 gfx/misc/pokegear_sprites.png delete mode 100644 gfx/misc/shadow.png delete mode 100644 gfx/misc/town_map.2bpp.lz.c0587c86 delete mode 100644 gfx/misc/town_map.png delete mode 100644 gfx/misc/trainer_card.png delete mode 100644 gfx/misc/unown_font.png delete mode 100644 gfx/overworld/chris_fish.png delete mode 100644 gfx/overworld/headbutt_tree.png delete mode 100644 gfx/overworld/kris_fish.png delete mode 100644 gfx/overworld/trainer_battle_pokeball_tiles.png create mode 100644 gfx/ow_fx/boulder_dust.png create mode 100644 gfx/ow_fx/chris_fish.png create mode 100644 gfx/ow_fx/cut_grass.png create mode 100644 gfx/ow_fx/cut_tree.png create mode 100644 gfx/ow_fx/fishing_rod.png create mode 100644 gfx/ow_fx/grass_rustle.png create mode 100644 gfx/ow_fx/headbutt_tree.png create mode 100644 gfx/ow_fx/kris_fish.png create mode 100644 gfx/ow_fx/shadow.png create mode 100644 gfx/ow_fx/trainer_battle_pokeball_tiles.png create mode 100644 gfx/pack/pack.png create mode 100644 gfx/pack/pack_f.png create mode 100644 gfx/pack/pack_menu.png delete mode 100644 gfx/pc.2bpp.lz.2201c1aa delete mode 100644 gfx/pc.png create mode 100644 gfx/pc/pc.2bpp.lz.2201c1aa create mode 100644 gfx/pc/pc.png create mode 100644 gfx/pc/pc_mail.png delete mode 100644 gfx/pc_mail.png create mode 100644 gfx/player/chris.png create mode 100644 gfx/player/chris_back.2bpp.lz.0312ddce create mode 100644 gfx/player/chris_back.png create mode 100644 gfx/player/kris.png create mode 100644 gfx/player/kris_back.png create mode 100644 gfx/pokedex/footprints.png create mode 100644 gfx/pokegear/dexmap_nest_icon.2bpp create mode 100644 gfx/pokegear/fast_ship.png create mode 100644 gfx/pokegear/flymap_label_border.1bpp create mode 100644 gfx/pokegear/johto.bin create mode 100644 gfx/pokegear/kanto.bin create mode 100644 gfx/pokegear/pokegear.2bpp.lz.42315ab4 create mode 100644 gfx/pokegear/pokegear.png create mode 100644 gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f create mode 100644 gfx/pokegear/pokegear_sprites.png create mode 100644 gfx/pokegear/town_map.2bpp.lz.c0587c86 create mode 100644 gfx/pokegear/town_map.png create mode 100644 gfx/shrink/shrink1.2bpp.lz.d4443930 create mode 100644 gfx/shrink/shrink1.png create mode 100644 gfx/shrink/shrink2.2bpp.lz.3f58480a create mode 100644 gfx/shrink/shrink2.png delete mode 100644 gfx/shrink1.2bpp.lz.d4443930 delete mode 100644 gfx/shrink1.png delete mode 100644 gfx/shrink2.2bpp.lz.3f58480a delete mode 100644 gfx/shrink2.png delete mode 100644 gfx/slots.tilemap create mode 100644 gfx/slots/slots.tilemap create mode 100644 gfx/slots/slots_1.2bpp.lz.b22ddc13 create mode 100644 gfx/slots/slots_1.png create mode 100644 gfx/slots/slots_2.2bpp.lz.b28f76e3 create mode 100644 gfx/slots/slots_2.png create mode 100644 gfx/slots/slots_3.2bpp.lz.70c2984c create mode 100644 gfx/slots/slots_3.png delete mode 100644 gfx/slots_1.2bpp.lz.b22ddc13 delete mode 100644 gfx/slots_1.png delete mode 100644 gfx/slots_2.2bpp.lz.b28f76e3 delete mode 100644 gfx/slots_2.png delete mode 100644 gfx/slots_3.2bpp.lz.70c2984c delete mode 100755 gfx/slots_3.png create mode 100644 gfx/splash/copyright.png delete mode 100644 gfx/tilesets/water.png create mode 100644 gfx/tilesets/water/water.png create mode 100644 gfx/trainer_card/badges.png create mode 100644 gfx/trainer_card/card_right_corner.png create mode 100644 gfx/trainer_card/card_status.png create mode 100644 gfx/trainer_card/chris_card.png create mode 100644 gfx/trainer_card/kris_card.png create mode 100644 gfx/trainer_card/leaders.png create mode 100644 gfx/trainer_card/trainer_card.png 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/battle/dude.2bpp.lz.d13fb490 b/gfx/battle/dude.2bpp.lz.d13fb490 new file mode 100644 index 000000000..b8e96a09f Binary files /dev/null and b/gfx/battle/dude.2bpp.lz.d13fb490 differ diff --git a/gfx/battle/dude.png b/gfx/battle/dude.png new file mode 100644 index 000000000..9a74a90d6 Binary files /dev/null and b/gfx/battle/dude.png differ 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/font/font.png b/gfx/font/font.png new file mode 100644 index 000000000..7119c0691 Binary files /dev/null and b/gfx/font/font.png differ diff --git a/gfx/font/font_battle_extra.png b/gfx/font/font_battle_extra.png new file mode 100644 index 000000000..15e25a40c Binary files /dev/null and b/gfx/font/font_battle_extra.png differ diff --git a/gfx/font/font_extra.png b/gfx/font/font_extra.png new file mode 100644 index 000000000..7ca840c3a Binary files /dev/null and b/gfx/font/font_extra.png differ diff --git a/gfx/font/font_inversed.png b/gfx/font/font_inversed.png new file mode 100644 index 000000000..519339f39 Binary files /dev/null and b/gfx/font/font_inversed.png differ diff --git a/gfx/font/unown_font.png b/gfx/font/unown_font.png new file mode 100644 index 000000000..5ac70b807 Binary files /dev/null and b/gfx/font/unown_font.png differ diff --git a/gfx/misc/badges.png b/gfx/misc/badges.png deleted file mode 100644 index 4e5820da8..000000000 Binary files a/gfx/misc/badges.png and /dev/null differ diff --git a/gfx/misc/boulderdust.png b/gfx/misc/boulderdust.png deleted file mode 100644 index 9acb11c1b..000000000 Binary files a/gfx/misc/boulderdust.png and /dev/null differ diff --git a/gfx/misc/card_right_corner.png b/gfx/misc/card_right_corner.png deleted file mode 100644 index fa9aea024..000000000 Binary files a/gfx/misc/card_right_corner.png and /dev/null differ diff --git a/gfx/misc/card_status.png b/gfx/misc/card_status.png deleted file mode 100644 index b33bb2029..000000000 Binary files a/gfx/misc/card_status.png and /dev/null differ diff --git a/gfx/misc/chris.png b/gfx/misc/chris.png deleted file mode 100644 index 19869944e..000000000 Binary files a/gfx/misc/chris.png and /dev/null differ diff --git a/gfx/misc/chris_card.png b/gfx/misc/chris_card.png deleted file mode 100644 index 977981d41..000000000 Binary files a/gfx/misc/chris_card.png and /dev/null differ diff --git a/gfx/misc/copyright.png b/gfx/misc/copyright.png deleted file mode 100644 index 023bb93dd..000000000 Binary files a/gfx/misc/copyright.png and /dev/null differ diff --git a/gfx/misc/cut_grass.png b/gfx/misc/cut_grass.png deleted file mode 100644 index b10e0cf8c..000000000 Binary files a/gfx/misc/cut_grass.png and /dev/null differ diff --git a/gfx/misc/cut_tree.png b/gfx/misc/cut_tree.png deleted file mode 100644 index c1f1bc97d..000000000 Binary files a/gfx/misc/cut_tree.png and /dev/null differ diff --git a/gfx/misc/dude.2bpp.lz.d13fb490 b/gfx/misc/dude.2bpp.lz.d13fb490 deleted file mode 100644 index b8e96a09f..000000000 Binary files a/gfx/misc/dude.2bpp.lz.d13fb490 and /dev/null differ diff --git a/gfx/misc/dude.png b/gfx/misc/dude.png deleted file mode 100644 index 9a74a90d6..000000000 Binary files a/gfx/misc/dude.png and /dev/null differ diff --git a/gfx/misc/fast_ship.png b/gfx/misc/fast_ship.png deleted file mode 100644 index e92f00f55..000000000 Binary files a/gfx/misc/fast_ship.png and /dev/null differ diff --git a/gfx/misc/fishing2.png b/gfx/misc/fishing2.png deleted file mode 100644 index 32d277269..000000000 Binary files a/gfx/misc/fishing2.png and /dev/null differ diff --git a/gfx/misc/fishing4.png b/gfx/misc/fishing4.png deleted file mode 100644 index 0b2d73e2c..000000000 Binary files a/gfx/misc/fishing4.png and /dev/null differ diff --git a/gfx/misc/font.png b/gfx/misc/font.png deleted file mode 100644 index 7119c0691..000000000 Binary files a/gfx/misc/font.png and /dev/null differ diff --git a/gfx/misc/font_battle_extra.png b/gfx/misc/font_battle_extra.png deleted file mode 100644 index 15e25a40c..000000000 Binary files a/gfx/misc/font_battle_extra.png and /dev/null differ diff --git a/gfx/misc/font_extra.png b/gfx/misc/font_extra.png deleted file mode 100644 index 7ca840c3a..000000000 Binary files a/gfx/misc/font_extra.png and /dev/null differ diff --git a/gfx/misc/font_inversed.png b/gfx/misc/font_inversed.png deleted file mode 100644 index 519339f39..000000000 Binary files a/gfx/misc/font_inversed.png and /dev/null differ diff --git a/gfx/misc/footprints.png b/gfx/misc/footprints.png deleted file mode 100644 index b1e350436..000000000 Binary files a/gfx/misc/footprints.png and /dev/null differ diff --git a/gfx/misc/johto.bin b/gfx/misc/johto.bin deleted file mode 100644 index faa5efe70..000000000 Binary files a/gfx/misc/johto.bin and /dev/null differ diff --git a/gfx/misc/kanto.bin b/gfx/misc/kanto.bin deleted file mode 100644 index 8a08cd826..000000000 Binary files a/gfx/misc/kanto.bin and /dev/null differ diff --git a/gfx/misc/kris.png b/gfx/misc/kris.png deleted file mode 100644 index 7a855e676..000000000 Binary files a/gfx/misc/kris.png and /dev/null differ diff --git a/gfx/misc/kris_back.png b/gfx/misc/kris_back.png deleted file mode 100644 index eb0c1e941..000000000 Binary files a/gfx/misc/kris_back.png and /dev/null differ diff --git a/gfx/misc/kris_card.png b/gfx/misc/kris_card.png deleted file mode 100644 index 2ffa11159..000000000 Binary files a/gfx/misc/kris_card.png and /dev/null differ diff --git a/gfx/misc/leaders.png b/gfx/misc/leaders.png deleted file mode 100644 index 6e7eb0f8d..000000000 Binary files a/gfx/misc/leaders.png and /dev/null differ diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png deleted file mode 100644 index b85fc0990..000000000 Binary files a/gfx/misc/pack.png and /dev/null differ diff --git a/gfx/misc/pack_f.png b/gfx/misc/pack_f.png deleted file mode 100644 index fbe120bd1..000000000 Binary files a/gfx/misc/pack_f.png and /dev/null differ diff --git a/gfx/misc/pack_menu.png b/gfx/misc/pack_menu.png deleted file mode 100644 index 52e2bcdd5..000000000 Binary files a/gfx/misc/pack_menu.png and /dev/null differ diff --git a/gfx/misc/player.2bpp.lz.0312ddce b/gfx/misc/player.2bpp.lz.0312ddce deleted file mode 100644 index aec84bbab..000000000 Binary files a/gfx/misc/player.2bpp.lz.0312ddce and /dev/null differ diff --git a/gfx/misc/player.png b/gfx/misc/player.png deleted file mode 100644 index 7bf3c50db..000000000 Binary files a/gfx/misc/player.png and /dev/null differ diff --git a/gfx/misc/pokegear.2bpp.lz.42315ab4 b/gfx/misc/pokegear.2bpp.lz.42315ab4 deleted file mode 100644 index df312a51b..000000000 Binary files a/gfx/misc/pokegear.2bpp.lz.42315ab4 and /dev/null differ diff --git a/gfx/misc/pokegear.png b/gfx/misc/pokegear.png deleted file mode 100644 index 78774a260..000000000 Binary files a/gfx/misc/pokegear.png and /dev/null differ diff --git a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f b/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f deleted file mode 100644 index b5af62d28..000000000 Binary files a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f and /dev/null differ diff --git a/gfx/misc/pokegear_sprites.png b/gfx/misc/pokegear_sprites.png deleted file mode 100644 index 746d4b486..000000000 Binary files a/gfx/misc/pokegear_sprites.png and /dev/null differ diff --git a/gfx/misc/shadow.png b/gfx/misc/shadow.png deleted file mode 100644 index ba3dab5be..000000000 Binary files a/gfx/misc/shadow.png and /dev/null differ diff --git a/gfx/misc/town_map.2bpp.lz.c0587c86 b/gfx/misc/town_map.2bpp.lz.c0587c86 deleted file mode 100644 index c807a372f..000000000 Binary files a/gfx/misc/town_map.2bpp.lz.c0587c86 and /dev/null differ diff --git a/gfx/misc/town_map.png b/gfx/misc/town_map.png deleted file mode 100644 index 6e7af59d0..000000000 Binary files a/gfx/misc/town_map.png and /dev/null differ diff --git a/gfx/misc/trainer_card.png b/gfx/misc/trainer_card.png deleted file mode 100644 index 88ce35bca..000000000 Binary files a/gfx/misc/trainer_card.png and /dev/null differ diff --git a/gfx/misc/unown_font.png b/gfx/misc/unown_font.png deleted file mode 100644 index 5ac70b807..000000000 Binary files a/gfx/misc/unown_font.png and /dev/null differ diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png deleted file mode 100644 index ea0730151..000000000 Binary files a/gfx/overworld/chris_fish.png and /dev/null differ diff --git a/gfx/overworld/headbutt_tree.png b/gfx/overworld/headbutt_tree.png deleted file mode 100644 index 4cbb595f7..000000000 Binary files a/gfx/overworld/headbutt_tree.png and /dev/null differ diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png deleted file mode 100644 index a47b89042..000000000 Binary files a/gfx/overworld/kris_fish.png and /dev/null differ diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png deleted file mode 100644 index a4655d26e..000000000 Binary files a/gfx/overworld/trainer_battle_pokeball_tiles.png and /dev/null differ diff --git a/gfx/ow_fx/boulder_dust.png b/gfx/ow_fx/boulder_dust.png new file mode 100644 index 000000000..9acb11c1b Binary files /dev/null and b/gfx/ow_fx/boulder_dust.png differ diff --git a/gfx/ow_fx/chris_fish.png b/gfx/ow_fx/chris_fish.png new file mode 100644 index 000000000..ea0730151 Binary files /dev/null and b/gfx/ow_fx/chris_fish.png differ diff --git a/gfx/ow_fx/cut_grass.png b/gfx/ow_fx/cut_grass.png new file mode 100644 index 000000000..b10e0cf8c Binary files /dev/null and b/gfx/ow_fx/cut_grass.png differ diff --git a/gfx/ow_fx/cut_tree.png b/gfx/ow_fx/cut_tree.png new file mode 100644 index 000000000..c1f1bc97d Binary files /dev/null and b/gfx/ow_fx/cut_tree.png differ diff --git a/gfx/ow_fx/fishing_rod.png b/gfx/ow_fx/fishing_rod.png new file mode 100644 index 000000000..32d277269 Binary files /dev/null and b/gfx/ow_fx/fishing_rod.png differ diff --git a/gfx/ow_fx/grass_rustle.png b/gfx/ow_fx/grass_rustle.png new file mode 100644 index 000000000..0b2d73e2c Binary files /dev/null and b/gfx/ow_fx/grass_rustle.png differ diff --git a/gfx/ow_fx/headbutt_tree.png b/gfx/ow_fx/headbutt_tree.png new file mode 100644 index 000000000..4cbb595f7 Binary files /dev/null and b/gfx/ow_fx/headbutt_tree.png differ diff --git a/gfx/ow_fx/kris_fish.png b/gfx/ow_fx/kris_fish.png new file mode 100644 index 000000000..a47b89042 Binary files /dev/null and b/gfx/ow_fx/kris_fish.png differ diff --git a/gfx/ow_fx/shadow.png b/gfx/ow_fx/shadow.png new file mode 100644 index 000000000..ba3dab5be Binary files /dev/null and b/gfx/ow_fx/shadow.png differ diff --git a/gfx/ow_fx/trainer_battle_pokeball_tiles.png b/gfx/ow_fx/trainer_battle_pokeball_tiles.png new file mode 100644 index 000000000..a4655d26e Binary files /dev/null and b/gfx/ow_fx/trainer_battle_pokeball_tiles.png differ diff --git a/gfx/pack/pack.png b/gfx/pack/pack.png new file mode 100644 index 000000000..b85fc0990 Binary files /dev/null and b/gfx/pack/pack.png differ diff --git a/gfx/pack/pack_f.png b/gfx/pack/pack_f.png new file mode 100644 index 000000000..fbe120bd1 Binary files /dev/null and b/gfx/pack/pack_f.png differ diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png new file mode 100644 index 000000000..52e2bcdd5 Binary files /dev/null and b/gfx/pack/pack_menu.png differ diff --git a/gfx/pc.2bpp.lz.2201c1aa b/gfx/pc.2bpp.lz.2201c1aa deleted file mode 100644 index 996cfadc9..000000000 Binary files a/gfx/pc.2bpp.lz.2201c1aa and /dev/null differ diff --git a/gfx/pc.png b/gfx/pc.png deleted file mode 100644 index ce8fed73b..000000000 Binary files a/gfx/pc.png and /dev/null differ diff --git a/gfx/pc/pc.2bpp.lz.2201c1aa b/gfx/pc/pc.2bpp.lz.2201c1aa new file mode 100644 index 000000000..996cfadc9 Binary files /dev/null and b/gfx/pc/pc.2bpp.lz.2201c1aa differ diff --git a/gfx/pc/pc.png b/gfx/pc/pc.png new file mode 100644 index 000000000..ce8fed73b Binary files /dev/null and b/gfx/pc/pc.png differ diff --git a/gfx/pc/pc_mail.png b/gfx/pc/pc_mail.png new file mode 100644 index 000000000..fd4b2892f Binary files /dev/null and b/gfx/pc/pc_mail.png differ diff --git a/gfx/pc_mail.png b/gfx/pc_mail.png deleted file mode 100644 index fd4b2892f..000000000 Binary files a/gfx/pc_mail.png and /dev/null differ diff --git a/gfx/player/chris.png b/gfx/player/chris.png new file mode 100644 index 000000000..19869944e Binary files /dev/null and b/gfx/player/chris.png differ diff --git a/gfx/player/chris_back.2bpp.lz.0312ddce b/gfx/player/chris_back.2bpp.lz.0312ddce new file mode 100644 index 000000000..aec84bbab Binary files /dev/null and b/gfx/player/chris_back.2bpp.lz.0312ddce differ diff --git a/gfx/player/chris_back.png b/gfx/player/chris_back.png new file mode 100644 index 000000000..7bf3c50db Binary files /dev/null and b/gfx/player/chris_back.png differ diff --git a/gfx/player/kris.png b/gfx/player/kris.png new file mode 100644 index 000000000..7a855e676 Binary files /dev/null and b/gfx/player/kris.png differ diff --git a/gfx/player/kris_back.png b/gfx/player/kris_back.png new file mode 100644 index 000000000..eb0c1e941 Binary files /dev/null and b/gfx/player/kris_back.png differ diff --git a/gfx/pokedex/footprints.png b/gfx/pokedex/footprints.png new file mode 100644 index 000000000..b1e350436 Binary files /dev/null and b/gfx/pokedex/footprints.png differ 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/pokegear/fast_ship.png b/gfx/pokegear/fast_ship.png new file mode 100644 index 000000000..e92f00f55 Binary files /dev/null and b/gfx/pokegear/fast_ship.png differ diff --git a/gfx/pokegear/flymap_label_border.1bpp b/gfx/pokegear/flymap_label_border.1bpp new file mode 100644 index 000000000..671aab1d7 Binary files /dev/null and b/gfx/pokegear/flymap_label_border.1bpp differ diff --git a/gfx/pokegear/johto.bin b/gfx/pokegear/johto.bin new file mode 100644 index 000000000..faa5efe70 Binary files /dev/null and b/gfx/pokegear/johto.bin differ diff --git a/gfx/pokegear/kanto.bin b/gfx/pokegear/kanto.bin new file mode 100644 index 000000000..8a08cd826 Binary files /dev/null and b/gfx/pokegear/kanto.bin differ diff --git a/gfx/pokegear/pokegear.2bpp.lz.42315ab4 b/gfx/pokegear/pokegear.2bpp.lz.42315ab4 new file mode 100644 index 000000000..df312a51b Binary files /dev/null and b/gfx/pokegear/pokegear.2bpp.lz.42315ab4 differ diff --git a/gfx/pokegear/pokegear.png b/gfx/pokegear/pokegear.png new file mode 100644 index 000000000..78774a260 Binary files /dev/null and b/gfx/pokegear/pokegear.png differ diff --git a/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f new file mode 100644 index 000000000..b5af62d28 Binary files /dev/null and b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f differ diff --git a/gfx/pokegear/pokegear_sprites.png b/gfx/pokegear/pokegear_sprites.png new file mode 100644 index 000000000..746d4b486 Binary files /dev/null and b/gfx/pokegear/pokegear_sprites.png differ diff --git a/gfx/pokegear/town_map.2bpp.lz.c0587c86 b/gfx/pokegear/town_map.2bpp.lz.c0587c86 new file mode 100644 index 000000000..c807a372f Binary files /dev/null and b/gfx/pokegear/town_map.2bpp.lz.c0587c86 differ diff --git a/gfx/pokegear/town_map.png b/gfx/pokegear/town_map.png new file mode 100644 index 000000000..6e7af59d0 Binary files /dev/null and b/gfx/pokegear/town_map.png differ diff --git a/gfx/shrink/shrink1.2bpp.lz.d4443930 b/gfx/shrink/shrink1.2bpp.lz.d4443930 new file mode 100644 index 000000000..284bee8c2 Binary files /dev/null and b/gfx/shrink/shrink1.2bpp.lz.d4443930 differ diff --git a/gfx/shrink/shrink1.png b/gfx/shrink/shrink1.png new file mode 100644 index 000000000..6cf5b8077 Binary files /dev/null and b/gfx/shrink/shrink1.png differ diff --git a/gfx/shrink/shrink2.2bpp.lz.3f58480a b/gfx/shrink/shrink2.2bpp.lz.3f58480a new file mode 100644 index 000000000..df14d5ed4 Binary files /dev/null and b/gfx/shrink/shrink2.2bpp.lz.3f58480a differ diff --git a/gfx/shrink/shrink2.png b/gfx/shrink/shrink2.png new file mode 100644 index 000000000..276b4e7c7 Binary files /dev/null and b/gfx/shrink/shrink2.png differ diff --git a/gfx/shrink1.2bpp.lz.d4443930 b/gfx/shrink1.2bpp.lz.d4443930 deleted file mode 100644 index 284bee8c2..000000000 Binary files a/gfx/shrink1.2bpp.lz.d4443930 and /dev/null differ diff --git a/gfx/shrink1.png b/gfx/shrink1.png deleted file mode 100644 index 6cf5b8077..000000000 Binary files a/gfx/shrink1.png and /dev/null differ diff --git a/gfx/shrink2.2bpp.lz.3f58480a b/gfx/shrink2.2bpp.lz.3f58480a deleted file mode 100644 index df14d5ed4..000000000 Binary files a/gfx/shrink2.2bpp.lz.3f58480a and /dev/null differ diff --git a/gfx/shrink2.png b/gfx/shrink2.png deleted file mode 100644 index 276b4e7c7..000000000 Binary files a/gfx/shrink2.png and /dev/null differ diff --git a/gfx/slots.tilemap b/gfx/slots.tilemap deleted file mode 100644 index 5e920ed54..000000000 Binary files a/gfx/slots.tilemap and /dev/null differ diff --git a/gfx/slots/slots.tilemap b/gfx/slots/slots.tilemap new file mode 100644 index 000000000..5e920ed54 Binary files /dev/null and b/gfx/slots/slots.tilemap differ diff --git a/gfx/slots/slots_1.2bpp.lz.b22ddc13 b/gfx/slots/slots_1.2bpp.lz.b22ddc13 new file mode 100644 index 000000000..90d3ce139 Binary files /dev/null and b/gfx/slots/slots_1.2bpp.lz.b22ddc13 differ diff --git a/gfx/slots/slots_1.png b/gfx/slots/slots_1.png new file mode 100644 index 000000000..a10340844 Binary files /dev/null and b/gfx/slots/slots_1.png differ diff --git a/gfx/slots/slots_2.2bpp.lz.b28f76e3 b/gfx/slots/slots_2.2bpp.lz.b28f76e3 new file mode 100644 index 000000000..638c68055 Binary files /dev/null and b/gfx/slots/slots_2.2bpp.lz.b28f76e3 differ diff --git a/gfx/slots/slots_2.png b/gfx/slots/slots_2.png new file mode 100644 index 000000000..aa1292ccb Binary files /dev/null and b/gfx/slots/slots_2.png differ diff --git a/gfx/slots/slots_3.2bpp.lz.70c2984c b/gfx/slots/slots_3.2bpp.lz.70c2984c new file mode 100644 index 000000000..858b6e464 Binary files /dev/null and b/gfx/slots/slots_3.2bpp.lz.70c2984c differ diff --git a/gfx/slots/slots_3.png b/gfx/slots/slots_3.png new file mode 100644 index 000000000..456e9b6bf Binary files /dev/null and b/gfx/slots/slots_3.png differ diff --git a/gfx/slots_1.2bpp.lz.b22ddc13 b/gfx/slots_1.2bpp.lz.b22ddc13 deleted file mode 100644 index 90d3ce139..000000000 Binary files a/gfx/slots_1.2bpp.lz.b22ddc13 and /dev/null differ diff --git a/gfx/slots_1.png b/gfx/slots_1.png deleted file mode 100644 index a10340844..000000000 Binary files a/gfx/slots_1.png and /dev/null differ diff --git a/gfx/slots_2.2bpp.lz.b28f76e3 b/gfx/slots_2.2bpp.lz.b28f76e3 deleted file mode 100644 index 638c68055..000000000 Binary files a/gfx/slots_2.2bpp.lz.b28f76e3 and /dev/null differ diff --git a/gfx/slots_2.png b/gfx/slots_2.png deleted file mode 100644 index aa1292ccb..000000000 Binary files a/gfx/slots_2.png and /dev/null differ diff --git a/gfx/slots_3.2bpp.lz.70c2984c b/gfx/slots_3.2bpp.lz.70c2984c deleted file mode 100644 index 858b6e464..000000000 Binary files a/gfx/slots_3.2bpp.lz.70c2984c and /dev/null differ diff --git a/gfx/slots_3.png b/gfx/slots_3.png deleted file mode 100755 index 456e9b6bf..000000000 Binary files a/gfx/slots_3.png and /dev/null differ diff --git a/gfx/splash/copyright.png b/gfx/splash/copyright.png new file mode 100644 index 000000000..023bb93dd Binary files /dev/null and b/gfx/splash/copyright.png differ diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water.png deleted file mode 100644 index 0aa2640c9..000000000 Binary files a/gfx/tilesets/water.png and /dev/null differ diff --git a/gfx/tilesets/water/water.png b/gfx/tilesets/water/water.png new file mode 100644 index 000000000..0aa2640c9 Binary files /dev/null and b/gfx/tilesets/water/water.png differ diff --git a/gfx/trainer_card/badges.png b/gfx/trainer_card/badges.png new file mode 100644 index 000000000..4e5820da8 Binary files /dev/null and b/gfx/trainer_card/badges.png differ diff --git a/gfx/trainer_card/card_right_corner.png b/gfx/trainer_card/card_right_corner.png new file mode 100644 index 000000000..fa9aea024 Binary files /dev/null and b/gfx/trainer_card/card_right_corner.png differ diff --git a/gfx/trainer_card/card_status.png b/gfx/trainer_card/card_status.png new file mode 100644 index 000000000..b33bb2029 Binary files /dev/null and b/gfx/trainer_card/card_status.png differ diff --git a/gfx/trainer_card/chris_card.png b/gfx/trainer_card/chris_card.png new file mode 100644 index 000000000..977981d41 Binary files /dev/null and b/gfx/trainer_card/chris_card.png differ diff --git a/gfx/trainer_card/kris_card.png b/gfx/trainer_card/kris_card.png new file mode 100644 index 000000000..2ffa11159 Binary files /dev/null and b/gfx/trainer_card/kris_card.png differ diff --git a/gfx/trainer_card/leaders.png b/gfx/trainer_card/leaders.png new file mode 100644 index 000000000..6e7eb0f8d Binary files /dev/null and b/gfx/trainer_card/leaders.png differ diff --git a/gfx/trainer_card/trainer_card.png b/gfx/trainer_card/trainer_card.png new file mode 100644 index 000000000..88ce35bca Binary files /dev/null and b/gfx/trainer_card/trainer_card.png differ 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 -- cgit v1.2.3