summaryrefslogtreecommitdiff
path: root/src/secret_base.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-16 18:31:23 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-19 18:52:24 -0500
commitad0bb29c4b5802a526722ab15a63396c437dc943 (patch)
treebfda08573471b17151fc4c3cc38ba5d3498b25d6 /src/secret_base.c
parent544b5b61d42e355ef44c65dc84e53d5f73d7c0e1 (diff)
Label various overworld-related things
Diffstat (limited to 'src/secret_base.c')
-rw-r--r--src/secret_base.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/secret_base.c b/src/secret_base.c
index 60ce80af5..69c7171d6 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();