From 6a66f28bf5af0db4484dc0450eeeb343e5bdda3f Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 2 Apr 2014 00:16:03 -0400 Subject: Fix image extensions in gfx/{credits,misc}. --- engine/credits.asm | 10 +++++----- gfx/credits/border.2bpp | Bin 144 -> 0 bytes gfx/credits/border.w72.2bpp | Bin 0 -> 144 bytes gfx/credits/ditto.2bpp | Bin 1024 -> 0 bytes gfx/credits/ditto.w32.2bpp | Bin 0 -> 1024 bytes gfx/credits/igglybuff.2bpp | Bin 1024 -> 0 bytes gfx/credits/igglybuff.w32.2bpp | Bin 0 -> 1024 bytes gfx/credits/pichu.2bpp | Bin 1024 -> 0 bytes gfx/credits/pichu.w32.2bpp | Bin 0 -> 1024 bytes gfx/credits/smoochum.2bpp | Bin 1024 -> 0 bytes gfx/credits/smoochum.w32.2bpp | Bin 0 -> 1024 bytes gfx/credits/theend.2bpp | Bin 256 -> 0 bytes gfx/credits/theend.w64.2bpp | Bin 0 -> 256 bytes gfx/misc/badges.2bpp | Bin 704 -> 0 bytes gfx/misc/badges.w16.2bpp | Bin 0 -> 704 bytes gfx/misc/dude.6x6.2bpp.lz | Bin 0 -> 320 bytes gfx/misc/dude.lz | Bin 320 -> 0 bytes gfx/misc/font.1bpp | Bin 1024 -> 0 bytes gfx/misc/font.w128.1bpp | Bin 0 -> 1024 bytes gfx/misc/font_inversed.1bpp | 1 - gfx/misc/font_inversed.w128.1bpp | 1 + gfx/misc/footprints.1bpp | 1 - gfx/misc/footprints.w128.1bpp | 1 + gfx/misc/gbc_only.lz | Bin 1350 -> 0 bytes gfx/misc/gbc_only.w112.2bpp.lz | Bin 0 -> 1350 bytes gfx/misc/leaders.2bpp | Bin 1376 -> 0 bytes gfx/misc/leaders.w24.2bpp | Bin 0 -> 1376 bytes gfx/misc/pack.2bpp | Bin 960 -> 0 bytes gfx/misc/pack.w40.2bpp | Bin 0 -> 960 bytes gfx/misc/pack_f.2bpp | Bin 960 -> 0 bytes gfx/misc/pack_f.w40.2bpp | Bin 0 -> 960 bytes gfx/misc/player.6x6.2bpp.lz | Bin 0 -> 400 bytes gfx/misc/player.lz | Bin 400 -> 0 bytes gfx/misc/pokegear.2bpp.lz | Bin 0 -> 739 bytes gfx/misc/pokegear.lz | Bin 739 -> 0 bytes gfx/misc/pokegear_sprites.2bpp.lz | Bin 0 -> 43 bytes gfx/misc/pokegear_sprites.lz | Bin 43 -> 0 bytes gfx/misc/town_map.2bpp.lz | Bin 0 -> 772 bytes gfx/misc/town_map.lz | Bin 772 -> 0 bytes main.asm | 30 +++++++++++++++--------------- misc/gbc_only.asm | 10 +++++----- 41 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 gfx/credits/border.2bpp create mode 100644 gfx/credits/border.w72.2bpp delete mode 100644 gfx/credits/ditto.2bpp create mode 100644 gfx/credits/ditto.w32.2bpp delete mode 100644 gfx/credits/igglybuff.2bpp create mode 100644 gfx/credits/igglybuff.w32.2bpp delete mode 100644 gfx/credits/pichu.2bpp create mode 100644 gfx/credits/pichu.w32.2bpp delete mode 100644 gfx/credits/smoochum.2bpp create mode 100644 gfx/credits/smoochum.w32.2bpp delete mode 100644 gfx/credits/theend.2bpp create mode 100644 gfx/credits/theend.w64.2bpp delete mode 100644 gfx/misc/badges.2bpp create mode 100644 gfx/misc/badges.w16.2bpp create mode 100644 gfx/misc/dude.6x6.2bpp.lz delete mode 100644 gfx/misc/dude.lz delete mode 100644 gfx/misc/font.1bpp create mode 100644 gfx/misc/font.w128.1bpp delete mode 100644 gfx/misc/font_inversed.1bpp create mode 100644 gfx/misc/font_inversed.w128.1bpp delete mode 100644 gfx/misc/footprints.1bpp create mode 100644 gfx/misc/footprints.w128.1bpp delete mode 100644 gfx/misc/gbc_only.lz create mode 100644 gfx/misc/gbc_only.w112.2bpp.lz delete mode 100644 gfx/misc/leaders.2bpp create mode 100644 gfx/misc/leaders.w24.2bpp delete mode 100644 gfx/misc/pack.2bpp create mode 100644 gfx/misc/pack.w40.2bpp delete mode 100644 gfx/misc/pack_f.2bpp create mode 100644 gfx/misc/pack_f.w40.2bpp create mode 100644 gfx/misc/player.6x6.2bpp.lz delete mode 100644 gfx/misc/player.lz create mode 100644 gfx/misc/pokegear.2bpp.lz delete mode 100644 gfx/misc/pokegear.lz create mode 100644 gfx/misc/pokegear_sprites.2bpp.lz delete mode 100644 gfx/misc/pokegear_sprites.lz create mode 100644 gfx/misc/town_map.2bpp.lz delete mode 100644 gfx/misc/town_map.lz diff --git a/engine/credits.asm b/engine/credits.asm index 42144c5d2..a68f7ceb0 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -803,13 +803,13 @@ Function109c1c: ; 109c1c (42:5c1c) ; 109c24 (42:5c24) -CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp" +CreditsBorderGFX: INCBIN "gfx/credits/border.w72.2bpp" CreditsMonsGFX: -CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp" -CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp" -CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp" -CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp" +CreditsPichuGFX: INCBIN "gfx/credits/pichu.w32.2bpp" +CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.w32.2bpp" +CreditsDittoGFX: INCBIN "gfx/credits/ditto.w32.2bpp" +CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.w32.2bpp" CreditsScript: ; 10acb4 diff --git a/gfx/credits/border.2bpp b/gfx/credits/border.2bpp deleted file mode 100644 index 32b3fead9..000000000 Binary files a/gfx/credits/border.2bpp and /dev/null differ diff --git a/gfx/credits/border.w72.2bpp b/gfx/credits/border.w72.2bpp new file mode 100644 index 000000000..32b3fead9 Binary files /dev/null and b/gfx/credits/border.w72.2bpp differ diff --git a/gfx/credits/ditto.2bpp b/gfx/credits/ditto.2bpp deleted file mode 100644 index 59677a90f..000000000 Binary files a/gfx/credits/ditto.2bpp and /dev/null differ diff --git a/gfx/credits/ditto.w32.2bpp b/gfx/credits/ditto.w32.2bpp new file mode 100644 index 000000000..59677a90f Binary files /dev/null and b/gfx/credits/ditto.w32.2bpp differ diff --git a/gfx/credits/igglybuff.2bpp b/gfx/credits/igglybuff.2bpp deleted file mode 100644 index a626c758d..000000000 Binary files a/gfx/credits/igglybuff.2bpp and /dev/null differ diff --git a/gfx/credits/igglybuff.w32.2bpp b/gfx/credits/igglybuff.w32.2bpp new file mode 100644 index 000000000..a626c758d Binary files /dev/null and b/gfx/credits/igglybuff.w32.2bpp differ diff --git a/gfx/credits/pichu.2bpp b/gfx/credits/pichu.2bpp deleted file mode 100644 index da635e6b4..000000000 Binary files a/gfx/credits/pichu.2bpp and /dev/null differ diff --git a/gfx/credits/pichu.w32.2bpp b/gfx/credits/pichu.w32.2bpp new file mode 100644 index 000000000..da635e6b4 Binary files /dev/null and b/gfx/credits/pichu.w32.2bpp differ diff --git a/gfx/credits/smoochum.2bpp b/gfx/credits/smoochum.2bpp deleted file mode 100644 index 83926ec95..000000000 Binary files a/gfx/credits/smoochum.2bpp and /dev/null differ diff --git a/gfx/credits/smoochum.w32.2bpp b/gfx/credits/smoochum.w32.2bpp new file mode 100644 index 000000000..83926ec95 Binary files /dev/null and b/gfx/credits/smoochum.w32.2bpp differ diff --git a/gfx/credits/theend.2bpp b/gfx/credits/theend.2bpp deleted file mode 100644 index b689688ba..000000000 Binary files a/gfx/credits/theend.2bpp and /dev/null differ diff --git a/gfx/credits/theend.w64.2bpp b/gfx/credits/theend.w64.2bpp new file mode 100644 index 000000000..b689688ba Binary files /dev/null and b/gfx/credits/theend.w64.2bpp differ diff --git a/gfx/misc/badges.2bpp b/gfx/misc/badges.2bpp deleted file mode 100644 index 52cf24e1b..000000000 Binary files a/gfx/misc/badges.2bpp and /dev/null differ diff --git a/gfx/misc/badges.w16.2bpp b/gfx/misc/badges.w16.2bpp new file mode 100644 index 000000000..52cf24e1b Binary files /dev/null and b/gfx/misc/badges.w16.2bpp differ diff --git a/gfx/misc/dude.6x6.2bpp.lz b/gfx/misc/dude.6x6.2bpp.lz new file mode 100644 index 000000000..b8e96a09f Binary files /dev/null and b/gfx/misc/dude.6x6.2bpp.lz differ diff --git a/gfx/misc/dude.lz b/gfx/misc/dude.lz deleted file mode 100644 index b8e96a09f..000000000 Binary files a/gfx/misc/dude.lz and /dev/null differ diff --git a/gfx/misc/font.1bpp b/gfx/misc/font.1bpp deleted file mode 100644 index ff8d2d4fe..000000000 Binary files a/gfx/misc/font.1bpp and /dev/null differ diff --git a/gfx/misc/font.w128.1bpp b/gfx/misc/font.w128.1bpp new file mode 100644 index 000000000..ff8d2d4fe Binary files /dev/null and b/gfx/misc/font.w128.1bpp differ diff --git a/gfx/misc/font_inversed.1bpp b/gfx/misc/font_inversed.1bpp deleted file mode 100644 index 39a7e73d6..000000000 --- a/gfx/misc/font_inversed.1bpp +++ /dev/null @@ -1 +0,0 @@ -׻}}{{}}ý{}}}{ýa}}}}}}}www{woO7{}}9Um}}}}=]muy}ǻ}}}}}ǻ}}u}}w{}{}}}}}}}}}}mU99}9׻9}߿ûýmmmmýÿ}mmU;׹߁׻}}ǻ}}}}}}ûý=}7w?i?l?a?A?]ouu'Www1ϗͥ3?ýǫmǻߏߏ׻߿ǻdz9999Ó39?99999999 \ No newline at end of file diff --git a/gfx/misc/font_inversed.w128.1bpp b/gfx/misc/font_inversed.w128.1bpp new file mode 100644 index 000000000..39a7e73d6 --- /dev/null +++ b/gfx/misc/font_inversed.w128.1bpp @@ -0,0 +1 @@ +׻}}{{}}ý{}}}{ýa}}}}}}}www{woO7{}}9Um}}}}=]muy}ǻ}}}}}ǻ}}u}}w{}{}}}}}}}}}}mU99}9׻9}߿ûýmmmmýÿ}mmU;׹߁׻}}ǻ}}}}}}ûý=}7w?i?l?a?A?]ouu'Www1ϗͥ3?ýǫmǻߏߏ׻߿ǻdz9999Ó39?99999999 \ No newline at end of file diff --git a/gfx/misc/footprints.1bpp b/gfx/misc/footprints.1bpp deleted file mode 100644 index 005bfee0f..000000000 --- a/gfx/misc/footprints.1bpp +++ /dev/null @@ -1 +0,0 @@ -/w'7'o/7'7'_o/????????'#???????????????w7##?o'ogGG????????????_??oO????????oG??χOO?????ϟ???????????????????????????_'7'ތccCÇ???????????/'?ߟ??????????LJ?/o??????OG????ߏ????sCϟ?=q????_O?OG????g???oO??ߏߏ?ߟ???Ϗ?????????????;37???ߟ????????????OOOOϏ??Ϗ????ߏoO733cgG????????LJ??{913#o''''g/''χ????????OO????????'?_??_???????????????????ϟsc?O????????????????????????????????????·??s??????????????????????????7''_O?_wgoO?????????????????_OG????????O?????????c7?O? ??????????? ???????Ç??O?G???g''o????Ǐ????ߟ_?'????????OGoggOO?7# 7# 7#+7##7##?O???????? \ No newline at end of file diff --git a/gfx/misc/footprints.w128.1bpp b/gfx/misc/footprints.w128.1bpp new file mode 100644 index 000000000..005bfee0f --- /dev/null +++ b/gfx/misc/footprints.w128.1bpp @@ -0,0 +1 @@ +/w'7'o/7'7'_o/????????'#???????????????w7##?o'ogGG????????????_??oO????????oG??χOO?????ϟ???????????????????????????_'7'ތccCÇ???????????/'?ߟ??????????LJ?/o??????OG????ߏ????sCϟ?=q????_O?OG????g???oO??ߏߏ?ߟ???Ϗ?????????????;37???ߟ????????????OOOOϏ??Ϗ????ߏoO733cgG????????LJ??{913#o''''g/''χ????????OO????????'?_??_???????????????????ϟsc?O????????????????????????????????????·??s??????????????????????????7''_O?_wgoO?????????????????_OG????????O?????????c7?O? ??????????? ???????Ç??O?G???g''o????Ǐ????ߟ_?'????????OGoggOO?7# 7# 7#+7##7##?O???????? \ No newline at end of file diff --git a/gfx/misc/gbc_only.lz b/gfx/misc/gbc_only.lz deleted file mode 100644 index 9533fbe6d..000000000 Binary files a/gfx/misc/gbc_only.lz and /dev/null differ diff --git a/gfx/misc/gbc_only.w112.2bpp.lz b/gfx/misc/gbc_only.w112.2bpp.lz new file mode 100644 index 000000000..9533fbe6d Binary files /dev/null and b/gfx/misc/gbc_only.w112.2bpp.lz differ diff --git a/gfx/misc/leaders.2bpp b/gfx/misc/leaders.2bpp deleted file mode 100644 index fecae45db..000000000 Binary files a/gfx/misc/leaders.2bpp and /dev/null differ diff --git a/gfx/misc/leaders.w24.2bpp b/gfx/misc/leaders.w24.2bpp new file mode 100644 index 000000000..fecae45db Binary files /dev/null and b/gfx/misc/leaders.w24.2bpp differ diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.2bpp deleted file mode 100644 index 22be55081..000000000 Binary files a/gfx/misc/pack.2bpp and /dev/null differ diff --git a/gfx/misc/pack.w40.2bpp b/gfx/misc/pack.w40.2bpp new file mode 100644 index 000000000..22be55081 Binary files /dev/null and b/gfx/misc/pack.w40.2bpp differ diff --git a/gfx/misc/pack_f.2bpp b/gfx/misc/pack_f.2bpp deleted file mode 100644 index 60d6b7f91..000000000 Binary files a/gfx/misc/pack_f.2bpp and /dev/null differ diff --git a/gfx/misc/pack_f.w40.2bpp b/gfx/misc/pack_f.w40.2bpp new file mode 100644 index 000000000..60d6b7f91 Binary files /dev/null and b/gfx/misc/pack_f.w40.2bpp differ diff --git a/gfx/misc/player.6x6.2bpp.lz b/gfx/misc/player.6x6.2bpp.lz new file mode 100644 index 000000000..aec84bbab Binary files /dev/null and b/gfx/misc/player.6x6.2bpp.lz differ diff --git a/gfx/misc/player.lz b/gfx/misc/player.lz deleted file mode 100644 index aec84bbab..000000000 Binary files a/gfx/misc/player.lz and /dev/null differ diff --git a/gfx/misc/pokegear.2bpp.lz b/gfx/misc/pokegear.2bpp.lz new file mode 100644 index 000000000..9db046141 Binary files /dev/null and b/gfx/misc/pokegear.2bpp.lz differ diff --git a/gfx/misc/pokegear.lz b/gfx/misc/pokegear.lz deleted file mode 100644 index 9db046141..000000000 Binary files a/gfx/misc/pokegear.lz and /dev/null differ diff --git a/gfx/misc/pokegear_sprites.2bpp.lz b/gfx/misc/pokegear_sprites.2bpp.lz new file mode 100644 index 000000000..e64a385be Binary files /dev/null and b/gfx/misc/pokegear_sprites.2bpp.lz differ diff --git a/gfx/misc/pokegear_sprites.lz b/gfx/misc/pokegear_sprites.lz deleted file mode 100644 index e64a385be..000000000 Binary files a/gfx/misc/pokegear_sprites.lz and /dev/null differ diff --git a/gfx/misc/town_map.2bpp.lz b/gfx/misc/town_map.2bpp.lz new file mode 100644 index 000000000..c807a372f Binary files /dev/null and b/gfx/misc/town_map.2bpp.lz differ diff --git a/gfx/misc/town_map.lz b/gfx/misc/town_map.lz deleted file mode 100644 index c807a372f..000000000 Binary files a/gfx/misc/town_map.lz and /dev/null differ diff --git a/main.asm b/main.asm index e60c53fe2..8f7f57105 100644 --- a/main.asm +++ b/main.asm @@ -16425,7 +16425,7 @@ PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp" PackGFX: -INCBIN "gfx/misc/pack.2bpp" +INCBIN "gfx/misc/pack.w40.2bpp" Function113d6: ; 113d6 call Function114dd @@ -34515,10 +34515,10 @@ Unknown_254c9: ; 254c9 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" -LeaderGFX: INCBIN "gfx/misc/leaders.2bpp" -LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp" -BadgeGFX: INCBIN "gfx/misc/badges.2bpp" -BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" +LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" +LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" +BadgeGFX: INCBIN "gfx/misc/badges.w16.2bpp" +BadgeGFX2: INCBIN "gfx/misc/badges.w16.2bpp" CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp" @@ -41629,11 +41629,11 @@ Function2ba01: ; 2ba01 ChrisBackpic: ; 2ba1a -INCBIN "gfx/misc/player.lz" +INCBIN "gfx/misc/player.6x6.2bpp.lz" ; 2bbaa DudeBackpic: ; 2bbaa -INCBIN "gfx/misc/dude.lz" +INCBIN "gfx/misc/dude.6x6.2bpp.lz" ; 2bcea @@ -51182,7 +51182,7 @@ PackFGFXPointers: ; 48e93 ; 48e9b PackFGFX: ; 48e9b -INCBIN "gfx/misc/pack_f.2bpp" +INCBIN "gfx/misc/pack_f.w40.2bpp" ; 4925b Function4925b: ; 4925b @@ -76413,7 +76413,7 @@ Function914bb: ; 914bb (24:54bb) INCBIN "baserom.gbc",$914ce,$914dd - $914ce PokegearSpritesGFX: ; 914dd -INCBIN "gfx/misc/pokegear_sprites.lz" +INCBIN "gfx/misc/pokegear_sprites.2bpp.lz" ; 91508 INCBIN "baserom.gbc",$91508,$9163e - $91508 @@ -81535,7 +81535,7 @@ Functioncbce5: ; cbce5 ; cbd2e TheEndGFX:: ; cbd2e -INCBIN "gfx/credits/theend.2bpp" +INCBIN "gfx/credits/theend.w64.2bpp" ; cbe2e @@ -81710,7 +81710,7 @@ INCLUDE "gfx/pics/kanto_frames.asm" SECTION "bank36", ROMX, BANK[$36] -FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" +FontInversed: INCBIN "gfx/misc/font_inversed.w128.1bpp" SECTION "Pic Animations 3", ROMX, BANK[$36] @@ -87911,7 +87911,7 @@ FontExtra: INCBIN "gfx/misc/font_extra.2bpp" Font: -INCBIN "gfx/misc/font.1bpp" +INCBIN "gfx/misc/font.w128.1bpp" FontBattleExtra: INCBIN "gfx/misc/font_battle_extra.2bpp" @@ -87954,7 +87954,7 @@ INCBIN "baserom.gbc", $f8b10, $f8ba0 - $f8b10 ; f8ba0 TownMapGFX: ; f8ba0 -INCBIN "gfx/misc/town_map.lz" +INCBIN "gfx/misc/town_map.2bpp.lz" ; f8ea4 GFX_f8ea4: ; f8ea4 @@ -87986,7 +87986,7 @@ INCBIN "baserom.gbc", $f9424, $f9434 - $f9424 ; f9434 Footprints: ; f9434 -INCBIN "gfx/misc/footprints.1bpp" +INCBIN "gfx/misc/footprints.w128.1bpp" ; fb434 INCBIN "baserom.gbc", $fb434, $fb449 - $fb434 @@ -107093,7 +107093,7 @@ Function1de2c5: ; 1de2c5 ; 1de2e4 PokegearGFX: ; 1de2e4 -INCBIN "gfx/misc/pokegear.lz" +INCBIN "gfx/misc/pokegear.2bpp.lz" ; 1de5c7 INCBIN "baserom.gbc",$1de5c7,$1de5c8 - $1de5c7 diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index dfe9e2fb6..d642d6c24 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -137,14 +137,14 @@ DrawGBCOnlyGraphic: ; 4eb27 GBCOnlyString: ; 4eb38 - db "This Game Pak is", $4e - db "designed only for", $4e - db "use on the", $4e - db "Game Boy Color.@" + db "This Game Pak is" + next "designed only for" + next "use on the" + next "Game Boy Color.@" ; 4eb76 GBCOnlyGFX: ; 4eb76 -INCBIN "gfx/misc/gbc_only.lz" +INCBIN "gfx/misc/gbc_only.w112.2bpp.lz" ; 4f0bc -- cgit v1.2.3