Merge master into ObjEvent rename

2019-12-15 02:00:00 -05:00
parent 6556b556dd 6967caefb2
commit 82f55f2381
49 changed files with 1845 additions and 1829 deletions
@@ -517,7 +517,7 @@ static bool8 TryStartMiscWalkingScripts(u16 metatileBehavior)
    }
    else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior))
    {
-        ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8);
+        ScriptContext1_SetupScript(BattlePyramid_WarpToNextFloor);
        return TRUE;
    }
    else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE)