diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-27 16:30:47 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-27 16:52:13 -0600 |
| commit | d59f5a8e5649ad09a41b65edcc68f701320ca52e (patch) | |
| tree | b05721bd6ec8578fb3ac04fb30fbd65cec4cc335 /src/field_effect.c | |
| parent | 2c0f5f58e9234f34f5f4aa2ffae931a57c6cf19e (diff) | |
Misc overworld documentation
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 9a65a444b..75104d426 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2171,7 +2171,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { SetEventObjectDirection(eventObject, task->data[15]); - sub_8084E14(); + SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; SetMainCallback2(CB2_LoadMap); @@ -2332,7 +2332,7 @@ static void TeleportFieldEffectTask4(struct Task *task) if (BGMusicStopped() == TRUE) { - Overworld_SetWarpDestToLastHealLoc(); + SetWarpDestinationToLastHealLocation(); WarpIntoMap(); SetMainCallback2(CB2_LoadMap); gFieldCallback = mapldr_08085D88; @@ -2443,7 +2443,7 @@ static void sub_80B8410(struct Task *task) bool8 FldEff_FieldMoveShowMon(void) { u8 taskId; - if (is_map_type_1_2_3_5_or_6(Overworld_GetMapTypeOfSaveblockLocation()) == TRUE) + if (is_map_type_1_2_3_5_or_6(GetCurrentMapType()) == TRUE) { taskId = CreateTask(sub_80B8554, 0xff); } else |