Merge branch 'MainMenuRewrite' of https://github.com/Rubberduckycooly…

…/Sonic-1-2-2013-Decompilation into MainMenuRewrite
RSDKModding · Oct 22, 2021 · 95d236c · 95d236c
2 parents 0dc6f57 + d33f91e
commit 95d236c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/RSDKv4/Script.cpp b/RSDKv4/Script.cpp
@@ -4864,9 +4864,14 @@ void ProcessScript(int scriptCodePtr, int jumpTablePtr, byte scriptEvent)
             }
             case FUNC_RETURN:
                 opcodeSize    = 0;
-                scriptCodePtr = functionStack[--functionStackPos];
-                jumpTablePtr  = functionStack[--functionStackPos];
-                scriptDataPtr = functionStack[--functionStackPos];
+                if (!functionStackPos) { //event, stop running
+                    running = false;
+                }
+                else { //function, jump out
+                    scriptCodePtr = functionStack[--functionStackPos];
+                    jumpTablePtr  = functionStack[--functionStackPos];
+                    scriptDataPtr = functionStack[--functionStackPos];
+                }
                 break;
             case FUNC_SETLAYERDEFORMATION:
                 opcodeSize = 0;