diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-25 13:26:22 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2021-03-27 17:27:20 -0500 |
| commit | 7a5c6d4d869b314ce748fe2ccff493c468fa0a91 (patch) | |
| tree | 0f6b4b4ab794da91b7a2565dc33e5981c886776b /src/field_control_avatar.c | |
| parent | 0f869fb26630cd7ec65a1873d76d144bdfaf11d4 (diff) | |
Standardize Friendship/Happiness
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)++; |