we need the fix here too

RSDKModding · Mar 18, 2023 · b94f6c0 · b94f6c0
1 parent c08a97e
commit b94f6c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/RSDKv4/Drawing.cpp b/RSDKv4/Drawing.cpp
@@ -1230,7 +1230,11 @@ void DrawStageGFX()
 
         DrawObjectList(5);
 #if RETRO_REV03
-        DrawObjectList(7);
+#if !RETRO_USE_ORIGINAL_CODE
+        // Hacky fix for Tails Object not working properly in special stages on non-Origins bytecode
+        if (!Engine.usingBytecode || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
+#endif
+            DrawObjectList(7);
 #endif
         DrawObjectList(6);
     }

diff --git a/RSDKv4/Scene.cpp b/RSDKv4/Scene.cpp
@@ -291,7 +291,11 @@ void ProcessStage(void)
             DrawObjectList(4);
             DrawObjectList(5);
 #if RETRO_REV03
-            DrawObjectList(7);
+#if !RETRO_USE_ORIGINAL_CODE
+            // Hacky fix for Tails Object not working properly in special stages on non-Origins bytecode
+            if (!Engine.usingBytecode || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
+#endif
+                DrawObjectList(7);
 #endif
             DrawObjectList(6);
 
@@ -470,7 +474,11 @@ void ProcessStage(void)
                 DrawObjectList(4);
                 DrawObjectList(5);
 #if RETRO_REV03
-                DrawObjectList(7);
+#if !RETRO_USE_ORIGINAL_CODE
+                // Hacky fix for Tails Object not working properly in special stages on non-Origins bytecode
+                if (!Engine.usingBytecode || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
+#endif
+                    DrawObjectList(7);
 #endif
                 DrawObjectList(6);