From caf682d92bfe069c09b7cf024c995255705d33b1 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 24 May 2020 18:28:58 +0100 Subject: fix warnings in script.h --- arm9/src/script.c | 5 ++--- include/script.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/arm9/src/script.c b/arm9/src/script.c index 8a36f924..7f15f251 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -1,4 +1,3 @@ -#include "global.h" #include "script.h" u16 ScriptReadHalfword(struct ScriptContext *ctx); @@ -42,9 +41,9 @@ THUMB_FUNC void StopScript(struct ScriptContext *ctx) ctx->scriptPtr = 0; } -THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, int r1) +THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, s32 r1) { - ctx->unk74 = r1; + ctx->unk74 = (u32)r1; } THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx) diff --git a/include/script.h b/include/script.h index 2ecc8e28..0a69f7dd 100644 --- a/include/script.h +++ b/include/script.h @@ -1,6 +1,8 @@ #ifndef _SCRIPT_H_ #define _SCRIPT_H_ +#include "global.h" + struct ScriptContext; typedef u8 (*ScrCmdFunc)(struct ScriptContext *); @@ -22,6 +24,18 @@ struct ScriptContext #define ScriptReadByte(ctx) (*(ctx->scriptPtr++)) +void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd); +u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr); +void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *)); +void StopScript(struct ScriptContext *ctx); +void FUN_02038B6C(struct ScriptContext *ctx, s32 r1); +u8 RunScriptCommand(struct ScriptContext *ctx); +u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr); +const u8 *ScriptPop(struct ScriptContext *ctx); +void ScriptJump(struct ScriptContext *ctx, const u8 *ptr); +u8 ScriptCall(struct ScriptContext *ctx, const u8 *ptr); +void ScriptReturn(struct ScriptContext *ctx); u16 ScriptReadHalfword(struct ScriptContext *ctx); +u32 ScriptReadWord(struct ScriptContext *ctx); #endif // _SCRIPT_H_ -- cgit v1.2.3