diff --git a/RSDKv4/Drawing.cpp b/RSDKv4/Drawing.cpp index 8c7120ac3..f47e7557e 100644 --- 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 index 1e385110e..8a330cdf9 100644 --- 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);