From e1cce1cfb961c5f5f191156b9ce595fcf28b9f7e Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 8 Oct 2013 22:28:51 -0400 Subject: [PATCH] fix padding in compressed intro graphics --- gfx/intro/001.lz | Bin 12 -> 16 bytes gfx/intro/002.lz | Bin 59 -> 64 bytes gfx/intro/003.lz | Bin 12 -> 16 bytes gfx/intro/004.lz | Bin 88 -> 96 bytes gfx/intro/005.lz | Bin 27 -> 32 bytes gfx/intro/006.lz | Bin 69 -> 80 bytes gfx/intro/007.lz | Bin 71 -> 80 bytes gfx/intro/008.lz | Bin 179 -> 192 bytes gfx/intro/009.lz | Bin 14 -> 16 bytes gfx/intro/010.lz | Bin 83 -> 96 bytes gfx/intro/011.lz | Bin 88 -> 96 bytes gfx/intro/012.lz | Bin 205 -> 208 bytes gfx/intro/013.lz | Bin 76 -> 80 bytes gfx/intro/014.lz | Bin 206 -> 208 bytes gfx/intro/015.lz | Bin 39 -> 48 bytes gfx/intro/017.lz | Bin 52 -> 64 bytes gfx/intro/background.lz | Bin 492 -> 496 bytes gfx/intro/crystal_unowns.lz | Bin 243 -> 256 bytes gfx/intro/logo.lz | Bin 1080 -> 1088 bytes gfx/intro/pichu_wooper.lz | Bin 835 -> 848 bytes gfx/intro/pulse.lz | Bin 135 -> 144 bytes gfx/intro/suicune_back.lz | Bin 923 -> 928 bytes gfx/intro/suicune_close.lz | Bin 1050 -> 1056 bytes gfx/intro/suicune_jump.lz | Bin 1210 -> 1216 bytes gfx/intro/suicune_run.lz | Bin 974 -> 976 bytes gfx/intro/unown_back.lz | Bin 317 -> 320 bytes gfx/intro/unowns.lz | Bin 1003 -> 1008 bytes main.asm | 108 +++++++++++------------------------- 28 files changed, 33 insertions(+), 75 deletions(-) diff --git a/gfx/intro/001.lz b/gfx/intro/001.lz index 467aa27c11c0fd723fdd5b18db1b979f23df77f3..926fb6e8e435eb7d204cb20fccd776d8bde3c5fa 100644 GIT binary patch literal 16 WcmXR`{eQIKll=Ur`~UxE00IC{=LjzV literal 12 UcmXR`{eQIKll=Ur`~Uw3052;DF8}}l diff --git a/gfx/intro/002.lz b/gfx/intro/002.lz index 1f460c26d53be30c600c32bb957f19bbd3a08af5..c63f215f2a33c7146423ce059a7dda0995b61717 100644 GIT binary patch delta 10 OcmcC^m|)Gy00ICC(*aBX delta 4 LcmZ>;o?s0C0}ug6 diff --git a/gfx/intro/003.lz b/gfx/intro/003.lz index 30ef2881755c6b436577099ae2be24d92df35824..182ffb13047217c2100358df03b3b3801c2c9842 100644 GIT binary patch literal 16 WcmaD_&-f(1=}CO^+x`C;fB*nX#0Q)J literal 12 TcmaD_&-f(1=}CO^+x`CmEmQ}b diff --git a/gfx/intro/004.lz b/gfx/intro/004.lz index dda9d45a47c48dca1353092d120114b5992b5831..5897d176b4824aff89fc42b001b4beadbcc20e4c 100644 GIT binary patch delta 13 Ocmaz@m=M9i00jUN?E$F( delta 4 LcmYd@m=FN~1Ox%0 diff --git a/gfx/intro/005.lz b/gfx/intro/005.lz index aabd0661ebf46a1bf9e14defd822362aeed0d4f4..0ae96b7f7264fcb396747bef7ebe13e3c1d7f9d1 100644 GIT binary patch delta 10 Ocmb1Em>|u{00IC9lK|`h delta 4 LcmY$8o*)eX0uTV_ diff --git a/gfx/intro/006.lz b/gfx/intro/006.lz index b9de6c532061532960fb2fecee7e6939014428d0..46436b607e6ab36ab79805cb2911462a57443c7e 100644 GIT binary patch delta 16 OcmZ<_nBdCIfB*m#^#OJO delta 4 LcmWG=o!|-p19$;z diff --git a/gfx/intro/007.lz b/gfx/intro/007.lz index d1974ec774e7eb0ac653ae32f7e13361d7d84c8a..d1694ed3e37b943ba559a32cac8134f6bb043270 100644 GIT binary patch delta 14 OcmZ<{nBdOI00RILCjoc> delta 4 LcmWG=pWqGv1AqZ< diff --git a/gfx/intro/008.lz b/gfx/intro/008.lz index ffd675a6d4a7f3c0223ec7ad7822930f4d78908f..356c6d5e8fea4741438e069c455dded8e8c3a85d 100644 GIT binary patch delta 20 RcmdnYcz|)jW?lwl001xN0>%IU delta 6 NcmX@WxS4UnW&jB-0=WPH diff --git a/gfx/intro/009.lz b/gfx/intro/009.lz index f419a8924cd2d689339cca2948436ad69ad50c7a..238d6a60e2b1c9b36fd3848b46a54dfa45fce11c 100644 GIT binary patch literal 16 YcmaE}Qkn65!|8?(_vgP0{m;Mv08p9<1ONa4 literal 14 WcmaE}Qkn65!|8?(_vgP0{SN>>k_iL= diff --git a/gfx/intro/010.lz b/gfx/intro/010.lz index fb2c453d009971062023201a90da0ca1a60e0c9f..6e45c45f7a9f72d27603bc1f0b3727468665e212 100644 GIT binary patch delta 18 OcmWGem=Mg%fD8Z{+X18i delta 4 LcmYcYo)8QG1MmTt diff --git a/gfx/intro/011.lz b/gfx/intro/011.lz index e565424a17431b4c5cbf6782b98928d7c4db9d48..68ceb19f8ad5324db9528ce487d2b47752dd4c3c 100644 GIT binary patch delta 13 Ocmaz@m=M9i00jUN?E$F( delta 4 LcmYd@m=FN~1Ox%0 diff --git a/gfx/intro/012.lz b/gfx/intro/012.lz index 4c35460fc2edb597352a497ea7303eecf718ce5c..0d6af294cc0d1d5cdfcb572814304c9c36b1d8f3 100644 GIT binary patch delta 10 RcmX@hc!6=kS!Mc$RU(SpW(T0{s90 diff --git a/gfx/intro/013.lz b/gfx/intro/013.lz index 0887b9a142de4f99a51505cc0282bc557b13f382..91635527c34546f296a1a3a8eb9c15265a807975 100644 GIT binary patch delta 9 OcmeYXnBc?000aOF0Repg delta 4 LcmWIWncxEe1C#-I diff --git a/gfx/intro/014.lz b/gfx/intro/014.lz index 8ec56538857b63418be1fc7b34b26f031710dfbc..a892ab1b42f0d3a0bb95595ef535f5a306e1939b 100644 GIT binary patch delta 9 QcmX@dc!6=kIVJ`M0231f0RR91 delta 6 Ncmcb>c#d(xIRFY20{;L2 diff --git a/gfx/intro/015.lz b/gfx/intro/015.lz index 3fc339a468befd6160150a53f94eb345b24864e7..22a4cc926144bd96f2baaef75b7766c041ef5e55 100644 GIT binary patch delta 14 OcmY#4n4r$d00RIGX8{-h delta 4 LcmXp|pP&u^0)PPz diff --git a/gfx/intro/017.lz b/gfx/intro/017.lz index 335d395582885a965c6331190f63cd29188df47f..90ce59e58784a4c7ffaa920510eb07f8c813aacb 100644 GIT binary patch delta 17 OcmXqUm|()gfCK;&X#qt5 delta 4 LcmZ=TnP36{0`vhn diff --git a/gfx/intro/background.lz b/gfx/intro/background.lz index 7d3fc52f711a441414071f0aac535fb3a8e4fe56..1ef2f12036ae834265ad07471e45c26a830dd998 100644 GIT binary patch delta 12 ScmaFE{DFDH8%7oeAOHX$#sh=^ delta 7 Ocmeys{DyhM8%6*RIs| diff --git a/gfx/intro/logo.lz b/gfx/intro/logo.lz index bd93412c0736073caa0e7aaa570dd2f6ce678bae..5beb0e6ef8fd43f09f06e93f1b3555062d74844d 100644 GIT binary patch delta 16 ScmdnNae!lk1q%lQ6aWAs2m*Zo delta 7 OcmX@Wv4dlS1q%QRvjTMh diff --git a/gfx/intro/pichu_wooper.lz b/gfx/intro/pichu_wooper.lz index c2a325bb728fb5669c5b52ad8df73bfaa62328ef..90174a098ad6288cd131af46a6a367a96d94e699 100644 GIT binary patch delta 21 ScmX@ic7bh!Gczv(G5`QED*~ec delta 7 Ocmcb>c9?C0Gcy1TTLP8< diff --git a/gfx/intro/pulse.lz b/gfx/intro/pulse.lz index 3ce37c136715ce2c3da1a7259671ff70ecb0d570..5a7fec1a939aad53d38add7bf9f6dcf7a7775188 100644 GIT binary patch delta 16 QcmZo?oWMAtos$6u03BljIsgCw delta 6 NcmbQh*v>ei9RLS00xevW;^Ic5M2vI8yv diff --git a/gfx/intro/unown_back.lz b/gfx/intro/unown_back.lz index a1c49ed3ab38477e2243bb2aa7fc7a214bd2a411..21cae29274cad59745e9b28f1dffa57d02ac1a96 100644 GIT binary patch delta 11 ScmdnXbbx7tEh94n0|NjRT>^6e delta 7 OcmX@Ww3lgvEh7L6mjZAA diff --git a/gfx/intro/unowns.lz b/gfx/intro/unowns.lz index 882af3b3464d8ae1a80fe8a17ea982f749765e3b..67e90b0b68a13673749e1877e7a77a750b3697b3 100644 GIT binary patch delta 13 ScmaFO{(*hNYi3pk5C8xqp#zNo delta 7 Ocmeys{+fNmYi0lsT?2>! diff --git a/main.asm b/main.asm index 8bd4f162f..763b60072 100644 --- a/main.asm +++ b/main.asm @@ -71793,159 +71793,119 @@ INCBIN "baserom.gbc", $e491e, $e555d - $e491e IntroSuicuneRunGFX: ; e555d INCBIN "gfx/intro/suicune_run.lz" -; e592b - -INCBIN "baserom.gbc", $e592b, $e592d - $e592b +; e592d IntroPichuWooperGFX: ; e592d INCBIN "gfx/intro/pichu_wooper.lz" -; e5c70 - -INCBIN "baserom.gbc", $e5c70, $e5c7d - $e5c70 +; e5c7d IntroBackgroundGFX: ; e5c7d INCBIN "gfx/intro/background.lz" -; e5e69 - -INCBIN "baserom.gbc", $e5e69, $e5e6d - $e5e69 +; e5e6d IntroTilemap004: ; e5e6d INCBIN "gfx/intro/004.lz" -; e5ec5 - -INCBIN "baserom.gbc", $e5ec5, $e5ecd - $e5ec5 +; e5ecd IntroTilemap003: ; e5ecd INCBIN "gfx/intro/003.lz" -; e5ed9 +; e5edd -INCBIN "baserom.gbc", $e5ed9, $e5f5d - $e5ed9 +INCBIN "baserom.gbc", $e5edd, $e5f5d - $e5edd IntroUnownsGFX: ; e5f5d INCBIN "gfx/intro/unowns.lz" -; e6348 - -INCBIN "baserom.gbc", $e6348, $e634d - $e6348 +; e634d IntroPulseGFX: ; e634d INCBIN "gfx/intro/pulse.lz" -; e63d4 - -INCBIN "baserom.gbc", $e63d4, $e63dd - $e63d4 +; e63dd IntroTilemap002: ; e63dd INCBIN "gfx/intro/002.lz" -; e6418 - -INCBIN "baserom.gbc", $e6418, $e641d - $e6418 +; e641d IntroTilemap001: ; e641d INCBIN "gfx/intro/001.lz" -; e6429 - -INCBIN "baserom.gbc", $e6429, $e642d - $e6429 +; e642d IntroTilemap006: ; e642d INCBIN "gfx/intro/006.lz" -; e6472 - -INCBIN "baserom.gbc", $e6472, $e647d - $e6472 +; e647d IntroTilemap005: ; e647d INCBIN "gfx/intro/005.lz" -; e6498 - -INCBIN "baserom.gbc", $e6498, $e649d - $e6498 +; e649d IntroTilemap008: ; e649d INCBIN "gfx/intro/008.lz" -; e6550 - -INCBIN "baserom.gbc", $e6550, $e655d - $e6550 +; e655d IntroTilemap007: ; e655d INCBIN "gfx/intro/007.lz" -; e65a4 +; e65ad -INCBIN "baserom.gbc", $e65a4, $e662d - $e65a4 +INCBIN "baserom.gbc", $e65ad, $e662d - $e65ad IntroCrystalUnownsGFX: ; e662d INCBIN "gfx/intro/crystal_unowns.lz" -; e6720 - -INCBIN "baserom.gbc", $e6720, $e672d - $e6720 +; e672d IntroTilemap017: ; e672d INCBIN "gfx/intro/017.lz" -; e6761 - -INCBIN "baserom.gbc", $e6761, $e676d - $e6761 +; e676d IntroTilemap015: ; e676d INCBIN "gfx/intro/015.lz" -; e6794 +; e679d -INCBIN "baserom.gbc", $e6794, $e681d - $e6794 +INCBIN "baserom.gbc", $e679d, $e681d - $e679d IntroSuicuneCloseGFX: ; e681d INCBIN "gfx/intro/suicune_close.lz" -; e6c37 - -INCBIN "baserom.gbc", $e6c37, $e6c3d - $e6c37 +; e6c3d IntroTilemap012: ; e6c3d INCBIN "gfx/intro/012.lz" -; e6d0a - -INCBIN "baserom.gbc", $e6d0a, $e6d0d - $e6d0a +; e6d0d IntroTilemap011: ; e6d0d INCBIN "gfx/intro/011.lz" -; e6d65 +; e6d6d -INCBIN "baserom.gbc", $e6d65, $e6ded - $e6d65 +INCBIN "baserom.gbc", $e6d6d, $e6ded - $e6d6d IntroSuicuneJumpGFX: ; e6ded INCBIN "gfx/intro/suicune_jump.lz" -; e72a7 - -INCBIN "baserom.gbc", $e72a7, $e72ad - $e72a7 +; e72ad IntroSuicuneBackGFX: ; e72ad INCBIN "gfx/intro/suicune_back.lz" -; e7648 - -INCBIN "baserom.gbc", $e7648, $e764d - $e7648 +; e764d IntroTilemap010: ; e764d INCBIN "gfx/intro/010.lz" -; e76a0 - -INCBIN "baserom.gbc", $e76a0, $e76ad - $e76a0 +; e76ad IntroTilemap009: ; e76ad INCBIN "gfx/intro/009.lz" -; e76bb - -INCBIN "baserom.gbc", $e76bb, $e76bd - $e76bb +; e76bd IntroTilemap014: ; e76bd INCBIN "gfx/intro/014.lz" -; e778b - -INCBIN "baserom.gbc", $e778b, $e778d - $e778b +; e778d IntroTilemap013: ; e778d INCBIN "gfx/intro/013.lz" -; e77d9 +; e77dd -INCBIN "baserom.gbc", $e77d9, $e785d - $e77d9 +INCBIN "baserom.gbc", $e77dd, $e785d - $e77dd IntroUnownBackGFX: ; e785d INCBIN "gfx/intro/unown_back.lz" -; e799a +; e799d -INCBIN "baserom.gbc", $e799a, $e7a70 - $e799a +INCBIN "baserom.gbc", $e799d, $e7a70 - $e799d ; ================================================================ @@ -78936,9 +78896,7 @@ INCBIN "baserom.gbc", $108bbd, $109407 - $108bbd IntroLogoGFX: ; 109407 INCBIN "gfx/intro/logo.lz" -; 10983f - -INCBIN "baserom.gbc", $10983f, $109847 - $10983f +; 109847 Function109847: ; 109847