From b7d9b77e4697b84ccefe33056c5bece0c94cf557 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Tue, 16 Mar 2021 01:00:14 -0400 Subject: [PATCH] Added Fortree/weather institute lights. --- data/tilesets/headers.inc | 4 ++-- data/tilesets/secondary/fortree/metatiles.bin | Bin 4480 -> 4480 bytes .../secondary/fortree/palettes/08.pal | 4 ++-- data/tilesets/secondary/fortree/tiles.png | Bin 4414 -> 4433 bytes .../tilesets/secondary/mauville/metatiles.bin | Bin 8160 -> 8160 bytes .../secondary/mauville/palettes/07.pal | 6 +++--- .../secondary/mauville/palettes/10.pal | 2 +- .../secondary/mauville/palettes/11.pal | 2 +- data/tilesets/secondary/mauville/tiles.png | Bin 6068 -> 6069 bytes .../secondary/petalburg/palettes/06.pal | 2 +- .../secondary/petalburg/palettes/07.pal | 2 +- .../secondary/rustboro/palettes/06.pal | 2 +- .../secondary/slateport/palettes/06.pal | 2 +- .../secondary/slateport/palettes/12.pal | 2 +- src/palette.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index f495aae2c0..c652587a0e 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -57,7 +57,7 @@ gTileset_Slateport:: @ 83DF764 gTileset_Mauville:: @ 83DF77C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset - .2byte 0x12 @ lightPalettes 7,10 + .2byte 0x32 @ lightPalettes 7,10,11 .4byte gTilesetTiles_Mauville .4byte gTilesetPalettes_Mauville .4byte gMetatiles_Mauville @@ -90,7 +90,7 @@ gTileset_Fallarbor:: @ 83DF7AC gTileset_Fortree:: @ 83DF7C4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset - .2byte 0 @ padding + .2byte 0x0404 @ lightPalettes 8, customLights 8 .4byte gTilesetTiles_Fortree .4byte gTilesetPalettes_Fortree .4byte gMetatiles_Fortree diff --git a/data/tilesets/secondary/fortree/metatiles.bin b/data/tilesets/secondary/fortree/metatiles.bin index ecc00d7e7092a272c134c4a9fdcaae507c44c11e..1b0958cbd1e07e44e47a8dc2a7f6e04356798110 100644 GIT binary patch delta 56 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 H!ZYrFhG_0n delta 4358 zcmWNSc|6m70LQ;S+iXlM(S|UhN5~PmV{@N1xgy6xa)gPY9Q#>xAxDvrJ4CJ=p~sp? zg^CX3T!|c!BO>H^KL5Sn|G!_Kerc9;DwXlt!kBFD8@G^cdtqeY@=KI;+odx^?dFk6 z^J61+8moPCA99Ul1`;8Yn?Cl4N46KevRH9w*(YsvwP*R8q@IM*f+O<7Lo$A}soXCK zhCH>G;XR8cik}4Ni#lc{BMpu}Z8|1B>*73{qSs@tl^9#d$o`>k9q4X&zB;+P^)`aR zGFnkdTe`QHebzq6LB4DINJmzF4Z&2pulkUn*=3e=wQPaI)P5lUWcqB`e3n!9l;+rk zZ*cfd8OOy_LY*M2rTc?01|PI)ti)(PwntaGt?is_L9l&j{s6|CO0vg9ldlR;^7?z+ z`MUeMvtAN=ofcz!@9e-Ur>c6PMur5+VE>BY2%lF6Sfl;zZkxArxy!t^R(Zg%#_rFt z1#WK#2RcxAwu!y6bvD{O3RopqVl1@C)?tv$$@U9wPJ4=7|JGg@okx+p;(yU6`8KMl zc;;+<;{+#oxZGJ*=acZ2CZ;=S^SGg&jdxQM^O;TU`&wSXpA}3rP8#SjU@&{KB%*NF zZJ*BpfKuqccoG+ILiyJr!EbSk3-k4iH&7_`K~0n=1#2PmBcX};`JQm_GyBCG?Q1nP z7tJZsbTHMF{ZIn@dWPV!l#wLb$DwDfN`7B#Ju!TV;+}TirrV3Mc#B+~(K9!HUr(+^ zZg2#SMUlfxM*C&7cpouNgJ(Qy1=N9y(9{Nq3Fj4xgr&Ut9#F$kLd{C921(fZV{WWP zP&)Gk+;=DN7F3i8F1=GLN8i_@&9_$$o}vclA75z=?M*wpof~pg^`6DKPrY>-&^%d} zyP9e62Z7w)7z3nJ4y*UVH1fNf+#Y@ff};U~+G&bSAU zY9#*s6H&lMMOU>6^RX**SD%c=rS)QJ$`%MSb}Z|#$MxHy)3Z_M1eV%F>{aL@(51t& z58fBaGzw#C-pZ-C?DAw=`vr$A?M2hpUd>PCbz0_0?0x0S>)$#AVS;;T&D`NO`&_|Z zBokzWAyy7EY-R4Lr@fD5S55_Fdj<3K^QND2Ofx16sriu|9Z=77osI?^tKa<4N#RaL z+NO3UWu@Kt0g0}ig)E8$rLclX)nc5MWRoQ@+-M(kR9H5bU=l(BN& zE60>p=%k;GB%O-$;kpaKHG1qNrSiu`@5DZn6Cr2>I(r6>W?iqCuY3+d`e^i{x;EbnikvJCrtu?QUuR zzW6YIs>;KJFd??OS;~D0RhxX+S|{Ifx&9`vJzDN!8jvnK#p{RQ2#S{`B-!cl@GHHV zmt&Vv3=*vWy!&^xEZ&xkb3>^pO@EYRl=};DCO%xsdVN%a^d`}7uXO4OZIGLCIe_ux zQ~Q*)3*C+K;EuWJhxn36ju2giV|O^iqAXrB_nAb4C|CcGf)Xh~`|!aM)53$+LryKsmRH2Qx0aia7+D6> z7@WCFZ^?U^+ZHt)tcvkw)rd(`8Dc)(!J%6RFS8prxJL$cv_xpJBUxW3AlN3#;czmp}Hm!}pYcV63F%i)ejCQt-s?tt$*EvhtV4s8FpV zjVa1azhAO3uV=@Lg?2oB)g;*w68x{+=Jfb=^pSUMZ; z4sQMu5#;7_jNa!~9Ju7WS>ApI~%NgFO&b-joMf+AuZBOE*G zF%LM3brKHhXlgm0;A!w41zKGVPKyTxGZ#? zwr>KW32=jLI@S%wUd#1hlh`jLP;yd(egYDm2+|6}$XU8NR*86sB!j$K@Pq;{pg}Z# zruRA@`{(*$3Y`7!8uKJ%y;p*G`D#T~7`Hl?jFaKkHUiS; z;xAp?*n^s}4)VGiACA%G<$YrgPh1yJ36~>PFF>=Al$#K7-}q(>m+t{mwK7k`>(jvO zIU~yhHm&J|z8z}4Oi{4zLZ&{C9~g5F=t8727pIbx#}ZH^MLn5#>W5DSEjHGWuxV0{=CUqhJvD+Uu9MIhOl=c;oT>@ zIqL>j>!^e-Gup^gv=~-bsm6!K*h@ZJ{b_XKhVJjA7f;2yzW#;I1O+~xQUR}domJmK zTaB`gm5-DL2XIuq*dRh_9ebcjMD4RXf%MkWIUWCnJBC3oJXPuVmp-deVLqysl>EKR zYZ9(|6WFwWj%m39QpxT9Yvc!yUGC-Q*D&KdLsu8u5_BUpo8AnxkH-cu)VPQ}#+jdE zC&@2Vf(&5x@$w=p0sdavt^!7U%DJ3vy)(*>1{{xsYfKcMuMdG2*e-Ddm*0=N816W} zh&Y7My&b1>5agSPZEWl;+T1ue)BU|?TGSX$&^Jh3CSxfs8E3YCY}7S3+gritk*Z{~ z2=ZOUCn6>fPb>>cIZM@nr08zR>o_-gW-0mX`z1fo}6vqJngT_Rxcm zqm6-<_k*IF&+4(BhOi}q9yczz552Bnrf2M>E}p8a3vkYSEv%<$jVXHFbdQIuZUmio z_c`~4ubD=T!zPcdYBaWA>%3aGOduxaTnODmEPU8I)N|WfhllYUxqGCti&OocOHwcb zzeo^^z$Xoi>yKPmNC-bDsjaLHFS<0m4S#3HXZUrwh^NEP%Pa76{Feq1(JOEE2axCY z>lUmBEt}j|UC>)M@|66uyvbbd*I%D>kCYC~&Z&Bnc>{FcJeDM>RY#YCHihRmMS}Un z7VUEUn|p;e`C1qPODEdm#L%ZRxv$9Ni+_9-{8V{Pnbr|A($v^lRw3Gw-7iq<7!oR^ z*OGerZs)7-GcjPq{Y5gOJX}gD(bAfoC>nHN$=Hj>B-x#R7SU%at~tsma-&izkbacn zAlUEA)vdlf*@CwyuJ960lcJ@#g@wB{mB$3U$=#!nS^Hv~Q zUH-8UhLSlexuu4BHVhfMIDY~o_PTvR-4N*Df)?kVLkrP03)%{7@^{xy#CS_YJP z+`GbeY78Ip(i7IhfsnYtn*u{k*0&|}F132=Baan2=zYAIGUwCL@MLbSEa1q}Aq`R# zZw%FCIGqQ~d>Deq@Syw*p7io!j~-vab-xCByE-1Cwq4%?d-9V%4sGr!cGRq@+5oxy z>RoTex{Av(#U()pZcZnl%}eoP{_y(kA=rh^csO3J)E`li?6Qz1%oVA&5x@^4)t&C@ zJ0H^=Sf5kZx?W=(IZ)nCy%6m=@a9Fzx@g?k#!bgj-n-O+ItjLlzoODl%|}GiazsY= zvv`DcPlFBNedVXAomLSLiRucFHH=F>_PWTY(Pbjamz%G&*kE_<9b+d@4s@lIl4au< zc^luvdiX)~ZvNhZZF2TN%Gbr>-d1oF4BX#_0z5&h=J31u2$81 zHai`Xr7LM5wfcC~ax1P6d-GQcL($YjL#p8P%T_9PiEBDr)~p1MzX9~ykkGB?Nwh=% zifM!Dx8bT%^Xi;W9RmlvLJJ3T7^4?@25J>4yo2U#nd+=9PQ3@Aj5ZM?wCt4Dpif#$ zZfRMYn}`Ax0Y+R%E_6q5)9PpRd6rc(@HIe!Hb2CzqYmdLTEPVaB$b)!x|LFVo-h&u z*(>v-vVIw~>9?{zU+#d|n`lJtrvr0msOKgm=*oY{yHwJaY7l$!JmbiIcps~53-2EV zH5gmj43|g&;*5dy16IvTM3NEyYZs5-Bb3N-KF*QxFa(DVl$8;7U>{U>pV{5{Nz!v0oNPipB~F4>E!F7i8WU_ImN*v*|T^i+1~1;++)%WY`J= z1dya8VgVZ(Vtv5o4Fl2%0NyceM*%FDyDkp@?$iS`3mCTnUT$uL4GSO$c$~@{WQqfV z1v?z;UwRniua5{FvZYNrmSElN`4{yYW|SGa7?KKWB;paYw1vbp4H6BCDOSb6>gDHxWjJxIyQnI1m>?2oP^hinG1NNNDbm_c3n9sgW8CA}9WqlkEZ0 z|8a^Dbu0lX5q$ny>Af>HbhlfpN?VoaH7N^n`;Mhb-|sIqNYl zyvPEq_Dj@tt`{?mOJGc49#ft|R<;xrB{oe0QzI^Np~ ze%CPI^AAWccJ@qg&}vwWXiB@(nCAXg`(KYVqrlG!BoyOShz01At;s4Oe*k5lv@oar z@7lCG7>Jicxu7Y{t~`KhbDdH^2Y;q4alrq1cr#bkp1!s2Hzc-qU8mvG{^R>S`~zw< zqwcCpkQ6S|Q&4%!SbzR3mf=5*r}kAa2+y=SvnigBej2I?E%j7L(((u61H1kx{ePh! z#6e`-EVTDJ)XaE_piSC6H~Z4jy3~Wl(1Js9KlarfpMUys5BGM`Kj{LLKC8E{j0dRf xt?d`6F$AY-N+S{KQ=a(2MH*6=XZ-FF)-rOLWzy<*0M-N2+ delta 28 ecmaE0|G<7jp(KCu>*P1dZ-FF)-rOLWzy<)^#}35+ diff --git a/data/tilesets/secondary/mauville/palettes/07.pal b/data/tilesets/secondary/mauville/palettes/07.pal index b74a8c0097..6f43490ad6 100644 --- a/data/tilesets/secondary/mauville/palettes/07.pal +++ b/data/tilesets/secondary/mauville/palettes/07.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -16 64 0 +8 0 128 255 255 180 238 238 90 213 213 65 @@ -9,11 +9,11 @@ JASC-PAL 131 131 139 98 98 123 65 74 106 -168 200 224 +40 48 88 213 213 213 164 164 172 230 197 246 213 139 222 197 115 164 148 98 106 -40 48 88 +168 200 224 diff --git a/data/tilesets/secondary/mauville/palettes/10.pal b/data/tilesets/secondary/mauville/palettes/10.pal index 5b3c5e6ef2..b87549f6d1 100644 --- a/data/tilesets/secondary/mauville/palettes/10.pal +++ b/data/tilesets/secondary/mauville/palettes/10.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -16 128 8 +8 192 0 255 255 255 148 222 205 123 180 172 diff --git a/data/tilesets/secondary/mauville/palettes/11.pal b/data/tilesets/secondary/mauville/palettes/11.pal index c73ec2fe82..48166182ae 100644 --- a/data/tilesets/secondary/mauville/palettes/11.pal +++ b/data/tilesets/secondary/mauville/palettes/11.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -172 180 139 +0 48 0 255 255 255 222 230 238 164 180 197 diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png index 68e2f49dcd230ab4f02a0750dca913f8ed2bedf0..20da7198e89bf0890f4ec48261c9372907c2c4c6 100644 GIT binary patch delta 6027 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 Kv1K}x=>G%p*Srz{ delta 6026 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 { // Color 0 is a bitmask for which colors to blend; color 15 is the alt blend color gPlttBufferFaded[index] = gPlttBufferUnfaded[index]; - altBlendIndices = gPlttBufferUnfaded[index] & 0x7FFF; // Note that color 15 will never be light-blended + altBlendIndices = gPlttBufferUnfaded[index] << 1; // bit 0 species color 1, etc. data3 = (struct PlttData *)&gPlttBufferUnfaded[index+15]; if (!data3->unused_15) // use default blend color instead data3 = (struct PlttData *)&defaultBlendColor;