diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 17:58:19 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 17:58:19 -0500 |
| commit | 70cc2c16becca3a66b21a71f0a781654dc55290b (patch) | |
| tree | ee931ee96a0438cd56ca67b0a765bbd650bf7d55 /src/decoration.c | |
| parent | 2c7a4e1406b078cf9bcc2a16e92a58497390aa17 (diff) | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
Merge remote-tracking branch 'upstream/master' into assets
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/decoration.c b/src/decoration.c index 2a70a3835..a4976932d 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -2039,7 +2039,7 @@ void sub_80FF114(u8 taskId) { DrawWholeMapView(); Overworld_SetWarpDestination(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1, gTasks[taskId].data[3], gTasks[taskId].data[4]); - warp_in(); + WarpIntoMap(); } void sub_80FF160(u8 taskId) { |