From 145e90483b2a30698f917f62e585aa7fa4794588 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 00:41:28 -0800 Subject: event_data.c --- src/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script.c') diff --git a/src/script.c b/src/script.c index a7aa9c809..8ce889930 100644 --- a/src/script.c +++ b/src/script.c @@ -1,7 +1,7 @@ #include "global.h" #include "script.h" #include "asm_fieldmap.h" -#include "var.h" +#include "event_data.h" #define RAM_SCRIPT_MAGIC 51 -- cgit v1.2.3 From 929148fb7de2eda9fee1f4611834d4dfb73c9f91 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 23:42:33 -0800 Subject: define script data in C --- src/script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/script.c') diff --git a/src/script.c b/src/script.c index 8ce889930..7a9c8e102 100644 --- a/src/script.c +++ b/src/script.c @@ -15,7 +15,7 @@ static bool8 sScriptContext2Enabled; extern ScrCmdFunc gScriptCmdTable[]; extern ScrCmdFunc gScriptCmdTableEnd[]; -extern void *gUnknown_083762D8; +extern void *gNullScriptPtr; void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd) { @@ -83,7 +83,7 @@ u8 RunScript(struct ScriptContext *ctx) return 0; } - if (ctx->scriptPtr == gUnknown_083762D8) + if (ctx->scriptPtr == gNullScriptPtr) { while (1) asm("svc 2"); // HALT -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/script.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/script.c') diff --git a/src/script.c b/src/script.c index 7a9c8e102..488a67de1 100644 --- a/src/script.c +++ b/src/script.c @@ -1,6 +1,5 @@ #include "global.h" #include "script.h" -#include "asm_fieldmap.h" #include "event_data.h" #define RAM_SCRIPT_MAGIC 51 -- cgit v1.2.3