Remove redundant dimensions in image filenames.

37 files changed, 31 insertions, 31 deletions

diff --git a/data/sgb_border.asm b/data/sgb_border.asm
index 716a991e..5a0bbb2d 100755
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -55,8 +55,8 @@ ENDC
 
 SGBBorderGraphics: ; 72fe8 (1c:6fe8)
 IF _RED
-	INCBIN "gfx/red/sgbborder.w128.2bpp"
+	INCBIN "gfx/red/sgbborder.2bpp"
 ENDC
 IF _BLUE
-	INCBIN "gfx/blue/sgbborder.w128.2bpp"
+	INCBIN "gfx/blue/sgbborder.2bpp"
 ENDC
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 82e769f5..5af7484c 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -260,4 +260,4 @@ INCLUDE "data/credits_order.asm"
 INCLUDE "text/credits_text.asm"
 
 TheEndGfx: ; 7473e (1d:473e) ; 473E (473F on blue)
-	INCBIN "gfx/theend.w40.interleave.2bpp"
+	INCBIN "gfx/theend.interleave.2bpp"
diff --git a/engine/intro.asm b/engine/intro.asm
index c20e5e3f..8e344e48 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -425,7 +425,7 @@ IntroNidorinoAnimation7: ; 41950 (10:5950)
 	db $50 ; list terminator
 
 GameFreakIntro: ; 41959 (10:5959)
-	INCBIN "gfx/gamefreak_intro.h8.2bpp"
+	INCBIN "gfx/gamefreak_intro.2bpp"
 	INCBIN "gfx/gamefreak_logo.2bpp"
 	ds $10 ; blank tile
 
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index 27214240..a8d863df 100755
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -65,4 +65,4 @@ EmotionBubblesOAM: ; 17cb5 (5:7cb5)
 	db $FA,$00,$FB,$00
 
 EmotionBubbles: ; 17cbd (5:7cbd)
-	INCBIN "gfx/emotion_bubbles.w16.2bpp"
+	INCBIN "gfx/emotion_bubbles.2bpp"
diff --git a/gfx/badges.w16.png b/gfx/badges.png
index 8b0fc516..8b0fc516 100644
--- a/gfx/badges.w16.png
+++ b/gfx/badges.png
diff --git a/gfx/blue/blueversion.h8.png b/gfx/blue/blueversion.png
index dd7e2b6f..dd7e2b6f 100644
--- a/gfx/blue/blueversion.h8.png
+++ b/gfx/blue/blueversion.png
diff --git a/gfx/blue/sgbborder.w128.png b/gfx/blue/sgbborder.png
index 098df2b6..098df2b6 100644
--- a/gfx/blue/sgbborder.w128.png
+++ b/gfx/blue/sgbborder.png
diff --git a/gfx/copyright.h8.png b/gfx/copyright.png
index 49174349..49174349 100644
--- a/gfx/copyright.h8.png
+++ b/gfx/copyright.png
diff --git a/gfx/emotion_bubbles.w16.png b/gfx/emotion_bubbles.png
index 31deacf4..31deacf4 100644
--- a/gfx/emotion_bubbles.w16.png
+++ b/gfx/emotion_bubbles.png
diff --git a/gfx/font.w128.png b/gfx/font.png
index d5548c09..d5548c09 100644
--- a/gfx/font.w128.png
+++ b/gfx/font.png
diff --git a/gfx/gamefreak.h8.png b/gfx/gamefreak.png
index 509232bd..509232bd 100644
--- a/gfx/gamefreak.h8.png
+++ b/gfx/gamefreak.png
diff --git a/gfx/gamefreak_intro.h8.png b/gfx/gamefreak_intro.png
index 0fa6832c..0fa6832c 100644
--- a/gfx/gamefreak_intro.h8.png
+++ b/gfx/gamefreak_intro.png
diff --git a/gfx/hp_bar_and_status.w80.png b/gfx/hp_bar_and_status.w80.png
deleted file mode 100644
index 79830885..00000000
--- a/gfx/hp_bar_and_status.w80.png
+++ /dev/null
diff --git a/gfx/pokemon_logo.w128.png b/gfx/pokemon_logo.png
index cc7582c5..cc7582c5 100644
--- a/gfx/pokemon_logo.w128.png
+++ b/gfx/pokemon_logo.png
diff --git a/gfx/red/redgreenversion.h8.png b/gfx/red/redgreenversion.png
index 8b34ec09..8b34ec09 100644
--- a/gfx/red/redgreenversion.h8.png
+++ b/gfx/red/redgreenversion.png
diff --git a/gfx/red/sgbborder.w128.png b/gfx/red/sgbborder.png
index 7549bb47..7549bb47 100644
--- a/gfx/red/sgbborder.w128.png
+++ b/gfx/red/sgbborder.png
diff --git a/gfx/theend.w40.interleave.png b/gfx/theend.interleave.png
index 025ebb61..025ebb61 100644
--- a/gfx/theend.w40.interleave.png
+++ b/gfx/theend.interleave.png
diff --git a/gfx/tilesets/cavern.w128.t14.png b/gfx/tilesets/cavern.t14.png
index 5397fd65..5397fd65 100644
--- a/gfx/tilesets/cavern.w128.t14.png
+++ b/gfx/tilesets/cavern.t14.png
diff --git a/gfx/tilesets/cemetery.w128.t4.png b/gfx/tilesets/cemetery.t4.png
index b1df015a..b1df015a 100644
--- a/gfx/tilesets/cemetery.w128.t4.png
+++ b/gfx/tilesets/cemetery.t4.png
diff --git a/gfx/tilesets/club.w128.t5.png b/gfx/tilesets/club.t5.png
index 05a55879..05a55879 100644
--- a/gfx/tilesets/club.w128.t5.png
+++ b/gfx/tilesets/club.t5.png
diff --git a/gfx/tilesets/facility.w128.png b/gfx/tilesets/facility.png
index 3654900e..3654900e 100644
--- a/gfx/tilesets/facility.w128.png
+++ b/gfx/tilesets/facility.png
diff --git a/gfx/tilesets/forest.w128.png b/gfx/tilesets/forest.png
index fd534d48..fd534d48 100644
--- a/gfx/tilesets/forest.w128.png
+++ b/gfx/tilesets/forest.png
diff --git a/gfx/tilesets/gate.w128.t1.png b/gfx/tilesets/gate.t1.png
index 372e6751..372e6751 100644
--- a/gfx/tilesets/gate.w128.t1.png
+++ b/gfx/tilesets/gate.t1.png
diff --git a/gfx/tilesets/gym.w128.png b/gfx/tilesets/gym.png
index bffb472b..bffb472b 100644
--- a/gfx/tilesets/gym.w128.png
+++ b/gfx/tilesets/gym.png
diff --git a/gfx/tilesets/house.w128.t2.png b/gfx/tilesets/house.t2.png
index b5d67c95..b5d67c95 100644
--- a/gfx/tilesets/house.w128.t2.png
+++ b/gfx/tilesets/house.t2.png
diff --git a/gfx/tilesets/interior.w128.t1.png b/gfx/tilesets/interior.t1.png
index 3123d81c..3123d81c 100644
--- a/gfx/tilesets/interior.w128.t1.png
+++ b/gfx/tilesets/interior.t1.png
diff --git a/gfx/tilesets/lab.w128.t4.png b/gfx/tilesets/lab.t4.png
index 4a114337..4a114337 100644
--- a/gfx/tilesets/lab.w128.t4.png
+++ b/gfx/tilesets/lab.t4.png
diff --git a/gfx/tilesets/lobby.w128.t2.png b/gfx/tilesets/lobby.t2.png
index f2a1c180..f2a1c180 100644
--- a/gfx/tilesets/lobby.w128.t2.png
+++ b/gfx/tilesets/lobby.t2.png
diff --git a/gfx/tilesets/mansion.w128.t2.png b/gfx/tilesets/mansion.t2.png
index 557c23b4..557c23b4 100644
--- a/gfx/tilesets/mansion.w128.t2.png
+++ b/gfx/tilesets/mansion.t2.png
diff --git a/gfx/tilesets/overworld.w128.t2.png b/gfx/tilesets/overworld.t2.png
index c7533e40..c7533e40 100644
--- a/gfx/tilesets/overworld.w128.t2.png
+++ b/gfx/tilesets/overworld.t2.png
diff --git a/gfx/tilesets/plateau.w128.t10.png b/gfx/tilesets/plateau.t10.png
index b87162d8..b87162d8 100644
--- a/gfx/tilesets/plateau.w128.t10.png
+++ b/gfx/tilesets/plateau.t10.png
diff --git a/gfx/tilesets/pokecenter.w128.png b/gfx/tilesets/pokecenter.png
index ab4821d9..ab4821d9 100644
--- a/gfx/tilesets/pokecenter.w128.png
+++ b/gfx/tilesets/pokecenter.png
diff --git a/gfx/tilesets/reds_house.w128.t7.png b/gfx/tilesets/reds_house.t7.png
index 5f210d04..5f210d04 100644
--- a/gfx/tilesets/reds_house.w128.t7.png
+++ b/gfx/tilesets/reds_house.t7.png
diff --git a/gfx/tilesets/ship.w128.t6.png b/gfx/tilesets/ship.t6.png
index cf5b6b95..cf5b6b95 100644
--- a/gfx/tilesets/ship.w128.t6.png
+++ b/gfx/tilesets/ship.t6.png
diff --git a/gfx/tilesets/ship_port.w128.t2.png b/gfx/tilesets/ship_port.t2.png
index fa5bbb27..fa5bbb27 100644
--- a/gfx/tilesets/ship_port.w128.t2.png
+++ b/gfx/tilesets/ship_port.t2.png
diff --git a/gfx/tilesets/underground.w128.t7.png b/gfx/tilesets/underground.t7.png
index baa86c17..baa86c17 100644
--- a/gfx/tilesets/underground.w128.t7.png
+++ b/gfx/tilesets/underground.t7.png
diff --git a/main.asm b/main.asm
index f928ec70..4ba797f2 100755
--- a/main.asm
+++ b/main.asm
@@ -3044,7 +3044,7 @@ DrawBadges: ; ea03 (3:6a03)
 	db $20, $28, $30, $38, $40, $48, $50, $58
 
 GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e)
-	INCBIN "gfx/badges.w16.2bpp"
+	INCBIN "gfx/badges.2bpp"
 
 Func_ee9e: ; ee9e (3:6e9e)
 	call GetPredefRegisters
@@ -4687,15 +4687,15 @@ SnorlaxSprite:         INCBIN "gfx/sprites/snorlax.2bpp"
 OldAmberSprite:        INCBIN "gfx/sprites/old_amber.2bpp"
 LyingOldManSprite:     INCBIN "gfx/sprites/lying_old_man.2bpp"
 
-PokemonLogoGraphics:            INCBIN "gfx/pokemon_logo.w128.2bpp"
-FontGraphics:                   INCBIN "gfx/font.w128.1bpp"
+PokemonLogoGraphics:            INCBIN "gfx/pokemon_logo.2bpp"
+FontGraphics:                   INCBIN "gfx/font.1bpp"
 ABTiles:                        INCBIN "gfx/AB.2bpp"
 HpBarAndStatusGraphics:         INCBIN "gfx/hp_bar_and_status.2bpp"
 BattleHudTiles1:                INCBIN "gfx/battle_hud1.1bpp"
 BattleHudTiles2:                INCBIN "gfx/battle_hud2.1bpp"
 BattleHudTiles3:                INCBIN "gfx/battle_hud3.1bpp"
-NintendoCopyrightLogoGraphics:  INCBIN "gfx/copyright.h8.2bpp"
-GamefreakLogoGraphics:          INCBIN "gfx/gamefreak.h8.2bpp"
+NintendoCopyrightLogoGraphics:  INCBIN "gfx/copyright.2bpp"
+GamefreakLogoGraphics:          INCBIN "gfx/gamefreak.2bpp"
 TextBoxGraphics:                INCBIN "gfx/text_box.2bpp"
 PokedexTileGraphics:            INCBIN "gfx/pokedex.2bpp"
 WorldMapTileGraphics:           INCBIN "gfx/town_map.2bpp"
@@ -6343,23 +6343,23 @@ INCLUDE "engine/hidden_object_functions18.asm"
 
 SECTION "bank19",ROMX,BANK[$19]
 
-Overworld_GFX:     INCBIN "gfx/tilesets/overworld.w128.t2.2bpp"
+Overworld_GFX:     INCBIN "gfx/tilesets/overworld.t2.2bpp"
 Overworld_Block:   INCBIN "gfx/blocksets/overworld.bst"
 
 RedsHouse1_GFX:
-RedsHouse2_GFX:    INCBIN "gfx/tilesets/reds_house.w128.t7.2bpp"
+RedsHouse2_GFX:    INCBIN "gfx/tilesets/reds_house.t7.2bpp"
 RedsHouse1_Block:
 RedsHouse2_Block:  INCBIN "gfx/blocksets/reds_house.bst"
 
-House_GFX:         INCBIN "gfx/tilesets/house.w128.t2.2bpp"
+House_GFX:         INCBIN "gfx/tilesets/house.t2.2bpp"
 House_Block:       INCBIN "gfx/blocksets/house.bst"
-Mansion_GFX:       INCBIN "gfx/tilesets/mansion.w128.t2.2bpp"
+Mansion_GFX:       INCBIN "gfx/tilesets/mansion.t2.2bpp"
 Mansion_Block:     INCBIN "gfx/blocksets/mansion.bst"
-ShipPort_GFX:      INCBIN "gfx/tilesets/ship_port.w128.t2.2bpp"
+ShipPort_GFX:      INCBIN "gfx/tilesets/ship_port.t2.2bpp"
 ShipPort_Block:    INCBIN "gfx/blocksets/ship_port.bst"
-Interior_GFX:      INCBIN "gfx/tilesets/interior.w128.t1.2bpp"
+Interior_GFX:      INCBIN "gfx/tilesets/interior.t1.2bpp"
 Interior_Block:    INCBIN "gfx/blocksets/interior.bst"
-Plateau_GFX:       INCBIN "gfx/tilesets/plateau.w128.t10.2bpp"
+Plateau_GFX:       INCBIN "gfx/tilesets/plateau.t10.2bpp"
 Plateau_Block:     INCBIN "gfx/blocksets/plateau.bst"
 
 
@@ -6369,50 +6369,50 @@ INCLUDE "engine/battle/1a.asm"
 
 Version_GFX:
 IF _RED
-	INCBIN "gfx/red/redgreenversion.h8.1bpp" ; 10 tiles
+	INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles
 ENDC
 IF _BLUE
-	INCBIN "gfx/blue/blueversion.h8.1bpp" ; 8 tiles
+	INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles
 ENDC
 
 Dojo_GFX:
-Gym_GFX:           INCBIN "gfx/tilesets/gym.w128.2bpp"
+Gym_GFX:           INCBIN "gfx/tilesets/gym.2bpp"
 Dojo_Block:
 Gym_Block:         INCBIN "gfx/blocksets/gym.bst"
 
 Mart_GFX:
-Pokecenter_GFX:    INCBIN "gfx/tilesets/pokecenter.w128.2bpp"
+Pokecenter_GFX:    INCBIN "gfx/tilesets/pokecenter.2bpp"
 Mart_Block:
 Pokecenter_Block:  INCBIN "gfx/blocksets/pokecenter.bst"
 
 ForestGate_GFX:
 Museum_GFX:
-Gate_GFX:          INCBIN "gfx/tilesets/gate.w128.t1.2bpp"
+Gate_GFX:          INCBIN "gfx/tilesets/gate.t1.2bpp"
 ForestGate_Block:
 Museum_Block:
 Gate_Block:        INCBIN "gfx/blocksets/gate.bst"
 
-Forest_GFX:        INCBIN "gfx/tilesets/forest.w128.2bpp"
+Forest_GFX:        INCBIN "gfx/tilesets/forest.2bpp"
 Forest_Block:      INCBIN "gfx/blocksets/forest.bst"
-Facility_GFX:      INCBIN "gfx/tilesets/facility.w128.2bpp"
+Facility_GFX:      INCBIN "gfx/tilesets/facility.2bpp"
 Facility_Block:    INCBIN "gfx/blocksets/facility.bst"
 
 
 SECTION "bank1B",ROMX,BANK[$1B]
 
-Cemetery_GFX:      INCBIN "gfx/tilesets/cemetery.w128.t4.2bpp"
+Cemetery_GFX:      INCBIN "gfx/tilesets/cemetery.t4.2bpp"
 Cemetery_Block:    INCBIN "gfx/blocksets/cemetery.bst"
-Cavern_GFX:        INCBIN "gfx/tilesets/cavern.w128.t14.2bpp"
+Cavern_GFX:        INCBIN "gfx/tilesets/cavern.t14.2bpp"
 Cavern_Block:      INCBIN "gfx/blocksets/cavern.bst"
-Lobby_GFX:         INCBIN "gfx/tilesets/lobby.w128.t2.2bpp"
+Lobby_GFX:         INCBIN "gfx/tilesets/lobby.t2.2bpp"
 Lobby_Block:       INCBIN "gfx/blocksets/lobby.bst"
-Ship_GFX:          INCBIN "gfx/tilesets/ship.w128.t6.2bpp"
+Ship_GFX:          INCBIN "gfx/tilesets/ship.t6.2bpp"
 Ship_Block:        INCBIN "gfx/blocksets/ship.bst"
-Lab_GFX:           INCBIN "gfx/tilesets/lab.w128.t4.2bpp"
+Lab_GFX:           INCBIN "gfx/tilesets/lab.t4.2bpp"
 Lab_Block:         INCBIN "gfx/blocksets/lab.bst"
-Club_GFX:          INCBIN "gfx/tilesets/club.w128.t5.2bpp"
+Club_GFX:          INCBIN "gfx/tilesets/club.t5.2bpp"
 Club_Block:        INCBIN "gfx/blocksets/club.bst"
-Underground_GFX:   INCBIN "gfx/tilesets/underground.w128.t7.2bpp"
+Underground_GFX:   INCBIN "gfx/tilesets/underground.t7.2bpp"
 Underground_Block: INCBIN "gfx/blocksets/underground.bst"