summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-23 23:49:37 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-23 23:49:37 -0500
commitcdc5d1b683dd89e80d3daaf13965cae916ed9f6c (patch)
treee7f1242e19188b3dce7ed59ee0c81ef08fe55b3e /src/field_effect.c
parent5598fc659b4616b1964b38c55cef97c83f615646 (diff)
do some scrcmd/overworld labeling
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index 0625e9d18..ba71c40d7 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1213,7 +1213,7 @@ void task00_8084310(u8 taskId)
}
if (!FieldEffectActiveListContains(FLDEFF_USE_FLY))
{
- flag_var_implications_of_teleport_();
+ Overworld_ResetStateAfterFly();
warp_in();
SetMainCallback2(CB2_LoadMap);
gFieldCallback = mapldr_08084390;
@@ -2267,7 +2267,7 @@ void sub_8087D78(struct Task *task)
{
if (!gPaletteFade.active && sub_8054034() == TRUE)
{
- sub_8053570();
+ Overworld_SetWarpDestToLastHealLoc();
warp_in();
SetMainCallback2(CB2_LoadMap);
gFieldCallback = mapldr_08085D88;