diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_fadetransition.h | 4 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index d649fc02f..240353f5e 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -11,7 +11,7 @@ void DoDoorWarp(void); void DoFallWarp(void); void DoTeleportWarp(void); void sub_807E500(void); -void sub_807DF64(void); +void FieldCB_UnionRoomWarp(void); void WarpFadeOutScreen(void); void FieldCallback_ReturnToEventScript2(void); void FadeInFromBlack(void); @@ -20,7 +20,7 @@ void WarpFadeInScreen(void); void sub_807DCE4(void); -bool32 sub_807E418(void); +bool32 FieldFadeTransitionBackgroundEffectIsFinished(void); void palette_bg_faded_fill_black(void); void sub_807E4A0(u16 metatileBehavior, u16 delay); void DoEscalatorWarp(u8 a0); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index d6c02d8ab..90e2baaaf 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -20,7 +20,7 @@ u8 GetPlayerAvatarGraphicsIdByStateId(u8); void SetPlayerAvatarStateMask(u8 mask); void AlignFishingAnimationFrames(struct Sprite *sprite); void CreateStopSurfingTask_NoMusicChange(u8 direction); -void sub_805DAE4(u8 direction); +void SavePlayerFacingDirectionForTeleport(u8 direction); void SetPlayerAvatarTransitionFlags(u16 a); bool8 IsPlayerFacingSurfableFishableWater(void); void StartFishing(u8 secondaryId); @@ -29,10 +29,10 @@ u8 PlayerGetZCoord(void); u8 GetPlayerAvatarGraphicsIdByCurrentState(void); void sub_805CB70(void); void SetPlayerInvisibility(bool8); -void sub_805DC04(void); -void sub_805DAB0(void); -bool32 sub_805DAD0(void); -bool32 sub_805DC24(void); +void StartTeleportInPlayerAnim(void); +void StartTeleportWarpOutPlayerAnim(void); +bool32 WaitTeleportWarpOutPlayerAnim(void); +bool32 WaitTeleportInPlayerAnim(void); bool8 PartyHasMonWithSurf(void); bool8 IsPlayerSurfingNorth(void); u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); |