From d5089d3c623e2b147b035cf12569810d604bf47d Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 27 Jun 2020 16:27:30 -0400 Subject: [PATCH] Organize gfx/ --- .gitattributes | 2 +- Makefile | 21 ++++--- data/sgb_border.asm | 8 +-- engine/HoF_room_pc.asm | 2 +- engine/battle/animations.asm | 10 ++-- engine/battle/battle_transitions.asm | 2 +- engine/battle/draw_hud_pokeball_gfx.asm | 2 +- engine/gamefreak.asm | 2 +- engine/intro.asm | 24 ++++---- engine/menu/draw_badges.asm | 2 +- engine/menu/naming_screen.asm | 2 +- engine/menu/status_screen.asm | 4 +- engine/mon_party_sprites.asm | 2 +- engine/overworld/emotion_bubbles.asm | 10 ++-- engine/overworld/healing_machine.asm | 2 +- engine/overworld/ledges.asm | 2 +- engine/overworld/ssanne.asm | 2 +- engine/slot_machine.asm | 6 +- engine/town_map.asm | 9 ++- gfx/attack_anim_1.png | Bin 1042 -> 0 bytes gfx/attack_anim_2.png | Bin 999 -> 0 bytes gfx/battle/attack_anim_1.png | Bin 0 -> 977 bytes gfx/battle/attack_anim_2.png | Bin 0 -> 936 bytes gfx/battle/balls.png | Bin 0 -> 115 bytes gfx/battle/battle_hud_1.png | Bin 0 -> 102 bytes gfx/battle/battle_hud_2.png | Bin 0 -> 88 bytes gfx/battle/battle_hud_3.png | Bin 0 -> 93 bytes .../minimize.png} | Bin gfx/battle_hud1.png | Bin 94 -> 0 bytes gfx/battle_hud2.png | Bin 79 -> 0 bytes gfx/battle_hud3.png | Bin 88 -> 0 bytes gfx/emotes/happy.png | Bin 0 -> 125 bytes gfx/emotes/question.png | Bin 0 -> 124 bytes gfx/emotes/shock.png | Bin 0 -> 110 bytes gfx/emotion_bubbles.png | Bin 149 -> 0 bytes gfx/{ => font}/AB.png | Bin gfx/{ED_tile.png => font/ED.png} | Bin gfx/{p_tile.png => font/P.png} | Bin gfx/{ => font}/font.png | Bin gfx/font/font_battle_extra.png | Bin 0 -> 252 bytes gfx/font/font_extra.png | Bin 0 -> 283 bytes gfx/hp_bar_and_status.png | Bin 262 -> 0 bytes .../blue_jigglypuff_1.png} | Bin .../blue_jigglypuff_2.png} | Bin .../blue_jigglypuff_3.png} | Bin gfx/{ => intro_credits}/copyright.png | Bin gfx/{ => intro_credits}/falling_star.png | Bin gfx/{ => intro_credits}/gamefreak_logo.png | Bin .../gamefreak_presents.png} | Bin gfx/intro_credits/gengar.png | Bin 0 -> 1082 bytes .../red_nidorino_1.png} | Bin .../red_nidorino_2.png} | Bin .../red_nidorino_3.png} | Bin gfx/{theend.png => intro_credits/the_end.png} | Bin gfx/intro_fight.png | Bin 1099 -> 0 bytes gfx/{ => overworld}/battle_transition.png | Bin .../fishing_rod.png} | Bin .../heal_machine.png} | Bin .../red_fish_back.png} | Bin .../red_fish_front.png} | Bin .../red_fish_side.png} | Bin .../shadow.png} | Bin .../smoke.png} | Bin .../spinners.png} | Bin gfx/pokeball.png | Bin 124 -> 0 bytes gfx/{ => pokedex}/mon_nest_icon.png | Bin gfx/{ => pokedex}/pokedex.png | Bin .../sgbborder.png => sgb/blue_border.png} | Bin .../sgbborder.map => sgb/blue_border.tilemap} | Bin gfx/{red/sgbborder.png => sgb/red_border.png} | Bin .../sgbborder.map => sgb/red_border.tilemap} | Bin .../blue_slots_1.png} | Bin .../blue_slots_2.png} | Bin .../red_slots_1.png} | Bin .../red_slots_2.png} | Bin .../slotmachine.map => slots/slots.tilemap} | Bin 240 -> 236 bytes gfx/text_box.png | Bin 295 -> 0 bytes .../blue_version.png} | Bin .../gamefreak_inc.png} | Bin gfx/{player_title.png => title/player.png} | Bin gfx/{ => title}/pokemon_logo.png | Bin .../red_version.png} | Bin gfx/{ => town_map}/town_map.png | Bin gfx/{ => town_map}/town_map.rle | Bin gfx/{ => town_map}/town_map_cursor.png | Bin gfx/{ => town_map}/up_arrow.png | Bin gfx/{trade2.png => trade/cable_ball.png} | Bin gfx/{ => trade}/game_boy.png | Bin gfx/{ => trade}/link_cable.png | Bin gfx/{ => trade}/mon_ow_sprites.png | Bin gfx/{ => trainer_card}/badge_numbers.png | Bin gfx/{ => trainer_card}/badges.png | Bin gfx/{ => trainer_card}/blank_leader_names.png | Bin gfx/{ => trainer_card}/circle_tile.png | Bin gfx/{ => trainer_card}/trainer_info.png | Bin gfx/yellow/slotmachine1.png | Bin 470 -> 0 bytes gfx/yellow/slotmachine2.png | Bin 379 -> 0 bytes main.asm | 52 +++++++++--------- scripts/RocketHideoutB2F.asm | 2 +- tilesets.asm | 2 +- 100 files changed, 87 insertions(+), 83 deletions(-) delete mode 100644 gfx/attack_anim_1.png delete mode 100644 gfx/attack_anim_2.png create mode 100644 gfx/battle/attack_anim_1.png create mode 100644 gfx/battle/attack_anim_2.png create mode 100644 gfx/battle/balls.png create mode 100644 gfx/battle/battle_hud_1.png create mode 100644 gfx/battle/battle_hud_2.png create mode 100644 gfx/battle/battle_hud_3.png rename gfx/{minimized_mon_sprite.png => battle/minimize.png} (100%) delete mode 100644 gfx/battle_hud1.png delete mode 100644 gfx/battle_hud2.png delete mode 100644 gfx/battle_hud3.png create mode 100644 gfx/emotes/happy.png create mode 100644 gfx/emotes/question.png create mode 100644 gfx/emotes/shock.png delete mode 100644 gfx/emotion_bubbles.png rename gfx/{ => font}/AB.png (100%) rename gfx/{ED_tile.png => font/ED.png} (100%) rename gfx/{p_tile.png => font/P.png} (100%) rename gfx/{ => font}/font.png (100%) create mode 100644 gfx/font/font_battle_extra.png create mode 100644 gfx/font/font_extra.png delete mode 100644 gfx/hp_bar_and_status.png rename gfx/{blue/intro_purin_1.png => intro_credits/blue_jigglypuff_1.png} (100%) rename gfx/{blue/intro_purin_2.png => intro_credits/blue_jigglypuff_2.png} (100%) rename gfx/{blue/intro_purin_3.png => intro_credits/blue_jigglypuff_3.png} (100%) rename gfx/{ => intro_credits}/copyright.png (100%) rename gfx/{ => intro_credits}/falling_star.png (100%) rename gfx/{ => intro_credits}/gamefreak_logo.png (100%) rename gfx/{gamefreak_intro.png => intro_credits/gamefreak_presents.png} (100%) create mode 100644 gfx/intro_credits/gengar.png rename gfx/{red/intro_nido_1.png => intro_credits/red_nidorino_1.png} (100%) rename gfx/{red/intro_nido_2.png => intro_credits/red_nidorino_2.png} (100%) rename gfx/{red/intro_nido_3.png => intro_credits/red_nidorino_3.png} (100%) rename gfx/{theend.png => intro_credits/the_end.png} (100%) delete mode 100644 gfx/intro_fight.png rename gfx/{ => overworld}/battle_transition.png (100%) rename gfx/{red_fishingrod_tiles.png => overworld/fishing_rod.png} (100%) rename gfx/{pokecenter_ball.png => overworld/heal_machine.png} (100%) rename gfx/{red_fishing_tile_back.png => overworld/red_fish_back.png} (100%) rename gfx/{red_fishing_tile_front.png => overworld/red_fish_front.png} (100%) rename gfx/{red_fishing_tile_side.png => overworld/red_fish_side.png} (100%) rename gfx/{ledge_hopping_shadow.png => overworld/shadow.png} (100%) rename gfx/{ss_anne_smoke_puff.png => overworld/smoke.png} (100%) rename gfx/{spinner_arrow.png => overworld/spinners.png} (100%) delete mode 100644 gfx/pokeball.png rename gfx/{ => pokedex}/mon_nest_icon.png (100%) rename gfx/{ => pokedex}/pokedex.png (100%) rename gfx/{blue/sgbborder.png => sgb/blue_border.png} (100%) rename gfx/{blue/sgbborder.map => sgb/blue_border.tilemap} (100%) rename gfx/{red/sgbborder.png => sgb/red_border.png} (100%) rename gfx/{red/sgbborder.map => sgb/red_border.tilemap} (100%) rename gfx/{blue/slotmachine1.png => slots/blue_slots_1.png} (100%) rename gfx/{blue/slotmachine2.png => slots/blue_slots_2.png} (100%) rename gfx/{red/slotmachine1.png => slots/red_slots_1.png} (100%) rename gfx/{red/slotmachine2.png => slots/red_slots_2.png} (100%) rename gfx/{tilemaps/slotmachine.map => slots/slots.tilemap} (52%) delete mode 100644 gfx/text_box.png rename gfx/{blue/blueversion.png => title/blue_version.png} (100%) rename gfx/{gamefreak.png => title/gamefreak_inc.png} (100%) rename gfx/{player_title.png => title/player.png} (100%) rename gfx/{ => title}/pokemon_logo.png (100%) rename gfx/{red/redgreenversion.png => title/red_version.png} (100%) rename gfx/{ => town_map}/town_map.png (100%) rename gfx/{ => town_map}/town_map.rle (100%) rename gfx/{ => town_map}/town_map_cursor.png (100%) rename gfx/{ => town_map}/up_arrow.png (100%) rename gfx/{trade2.png => trade/cable_ball.png} (100%) rename gfx/{ => trade}/game_boy.png (100%) rename gfx/{ => trade}/link_cable.png (100%) rename gfx/{ => trade}/mon_ow_sprites.png (100%) rename gfx/{ => trainer_card}/badge_numbers.png (100%) rename gfx/{ => trainer_card}/badges.png (100%) rename gfx/{ => trainer_card}/blank_leader_names.png (100%) rename gfx/{ => trainer_card}/circle_tile.png (100%) rename gfx/{ => trainer_card}/trainer_info.png (100%) delete mode 100644 gfx/yellow/slotmachine1.png delete mode 100644 gfx/yellow/slotmachine2.png diff --git a/.gitattributes b/.gitattributes index bc973be03..4f4d8c388 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,7 @@ *.rle binary *.tilecoll binary *.bst binary -*.map binary +*.tilemap binary *.wav binary *.blk binary *.pic binary diff --git a/Makefile b/Makefile index 59e593e88..2b0770825 100644 --- a/Makefile +++ b/Makefile @@ -83,17 +83,22 @@ pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" ### Misc file-specific graphics rules -gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h -gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h -gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h -gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h -gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h -gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h +gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace +gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace + +gfx/intro_credits/blue_jigglypuff_1.2bpp: $(RGBGFX) += -h +gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h +gfx/intro_credits/blue_jigglypuff_3.2bpp: $(RGBGFX) += -h +gfx/intro_credits/red_nidorino_1.2bpp: $(RGBGFX) += -h +gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h +gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h + +gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$< -gfx/game_boy.2bpp: tools/gfx += --remove-duplicates -gfx/theend.2bpp: tools/gfx += --interleave --png=$< gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace +gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates + ### Catch-all graphics rules diff --git a/data/sgb_border.asm b/data/sgb_border.asm index c2afc193e..aa11a3265 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,9 +1,9 @@ BorderPalettes: IF DEF(_RED) - INCBIN "gfx/red/sgbborder.map" + INCBIN "gfx/sgb/red_border.tilemap" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/sgbborder.map" + INCBIN "gfx/sgb/blue_border.tilemap" ENDC ds $100 @@ -55,8 +55,8 @@ ENDC SGBBorderGraphics: IF DEF(_RED) - INCBIN "gfx/red/sgbborder.2bpp" + INCBIN "gfx/sgb/red_border.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/sgbborder.2bpp" + INCBIN "gfx/sgb/blue_border.2bpp" ENDC diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 7e08631cc..f820aae3f 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -266,5 +266,5 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" TheEndGfx: - INCBIN "gfx/theend.2bpp" + INCBIN "gfx/intro_credits/the_end.2bpp" TheEndGfxEnd: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 9eb7badbf..fcc3c99f2 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -361,17 +361,17 @@ AnimationTilesetPointers: db $FF AnimationTileset1: - INCBIN "gfx/attack_anim_1.2bpp" + INCBIN "gfx/battle/attack_anim_1.2bpp" AnimationTileset2: - INCBIN "gfx/attack_anim_2.2bpp" + INCBIN "gfx/battle/attack_anim_2.2bpp" SlotMachineTiles2: IF DEF(_RED) - INCBIN "gfx/red/slotmachine2.2bpp" + INCBIN "gfx/slots/red_slots_2.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine2.2bpp" + INCBIN "gfx/slots/blue_slots_2.2bpp" ENDC MoveAnimation: @@ -1710,7 +1710,7 @@ AnimationMinimizeMon: jp AnimationShowMonPic MinimizedMonSprite: - INCBIN "gfx/minimized_mon_sprite.1bpp" + INCBIN "gfx/battle/minimize.1bpp" MinimizedMonSpriteEnd: AnimationSlideMonDownAndHide: diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index f2e26ed54..62b023b03 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -160,7 +160,7 @@ LoadBattleTransitionTile: jp CopyVideoData BattleTransitionTile: - INCBIN "gfx/battle_transition.2bpp" + INCBIN "gfx/overworld/battle_transition.2bpp" BattleTransitionTileEnd: BattleTransition_BlackScreen: diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 323dd167b..c0a919490 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -188,5 +188,5 @@ SetupPlayerAndEnemyPokeballs: ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon) PokeballTileGraphics:: - INCBIN "gfx/pokeball.2bpp" + INCBIN "gfx/battle/balls.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 5226072b1..78e48384a 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -239,5 +239,5 @@ GameFreakShootingStarOAMData: GameFreakShootingStarOAMDataEnd: FallingStar: - INCBIN "gfx/falling_star.2bpp" + INCBIN "gfx/intro_credits/falling_star.2bpp" FallingStarEnd: diff --git a/engine/intro.asm b/engine/intro.asm index a016b3653..9a13c96f1 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -438,35 +438,33 @@ IntroNidorinoAnimation7: db ANIMATION_END GameFreakIntro: - INCBIN "gfx/gamefreak_intro.2bpp" - INCBIN "gfx/gamefreak_logo.2bpp" - rept 16 - db $00 ; blank tile - endr + INCBIN "gfx/intro_credits/gamefreak_presents.2bpp" + INCBIN "gfx/intro_credits/gamefreak_logo.2bpp" + ds 16, $00 ; blank tile GameFreakIntroEnd: FightIntroBackMon: - INCBIN "gfx/intro_fight.2bpp" + INCBIN "gfx/intro_credits/gengar.2bpp" FightIntroBackMonEnd: FightIntroFrontMon: IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.2bpp" + INCBIN "gfx/intro_credits/red_nidorino_1.2bpp" FightIntroFrontMon2: - INCBIN "gfx/red/intro_nido_2.2bpp" + INCBIN "gfx/intro_credits/red_nidorino_2.2bpp" FightIntroFrontMon3: - INCBIN "gfx/red/intro_nido_3.2bpp" + INCBIN "gfx/intro_credits/red_nidorino_3.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.2bpp" + INCBIN "gfx/intro_credits/blue_jigglypuff_1.2bpp" FightIntroFrontMon2: - INCBIN "gfx/blue/intro_purin_2.2bpp" + INCBIN "gfx/intro_credits/blue_jigglypuff_2.2bpp" FightIntroFrontMon3: - INCBIN "gfx/blue/intro_purin_3.2bpp" + INCBIN "gfx/intro_credits/blue_jigglypuff_3.2bpp" ENDC FightIntroFrontMonEnd: - ds $10 ; blank tile + ds 16, $00 ; blank tile diff --git a/engine/menu/draw_badges.asm b/engine/menu/draw_badges.asm index 9e6262a08..1888e32f6 100644 --- a/engine/menu/draw_badges.asm +++ b/engine/menu/draw_badges.asm @@ -117,4 +117,4 @@ DrawBadges: db $20, $28, $30, $38, $40, $48, $50, $58 GymLeaderFaceAndBadgeTileGraphics: - INCBIN "gfx/badges.2bpp" + INCBIN "gfx/trainer_card/badges.2bpp" diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index e29739889..2b86d6f41 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -332,7 +332,7 @@ LoadEDTile: jp CopyVideoDataDouble ED_Tile: - INCBIN "gfx/ED_tile.1bpp" + INCBIN "gfx/font/ED.1bpp" ED_TileEnd: PrintAlphabet: diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index ef94f13c6..20bee0eef 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -241,8 +241,8 @@ DrawLineBox: ld [hl], $6f ; ← (halfarrow ending) ret -PTile: ; This is a single 1bpp "P" tile - INCBIN "gfx/p_tile.1bpp" +PTile: + INCBIN "gfx/font/P.1bpp" PTileEnd: PrintStatsBox: diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 1e0f9c59d..994f5086e 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -281,4 +281,4 @@ GetPartyMonSpriteID: INCLUDE "data/mon_party_sprites.asm" MonPartySprites: - INCBIN "gfx/mon_ow_sprites.2bpp" + INCBIN "gfx/trade/mon_ow_sprites.2bpp" diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index ac4276bdb..20309fc10 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -62,13 +62,15 @@ EmotionBubble: jp UpdateSprites EmotionBubblesPointerTable: - dw EmotionBubbles - dw EmotionBubbles + $40 - dw EmotionBubbles + $80 + dw ShockEmote + dw QuestionEmote + dw HappyEmote EmotionBubblesOAM: db $F8,$00,$F9,$00 db $FA,$00,$FB,$00 EmotionBubbles: - INCBIN "gfx/emotion_bubbles.2bpp" +ShockEmote: INCBIN "gfx/emotes/shock.2bpp" +QuestionEmote: INCBIN "gfx/emotes/question.2bpp" +HappyEmote: INCBIN "gfx/emotes/happy.2bpp" diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 73b3fa1f8..510f963be 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -63,7 +63,7 @@ AnimateHealingMachine: jp UpdateSprites PokeCenterFlashingMonitorAndHealBall: - INCBIN "gfx/pokecenter_ball.2bpp" + INCBIN "gfx/overworld/heal_machine.2bpp" PokeCenterOAMData: db $24,$34,$7C,$10 ; heal machine monitor diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index b0ec703a4..290c8c80b 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -68,7 +68,7 @@ LoadHoppingShadowOAM: ret LedgeHoppingShadow: - INCBIN "gfx/ledge_hopping_shadow.1bpp" + INCBIN "gfx/overworld/shadow.1bpp" LedgeHoppingShadowEnd: LedgeHoppingShadowOAM: diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index c226a5c5a..6c26b7121 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -89,5 +89,5 @@ LoadSmokeTile: jp CopyVideoData SSAnneSmokePuffTile: - INCBIN "gfx/ss_anne_smoke_puff.2bpp" + INCBIN "gfx/overworld/smoke.2bpp" SSAnneSmokePuffTileEnd: diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 3a46687f4..0a92c69bf 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -878,15 +878,15 @@ LoadSlotMachineTiles: jp SlotMachine_AnimWheel3 SlotMachineMap: - INCBIN "gfx/tilemaps/slotmachine.map" + INCBIN "gfx/slots/slots.tilemap" SlotMachineMapEnd: INCLUDE "data/slot_machine_wheels.asm" SlotMachineTiles1: IF DEF(_RED) - INCBIN "gfx/red/slotmachine1.2bpp" + INCBIN "gfx/slots/red_slots_1.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine1.2bpp" + INCBIN "gfx/slots/blue_slots_1.2bpp" ENDC diff --git a/engine/town_map.asm b/engine/town_map.asm index 1bb8d5613..9cc551613 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -106,7 +106,7 @@ DisplayTownMap: INCLUDE "data/town_map_order.asm" TownMapCursor: - INCBIN "gfx/town_map_cursor.1bpp" + INCBIN "gfx/town_map/town_map_cursor.1bpp" TownMapCursorEnd: LoadTownMap_Nest: @@ -271,7 +271,7 @@ BuildFlyLocationsList: ret TownMapUpArrow: - INCBIN "gfx/up_arrow.1bpp" + INCBIN "gfx/town_map/up_arrow.1bpp" TownMapUpArrowEnd: LoadTownMap: @@ -325,8 +325,7 @@ LoadTownMap: ret CompressedMap: -; you can decompress this file with the redrle program in the extras/ dir - INCBIN "gfx/town_map.rle" + INCBIN "gfx/town_map/town_map.rle" ExitTownMap: ; clear town map graphics data and load usual graphics data @@ -587,7 +586,7 @@ INCLUDE "data/town_map_entries.asm" INCLUDE "text/map_names.asm" MonNestIcon: - INCBIN "gfx/mon_nest_icon.1bpp" + INCBIN "gfx/pokedex/mon_nest_icon.1bpp" MonNestIconEnd: TownMapSpriteBlinkingAnimation:: diff --git a/gfx/attack_anim_1.png b/gfx/attack_anim_1.png deleted file mode 100644 index 12bd7aa2104bb2e53c03817302d62fd906c4db74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1042 zcmV+t1nv8YP)ZOfL&x9eorF>9Fbuy%qj_8M`{;c?OCx2N2W`5<=dBX0jQKK#6* zYb8(Q^QS)@M-YF5Q#0*s5@+ZYlu5tjHg8#Syl^H(qC96E&U`u(@uLczB7S~|=KL6Y zi|z(TD?Hxd)(Wq0=*g7jbIT8w6_1T|RzAaD8^w7>@*(yvCm-|dM2Rhbc)GoFqTIbR zM018NG`k$ex;ABdUHyl@)AX<@mqSYJL(8#IE*x=Ij}89O%)vHBWcS#zT=(c&J>T<{ zi>f>Cuy1Ig1M&Cy_h>ihvz3D-EA04DtK*r!N z(^@4nPuGJKjhJAbRd1O2_^AZjSCRt#9r}i_p?*o*R4`S{4#uaEr&Q!q%a@jY_u!L# zY5|KG(# zo+u>wn*NXDqQp3}lpSK&!Eg#`oxtwkK^a;3A+0LOud$<>QqTDPs*rq-Eo&h*)NOxL z33rvCficQ34H<(1NttL@&zwpXMRHX=P%BW3#$iS3)0$3EXEa4haXdWv(ePaDml8Vq zI@_kNRm)jvHN%e1?TQiJ&qHK1IK zfkTX*(|@4$RlkO)q>wvdWkcJ#T$-}4 zdIt9Jt`0cb=g9K*2x-=NLe!@(^I#N_NUoj29_Erg!(|P#NG;8xt9R0#>P0wugGB#L zf(i}G?&O!Kh0PHAirkRW*7i2uU&?zwk-bmrp6m7KkvK(fNly;0yD9%Fy%Mb*S`S|S z?yR{F#3xomNx*AMytByM0>^K0JgZL8HvWcR>eTP)RV-i9gDvs@53b>L3^2#k(*OVf M07*qoM6N<$f;AEa>i_@% diff --git a/gfx/attack_anim_2.png b/gfx/attack_anim_2.png deleted file mode 100644 index 57abbfdeb1e591dd6910318f789ea1899896c644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 999 zcmV=0o znB)e`!hJJVL+vaaH0W$K&Y^gfUG+=JoYZ5<19Q${ud5HCHB~y9$B-Fu|{coYHQTy zx#-R=ge6azh9_~9NJ~De2C1vXL^h+76Uc$*SI<+PZQZ{hDpBtg&NE}exR*;audCp( z7ugZ_!UDzSwVDnaWNRO4{;Xkpoo#;*w^L8^FBkY~jQ0z?=aYBwO(&+&B##v$l2c0H zP{C)9*!97w?&DrfyWJwn6~12O+B(r3a<6Z{)EU*;Y0ej`=~t!wqDN&G4aN+bzp9yA zvMM+Sp8WOW?ITNubl~EvE+WTJNY2&BP}=BkZbxV@ayR0o2G4o_RGm5J39lf36MjH> znHw*&my-O9JcGT4b;o%E`4qWLu0S+K<36TJ%*Z7~(FvZdpE&o;yU zvh-||*ZWeJzJGFW@%$edZhV-s+hDgyX@=rWekf-;Xww^}y-aO^+8B2Wdi6vGG=G$2 zN^vGXrR#>;vXV&}lk82BPU-w%#Nk!$`N@ezZMKf)s<(k-Pj_>#TnBb^DxCG}dCb0& z70w=2$NK*4sO8zttMMG}?_UL_JC^b9jf|5s|IeBE7`hvnP4;{mOGT837a{T2^4kxf<1eaLnUjYX0rl3D#ONYS^@9p7D(qaLC<{|5o% VKtl9pJyHMw002ovPDHLkV1g4Y<}&~Q diff --git a/gfx/battle/attack_anim_1.png b/gfx/battle/attack_anim_1.png new file mode 100644 index 0000000000000000000000000000000000000000..f37287378322376abc67a9bb5fac66d91007d23f GIT binary patch literal 977 zcmV;?11|iDP)tUs!rOYtMX#`5pAlo6gGBjwerGezL7VV(JW>aa0owlpSeA&&HrmG7h z0oSqhF1{9eh!#(QdK)Y-<(Dn*2H!5rw(Q}RdqMAu&@*NwAHfk_U3e~FcT+WcJRuE3T(7h{T9v> zX+Q0DJJUP2H!Fq35ZbD7^Kl`IFn4xwE~R~=)%yD7lmO0QGK8O1W8>ey$&{oar!W6#!^}gTyM&C%IM-VA!-DOUM|g{4E;td8&)Bu`{6sgLp;V& z5r&FQe*1N;kPcAU_{aXxJ3owVC*SH@yz|v9%D=Q!L-i$_Ahr5JmD<7m>zz|VN{C#U{?FG=!y*3Jru2~A=bLU~RSpkWS`O1p%W`r2uwFuzWUCqxD znL5gBBNi^I_rAc_PY}sB2FAoFtDuXmMomqL45TVBvnl}btEv$RF9r7t1s^k6xB|7r z@2WQXF0Ie#TV_I#M0tR^u`jTM;Fy6K*tBxf%ZMDTfCPYn{VIaL@1p*`(u#~s=pY@S z(|3e+;OGTO=#V1JDT1C;u1e@%(t-BeLX<}!`##RgFt`lhQQ=CU=ZD3Bswg3}x9f#h z4lYah!Q-*6p$|Y=ph&}}YeXre6oJbqf1T6BQxz$|ET{lU=RN_|ANd0Uc7L=S$$q?r%d@81FS(-P7aJVF7AcY&};sMFaEk_Hc)1a*cC1 zCAUcc(*vx3`Y7McY2eqlOjb}m&S8}R5zs=m1wYz+7eq0r$V;GU@0)%87*hH|3tB00000NkvXXu0mjfO+3pf literal 0 HcmV?d00001 diff --git a/gfx/battle/attack_anim_2.png b/gfx/battle/attack_anim_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6867d650fc11970a378cf0bbb245cddc48b73257 GIT binary patch literal 936 zcmV;Z16TZsP)ZUOe$aw-Z$;)ux=mBTsp%v$ehhwYO;0@_E!0PuR0mEL+I+Ruj{>fRmEJemxh3D zfw51D17uy>WG@zAW_z?BFnO2M|$t+0v0kBsJ5D5e?eY}?_ zR^q?zOHQC!TLV_+6q8*cQ2x5z){OJAlv@PEw_RY@wh%aF8B>VeMpN^UKo1g3vWeig zp5|Ia1dQ7Ec7gFR0n^55#R$gxvx*ionKmE=Ht7I|afBe-!;yVV^3nA5%9+qoco4%` z1;7QHLn4AAgw8+b{{qZ-Y(X!Pm_w@x4BYRy!VtnY0)D|^xpvF)_I6q$kOU0W7Z${R zS|gyia-Wx9R&A+Ueiuvj#CzI__7QmSj0+)xgZ>8<3y#0qW1v@7HH$V=-yofueCOj8E!ZwcZP1loBG7}(B2sCqaS=`VY z5<@U7>3XX{BbW{(_%VLHBxXDCr#{kefX1ZHWw&9IYX?3?U=TXq!$5opPrdsij>xly zY!$%Yk(vM#^5xj?!Dlvvo2@TKNTdaN$s4@j-+2}8uW}0E-R%b#04EhH#~>MYLduWY8MnE&=4B+ae&I7nM;80TRIM$^L5HiKWXNU0iK)(sMR&dD~J8sN+ z4P1;lz+Y_y56tB)z2b~Q=3MvIqwR|v7y)kte_fV0VPlPJwtU#Q8&&7iB!HKP+wq1r zda^qLclq#p|6#>~R2E>#2RJiN8n}u%!15sm<`#Gh@CiP>gC|?LxUrqpj-oeufEUwpf;yQtY3y_a~xHrwy4sAwuQulTz9Sp%j zm%1$&%HioWZCPN}3K0GeOb3sLraeCa$zIl_N+`Ynl6r==4Db(9(oizOfs*3@0000< KMNUMnLSTY260QLN literal 0 HcmV?d00001 diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png new file mode 100644 index 0000000000000000000000000000000000000000..21bb5e37250827a941a0ac2a3d2b6e26fab0cab1 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k1SA-~$L+cVq^vw$978H@CI8@O<*EPi|HJ&= zpWEj>O#ZWq($H OO!IX0b6Mw<&;$Tsiz;*g literal 0 HcmV?d00001 diff --git a/gfx/battle/battle_hud_1.png b/gfx/battle/battle_hud_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ed9d4a56002c4e60ce9a4aab165741300789c524 GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^5FVdQ&MBb@0Ab@G A)Bpeg literal 0 HcmV?d00001 diff --git a/gfx/battle/battle_hud_2.png b/gfx/battle/battle_hud_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6954b58c4f345540e2b5055ef60c113adfd066 GIT binary patch literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^5Irf%Q~loCIHj_8t?!B literal 0 HcmV?d00001 diff --git a/gfx/battle/battle_hud_3.png b/gfx/battle/battle_hud_3.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1c57f723439c2ca9076fab0eaeed67d3240226 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^5pGTof q-pTM!Is;QRTb%%F(tmd55H5y@9SWb8`1-qn^m)4axvX1I`7k3Jo562;hU=cfw@)VR`wPFVdQ&MBb@0GUr7DF6Tf diff --git a/gfx/battle_hud2.png b/gfx/battle_hud2.png deleted file mode 100644 index a5df75c8c3ded4a496ee5437de93be46e4bac78c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^96&6=2qYNZFKXNiq{KX3978y+Cs&+n;I&Kmao~eI c>ocbe2L28)MbXu-VnHfBUHx3vIVCg!0J<0y+yDRo diff --git a/gfx/battle_hud3.png b/gfx/battle_hud3.png deleted file mode 100644 index 00643de7b57dae50c0e1d053f1a620410654449d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^96&6=2qYNZFKXNiq~twa978y+C;vFl(4@eSXv^+g l##X2C-@e&)!dafl>C*gVw~tmv9Fw~reTr%7V!lA> XY1dUVtwKFwLFRh8`njxgN@xNAS79hN literal 0 HcmV?d00001 diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png new file mode 100644 index 0000000000000000000000000000000000000000..ef1d770b4f55aa1239eb65706b77feb7a5b1ae78 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJXHOT$kcwN$KelIGt!tC#;rYeW zAGY>Y+KZ%wh$9ycZgt>vDp|`=v^y+=u`_gaf{p-V7|*qD`J&hB+W!Cl@}If$?|;Vk WE=tkY!}fgv8SCll=d#Wzp$PyCt1RgN literal 0 HcmV?d00001 diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png new file mode 100644 index 0000000000000000000000000000000000000000..f15cf50fa3a9f31aff43864210169a1ad9ce4102 GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJQ%@JikcwN$KelIGt!tC#;rYeW zAGY>Y+KZ@#TRE&ZW{Db!uaQ{u_P*A-zdZl{zx>ZG^!qf?Jh?g1I(>FVdQ I&MBb@0K=pvO#lD@ literal 0 HcmV?d00001 diff --git a/gfx/emotion_bubbles.png b/gfx/emotion_bubbles.png deleted file mode 100644 index 31deacf46a2b655ca1342cb16f5d7f889ace812d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JsTfZe$B>F!OV4cNZ7|?*xwzWa z&1=@0&N-?|;TLr$#?ENcQY(^bS+J;blJ4*139{-F3Ma7MGOKRi(_bi)-+bwz^6w?q x^K1`n@b=}-{c*F~e5G;LEU|3y6~3!#zUwXAos(;EGQ|{RpQo#z%Q~loCIGlMHSPca diff --git a/gfx/AB.png b/gfx/font/AB.png similarity index 100% rename from gfx/AB.png rename to gfx/font/AB.png diff --git a/gfx/ED_tile.png b/gfx/font/ED.png similarity index 100% rename from gfx/ED_tile.png rename to gfx/font/ED.png diff --git a/gfx/p_tile.png b/gfx/font/P.png similarity index 100% rename from gfx/p_tile.png rename to gfx/font/P.png diff --git a/gfx/font.png b/gfx/font/font.png similarity index 100% rename from gfx/font.png rename to gfx/font/font.png diff --git a/gfx/font/font_battle_extra.png b/gfx/font/font_battle_extra.png new file mode 100644 index 0000000000000000000000000000000000000000..d00ae7bc377b0672d9823306409e579f09952093 GIT binary patch literal 252 zcmVh8{7$w`%Q4R?1t}3>p`_|_}f?u=Oe<0cXbob zBX1nl8ZtGUJUg~g0>|kzP#J&}g=9$az{E0?BQ#>MwFIFO{DiV&@FY7%6<47uRd(-Y zc;r`6Y{9K8;Z&a^vE1dvJ=xt$^IyMCtXFUA?E3***-_FN0ivS-0000$7Dmv9-w*?)) zK$wNrVKgc&me)U{Z}l7$3+c!EES2S|t)NPJD_GRW?n0s!W=Yj#11S{Ihs6diw*ro` z@T6~xJEZXrxj3zFyn(+~3{DCWT&M_N1z(9uDa;`92`uj}V4NEW@CxLfDoGHB$S^pL zVH?N-(tA$2bJl`W;Zyr2Z{Zh^;>d(Z0-i`bfUfDQP0q5YfH+5f0mC9kg(J@ndE0&{ hnVjVIE>U%!uq5x?nc?jHubu z9(MQbiFyitJN(AWRIAVWsP|g0c$xpqz~8vzjmk!CBeufAJ7FEDOo1T~S5MSrrrWpK zo=#s(+-^vc*NH4xnqwPCvck8!<4tBr*S5cTDP1s|$9xOOutd)k_iphHq>iIJOV diff --git a/gfx/blue/intro_purin_1.png b/gfx/intro_credits/blue_jigglypuff_1.png similarity index 100% rename from gfx/blue/intro_purin_1.png rename to gfx/intro_credits/blue_jigglypuff_1.png diff --git a/gfx/blue/intro_purin_2.png b/gfx/intro_credits/blue_jigglypuff_2.png similarity index 100% rename from gfx/blue/intro_purin_2.png rename to gfx/intro_credits/blue_jigglypuff_2.png diff --git a/gfx/blue/intro_purin_3.png b/gfx/intro_credits/blue_jigglypuff_3.png similarity index 100% rename from gfx/blue/intro_purin_3.png rename to gfx/intro_credits/blue_jigglypuff_3.png diff --git a/gfx/copyright.png b/gfx/intro_credits/copyright.png similarity index 100% rename from gfx/copyright.png rename to gfx/intro_credits/copyright.png diff --git a/gfx/falling_star.png b/gfx/intro_credits/falling_star.png similarity index 100% rename from gfx/falling_star.png rename to gfx/intro_credits/falling_star.png diff --git a/gfx/gamefreak_logo.png b/gfx/intro_credits/gamefreak_logo.png similarity index 100% rename from gfx/gamefreak_logo.png rename to gfx/intro_credits/gamefreak_logo.png diff --git a/gfx/gamefreak_intro.png b/gfx/intro_credits/gamefreak_presents.png similarity index 100% rename from gfx/gamefreak_intro.png rename to gfx/intro_credits/gamefreak_presents.png diff --git a/gfx/intro_credits/gengar.png b/gfx/intro_credits/gengar.png new file mode 100644 index 0000000000000000000000000000000000000000..99fcda8d31fc49e2aef68b9d9497aba99eb91675 GIT binary patch literal 1082 zcmV-A1jYM_P)Bx?WoVJOz|y4B|ElVhCExf@17uV7>sbPi(7!mZZz1~9bP$y!1z2nFvR~d zNI5oc74Bs#Rt@;t9I*2LF>Eq&Ys*#v$`C(KRRcueFn@v@UT*XkLA}V=NrI@^gd$uQ zDf9|eA0nbIVv!eh2?L_XLXK575kwn1Hbxn?04M}n+C!n)FQG0Ncv@hfX#b|) z0pN**F!x^xy__}-X>7aJnb@|z==W8mkd^x*p(B<2TI5}EhUlK(j-}dzHdboX1+9>3k=>9$Oz)&-C}&7Y3q)N7R8r1uMgB`ld1{nl z{ZbiH7~+vs+U_-cI4ZvPA!9HES)OKtra<>)GXvl)e7MQ)%u{A#9m%{%IaLC>BV_@= z9^zJ0w;qg8(4Mb)@PoF9=vw3+vOHDerS1}8mEi*S8%rX-JMskkUk{zy{r4ng>QX15 zAt=$gw)-e1OY+BIPYX1E7?@hru~t1H52&0ldjtFbMHmyf_rS90(lCT`0DkMyCb7Lb z)XHQ!XT@{0`M_-3I04|{DO~{@_Q7yvkdr#pTC+`uAxvZsP(<%NA zP1n{v7%;v4!5cM1vM}gODLO9Hi4LNmZC)_(Q)(C%YPV~o93twNu89>ecl1e+i*>4G zdKY^;D~F+}=YA-&8O^OM)_5?C4jneD-T84Avf8|dlIL_5#9i7%Op!XRLxu7EsWzd= zk&FvkQOS$&SlYST16}#w+y~(kf{)z74okHf>hNo6nWwH{h!bWism!vFZd@LazI;=L z_Y8gu0HG4T$l5%vZ+&(XqtU6oeZ3q2ev?Jsss@kE-Id4d6(Tq#k&kEStd5PykCW!T zTJE9MeO;w+vu%Mz2T$Zg9~*3co}-GsRxre5V+L;-rfK7@VoC{dqhM=7uNnrZhiPhn z7L#19K+?bILBoI!aEf!hNETr+v`dkeWS!3Wdxnh202q8n6e!Y>!IAz`TKh;DqJ2b0 zUiySAJ9xxCssUQGZPCh^t}KaKHA5Sw504b^4{!&BdYg}%82|tP07*qoM6N<$g1rFo AeEf5CRw=FS=!*%8hhLzT&zBNRy->>~kAO zfcXP%MZ|OfCxECzO;Y3+NJ(^chsm2g8DT*#-@e_Mo%d#lnTX#rul>3Cf!{a^z%@5l z*|~o?m?tf;;q^kV{A|3mEl~4YH>`a%U8xpmct>|@SLCa13o!3S!;RkYD{}|b$I7hS zgM8)hfK5(jtvxQLdEvct%)=sgK6j3E<-OL-rkZM>X`=6oeCXVOz0Y${E&0kDt;YlJ zg_#iDKgB^e9OJ(%hzt(mW4!?*0YhTo)AbH3>jV%+@*e)xKh{Smu^7EsI?fM=}xL}kl30Prij zA<@&8u?3)FytzAKiuP{@F@O_xZf?I}(w(mc0||;HKO8e1NeXY6-&g0j&3gK%1h8hl zK3zie#7ka~mYYR>ON>WTPk@H&xo*gQO&LAmM(nVLzT@ggl>H%ZW&qwn-%W9Ep3yz7 zD*$_u*jd`88I)@qv$oh!NI&nucv5%W;>bkKC@N!o_u=pb@pgM|PtqFD7* zBEa0xXO1t|nUIBx)aRNPYc#R~5Z-d`*j(w9Rh5}gj}_H^;hu805SakLH)f$nwMdG3 z{7yC1dG4}}DICJ_cZ8}!pSzmKYYmF7eLFpowJ{9Wk3xvpb*UPMpGg z$VEYoG5(j(WXwl=Tp^1ObAs8iKcyP?O-;*4QtzpD|1<0sfZGH{$XbSs7g||NBNxFb zDStYH0@B9JKbImF^Ky@*(V0(W*Z}ylxMNJS)=kxv!nna$vjITSWFlda;XgVb(e4;I z8WKa#1xV4W;iX$8y$%DJ zOn510|I#A>9T@^k<__m^e8F-|5@L>dcqG39V5BT#45d#3&VN$IU|hrV z@4%S?ohJ;;hXVx)vsfqm*dn39HjQ<)we;tF+kiLU^V_87zW;A{=Msxhf>;EP3OB=2 WQC;!H2Tj+3jP-Q&b6Mw<&;$T^>nD!@ diff --git a/gfx/mon_nest_icon.png b/gfx/pokedex/mon_nest_icon.png similarity index 100% rename from gfx/mon_nest_icon.png rename to gfx/pokedex/mon_nest_icon.png diff --git a/gfx/pokedex.png b/gfx/pokedex/pokedex.png similarity index 100% rename from gfx/pokedex.png rename to gfx/pokedex/pokedex.png diff --git a/gfx/blue/sgbborder.png b/gfx/sgb/blue_border.png similarity index 100% rename from gfx/blue/sgbborder.png rename to gfx/sgb/blue_border.png diff --git a/gfx/blue/sgbborder.map b/gfx/sgb/blue_border.tilemap similarity index 100% rename from gfx/blue/sgbborder.map rename to gfx/sgb/blue_border.tilemap diff --git a/gfx/red/sgbborder.png b/gfx/sgb/red_border.png similarity index 100% rename from gfx/red/sgbborder.png rename to gfx/sgb/red_border.png diff --git a/gfx/red/sgbborder.map b/gfx/sgb/red_border.tilemap similarity index 100% rename from gfx/red/sgbborder.map rename to gfx/sgb/red_border.tilemap diff --git a/gfx/blue/slotmachine1.png b/gfx/slots/blue_slots_1.png similarity index 100% rename from gfx/blue/slotmachine1.png rename to gfx/slots/blue_slots_1.png diff --git a/gfx/blue/slotmachine2.png b/gfx/slots/blue_slots_2.png similarity index 100% rename from gfx/blue/slotmachine2.png rename to gfx/slots/blue_slots_2.png diff --git a/gfx/red/slotmachine1.png b/gfx/slots/red_slots_1.png similarity index 100% rename from gfx/red/slotmachine1.png rename to gfx/slots/red_slots_1.png diff --git a/gfx/red/slotmachine2.png b/gfx/slots/red_slots_2.png similarity index 100% rename from gfx/red/slotmachine2.png rename to gfx/slots/red_slots_2.png diff --git a/gfx/tilemaps/slotmachine.map b/gfx/slots/slots.tilemap similarity index 52% rename from gfx/tilemaps/slotmachine.map rename to gfx/slots/slots.tilemap index 68807bbd1fddd7b0958913834ba0950ff32aae4b..8af0cdd36fdc1ad84f932c09a0cc42cc5779ca38 100644 GIT binary patch delta 18 Xcmeys_=a(U|HJ_Gi52P~@`MHeN?r$l delta 26 acmaFE_H1|q<$BN_m2mIto@ diff --git a/gfx/text_box.png b/gfx/text_box.png deleted file mode 100644 index 3673e74cd8931342355bd12934b8239be9a05c58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmV+?0oeYDP)sBXx`4M+Hf}*l@mW-QvGK9X9czt!P>|Fh3FN`i4uT!FZR6 z@dqEx2gElnh?%Q&Mg;^F9Y|>uHsCc-x76U1UOQc=!YiY}vo256c>vEw=WU z)$mIAj-lxu%@U7^#OqhDuG>mkc@Qlj3d0X!2^o?2O0vomsi38MRh>$qJJ1$Yfb6D# tbq?gQRd5m-6Nhcz5qF(U?=53c6a~)002ovPDHLkV1hE(e69ch diff --git a/gfx/blue/blueversion.png b/gfx/title/blue_version.png similarity index 100% rename from gfx/blue/blueversion.png rename to gfx/title/blue_version.png diff --git a/gfx/gamefreak.png b/gfx/title/gamefreak_inc.png similarity index 100% rename from gfx/gamefreak.png rename to gfx/title/gamefreak_inc.png diff --git a/gfx/player_title.png b/gfx/title/player.png similarity index 100% rename from gfx/player_title.png rename to gfx/title/player.png diff --git a/gfx/pokemon_logo.png b/gfx/title/pokemon_logo.png similarity index 100% rename from gfx/pokemon_logo.png rename to gfx/title/pokemon_logo.png diff --git a/gfx/red/redgreenversion.png b/gfx/title/red_version.png similarity index 100% rename from gfx/red/redgreenversion.png rename to gfx/title/red_version.png diff --git a/gfx/town_map.png b/gfx/town_map/town_map.png similarity index 100% rename from gfx/town_map.png rename to gfx/town_map/town_map.png diff --git a/gfx/town_map.rle b/gfx/town_map/town_map.rle similarity index 100% rename from gfx/town_map.rle rename to gfx/town_map/town_map.rle diff --git a/gfx/town_map_cursor.png b/gfx/town_map/town_map_cursor.png similarity index 100% rename from gfx/town_map_cursor.png rename to gfx/town_map/town_map_cursor.png diff --git a/gfx/up_arrow.png b/gfx/town_map/up_arrow.png similarity index 100% rename from gfx/up_arrow.png rename to gfx/town_map/up_arrow.png diff --git a/gfx/trade2.png b/gfx/trade/cable_ball.png similarity index 100% rename from gfx/trade2.png rename to gfx/trade/cable_ball.png diff --git a/gfx/game_boy.png b/gfx/trade/game_boy.png similarity index 100% rename from gfx/game_boy.png rename to gfx/trade/game_boy.png diff --git a/gfx/link_cable.png b/gfx/trade/link_cable.png similarity index 100% rename from gfx/link_cable.png rename to gfx/trade/link_cable.png diff --git a/gfx/mon_ow_sprites.png b/gfx/trade/mon_ow_sprites.png similarity index 100% rename from gfx/mon_ow_sprites.png rename to gfx/trade/mon_ow_sprites.png diff --git a/gfx/badge_numbers.png b/gfx/trainer_card/badge_numbers.png similarity index 100% rename from gfx/badge_numbers.png rename to gfx/trainer_card/badge_numbers.png diff --git a/gfx/badges.png b/gfx/trainer_card/badges.png similarity index 100% rename from gfx/badges.png rename to gfx/trainer_card/badges.png diff --git a/gfx/blank_leader_names.png b/gfx/trainer_card/blank_leader_names.png similarity index 100% rename from gfx/blank_leader_names.png rename to gfx/trainer_card/blank_leader_names.png diff --git a/gfx/circle_tile.png b/gfx/trainer_card/circle_tile.png similarity index 100% rename from gfx/circle_tile.png rename to gfx/trainer_card/circle_tile.png diff --git a/gfx/trainer_info.png b/gfx/trainer_card/trainer_info.png similarity index 100% rename from gfx/trainer_info.png rename to gfx/trainer_card/trainer_info.png diff --git a/gfx/yellow/slotmachine1.png b/gfx/yellow/slotmachine1.png deleted file mode 100644 index 335ce97c0e61ce4346f6a69a7656d2ac4a022314..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P)>m0004CHid%KPB0`LU)U`|B(8cAg z&W^&9!dr!U&TVXhZTN9}@}2LyIk}{Cnj}fiK|<$>!+mD+LhK!zcnnpu<@ent*rgo z{xYG*_8<1TiWGAD!?5x?8`*Fs6nj*UAhRJ-z zwz+Ub8SzL-DlX{0a2>wQ$XA9gIMI7O{cB9G)91Xk#m0fhdEP)E3}t~iSJp8v(&JEXtN+h zBcgOEh7xTSB}>613|sJKOtIJ7g#Cd+9b-M%7QW|Wu