Fixed shadow hot springs bug.
This commit is contained in:
parent
c3fdaca8e2
commit
37d0e17be4
4 changed files with 4 additions and 3 deletions
|
@ -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¬2XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(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¬2XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(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
|
|
@ -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",
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue