diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-10 15:26:46 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-10 15:26:46 -0700 |
commit | 408252d1ce2ebc4994b2d1b07fe6be2746b73e7b (patch) | |
tree | cad1cfa47f95dca44cfd049a1df06525c33552f4 /src/fldeff_teleport.c | |
parent | 8a8ea01c10263c25cfd84780af43abcb5e3f4efc (diff) |
Document fldeff_teleport.c
Diffstat (limited to 'src/fldeff_teleport.c')
-rw-r--r-- | src/fldeff_teleport.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index f27fa86fa..9f72c6383 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -1,5 +1,4 @@ #include "global.h" -#include "fldeff_teleport.h" #include "field_effect.h" #include "field_player_avatar.h" #include "pokemon_menu.h" @@ -12,19 +11,23 @@ extern void (*gFieldCallback)(void); extern u8 gLastFieldPokeMenuOpened; extern void (*gPostMenuFieldCallback)(void); +static void FieldCallback_Teleport(void); +static void StartTeleportFieldEffect(void); + + bool8 SetUpFieldMove_Teleport(void) { if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE) { gFieldCallback = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = hm_teleport_run_dp02scr; + gPostMenuFieldCallback = FieldCallback_Teleport; return TRUE; } return FALSE; } -void hm_teleport_run_dp02scr(void) +static void FieldCallback_Teleport(void) { Overworld_ResetStateAfterTeleport(); FieldEffectStart(FLDEFF_USE_TELEPORT); @@ -34,14 +37,14 @@ void hm_teleport_run_dp02scr(void) bool8 FldEff_UseTeleport(void) { u8 taskId = oei_task_add(); - gTasks[taskId].data[8] = (u32)sub_814A404 >> 16; - gTasks[taskId].data[9] = (u32)sub_814A404; - SetPlayerAvatarTransitionFlags(1); + gTasks[taskId].data[8] = (u32)StartTeleportFieldEffect >> 16; + gTasks[taskId].data[9] = (u32)StartTeleportFieldEffect; + SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); return 0; } -void sub_814A404(void) +static void StartTeleportFieldEffect(void) { FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT); - sub_8087BA8(); + CreateTeleportFieldEffectTask(); } |