summaryrefslogtreecommitdiff
path: root/src/fldeff_teleport.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-12 16:53:04 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-12 16:53:04 -0500
commita185f8a26dc5e5a04908c272ab54bede7af8a10c (patch)
tree9e427bbb6c06e6e6693bd5dfeed04140acb5554e /src/fldeff_teleport.c
parent3b3d1596526ad0b19f7042d5176d92eac4738451 (diff)
lots more relabeling
Diffstat (limited to 'src/fldeff_teleport.c')
-rw-r--r--src/fldeff_teleport.c6
1 files changed, 3 insertions, 3 deletions
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;
}