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/secret_base.c | |
| parent | 2c7a4e1406b078cf9bcc2a16e92a58497390aa17 (diff) | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
Merge remote-tracking branch 'upstream/master' into assets
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 0812d2ac6..632d6845e 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -363,7 +363,7 @@ void sub_80BBA48(u8 taskid) if (gSaveBlock1.secretBases[curbaseid].sbr_field_10 < 0xff) gSaveBlock1.secretBases[curbaseid].sbr_field_10++; sub_80BBA14(); - warp_in(); + WarpIntoMap(); gFieldCallback = sub_8080990; SetMainCallback2(CB2_LoadMap); DestroyTask(taskid); @@ -416,7 +416,7 @@ void sub_80BBBEC(u8 taskid) { idx = 4 * (gCurrentSecretBaseId / 10); Overworld_SetWarpDestination(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1, gUnknown_083D1374[idx + 2], gUnknown_083D1374[idx + 3]); - warp_in(); + WarpIntoMap(); gFieldCallback = sub_80BBB90; SetMainCallback2(CB2_LoadMap); DestroyTask(taskid); @@ -578,7 +578,7 @@ void sub_80BC074(u8 taskid) break; case 2: copy_saved_warp2_bank_and_enter_x_to_warp1(0x7E); - warp_in(); + WarpIntoMap(); gFieldCallback = mapldr_default; SetMainCallback2(CB2_LoadMap); ScriptContext2_Disable(); |