diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-04 23:31:37 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-04 23:31:37 +0100 |
| commit | 4c54212b1f559a110fc7f6fffebe3a54748f3fec (patch) | |
| tree | 9a15ec95345fdc22fd5d48580f0492695b8c036f /src/secret_base.c | |
| parent | 5c66b8a7eff886b72bb98e22b5b34421d1a601d2 (diff) | |
Bring labels for overworld.c over from pokeruby
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 d357261fe..7fae50a81 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -388,7 +388,7 @@ void sub_80E8FD0(u8 taskId) gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_10 ++; } sub_80E8F9C(); - warp_in(); + WarpIntoMap(); gFieldCallback = sub_80AF168; SetMainCallback2(CB2_LoadMap); DestroyTask(taskId); @@ -446,7 +446,7 @@ void sub_80E916C(u8 taskId) { idx = sCurSecretBaseId / 10 * 4; Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gUnknown_0858CFE8[idx + 2], gUnknown_0858CFE8[idx + 3]); - warp_in(); + WarpIntoMap(); gFieldCallback = sub_80E9108; SetMainCallback2(CB2_LoadMap); DestroyTask(taskId); @@ -644,7 +644,7 @@ void sub_80E96A4(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(); |