GetScriptMember->GetScriptMemberPtr

This commit is contained in:
RavePossum
2024-06-24 23:46:10 -04:00
parent 52da4e9219
commit 873e60d400
24 changed files with 367 additions and 367 deletions

View File

@@ -137,7 +137,7 @@ void ScriptManager_Start(TaskManager * taskManager, u16 scriptID, MapObject * ob
void ScriptManager_Change(TaskManager * taskManager, u16 scriptID, MapObject * object);
ScriptContext * ScriptContext_New(FieldSystem * fieldSystem, u16 scriptID);
void * ScriptManager_GetMemberPtr(ScriptManager * scriptManager, u32 member);
void * FieldSystem_GetScriptMember(FieldSystem * fieldSystem, u32 member);
void * FieldSystem_GetScriptMemberPtr(FieldSystem * fieldSystem, u32 member);
void sub_0203F0C0(FieldSystem * fieldSystem);
u16 * FieldSystem_GetVarPointer(FieldSystem * fieldSystem, u16 varID);
u16 FieldSystem_TryGetVar(FieldSystem * fieldSystem, u16 varID);

View File

@@ -114,22 +114,22 @@ static u8 ov5_021DD574 (ScriptContext * param0)
static void ov5_021DD588 (FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * param1)
{
param1->unk_00 = *(Strbuf **)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF);
param1->unk_04 = *(Strbuf **)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF);
param1->unk_08 = *(StringTemplate **)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
param1->unk_0C = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW);
param1->unk_10 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN);
param1->unk_14 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID);
param1->unk_00 = *(Strbuf **)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF);
param1->unk_04 = *(Strbuf **)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF);
param1->unk_08 = *(StringTemplate **)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
param1->unk_0C = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW);
param1->unk_10 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN);
param1->unk_14 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID);
}
static void ov5_021DD5D0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov5_021DD648 * param2)
{
param2->unk_00 = *(Strbuf **)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF);
param2->unk_04 = *(Strbuf **)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF);
param2->unk_00 = *(Strbuf **)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF);
param2->unk_04 = *(Strbuf **)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF);
param2->unk_08 = param1;
param2->unk_0C = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW);
param2->unk_10 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN);
param2->unk_14 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID);
param2->unk_0C = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW);
param2->unk_10 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN);
param2->unk_14 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID);
}
static void ov5_021DD610 (FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * param1)

View File

@@ -145,7 +145,7 @@ void ov5_021EE9BC (FieldSystem * fieldSystem, u16 param1)
static void ov5_021EE9E8 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3, vu16 param4)
{
u32 v0;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
v0 = ov5_021EE8A8(param3, param4);

View File

@@ -138,7 +138,7 @@ BOOL ScrCmd_2DE (ScriptContext * ctx)
MessageLoader * v7;
FieldSystem * fieldSystem = ctx->fieldSystem;
UnkStruct_ov5_021F6704 * v9;
StringTemplate ** v10 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v10 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v11 = ScriptContext_GetVar(ctx);
u16 v12 = ScriptContext_GetVar(ctx);
u16 v13 = ScriptContext_ReadHalfWord(ctx);
@@ -148,7 +148,7 @@ BOOL ScrCmd_2DE (ScriptContext * ctx)
ctx->data[0] = v13;
v6 = MessageLoader_Init(0, 26, 412, 32);
v9 = ov5_021F6704(fieldSystem, 20, 1, 0, 1, FieldSystem_GetVarPointer(fieldSystem, v13), *v10, FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), v6, FieldSystem_GetVarPointer(fieldSystem, v14), FieldSystem_GetVarPointer(fieldSystem, v15));
v9 = ov5_021F6704(fieldSystem, 20, 1, 0, 1, FieldSystem_GetVarPointer(fieldSystem, v13), *v10, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), v6, FieldSystem_GetVarPointer(fieldSystem, v14), FieldSystem_GetVarPointer(fieldSystem, v15));
v1 = sub_020308A0(fieldSystem->saveData, 11, &v0);
if (v0 == 1) {

View File

@@ -329,7 +329,7 @@ BOOL ScrCmd_2E6 (ScriptContext * param0)
UnkStruct_ov5_021F7ED8 * v10;
u16 v11[4];
u16 v12[(NELEMS(sTeachableMoves))];
StringTemplate ** v13 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v13 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v14 = ScriptContext_GetVar(param0);
u16 v15 = ScriptContext_GetVar(param0);
u16 v16 = ScriptContext_ReadHalfWord(param0);
@@ -341,7 +341,7 @@ BOOL ScrCmd_2E6 (ScriptContext * param0)
}
v7 = MessageLoader_Init(0, 26, 647, 32);
v10 = ov5_021F7ED8(fieldSystem, 20, 1, 0, 1, FieldSystem_GetVarPointer(fieldSystem, v16), *v13, FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_WINDOW), v7);
v10 = ov5_021F7ED8(fieldSystem, 20, 1, 0, 1, FieldSystem_GetVarPointer(fieldSystem, v16), *v13, FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_WINDOW), v7);
for (v2 = 0; v2 < (NELEMS(sTeachableMoves)); v2++) {
v12[v2] = 0;
@@ -627,8 +627,8 @@ static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0)
BOOL ScrCmd_2EC (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
UnkStruct_ov5_021DC1A4 ** v2 = FieldSystem_GetScriptMember(fieldSystem, 0);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
UnkStruct_ov5_021DC1A4 ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0);
u8 v3 = ScriptContext_ReadByte(param0);
u8 v4 = ScriptContext_ReadByte(param0);
u16 v5 = ScriptContext_GetVar(param0);
@@ -643,7 +643,7 @@ BOOL ScrCmd_2EC (ScriptContext * param0)
BOOL ScrCmd_2ED (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0);
UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0);
ov5_021DD3A8(*v1);
return 0;

View File

@@ -406,7 +406,7 @@ BOOL RefreshRadarChain (TaskManager *taskMan) {
if (*v2 < RADAR_BATTERY_STEPS) {
ScriptManager_Start(taskMan, 8970, NULL, NULL);
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_0) = RADAR_BATTERY_STEPS - (*v2);
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_0) = RADAR_BATTERY_STEPS - (*v2);
*v1 = 4;
} else {
*v2 = 0;

File diff suppressed because it is too large Load Diff

View File

@@ -435,7 +435,7 @@ void * ScriptManager_GetMemberPtr (ScriptManager *scriptManager, u32 member)
return NULL;
}
void * FieldSystem_GetScriptMember (FieldSystem * fieldSystem, u32 member)
void * FieldSystem_GetScriptMemberPtr (FieldSystem * fieldSystem, u32 member)
{
ScriptManager *script = TaskManager_Environment(fieldSystem->unk_10);
@@ -483,7 +483,7 @@ u16 * FieldSystem_GetVarPointer (FieldSystem * fieldSystem, u16 varID)
return VarsFlags_GetVarAddress(varsFlags, varID);
}
return FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_START + varID - SPECIAL_VARS_START);
return FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_START + varID - SPECIAL_VARS_START);
}
u16 FieldSystem_TryGetVar (FieldSystem * fieldSystem, u16 varID)
@@ -535,10 +535,10 @@ void sub_0203F1FC (FieldSystem * fieldSystem)
void FieldSystem_SetScriptParameters (FieldSystem * fieldSystem, u16 scriptParam0, u16 scriptParam1, u16 scriptParam2, u16 scriptParam3)
{
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_0) = scriptParam0;
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_1) = scriptParam1;
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_2) = scriptParam2;
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_3) = scriptParam3;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_0) = scriptParam0;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_1) = scriptParam1;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_2) = scriptParam2;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_3) = scriptParam3;
}
u16 Script_GetTrainerID(u16 scriptID)

View File

@@ -67,7 +67,7 @@ BOOL ScrCmd_10F(ScriptContext * param0);
BOOL ScrCmd_0F8 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 v1 = ScriptContext_GetVar(param0);
sub_02094754(*v0, v1);
@@ -76,7 +76,7 @@ BOOL ScrCmd_0F8 (ScriptContext * param0)
BOOL ScrCmd_0F9 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 v1 = ScriptContext_GetVar(param0);
param0->data[0] = v1;
@@ -87,7 +87,7 @@ BOOL ScrCmd_0F9 (ScriptContext * param0)
static BOOL sub_02046CE0 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
return sub_0209476C(*v0, param0->data[0]);
}
@@ -95,7 +95,7 @@ BOOL ScrCmd_0FA (ScriptContext * param0)
{
Strbuf* v0;
Pokemon * v1;
void ** v2 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v2 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem));
u16 v4 = ScriptContext_GetVar(param0);
u16 v5 = ScriptContext_GetVar(param0);
@@ -130,7 +130,7 @@ BOOL ScrCmd_0FA (ScriptContext * param0)
BOOL ScrCmd_0FB (ScriptContext * param0)
{
Pokemon * v0;
void ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 v2 = ScriptContext_GetVar(param0);
u32 v3 = MapHeader_GetMapLabelTextID(param0->fieldSystem->location->mapId);
@@ -142,8 +142,8 @@ BOOL ScrCmd_0FB (ScriptContext * param0)
BOOL ScrCmd_0FC (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -154,8 +154,8 @@ BOOL ScrCmd_0FC (ScriptContext * param0)
BOOL ScrCmd_0FD (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -166,8 +166,8 @@ BOOL ScrCmd_0FD (ScriptContext * param0)
BOOL ScrCmd_0FE (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -178,8 +178,8 @@ BOOL ScrCmd_0FE (ScriptContext * param0)
BOOL ScrCmd_0FF (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -189,7 +189,7 @@ BOOL ScrCmd_0FF (ScriptContext * param0)
BOOL ScrCmd_100 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
sub_020943B0(*v0);
ScriptContext_Pause(param0, sub_02046FDC);
@@ -199,13 +199,13 @@ BOOL ScrCmd_100 (ScriptContext * param0)
static BOOL sub_02046FDC (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
return sub_020944CC(*v0);
}
BOOL ScrCmd_101 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
sub_020933F8(param0->taskManager, *v0);
return 1;
@@ -213,8 +213,8 @@ BOOL ScrCmd_101 (ScriptContext * param0)
BOOL ScrCmd_102 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
sub_020946A4(*v0, *v1, v2);
@@ -223,8 +223,8 @@ BOOL ScrCmd_102 (ScriptContext * param0)
BOOL ScrCmd_103 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
sub_020946CC(*v0, *v1, v2);
@@ -233,8 +233,8 @@ BOOL ScrCmd_103 (ScriptContext * param0)
BOOL ScrCmd_104 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
sub_020946F0(*v0, *v1, v2);
@@ -243,7 +243,7 @@ BOOL ScrCmd_104 (ScriptContext * param0)
BOOL ScrCmd_105 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02094750(*v0);
@@ -252,8 +252,8 @@ BOOL ScrCmd_105 (ScriptContext * param0)
BOOL ScrCmd_106 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
sub_02094720(*v0, *v1, v2);
@@ -262,7 +262,7 @@ BOOL ScrCmd_106 (ScriptContext * param0)
BOOL ScrCmd_107 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02094790(*v0);
@@ -271,7 +271,7 @@ BOOL ScrCmd_107 (ScriptContext * param0)
BOOL ScrCmd_108 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_020947A4(*v0);
@@ -280,7 +280,7 @@ BOOL ScrCmd_108 (ScriptContext * param0)
BOOL ScrCmd_109 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_020947C8(*v0);
@@ -289,7 +289,7 @@ BOOL ScrCmd_109 (ScriptContext * param0)
BOOL ScrCmd_10A (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 v1 = ScriptContext_GetVar(param0);
u16 * v2 = ScriptContext_GetVarPointer(param0);
@@ -299,7 +299,7 @@ BOOL ScrCmd_10A (ScriptContext * param0)
BOOL ScrCmd_10B (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 v1 = ScriptContext_GetVar(param0);
u16 * v2 = ScriptContext_GetVarPointer(param0);
@@ -309,7 +309,7 @@ BOOL ScrCmd_10B (ScriptContext * param0)
BOOL ScrCmd_10C (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02094804(*v0);
@@ -318,7 +318,7 @@ BOOL ScrCmd_10C (ScriptContext * param0)
BOOL ScrCmd_110 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
u16 * v2 = ScriptContext_GetVarPointer(param0);
u16 * v3 = ScriptContext_GetVarPointer(param0);
@@ -330,7 +330,7 @@ BOOL ScrCmd_110 (ScriptContext * param0)
BOOL ScrCmd_10D (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02094868(*v0);
@@ -339,8 +339,8 @@ BOOL ScrCmd_10D (ScriptContext * param0)
BOOL ScrCmd_10E (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v2 = ScriptContext_GetVar(param0);
sub_02094898(*v0, *v1, v2, 11);
@@ -349,7 +349,7 @@ BOOL ScrCmd_10E (ScriptContext * param0)
BOOL ScrCmd_10F (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02094904(*v0);
@@ -358,7 +358,7 @@ BOOL ScrCmd_10F (ScriptContext * param0)
BOOL ScrCmd_117 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
sub_02094850(*v0);
return 0;
@@ -366,7 +366,7 @@ BOOL ScrCmd_117 (ScriptContext * param0)
BOOL ScrCmd_118 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
sub_02094860(*v0);
return 0;
@@ -374,7 +374,7 @@ BOOL ScrCmd_118 (ScriptContext * param0)
BOOL ScrCmd_111 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 v1 = ScriptContext_GetVar(param0);
sub_02094A58(*v0, v1);
@@ -383,7 +383,7 @@ BOOL ScrCmd_111 (ScriptContext * param0)
BOOL ScrCmd_112 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
ScriptContext_Pause(param0, sub_02047404);
return 1;
@@ -391,7 +391,7 @@ BOOL ScrCmd_112 (ScriptContext * param0)
static BOOL sub_02047404 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
if (sub_02094B1C(*v0) == 1) {
return 1;
@@ -414,7 +414,7 @@ BOOL ScrCmd_114 (ScriptContext * param0)
BOOL ScrCmd_115 (ScriptContext * param0)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
u16 * v1 = ScriptContext_GetVarPointer(param0);
int v2, v3, v4, v5, v6;

View File

@@ -41,7 +41,7 @@ static Strbuf* sub_02047998(u16 param0, u32 param1);
BOOL ScrCmd_2EF (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u8 v3 = ScriptContext_GetVar(param0);
@@ -52,7 +52,7 @@ BOOL ScrCmd_2EF (ScriptContext * param0)
BOOL ScrCmd_0CD (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
StringTemplate_SetPlayerName(*v1, v2, SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)));
@@ -62,7 +62,7 @@ BOOL ScrCmd_0CD (ScriptContext * param0)
BOOL ScrCmd_0CE (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
StringTemplate_SetRivalName(*v1, v2, fieldSystem->saveData);
@@ -72,7 +72,7 @@ BOOL ScrCmd_0CE (ScriptContext * param0)
BOOL ScrCmd_0CF (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
StringTemplate_SetCounterpartName(*v1, v2, fieldSystem->saveData);
@@ -83,7 +83,7 @@ BOOL ScrCmd_0D0 (ScriptContext * param0)
{
Pokemon * v0;
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v3 = ScriptContext_ReadByte(param0);
u16 v4 = ScriptContext_GetVar(param0);
@@ -96,7 +96,7 @@ BOOL ScrCmd_0D0 (ScriptContext * param0)
BOOL ScrCmd_2FD (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -107,7 +107,7 @@ BOOL ScrCmd_2FD (ScriptContext * param0)
BOOL ScrCmd_0D1 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -118,7 +118,7 @@ BOOL ScrCmd_0D1 (ScriptContext * param0)
BOOL ScrCmd_0D2 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -130,7 +130,7 @@ BOOL ScrCmd_0D2 (ScriptContext * param0)
BOOL ScrCmd_0D3 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
u16 v4;
@@ -144,7 +144,7 @@ BOOL ScrCmd_0D3 (ScriptContext * param0)
BOOL ScrCmd_0D4 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -155,7 +155,7 @@ BOOL ScrCmd_0D4 (ScriptContext * param0)
BOOL ScrCmd_0D5 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -166,7 +166,7 @@ BOOL ScrCmd_0D5 (ScriptContext * param0)
BOOL ScrCmd_280 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
u8 v4 = ScriptContext_ReadByte(param0);
@@ -183,7 +183,7 @@ BOOL ScrCmd_280 (ScriptContext * param0)
BOOL ScrCmd_2F5 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u32 v3 = ScriptContext_ReadWord(param0);
u8 v4 = ScriptContext_ReadByte(param0);
@@ -201,7 +201,7 @@ BOOL ScrCmd_0D6 (ScriptContext * param0)
{
Pokemon * v0;
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v3 = ScriptContext_ReadByte(param0);
u16 v4 = ScriptContext_GetVar(param0);
@@ -216,7 +216,7 @@ BOOL ScrCmd_251 (ScriptContext * param0)
BoxPokemon * v0;
FieldSystem * fieldSystem = param0->fieldSystem;
PCBoxes * v2 = SaveData_PCBoxes(fieldSystem->saveData);
StringTemplate ** v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v4 = ScriptContext_ReadByte(param0);
u16 v5 = ScriptContext_GetVar(param0);
u32 v6, v7;
@@ -233,7 +233,7 @@ BOOL ScrCmd_0D7 (ScriptContext * param0)
{
Pokemon * v0;
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v3 = ScriptContext_ReadByte(param0);
u16 v4 = ScriptContext_GetVar(param0);
@@ -244,7 +244,7 @@ BOOL ScrCmd_0D7 (ScriptContext * param0)
BOOL ScrCmd_0D8 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -257,7 +257,7 @@ BOOL ScrCmd_0D9 (ScriptContext * param0)
int v0;
FieldSystem * fieldSystem = param0->fieldSystem;
TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem));
StringTemplate ** v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v4 = ScriptContext_ReadByte(param0);
v0 = sub_0205CA14(TrainerInfo_Gender(v2), TrainerInfo_Appearance(v2), 2);
@@ -269,7 +269,7 @@ BOOL ScrCmd_0D9 (ScriptContext * param0)
BOOL ScrCmd_0DA (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
u16 v4 = ScriptContext_ReadHalfWord(param0);
@@ -296,7 +296,7 @@ static Strbuf* sub_02047998 (u16 param0, u32 param1)
BOOL ScrCmd_0DB (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v1 = ScriptContext_ReadByte(param0);
u16 v2 = sub_0206B054(SaveData_GetVarsFlags(param0->fieldSystem->saveData));
Strbuf* v3 = sub_02047998(v2, 4);
@@ -309,7 +309,7 @@ BOOL ScrCmd_0DB (ScriptContext * param0)
BOOL ScrCmd_0DC (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v1 = ScriptContext_ReadByte(param0);
u16 v2 = sub_0206B064(SaveData_GetVarsFlags(param0->fieldSystem->saveData));
Strbuf* v3 = sub_02047998(v2, 4);
@@ -322,7 +322,7 @@ BOOL ScrCmd_0DC (ScriptContext * param0)
BOOL ScrCmd_0DD (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v1 = ScriptContext_ReadByte(param0);
u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData));
Strbuf* v3 = sub_02047998(v2, 4);
@@ -336,7 +336,7 @@ BOOL ScrCmd_0DD (ScriptContext * param0)
BOOL ScrCmd_0DF (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -347,7 +347,7 @@ BOOL ScrCmd_0DF (ScriptContext * param0)
BOOL ScrCmd_0E0 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -358,7 +358,7 @@ BOOL ScrCmd_0E0 (ScriptContext * param0)
BOOL ScrCmd_0E1 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -369,7 +369,7 @@ BOOL ScrCmd_0E1 (ScriptContext * param0)
BOOL ScrCmd_0E2 (ScriptContext * param0)
{
Strbuf* v0 = Strbuf_Init(22, 4);
StringTemplate ** v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -382,7 +382,7 @@ BOOL ScrCmd_0E2 (ScriptContext * param0)
BOOL ScrCmd_17B (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v1 = ScriptContext_ReadByte(param0);
u16 v2 = ScriptContext_GetVar(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -396,7 +396,7 @@ BOOL ScrCmd_17B (ScriptContext * param0)
BOOL ScrCmd_17C (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v1 = ScriptContext_ReadByte(param0);
u16 v2 = ScriptContext_GetVar(param0);
@@ -407,7 +407,7 @@ BOOL ScrCmd_17C (ScriptContext * param0)
BOOL ScrCmd_261 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -419,7 +419,7 @@ BOOL ScrCmd_272 (ScriptContext * param0)
{
Strbuf* v0;
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v3 = ScriptContext_ReadByte(param0);
v0 = Strbuf_Init(10 + 1, 11);
@@ -435,7 +435,7 @@ BOOL ScrCmd_1CB (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Pokemon * v1;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v3 = ScriptContext_ReadByte(param0);
u16 v4 = ScriptContext_GetVar(param0);
u16 v5 = ScriptContext_GetVar(param0);
@@ -451,7 +451,7 @@ BOOL ScrCmd_1CB (ScriptContext * param0)
BOOL ScrCmd_232 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
u16 v4;
@@ -465,7 +465,7 @@ BOOL ScrCmd_232 (ScriptContext * param0)
BOOL ScrCmd_2B3 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -478,7 +478,7 @@ BOOL ScrCmd_2B3 (ScriptContext * param0)
BOOL ScrCmd_2F3 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -489,7 +489,7 @@ BOOL ScrCmd_2F3 (ScriptContext * param0)
BOOL ScrCmd_33C (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -500,7 +500,7 @@ BOOL ScrCmd_33C (ScriptContext * param0)
BOOL ScrCmd_33D (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -511,7 +511,7 @@ BOOL ScrCmd_33D (ScriptContext * param0)
BOOL ScrCmd_33E (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -522,7 +522,7 @@ BOOL ScrCmd_33E (ScriptContext * param0)
BOOL ScrCmd_33F (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -533,7 +533,7 @@ BOOL ScrCmd_33F (ScriptContext * param0)
BOOL ScrCmd_340 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -544,7 +544,7 @@ BOOL ScrCmd_340 (ScriptContext * param0)
BOOL ScrCmd_341 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
u16 v4 = ScriptContext_ReadHalfWord(param0);
@@ -556,7 +556,7 @@ BOOL ScrCmd_341 (ScriptContext * param0)
BOOL ScrCmd_342 (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v1 = ScriptContext_ReadByte(param0);
u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData));
@@ -567,7 +567,7 @@ BOOL ScrCmd_342 (ScriptContext * param0)
BOOL ScrCmd_343 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -578,7 +578,7 @@ BOOL ScrCmd_343 (ScriptContext * param0)
BOOL ScrCmd_344 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -589,7 +589,7 @@ BOOL ScrCmd_344 (ScriptContext * param0)
BOOL ScrCmd_345 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u16 v3 = ScriptContext_GetVar(param0);
@@ -602,7 +602,7 @@ BOOL ScrCmd_345 (ScriptContext * param0)
BOOL ScrCmd_346 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
StringTemplate_CapitalizeArgAtIndex(*v1, v2);
@@ -612,7 +612,7 @@ BOOL ScrCmd_346 (ScriptContext * param0)
BOOL ScrCmd_347 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v2 = ScriptContext_ReadByte(param0);
u8 v3 = ScriptContext_ReadByte(param0);

View File

@@ -59,21 +59,21 @@ BOOL ScrCmd_0B6 (ScriptContext * param0)
u16 v9 = ScriptContext_GetVar(param0);
if (v9 == 0) {
v0 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_SIGHT_RANGE);
v4 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_DIRECTION);
v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_SCRIPT_ID);
v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_ID);
v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_TYPE);
v6 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_MAP_OBJECT);
v5 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_0_TASK);
v0 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_SIGHT_RANGE);
v4 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_DIRECTION);
v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_SCRIPT_ID);
v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_ID);
v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_TYPE);
v6 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_MAP_OBJECT);
v5 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_0_TASK);
} else {
v0 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_SIGHT_RANGE);
v4 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_DIRECTION);
v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_SCRIPT_ID);
v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_ID);
v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_TYPE);
v6 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_MAP_OBJECT);
v5 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TRAINER_1_TASK);
v0 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_SIGHT_RANGE);
v4 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_DIRECTION);
v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_SCRIPT_ID);
v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_ID);
v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_TYPE);
v6 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_MAP_OBJECT);
v5 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TRAINER_1_TASK);
}
playerAvatar = fieldSystem->playerAvatar;
@@ -91,9 +91,9 @@ BOOL ScrCmd_0B7 (ScriptContext * param0)
*v2 = 0;
if (v1 == 0) {
v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_0_TASK);
v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_0_TASK);
} else {
v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_1_TASK);
v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_1_TASK);
}
if (*v0 == NULL) {
@@ -112,7 +112,7 @@ BOOL ScrCmd_0B7 (ScriptContext * param0)
BOOL ScrCmd_0B8 (ScriptContext * param0)
{
u16 * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_0_TYPE);
u16 * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_0_TYPE);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = *v0;
@@ -121,8 +121,8 @@ BOOL ScrCmd_0B8 (ScriptContext * param0)
BOOL ScrCmd_0B9 (ScriptContext * param0)
{
u16 * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_0_ID);
u16 * v1 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_1_ID);
u16 * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_0_ID);
u16 * v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TRAINER_1_ID);
u16 v2 = ScriptContext_GetVar(param0);
u16 * v3 = ScriptContext_GetVarPointer(param0);
@@ -133,7 +133,7 @@ BOOL ScrCmd_0B9 (ScriptContext * param0)
BOOL ScrCmd_0E4 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
u16 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v2 = ScriptContext_GetVarPointer(param0);
*v2 = Script_GetTrainerID(*v1);
@@ -144,8 +144,8 @@ BOOL ScrCmd_0E5 (ScriptContext * param0)
{
u32 v0;
FieldSystem * fieldSystem = param0->fieldSystem;
u16 * v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
BOOL * v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 * v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
BOOL * v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 v4 = ScriptContext_GetVar(param0);
u16 v5 = ScriptContext_GetVar(param0);
u16 v6;
@@ -163,7 +163,7 @@ BOOL ScrCmd_0E5 (ScriptContext * param0)
BOOL ScrCmd_2A0 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
BOOL * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
BOOL * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 v2 = ScriptContext_GetVar(param0);
u16 v3 = ScriptContext_GetVar(param0);
u16 v4 = ScriptContext_GetVar(param0);
@@ -175,7 +175,7 @@ BOOL ScrCmd_2A0 (ScriptContext * param0)
BOOL ScrCmd_0E7 (ScriptContext * param0)
{
u16 v0, v1, v2, v3, v4;
u16 * v5 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v5 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v6 = ScriptContext_GetVarPointer(param0);
u16 * v7 = ScriptContext_GetVarPointer(param0);
u16 * v8 = ScriptContext_GetVarPointer(param0);
@@ -210,7 +210,7 @@ BOOL ScrCmd_0E7 (ScriptContext * param0)
BOOL ScrCmd_0E8 (ScriptContext * param0)
{
u16 v0, v1, v2, v3, v4;
u16 * v5 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v5 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v6 = ScriptContext_GetVarPointer(param0);
u16 * v7 = ScriptContext_GetVarPointer(param0);
u16 * v8 = ScriptContext_GetVarPointer(param0);
@@ -244,7 +244,7 @@ BOOL ScrCmd_0E8 (ScriptContext * param0)
BOOL ScrCmd_0E9 (ScriptContext * param0)
{
u16 * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_SCRIPT_ID);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = Script_IsTrainerDoubleBattle(Script_GetTrainerID(*v0));
@@ -267,7 +267,7 @@ BOOL ScrCmd_0EB (ScriptContext * param0)
BOOL ScrCmd_0EC (ScriptContext * param0)
{
BOOL * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
BOOL * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02052868(*v0);
@@ -276,7 +276,7 @@ BOOL ScrCmd_0EC (ScriptContext * param0)
BOOL ScrCmd_0ED (ScriptContext * param0)
{
BOOL * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
BOOL * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02052878(*v0);
@@ -285,7 +285,7 @@ BOOL ScrCmd_0ED (ScriptContext * param0)
BOOL ScrCmd_2BC (ScriptContext * param0)
{
BOOL * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
BOOL * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02052888(*v0);
@@ -303,7 +303,7 @@ BOOL ScrCmd_0EE (ScriptContext * param0)
BOOL ScrCmd_0EF (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
BOOL * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
BOOL * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
sub_020515CC(param0->taskManager, 1, 0, 0, 11, v1);
@@ -315,7 +315,7 @@ BOOL ScrCmd_0F0 (ScriptContext * param0)
MapObject ** v0;
FieldSystem * fieldSystem = param0->fieldSystem;
v0 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
v0 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
Script_SetTrainerDefeated(MapObject_FieldSystem(*v0), MapObject_Id(*v0));
return 0;
@@ -328,7 +328,7 @@ BOOL ScrCmd_0F1 (ScriptContext * param0)
MapObject ** v2;
FieldSystem * fieldSystem = param0->fieldSystem;
v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
v1 = (s32)ScriptContext_ReadWord(param0);
v0 = Script_IsTrainerDefeated(MapObject_FieldSystem(*v2), MapObject_Id(*v2));
@@ -342,7 +342,7 @@ BOOL ScrCmd_0F1 (ScriptContext * param0)
BOOL ScrCmd_314 (ScriptContext * param0)
{
BOOL * v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
BOOL * v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = *v0;

View File

@@ -22,7 +22,7 @@
BOOL ScrCmd_21D (ScriptContext * param0)
{
StringTemplate ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
UnkStruct_0202B4A0 * v1 = sub_0202B4A0(param0->fieldSystem->saveData);
SaveData * v2 = param0->fieldSystem->saveData;

View File

@@ -79,7 +79,7 @@ BOOL ScrCmd_235 (ScriptContext * param0)
break;
case 3:
{
StringTemplate ** v4 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v4 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v5 = ScriptContext_GetVar(param0);
u16 * v6 = ScriptContext_GetVarPointer(param0);
u16 * v7 = ScriptContext_GetVarPointer(param0);
@@ -160,7 +160,7 @@ BOOL ScrCmd_237 (ScriptContext * param0)
{
StringTemplate ** v0;
v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
switch (ScriptContext_ReadHalfWord(param0)) {
case 0:

View File

@@ -117,11 +117,11 @@ BOOL ScrCmd_1DD (ScriptContext * param0)
sub_0206BCE4(param0->taskManager, v1, v2, *v3);
return 1;
case (30 + 0):
v5 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v5 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
sub_0204A358(v6, param0->taskManager, v5);
return 1;
case (30 + 1):
v5 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v5 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
*v3 = sub_0204A378(v6, v5, param0->fieldSystem->saveData);
break;
case (30 + 2):
@@ -393,7 +393,7 @@ BOOL ScrCmd_294 (ScriptContext * param0)
u8 v2 = ScriptContext_ReadByte(param0);
Window ** v3;
v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
*v3 = ov5_021DD140(param0->fieldSystem, v1, v2);
return 0;
@@ -402,7 +402,7 @@ BOOL ScrCmd_294 (ScriptContext * param0)
BOOL ScrCmd_295 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Window ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
Window ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
ov5_021DD084(*v1);
return 0;
@@ -411,7 +411,7 @@ BOOL ScrCmd_295 (ScriptContext * param0)
BOOL ScrCmd_296 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Window ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
Window ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
ov5_021DD1A4(param0->fieldSystem, *v1);
return 0;

View File

@@ -17,7 +17,7 @@ BOOL ScrCmd_17D (ScriptContext * param0)
MapObject ** v0;
u16 * v1 = ScriptContext_GetVarPointer(param0);
v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
*v1 = sub_02055F00(param0->fieldSystem, *v0);
return 0;
@@ -25,7 +25,7 @@ BOOL ScrCmd_17D (ScriptContext * param0)
BOOL ScrCmd_17E (ScriptContext * param0)
{
MapObject ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02055F40(param0->fieldSystem, *v0);
@@ -34,7 +34,7 @@ BOOL ScrCmd_17E (ScriptContext * param0)
BOOL ScrCmd_17F (ScriptContext * param0)
{
MapObject ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02055F64(param0->fieldSystem, *v0);
@@ -43,7 +43,7 @@ BOOL ScrCmd_17F (ScriptContext * param0)
BOOL ScrCmd_180 (ScriptContext * param0)
{
MapObject ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02055F88(param0->fieldSystem, *v0);
@@ -52,7 +52,7 @@ BOOL ScrCmd_180 (ScriptContext * param0)
BOOL ScrCmd_181 (ScriptContext * param0)
{
MapObject ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
u16 * v1 = ScriptContext_GetVarPointer(param0);
*v1 = sub_02055FA8(param0->fieldSystem, *v0);
@@ -61,7 +61,7 @@ BOOL ScrCmd_181 (ScriptContext * param0)
BOOL ScrCmd_182 (ScriptContext * param0)
{
MapObject ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
u16 v1 = ScriptContext_GetVar(param0);
sub_02055E80(param0->fieldSystem, *v0, v1);
@@ -70,7 +70,7 @@ BOOL ScrCmd_182 (ScriptContext * param0)
BOOL ScrCmd_183 (ScriptContext * param0)
{
MapObject ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
GameRecords * v1 = SaveData_GetGameRecordsPtr(param0->fieldSystem->saveData);
u16 v2 = ScriptContext_GetVar(param0);
@@ -100,7 +100,7 @@ BOOL ScrCmd_185 (ScriptContext * param0)
{
u16 v0;
GameRecords * v1 = SaveData_GetGameRecordsPtr(param0->fieldSystem->saveData);
MapObject ** v2 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
MapObject ** v2 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT);
sub_02055E00(param0->fieldSystem, *v2);
GameRecords_IncrementTrainerScore(v1, TRAINER_SCORE_EVENT_UNK_00);

View File

@@ -131,7 +131,7 @@ BOOL ScrCmd_23E (ScriptContext * param0)
{
UnkStruct_0204B830 v5;
const UnkStruct_020EBE94 * v6 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1];
StringTemplate ** v7 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v7 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 * v8 = ScriptContext_GetVarPointer(param0);
u16 * v9 = ScriptContext_GetVarPointer(param0);
@@ -143,7 +143,7 @@ BOOL ScrCmd_23E (ScriptContext * param0)
{
UnkStruct_0204B830 v10;
const UnkStruct_020EBE94 * v11 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1];
StringTemplate ** v12 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v12 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 * v13 = ScriptContext_GetVarPointer(param0);
u16 * v14 = ScriptContext_GetVarPointer(param0);

View File

@@ -25,7 +25,7 @@ BOOL ScrCmd_075 (ScriptContext * param0)
u16 v2 = ScriptContext_GetVar(param0);
Window ** v3;
v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
*v3 = ov5_021DD020(param0->fieldSystem, v1, v2);
return 0;
@@ -34,7 +34,7 @@ BOOL ScrCmd_075 (ScriptContext * param0)
BOOL ScrCmd_076 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Window ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
Window ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
ov5_021DD084(*v1);
return 0;
@@ -43,7 +43,7 @@ BOOL ScrCmd_076 (ScriptContext * param0)
BOOL ScrCmd_077 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Window ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
Window ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COIN_WINDOW);
ov5_021DD098(param0->fieldSystem, *v1);
return 0;

View File

@@ -95,7 +95,7 @@ BOOL ScrCmd_072 (ScriptContext * param0)
u16 v2 = ScriptContext_GetVar(param0);
Window ** v3;
v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MONEY_WINDOW);
v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MONEY_WINDOW);
*v3 = ov5_021DCEB0(param0->fieldSystem, v1, v2);
return 0;
@@ -104,7 +104,7 @@ BOOL ScrCmd_072 (ScriptContext * param0)
BOOL ScrCmd_073 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Window ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MONEY_WINDOW);
Window ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MONEY_WINDOW);
ov5_021DCF58(*v1);
return 0;
@@ -113,7 +113,7 @@ BOOL ScrCmd_073 (ScriptContext * param0)
BOOL ScrCmd_074 (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Window ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MONEY_WINDOW);
Window ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MONEY_WINDOW);
ov5_021DCF6C(param0->fieldSystem, *v1);
return 0;

View File

@@ -24,7 +24,7 @@ BOOL ScrCmd_16D (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
SaveData * v1 = fieldSystem->saveData;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
ov5_021E72BC(sub_02026310(v1), *v2);
@@ -74,7 +74,7 @@ BOOL ScrCmd_1A4 (ScriptContext * param0)
FieldSystem * fieldSystem = param0->fieldSystem;
UnkStruct_02026310 * v1;
Party * v2;
StringTemplate ** v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
SaveData * v4 = fieldSystem->saveData;
u16 * v5 = ScriptContext_GetVarPointer(param0);
u8 v6 = ScriptContext_GetVar(param0);
@@ -90,7 +90,7 @@ BOOL ScrCmd_1AA (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
UnkStruct_02026310 * v1;
StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
SaveData * v3 = fieldSystem->saveData;
u16 * v4 = ScriptContext_GetVarPointer(param0);
u8 v5 = ScriptContext_GetVar(param0);
@@ -106,7 +106,7 @@ BOOL ScrCmd_1AE (ScriptContext * param0)
FieldSystem * fieldSystem = param0->fieldSystem;
SaveData * v1 = fieldSystem->saveData;
UnkStruct_02026310 * v2;
StringTemplate ** v3 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v3 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 * v4 = ScriptContext_GetVarPointer(param0);
u16 v5 = ScriptContext_GetVar(param0);
@@ -120,7 +120,7 @@ BOOL ScrCmd_1AF (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
Party * v1;
StringTemplate ** v2 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u16 v3 = ScriptContext_ReadHalfWord(param0);
u16 v4 = ScriptContext_GetVar(param0);
u16 * v5 = ScriptContext_GetVarPointer(param0);
@@ -151,7 +151,7 @@ BOOL ScrCmd_1BC (ScriptContext * param0)
{
FieldSystem * fieldSystem = param0->fieldSystem;
SaveData * v1 = fieldSystem->saveData;
StringTemplate ** v2 = FieldSystem_GetScriptMember(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v3 = ScriptContext_GetVar(param0);
u8 v4 = ScriptContext_GetVar(param0);
u8 v5 = ScriptContext_GetVar(param0);

View File

@@ -25,7 +25,7 @@ BOOL ScrCmd_1C6 (ScriptContext * param0)
u16 v0 = ScriptContext_GetVar(param0);
void ** v1;
v1 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
*v1 = sub_0203D6E4(32, param0->fieldSystem, v0);
ScriptContext_Pause(param0, sub_02041D60);
@@ -38,7 +38,7 @@ BOOL ScrCmd_1C7 (ScriptContext * param0)
u16 * v1;
v1 = ScriptContext_GetVarPointer(param0);
v0 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
GF_ASSERT(*v0 != 0);
*v1 = sub_0203D750(*v0);
@@ -74,7 +74,7 @@ BOOL ScrCmd_21F (ScriptContext * param0)
static void sub_0204EE90 (ScriptContext * param0, u16 param1, Pokemon * param2, u16 * param3)
{
void ** v0 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
void ** v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
UnkStruct_020997B8 * v1;
v1 = sub_020997B8(32);
@@ -137,7 +137,7 @@ BOOL ScrCmd_223 (ScriptContext * param0)
{
UnkStruct_020997B8 * v0;
u16 * v1 = ScriptContext_GetVarPointer(param0);
void ** v2 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
void ** v2 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
v0 = *v2;
@@ -158,7 +158,7 @@ BOOL ScrCmd_225 (ScriptContext * param0)
{
UnkStruct_020997B8 * v0;
u16 * v1 = ScriptContext_GetVarPointer(param0);
void ** v2 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
void ** v2 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
v0 = *v2;

View File

@@ -99,7 +99,7 @@ BOOL ScrCmd_2CC (ScriptContext * param0)
v10 = sub_02030114(param0->fieldSystem->saveData);
v11 = sub_0203026C(param0->fieldSystem->saveData);
v8 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v8 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
switch (v3) {
case 0:
@@ -531,7 +531,7 @@ BOOL ScrCmd_324 (ScriptContext * param0)
u32 v4, v5, v6;
u16 v7, v8;
FieldSystem * fieldSystem = param0->fieldSystem;
StringTemplate ** v10 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
StringTemplate ** v10 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
u8 v11 = ScriptContext_ReadByte(param0);
u8 v12 = ScriptContext_ReadByte(param0);
u8 v13 = ScriptContext_ReadByte(param0);

View File

@@ -78,7 +78,7 @@ BOOL ScrCmd_2D2 (ScriptContext * param0)
v6 = FieldSystem_GetVarPointer(param0->fieldSystem, v5);
v10 = sub_020302DC(param0->fieldSystem->saveData);
v11 = sub_0203041C(param0->fieldSystem->saveData);
v8 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v8 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
switch (v3) {
case 0:

View File

@@ -78,7 +78,7 @@ BOOL ScrCmd_2D9 (ScriptContext * param0)
v6 = FieldSystem_GetVarPointer(param0->fieldSystem, v5);
v10 = sub_020304A0(param0->fieldSystem->saveData);
v11 = sub_020305B8(param0->fieldSystem->saveData);
v8 = FieldSystem_GetScriptMember(param0->fieldSystem, 19);
v8 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
switch (v3) {
case 0:

View File

@@ -314,10 +314,10 @@ static BOOL sub_020685AC (TaskManager * taskMan)
sub_0203C9D4(fieldSystem, &v3);
ScriptManager_Start(taskMan, v1->unk_00, v3, NULL);
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_0) = v1->unk_04;
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_1) = v1->unk_06;
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_2) = v1->unk_08;
*(u16 *)FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_PARAMETER_3) = v1->unk_0A;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_0) = v1->unk_04;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_1) = v1->unk_06;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_2) = v1->unk_08;
*(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_3) = v1->unk_0A;
(*v2)++;
break;