From 42afbf282d1995ec1970370abd200d7eb6baf8a7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 Jun 2020 08:36:38 -0400 Subject: Some more renaming --- include/map_header.h | 4 ++-- include/msgdata.h | 1 + include/script.h | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/map_header.h b/include/map_header.h index 0adb5886..e4e96a59 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -4,8 +4,8 @@ u8 FUN_02034724(u32 mapno); u8 FUN_02034738(u32 mapno); u16 FUN_0203474C(u32 mapno); -u16 FUN_02034774(u32 mapno); -u16 FUN_02034788(u32 mapno); +u16 MapHeader_GetMsgBank(u32 mapno); +u16 MapHeader_GetScrSeqReleaseNo(u32 mapno); u16 FUN_0203479C(u32 mapno); u16 FUN_020347B0(u32 mapno); u16 FUN_020347C4(u32 mapno); diff --git a/include/msgdata.h b/include/msgdata.h index fae8ca78..c2f37274 100644 --- a/include/msgdata.h +++ b/include/msgdata.h @@ -1,6 +1,7 @@ #ifndef POKEDIAMOND_MSG_DATA_H #define POKEDIAMOND_MSG_DATA_H +#include "filesystem.h" #include "string16.h" struct MsgDataAlloc diff --git a/include/script.h b/include/script.h index 87ac778b..494a9d9f 100644 --- a/include/script.h +++ b/include/script.h @@ -2,6 +2,7 @@ #define _SCRIPT_H_ #include "global.h" +#include "msgdata.h" struct ScriptContext; @@ -17,17 +18,17 @@ struct ScriptContext const u8 *scriptPtr; const u8 *stack[20]; ScrCmdFunc *cmdTable; - ScrCmdFunc *cmdTableEnd; + u32 cmdCount; u32 data[4]; u32 unk74; - u32 unk78; - u32 unk7C; + struct MsgData * unk78; + u8 *unk7C; void * unk80; }; #define ScriptReadByte(ctx) (*(ctx->scriptPtr++)) -void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd); +void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount); u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr); void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *)); void StopScript(struct ScriptContext *ctx); -- cgit v1.2.3