From e4a72cbff306e805606c3d95e5192e535fcb0ca8 Mon Sep 17 00:00:00 2001 From: drifloony Date: Sat, 15 Jul 2017 18:48:46 -0700 Subject: map out ram variables --- src/script.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/script.c') diff --git a/src/script.c b/src/script.c index c27eb22fe..e5be913c6 100644 --- a/src/script.c +++ b/src/script.c @@ -4,8 +4,7 @@ #define RAM_SCRIPT_MAGIC 51 -extern u8 *gUnknown_0202E8AC; -extern u32 gUnknown_0202E8B0; +EWRAM_DATA u8 *gUnknown_0202E8AC = NULL; static u8 sScriptContext1Status; static struct ScriptContext sScriptContext1; -- cgit v1.2.3 From 275344c3de95471b93a6a417e2178d93688887a9 Mon Sep 17 00:00:00 2001 From: drifloony Date: Tue, 18 Jul 2017 20:24:49 -0700 Subject: finish decompiling mystery_event_script --- src/script.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/script.c') 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) ; } -- cgit v1.2.3