From ea5e081f74603dffe4e2cf2372f930a3686dbeaf Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Mon, 21 Feb 2022 15:54:49 -0500 Subject: [PATCH] Fixed shadow palette tag. Fully removed permanent shadows. --- .../field_effects/pics/shadow_extra_large.png | Bin 152 -> 5188 bytes graphics/field_effects/pics/shadow_large.png | Bin 144 -> 4911 bytes graphics/field_effects/pics/shadow_medium.png | Bin 143 -> 4767 bytes graphics/field_effects/pics/shadow_small.png | Bin 143 -> 4807 bytes graphics/weather/fog.pal | 2 +- src/data/field_effects/field_effect_objects.h | 40 ++---------------- src/field_effect_helpers.c | 2 +- 7 files changed, 6 insertions(+), 38 deletions(-) diff --git a/graphics/field_effects/pics/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png index 765a5291a8d9eb0f6508e5d9e223c421112ca56b..eb334a976c597db39f56470dcb6e90b9123a3dd4 100644 GIT binary patch literal 5188 zcmeHKX;@Ro8V*~56p&RAgM?regzO1fWDyCF2%#822#9c!oP+>bOacV#?R5i-OGO0{ z1r)HBi()Gvf-5MC3aGe%Wzn{X;tFU*tWfSr!0oyHDOh1N2xeK8d9#13B}1EQk5E zgu&E3Pa|WFI=h-oifpR&lW|#tBe_Du>IqubGU?9V&Kmk8kz)%tw;gPy-S)44ef4hJ zWabuD)s|9PUasfSDBf?ISz`|>PAzmyJNJ{i|NPX#`hi~4ESGqb2eOdvKlc?rgI@{7 z?=tkSkE8Uw*rq7BKT$eVg=lx)w>@Ziy|sZiWr!2{b(DABk?l@3=`E|b%-_Gi8gpNC z;@o890g8UA?h6xZ&kVCss`-;ZOn5LVqpx8p{N#g;-dPG)J*3b1OFrtsRowcktD-K+ zn8pu}$jv=B6g(T4H8>ypJgB7C+$YLxa_?w$;lA!}x%AxefYhW8tJrPEIfvZJW4>FH zm1&x@X)n>&2=T5U{ieaM_FL*Of`T#Mp(QU7p)%%&2IDZbdyZs<1N zyxUrSVNdnE!%K`Rd%bs>j#Qpm)sh6;Pz78u`uWe)a8gN<>=$qNzM-|5>qqa|KdiHc zp>EHn`stXAGkjfkL<+ys{eI3wxXb0;b4{&tjAp4X;Wz3l2>T?SWi{PZBNk=Cbw$%U_j@m0h}TZwUYTqhH3^Tj!Wt?L@8*2t51?A+y8r*GLlPRT!e?{2JOf0@#AHB>Zcij|tCw&s5FYA4O3|G^LTt6kz`ZHGT_qHo!c@--MOa79EMOiI5Ae z*@aOq@Mdq*bhl%F0ji(Y$2r8=u$z_)>dFIwh@O$f%ZE(QIb>CoR9%oqTwFS(E0r~2 z`+A(EPc2S3C3;}{`tYv}5W&w)DMWSawy^!j2E3MsHP%}s8K(Bzk6Wfq=~_Mx8P1uV zsPq^o>M~Sn%k_-T{OFKso1UN zQM}@zElJGetV9@euixOfCBo2F6zj0kz;{HisiT9{>A!3uj+0<9(74*?PXC&|GkT{x z7KNEi=^rRRR2a_*6!fzkX_6rKI4uP&$?Vf*mPDS_1X&_*RgC#yln#6{qdXIRnZIA z4$rCMEdDFnYR}~SGo78KflCtR*3~^rxIRx_ug54REw`0i3cL~Ht~)IHgPk5fGJ7aS znUOR+@Q2PtPGlRUq0tGqqV!2he%hRY)Ev5=*^M!>7)nkYa%sDw52`vE_bXf|!}10K+mu z!uc6Ve3}5|;|=#z(;)&0r~;5`NwQQ)S9_tfymY9pF=J6kEku>%g^FT_BK>3v5J|$2 zFgUcoTAWHidBc&O3W1Q$VFb)jKrJs+f=VT)W3g#zX_z!3My3#9@iZC@iz8qO1T=&| zE7PSaK#i6voi!BG91Kv&SBT{*u}q58Z~{D8ipmRxg8Gqf=O>Y~+3)D3${7_PJ+Nv( zj>TheScwGtp@&lCp9+!8Oz3Ytl;P0TjOBnzS&D)W`lo_YmGg%b0{%OHd5R)g8;*dF z1(QJu1XV(#;y)TPki`yt=b@26B$mjvUXa)yAys1Gd$B&6o2Ew_&W96$+~4tjgnk>l z77U@-Y&t{6Pti<|#qdID#-|Hpe6fJ8tgm?>CP)@*yO2n2;?e>B^dL$g z6%=R(g8Zht_z8ei1VTG}CZ*om#ecJ0Gzv(@Qw1JqGQjgdllYLvfDjO(J@_~h$wTNt zgQWkMT`3c)(f|eMD}o}0qJdIK8x7KBMoia_@o5R5MkyQtkH(SE1X4JjLMPzqBpM1k z6D(G6jcUaBnrIGL-{LQSxKR5zJ{dtg2()Y7m zpXK@_1wIMFyvoZ7~Zw=*b< tw>B~QwJ_T-7>S(4!S8}0lXaaaFqnH=^e+*NQ;rZC#_|tg99Xg3j9Hh@&EqUA5s%2VrH0YF+Fpl-(pRmat2RVKbLh*2~7Zaj3H$J diff --git a/graphics/field_effects/pics/shadow_large.png b/graphics/field_effects/pics/shadow_large.png index e917823b05cd96f64884877479f9c8df82d73483..1695208af543eee620304317dd419295cbe6d44a 100644 GIT binary patch literal 4911 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 delta 86 zcmbQQ+Rr#adGbF&MenHYy#j_oTb3kM7du*7O8o!-pMilvHh11}ASLDL;uyj)GdbY^ p^N;_`2iY}vlm50dwQ%_GG92cTe|U0_SQ$_igQu&X%Q~loCID}b9-#mL diff --git a/graphics/field_effects/pics/shadow_small.png b/graphics/field_effects/pics/shadow_small.png index f5feada2b96633ca74e5281fa01fa7fd59aff536..6cd37c5f23a54d2ea919da42888fa1bb2f98384a 100644 GIT binary patch literal 4807 zcmeHKX;c&05)P{fxFX8{Y7C+%c9ITFAQ5B3%M9uqL`6XuKv@Ps!Id+D3o0VwL!TS(CZNKZ`Qtfn{+V++-CeiptE#W+R&p~# z<_3;1wKXM?NF%sGetd8@(O!lI;F~$=U=fLAz)1=XSMgCbS)r7RaS29NB`Pp7roqJ| zlIB+Dj>XCuQ_a&`Bm8%yP4*VBkex@Lk+0T|O0AB3*0$V(#?3usi~7v=-5dSv?a~z^ zUk{tmE1~+G$)5jG<2!PfneoHdhmYl@gn#&$L#R%wn+-XRTa?G=ykz$9%?Web?zo0WIPPrTkK^<+ii>O-;L;Vouy2 z-?HXr?61K)rWlJYHAag{1p6Pj(bU_`H`$?%78}NtM7y0+pPn~jBRo5=>h^Z$@`|1i z@&>M~H{6Jf)UmUiOJkB#riAI07G0CHM0eko3D&EcZX9!n*k@$s(Eh`XpxY>E+N!Q~ z(IFixQz)6)RnDizPTFid%P3uvw{e7tQ-EyUw$(xU_H7+@txm_!*e8ay)#S^1-T;W>(pS-BT8~+~2{xE4jM(h|^x%Wyg*za}6V)jeC$g7Lcp- zhSE8g9egBXLh_Sa#~&>*4whD#IBY^xEma32o2oj)_uhKi^f>>I^-Yll)~+c>lXmY* z%q_1rFLxik?&;*TRS&Cc?ABhA9oSQoBF@RGTF02{zHtgX+C0~NWO2&}&ht%s%>D|z z^Jem+DaGn7gvH&d?RjTYy^q%}-SeaZ^6jyy%TFrpe(D&3a?Zw&IG^70sMD-tNz|L$ zf66(1aU6rNGF#cTTABFnhr*X9>uzR0AKx&i82k#IxRbv+-_=aC|3Isdk=Q` z_q5-+aM->tIeke@eO&cN=9%W{?!F*94oUp>6 z@?d3qTPk%8iKMp%=Ws%}9L}fh1U6Al>Q>L7%ii`COTF?b+gB}gy1!*VJ7Tou^6cqW zrM|fH=_k?34r>Gt;z!yWHLqGdas7f})-h4zBaM7s7?ju6avS`E-!J9Ij%h1h?se~O z@|_C?=WD0WH}5mtS8ynAZu#2C9~PLLFWYRAKDsQe${gAiQBxM5a`*D(=5sdnO0Ul{TyB(SxGg{quN_t<`{F=wBx5&s` z%eS5#Rdc1-*Mn!j-E#ZO3#<&RZgI}`Ww~d%s+Zc#C~*GnM5Dcr{_G%%k>1!R1^Y}b z;6)4g=J~kS^ZOHj|1eF-Z9kf}RjB9cG+OHQX5#zjH=O43*xXY0KYIib6AyYvTgST2 zc>1oTaM9GXuJ4NYGe0h}`02ys3k?ki0=;AHii)1cUYnpeYv7lMd~YqS4s2XJL%%EL z6)!RRh1KK5L{eN=+bg{)e%MvFOQnH6`@Vd8aSHcRfh&E+z2``EY#-0rh z##=aV4qGUfQc;myfKfG41sH!Ml82W@fePa=6-ykuLO;c5%PGY5c5yKWGaWj5F+7cdquob zqDx04q+t?F3RDT;6&~U;kjo4CY@wwf2A3*yR)FjwnkroUg{&d5X;*aV3=RaCf5si6 z{V8{yGSK4j*nVv z5>JXYD6-a4*WhH2{;~w&1kgy-_WVHC&&QVczx8hd39efrlXZ>DMuq)O2s8l`=^O#O z{v}~7DvQCu4j*W#PjdVp$^}X+bY(EzAQ6U%AViG8kUJs}K$x40J1PVTqPqw5=8U&X*zDSzv( zZ*+YX17D^5t-JnjbeVoR?qD+T4@eCTGl>DswcsE`51A9{PgLahT|eDdk$o?lNcQpR z%Rha6S@L=xes)DKP#F#LPv;Ag2_F{ArmwFLNDfT0eg$rNg4uz7q;*E)gTTvhMNkAm zBAHoeFFn%k92+1UrsDGahdnT~u^eZ{{cA@I5ZQA5d_ql{h0)#yITmS}hc&~^T~?CH b^fUEHVTHpW%-ixOphe>P&-FXu8@=j(7?>nJ delta 86 zcmX@E+Rr#ad9s?2qIXpHUID|PElZNBiybX3CI0{a&%nSSn>+6~kdpFraSY*@nVjIj p{71gw$N&HQJpUUR4l#8yGECy*{>oQV+zwR5;OXk;vd$@?2>?w89&P{t diff --git a/graphics/weather/fog.pal b/graphics/weather/fog.pal index 6191b66928..1f40dd4e74 100644 --- a/graphics/weather/fog.pal +++ b/graphics/weather/fog.pal @@ -10,7 +10,7 @@ JASC-PAL 213 213 213 222 222 222 164 164 164 -255 0 255 +0 0 0 255 0 255 255 0 255 180 180 180 diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 9e22ec05eb..00b95340ea 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -28,45 +28,13 @@ static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_MAY, - .oam = &gObjectEventBaseOam_8x8, - .anims = sAnimTable_Shadow, - .images = sPicTable_ShadowSmall, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = UpdateShadowFieldEffect, -}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, TAG_WEATHER_START, &gObjectEventBaseOam_8x8, sAnimTable_Shadow, sPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_MAY, - .oam = &gObjectEventBaseOam_16x8, - .anims = sAnimTable_Shadow, - .images = sPicTable_ShadowMedium, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = UpdateShadowFieldEffect, -}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, TAG_WEATHER_START, &gObjectEventBaseOam_16x8, sAnimTable_Shadow, sPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_MAY, - .oam = &gObjectEventBaseOam_32x8, - .anims = sAnimTable_Shadow, - .images = sPicTable_ShadowLarge, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = UpdateShadowFieldEffect, -}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, TAG_WEATHER_START, &gObjectEventBaseOam_32x8, sAnimTable_Shadow, sPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_MAY, - .oam = &gObjectEventBaseOam_64x32, - .anims = sAnimTable_Shadow, - .images = sPicTable_ShadowExtraLarge, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = UpdateShadowFieldEffect, -}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, TAG_WEATHER_START, &gObjectEventBaseOam_64x32, sAnimTable_Shadow, sPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; static const struct SpriteFrameImage sPicTable_TallGrass[] = { overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 0a5fdd9733..d47c402629 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -352,7 +352,7 @@ void UpdateShadowFieldEffect(struct Sprite *sprite) sprite->x = linkedSprite->x; sprite->y = linkedSprite->y + sprite->data[3]; sprite->invisible = linkedSprite->invisible; - if (!objectEvent->active + if (!objectEvent->active || !objectEvent->hasShadow || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->previousMetatileBehavior))