From d5089d3c623e2b147b035cf12569810d604bf47d Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 27 Jun 2020 16:27:30 -0400 Subject: Organize gfx/ --- .gitattributes | 2 +- Makefile | 23 ++++++++------ 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/AB.png | Bin 90 -> 0 bytes gfx/ED_tile.png | Bin 79 -> 0 bytes gfx/attack_anim_1.png | Bin 1042 -> 0 bytes gfx/attack_anim_2.png | Bin 999 -> 0 bytes gfx/badge_numbers.png | Bin 135 -> 0 bytes gfx/badges.png | Bin 924 -> 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 gfx/battle/minimize.png | Bin 0 -> 74 bytes 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/battle_transition.png | Bin 68 -> 0 bytes gfx/blank_leader_names.png | Bin 73 -> 0 bytes gfx/blue/blueversion.png | Bin 116 -> 0 bytes gfx/blue/intro_purin_1.png | Bin 366 -> 0 bytes gfx/blue/intro_purin_2.png | Bin 360 -> 0 bytes gfx/blue/intro_purin_3.png | Bin 416 -> 0 bytes gfx/blue/sgbborder.map | Bin 1792 -> 0 bytes gfx/blue/sgbborder.png | Bin 1117 -> 0 bytes gfx/blue/slotmachine1.png | Bin 459 -> 0 bytes gfx/blue/slotmachine2.png | Bin 314 -> 0 bytes gfx/circle_tile.png | Bin 81 -> 0 bytes gfx/copyright.png | Bin 220 -> 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/falling_star.png | Bin 90 -> 0 bytes gfx/font.png | Bin 625 -> 0 bytes gfx/font/AB.png | Bin 0 -> 90 bytes gfx/font/ED.png | Bin 0 -> 79 bytes gfx/font/P.png | Bin 0 -> 77 bytes gfx/font/font.png | Bin 0 -> 625 bytes gfx/font/font_battle_extra.png | Bin 0 -> 252 bytes gfx/font/font_extra.png | Bin 0 -> 283 bytes gfx/game_boy.png | Bin 246 -> 0 bytes gfx/gamefreak.png | Bin 147 -> 0 bytes gfx/gamefreak_intro.png | Bin 180 -> 0 bytes gfx/gamefreak_logo.png | Bin 139 -> 0 bytes gfx/hp_bar_and_status.png | Bin 262 -> 0 bytes gfx/intro_credits/blue_jigglypuff_1.png | Bin 0 -> 366 bytes gfx/intro_credits/blue_jigglypuff_2.png | Bin 0 -> 360 bytes gfx/intro_credits/blue_jigglypuff_3.png | Bin 0 -> 416 bytes gfx/intro_credits/copyright.png | Bin 0 -> 220 bytes gfx/intro_credits/falling_star.png | Bin 0 -> 90 bytes gfx/intro_credits/gamefreak_logo.png | Bin 0 -> 139 bytes gfx/intro_credits/gamefreak_presents.png | Bin 0 -> 180 bytes gfx/intro_credits/gengar.png | Bin 0 -> 1082 bytes gfx/intro_credits/red_nidorino_1.png | Bin 0 -> 462 bytes gfx/intro_credits/red_nidorino_2.png | Bin 0 -> 449 bytes gfx/intro_credits/red_nidorino_3.png | Bin 0 -> 495 bytes gfx/intro_credits/the_end.png | Bin 0 -> 139 bytes gfx/intro_fight.png | Bin 1099 -> 0 bytes gfx/ledge_hopping_shadow.png | Bin 77 -> 0 bytes gfx/link_cable.png | Bin 207 -> 0 bytes gfx/minimized_mon_sprite.png | Bin 74 -> 0 bytes gfx/mon_nest_icon.png | Bin 80 -> 0 bytes gfx/mon_ow_sprites.png | Bin 324 -> 0 bytes gfx/overworld/battle_transition.png | Bin 0 -> 68 bytes gfx/overworld/fishing_rod.png | Bin 0 -> 108 bytes gfx/overworld/heal_machine.png | Bin 0 -> 93 bytes gfx/overworld/red_fish_back.png | Bin 0 -> 114 bytes gfx/overworld/red_fish_front.png | Bin 0 -> 107 bytes gfx/overworld/red_fish_side.png | Bin 0 -> 111 bytes gfx/overworld/shadow.png | Bin 0 -> 77 bytes gfx/overworld/smoke.png | Bin 0 -> 90 bytes gfx/overworld/spinners.png | Bin 0 -> 131 bytes gfx/p_tile.png | Bin 77 -> 0 bytes gfx/player_title.png | Bin 450 -> 0 bytes gfx/pokeball.png | Bin 124 -> 0 bytes gfx/pokecenter_ball.png | Bin 93 -> 0 bytes gfx/pokedex.png | Bin 179 -> 0 bytes gfx/pokedex/mon_nest_icon.png | Bin 0 -> 80 bytes gfx/pokedex/pokedex.png | Bin 0 -> 179 bytes gfx/pokemon_logo.png | Bin 926 -> 0 bytes gfx/red/intro_nido_1.png | Bin 462 -> 0 bytes gfx/red/intro_nido_2.png | Bin 449 -> 0 bytes gfx/red/intro_nido_3.png | Bin 495 -> 0 bytes gfx/red/redgreenversion.png | Bin 126 -> 0 bytes gfx/red/sgbborder.map | Bin 1792 -> 0 bytes gfx/red/sgbborder.png | Bin 1048 -> 0 bytes gfx/red/slotmachine1.png | Bin 471 -> 0 bytes gfx/red/slotmachine2.png | Bin 346 -> 0 bytes gfx/red_fishing_tile_back.png | Bin 114 -> 0 bytes gfx/red_fishing_tile_front.png | Bin 107 -> 0 bytes gfx/red_fishing_tile_side.png | Bin 111 -> 0 bytes gfx/red_fishingrod_tiles.png | Bin 108 -> 0 bytes gfx/sgb/blue_border.png | Bin 0 -> 1117 bytes gfx/sgb/blue_border.tilemap | Bin 0 -> 1792 bytes gfx/sgb/red_border.png | Bin 0 -> 1048 bytes gfx/sgb/red_border.tilemap | Bin 0 -> 1792 bytes gfx/slots/blue_slots_1.png | Bin 0 -> 459 bytes gfx/slots/blue_slots_2.png | Bin 0 -> 314 bytes gfx/slots/red_slots_1.png | Bin 0 -> 471 bytes gfx/slots/red_slots_2.png | Bin 0 -> 346 bytes gfx/slots/slots.tilemap | Bin 0 -> 236 bytes gfx/spinner_arrow.png | Bin 131 -> 0 bytes gfx/ss_anne_smoke_puff.png | Bin 90 -> 0 bytes gfx/text_box.png | Bin 295 -> 0 bytes gfx/theend.png | Bin 139 -> 0 bytes gfx/tilemaps/slotmachine.map | Bin 240 -> 0 bytes gfx/title/blue_version.png | Bin 0 -> 116 bytes gfx/title/gamefreak_inc.png | Bin 0 -> 147 bytes gfx/title/player.png | Bin 0 -> 450 bytes gfx/title/pokemon_logo.png | Bin 0 -> 926 bytes gfx/title/red_version.png | Bin 0 -> 126 bytes gfx/town_map.png | Bin 256 -> 0 bytes gfx/town_map.rle | Bin 171 -> 0 bytes gfx/town_map/town_map.png | Bin 0 -> 256 bytes gfx/town_map/town_map.rle | Bin 0 -> 171 bytes gfx/town_map/town_map_cursor.png | Bin 0 -> 82 bytes gfx/town_map/up_arrow.png | Bin 0 -> 80 bytes gfx/town_map_cursor.png | Bin 82 -> 0 bytes gfx/trade/cable_ball.png | Bin 0 -> 126 bytes gfx/trade/game_boy.png | Bin 0 -> 246 bytes gfx/trade/link_cable.png | Bin 0 -> 207 bytes gfx/trade/mon_ow_sprites.png | Bin 0 -> 324 bytes gfx/trade2.png | Bin 126 -> 0 bytes gfx/trainer_card/badge_numbers.png | Bin 0 -> 135 bytes gfx/trainer_card/badges.png | Bin 0 -> 924 bytes gfx/trainer_card/blank_leader_names.png | Bin 0 -> 73 bytes gfx/trainer_card/circle_tile.png | Bin 0 -> 81 bytes gfx/trainer_card/trainer_info.png | Bin 0 -> 175 bytes gfx/trainer_info.png | Bin 175 -> 0 bytes gfx/up_arrow.png | Bin 80 -> 0 bytes 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 +- 154 files changed, 88 insertions(+), 84 deletions(-) delete mode 100644 gfx/AB.png delete mode 100644 gfx/ED_tile.png delete mode 100644 gfx/attack_anim_1.png delete mode 100644 gfx/attack_anim_2.png delete mode 100644 gfx/badge_numbers.png delete mode 100644 gfx/badges.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 create mode 100644 gfx/battle/minimize.png delete mode 100644 gfx/battle_hud1.png delete mode 100644 gfx/battle_hud2.png delete mode 100644 gfx/battle_hud3.png delete mode 100644 gfx/battle_transition.png delete mode 100644 gfx/blank_leader_names.png delete mode 100644 gfx/blue/blueversion.png delete mode 100644 gfx/blue/intro_purin_1.png delete mode 100644 gfx/blue/intro_purin_2.png delete mode 100644 gfx/blue/intro_purin_3.png delete mode 100644 gfx/blue/sgbborder.map delete mode 100644 gfx/blue/sgbborder.png delete mode 100644 gfx/blue/slotmachine1.png delete mode 100644 gfx/blue/slotmachine2.png delete mode 100644 gfx/circle_tile.png delete mode 100644 gfx/copyright.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 delete mode 100644 gfx/falling_star.png delete mode 100644 gfx/font.png create mode 100644 gfx/font/AB.png create mode 100644 gfx/font/ED.png create mode 100644 gfx/font/P.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 delete mode 100644 gfx/game_boy.png delete mode 100644 gfx/gamefreak.png delete mode 100644 gfx/gamefreak_intro.png delete mode 100644 gfx/gamefreak_logo.png delete mode 100644 gfx/hp_bar_and_status.png create mode 100644 gfx/intro_credits/blue_jigglypuff_1.png create mode 100644 gfx/intro_credits/blue_jigglypuff_2.png create mode 100644 gfx/intro_credits/blue_jigglypuff_3.png create mode 100644 gfx/intro_credits/copyright.png create mode 100644 gfx/intro_credits/falling_star.png create mode 100644 gfx/intro_credits/gamefreak_logo.png create mode 100644 gfx/intro_credits/gamefreak_presents.png create mode 100644 gfx/intro_credits/gengar.png create mode 100644 gfx/intro_credits/red_nidorino_1.png create mode 100644 gfx/intro_credits/red_nidorino_2.png create mode 100644 gfx/intro_credits/red_nidorino_3.png create mode 100644 gfx/intro_credits/the_end.png delete mode 100644 gfx/intro_fight.png delete mode 100644 gfx/ledge_hopping_shadow.png delete mode 100644 gfx/link_cable.png delete mode 100644 gfx/minimized_mon_sprite.png delete mode 100644 gfx/mon_nest_icon.png delete mode 100644 gfx/mon_ow_sprites.png create mode 100644 gfx/overworld/battle_transition.png create mode 100644 gfx/overworld/fishing_rod.png create mode 100644 gfx/overworld/heal_machine.png create mode 100644 gfx/overworld/red_fish_back.png create mode 100644 gfx/overworld/red_fish_front.png create mode 100644 gfx/overworld/red_fish_side.png create mode 100644 gfx/overworld/shadow.png create mode 100644 gfx/overworld/smoke.png create mode 100644 gfx/overworld/spinners.png delete mode 100644 gfx/p_tile.png delete mode 100644 gfx/player_title.png delete mode 100644 gfx/pokeball.png delete mode 100644 gfx/pokecenter_ball.png delete mode 100644 gfx/pokedex.png create mode 100644 gfx/pokedex/mon_nest_icon.png create mode 100644 gfx/pokedex/pokedex.png delete mode 100644 gfx/pokemon_logo.png delete mode 100644 gfx/red/intro_nido_1.png delete mode 100644 gfx/red/intro_nido_2.png delete mode 100644 gfx/red/intro_nido_3.png delete mode 100644 gfx/red/redgreenversion.png delete mode 100644 gfx/red/sgbborder.map delete mode 100644 gfx/red/sgbborder.png delete mode 100644 gfx/red/slotmachine1.png delete mode 100644 gfx/red/slotmachine2.png delete mode 100644 gfx/red_fishing_tile_back.png delete mode 100644 gfx/red_fishing_tile_front.png delete mode 100644 gfx/red_fishing_tile_side.png delete mode 100644 gfx/red_fishingrod_tiles.png create mode 100644 gfx/sgb/blue_border.png create mode 100644 gfx/sgb/blue_border.tilemap create mode 100644 gfx/sgb/red_border.png create mode 100644 gfx/sgb/red_border.tilemap create mode 100644 gfx/slots/blue_slots_1.png create mode 100644 gfx/slots/blue_slots_2.png create mode 100644 gfx/slots/red_slots_1.png create mode 100644 gfx/slots/red_slots_2.png create mode 100644 gfx/slots/slots.tilemap delete mode 100644 gfx/spinner_arrow.png delete mode 100644 gfx/ss_anne_smoke_puff.png delete mode 100644 gfx/text_box.png delete mode 100644 gfx/theend.png delete mode 100644 gfx/tilemaps/slotmachine.map create mode 100644 gfx/title/blue_version.png create mode 100644 gfx/title/gamefreak_inc.png create mode 100644 gfx/title/player.png create mode 100644 gfx/title/pokemon_logo.png create mode 100644 gfx/title/red_version.png delete mode 100644 gfx/town_map.png delete mode 100755 gfx/town_map.rle create mode 100644 gfx/town_map/town_map.png create mode 100755 gfx/town_map/town_map.rle create mode 100644 gfx/town_map/town_map_cursor.png create mode 100644 gfx/town_map/up_arrow.png delete mode 100644 gfx/town_map_cursor.png create mode 100644 gfx/trade/cable_ball.png create mode 100644 gfx/trade/game_boy.png create mode 100644 gfx/trade/link_cable.png create mode 100644 gfx/trade/mon_ow_sprites.png delete mode 100644 gfx/trade2.png create mode 100644 gfx/trainer_card/badge_numbers.png create mode 100644 gfx/trainer_card/badges.png create mode 100644 gfx/trainer_card/blank_leader_names.png create mode 100644 gfx/trainer_card/circle_tile.png create mode 100644 gfx/trainer_card/trainer_info.png delete mode 100644 gfx/trainer_info.png delete mode 100644 gfx/up_arrow.png delete mode 100644 gfx/yellow/slotmachine1.png delete mode 100644 gfx/yellow/slotmachine2.png diff --git a/.gitattributes b/.gitattributes index bc973be0..4f4d8c38 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 59e593e8..2b077082 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/game_boy.2bpp: tools/gfx += --remove-duplicates -gfx/theend.2bpp: tools/gfx += --interleave --png=$< +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/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 c2afc193..aa11a326 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 7e08631c..f820aae3 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 9eb7badb..fcc3c99f 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 f2e26ed5..62b023b0 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 323dd167..c0a91949 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 5226072b..78e48384 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 a016b365..9a13c96f 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 9e6262a0..1888e32f 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 e2973988..2b86d6f4 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 ef94f13c..20bee0ee 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 1e0f9c59..994f5086 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 ac4276bd..20309fc1 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 73b3fa1f..510f963b 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 b0ec703a..290c8c80 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 c226a5c5..6c26b712 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 3a46687f..0a92c69b 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 1bb8d561..9cc55161 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/AB.png b/gfx/AB.png deleted file mode 100644 index 89ac01db..00000000 Binary files a/gfx/AB.png and /dev/null differ diff --git a/gfx/ED_tile.png b/gfx/ED_tile.png deleted file mode 100644 index 352489d6..00000000 Binary files a/gfx/ED_tile.png and /dev/null differ diff --git a/gfx/attack_anim_1.png b/gfx/attack_anim_1.png deleted file mode 100644 index 12bd7aa2..00000000 Binary files a/gfx/attack_anim_1.png and /dev/null differ diff --git a/gfx/attack_anim_2.png b/gfx/attack_anim_2.png deleted file mode 100644 index 57abbfde..00000000 Binary files a/gfx/attack_anim_2.png and /dev/null differ diff --git a/gfx/badge_numbers.png b/gfx/badge_numbers.png deleted file mode 100644 index c9283065..00000000 Binary files a/gfx/badge_numbers.png and /dev/null differ diff --git a/gfx/badges.png b/gfx/badges.png deleted file mode 100644 index 8b0fc516..00000000 Binary files a/gfx/badges.png and /dev/null differ diff --git a/gfx/battle/attack_anim_1.png b/gfx/battle/attack_anim_1.png new file mode 100644 index 00000000..f3728737 Binary files /dev/null and b/gfx/battle/attack_anim_1.png differ diff --git a/gfx/battle/attack_anim_2.png b/gfx/battle/attack_anim_2.png new file mode 100644 index 00000000..6867d650 Binary files /dev/null and b/gfx/battle/attack_anim_2.png differ diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png new file mode 100644 index 00000000..21bb5e37 Binary files /dev/null and b/gfx/battle/balls.png differ diff --git a/gfx/battle/battle_hud_1.png b/gfx/battle/battle_hud_1.png new file mode 100644 index 00000000..ed9d4a56 Binary files /dev/null and b/gfx/battle/battle_hud_1.png differ diff --git a/gfx/battle/battle_hud_2.png b/gfx/battle/battle_hud_2.png new file mode 100644 index 00000000..0f6954b5 Binary files /dev/null and b/gfx/battle/battle_hud_2.png differ diff --git a/gfx/battle/battle_hud_3.png b/gfx/battle/battle_hud_3.png new file mode 100644 index 00000000..fd1c57f7 Binary files /dev/null and b/gfx/battle/battle_hud_3.png differ diff --git a/gfx/battle/minimize.png b/gfx/battle/minimize.png new file mode 100644 index 00000000..35ca75cb Binary files /dev/null and b/gfx/battle/minimize.png differ diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png deleted file mode 100644 index 74e6361f..00000000 Binary files a/gfx/battle_hud1.png and /dev/null differ diff --git a/gfx/battle_hud2.png b/gfx/battle_hud2.png deleted file mode 100644 index a5df75c8..00000000 Binary files a/gfx/battle_hud2.png and /dev/null differ diff --git a/gfx/battle_hud3.png b/gfx/battle_hud3.png deleted file mode 100644 index 00643de7..00000000 Binary files a/gfx/battle_hud3.png and /dev/null differ diff --git a/gfx/battle_transition.png b/gfx/battle_transition.png deleted file mode 100644 index e2bd6299..00000000 Binary files a/gfx/battle_transition.png and /dev/null differ diff --git a/gfx/blank_leader_names.png b/gfx/blank_leader_names.png deleted file mode 100644 index 867a39fe..00000000 Binary files a/gfx/blank_leader_names.png and /dev/null differ diff --git a/gfx/blue/blueversion.png b/gfx/blue/blueversion.png deleted file mode 100644 index a9c87be8..00000000 Binary files a/gfx/blue/blueversion.png and /dev/null differ diff --git a/gfx/blue/intro_purin_1.png b/gfx/blue/intro_purin_1.png deleted file mode 100644 index 0e53582c..00000000 Binary files a/gfx/blue/intro_purin_1.png and /dev/null differ diff --git a/gfx/blue/intro_purin_2.png b/gfx/blue/intro_purin_2.png deleted file mode 100644 index 21107af0..00000000 Binary files a/gfx/blue/intro_purin_2.png and /dev/null differ diff --git a/gfx/blue/intro_purin_3.png b/gfx/blue/intro_purin_3.png deleted file mode 100644 index 1c30a0e8..00000000 Binary files a/gfx/blue/intro_purin_3.png and /dev/null differ diff --git a/gfx/blue/sgbborder.map b/gfx/blue/sgbborder.map deleted file mode 100644 index b0b0b94b..00000000 Binary files a/gfx/blue/sgbborder.map and /dev/null differ diff --git a/gfx/blue/sgbborder.png b/gfx/blue/sgbborder.png deleted file mode 100644 index 098df2b6..00000000 Binary files a/gfx/blue/sgbborder.png and /dev/null differ diff --git a/gfx/blue/slotmachine1.png b/gfx/blue/slotmachine1.png deleted file mode 100644 index 41ebfdea..00000000 Binary files a/gfx/blue/slotmachine1.png and /dev/null differ diff --git a/gfx/blue/slotmachine2.png b/gfx/blue/slotmachine2.png deleted file mode 100644 index ee8c688e..00000000 Binary files a/gfx/blue/slotmachine2.png and /dev/null differ diff --git a/gfx/circle_tile.png b/gfx/circle_tile.png deleted file mode 100644 index 64c00c9f..00000000 Binary files a/gfx/circle_tile.png and /dev/null differ diff --git a/gfx/copyright.png b/gfx/copyright.png deleted file mode 100644 index 49174349..00000000 Binary files a/gfx/copyright.png and /dev/null differ diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png new file mode 100644 index 00000000..dd65f4d1 Binary files /dev/null and b/gfx/emotes/happy.png differ diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png new file mode 100644 index 00000000..ef1d770b Binary files /dev/null and b/gfx/emotes/question.png differ diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png new file mode 100644 index 00000000..f15cf50f Binary files /dev/null and b/gfx/emotes/shock.png differ diff --git a/gfx/emotion_bubbles.png b/gfx/emotion_bubbles.png deleted file mode 100644 index 31deacf4..00000000 Binary files a/gfx/emotion_bubbles.png and /dev/null differ diff --git a/gfx/falling_star.png b/gfx/falling_star.png deleted file mode 100644 index 9093bef4..00000000 Binary files a/gfx/falling_star.png and /dev/null differ diff --git a/gfx/font.png b/gfx/font.png deleted file mode 100644 index 34e86b4a..00000000 Binary files a/gfx/font.png and /dev/null differ diff --git a/gfx/font/AB.png b/gfx/font/AB.png new file mode 100644 index 00000000..89ac01db Binary files /dev/null and b/gfx/font/AB.png differ diff --git a/gfx/font/ED.png b/gfx/font/ED.png new file mode 100644 index 00000000..352489d6 Binary files /dev/null and b/gfx/font/ED.png differ diff --git a/gfx/font/P.png b/gfx/font/P.png new file mode 100644 index 00000000..3df11133 Binary files /dev/null and b/gfx/font/P.png differ diff --git a/gfx/font/font.png b/gfx/font/font.png new file mode 100644 index 00000000..34e86b4a 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 00000000..d00ae7bc 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 00000000..243acda0 Binary files /dev/null and b/gfx/font/font_extra.png differ diff --git a/gfx/game_boy.png b/gfx/game_boy.png deleted file mode 100644 index 62144956..00000000 Binary files a/gfx/game_boy.png and /dev/null differ diff --git a/gfx/gamefreak.png b/gfx/gamefreak.png deleted file mode 100644 index 509232bd..00000000 Binary files a/gfx/gamefreak.png and /dev/null differ diff --git a/gfx/gamefreak_intro.png b/gfx/gamefreak_intro.png deleted file mode 100644 index f65c64ed..00000000 Binary files a/gfx/gamefreak_intro.png and /dev/null differ diff --git a/gfx/gamefreak_logo.png b/gfx/gamefreak_logo.png deleted file mode 100644 index 1671943b..00000000 Binary files a/gfx/gamefreak_logo.png and /dev/null differ diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png deleted file mode 100644 index 1a832831..00000000 Binary files a/gfx/hp_bar_and_status.png and /dev/null differ diff --git a/gfx/intro_credits/blue_jigglypuff_1.png b/gfx/intro_credits/blue_jigglypuff_1.png new file mode 100644 index 00000000..0e53582c Binary files /dev/null and b/gfx/intro_credits/blue_jigglypuff_1.png differ diff --git a/gfx/intro_credits/blue_jigglypuff_2.png b/gfx/intro_credits/blue_jigglypuff_2.png new file mode 100644 index 00000000..21107af0 Binary files /dev/null and b/gfx/intro_credits/blue_jigglypuff_2.png differ diff --git a/gfx/intro_credits/blue_jigglypuff_3.png b/gfx/intro_credits/blue_jigglypuff_3.png new file mode 100644 index 00000000..1c30a0e8 Binary files /dev/null and b/gfx/intro_credits/blue_jigglypuff_3.png differ diff --git a/gfx/intro_credits/copyright.png b/gfx/intro_credits/copyright.png new file mode 100644 index 00000000..49174349 Binary files /dev/null and b/gfx/intro_credits/copyright.png differ diff --git a/gfx/intro_credits/falling_star.png b/gfx/intro_credits/falling_star.png new file mode 100644 index 00000000..9093bef4 Binary files /dev/null and b/gfx/intro_credits/falling_star.png differ diff --git a/gfx/intro_credits/gamefreak_logo.png b/gfx/intro_credits/gamefreak_logo.png new file mode 100644 index 00000000..1671943b Binary files /dev/null and b/gfx/intro_credits/gamefreak_logo.png differ diff --git a/gfx/intro_credits/gamefreak_presents.png b/gfx/intro_credits/gamefreak_presents.png new file mode 100644 index 00000000..f65c64ed Binary files /dev/null and b/gfx/intro_credits/gamefreak_presents.png differ diff --git a/gfx/intro_credits/gengar.png b/gfx/intro_credits/gengar.png new file mode 100644 index 00000000..99fcda8d Binary files /dev/null and b/gfx/intro_credits/gengar.png differ diff --git a/gfx/intro_credits/red_nidorino_1.png b/gfx/intro_credits/red_nidorino_1.png new file mode 100644 index 00000000..4c7804a1 Binary files /dev/null and b/gfx/intro_credits/red_nidorino_1.png differ diff --git a/gfx/intro_credits/red_nidorino_2.png b/gfx/intro_credits/red_nidorino_2.png new file mode 100644 index 00000000..a29a4814 Binary files /dev/null and b/gfx/intro_credits/red_nidorino_2.png differ diff --git a/gfx/intro_credits/red_nidorino_3.png b/gfx/intro_credits/red_nidorino_3.png new file mode 100644 index 00000000..e920d55d Binary files /dev/null and b/gfx/intro_credits/red_nidorino_3.png differ diff --git a/gfx/intro_credits/the_end.png b/gfx/intro_credits/the_end.png new file mode 100644 index 00000000..025ebb61 Binary files /dev/null and b/gfx/intro_credits/the_end.png differ diff --git a/gfx/intro_fight.png b/gfx/intro_fight.png deleted file mode 100644 index d7774c01..00000000 Binary files a/gfx/intro_fight.png and /dev/null differ diff --git a/gfx/ledge_hopping_shadow.png b/gfx/ledge_hopping_shadow.png deleted file mode 100644 index 8e760056..00000000 Binary files a/gfx/ledge_hopping_shadow.png and /dev/null differ diff --git a/gfx/link_cable.png b/gfx/link_cable.png deleted file mode 100644 index d0421472..00000000 Binary files a/gfx/link_cable.png and /dev/null differ diff --git a/gfx/minimized_mon_sprite.png b/gfx/minimized_mon_sprite.png deleted file mode 100644 index 35ca75cb..00000000 Binary files a/gfx/minimized_mon_sprite.png and /dev/null differ diff --git a/gfx/mon_nest_icon.png b/gfx/mon_nest_icon.png deleted file mode 100644 index ade69944..00000000 Binary files a/gfx/mon_nest_icon.png and /dev/null differ diff --git a/gfx/mon_ow_sprites.png b/gfx/mon_ow_sprites.png deleted file mode 100644 index 8402af2d..00000000 Binary files a/gfx/mon_ow_sprites.png and /dev/null differ diff --git a/gfx/overworld/battle_transition.png b/gfx/overworld/battle_transition.png new file mode 100644 index 00000000..e2bd6299 Binary files /dev/null and b/gfx/overworld/battle_transition.png differ diff --git a/gfx/overworld/fishing_rod.png b/gfx/overworld/fishing_rod.png new file mode 100644 index 00000000..e097c6c9 Binary files /dev/null and b/gfx/overworld/fishing_rod.png differ diff --git a/gfx/overworld/heal_machine.png b/gfx/overworld/heal_machine.png new file mode 100644 index 00000000..1832c842 Binary files /dev/null and b/gfx/overworld/heal_machine.png differ diff --git a/gfx/overworld/red_fish_back.png b/gfx/overworld/red_fish_back.png new file mode 100644 index 00000000..0972377c Binary files /dev/null and b/gfx/overworld/red_fish_back.png differ diff --git a/gfx/overworld/red_fish_front.png b/gfx/overworld/red_fish_front.png new file mode 100644 index 00000000..e18a27d8 Binary files /dev/null and b/gfx/overworld/red_fish_front.png differ diff --git a/gfx/overworld/red_fish_side.png b/gfx/overworld/red_fish_side.png new file mode 100644 index 00000000..11f25c2a Binary files /dev/null and b/gfx/overworld/red_fish_side.png differ diff --git a/gfx/overworld/shadow.png b/gfx/overworld/shadow.png new file mode 100644 index 00000000..8e760056 Binary files /dev/null and b/gfx/overworld/shadow.png differ diff --git a/gfx/overworld/smoke.png b/gfx/overworld/smoke.png new file mode 100644 index 00000000..5bcaf18a Binary files /dev/null and b/gfx/overworld/smoke.png differ diff --git a/gfx/overworld/spinners.png b/gfx/overworld/spinners.png new file mode 100644 index 00000000..aea0672b Binary files /dev/null and b/gfx/overworld/spinners.png differ diff --git a/gfx/p_tile.png b/gfx/p_tile.png deleted file mode 100644 index 3df11133..00000000 Binary files a/gfx/p_tile.png and /dev/null differ diff --git a/gfx/player_title.png b/gfx/player_title.png deleted file mode 100644 index 093664d1..00000000 Binary files a/gfx/player_title.png and /dev/null differ diff --git a/gfx/pokeball.png b/gfx/pokeball.png deleted file mode 100644 index 830f72b2..00000000 Binary files a/gfx/pokeball.png and /dev/null differ diff --git a/gfx/pokecenter_ball.png b/gfx/pokecenter_ball.png deleted file mode 100644 index 1832c842..00000000 Binary files a/gfx/pokecenter_ball.png and /dev/null differ diff --git a/gfx/pokedex.png b/gfx/pokedex.png deleted file mode 100644 index 0a2c89ea..00000000 Binary files a/gfx/pokedex.png and /dev/null differ diff --git a/gfx/pokedex/mon_nest_icon.png b/gfx/pokedex/mon_nest_icon.png new file mode 100644 index 00000000..ade69944 Binary files /dev/null and b/gfx/pokedex/mon_nest_icon.png differ diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png new file mode 100644 index 00000000..0a2c89ea Binary files /dev/null and b/gfx/pokedex/pokedex.png differ diff --git a/gfx/pokemon_logo.png b/gfx/pokemon_logo.png deleted file mode 100644 index cc7582c5..00000000 Binary files a/gfx/pokemon_logo.png and /dev/null differ diff --git a/gfx/red/intro_nido_1.png b/gfx/red/intro_nido_1.png deleted file mode 100644 index 4c7804a1..00000000 Binary files a/gfx/red/intro_nido_1.png and /dev/null differ diff --git a/gfx/red/intro_nido_2.png b/gfx/red/intro_nido_2.png deleted file mode 100644 index a29a4814..00000000 Binary files a/gfx/red/intro_nido_2.png and /dev/null differ diff --git a/gfx/red/intro_nido_3.png b/gfx/red/intro_nido_3.png deleted file mode 100644 index e920d55d..00000000 Binary files a/gfx/red/intro_nido_3.png and /dev/null differ diff --git a/gfx/red/redgreenversion.png b/gfx/red/redgreenversion.png deleted file mode 100644 index e41b4295..00000000 Binary files a/gfx/red/redgreenversion.png and /dev/null differ diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map deleted file mode 100644 index 4077ed8e..00000000 Binary files a/gfx/red/sgbborder.map and /dev/null differ diff --git a/gfx/red/sgbborder.png b/gfx/red/sgbborder.png deleted file mode 100644 index 7549bb47..00000000 Binary files a/gfx/red/sgbborder.png and /dev/null differ diff --git a/gfx/red/slotmachine1.png b/gfx/red/slotmachine1.png deleted file mode 100644 index 785c74f9..00000000 Binary files a/gfx/red/slotmachine1.png and /dev/null differ diff --git a/gfx/red/slotmachine2.png b/gfx/red/slotmachine2.png deleted file mode 100644 index 779d0cd8..00000000 Binary files a/gfx/red/slotmachine2.png and /dev/null differ diff --git a/gfx/red_fishing_tile_back.png b/gfx/red_fishing_tile_back.png deleted file mode 100644 index 0972377c..00000000 Binary files a/gfx/red_fishing_tile_back.png and /dev/null differ diff --git a/gfx/red_fishing_tile_front.png b/gfx/red_fishing_tile_front.png deleted file mode 100644 index e18a27d8..00000000 Binary files a/gfx/red_fishing_tile_front.png and /dev/null differ diff --git a/gfx/red_fishing_tile_side.png b/gfx/red_fishing_tile_side.png deleted file mode 100644 index 11f25c2a..00000000 Binary files a/gfx/red_fishing_tile_side.png and /dev/null differ diff --git a/gfx/red_fishingrod_tiles.png b/gfx/red_fishingrod_tiles.png deleted file mode 100644 index e097c6c9..00000000 Binary files a/gfx/red_fishingrod_tiles.png and /dev/null differ diff --git a/gfx/sgb/blue_border.png b/gfx/sgb/blue_border.png new file mode 100644 index 00000000..098df2b6 Binary files /dev/null and b/gfx/sgb/blue_border.png differ diff --git a/gfx/sgb/blue_border.tilemap b/gfx/sgb/blue_border.tilemap new file mode 100644 index 00000000..b0b0b94b Binary files /dev/null and b/gfx/sgb/blue_border.tilemap differ diff --git a/gfx/sgb/red_border.png b/gfx/sgb/red_border.png new file mode 100644 index 00000000..7549bb47 Binary files /dev/null and b/gfx/sgb/red_border.png differ diff --git a/gfx/sgb/red_border.tilemap b/gfx/sgb/red_border.tilemap new file mode 100644 index 00000000..4077ed8e Binary files /dev/null and b/gfx/sgb/red_border.tilemap differ diff --git a/gfx/slots/blue_slots_1.png b/gfx/slots/blue_slots_1.png new file mode 100644 index 00000000..41ebfdea Binary files /dev/null and b/gfx/slots/blue_slots_1.png differ diff --git a/gfx/slots/blue_slots_2.png b/gfx/slots/blue_slots_2.png new file mode 100644 index 00000000..ee8c688e Binary files /dev/null and b/gfx/slots/blue_slots_2.png differ diff --git a/gfx/slots/red_slots_1.png b/gfx/slots/red_slots_1.png new file mode 100644 index 00000000..785c74f9 Binary files /dev/null and b/gfx/slots/red_slots_1.png differ diff --git a/gfx/slots/red_slots_2.png b/gfx/slots/red_slots_2.png new file mode 100644 index 00000000..779d0cd8 Binary files /dev/null and b/gfx/slots/red_slots_2.png differ diff --git a/gfx/slots/slots.tilemap b/gfx/slots/slots.tilemap new file mode 100644 index 00000000..8af0cdd3 Binary files /dev/null and b/gfx/slots/slots.tilemap differ diff --git a/gfx/spinner_arrow.png b/gfx/spinner_arrow.png deleted file mode 100644 index aea0672b..00000000 Binary files a/gfx/spinner_arrow.png and /dev/null differ diff --git a/gfx/ss_anne_smoke_puff.png b/gfx/ss_anne_smoke_puff.png deleted file mode 100644 index 5bcaf18a..00000000 Binary files a/gfx/ss_anne_smoke_puff.png and /dev/null differ diff --git a/gfx/text_box.png b/gfx/text_box.png deleted file mode 100644 index 3673e74c..00000000 Binary files a/gfx/text_box.png and /dev/null differ diff --git a/gfx/theend.png b/gfx/theend.png deleted file mode 100644 index 025ebb61..00000000 Binary files a/gfx/theend.png and /dev/null differ diff --git a/gfx/tilemaps/slotmachine.map b/gfx/tilemaps/slotmachine.map deleted file mode 100644 index 68807bbd..00000000 Binary files a/gfx/tilemaps/slotmachine.map and /dev/null differ diff --git a/gfx/title/blue_version.png b/gfx/title/blue_version.png new file mode 100644 index 00000000..a9c87be8 Binary files /dev/null and b/gfx/title/blue_version.png differ diff --git a/gfx/title/gamefreak_inc.png b/gfx/title/gamefreak_inc.png new file mode 100644 index 00000000..509232bd Binary files /dev/null and b/gfx/title/gamefreak_inc.png differ diff --git a/gfx/title/player.png b/gfx/title/player.png new file mode 100644 index 00000000..093664d1 Binary files /dev/null and b/gfx/title/player.png differ diff --git a/gfx/title/pokemon_logo.png b/gfx/title/pokemon_logo.png new file mode 100644 index 00000000..cc7582c5 Binary files /dev/null and b/gfx/title/pokemon_logo.png differ diff --git a/gfx/title/red_version.png b/gfx/title/red_version.png new file mode 100644 index 00000000..e41b4295 Binary files /dev/null and b/gfx/title/red_version.png differ diff --git a/gfx/town_map.png b/gfx/town_map.png deleted file mode 100644 index 23e52130..00000000 Binary files a/gfx/town_map.png and /dev/null differ diff --git a/gfx/town_map.rle b/gfx/town_map.rle deleted file mode 100755 index f9ede0ec..00000000 Binary files a/gfx/town_map.rle and /dev/null differ diff --git a/gfx/town_map/town_map.png b/gfx/town_map/town_map.png new file mode 100644 index 00000000..23e52130 Binary files /dev/null and b/gfx/town_map/town_map.png differ diff --git a/gfx/town_map/town_map.rle b/gfx/town_map/town_map.rle new file mode 100755 index 00000000..f9ede0ec Binary files /dev/null and b/gfx/town_map/town_map.rle differ diff --git a/gfx/town_map/town_map_cursor.png b/gfx/town_map/town_map_cursor.png new file mode 100644 index 00000000..39cf2c2e Binary files /dev/null and b/gfx/town_map/town_map_cursor.png differ diff --git a/gfx/town_map/up_arrow.png b/gfx/town_map/up_arrow.png new file mode 100644 index 00000000..6ebd7bfd Binary files /dev/null and b/gfx/town_map/up_arrow.png differ diff --git a/gfx/town_map_cursor.png b/gfx/town_map_cursor.png deleted file mode 100644 index 39cf2c2e..00000000 Binary files a/gfx/town_map_cursor.png and /dev/null differ diff --git a/gfx/trade/cable_ball.png b/gfx/trade/cable_ball.png new file mode 100644 index 00000000..ccd3a222 Binary files /dev/null and b/gfx/trade/cable_ball.png differ diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png new file mode 100644 index 00000000..62144956 Binary files /dev/null and b/gfx/trade/game_boy.png differ diff --git a/gfx/trade/link_cable.png b/gfx/trade/link_cable.png new file mode 100644 index 00000000..d0421472 Binary files /dev/null and b/gfx/trade/link_cable.png differ diff --git a/gfx/trade/mon_ow_sprites.png b/gfx/trade/mon_ow_sprites.png new file mode 100644 index 00000000..8402af2d Binary files /dev/null and b/gfx/trade/mon_ow_sprites.png differ diff --git a/gfx/trade2.png b/gfx/trade2.png deleted file mode 100644 index ccd3a222..00000000 Binary files a/gfx/trade2.png and /dev/null differ diff --git a/gfx/trainer_card/badge_numbers.png b/gfx/trainer_card/badge_numbers.png new file mode 100644 index 00000000..c9283065 Binary files /dev/null and b/gfx/trainer_card/badge_numbers.png differ diff --git a/gfx/trainer_card/badges.png b/gfx/trainer_card/badges.png new file mode 100644 index 00000000..8b0fc516 Binary files /dev/null and b/gfx/trainer_card/badges.png differ diff --git a/gfx/trainer_card/blank_leader_names.png b/gfx/trainer_card/blank_leader_names.png new file mode 100644 index 00000000..867a39fe Binary files /dev/null and b/gfx/trainer_card/blank_leader_names.png differ diff --git a/gfx/trainer_card/circle_tile.png b/gfx/trainer_card/circle_tile.png new file mode 100644 index 00000000..64c00c9f Binary files /dev/null and b/gfx/trainer_card/circle_tile.png differ diff --git a/gfx/trainer_card/trainer_info.png b/gfx/trainer_card/trainer_info.png new file mode 100644 index 00000000..d3ac169f Binary files /dev/null and b/gfx/trainer_card/trainer_info.png differ diff --git a/gfx/trainer_info.png b/gfx/trainer_info.png deleted file mode 100644 index d3ac169f..00000000 Binary files a/gfx/trainer_info.png and /dev/null differ diff --git a/gfx/up_arrow.png b/gfx/up_arrow.png deleted file mode 100644 index 6ebd7bfd..00000000 Binary files a/gfx/up_arrow.png and /dev/null differ diff --git a/gfx/yellow/slotmachine1.png b/gfx/yellow/slotmachine1.png deleted file mode 100644 index 335ce97c..00000000 Binary files a/gfx/yellow/slotmachine1.png and /dev/null differ diff --git a/gfx/yellow/slotmachine2.png b/gfx/yellow/slotmachine2.png deleted file mode 100644 index b4bdf8a8..00000000 Binary files a/gfx/yellow/slotmachine2.png and /dev/null differ diff --git a/main.asm b/main.asm index 1c5aa223..abe13d5b 100755 --- a/main.asm +++ b/main.asm @@ -79,27 +79,27 @@ INCLUDE "engine/hidden_object_functions3.asm" SECTION "Graphics (BANK 4)", ROMX -PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" -FontGraphics:: INCBIN "gfx/font.1bpp" +PokemonLogoGraphics: INCBIN "gfx/title/pokemon_logo.2bpp" +FontGraphics:: INCBIN "gfx/font/font.1bpp" FontGraphicsEnd:: -ABTiles: INCBIN "gfx/AB.2bpp" -HpBarAndStatusGraphics:: INCBIN "gfx/hp_bar_and_status.2bpp" +ABTiles: INCBIN "gfx/font/AB.2bpp" +HpBarAndStatusGraphics:: INCBIN "gfx/font/font_battle_extra.2bpp" HpBarAndStatusGraphicsEnd:: -BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp" +BattleHudTiles1: INCBIN "gfx/battle/battle_hud_1.1bpp" BattleHudTiles1End: -BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp" -BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp" +BattleHudTiles2: INCBIN "gfx/battle/battle_hud_2.1bpp" +BattleHudTiles3: INCBIN "gfx/battle/battle_hud_3.1bpp" BattleHudTiles3End: -NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp" -GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp" +NintendoCopyrightLogoGraphics: INCBIN "gfx/intro_credits/copyright.2bpp" +GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" GamefreakLogoGraphicsEnd: -TextBoxGraphics:: INCBIN "gfx/text_box.2bpp" +TextBoxGraphics:: INCBIN "gfx/font/font_extra.2bpp" TextBoxGraphicsEnd:: -PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" +PokedexTileGraphics: INCBIN "gfx/pokedex/pokedex.2bpp" PokedexTileGraphicsEnd: -WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" +WorldMapTileGraphics: INCBIN "gfx/town_map/town_map.2bpp" WorldMapTileGraphicsEnd: -PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" +PlayerCharacterTitleGraphics: INCBIN "gfx/title/player.2bpp" PlayerCharacterTitleGraphicsEnd: @@ -176,11 +176,11 @@ SECTION "Battle (BANK B)", ROMX INCLUDE "engine/battle/display_effectiveness.asm" -TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_info.2bpp" +TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_card/trainer_info.2bpp" TrainerInfoTextBoxTileGraphicsEnd: -BlankLeaderNames: INCBIN "gfx/blank_leader_names.2bpp" -CircleTile: INCBIN "gfx/circle_tile.2bpp" -BadgeNumbersTileGraphics: INCBIN "gfx/badge_numbers.2bpp" +BlankLeaderNames: INCBIN "gfx/trainer_card/blank_leader_names.2bpp" +CircleTile: INCBIN "gfx/trainer_card/circle_tile.2bpp" +BadgeNumbersTileGraphics: INCBIN "gfx/trainer_card/badge_numbers.2bpp" INCLUDE "engine/items/tmhm.asm" INCLUDE "engine/battle/scale_sprites.asm" @@ -215,12 +215,12 @@ INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" TradingAnimationGraphics: -INCBIN "gfx/game_boy.2bpp" -INCBIN "gfx/link_cable.2bpp" +INCBIN "gfx/trade/game_boy.2bpp" +INCBIN "gfx/trade/link_cable.2bpp" TradingAnimationGraphicsEnd: ; Pokeball traveling through the link cable. -TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp" +TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp" TradingAnimationGraphics2End: INCLUDE "engine/evos_moves.asm" @@ -323,10 +323,10 @@ INCLUDE "engine/battle/decrement_pp.asm" Version_GFX: IF DEF(_RED) - INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles + INCBIN "gfx/title/red_version.1bpp" ; 10 tiles ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles + INCBIN "gfx/title/blue_version.1bpp" ; 8 tiles ENDC Version_GFXEnd: @@ -370,10 +370,10 @@ INCLUDE "engine/battle/animations.asm" INCLUDE "engine/overworld/cut2.asm" INCLUDE "engine/overworld/ssanne.asm" -RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp" -RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp" -RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp" -RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" +RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp" +RedFishingTilesBack: INCBIN "gfx/overworld/red_fish_back.2bpp" +RedFishingTilesSide: INCBIN "gfx/overworld/red_fish_side.2bpp" +RedFishingRodTiles: INCBIN "gfx/overworld/fishing_rod.2bpp" INCLUDE "data/animations.asm" INCLUDE "engine/evolution.asm" diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index 7805f67a..40e2acc4 100755 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -411,7 +411,7 @@ SpinnerPlayerFacingDirections: ; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ SpinnerArrowAnimTiles: - INCBIN "gfx/spinner_arrow.2bpp" + INCBIN "gfx/overworld/spinners.2bpp" RocketHideoutB2F_TextPointers: dw RocketHideout2Text1 diff --git a/tilesets.asm b/tilesets.asm index 01a8f933..ed6b6223 100644 --- a/tilesets.asm +++ b/tilesets.asm @@ -5,7 +5,7 @@ Overworld_Block:: INCBIN "gfx/blocksets/overworld.bst" RedsHouse1_GFX:: RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp" - ds 16 + ds 16, $00 ; blank tile RedsHouse1_Block:: RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst" -- cgit v1.2.3