From ccf4fe54a8e444aaf966fac7b38bc9452c494222 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 5 Aug 2015 18:11:43 -0500 Subject: Remove unused gfx file extensions --- engine/HoF_room_pc.asm | 2 +- engine/intro.asm | 12 ++++++------ gfx/blue/intro_purin_1.6x6.png | Bin 380 -> 0 bytes gfx/blue/intro_purin_1.png | Bin 0 -> 380 bytes gfx/blue/intro_purin_2.6x6.png | Bin 374 -> 0 bytes gfx/blue/intro_purin_2.png | Bin 0 -> 374 bytes gfx/blue/intro_purin_3.6x6.png | Bin 430 -> 0 bytes gfx/blue/intro_purin_3.png | Bin 0 -> 430 bytes gfx/game_boy.norepeat.png | Bin 264 -> 0 bytes gfx/game_boy.png | Bin 0 -> 264 bytes gfx/red/intro_nido_1.6x6.png | Bin 476 -> 0 bytes gfx/red/intro_nido_1.png | Bin 0 -> 476 bytes gfx/red/intro_nido_2.6x6.png | Bin 463 -> 0 bytes gfx/red/intro_nido_2.png | Bin 0 -> 463 bytes gfx/red/intro_nido_3.6x6.png | Bin 509 -> 0 bytes gfx/red/intro_nido_3.png | Bin 0 -> 509 bytes gfx/theend.interleave.png | Bin 153 -> 0 bytes gfx/theend.png | Bin 0 -> 153 bytes gfx/tilesets/cavern.png | Bin 0 -> 1038 bytes gfx/tilesets/cavern.t14.png | Bin 1038 -> 0 bytes gfx/tilesets/cemetery.png | Bin 0 -> 943 bytes gfx/tilesets/cemetery.t4.png | Bin 943 -> 0 bytes gfx/tilesets/club.png | Bin 0 -> 914 bytes gfx/tilesets/club.t5.png | Bin 914 -> 0 bytes gfx/tilesets/gate.png | Bin 0 -> 1134 bytes gfx/tilesets/gate.t1.png | Bin 1134 -> 0 bytes gfx/tilesets/house.png | Bin 0 -> 1178 bytes gfx/tilesets/house.t2.png | Bin 1178 -> 0 bytes gfx/tilesets/interior.png | Bin 0 -> 1156 bytes gfx/tilesets/interior.t1.png | Bin 1156 -> 0 bytes gfx/tilesets/lab.png | Bin 0 -> 1066 bytes gfx/tilesets/lab.t4.png | Bin 1066 -> 0 bytes gfx/tilesets/lobby.png | Bin 0 -> 981 bytes gfx/tilesets/lobby.t2.png | Bin 981 -> 0 bytes gfx/tilesets/mansion.png | Bin 0 -> 976 bytes gfx/tilesets/mansion.t2.png | Bin 976 -> 0 bytes gfx/tilesets/overworld.png | Bin 0 -> 1324 bytes gfx/tilesets/overworld.t2.png | Bin 1324 -> 0 bytes gfx/tilesets/plateau.png | Bin 0 -> 1027 bytes gfx/tilesets/plateau.t10.png | Bin 1027 -> 0 bytes gfx/tilesets/reds_house.png | Bin 0 -> 860 bytes gfx/tilesets/reds_house.t7.png | Bin 860 -> 0 bytes gfx/tilesets/ship.png | Bin 0 -> 880 bytes gfx/tilesets/ship.t6.png | Bin 880 -> 0 bytes gfx/tilesets/ship_port.png | Bin 0 -> 1140 bytes gfx/tilesets/ship_port.t2.png | Bin 1140 -> 0 bytes gfx/tilesets/underground.png | Bin 0 -> 288 bytes gfx/tilesets/underground.t7.png | Bin 288 -> 0 bytes main.asm | 32 ++++++++++++++++---------------- 49 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 gfx/blue/intro_purin_1.6x6.png create mode 100644 gfx/blue/intro_purin_1.png delete mode 100644 gfx/blue/intro_purin_2.6x6.png create mode 100644 gfx/blue/intro_purin_2.png delete mode 100644 gfx/blue/intro_purin_3.6x6.png create mode 100644 gfx/blue/intro_purin_3.png delete mode 100644 gfx/game_boy.norepeat.png create mode 100644 gfx/game_boy.png delete mode 100644 gfx/red/intro_nido_1.6x6.png create mode 100644 gfx/red/intro_nido_1.png delete mode 100644 gfx/red/intro_nido_2.6x6.png create mode 100644 gfx/red/intro_nido_2.png delete mode 100644 gfx/red/intro_nido_3.6x6.png create mode 100644 gfx/red/intro_nido_3.png delete mode 100644 gfx/theend.interleave.png create mode 100644 gfx/theend.png create mode 100755 gfx/tilesets/cavern.png delete mode 100755 gfx/tilesets/cavern.t14.png create mode 100755 gfx/tilesets/cemetery.png delete mode 100755 gfx/tilesets/cemetery.t4.png create mode 100755 gfx/tilesets/club.png delete mode 100755 gfx/tilesets/club.t5.png create mode 100755 gfx/tilesets/gate.png delete mode 100755 gfx/tilesets/gate.t1.png create mode 100755 gfx/tilesets/house.png delete mode 100755 gfx/tilesets/house.t2.png create mode 100755 gfx/tilesets/interior.png delete mode 100755 gfx/tilesets/interior.t1.png create mode 100755 gfx/tilesets/lab.png delete mode 100755 gfx/tilesets/lab.t4.png create mode 100755 gfx/tilesets/lobby.png delete mode 100755 gfx/tilesets/lobby.t2.png create mode 100755 gfx/tilesets/mansion.png delete mode 100755 gfx/tilesets/mansion.t2.png create mode 100755 gfx/tilesets/overworld.png delete mode 100755 gfx/tilesets/overworld.t2.png create mode 100755 gfx/tilesets/plateau.png delete mode 100755 gfx/tilesets/plateau.t10.png create mode 100755 gfx/tilesets/reds_house.png delete mode 100755 gfx/tilesets/reds_house.t7.png create mode 100755 gfx/tilesets/ship.png delete mode 100755 gfx/tilesets/ship.t6.png create mode 100755 gfx/tilesets/ship_port.png delete mode 100755 gfx/tilesets/ship_port.t2.png create mode 100755 gfx/tilesets/underground.png delete mode 100755 gfx/tilesets/underground.t7.png diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 704fea16..90b9450b 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -266,4 +266,4 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" TheEndGfx: ; 7473e (1d:473e) (7473f on blue) - INCBIN "gfx/theend.interleave.2bpp" + INCBIN "gfx/theend.2bpp" diff --git a/engine/intro.asm b/engine/intro.asm index 154c41fd..9f17e05c 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -437,14 +437,14 @@ FightIntroBackMon: ; 41a99 (10:5a99) FightIntroFrontMon: ; 42099 (10:6099) IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.6x6.2bpp" - INCBIN "gfx/red/intro_nido_2.6x6.2bpp" - INCBIN "gfx/red/intro_nido_3.6x6.2bpp" + INCBIN "gfx/red/intro_nido_1.2bpp" + INCBIN "gfx/red/intro_nido_2.2bpp" + INCBIN "gfx/red/intro_nido_3.2bpp" ds $10 ; blank tile ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_2.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_3.6x6.2bpp" + INCBIN "gfx/blue/intro_purin_1.2bpp" + INCBIN "gfx/blue/intro_purin_2.2bpp" + INCBIN "gfx/blue/intro_purin_3.2bpp" ds $10 ; blank tile ENDC diff --git a/gfx/blue/intro_purin_1.6x6.png b/gfx/blue/intro_purin_1.6x6.png deleted file mode 100644 index a14acfb3..00000000 Binary files a/gfx/blue/intro_purin_1.6x6.png and /dev/null differ diff --git a/gfx/blue/intro_purin_1.png b/gfx/blue/intro_purin_1.png new file mode 100644 index 00000000..a14acfb3 Binary files /dev/null and b/gfx/blue/intro_purin_1.png differ diff --git a/gfx/blue/intro_purin_2.6x6.png b/gfx/blue/intro_purin_2.6x6.png deleted file mode 100644 index 31793daf..00000000 Binary files a/gfx/blue/intro_purin_2.6x6.png and /dev/null differ diff --git a/gfx/blue/intro_purin_2.png b/gfx/blue/intro_purin_2.png new file mode 100644 index 00000000..31793daf Binary files /dev/null and b/gfx/blue/intro_purin_2.png differ diff --git a/gfx/blue/intro_purin_3.6x6.png b/gfx/blue/intro_purin_3.6x6.png deleted file mode 100644 index d7bfb1f0..00000000 Binary files a/gfx/blue/intro_purin_3.6x6.png and /dev/null differ diff --git a/gfx/blue/intro_purin_3.png b/gfx/blue/intro_purin_3.png new file mode 100644 index 00000000..d7bfb1f0 Binary files /dev/null and b/gfx/blue/intro_purin_3.png differ diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png deleted file mode 100644 index adeedabb..00000000 Binary files a/gfx/game_boy.norepeat.png and /dev/null differ diff --git a/gfx/game_boy.png b/gfx/game_boy.png new file mode 100644 index 00000000..adeedabb Binary files /dev/null and b/gfx/game_boy.png differ diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.6x6.png deleted file mode 100644 index 14d79c6d..00000000 Binary files a/gfx/red/intro_nido_1.6x6.png and /dev/null differ diff --git a/gfx/red/intro_nido_1.png b/gfx/red/intro_nido_1.png new file mode 100644 index 00000000..14d79c6d Binary files /dev/null and b/gfx/red/intro_nido_1.png differ diff --git a/gfx/red/intro_nido_2.6x6.png b/gfx/red/intro_nido_2.6x6.png deleted file mode 100644 index 78759914..00000000 Binary files a/gfx/red/intro_nido_2.6x6.png and /dev/null differ diff --git a/gfx/red/intro_nido_2.png b/gfx/red/intro_nido_2.png new file mode 100644 index 00000000..78759914 Binary files /dev/null and b/gfx/red/intro_nido_2.png differ diff --git a/gfx/red/intro_nido_3.6x6.png b/gfx/red/intro_nido_3.6x6.png deleted file mode 100644 index 52f35fa5..00000000 Binary files a/gfx/red/intro_nido_3.6x6.png and /dev/null differ diff --git a/gfx/red/intro_nido_3.png b/gfx/red/intro_nido_3.png new file mode 100644 index 00000000..52f35fa5 Binary files /dev/null and b/gfx/red/intro_nido_3.png differ diff --git a/gfx/theend.interleave.png b/gfx/theend.interleave.png deleted file mode 100644 index bc6ff558..00000000 Binary files a/gfx/theend.interleave.png and /dev/null differ diff --git a/gfx/theend.png b/gfx/theend.png new file mode 100644 index 00000000..bc6ff558 Binary files /dev/null and b/gfx/theend.png differ diff --git a/gfx/tilesets/cavern.png b/gfx/tilesets/cavern.png new file mode 100755 index 00000000..7a66b727 Binary files /dev/null and b/gfx/tilesets/cavern.png differ diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.t14.png deleted file mode 100755 index 7a66b727..00000000 Binary files a/gfx/tilesets/cavern.t14.png and /dev/null differ diff --git a/gfx/tilesets/cemetery.png b/gfx/tilesets/cemetery.png new file mode 100755 index 00000000..3dcba0f0 Binary files /dev/null and b/gfx/tilesets/cemetery.png differ diff --git a/gfx/tilesets/cemetery.t4.png b/gfx/tilesets/cemetery.t4.png deleted file mode 100755 index 3dcba0f0..00000000 Binary files a/gfx/tilesets/cemetery.t4.png and /dev/null differ diff --git a/gfx/tilesets/club.png b/gfx/tilesets/club.png new file mode 100755 index 00000000..1e367b1e Binary files /dev/null and b/gfx/tilesets/club.png differ diff --git a/gfx/tilesets/club.t5.png b/gfx/tilesets/club.t5.png deleted file mode 100755 index 1e367b1e..00000000 Binary files a/gfx/tilesets/club.t5.png and /dev/null differ diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png new file mode 100755 index 00000000..4a97d6f9 Binary files /dev/null and b/gfx/tilesets/gate.png differ diff --git a/gfx/tilesets/gate.t1.png b/gfx/tilesets/gate.t1.png deleted file mode 100755 index 4a97d6f9..00000000 Binary files a/gfx/tilesets/gate.t1.png and /dev/null differ diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png new file mode 100755 index 00000000..dabd6238 Binary files /dev/null and b/gfx/tilesets/house.png differ diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png deleted file mode 100755 index dabd6238..00000000 Binary files a/gfx/tilesets/house.t2.png and /dev/null differ diff --git a/gfx/tilesets/interior.png b/gfx/tilesets/interior.png new file mode 100755 index 00000000..8273960c Binary files /dev/null and b/gfx/tilesets/interior.png differ diff --git a/gfx/tilesets/interior.t1.png b/gfx/tilesets/interior.t1.png deleted file mode 100755 index 8273960c..00000000 Binary files a/gfx/tilesets/interior.t1.png and /dev/null differ diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png new file mode 100755 index 00000000..481b80d7 Binary files /dev/null and b/gfx/tilesets/lab.png differ diff --git a/gfx/tilesets/lab.t4.png b/gfx/tilesets/lab.t4.png deleted file mode 100755 index 481b80d7..00000000 Binary files a/gfx/tilesets/lab.t4.png and /dev/null differ diff --git a/gfx/tilesets/lobby.png b/gfx/tilesets/lobby.png new file mode 100755 index 00000000..6f6a1189 Binary files /dev/null and b/gfx/tilesets/lobby.png differ diff --git a/gfx/tilesets/lobby.t2.png b/gfx/tilesets/lobby.t2.png deleted file mode 100755 index 6f6a1189..00000000 Binary files a/gfx/tilesets/lobby.t2.png and /dev/null differ diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png new file mode 100755 index 00000000..8c8ab32d Binary files /dev/null and b/gfx/tilesets/mansion.png differ diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.t2.png deleted file mode 100755 index 8c8ab32d..00000000 Binary files a/gfx/tilesets/mansion.t2.png and /dev/null differ diff --git a/gfx/tilesets/overworld.png b/gfx/tilesets/overworld.png new file mode 100755 index 00000000..b3b37a2f Binary files /dev/null and b/gfx/tilesets/overworld.png differ diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.t2.png deleted file mode 100755 index b3b37a2f..00000000 Binary files a/gfx/tilesets/overworld.t2.png and /dev/null differ diff --git a/gfx/tilesets/plateau.png b/gfx/tilesets/plateau.png new file mode 100755 index 00000000..df92791b Binary files /dev/null and b/gfx/tilesets/plateau.png differ diff --git a/gfx/tilesets/plateau.t10.png b/gfx/tilesets/plateau.t10.png deleted file mode 100755 index df92791b..00000000 Binary files a/gfx/tilesets/plateau.t10.png and /dev/null differ diff --git a/gfx/tilesets/reds_house.png b/gfx/tilesets/reds_house.png new file mode 100755 index 00000000..9b4f1d8d Binary files /dev/null and b/gfx/tilesets/reds_house.png differ diff --git a/gfx/tilesets/reds_house.t7.png b/gfx/tilesets/reds_house.t7.png deleted file mode 100755 index 9b4f1d8d..00000000 Binary files a/gfx/tilesets/reds_house.t7.png and /dev/null differ diff --git a/gfx/tilesets/ship.png b/gfx/tilesets/ship.png new file mode 100755 index 00000000..f3db2c24 Binary files /dev/null and b/gfx/tilesets/ship.png differ diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.t6.png deleted file mode 100755 index f3db2c24..00000000 Binary files a/gfx/tilesets/ship.t6.png and /dev/null differ diff --git a/gfx/tilesets/ship_port.png b/gfx/tilesets/ship_port.png new file mode 100755 index 00000000..25a92082 Binary files /dev/null and b/gfx/tilesets/ship_port.png differ diff --git a/gfx/tilesets/ship_port.t2.png b/gfx/tilesets/ship_port.t2.png deleted file mode 100755 index 25a92082..00000000 Binary files a/gfx/tilesets/ship_port.t2.png and /dev/null differ diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png new file mode 100755 index 00000000..65f444b1 Binary files /dev/null and b/gfx/tilesets/underground.png differ diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.t7.png deleted file mode 100755 index 65f444b1..00000000 Binary files a/gfx/tilesets/underground.t7.png and /dev/null differ diff --git a/main.asm b/main.asm index 8def2f85..3d1119fe 100755 --- a/main.asm +++ b/main.asm @@ -5496,7 +5496,7 @@ INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" TradingAnimationGraphics: - INCBIN "gfx/game_boy.norepeat.2bpp" + INCBIN "gfx/game_boy.2bpp" INCBIN "gfx/link_cable.2bpp" TradingAnimationGraphics2: @@ -6456,23 +6456,23 @@ INCLUDE "engine/hidden_object_functions18.asm" SECTION "bank19",ROMX,BANK[$19] -Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp" +Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" RedsHouse1_GFX: -RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.t7.2bpp" +RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.2bpp" RedsHouse1_Block: RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst" -House_GFX: INCBIN "gfx/tilesets/house.t2.2bpp" +House_GFX: INCBIN "gfx/tilesets/house.2bpp" House_Block: INCBIN "gfx/blocksets/house.bst" -Mansion_GFX: INCBIN "gfx/tilesets/mansion.t2.2bpp" +Mansion_GFX: INCBIN "gfx/tilesets/mansion.2bpp" Mansion_Block: INCBIN "gfx/blocksets/mansion.bst" -ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.t2.2bpp" +ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.2bpp" ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst" -Interior_GFX: INCBIN "gfx/tilesets/interior.t1.2bpp" +Interior_GFX: INCBIN "gfx/tilesets/interior.2bpp" Interior_Block: INCBIN "gfx/blocksets/interior.bst" -Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" +Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" @@ -6500,7 +6500,7 @@ Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst" ForestGate_GFX: Museum_GFX: -Gate_GFX: INCBIN "gfx/tilesets/gate.t1.2bpp" +Gate_GFX: INCBIN "gfx/tilesets/gate.2bpp" ForestGate_Block: Museum_Block: Gate_Block: INCBIN "gfx/blocksets/gate.bst" @@ -6513,19 +6513,19 @@ Facility_Block: INCBIN "gfx/blocksets/facility.bst" SECTION "bank1B",ROMX,BANK[$1B] -Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" +Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" -Cavern_GFX: INCBIN "gfx/tilesets/cavern.t14.2bpp" +Cavern_GFX: INCBIN "gfx/tilesets/cavern.2bpp" Cavern_Block: INCBIN "gfx/blocksets/cavern.bst" -Lobby_GFX: INCBIN "gfx/tilesets/lobby.t2.2bpp" +Lobby_GFX: INCBIN "gfx/tilesets/lobby.2bpp" Lobby_Block: INCBIN "gfx/blocksets/lobby.bst" -Ship_GFX: INCBIN "gfx/tilesets/ship.t6.2bpp" +Ship_GFX: INCBIN "gfx/tilesets/ship.2bpp" Ship_Block: INCBIN "gfx/blocksets/ship.bst" -Lab_GFX: INCBIN "gfx/tilesets/lab.t4.2bpp" +Lab_GFX: INCBIN "gfx/tilesets/lab.2bpp" Lab_Block: INCBIN "gfx/blocksets/lab.bst" -Club_GFX: INCBIN "gfx/tilesets/club.t5.2bpp" +Club_GFX: INCBIN "gfx/tilesets/club.2bpp" Club_Block: INCBIN "gfx/blocksets/club.bst" -Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" +Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -- cgit v1.2.3