diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 19:57:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 19:57:00 -0500 |
| commit | 833f9026ff89c4bc7c9cf84b6c23d01e790e51e0 (patch) | |
| tree | 595bc979ea25ffb98b9d1033f52662cab62acf4a /src/script.c | |
| parent | 566392f441a66da41fc827b6d2e8cbeaf1cf4825 (diff) | |
| parent | 275344c3de95471b93a6a417e2178d93688887a9 (diff) | |
Merge pull request #385 from drifloony/mystery_event_script
finish decompiling mystery_event_script
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script.c b/src/script.c index e5be913c6..8f12da437 100644 --- a/src/script.c +++ b/src/script.c @@ -52,7 +52,7 @@ void StopScript(struct ScriptContext *ctx) ctx->scriptPtr = 0; } -u8 RunScript(struct ScriptContext *ctx) +u8 RunScriptCommand(struct ScriptContext *ctx) { if (ctx->mode == 0) return 0; @@ -191,7 +191,7 @@ bool8 ScriptContext2_RunScript(void) ScriptContext2_Enable(); - if (!RunScript(&sScriptContext1)) + if (!RunScriptCommand(&sScriptContext1)) { sScriptContext1Status = 2; ScriptContext2_Disable(); @@ -224,7 +224,7 @@ void ScriptContext2_RunNewScript(const u8 *ptr) { InitScriptContext(&sScriptContext2, &gScriptCmdTable, &gScriptCmdTableEnd); SetupBytecodeScript(&sScriptContext2, ptr); - while (RunScript(&sScriptContext2) == 1) + while (RunScriptCommand(&sScriptContext2) == 1) ; } |