Merge master into ObjEvent rename

2019-12-21 05:19:27 -05:00
parent 949509aade 026e1108b2
commit 68cdd7b1cb
67 changed files with 1026 additions and 822 deletions
@@ -413,7 +413,7 @@ static void Task_EnterSecretBase(u8 taskId)

        SetSecretBaseWarpDestination();
        WarpIntoMap();
-        gFieldCallback = FieldCallback_ReturnToEventScript2;
+        gFieldCallback = FieldCB_ContinueScriptHandleMusic;
        SetMainCallback2(CB2_LoadMap);
        DestroyTask(taskId);
        break;
@@ -456,7 +456,7 @@ static void EnterNewlyCreatedSecretBase_StartFadeIn(void)
    y += 7;
    MapGridSetMetatileIdAt(x, y, 0x220 | METATILE_COLLISION_MASK);
    CurrentMapDrawMetatileAt(x, y);
-    pal_fill_black();
+    FadeInFromBlack();
    CreateTask(EnterNewlyCreatedSecretBase_WaitFadeIn, 0);
 }

@@ -678,7 +678,7 @@ static void Task_WarpOutOfSecretBase(u8 taskId)
    case 2:
        SetWarpDestinationToDynamicWarp(0x7e);
        WarpIntoMap();
-        gFieldCallback = mapldr_default;
+        gFieldCallback = FieldCB_DefaultWarpExit;
        SetMainCallback2(CB2_LoadMap);
        ScriptContext2_Disable();
        DestroyTask(taskId);