Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-04-25 07:26:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix warnings in script.h

Browse Source
This commit is contained in:
red031000 2020-05-24 18:28:58 +01:00
parent f5020bf1a7
commit caf682d92b
No known key found for this signature in database
GPG Key ID: A3C87CFF2DC536C2
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arm9/src/script.c
View File

@ -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)

14
include/script.h
View File

@ -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_