diff options
| author | who-knows-who <j.williams97@outlook.com> | 2021-04-17 12:48:19 +0100 |
|---|---|---|
| committer | who-knows-who <j.williams97@outlook.com> | 2021-04-17 12:48:19 +0100 |
| commit | 996d9d78106cf4ab601815550ba77a92ab678328 (patch) | |
| tree | 9a92b4f792a11466cdee719b18ed449dee2e27fc /arm9/src/script.c | |
| parent | 267cb812e827604d4829d3afe28a82b0970d3706 (diff) | |
| parent | 85a8a2bd43633e11af094d66a35f3c32dc7c8bfe (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'arm9/src/script.c')
| -rw-r--r-- | arm9/src/script.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/src/script.c b/arm9/src/script.c index a5a5a6e4..2fa80058 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -17,7 +17,7 @@ THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 for (i = 0; i < NELEMS(ctx->stack); i++)
ctx->stack[i] = NULL;
- ctx->unk74 = 0;
+ ctx->unk74 = NULL;
}
THUMB_FUNC u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
@@ -27,7 +27,7 @@ THUMB_FUNC u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr) return 1;
}
-THUMB_FUNC void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *))
+THUMB_FUNC void SetupNativeScript(struct ScriptContext *ctx, BOOL (*ptr)(struct ScriptContext *))
{
ctx->mode = 2;
ctx->nativePtr = ptr;
@@ -39,9 +39,9 @@ THUMB_FUNC void StopScript(struct ScriptContext *ctx) ctx->scriptPtr = 0;
}
-THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, s32 r1)
+THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, struct UnkStruct_0204639C *r1)
{
- ctx->unk74 = (u32)r1;
+ ctx->unk74 = r1;
}
THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx)
|