summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-04-02 00:37:12 -0400
committeryenatch <yenatch@gmail.com>2014-04-02 00:41:56 -0400
commit73ffc4677a44030b2a2078dc377b6cb684a82959 (patch)
treee612b2393d1d2d610a6ab33d945ea60f18335bd2
parent6a66f28bf5af0db4484dc0450eeeb343e5bdda3f (diff)
Image extensions in gfx/{intro,title}.
-rw-r--r--engine/title.asm6
-rw-r--r--gfx/intro/001.tilemap.lz (renamed from gfx/intro/001.lz)bin16 -> 16 bytes
-rw-r--r--gfx/intro/002.tilemap.lz (renamed from gfx/intro/002.lz)bin64 -> 64 bytes
-rw-r--r--gfx/intro/003.tilemap.lz (renamed from gfx/intro/003.lz)bin16 -> 16 bytes
-rw-r--r--gfx/intro/004.tilemap.lz (renamed from gfx/intro/004.lz)bin96 -> 96 bytes
-rw-r--r--gfx/intro/005.tilemap.lz (renamed from gfx/intro/005.lz)bin32 -> 32 bytes
-rw-r--r--gfx/intro/006.tilemap.lz (renamed from gfx/intro/006.lz)bin80 -> 80 bytes
-rw-r--r--gfx/intro/007.tilemap.lz (renamed from gfx/intro/007.lz)bin80 -> 80 bytes
-rw-r--r--gfx/intro/008.tilemap.lz (renamed from gfx/intro/008.lz)bin192 -> 192 bytes
-rw-r--r--gfx/intro/009.tilemap.lz (renamed from gfx/intro/009.lz)bin16 -> 16 bytes
-rw-r--r--gfx/intro/010.tilemap.lz (renamed from gfx/intro/010.lz)bin96 -> 96 bytes
-rw-r--r--gfx/intro/011.tilemap.lz (renamed from gfx/intro/011.lz)bin96 -> 96 bytes
-rw-r--r--gfx/intro/012.tilemap.lz (renamed from gfx/intro/012.lz)bin208 -> 208 bytes
-rw-r--r--gfx/intro/013.tilemap.lz (renamed from gfx/intro/013.lz)bin80 -> 80 bytes
-rw-r--r--gfx/intro/014.tilemap.lz (renamed from gfx/intro/014.lz)bin208 -> 208 bytes
-rw-r--r--gfx/intro/015.tilemap.lz (renamed from gfx/intro/015.lz)bin48 -> 48 bytes
-rw-r--r--gfx/intro/017.tilemap.lz (renamed from gfx/intro/017.lz)bin64 -> 64 bytes
-rw-r--r--gfx/intro/background.2bpp.lz (renamed from gfx/intro/background.lz)bin496 -> 496 bytes
-rw-r--r--gfx/intro/crystal_unowns.2bpp.lz (renamed from gfx/intro/crystal_unowns.lz)bin256 -> 256 bytes
-rw-r--r--gfx/intro/logo.2bpp.lz (renamed from gfx/intro/logo.lz)bin1088 -> 1088 bytes
-rw-r--r--gfx/intro/pichu_wooper.2bpp.lz (renamed from gfx/intro/pichu_wooper.lz)bin848 -> 848 bytes
-rw-r--r--gfx/intro/pulse.2bpp.lz (renamed from gfx/intro/pulse.lz)bin144 -> 144 bytes
-rw-r--r--gfx/intro/suicune_back.2bpp.lz (renamed from gfx/intro/suicune_back.lz)bin928 -> 928 bytes
-rw-r--r--gfx/intro/suicune_close.2bpp.lz (renamed from gfx/intro/suicune_close.lz)bin1056 -> 1056 bytes
-rw-r--r--gfx/intro/suicune_jump.2bpp.lz (renamed from gfx/intro/suicune_jump.lz)bin1216 -> 1216 bytes
-rw-r--r--gfx/intro/suicune_run.2bpp.lz (renamed from gfx/intro/suicune_run.lz)bin976 -> 976 bytes
-rw-r--r--gfx/intro/unown_back.2bpp.lz (renamed from gfx/intro/unown_back.lz)bin320 -> 320 bytes
-rw-r--r--gfx/intro/unowns.2bpp.lz (renamed from gfx/intro/unowns.lz)bin1008 -> 1008 bytes
-rw-r--r--gfx/title/crystal.w48.interleave.2bpp.lz (renamed from gfx/title/crystal.lz)bin496 -> 496 bytes
-rw-r--r--gfx/title/logo.w160.t4.2bpp.lz (renamed from gfx/title/logo.lz)bin2504 -> 2504 bytes
-rw-r--r--gfx/title/suicune.w128.2bpp.lz (renamed from gfx/title/suicune.lz)bin992 -> 992 bytes
-rw-r--r--gfx/trade/game_boy.2bpp.lz (renamed from gfx/trade/game_boy.lz)bin320 -> 320 bytes
-rw-r--r--main.asm56
33 files changed, 31 insertions, 31 deletions
diff --git a/engine/title.asm b/engine/title.asm
index 5e444cff1..39025b2f1 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -375,15 +375,15 @@ AnimateTitleCrystal: ; 10ef32
; 10ef46
TitleSuicuneGFX: ; 10ef46
-INCBIN "gfx/title/suicune.lz"
+INCBIN "gfx/title/suicune.w128.2bpp.lz"
; 10f326
TitleLogoGFX: ; 10f326
-INCBIN "gfx/title/logo.lz"
+INCBIN "gfx/title/logo.w160.t4.2bpp.lz"
; 10fcee
TitleCrystalGFX: ; 10fcee
-INCBIN "gfx/title/crystal.lz"
+INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz"
; 10fede
TitleScreenPalettes:
diff --git a/gfx/intro/001.lz b/gfx/intro/001.tilemap.lz
index 926fb6e8e..926fb6e8e 100644
--- a/gfx/intro/001.lz
+++ b/gfx/intro/001.tilemap.lz
Binary files differ
diff --git a/gfx/intro/002.lz b/gfx/intro/002.tilemap.lz
index c63f215f2..c63f215f2 100644
--- a/gfx/intro/002.lz
+++ b/gfx/intro/002.tilemap.lz
Binary files differ
diff --git a/gfx/intro/003.lz b/gfx/intro/003.tilemap.lz
index 182ffb130..182ffb130 100644
--- a/gfx/intro/003.lz
+++ b/gfx/intro/003.tilemap.lz
Binary files differ
diff --git a/gfx/intro/004.lz b/gfx/intro/004.tilemap.lz
index 5897d176b..5897d176b 100644
--- a/gfx/intro/004.lz
+++ b/gfx/intro/004.tilemap.lz
Binary files differ
diff --git a/gfx/intro/005.lz b/gfx/intro/005.tilemap.lz
index 0ae96b7f7..0ae96b7f7 100644
--- a/gfx/intro/005.lz
+++ b/gfx/intro/005.tilemap.lz
Binary files differ
diff --git a/gfx/intro/006.lz b/gfx/intro/006.tilemap.lz
index 46436b607..46436b607 100644
--- a/gfx/intro/006.lz
+++ b/gfx/intro/006.tilemap.lz
Binary files differ
diff --git a/gfx/intro/007.lz b/gfx/intro/007.tilemap.lz
index d1694ed3e..d1694ed3e 100644
--- a/gfx/intro/007.lz
+++ b/gfx/intro/007.tilemap.lz
Binary files differ
diff --git a/gfx/intro/008.lz b/gfx/intro/008.tilemap.lz
index 356c6d5e8..356c6d5e8 100644
--- a/gfx/intro/008.lz
+++ b/gfx/intro/008.tilemap.lz
Binary files differ
diff --git a/gfx/intro/009.lz b/gfx/intro/009.tilemap.lz
index 238d6a60e..238d6a60e 100644
--- a/gfx/intro/009.lz
+++ b/gfx/intro/009.tilemap.lz
Binary files differ
diff --git a/gfx/intro/010.lz b/gfx/intro/010.tilemap.lz
index 6e45c45f7..6e45c45f7 100644
--- a/gfx/intro/010.lz
+++ b/gfx/intro/010.tilemap.lz
Binary files differ
diff --git a/gfx/intro/011.lz b/gfx/intro/011.tilemap.lz
index 68ceb19f8..68ceb19f8 100644
--- a/gfx/intro/011.lz
+++ b/gfx/intro/011.tilemap.lz
Binary files differ
diff --git a/gfx/intro/012.lz b/gfx/intro/012.tilemap.lz
index 0d6af294c..0d6af294c 100644
--- a/gfx/intro/012.lz
+++ b/gfx/intro/012.tilemap.lz
Binary files differ
diff --git a/gfx/intro/013.lz b/gfx/intro/013.tilemap.lz
index 91635527c..91635527c 100644
--- a/gfx/intro/013.lz
+++ b/gfx/intro/013.tilemap.lz
Binary files differ
diff --git a/gfx/intro/014.lz b/gfx/intro/014.tilemap.lz
index a892ab1b4..a892ab1b4 100644
--- a/gfx/intro/014.lz
+++ b/gfx/intro/014.tilemap.lz
Binary files differ
diff --git a/gfx/intro/015.lz b/gfx/intro/015.tilemap.lz
index 22a4cc926..22a4cc926 100644
--- a/gfx/intro/015.lz
+++ b/gfx/intro/015.tilemap.lz
Binary files differ
diff --git a/gfx/intro/017.lz b/gfx/intro/017.tilemap.lz
index 90ce59e58..90ce59e58 100644
--- a/gfx/intro/017.lz
+++ b/gfx/intro/017.tilemap.lz
Binary files differ
diff --git a/gfx/intro/background.lz b/gfx/intro/background.2bpp.lz
index 1ef2f1203..1ef2f1203 100644
--- a/gfx/intro/background.lz
+++ b/gfx/intro/background.2bpp.lz
Binary files differ
diff --git a/gfx/intro/crystal_unowns.lz b/gfx/intro/crystal_unowns.2bpp.lz
index 2585d9c52..2585d9c52 100644
--- a/gfx/intro/crystal_unowns.lz
+++ b/gfx/intro/crystal_unowns.2bpp.lz
Binary files differ
diff --git a/gfx/intro/logo.lz b/gfx/intro/logo.2bpp.lz
index 5beb0e6ef..5beb0e6ef 100644
--- a/gfx/intro/logo.lz
+++ b/gfx/intro/logo.2bpp.lz
Binary files differ
diff --git a/gfx/intro/pichu_wooper.lz b/gfx/intro/pichu_wooper.2bpp.lz
index 90174a098..90174a098 100644
--- a/gfx/intro/pichu_wooper.lz
+++ b/gfx/intro/pichu_wooper.2bpp.lz
Binary files differ
diff --git a/gfx/intro/pulse.lz b/gfx/intro/pulse.2bpp.lz
index 5a7fec1a9..5a7fec1a9 100644
--- a/gfx/intro/pulse.lz
+++ b/gfx/intro/pulse.2bpp.lz
Binary files differ
diff --git a/gfx/intro/suicune_back.lz b/gfx/intro/suicune_back.2bpp.lz
index 470d78b5b..470d78b5b 100644
--- a/gfx/intro/suicune_back.lz
+++ b/gfx/intro/suicune_back.2bpp.lz
Binary files differ
diff --git a/gfx/intro/suicune_close.lz b/gfx/intro/suicune_close.2bpp.lz
index 19b806269..19b806269 100644
--- a/gfx/intro/suicune_close.lz
+++ b/gfx/intro/suicune_close.2bpp.lz
Binary files differ
diff --git a/gfx/intro/suicune_jump.lz b/gfx/intro/suicune_jump.2bpp.lz
index b34a0c765..b34a0c765 100644
--- a/gfx/intro/suicune_jump.lz
+++ b/gfx/intro/suicune_jump.2bpp.lz
Binary files differ
diff --git a/gfx/intro/suicune_run.lz b/gfx/intro/suicune_run.2bpp.lz
index f48162258..f48162258 100644
--- a/gfx/intro/suicune_run.lz
+++ b/gfx/intro/suicune_run.2bpp.lz
Binary files differ
diff --git a/gfx/intro/unown_back.lz b/gfx/intro/unown_back.2bpp.lz
index 21cae2927..21cae2927 100644
--- a/gfx/intro/unown_back.lz
+++ b/gfx/intro/unown_back.2bpp.lz
Binary files differ
diff --git a/gfx/intro/unowns.lz b/gfx/intro/unowns.2bpp.lz
index 67e90b0b6..67e90b0b6 100644
--- a/gfx/intro/unowns.lz
+++ b/gfx/intro/unowns.2bpp.lz
Binary files differ
diff --git a/gfx/title/crystal.lz b/gfx/title/crystal.w48.interleave.2bpp.lz
index 9dcbafc86..9dcbafc86 100644
--- a/gfx/title/crystal.lz
+++ b/gfx/title/crystal.w48.interleave.2bpp.lz
Binary files differ
diff --git a/gfx/title/logo.lz b/gfx/title/logo.w160.t4.2bpp.lz
index 0fa7d7744..0fa7d7744 100644
--- a/gfx/title/logo.lz
+++ b/gfx/title/logo.w160.t4.2bpp.lz
Binary files differ
diff --git a/gfx/title/suicune.lz b/gfx/title/suicune.w128.2bpp.lz
index 359fd93ca..359fd93ca 100644
--- a/gfx/title/suicune.lz
+++ b/gfx/title/suicune.w128.2bpp.lz
Binary files differ
diff --git a/gfx/trade/game_boy.lz b/gfx/trade/game_boy.2bpp.lz
index 832164306..832164306 100644
--- a/gfx/trade/game_boy.lz
+++ b/gfx/trade/game_boy.2bpp.lz
Binary files differ
diff --git a/main.asm b/main.asm
index 8f7f57105..efe74a039 100644
--- a/main.asm
+++ b/main.asm
@@ -39881,7 +39881,7 @@ Tilemap_298f7: ; 297f7
TradeArrowGFX: INCBIN "gfx/trade/arrow.2bpp"
TradeCableGFX: INCBIN "gfx/trade/cable.2bpp"
TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp"
-TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.lz"
+TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz"
TradeBallGFX: INCBIN "gfx/trade/ball.2bpp"
TradePoofGFX: INCBIN "gfx/trade/poof.2bpp"
@@ -87780,122 +87780,122 @@ Functione552f: ; e552f (39:552f)
ret
IntroSuicuneRunGFX: ; e555d
-INCBIN "gfx/intro/suicune_run.lz"
+INCBIN "gfx/intro/suicune_run.2bpp.lz"
; e592d
IntroPichuWooperGFX: ; e592d
-INCBIN "gfx/intro/pichu_wooper.lz"
+INCBIN "gfx/intro/pichu_wooper.2bpp.lz"
; e5c7d
IntroBackgroundGFX: ; e5c7d
-INCBIN "gfx/intro/background.lz"
+INCBIN "gfx/intro/background.2bpp.lz"
; e5e6d
IntroTilemap004: ; e5e6d
-INCBIN "gfx/intro/004.lz"
+INCBIN "gfx/intro/004.tilemap.lz"
; e5ecd
IntroTilemap003: ; e5ecd
-INCBIN "gfx/intro/003.lz"
+INCBIN "gfx/intro/003.tilemap.lz"
; e5edd
UnknownDatae5edd: ; e5edd
INCBIN "baserom.gbc", $e5edd, $e5f5d - $e5edd
IntroUnownsGFX: ; e5f5d
-INCBIN "gfx/intro/unowns.lz"
+INCBIN "gfx/intro/unowns.2bpp.lz"
; e634d
IntroPulseGFX: ; e634d
-INCBIN "gfx/intro/pulse.lz"
+INCBIN "gfx/intro/pulse.2bpp.lz"
; e63dd
IntroTilemap002: ; e63dd
-INCBIN "gfx/intro/002.lz"
+INCBIN "gfx/intro/002.tilemap.lz"
; e641d
IntroTilemap001: ; e641d
-INCBIN "gfx/intro/001.lz"
+INCBIN "gfx/intro/001.tilemap.lz"
; e642d
IntroTilemap006: ; e642d
-INCBIN "gfx/intro/006.lz"
+INCBIN "gfx/intro/006.tilemap.lz"
; e647d
IntroTilemap005: ; e647d
-INCBIN "gfx/intro/005.lz"
+INCBIN "gfx/intro/005.tilemap.lz"
; e649d
IntroTilemap008: ; e649d
-INCBIN "gfx/intro/008.lz"
+INCBIN "gfx/intro/008.tilemap.lz"
; e655d
IntroTilemap007: ; e655d
-INCBIN "gfx/intro/007.lz"
+INCBIN "gfx/intro/007.tilemap.lz"
; e65ad
UnknownDatae65ad: ; e65ad
INCBIN "baserom.gbc", $e65ad, $e662d - $e65ad
IntroCrystalUnownsGFX: ; e662d
-INCBIN "gfx/intro/crystal_unowns.lz"
+INCBIN "gfx/intro/crystal_unowns.2bpp.lz"
; e672d
IntroTilemap017: ; e672d
-INCBIN "gfx/intro/017.lz"
+INCBIN "gfx/intro/017.tilemap.lz"
; e676d
IntroTilemap015: ; e676d
-INCBIN "gfx/intro/015.lz"
+INCBIN "gfx/intro/015.tilemap.lz"
; e679d
UnknownDatae679d: ; e679d
INCBIN "baserom.gbc", $e679d, $e681d - $e679d
IntroSuicuneCloseGFX: ; e681d
-INCBIN "gfx/intro/suicune_close.lz"
+INCBIN "gfx/intro/suicune_close.2bpp.lz"
; e6c3d
IntroTilemap012: ; e6c3d
-INCBIN "gfx/intro/012.lz"
+INCBIN "gfx/intro/012.tilemap.lz"
; e6d0d
IntroTilemap011: ; e6d0d
-INCBIN "gfx/intro/011.lz"
+INCBIN "gfx/intro/011.tilemap.lz"
; e6d6d
UnknownDatae6d6d: ; e6d6d
INCBIN "baserom.gbc", $e6d6d, $e6ded - $e6d6d
IntroSuicuneJumpGFX: ; e6ded
-INCBIN "gfx/intro/suicune_jump.lz"
+INCBIN "gfx/intro/suicune_jump.2bpp.lz"
; e72ad
IntroSuicuneBackGFX: ; e72ad
-INCBIN "gfx/intro/suicune_back.lz"
+INCBIN "gfx/intro/suicune_back.2bpp.lz"
; e764d
IntroTilemap010: ; e764d
-INCBIN "gfx/intro/010.lz"
+INCBIN "gfx/intro/010.tilemap.lz"
; e76ad
IntroTilemap009: ; e76ad
-INCBIN "gfx/intro/009.lz"
+INCBIN "gfx/intro/009.tilemap.lz"
; e76bd
IntroTilemap014: ; e76bd
-INCBIN "gfx/intro/014.lz"
+INCBIN "gfx/intro/014.tilemap.lz"
; e778d
IntroTilemap013: ; e778d
-INCBIN "gfx/intro/013.lz"
+INCBIN "gfx/intro/013.tilemap.lz"
; e77dd
UnknownDatae77dd: ; e77dd
INCBIN "baserom.gbc", $e77dd, $e785d - $e77dd
IntroUnownBackGFX: ; e785d
-INCBIN "gfx/intro/unown_back.lz"
+INCBIN "gfx/intro/unown_back.2bpp.lz"
; e799d
INCBIN "baserom.gbc", $e799d, $e7a5d - $e799d
@@ -96737,7 +96737,7 @@ Function108be0: ; 108be0 (42:4be0)
INCBIN "baserom.gbc",$108bec,$109407 - $108bec
IntroLogoGFX: ; 109407
-INCBIN "gfx/intro/logo.lz"
+INCBIN "gfx/intro/logo.2bpp.lz"
; 109847