Bring labels for overworld.c over from pokeruby

2018-09-04 23:31:37 +01:00
parent 5c66b8a7ef
commit 4c54212b1f
16 changed files with 231 additions and 232 deletions
@@ -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();