dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve some names in field_player_avatar

Browse Source
This commit is contained in:
PikalaxALT
2021-03-24 13:19:07 -04:00
parent 56f62d6d66
commit 7f70b570dd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+7 -7
View File
@@ -77,8 +77,8 @@ static void PlayerAvatarTransition_Underwater(struct ObjectEvent * playerObject)
static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent * playerObject); static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent * playerObject);
static bool8 PlayerIsAnimActive(void); static bool8 PlayerIsAnimActive(void);
static bool8 PlayerCheckIfAnimFinishedOrInactive(void); static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
static bool8 player_is_anim_in_certain_ranges(void); static bool8 PlayerAnimIsMultiFrameStationary(void);
static bool8 player_is_anim_in_certain_ranges__running_state_not_turn(void); static bool8 PlayerAnimIsMultiFrameStationaryAndStateNotTurning(void);
static void PlayCollisionSoundIfNotFacingWarp(u8 direction); static void PlayCollisionSoundIfNotFacingWarp(u8 direction);
static void PlayerGoSpin(u8 direction); static void PlayerGoSpin(u8 direction);
static void PlayerApplyTileForcedMovement(u8 metatileBehavior); static void PlayerApplyTileForcedMovement(u8 metatileBehavior);
@@ -746,18 +746,18 @@ void UpdatePlayerAvatarTransitionState(void)
{ {
if (!PlayerCheckIfAnimFinishedOrInactive()) if (!PlayerCheckIfAnimFinishedOrInactive())
{ {
if (!player_is_anim_in_certain_ranges()) if (!PlayerAnimIsMultiFrameStationary())
gPlayerAvatar.tileTransitionState = T_TILE_TRANSITION; gPlayerAvatar.tileTransitionState = T_TILE_TRANSITION;
} }
else else
{ {
if (!player_is_anim_in_certain_ranges__running_state_not_turn()) if (!PlayerAnimIsMultiFrameStationaryAndStateNotTurning())
gPlayerAvatar.tileTransitionState = T_TILE_CENTER; gPlayerAvatar.tileTransitionState = T_TILE_CENTER;
} }
} }
} }
static bool8 player_is_anim_in_certain_ranges(void) static bool8 PlayerAnimIsMultiFrameStationary(void)
{ {
u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId; u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId;
@@ -771,9 +771,9 @@ static bool8 player_is_anim_in_certain_ranges(void)
return FALSE; return FALSE;
} }
static bool8 player_is_anim_in_certain_ranges__running_state_not_turn(void) static bool8 PlayerAnimIsMultiFrameStationaryAndStateNotTurning(void)
{ {
if (player_is_anim_in_certain_ranges() && gPlayerAvatar.runningState != TURN_DIRECTION) if (PlayerAnimIsMultiFrameStationary() && gPlayerAvatar.runningState != TURN_DIRECTION)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;