summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-04-05 10:32:33 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-04-05 18:21:17 -0400
commit553fe6239ab55ac456e80528bfe3a1697a05c2ed (patch)
treea6d92086e40f81fbc0f07568976857259e2caee6 /src/field_effect.c
parentf90026826a0c4fb1f85a3e1648026392cb5072f9 (diff)
Document more field effects
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index 445827390..8152f19bb 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -3053,7 +3053,7 @@ static void SurfFieldEffect_End(struct Task *task)
gPlayerAvatar.preventStep = FALSE;
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_5;
ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection));
- SetSurfBobState(objectEvent->fieldEffectSpriteId, 1);
+ SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_PLAYER_AND_MON);
UnfreezeObjectEvents();
ScriptContext2_Disable();
FieldEffectActiveListRemove(FLDEFF_USE_SURF);
@@ -3204,8 +3204,8 @@ static void FlyOutFieldEffect_BirdLeaveBall(struct Task *task)
struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
{
- SetSurfBobState(objectEvent->fieldEffectSpriteId, 2);
- SetSurfBobWhileFlyingOutState(objectEvent->fieldEffectSpriteId, 0);
+ SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_JUST_MON);
+ SetSurfBlob_DontSyncAnim(objectEvent->fieldEffectSpriteId, FALSE);
}
task->tBirdSpriteId = CreateFlyBirdSprite(); // Does "leave ball" animation by default
task->tState++;
@@ -3473,7 +3473,7 @@ static void FlyInFieldEffect_BirdSwoopDown(struct Task *task)
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
{
- SetSurfBobState(objectEvent->fieldEffectSpriteId, 0);
+ SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_NONE);
}
ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
CameraObjectReset2();
@@ -3582,7 +3582,7 @@ static void FlyInFieldEffect_End(struct Task *task)
if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING)
{
state = PLAYER_AVATAR_STATE_SURFING;
- SetSurfBobState(objectEvent->fieldEffectSpriteId, 1);
+ SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_PLAYER_AND_MON);
}
ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state));
ObjectEventTurn(objectEvent, DIR_SOUTH);