diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-29 20:56:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 20:56:15 -0400 |
| commit | 50e9666e1637b15bd57fd7ee88180e50d2eb5e8c (patch) | |
| tree | b1543b6d79695862cb60d686548dd1a996b69e8c /src/field_control_avatar.c | |
| parent | dea07dc8656c8fb32f5b389b9f4f9a30fe26e555 (diff) | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
Merge branch 'master' into doc-introcred
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index a811901a9..6ec280fd0 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -67,7 +67,7 @@ static bool8 TryStartCoordEventScript(struct MapPosition *); static bool8 TryStartWarpEventScript(struct MapPosition *, u16); static bool8 TryStartMiscWalkingScripts(u16); static bool8 TryStartStepCountScript(u16); -static void UpdateHappinessStepCounter(void); +static void UpdateFriendshipStepCounter(void); static bool8 UpdatePoisonStepCounter(void); void FieldClearPlayerInput(struct FieldInput *input) @@ -542,7 +542,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } IncrementRematchStepCounter(); - UpdateHappinessStepCounter(); + UpdateFriendshipStepCounter(); UpdateFarawayIslandStepCounter(); if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED_MOVE) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) @@ -607,14 +607,15 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) return FALSE; } -void Unref_ClearHappinessStepCounter(void) +// Unused +static void ClearFriendshipStepCounter(void) { - VarSet(VAR_HAPPINESS_STEP_COUNTER, 0); + VarSet(VAR_FRIENDSHIP_STEP_COUNTER, 0); } -static void UpdateHappinessStepCounter(void) +static void UpdateFriendshipStepCounter(void) { - u16 *ptr = GetVarPointer(VAR_HAPPINESS_STEP_COUNTER); + u16 *ptr = GetVarPointer(VAR_FRIENDSHIP_STEP_COUNTER); int i; (*ptr)++; |