From 188ac8a9b4816dd98df0108314e58885c3b07452 Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 30 May 2014 01:30:10 -0700 Subject: [PATCH] Remove redundant dimensions in image filenames. --- data/sgb_border.asm | 4 +- engine/HoF_room_pc.asm | 2 +- engine/intro.asm | 2 +- engine/overworld/emotion_bubbles.asm | 2 +- gfx/{badges.w16.png => badges.png} | Bin .../{blueversion.h8.png => blueversion.png} | Bin .../{sgbborder.w128.png => sgbborder.png} | Bin gfx/{copyright.h8.png => copyright.png} | Bin ...on_bubbles.w16.png => emotion_bubbles.png} | Bin gfx/{font.w128.png => font.png} | Bin gfx/{gamefreak.h8.png => gamefreak.png} | Bin ...freak_intro.h8.png => gamefreak_intro.png} | Bin gfx/hp_bar_and_status.w80.png | Bin 257 -> 0 bytes ...pokemon_logo.w128.png => pokemon_logo.png} | Bin ...reenversion.h8.png => redgreenversion.png} | Bin gfx/red/{sgbborder.w128.png => sgbborder.png} | Bin ...0.interleave.png => theend.interleave.png} | Bin .../{cavern.w128.t14.png => cavern.t14.png} | Bin .../{cemetery.w128.t4.png => cemetery.t4.png} | Bin .../{club.w128.t5.png => club.t5.png} | Bin .../{facility.w128.png => facility.png} | Bin gfx/tilesets/{forest.w128.png => forest.png} | Bin .../{gate.w128.t1.png => gate.t1.png} | Bin gfx/tilesets/{gym.w128.png => gym.png} | Bin .../{house.w128.t2.png => house.t2.png} | Bin .../{interior.w128.t1.png => interior.t1.png} | Bin gfx/tilesets/{lab.w128.t4.png => lab.t4.png} | Bin .../{lobby.w128.t2.png => lobby.t2.png} | Bin .../{mansion.w128.t2.png => mansion.t2.png} | Bin ...overworld.w128.t2.png => overworld.t2.png} | Bin .../{plateau.w128.t10.png => plateau.t10.png} | Bin .../{pokecenter.w128.png => pokecenter.png} | Bin ...ds_house.w128.t7.png => reds_house.t7.png} | Bin .../{ship.w128.t6.png => ship.t6.png} | Bin ...ship_port.w128.t2.png => ship_port.t2.png} | Bin ...rground.w128.t7.png => underground.t7.png} | Bin main.asm | 52 +++++++++--------- 37 files changed, 31 insertions(+), 31 deletions(-) rename gfx/{badges.w16.png => badges.png} (100%) rename gfx/blue/{blueversion.h8.png => blueversion.png} (100%) rename gfx/blue/{sgbborder.w128.png => sgbborder.png} (100%) rename gfx/{copyright.h8.png => copyright.png} (100%) rename gfx/{emotion_bubbles.w16.png => emotion_bubbles.png} (100%) rename gfx/{font.w128.png => font.png} (100%) rename gfx/{gamefreak.h8.png => gamefreak.png} (100%) rename gfx/{gamefreak_intro.h8.png => gamefreak_intro.png} (100%) delete mode 100644 gfx/hp_bar_and_status.w80.png rename gfx/{pokemon_logo.w128.png => pokemon_logo.png} (100%) rename gfx/red/{redgreenversion.h8.png => redgreenversion.png} (100%) rename gfx/red/{sgbborder.w128.png => sgbborder.png} (100%) rename gfx/{theend.w40.interleave.png => theend.interleave.png} (100%) rename gfx/tilesets/{cavern.w128.t14.png => cavern.t14.png} (100%) rename gfx/tilesets/{cemetery.w128.t4.png => cemetery.t4.png} (100%) rename gfx/tilesets/{club.w128.t5.png => club.t5.png} (100%) rename gfx/tilesets/{facility.w128.png => facility.png} (100%) rename gfx/tilesets/{forest.w128.png => forest.png} (100%) rename gfx/tilesets/{gate.w128.t1.png => gate.t1.png} (100%) rename gfx/tilesets/{gym.w128.png => gym.png} (100%) rename gfx/tilesets/{house.w128.t2.png => house.t2.png} (100%) rename gfx/tilesets/{interior.w128.t1.png => interior.t1.png} (100%) rename gfx/tilesets/{lab.w128.t4.png => lab.t4.png} (100%) rename gfx/tilesets/{lobby.w128.t2.png => lobby.t2.png} (100%) rename gfx/tilesets/{mansion.w128.t2.png => mansion.t2.png} (100%) rename gfx/tilesets/{overworld.w128.t2.png => overworld.t2.png} (100%) rename gfx/tilesets/{plateau.w128.t10.png => plateau.t10.png} (100%) rename gfx/tilesets/{pokecenter.w128.png => pokecenter.png} (100%) rename gfx/tilesets/{reds_house.w128.t7.png => reds_house.t7.png} (100%) rename gfx/tilesets/{ship.w128.t6.png => ship.t6.png} (100%) rename gfx/tilesets/{ship_port.w128.t2.png => ship_port.t2.png} (100%) rename gfx/tilesets/{underground.w128.t7.png => underground.t7.png} (100%) 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 similarity index 100% rename from gfx/badges.w16.png rename to gfx/badges.png diff --git a/gfx/blue/blueversion.h8.png b/gfx/blue/blueversion.png similarity index 100% rename from gfx/blue/blueversion.h8.png rename to gfx/blue/blueversion.png diff --git a/gfx/blue/sgbborder.w128.png b/gfx/blue/sgbborder.png similarity index 100% rename from gfx/blue/sgbborder.w128.png rename to gfx/blue/sgbborder.png diff --git a/gfx/copyright.h8.png b/gfx/copyright.png similarity index 100% rename from gfx/copyright.h8.png rename to gfx/copyright.png diff --git a/gfx/emotion_bubbles.w16.png b/gfx/emotion_bubbles.png similarity index 100% rename from gfx/emotion_bubbles.w16.png rename to gfx/emotion_bubbles.png diff --git a/gfx/font.w128.png b/gfx/font.png similarity index 100% rename from gfx/font.w128.png rename to gfx/font.png diff --git a/gfx/gamefreak.h8.png b/gfx/gamefreak.png similarity index 100% rename from gfx/gamefreak.h8.png rename to gfx/gamefreak.png diff --git a/gfx/gamefreak_intro.h8.png b/gfx/gamefreak_intro.png similarity index 100% rename from gfx/gamefreak_intro.h8.png rename to 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 79830885f109674cde23527c2cb7013c2ecb6c4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmV+c0sj7pP)M4e0002UNklY}q|&1+uroHNB9Y(4q^?yBIc*~2H?VH@y(jg`u_jR+DahpdT(cfw?l1w%PuV=`C{ zNHXD&i%s>LyTMVendaIyx3HPzE7Bt;g{v`5^(zOAYN4zQCgJm$q!@@&1Y=0idKXhH zwwC}d!B1~U6<*+qiu;!!CN~pEsyA%OGP;rf!wstkx)Q$t9K2D|AD?o*00000NkvXX Hu0mjf!ZK^P diff --git a/gfx/pokemon_logo.w128.png b/gfx/pokemon_logo.png similarity index 100% rename from gfx/pokemon_logo.w128.png rename to gfx/pokemon_logo.png diff --git a/gfx/red/redgreenversion.h8.png b/gfx/red/redgreenversion.png similarity index 100% rename from gfx/red/redgreenversion.h8.png rename to gfx/red/redgreenversion.png diff --git a/gfx/red/sgbborder.w128.png b/gfx/red/sgbborder.png similarity index 100% rename from gfx/red/sgbborder.w128.png rename to gfx/red/sgbborder.png diff --git a/gfx/theend.w40.interleave.png b/gfx/theend.interleave.png similarity index 100% rename from gfx/theend.w40.interleave.png rename to gfx/theend.interleave.png diff --git a/gfx/tilesets/cavern.w128.t14.png b/gfx/tilesets/cavern.t14.png similarity index 100% rename from gfx/tilesets/cavern.w128.t14.png rename to gfx/tilesets/cavern.t14.png diff --git a/gfx/tilesets/cemetery.w128.t4.png b/gfx/tilesets/cemetery.t4.png similarity index 100% rename from gfx/tilesets/cemetery.w128.t4.png rename to gfx/tilesets/cemetery.t4.png diff --git a/gfx/tilesets/club.w128.t5.png b/gfx/tilesets/club.t5.png similarity index 100% rename from gfx/tilesets/club.w128.t5.png rename to gfx/tilesets/club.t5.png diff --git a/gfx/tilesets/facility.w128.png b/gfx/tilesets/facility.png similarity index 100% rename from gfx/tilesets/facility.w128.png rename to gfx/tilesets/facility.png diff --git a/gfx/tilesets/forest.w128.png b/gfx/tilesets/forest.png similarity index 100% rename from gfx/tilesets/forest.w128.png rename to gfx/tilesets/forest.png diff --git a/gfx/tilesets/gate.w128.t1.png b/gfx/tilesets/gate.t1.png similarity index 100% rename from gfx/tilesets/gate.w128.t1.png rename to gfx/tilesets/gate.t1.png diff --git a/gfx/tilesets/gym.w128.png b/gfx/tilesets/gym.png similarity index 100% rename from gfx/tilesets/gym.w128.png rename to gfx/tilesets/gym.png diff --git a/gfx/tilesets/house.w128.t2.png b/gfx/tilesets/house.t2.png similarity index 100% rename from gfx/tilesets/house.w128.t2.png rename to gfx/tilesets/house.t2.png diff --git a/gfx/tilesets/interior.w128.t1.png b/gfx/tilesets/interior.t1.png similarity index 100% rename from gfx/tilesets/interior.w128.t1.png rename to gfx/tilesets/interior.t1.png diff --git a/gfx/tilesets/lab.w128.t4.png b/gfx/tilesets/lab.t4.png similarity index 100% rename from gfx/tilesets/lab.w128.t4.png rename to gfx/tilesets/lab.t4.png diff --git a/gfx/tilesets/lobby.w128.t2.png b/gfx/tilesets/lobby.t2.png similarity index 100% rename from gfx/tilesets/lobby.w128.t2.png rename to gfx/tilesets/lobby.t2.png diff --git a/gfx/tilesets/mansion.w128.t2.png b/gfx/tilesets/mansion.t2.png similarity index 100% rename from gfx/tilesets/mansion.w128.t2.png rename to gfx/tilesets/mansion.t2.png diff --git a/gfx/tilesets/overworld.w128.t2.png b/gfx/tilesets/overworld.t2.png similarity index 100% rename from gfx/tilesets/overworld.w128.t2.png rename to gfx/tilesets/overworld.t2.png diff --git a/gfx/tilesets/plateau.w128.t10.png b/gfx/tilesets/plateau.t10.png similarity index 100% rename from gfx/tilesets/plateau.w128.t10.png rename to gfx/tilesets/plateau.t10.png diff --git a/gfx/tilesets/pokecenter.w128.png b/gfx/tilesets/pokecenter.png similarity index 100% rename from gfx/tilesets/pokecenter.w128.png rename to gfx/tilesets/pokecenter.png diff --git a/gfx/tilesets/reds_house.w128.t7.png b/gfx/tilesets/reds_house.t7.png similarity index 100% rename from gfx/tilesets/reds_house.w128.t7.png rename to gfx/tilesets/reds_house.t7.png diff --git a/gfx/tilesets/ship.w128.t6.png b/gfx/tilesets/ship.t6.png similarity index 100% rename from gfx/tilesets/ship.w128.t6.png rename to gfx/tilesets/ship.t6.png diff --git a/gfx/tilesets/ship_port.w128.t2.png b/gfx/tilesets/ship_port.t2.png similarity index 100% rename from gfx/tilesets/ship_port.w128.t2.png rename to gfx/tilesets/ship_port.t2.png diff --git a/gfx/tilesets/underground.w128.t7.png b/gfx/tilesets/underground.t7.png similarity index 100% rename from gfx/tilesets/underground.w128.t7.png rename to 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"