summaryrefslogtreecommitdiff
path: root/src/script.c
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-11-07 18:06:37 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-11-07 18:06:37 -0500
commita29b18ed2f27c2991b0894a69fa04738ba9522ca (patch)
tree4db08c6d6a2d585a0a42ee6f023faa9f6e8d13fb /src/script.c
parent8d2d34aae9767f283b3c34140920828e37540d23 (diff)
parent8b1c2c946b3b58cc938f0496a9af11a641749a1e (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/script.c')
-rw-r--r--src/script.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script.c b/src/script.c
index 889c25765..9ba1a7429 100644
--- a/src/script.c
+++ b/src/script.c
@@ -26,9 +26,9 @@ void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTable
s32 i;
ctx->mode = 0;
- ctx->scriptPtr = NULL;
+ ctx->scriptPtr = 0;
ctx->stackDepth = 0;
- ctx->nativePtr = NULL;
+ ctx->nativePtr = 0;
ctx->cmdTable = cmdTable;
ctx->cmdTableEnd = cmdTableEnd;
@@ -55,7 +55,7 @@ void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void))
void StopScript(struct ScriptContext *ctx)
{
ctx->mode = 0;
- ctx->scriptPtr = NULL;
+ ctx->scriptPtr = 0;
}
bool8 RunScriptCommand(struct ScriptContext *ctx)