diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-09 20:31:56 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-09 20:31:56 +0200 |
| commit | cf8898071d0aa02438be2b1b1d03a6e6b33892be (patch) | |
| tree | 645e643948653d0ae99a9187aab5e769c1ac3737 /src/secret_base.c | |
| parent | 4d1df7ecbe69cf151d00976648aa34faae8cd6e9 (diff) | |
| parent | e21b91cc2f48c4b6bf2cb2d8e97ea1d55c0163bb (diff) | |
Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2
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(); |