diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 09:27:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 09:27:45 -0400 |
| commit | 75ae00beff77e166c4ae573300ed5cb31175e8ac (patch) | |
| tree | ec15c56d3b09c2cec74ac907110c9111e18e8729 /src/field_effect.c | |
| parent | d8c9214e0a911882daf28dec07204de3c3c2df80 (diff) | |
| parent | 9cfc34f2ec26d45085d9c4006b21406f8f968ed6 (diff) | |
Merge pull request #315 from PikalaxALT/overworld
Overworld
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index b59ce5a6b..c0d7d3463 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2064,7 +2064,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task * task) if (data[4] == 1 && !gPaletteFade.active && BGMusicStopped() == TRUE) { SetObjectEventDirection(playerObj, task->data[15]); - sub_80555E0(); + SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = FieldCallback_EscapeRopeExit; SetMainCallback2(CB2_LoadMap); @@ -2331,7 +2331,7 @@ static void TeleportFieldEffectTask4(struct Task * task) { if (BGMusicStopped() == TRUE) { - copy_saved_warp3_bank_and_enter_x_to_warp1(); + SetWarpDestinationToLastHealLocation(); WarpIntoMap(); SetMainCallback2(CB2_LoadMap); gFieldCallback = FieldCallback_TeleportIn; |