Fixed shadow hot springs bug.

This commit is contained in:
Ariel Antonitis 2021-04-24 21:21:01 -04:00
parent c3fdaca8e2
commit 37d0e17be4
4 changed files with 4 additions and 3 deletions

View file

@ -1,3 +1,3 @@
qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{šœ2<C593>tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»233»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ220 1"1000 1"1000rr¨  00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{šœ2<C593>tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»2£2£2»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ220 1"1000 1"1000rr¨  00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
00 0 0
00rrёєі»ј0000rrАБВЕГџ000  Ж4rrИ1Й1КНЛ§000 !" !"Ж4rr00000000000040000Ж4m000000000000000Ж4Ж4qqrm0000000000000044qqllllllllllllllll

View file

@ -77,7 +77,7 @@
"x": 4,
"y": 4,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",

View file

@ -8862,7 +8862,7 @@ static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *
for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1)
if (flags & 1)
sGroundEffectFuncs[i](objEvent, sprite);
if (!gWeatherPtr->noShadows)
if (!(gWeatherPtr->noShadows || objEvent->inHotSprings))
GroundEffect_Shadow(objEvent, sprite);
}

View file

@ -349,6 +349,7 @@ void UpdateShadowFieldEffect(struct Sprite *sprite)
sprite->invisible = linkedSprite->invisible;
if (!objectEvent->active
|| objectEvent->noShadow
|| objectEvent->inHotSprings
|| gWeatherPtr->noShadows
|| MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior)
|| MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior)