Merge branch 'master' into clone-union

2022-09-03 14:31:04 -04:00
parent ab56ac41a1 ccd527b782
commit 0400ee2124
353 changed files with 20156 additions and 19152 deletions
@@ -1690,7 +1690,7 @@ void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callba
    
    do
    {
-        if (ScriptContext1_IsScriptSetUp() != TRUE && sub_8112CAC() == TRUE)
+        if (ScriptContext_IsEnabled() != TRUE && sub_8112CAC() == TRUE)
            spriteTemplate->callback = sub_811246C;
        else
            spriteTemplate->callback = callback;