diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 11:37:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 11:37:18 -0600 |
| commit | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/fldeff_teleport.c | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
| parent | 1b895ff52c011d51a9516791148cd5088ba411b5 (diff) | |
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
Diffstat (limited to 'src/fldeff_teleport.c')
| -rw-r--r-- | src/fldeff_teleport.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index e82a26cd1..ebf9aa38a 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 "party_menu.h" @@ -7,18 +6,21 @@ #include "rom6.h" #include "task.h" +static void FieldCallback_Teleport(void); +static void StartTeleportFieldEffect(void); + bool8 SetUpFieldMove_Teleport(void) { if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE) { gFieldCallback2 = 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); @@ -28,16 +30,14 @@ void hm_teleport_run_dp02scr(void) bool8 FldEff_UseTeleport(void) { u8 taskId = oei_task_add(); - gTasks[taskId].data[8] = (u32)sub_817C94C >> 16; - gTasks[taskId].data[9] = (u32)sub_817C94C; - SetPlayerAvatarTransitionFlags(1); + gTasks[taskId].data[8] = (u32)StartTeleportFieldEffect >> 16; + gTasks[taskId].data[9] = (u32)StartTeleportFieldEffect; + SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); return FALSE; } -void sub_817C94C(void) +static void StartTeleportFieldEffect(void) { FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT); CreateTeleportFieldEffectTask(); } - - |