From 3a7c2e3480773b95945a2ded71d083897994b551 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Fri, 12 Mar 2021 21:20:47 -0500 Subject: [PATCH] Updated Petalburg tileset lights. --- data/tilesets/headers.inc | 4 +-- .../secondary/petalburg/metatiles.bin | Bin 2304 -> 2304 bytes .../secondary/petalburg/palettes/06.pal | 4 +-- .../secondary/petalburg/palettes/07.pal | 28 +++++++++--------- data/tilesets/secondary/petalburg/tiles.png | Bin 1740 -> 1738 bytes 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index aefc245db5..32eec2ab94 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -13,7 +13,7 @@ gTileset_General:: @ 83DF704 gTileset_Petalburg:: @ 83DF71C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset - .2byte 0 @ padding + .2byte 0xC0 @ lightPalettes 7,8 .4byte gTilesetTiles_Petalburg .4byte gTilesetPalettes_Petalburg .4byte gMetatiles_Petalburg @@ -24,7 +24,7 @@ gTileset_Petalburg:: @ 83DF71C gTileset_Rustboro:: @ 83DF734 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset - .2byte 1 << 6 @ 1 << 6 + .2byte 1 << 6 @ lightPalettes .4byte gTilesetTiles_Rustboro .4byte gTilesetPalettes_Rustboro .4byte gMetatiles_Rustboro diff --git a/data/tilesets/secondary/petalburg/metatiles.bin b/data/tilesets/secondary/petalburg/metatiles.bin index 3711f4aeef135df2d52e729beee708e72769e30b..3ca46efec7868bb936838d926c003fd61abdf1cb 100644 GIT binary patch delta 35 rcmZn=Y7m<6mAPnY*~A}}%th16HkUBUGP4);70oT0SG0KsO9l%72__Cm delta 35 rcmZn=Y7m<6mAPqZ+r%H0%uUnUHkUBUGP5`JHO+0B*R**CO9l%75k?Nk diff --git a/data/tilesets/secondary/petalburg/palettes/06.pal b/data/tilesets/secondary/petalburg/palettes/06.pal index b893aa09e4..0c727de68c 100644 --- a/data/tilesets/secondary/petalburg/palettes/06.pal +++ b/data/tilesets/secondary/petalburg/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -24 41 82 +0 128 8 255 255 255 230 222 222 213 213 197 @@ -16,4 +16,4 @@ JASC-PAL 205 197 123 180 164 123 164 139 98 -115 197 164 +248 224 120 diff --git a/data/tilesets/secondary/petalburg/palettes/07.pal b/data/tilesets/secondary/petalburg/palettes/07.pal index 4b0812f094..3f7cad9b2c 100644 --- a/data/tilesets/secondary/petalburg/palettes/07.pal +++ b/data/tilesets/secondary/petalburg/palettes/07.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 +0 128 8 +213 222 172 0 0 0 +189 189 131 +164 172 123 +131 131 139 +98 106 123 +65 74 106 0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +164 213 230 +106 189 197 +112 192 160 +205 213 238 +156 156 180 +115 172 57 +248 224 120 diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png index 00d6d94a4ef2f74d70ca5eb58cfe0497deeb66b5..c3ae46ad7cc2d244042381cb4d43a10ddf4c553f 100644 GIT binary patch delta 1626 zcmV-g2BrDT4ayCWU+WH0*O9gig`%8}EdPk!Q=y8G$9cX#g{Wf-54uc=|sSU=N|J}_c+{6xHV zL}{cnbz4aW@cZ#-KpCTywSwk1uh-X=)|>q(`lvKq|8af&dXv3_Zu0XSAo|Fne`v&_ zpK}1tKPnvp;QC3Qk2&YG05Cd^7$6t|tXN*x+v+CjJGg;71n>s@lLMTN7-J*G^A@CC zxDMk7)CItxz=d-jMVw#i!U>FQaqboZmT{p8-n&BZmh>S5@aTzhfl&u7U~dXssP)kS zAq0e>k+Y!Hr^-A!3Yt{Q!;A}*e`>&#^B}jhI_#Lz=37cfY)HRlvAhKr5((M6uJDj6 zL|6EXWdZ$=vF2OG+|lq+DUrI%5(!G*Gd7^G1YNYCRLTOzp%CsAlm`tfkvjcX9BYg5 z0WN3{0l6S{#txhJNl?L+_|#JSS2K9p+^$MdP<>|`yNMHeDM{WW}i+q5jD89--9Pr2F) zU=Mws0k|`M&Y>R{2q1*qKsD<)XR(HzvFFBsDfOtAvj6}b6#?1>yC7Q{gLg&G5dSOM?Ey~|>7L&tzX3?M})4H7`L0N_y_gI~h*QjVi8weyF% zxni28ZRY_FpTQaj^_UqYNEEhxFAGR_ zyymIJ0vGg6rvu|sfT1n-z zU>Hv}zI#YW?WfJU?6z_%mrSn=*jx%gsRW=4DF87Hf&lY}FSH=~REf}qsF1LP1z2fT zD)6>pewhUlK=A!Pe*-oOd{`Dx`C@>h0Jl`t&5WHGlL-JU1XyzbQbxcX5(75p0BcgR zfb=X_wMUj!yKBV&@@Eb(nH(KWzygn2xV|kMl(E37J&pl#9S{;_0BftO{r>8jahU}g z07;HuJ|usqEx@A{JCZSw7R<$<06@|f$kWRz#=v*aB6yR4f1m@er^^6Nlm$md-M2AW z*!~WtCl8V!D6}Cf!ru=30idb?l@wrATF_s^x=`9An^+ebw`&%Ef0L8D4Y`ML45qTg zf^<%p#1?dC7pEmcHnA==Zc_^n)N=sSBv=zjIw!35WekkY?3BX?1nU9@6AXAS^B9OF zlc;S&Hm_n$f2d}X%4j5K!K0l40vzthe25lkfVKd}notw0j0<`lcu*FwBZQ7_K`_C9 zn?6P^1wczyK&$B>PH-i{GQb%C12!;STb{PS*-pEFSF8!u%sP-80n#*lGXmhcEdhkz z)BtS(l!J-^McX9Vy&x|(0I(z7sc+{k&;T{y6EV{+f7~HTqHd^8$GhRSu|V_z`fhy9 z07N%bjqd*iupNC?_O1rd6*meOJkqA5@X>cCKFYw+=UnR|!0rs6eA=NNBX4%qxhYWR zBc+P~-6?i;gWdQUD!xhO`B$A0l`aOTz6hAnwgw!6xB=D$s0sE4*&yjbag0f90X$VH zKVy%+oYmjP5@Fb0s) z?PP&04Tz^v2NCjO=}G{veTK3aaB#5q^58%MJbKoiUbvx0Q-Fu%3zSd;NGUswVXyb< zMXx6TPs$hW?5rI=Dc`>j0JRbym({Amxqf+gfA|Uk_{2VhHm(V60T$F}*?ScYeC=q}`%mCtP#QR`+dj@;KqqYqIWr1GT7)c1$9(HU(q8~zA0ssVH34qNc z0l1m&^|rGBv;dygx3D9&htQq};3qMF<^b3MKB&td4Z!9hv`x#jau&>QXARIv0z0Dr zNJD5#Kq>}>06kF709Gdac4*`C6}E4wFZe5;jgpL{pRObToW}N0{=~q!F6p{1iIRF3v07*qoM6N<$f+}CvHvj+t delta 1628 zcmV-i2BZ1P4a^OYU+WN-T39gig`%8}EdPk!Q=y8G$9cX#g{Wf-53FR5YBSU=H`-ZNr#{6xHV zL}{cnbz4aW@Y~U7KpCTywSwkXuh!R<)|>q(dapEG|9*Y_YLmTzZu0XSAbQWDe`v&_ zA9DcC-zyyg;OcRok2&YG05Cd=7$6t|tXN*v+v+Cj8@Pcy1n>s@lLMTL7-J*G^A@CC zxC-M3)CItxz=bm&MVw#g!ZD0&aqboZmT{p8-n&BZmh>S5@aVB}fl&u7V80i*Q0t=u zLI?;$BWFRYPnCIe6f~)p`xzG~f7O5~=Rt01b=VQ5&DWHU*pPnBVtEZNBoeYWUEv{D zh_3J%%L4i#W6jr$xufBOQX+MiB@&drWo$rU3A$)OsgwnbLm}KLC=VJ|B6a$&IMx>9 z16Ir#XPX1=A=2Ek1UhX7>U(6^jT`yQbb6e^Yv<6mG*b z4)8XYmSg~c)!*Z9+lc@`h%=>OeJIx;j^|Uy*~wZki_S%a`g8d3rfFG9Gl0&Jo^Z7n zz#jTE18`^jj6**z5I_jIhHBPv&SDKaW6zBNQ|eJKX8`~>Dgv|zW+nyzpzaAD;P@hd z+)5F@z=bg^Kk5boLp7ZPe=HG$v0R7_#=1KX5KF{B1fBx;Vji$e3}74i0C0R!1Xv;l zun`3;l&&ZOEQo>f3pEA^u>#(SI~T>^nvMa17(j|p8YF;f0l=d=20w-Ar5s0HYUdAi zbHy}G+s*?VK7%z5>N%+$SoeM09ZC~GwOTCzP+iULrK;DjS5ob6e{9wlkSJ{XP8N{v zc*RqT1up2DP6x(?07F~u$w7sHq^MRZ6*TqIfLh$b?)sXZ$7*YQI;*;&VLTSo7Q7ya zz%U+dd~=_W+7Fv`*=^-UE}32$u(=d~QVBp8QUGEY1OeuEpJ_q#p%S4BQ6XUo3$W6x zRN!sH{5%UJfZ+Roe+Fz6_^>RX^4S1K0dAO-DBnE8G0oJ5s z0qI$=Y7Z={cH4>p;dx^H8$ zu>BoOPaY&eP-sI|gufm513*;)Dk;FKw4lF+b)mFLHnA==Zq_XR_BtoG8*&fh7))h} z1?ikHi7n{P&QD5&Y+_w#+@uyBsOJEtNw6l6bWT|9%NQ7)*$Iaa2-XD*CK&Km<}naU zCQ;jlY+l8he^AXNmC;Dff=4?81UTH0`4BD80Br$`HK8V085i_A@SrSUM+hC=f?$FH z*L{p!3V@cZfL7B%oZw1?Wq>mP25exuwmfZtvz>MUuUHeRnROsH0;Fm9W(2@>TLK8b zt^wKtC8paE*Y2V$mOf4D`IMBPxGj(5XtV}a-c^zHbX z0f=s>8r}a3U_1J(>|G9^D{d4nc%)59;iKM}x2D|YyRD6@l^RGH1DqRdveGxFDZ4Ed8aRaOiP!sG8vO&^=;uw?I0(h!Y zfZ9OYS%|mFLmTBcInBUGCppyi4 zN<{yM(3XHy3