diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-09-13 11:01:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 11:01:47 -0500 |
| commit | c1c2015f7046676b043641c0d1f9d9e29bc73647 (patch) | |
| tree | cbea3afbcdad3d6bcc178ae4abffa9bbe88549f7 /src/fldeff_teleport.c | |
| parent | 37cf3484223366ee381f15d9a2cfeaf3612fd228 (diff) | |
| parent | 9e9c40214f7672662820636167d2cc1469ca2ba1 (diff) | |
Merge pull request #430 from camthesaxman/scrcmd_renaming
(don't merge yet) rename script commands
Diffstat (limited to 'src/fldeff_teleport.c')
| -rw-r--r-- | src/fldeff_teleport.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index 74e68df06..af48fb414 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -3,7 +3,7 @@ #include "field_effect.h" #include "field_player_avatar.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "rom6.h" #include "task.h" @@ -13,9 +13,9 @@ extern void (*gUnknown_03005CE4)(void); bool8 SetUpFieldMove_Teleport(void) { - if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE) + if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = hm_teleport_run_dp02scr; return TRUE; } @@ -25,9 +25,9 @@ bool8 SetUpFieldMove_Teleport(void) void hm_teleport_run_dp02scr(void) { - new_game(); - FieldEffectStart(63); - gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened; + Overworld_ResetStateAfterTeleport(); + FieldEffectStart(FLDEFF_USE_TELEPORT); + gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; } bool8 FldEff_UseTeleport(void) @@ -41,6 +41,6 @@ bool8 FldEff_UseTeleport(void) void sub_814A404(void) { - FieldEffectActiveListRemove(63); + FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT); sub_8087BA8(); } |