From a185f8a26dc5e5a04908c272ab54bede7af8a10c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 16:53:04 -0500 Subject: lots more relabeling --- src/fldeff_teleport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fldeff_teleport.c') diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index 10fdcce6e..3835d9eb6 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -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,7 +25,7 @@ bool8 SetUpFieldMove_Teleport(void) void hm_teleport_run_dp02scr(void) { - new_game(); + Overworld_ResetStateAfterTeleport(); FieldEffectStart(63); gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; } -- cgit v1.2.3