summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/scrcmd.c441
-rw-r--r--arm9/src/script.c6
2 files changed, 381 insertions, 66 deletions
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c
index 9e6a337a..0f8c6c45 100644
--- a/arm9/src/scrcmd.c
+++ b/arm9/src/scrcmd.c
@@ -1,5 +1,9 @@
#include "scrcmd.h"
#include "unk_0204639C.h"
+#include "main.h"
+#include "options.h"
+#include "player_data.h"
+#include "text.h"
extern u16 *GetVarPointer(struct UnkSavStruct80* arg, u16);
extern u16 VarGet(struct UnkSavStruct80* arg, u16 wk);
@@ -19,35 +23,55 @@ extern struct ScrStrBufs *MOD06_02244210(struct SaveBlock2 *sav, u16 poke, u16 s
extern void MOD05_021E2CBC(struct ScriptContext *ctx, struct ScrStrBufs *str, u8 param2, u32 param3);
extern void MOD05_021E2BB8(void *param0, struct ScriptContext *ctx);
extern BOOL FUN_020546C8(u8 param0);
-
-static BOOL RunPauseTimer(struct ScriptContext* ctx);
+extern u32 FUN_02058488(u32 param0);
+extern BOOL FUN_02030F40(void);
+extern void FUN_02055304(u32 param0, u32 param1);
+extern void FUN_02039460(struct UnkSavStruct80 *arg);
+extern void FUN_02055304(u32 param0, u32 param1);
+extern void FUN_020545B8(u32 param0, u8 *param1, u32 param2);
+extern void FUN_02054608(u8 *param0, struct Options *options);
+extern void FUN_0200D0E0(u32 *param0, u32 param1);
+extern void FUN_02019178(u32 *param0);
+extern void FUN_020179E0(u32 param0, u32 param1, u32 param2, u16 val);
+extern u32 FUN_02058510(u32 param0, u32 param1);
+extern void MOD05_021E8128(u32 param0, u8 type, u16 map);
+extern void MOD05_021E8130(u32 param0, u32 param1);
+extern void MOD05_021E8158(struct UnkSavStruct80 *unk80);
+extern u32 MOD05_021E8140(u32 param0);
+
+static BOOL RunPauseTimer(struct ScriptContext *ctx);
static u32 Compare(u16 a, u16 b);
-static BOOL FUN_02039CC8(struct ScriptContext* ctx);
-/*static*/ BOOL FUN_0203A2F0(struct ScriptContext* ctx);
+static BOOL FUN_02039CC8(struct ScriptContext *ctx);
+/*static*/ BOOL FUN_0203A2F0(struct ScriptContext *ctx);
+static BOOL FUN_0203A46C(struct ScriptContext *ctx);
+static BOOL FUN_0203A4AC(struct ScriptContext *ctx);
+static BOOL FUN_0203A4E0(struct ScriptContext *ctx);
+static BOOL FUN_0203A570(struct ScriptContext *ctx);
+static BOOL FUN_0203A6C8(struct ScriptContext* ctx);
extern u8 sScriptConditionTable[6][3];
-THUMB_FUNC BOOL ScrCmd_Nop(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Nop(struct ScriptContext *ctx)
{
#pragma unused(ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_Dummy(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Dummy(struct ScriptContext *ctx)
{
#pragma unused(ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_End(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_End(struct ScriptContext *ctx)
{
StopScript(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_Wait(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Wait(struct ScriptContext *ctx)
{
- struct UnkSavStruct80* arg = ctx->unk80;
+ struct UnkSavStruct80 *arg = ctx->unk80;
u16 num = ScriptReadHalfword(ctx);
u16 wk = ScriptReadHalfword(ctx);
u16* VarPointer = GetVarPointer(arg, wk);
@@ -57,56 +81,56 @@ THUMB_FUNC BOOL ScrCmd_Wait(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC static BOOL RunPauseTimer(struct ScriptContext* ctx)
+THUMB_FUNC static BOOL RunPauseTimer(struct ScriptContext *ctx)
{
u16* VarPointer = GetVarPointer(ctx->unk80, (u16)ctx->data[0]);
*VarPointer = (u16)(*VarPointer - 1);
return !(*VarPointer);
}
-THUMB_FUNC BOOL ScrCmd_DebugWatch(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_DebugWatch(struct ScriptContext *ctx)
{
u16 wk = ScriptReadHalfword(ctx);
VarGet(ctx->unk80, wk);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_LoadByte(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_LoadByte(struct ScriptContext *ctx)
{
u8 index = ScriptReadByte(ctx);
ctx->data[index] = ScriptReadByte(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_LoadWord(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_LoadWord(struct ScriptContext *ctx)
{
u8 index = ScriptReadByte(ctx);
ctx->data[index] = ScriptReadWord(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext *ctx)
{
u8 index = ScriptReadByte(ctx);
ctx->data[index] = *(u8 *)ScriptReadWord(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_WriteByteToAddr(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_WriteByteToAddr(struct ScriptContext *ctx)
{
u8* ptr = (u8*)ScriptReadWord(ctx);
*ptr = ScriptReadByte(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SetPtrByte(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetPtrByte(struct ScriptContext *ctx)
{
u8* ptr = (u8*)ScriptReadWord(ctx);
*ptr = (u8)ctx->data[ScriptReadByte(ctx)];
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CopyLocal(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CopyLocal(struct ScriptContext *ctx)
{
u8 index_store = ScriptReadByte(ctx);
u8 index_load = ScriptReadByte(ctx);
@@ -114,7 +138,7 @@ THUMB_FUNC BOOL ScrCmd_CopyLocal(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CopyByte(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CopyByte(struct ScriptContext *ctx)
{
u8 *target = (u8 *)ScriptReadWord(ctx);
u8 *source = (u8 *)ScriptReadWord(ctx);
@@ -138,7 +162,7 @@ THUMB_FUNC static u32 Compare(u16 a, u16 b)
}
}
-THUMB_FUNC BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext *ctx)
{
u8 a = (u8)ctx->data[ScriptReadByte(ctx)];
u8 b = (u8)ctx->data[ScriptReadByte(ctx)];
@@ -146,7 +170,7 @@ THUMB_FUNC BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareLocalToValue(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareLocalToValue(struct ScriptContext *ctx)
{
u8 a = (u8)ctx->data[ScriptReadByte(ctx)];
u8 b = ScriptReadByte(ctx);
@@ -154,7 +178,7 @@ THUMB_FUNC BOOL ScrCmd_CompareLocalToValue(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext *ctx)
{
u8 a = (u8)ctx->data[ScriptReadByte(ctx)];
u8 b = *(u8*)ScriptReadWord(ctx);
@@ -162,7 +186,7 @@ THUMB_FUNC BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext *ctx)
{
u8 a = *(u8*)ScriptReadWord(ctx);
u8 b = (u8)ctx->data[ScriptReadByte(ctx)];
@@ -170,7 +194,7 @@ THUMB_FUNC BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareAddrToValue(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareAddrToValue(struct ScriptContext *ctx)
{
u8 a = *(u8*)ScriptReadWord(ctx);
u8 b = (u8)ScriptReadByte(ctx);
@@ -178,7 +202,7 @@ THUMB_FUNC BOOL ScrCmd_CompareAddrToValue(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext *ctx)
{
u8 a = *(u8*)ScriptReadWord(ctx);
u8 b = *(u8*)ScriptReadWord(ctx);
@@ -186,7 +210,7 @@ THUMB_FUNC BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareVarToValue(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareVarToValue(struct ScriptContext *ctx)
{
u16 a = *GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
u16 b = ScriptReadHalfword(ctx);
@@ -194,7 +218,7 @@ THUMB_FUNC BOOL ScrCmd_CompareVarToValue(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CompareVarToVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CompareVarToVar(struct ScriptContext *ctx)
{
u16 *a = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
u16 *b = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
@@ -202,9 +226,9 @@ THUMB_FUNC BOOL ScrCmd_CompareVarToVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_RunScript(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_RunScript(struct ScriptContext *ctx)
{
- struct UnkSavStruct80* unk80 = ctx->unk80;
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
u8 *unk1 = (u8 *)FUN_02039438(unk80, 0x7);
u32 **unk2 = (u32 **)FUN_02039438(unk80, 0xe);
u16 id = ScriptReadHalfword(ctx);
@@ -214,9 +238,9 @@ THUMB_FUNC BOOL ScrCmd_RunScript(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL ScrCmd_RunScriptWait(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_RunScriptWait(struct ScriptContext *ctx)
{
- struct UnkSavStruct80* unk80 = ctx->unk80;
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
u8 *unk1 = (u8 *)FUN_02039438(unk80, 0x5);
u8 *unk2 = (u8 *)FUN_02039438(unk80, 0x7);
u32 **unk3 = (u32 **)FUN_02039438(unk80, 0xe);
@@ -230,7 +254,7 @@ THUMB_FUNC BOOL ScrCmd_RunScriptWait(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC static BOOL FUN_02039CC8(struct ScriptContext* ctx)
+THUMB_FUNC static BOOL FUN_02039CC8(struct ScriptContext *ctx)
{
u8* unk = FUN_02039438(ctx->unk80, 0x5);
@@ -241,7 +265,7 @@ THUMB_FUNC static BOOL FUN_02039CC8(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_RestartCurrentScript(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_RestartCurrentScript(struct ScriptContext *ctx)
{
u8* unk = (u8 *)FUN_02039438(ctx->unk80, 0x5);
@@ -249,14 +273,14 @@ THUMB_FUNC BOOL ScrCmd_RestartCurrentScript(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_GoTo(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GoTo(struct ScriptContext *ctx)
{
s32 offset = (s32)ScriptReadWord(ctx);
ScriptJump(ctx, ctx->scriptPtr + offset);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_ObjectGoTo(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_ObjectGoTo(struct ScriptContext *ctx)
{
u32* unk = FUN_02039438(ctx->unk80, 0xa);
u8 id = ScriptReadByte(ctx);
@@ -268,7 +292,7 @@ THUMB_FUNC BOOL ScrCmd_ObjectGoTo(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_BgGoTo(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_BgGoTo(struct ScriptContext *ctx)
{
u32 bgId = FUN_02046534(ctx->unk74);
u8 id = ScriptReadByte(ctx);
@@ -281,7 +305,7 @@ THUMB_FUNC BOOL ScrCmd_BgGoTo(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_DirectionGoTo(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_DirectionGoTo(struct ScriptContext *ctx)
{
u32 *playerDirection = FUN_02039438(ctx->unk80, 0x9);
u8 dir = ScriptReadByte(ctx);
@@ -294,20 +318,20 @@ THUMB_FUNC BOOL ScrCmd_DirectionGoTo(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_Call(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Call(struct ScriptContext *ctx)
{
s32 offset = (s32)ScriptReadWord(ctx);
ScriptCall(ctx, ctx->scriptPtr + offset);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_Return(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Return(struct ScriptContext *ctx)
{
ScriptReturn(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_GoToIf(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GoToIf(struct ScriptContext *ctx)
{
u8 compareType = ScriptReadByte(ctx);
s32 offset = (s32)ScriptReadWord(ctx);
@@ -319,7 +343,7 @@ THUMB_FUNC BOOL ScrCmd_GoToIf(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CallIf(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CallIf(struct ScriptContext *ctx)
{
u8 compareType = ScriptReadByte(ctx);
s32 offset = (s32)ScriptReadWord(ctx);
@@ -331,7 +355,7 @@ THUMB_FUNC BOOL ScrCmd_CallIf(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SetFlag(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetFlag(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 flag = ScriptReadHalfword(ctx);
@@ -339,7 +363,7 @@ THUMB_FUNC BOOL ScrCmd_SetFlag(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_ClearFlag(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_ClearFlag(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 flag = ScriptReadHalfword(ctx);
@@ -347,7 +371,7 @@ THUMB_FUNC BOOL ScrCmd_ClearFlag(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CheckFlag(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CheckFlag(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 flag = ScriptReadHalfword(ctx);
@@ -355,7 +379,7 @@ THUMB_FUNC BOOL ScrCmd_CheckFlag(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CheckFlagVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CheckFlagVar(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
@@ -364,7 +388,7 @@ THUMB_FUNC BOOL ScrCmd_CheckFlagVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SetFlagVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetFlagVar(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 *wk = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
@@ -372,7 +396,7 @@ THUMB_FUNC BOOL ScrCmd_SetFlagVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SetTrainerFlag(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetTrainerFlag(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 flag = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -380,7 +404,7 @@ THUMB_FUNC BOOL ScrCmd_SetTrainerFlag(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 flag = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -388,7 +412,7 @@ THUMB_FUNC BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u16 flag = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -396,7 +420,7 @@ THUMB_FUNC BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_AddVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_AddVar(struct ScriptContext *ctx)
{
u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
u16 wk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -404,7 +428,7 @@ THUMB_FUNC BOOL ScrCmd_AddVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SubVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SubVar(struct ScriptContext *ctx)
{
u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
u16 wk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -412,14 +436,14 @@ THUMB_FUNC BOOL ScrCmd_SubVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SetVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetVar(struct ScriptContext *ctx)
{
u16 *wk = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
*wk = ScriptReadHalfword(ctx);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_CopyVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CopyVar(struct ScriptContext *ctx)
{
u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
u16 *wk2 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
@@ -427,7 +451,7 @@ THUMB_FUNC BOOL ScrCmd_CopyVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_SetOrCopyVar(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetOrCopyVar(struct ScriptContext *ctx)
{
u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
u16 wk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -435,14 +459,14 @@ THUMB_FUNC BOOL ScrCmd_SetOrCopyVar(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_Message(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Message(struct ScriptContext *ctx)
{
u8 id = ScriptReadByte(ctx);
MOD05_ShowMessageInField(ctx, ctx->msgData, id);
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_MessageFrom(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_MessageFrom(struct ScriptContext *ctx)
{
u16 arc = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -452,7 +476,7 @@ THUMB_FUNC BOOL ScrCmd_MessageFrom(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_MessageFrom2(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_MessageFrom2(struct ScriptContext *ctx)
{
u16 arc = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -463,7 +487,7 @@ THUMB_FUNC BOOL ScrCmd_MessageFrom2(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL ScrCmd_Unk01FC(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk01FC(struct ScriptContext *ctx)
{
u16 typ = ScriptReadHalfword(ctx);
u16 id = ScriptReadHalfword(ctx);
@@ -474,7 +498,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FC(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_Unk01FD(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk01FD(struct ScriptContext *ctx)
{
u16 typ = ScriptReadHalfword(ctx);
u16 id = ScriptReadHalfword(ctx);
@@ -486,7 +510,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FD(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL ScrCmd_Unk01FE(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk01FE(struct ScriptContext *ctx)
{
u8 id = ScriptReadByte(ctx);
@@ -510,7 +534,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FE(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext *ctx)
{
struct UnkSavStruct80 *unk80 = ctx->unk80;
u8 msg = ScriptReadByte(ctx);
@@ -527,7 +551,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL ScrCmd_Unk026D(struct ScriptContext* ctx) //message unown font?
+THUMB_FUNC BOOL ScrCmd_Unk026D(struct ScriptContext *ctx) //message unown font?
{
struct UnkStruct_0203A288 myLocalStruct;
u16 msg = ScriptReadHalfword(ctx);
@@ -541,7 +565,7 @@ THUMB_FUNC BOOL ScrCmd_Unk026D(struct ScriptContext* ctx) //message unown font?
return TRUE;
}
-THUMB_FUNC BOOL ScrCmd_Unk002C(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk002C(struct ScriptContext *ctx)
{
u8 msg = ScriptReadByte(ctx);
MOD05_021E2BD0(ctx, ctx->msgData, msg, 1, NULL);
@@ -549,8 +573,299 @@ THUMB_FUNC BOOL ScrCmd_Unk002C(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC /*static*/ BOOL FUN_0203A2F0(struct ScriptContext* ctx)
+THUMB_FUNC /*static*/ BOOL FUN_0203A2F0(struct ScriptContext *ctx)
{
u8 *unk = (u8 *)FUN_02039438(ctx->unk80, 3);
return FUN_020546C8(*unk);
}
+
+THUMB_FUNC BOOL ScrCmd_Unk002D(struct ScriptContext *ctx)
+{
+ u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+ MOD05_021E2BD0(ctx, ctx->msgData, (u8)msg, 1, NULL);
+ SetupNativeScript(ctx, FUN_0203A2F0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk02C0(struct ScriptContext *ctx)
+{
+ struct UnkStruct_0203A288 myLocalStruct;
+ u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+
+ MOD05_021E2BB8(&myLocalStruct, ctx);
+ myLocalStruct.unk1 = 1;
+
+ MOD05_021E2BD0(ctx, ctx->msgData, (u8)msg, 1, &myLocalStruct);
+ SetupNativeScript(ctx, FUN_0203A2F0);
+
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk002E(struct ScriptContext *ctx)
+{
+ u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+ MOD05_021E2BD0(ctx, ctx->msgData, (u8)msg, 0, NULL);
+ SetupNativeScript(ctx, FUN_0203A2F0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk020C(struct ScriptContext *ctx)
+{
+ u32 *unk = FUN_02039438(ctx->unk80, 0xa);
+ u8 msg = (u8)FUN_02058488(*unk);
+ MOD05_021E2BD0(ctx, ctx->msgData, msg, 1, NULL);
+ SetupNativeScript(ctx, FUN_0203A2F0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk002F(struct ScriptContext *ctx)
+{
+ u8 msg = ScriptReadByte(ctx);
+
+ if (!FUN_02030F40())
+ {
+ MOD05_021E2BD0(ctx, ctx->msgData, msg, 1, NULL);
+ }
+ else
+ {
+ struct UnkStruct_0203A288 myLocalStruct;
+ MOD05_021E2BB8(&myLocalStruct, ctx);
+ myLocalStruct.unk0 = 1;
+ myLocalStruct.unk1 = 1;
+ MOD05_021E2BD0(ctx, ctx->msgData, msg, 0, &myLocalStruct);
+ }
+
+ SetupNativeScript(ctx, FUN_0203A2F0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_WaitButtonAB(struct ScriptContext *ctx)
+{
+ SetupNativeScript(ctx, FUN_0203A46C);
+ return TRUE;
+}
+
+THUMB_FUNC static BOOL FUN_0203A46C(struct ScriptContext *ctx)
+{
+#pragma unused(ctx)
+ if (gMain.unk48 & 0x3) // Mask (A | B) ?
+ {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_WaitButtonABTime(struct ScriptContext *ctx)
+{
+ ctx->data[0] = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+ SetupNativeScript(ctx, FUN_0203A4AC);
+ return TRUE;
+}
+
+THUMB_FUNC static BOOL FUN_0203A4AC(struct ScriptContext *ctx)
+{
+ if (gMain.unk48 & 0x3) // Mask (A | B) ?
+ {
+ return TRUE;
+ }
+ ctx->data[0] = ctx->data[0] - 1;
+
+ if (ctx->data[0] == 0)
+ {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_WaitButton(struct ScriptContext *ctx)
+{
+ SetupNativeScript(ctx, FUN_0203A4E0);
+ return TRUE;
+}
+
+THUMB_FUNC static BOOL FUN_0203A4E0(struct ScriptContext *ctx)
+{
+ if (gMain.unk48 & 3)
+ {
+ return TRUE;
+ }
+ else if (gMain.unk48 & 0x40)
+ {
+ FUN_02055304(ctx->unk80->unk38, 0);
+ }
+ else if (gMain.unk48 & 0x80)
+ {
+ FUN_02055304(ctx->unk80->unk38, 1);
+ }
+ else if (gMain.unk48 & 0x20)
+ {
+ FUN_02055304(ctx->unk80->unk38, 2);
+ }
+ else if (gMain.unk48 & 0x10)
+ {
+ FUN_02055304(ctx->unk80->unk38, 3);
+ }
+ else if (gMain.unk48 & 0x400)
+ {
+ FUN_02039460(ctx->unk80);
+ }
+ else
+ {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0032(struct ScriptContext *ctx)
+{
+ SetupNativeScript(ctx, FUN_0203A570);
+ return TRUE;
+}
+
+THUMB_FUNC static BOOL FUN_0203A570(struct ScriptContext *ctx)
+{
+#pragma unused(ctx)
+ if (gMain.unk48 & 0x3)
+ {
+ return TRUE;
+ }
+ else if (gMain.unk48 & 0xf0)
+ {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0033(struct ScriptContext *ctx)
+{
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
+ u8 *unk = (u8 *)FUN_02039438(unk80, 6);
+ FUN_020545B8(unk80->unk08, FUN_02039438(unk80, 1), 3);
+ FUN_02054608(FUN_02039438(unk80, 1), Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2));
+ *unk = 1;
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0034(struct ScriptContext* ctx)
+{
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
+ u32 *unk = FUN_02039438(unk80, 0x1); //windowID?
+ u8 *unk2 = FUN_02039438(unk80, 0x6);
+ FUN_0200D0E0(unk, 0); //clear window?
+ FUN_02019178(unk);
+ *unk2 = 0;
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0035(struct ScriptContext* ctx)
+{
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
+ u32 *unk = FUN_02039438(unk80, 0x1); //windowID?
+ u8 *unk2 = FUN_02039438(unk80, 0x6);
+ FUN_02019178(unk);
+ *unk2 = 0;
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_ScrollBg(struct ScriptContext* ctx)
+{
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
+ u16 *xval = FUN_02039438(unk80, 0x31);
+ u16 *xcnt = FUN_02039438(unk80, 0x2d);
+ u16 *xdir = FUN_02039438(unk80, 0x32);
+ u16 *yval = FUN_02039438(unk80, 0x33);
+ u16 *ycnt = FUN_02039438(unk80, 0x2e);
+ u16 *ydir = FUN_02039438(unk80, 0x34);
+
+ *xval = ScriptReadByte(ctx);
+ *xcnt = ScriptReadByte(ctx);
+ *xdir = ScriptReadByte(ctx);
+ *yval = ScriptReadByte(ctx);
+ *ycnt = ScriptReadByte(ctx);
+ *ydir = ScriptReadByte(ctx);
+
+ SetupNativeScript(ctx, FUN_0203A6C8);
+ return TRUE;
+}
+
+THUMB_FUNC static BOOL FUN_0203A6C8(struct ScriptContext* ctx)
+{
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
+ u16 *xval = FUN_02039438(unk80, 0x31);
+ u16 *xdir = FUN_02039438(unk80, 0x32);
+ u16 *yval = FUN_02039438(unk80, 0x33);
+ u16 *ydir = FUN_02039438(unk80, 0x34);
+ u16 *xcnt = FUN_02039438(unk80, 0x2d);
+ u16 *ycnt = FUN_02039438(unk80, 0x2e);
+
+ if (*xcnt == 0 && *ycnt == 0)
+ {
+ return TRUE;
+ }
+
+ if (*xval != 0)
+ {
+ if (*xdir == 0)
+ {
+ FUN_020179E0(unk80->unk08, 3, 1, *xval);
+ }
+ else
+ {
+ FUN_020179E0(unk80->unk08, 3, 2, *xval);
+ }
+ }
+
+ if (*yval != 0)
+ {
+ if (*ydir == 0)
+ {
+ FUN_020179E0(unk80->unk08, 3, 4, *yval);
+ }
+ else
+ {
+ FUN_020179E0(unk80->unk08, 3, 5, *yval);
+ }
+ }
+
+ if (*xcnt != 0)
+ {
+ *xcnt = (u16)(*xcnt - 1);
+ }
+
+ if (*ycnt != 0)
+ {
+ *ycnt = (u16)(*ycnt - 1);
+ }
+
+ return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CreateMessageBox(struct ScriptContext* ctx)
+{
+ struct UnkSavStruct80 *unk80 = ctx->unk80;
+ struct String **unk1 = FUN_02039438(unk80, 0x11);
+ struct String **unk2 = FUN_02039438(unk80, 0x10);
+ struct ScrStrBufs **unk3 = FUN_02039438(unk80, 0x0f);
+ u8 typ, msg;
+ u16 wk, map;
+
+ msg = ScriptReadByte(ctx);
+ typ = ScriptReadByte(ctx);
+ map = ScriptReadHalfword(ctx);
+ wk = ScriptReadHalfword(ctx);
+
+ if (map == 0)
+ {
+ u32 *unk4 = FUN_02039438(unk80, 10);
+ map = (u16)FUN_02058510(*unk4, 0);
+ }
+
+ MOD05_021E8128(unk80->unk60, typ, map);
+ MOD05_021E8130(unk80->unk60, 1);
+ MOD05_021E8158(unk80);
+ ReadMsgDataIntoString(ctx->msgData, msg, *unk1);
+ StringExpandPlaceholders(*unk3, *unk2, *unk1);
+ AddTextPrinterParameterized(MOD05_021E8140(unk80->unk60), 1, (u16 *)*unk2, 0, 0, 0, NULL);
+
+ return TRUE;
+}
diff --git a/arm9/src/script.c b/arm9/src/script.c
index d067ac79..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)
@@ -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)