diff options
| author | red031000 <rubenru09@aol.com> | 2020-05-26 01:54:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 01:54:32 +0100 |
| commit | 227da51c377f621f542ffdb52ef56bfb807f29ab (patch) | |
| tree | 31ec68ffd57f0d43df60f6885636cc12de782306 /arm9/src/script.c | |
| parent | 895b0ad8b9c09a0b6b1de59de76ed4a258076f87 (diff) | |
| parent | 0985659425ab1a9035d85512e330cdc247b24e6b (diff) | |
Merge pull request #109 from red031000/master
OS_protectionUnit.c + warning fixes
Diffstat (limited to 'arm9/src/script.c')
| -rw-r--r-- | arm9/src/script.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arm9/src/script.c b/arm9/src/script.c index 8a36f924..23515e5f 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -1,8 +1,5 @@ -#include "global.h"
#include "script.h"
-u16 ScriptReadHalfword(struct ScriptContext *ctx);
-
THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd)
{
u32 i;
@@ -42,9 +39,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)
|