diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index 27d8f6d658..eff9a56f1f 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -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); diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 4950fcd323..025107599a 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -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) diff --git a/src/overlay005/ov5_021EE7D4.c b/src/overlay005/ov5_021EE7D4.c index 6875af5336..f4b32f3b14 100644 --- a/src/overlay005/ov5_021EE7D4.c +++ b/src/overlay005/ov5_021EE7D4.c @@ -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); diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 4b0a530845..9eb87cc5dc 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -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) { diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 8fed90b722..e54a157a7c 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -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; diff --git a/src/pokeradar.c b/src/pokeradar.c index d5e5245df3..e8e999d884 100644 --- a/src/pokeradar.c +++ b/src/pokeradar.c @@ -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; diff --git a/src/scrcmd.c b/src/scrcmd.c index a9a6ebfc14..2417da0464 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1841,8 +1841,8 @@ static BOOL ScrCmd_013 (ScriptContext * ctx) { u16 v0; FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_CONTEXT_COUNT); - ScriptContext ** v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_CONTEXT_1); + u8 * v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_CONTEXT_COUNT); + ScriptContext ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_CONTEXT_1); v0 = ScriptContext_ReadHalfWord(ctx); *v3 = ScriptContext_New(fieldSystem, v0); @@ -1855,9 +1855,9 @@ static BOOL ScrCmd_CommonScript (ScriptContext * ctx) { u16 scriptID; FieldSystem * fieldSystem = ctx->fieldSystem; - u8 *commonScriptActive = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COMMON_SCRIPT_ACTIVE); - u8 *ctxCount = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_CONTEXT_COUNT); - ScriptContext **commonScriptCtx = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_CONTEXT_1); + u8 *commonScriptActive = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COMMON_SCRIPT_ACTIVE); + u8 *ctxCount = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_CONTEXT_COUNT); + ScriptContext **commonScriptCtx = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_CONTEXT_1); scriptID = ScriptContext_ReadHalfWord(ctx); *commonScriptActive = TRUE; @@ -1871,14 +1871,14 @@ static BOOL ScrCmd_CommonScript (ScriptContext * ctx) static BOOL ScriptContext_WaitCommonScript (ScriptContext * ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - u8 *commonScriptActive = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COMMON_SCRIPT_ACTIVE); + u8 *commonScriptActive = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COMMON_SCRIPT_ACTIVE); return *commonScriptActive == FALSE; } static BOOL ScrCmd_ReturnLocal (ScriptContext * ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - u8 *commonScriptActive = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_COMMON_SCRIPT_ACTIVE); + u8 *commonScriptActive = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_COMMON_SCRIPT_ACTIVE); *commonScriptActive = FALSE; return FALSE; } @@ -1896,7 +1896,7 @@ static BOOL ScrCmd_017 (ScriptContext * ctx) MapObject ** v2; FieldSystem * fieldSystem = ctx->fieldSystem; - v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); v0 = ScriptContext_ReadByte(ctx); v1 = (s32)ScriptContext_ReadWord(ctx); @@ -1931,7 +1931,7 @@ static BOOL ScrCmd_019 (ScriptContext * ctx) int * v2; FieldSystem * fieldSystem = ctx->fieldSystem; - v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_PLAYER_DIR); + v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_DIR); v0 = ScriptContext_ReadByte(ctx); v1 = (s32)ScriptContext_ReadWord(ctx); @@ -2214,7 +2214,7 @@ static BOOL ScrCmd_Message (ScriptContext * ctx) static BOOL sub_02040014 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); + u8 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); return FieldMessage_FinishedPrinting(*v1); } @@ -2256,7 +2256,7 @@ static BOOL ScrCmd_02E (ScriptContext * ctx) static BOOL ScrCmd_20C (ScriptContext * ctx) { - MapObject ** mapObj = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** mapObj = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); u8 v1 = MapObject_GetEventType(*mapObj); ov5_021DD444(ctx, ctx->loader, (u8)v1, 1, NULL); @@ -2363,10 +2363,10 @@ static BOOL ScriptContext_CheckABPadPress (ScriptContext * ctx) static BOOL ScrCmd_033 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); + u8 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); - FieldMessage_AddWindow(fieldSystem->unk_08, FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_MESSAGE_ID); - FieldMessage_DrawWindow(FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW), SaveData_Options(ctx->fieldSystem->saveData)); + FieldMessage_AddWindow(fieldSystem->unk_08, FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_MESSAGE_ID); + FieldMessage_DrawWindow(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SaveData_Options(ctx->fieldSystem->saveData)); *v1 = 1; return 0; @@ -2375,8 +2375,8 @@ static BOOL ScrCmd_033 (ScriptContext * ctx) static BOOL ScrCmd_CloseMessage (ScriptContext * ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - Window *window = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW); - u8 *v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); + Window *window = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW); + u8 *v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); sub_0200E084(window, 0); BGL_DeleteWindow(window); @@ -2388,8 +2388,8 @@ static BOOL ScrCmd_CloseMessage (ScriptContext * ctx) static BOOL ScrCmd_035 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - Window * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW); - u8 * v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); + Window * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW); + u8 * v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); BGL_DeleteWindow(v1); @@ -2401,12 +2401,12 @@ static BOOL ScrCmd_035 (ScriptContext * ctx) static BOOL ScrCmd_ScrollBG3 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u16 *distanceX = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_X); - u16 *countX = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_X); - u16 *directionX = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_X); - u16 *distanceY = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_Y); - u16 *countY = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_Y); - u16 *directionY = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_Y); + u16 *distanceX = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_X); + u16 *countX = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_X); + u16 *directionX = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_X); + u16 *distanceY = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_Y); + u16 *countY = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_Y); + u16 *directionY = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_Y); *distanceX = ScriptContext_ReadByte(ctx); *countX = ScriptContext_ReadByte(ctx); @@ -2423,12 +2423,12 @@ static BOOL ScrCmd_ScrollBG3 (ScriptContext * ctx) static BOOL ScriptContext_ScrollBG3 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u16 *distanceX = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_X); - u16 *directionX = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_X); - u16 *distanceY = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_Y); - u16 *directionY = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_Y); - u16 *countX = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_X); - u16 *countY = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_Y); + u16 *distanceX = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_X); + u16 *directionX = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_X); + u16 *distanceY = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIST_Y); + u16 *directionY = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_DIR_Y); + u16 *countX = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_X); + u16 *countY = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_BG3_SCROLL_COUNT_Y); if (*countX == 0 && *countY == 0) { return TRUE; @@ -2473,16 +2473,16 @@ static BOOL ScrCmd_036 (ScriptContext * ctx) u8 v7; fieldSystem = ctx->fieldSystem; - v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF); - v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); - v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF); + v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); + v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); v7 = ScriptContext_ReadByte(ctx); v6 = ScriptContext_ReadByte(ctx); v4 = ScriptContext_ReadHalfWord(ctx); v5 = ScriptContext_ReadHalfWord(ctx); if (v4 == 0) { - MapObject ** v8 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v8 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); v4 = sub_020629D8(*v8, 0); } @@ -2553,10 +2553,10 @@ static BOOL sub_020405C4 (ScriptContext * ctx) static BOOL ScrCmd_03A (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); - Strbuf ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF); - Strbuf ** v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); - StringTemplate ** v4 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + u8 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); + Strbuf ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TEMPORARY_BUF); + Strbuf ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); + StringTemplate ** v4 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v5 = ScriptContext_ReadByte(ctx); u16 v6 = ScriptContext_ReadHalfWord(ctx); @@ -2574,7 +2574,7 @@ static BOOL ScrCmd_03A (ScriptContext * ctx) static BOOL sub_02040670 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); + u8 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); u16 * v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); u8 v3 = ov5_021E1B54(fieldSystem->unk_64); int v4 = 0xffff; @@ -2666,7 +2666,7 @@ static BOOL ScrCmd_03C (ScriptContext * ctx) static BOOL ScrCmd_03E (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UIControlData ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_UI_CONTROL); + UIControlData ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_UI_CONTROL); u16 v2 = ScriptContext_ReadHalfWord(ctx); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -2683,7 +2683,7 @@ static BOOL sub_02040824 (ScriptContext * ctx) { u32 v0; FieldSystem * fieldSystem = ctx->fieldSystem; - UIControlData ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_UI_CONTROL); + UIControlData ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_UI_CONTROL); u16 * v3 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); v0 = sub_02002114(*v2, 4); @@ -2704,9 +2704,9 @@ static BOOL sub_02040824 (ScriptContext * ctx) static BOOL ScrCmd_18D (ScriptContext * ctx) { void ** v0; - Window * v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW); + Window * v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_SAVING_ICON); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_SAVING_ICON); *v0 = sub_0200E7FC(v1, 1024 - (18 + 12)); return 0; @@ -2716,7 +2716,7 @@ static BOOL ScrCmd_18E (ScriptContext * ctx) { void ** v0; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_SAVING_ICON); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_SAVING_ICON); DeleteWaitDial(*v0); return 0; @@ -2725,15 +2725,15 @@ static BOOL ScrCmd_18E (ScriptContext * ctx) static BOOL ScrCmd_040 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); - StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); + StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); u8 v6 = ScriptContext_ReadByte(ctx); u16 v7 = ScriptContext_ReadHalfWord(ctx); - *v1 = ov5_021DC150(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), NULL); + *v1 = ov5_021DC150(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), NULL); ctx->data[0] = v7; return 1; @@ -2742,15 +2742,15 @@ static BOOL ScrCmd_040 (ScriptContext * ctx) static BOOL ScrCmd_041 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); - StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); + StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); u8 v6 = ScriptContext_ReadByte(ctx); u16 v7 = ScriptContext_ReadHalfWord(ctx); - *v1 = ov5_021DC150(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), ctx->loader); + *v1 = ov5_021DC150(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), ctx->loader); ctx->data[0] = v7; return 1; @@ -2760,7 +2760,7 @@ static BOOL ScrCmd_042 (ScriptContext * ctx) { u8 v0, v1; FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v3 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); v0 = ScriptContext_ReadByte(ctx); v1 = ScriptContext_ReadByte(ctx); @@ -2773,7 +2773,7 @@ static BOOL ScrCmd_29D (ScriptContext * ctx) { u16 v0, v1; FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v3 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); v0 = ScriptContext_GetVar(ctx); v1 = ScriptContext_GetVar(ctx); @@ -2785,7 +2785,7 @@ static BOOL ScrCmd_29D (ScriptContext * ctx) static BOOL ScrCmd_043 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); ov5_021DC1AC(*v1); ScriptContext_Pause(ctx, sub_02040A50); @@ -2808,7 +2808,7 @@ static BOOL sub_02040A50 (ScriptContext * ctx) static BOOL ScrCmd_2B9 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); ov5_021DC1AC(*v1); ScriptContext_Pause(ctx, sub_02040A9C); @@ -2820,7 +2820,7 @@ static BOOL sub_02040A9C (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; u16 * v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); - UnkStruct_ov5_021DC1A4 ** v2 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); if (*v1 == 0xeeee) { if (sub_0205B9E8(fieldSystem->unk_7C)) { @@ -2838,15 +2838,15 @@ static BOOL sub_02040A9C (ScriptContext * ctx) static BOOL ScrCmd_044 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); - StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); + StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); u8 v6 = ScriptContext_ReadByte(ctx); u16 v7 = ScriptContext_ReadHalfWord(ctx); - *v1 = ov5_021DC48C(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), NULL); + *v1 = ov5_021DC48C(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), NULL); ctx->data[0] = v7; return 1; @@ -2855,15 +2855,15 @@ static BOOL ScrCmd_044 (ScriptContext * ctx) static BOOL ScrCmd_045 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); - StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); + StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); u8 v6 = ScriptContext_ReadByte(ctx); u16 v7 = ScriptContext_ReadHalfWord(ctx); - *v1 = ov5_021DC48C(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), ctx->loader); + *v1 = ov5_021DC48C(fieldSystem, v3, v4, v5, v6, FieldSystem_GetVarPointer(fieldSystem, v7), *v2, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), ctx->loader); ctx->data[0] = v7; return 1; @@ -2871,7 +2871,7 @@ static BOOL ScrCmd_045 (ScriptContext * ctx) static BOOL ScrCmd_046 (ScriptContext * ctx) { - UnkStruct_ov5_021DC1A4 ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 0); u8 v1 = ScriptContext_GetVar(ctx); u8 v2 = ScriptContext_GetVar(ctx); u8 v3 = ScriptContext_GetVar(ctx); @@ -2883,7 +2883,7 @@ static BOOL ScrCmd_046 (ScriptContext * ctx) static BOOL ScrCmd_047 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); ov5_021DC4B8(*v1); @@ -2894,7 +2894,7 @@ static BOOL ScrCmd_047 (ScriptContext * ctx) static BOOL ScrCmd_327 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); u16 v2 = ScriptContext_GetVar(ctx); ov5_021DC528(*v1, v2); @@ -2906,7 +2906,7 @@ static BOOL ScrCmd_327 (ScriptContext * ctx) static BOOL ScrCmd_306 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); u16 * v2 = ScriptContext_GetVarPointer(ctx); u16 * v3 = ScriptContext_GetVarPointer(ctx); @@ -2919,7 +2919,7 @@ static BOOL ScrCmd_306 (ScriptContext * ctx) static BOOL ScrCmd_048 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); u8 v2 = ScriptContext_ReadByte(ctx); ov5_021DCD94(*v1, v2); @@ -2931,7 +2931,7 @@ static BOOL ScrCmd_048 (ScriptContext * ctx) static BOOL ScrCmd_33A (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); u8 v2 = ScriptContext_ReadByte(ctx); ov5_021DD3F4(*v1, (BOOL)v2); @@ -2941,7 +2941,7 @@ static BOOL ScrCmd_33A (ScriptContext * ctx) static BOOL ScrCmd_33B (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 0); + UnkStruct_ov5_021DC1A4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 0); u8 v2 = ScriptContext_ReadByte(ctx); ov5_021DD410(*v1, (BOOL)v2); @@ -2959,7 +2959,7 @@ static BOOL ScrCmd_ApplyMovement (ScriptContext * ctx) } SysTask * v1 = MapObject_StartAnimation(object, (MapObjectAnimCmd *)(ctx->scriptPtr + movementOffset)); - u8 * v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); + u8 * v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); (*v2)++; sub_02040F28(ctx->fieldSystem, v1, NULL); return FALSE; @@ -3014,7 +3014,7 @@ static BOOL ScrCmd_2A1 (ScriptContext * ctx) v10[v11].unk_02 = 0; v1 = MapObject_StartAnimation(v4, v10); - v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); + v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); (*v2)++; sub_02040F28(ctx->fieldSystem, v1, v10); @@ -3030,7 +3030,7 @@ static MapObject * sub_02040ED4 (FieldSystem * fieldSystem, int param1) if (param1 == 0xf2) { v1 = sub_02062570(fieldSystem->mapObjMan, 0x30); } else if (param1 == 0xf1) { - v0 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); + v0 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); v1 = *v0; } else { v1 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, param1); @@ -3048,7 +3048,7 @@ static BOOL ScrCmd_WaitMovement (ScriptContext * ctx) static BOOL sub_02040F0C (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); + u8 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); if (*v1 == 0) { return 1; @@ -3082,7 +3082,7 @@ static void sub_02040F5C (SysTask * task, void * param1) u8 * v1; v0 = (UnkStruct_02040F28 *)param1; - v1 = FieldSystem_GetScriptMember(v0->fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); + v1 = FieldSystem_GetScriptMemberPtr(v0->fieldSystem, SCRIPT_MANAGER_MOVEMENT_COUNT); if (MapObject_HasAnimationEnded(v0->unk_04) == 1) { MapObject_FinishAnimation(v0->unk_04); @@ -3108,7 +3108,7 @@ static void sub_02040F5C (SysTask * task, void * param1) static BOOL ScrCmd_LockAll (ScriptContext * ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - MapObject **objectPtr = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject **objectPtr = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); if (*objectPtr == NULL) { MapObjectManager *mapObjMan = fieldSystem->mapObjMan; @@ -3156,7 +3156,7 @@ static inline void inline_020410F4_3 (int mask) static BOOL sub_02041004 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); MapObject * v2 = Player_MapObject(fieldSystem->playerAvatar); if (inline_020410F4_1((1 << 0)) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) { @@ -3210,7 +3210,7 @@ static BOOL sub_020410CC (ScriptContext * ctx) static BOOL ScrCmd_LockLastTalked (ScriptContext * ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - MapObject **v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject **v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); MapObject *player = Player_MapObject(fieldSystem->playerAvatar); MapObject *v3 = sub_02062570(fieldSystem->mapObjMan, 0x30); MapObject *v4 = sub_02069EB8(*v1); @@ -3313,7 +3313,7 @@ static BOOL ScrCmd_066 (ScriptContext * ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); - MapObject ** v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); + MapObject ** v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); *v2 = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, v0, v1, 0, 0x2000, 0x0, ctx->fieldSystem->location->mapId); @@ -3334,7 +3334,7 @@ static BOOL ScrCmd_066 (ScriptContext * ctx) static BOOL ScrCmd_067 (ScriptContext * ctx) { - MapObject ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); + MapObject ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); MapObject_Delete(*v0); @@ -3356,7 +3356,7 @@ static BOOL ScrCmd_308 (ScriptContext * ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); - MapObject ** v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); + MapObject ** v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); *v2 = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, v0, v1, 0, 0x2000, 0x0, ctx->fieldSystem->location->mapId); @@ -3369,7 +3369,7 @@ static BOOL ScrCmd_308 (ScriptContext * ctx) static BOOL ScrCmd_309 (ScriptContext * ctx) { - MapObject ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); + MapObject ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT); MapObject_Delete(*v0); return 0; @@ -3380,7 +3380,7 @@ static BOOL ScrCmd_FacePlayer (ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; PlayerAvatar *playerAvatar = fieldSystem->playerAvatar; int dir = Direction_GetOpposite(PlayerAvatar_GetDir(playerAvatar)); - MapObject **object = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject **object = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); if (*object == NULL) { return FALSE; @@ -3546,7 +3546,7 @@ static BOOL ScrCmd_191 (ScriptContext * ctx) { void ** v0; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3C0(32, ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); @@ -3557,7 +3557,7 @@ static BOOL ScrCmd_2A5 (ScriptContext * ctx) { void ** v0; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D3E4(32, ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); @@ -3568,7 +3568,7 @@ static BOOL ScrCmd_192 (ScriptContext * ctx) { void ** v0; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D50C(ctx->fieldSystem->unk_10, 32); return 1; @@ -3580,7 +3580,7 @@ static BOOL ScrCmd_193 (ScriptContext * ctx) u16 * v1; v1 = ScriptContext_GetVarPointer(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v0 != 0); @@ -3607,7 +3607,7 @@ static BOOL ScrCmd_2D0 (ScriptContext * ctx) v3 = ScriptContext_GetVarPointer(ctx); v4 = ScriptContext_GetVarPointer(ctx); - v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v5 = *v2; GF_ASSERT(*v2 != 0); @@ -3647,7 +3647,7 @@ static BOOL ScrCmd_2D4 (ScriptContext * ctx) v3 = ScriptContext_GetVarPointer(ctx); v4 = ScriptContext_GetVarPointer(ctx); v5 = ScriptContext_GetVarPointer(ctx); - v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v6 = *v2; GF_ASSERT(*v2 != 0); @@ -3689,7 +3689,7 @@ static BOOL ScrCmd_2DB (ScriptContext * ctx) v3 = ScriptContext_GetVarPointer(ctx); v4 = ScriptContext_GetVarPointer(ctx); v5 = ScriptContext_GetVarPointer(ctx); - v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v6 = *v2; GF_ASSERT(*v2 != 0); @@ -3720,7 +3720,7 @@ static BOOL ScrCmd_2DB (ScriptContext * ctx) static BOOL ScrCmd_194 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -3739,7 +3739,7 @@ static BOOL ScrCmd_195 (ScriptContext * ctx) v1 = ScriptContext_GetVarPointer(ctx); v2 = ScriptContext_GetVarPointer(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v0 != 0); @@ -3765,7 +3765,7 @@ static BOOL ScrCmd_195 (ScriptContext * ctx) static BOOL ScrCmd_196 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); *v0 = sub_0203D5C8(32, ctx->fieldSystem, v1); @@ -3780,7 +3780,7 @@ static BOOL ScrCmd_197 (ScriptContext * ctx) u16 * v1; v1 = ScriptContext_GetVarPointer(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v0 != 0); @@ -3794,7 +3794,7 @@ static BOOL ScrCmd_197 (ScriptContext * ctx) static BOOL ScrCmd_2E7 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -3811,7 +3811,7 @@ static BOOL ScrCmd_2E8 (ScriptContext * ctx) PokemonSummary * v2; v1 = ScriptContext_GetVarPointer(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v0 != 0); @@ -3827,7 +3827,7 @@ static BOOL ScrCmd_2E8 (ScriptContext * ctx) static BOOL ScrCmd_09B (ScriptContext * ctx) { u8 v0, v1; - MapObject ** v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); u16 v3 = ScriptContext_GetVar(ctx); u16 * v4 = ScriptContext_GetVarPointer(ctx); @@ -3868,7 +3868,7 @@ BOOL sub_02041CC8 (ScriptContext * ctx) void ** v0; FieldSystem * fieldSystem = ctx->fieldSystem; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); if (sub_020509B4(fieldSystem)) { return 0; @@ -3887,7 +3887,7 @@ static BOOL sub_02041CF4 (ScriptContext * ctx) UnkStruct_02042434 * v2; fieldSystem = ctx->fieldSystem; - v0 = FieldSystem_GetScriptMember(fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(fieldSystem, 19); v2 = *v0; if (sub_020509B4(fieldSystem)) { @@ -3912,7 +3912,7 @@ static BOOL sub_02041D3C (ScriptContext * ctx) void ** v0; FieldSystem * fieldSystem = ctx->fieldSystem; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); if (sub_0209C238(*v0) == 0) { return 0; @@ -3999,7 +3999,7 @@ static BOOL ScrCmd_0A3 (ScriptContext * ctx) static BOOL ScrCmd_0A4 (ScriptContext * ctx) { UnkStruct_ov98_02247168 * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); u16 * v2 = ScriptContext_GetVarPointer(ctx); v0 = (*v1); @@ -4019,7 +4019,7 @@ static BOOL ScrCmd_207 (ScriptContext * ctx) static BOOL ScrCmd_208 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -4033,7 +4033,7 @@ static BOOL ScrCmd_208 (ScriptContext * ctx) static BOOL ScrCmd_28C (ScriptContext * ctx) { Pokemon * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 v2 = ScriptContext_GetVar(ctx); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(ctx->fieldSystem->saveData), v2); @@ -4048,7 +4048,7 @@ static BOOL ScrCmd_28C (ScriptContext * ctx) static BOOL ScrCmd_209 (ScriptContext * ctx) { u8 * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); v0 = *v1; *v0 = 1; @@ -4059,7 +4059,7 @@ static BOOL ScrCmd_209 (ScriptContext * ctx) static BOOL ScrCmd_28D (ScriptContext * ctx) { u8 * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); v0 = *v1; *v0 = 2; @@ -4081,7 +4081,7 @@ static BOOL ScrCmd_28E (ScriptContext * ctx) static BOOL sub_02041FF8 (ScriptContext * ctx) { u8 * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 * v2 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); v0 = *v1; @@ -4096,7 +4096,7 @@ static BOOL sub_02041FF8 (ScriptContext * ctx) static BOOL ScrCmd_20A (ScriptContext * ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); - StringTemplate ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); VsSeeker_Start(ctx->taskManager, *v1, FieldSystem_GetVarPointer(ctx->fieldSystem, v0)); return 1; @@ -4104,7 +4104,7 @@ static BOOL ScrCmd_20A (ScriptContext * ctx) static BOOL ScrCmd_20B (ScriptContext * ctx) { - MapObject ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); if (*v0 != NULL) { if ((sub_02071CB4(ctx->fieldSystem, 2) == 0) || (ov8_0224C5DC(ctx->fieldSystem, *v0) == 0)) { @@ -4141,7 +4141,7 @@ static BOOL ScrCmd_0A6 (ScriptContext * ctx) static BOOL ScrCmd_0A7 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); int v1 = ScriptContext_ReadHalfWord(ctx); u16 * v2 = ScriptContext_GetVarPointer(ctx); @@ -4163,7 +4163,7 @@ static BOOL ScrCmd_0A7 (ScriptContext * ctx) static BOOL ScrCmd_0A8 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); int v1 = ScriptContext_ReadHalfWord(ctx); u16 * v2 = ScriptContext_GetVarPointer(ctx); @@ -4253,7 +4253,7 @@ static BOOL ScrCmd_0A9 (ScriptContext * ctx) static BOOL ScrCmd_0AA (ScriptContext * ctx) { UnkStruct_0203D8AC * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203D8AC)); @@ -4268,7 +4268,7 @@ static BOOL ScrCmd_1D7 (ScriptContext * ctx) { u8 v0; UnkStruct_0203D8AC * v1; - void ** v2 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v0 = ScriptContext_ReadHalfWord(ctx); *v2 = sub_02099674(ctx->fieldSystem, v0, 11); @@ -4300,7 +4300,7 @@ static BOOL ScrCmd_1D9 (ScriptContext * ctx) UnkStruct_ov90_021D0D80 * v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); - void ** v3 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v3 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov90_021D0D80)); @@ -4319,7 +4319,7 @@ static BOOL ScrCmd_1D9 (ScriptContext * ctx) static BOOL ScrCmd_0AB (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); UnkStruct_02042434 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02042434)); v1->unk_00 = ctx->fieldSystem->saveData; @@ -4356,7 +4356,7 @@ static BOOL ScrCmd_0AE (ScriptContext * ctx) static BOOL ScrCmd_0AF (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203DE34(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041CC8); @@ -4372,7 +4372,7 @@ static BOOL ScrCmd_0B0 (ScriptContext * ctx) static BOOL ScrCmd_0B1 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E244(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041CC8); @@ -4425,7 +4425,7 @@ static BOOL ScrCmd_0B3 (ScriptContext * ctx) static BOOL ScrCmd_0B4 (ScriptContext * ctx) { ChooseStarterData * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); *v1 = Heap_AllocFromHeap(11, sizeof(ChooseStarterData)); v0 = *v1; @@ -4441,7 +4441,7 @@ static BOOL ScrCmd_0B4 (ScriptContext * ctx) static BOOL ScrCmd_0B5 (ScriptContext * ctx) { ChooseStarterData * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); v0 = (*v1); @@ -4463,7 +4463,7 @@ static BOOL ScrCmd_178 (ScriptContext * ctx) v1 = 1; } - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v0 == 0); *v0 = sub_0203D264(ctx->fieldSystem, v1); @@ -4478,7 +4478,7 @@ static BOOL ScrCmd_179 (ScriptContext * ctx) void ** v1; v0 = ScriptContext_GetVarPointer(ctx); - v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v1 != 0); *v0 = sub_0203D2C4(*v1); @@ -4520,7 +4520,7 @@ static BOOL ScrCmd_271 (ScriptContext * ctx) static BOOL ScrCmd_2C6 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0209C1EC(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D3C); @@ -4572,7 +4572,7 @@ static BOOL ScrCmd_244 (ScriptContext * ctx) static BOOL ScrCmd_245 (ScriptContext * ctx) { - StringTemplate ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -4731,7 +4731,7 @@ static BOOL ScrCmd_0C4 (ScriptContext * ctx) static BOOL ScrCmd_0C5 (ScriptContext * ctx) { Pokemon * v0; - void ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 v2 = ScriptContext_GetVar(ctx); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(ctx->fieldSystem->saveData), v2); @@ -4743,7 +4743,7 @@ static BOOL ScrCmd_0C5 (ScriptContext * ctx) static BOOL sub_02042C80 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); if (ov6_02243FBC(*v0) == 1) { ov6_02243FC8(*v0); @@ -4846,17 +4846,17 @@ static BOOL ScrCmd_0DE (ScriptContext * ctx) static BOOL ScrCmd_0E6 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID); - Strbuf ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); - u8 * v3 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); - u8 * v4 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); + u16 * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID); + Strbuf ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); + u8 * v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_IS_MSG_BOX_OPEN); + u8 * v4 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); u16 v5 = ScriptContext_GetVar(ctx); u16 v6 = ScriptContext_GetVar(ctx); TrainerData_LoadMessage(v5, v6, *v2, 11); - BGL_FillWindow(FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_STR_TEMPLATE); + BGL_FillWindow(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_STR_TEMPLATE); - *v4 = FieldMessage_Print(FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW), *v2, SaveData_Options(ctx->fieldSystem->saveData), SCRIPT_MANAGER_WINDOW); + *v4 = FieldMessage_Print(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), *v2, SaveData_Options(ctx->fieldSystem->saveData), SCRIPT_MANAGER_WINDOW); ScriptContext_Pause(ctx, sub_02040014); return 1; @@ -4945,7 +4945,7 @@ static BOOL ScrCmd_0F6 (ScriptContext * ctx) PartyManagementData * v0; void ** v1; - v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v0 = *v1; sub_0205167C(ctx->fieldSystem->unk_10, v0->unk_2C, (0x4 | 0x1)); @@ -4989,7 +4989,7 @@ static BOOL ScrCmd_11C (ScriptContext * ctx) static BOOL ScrCmd_11D (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v2 = ScriptContext_ReadByte(ctx); u8 v3 = ScriptContext_ReadByte(ctx); u16 * v4 = ScriptContext_GetVarPointer(ctx); @@ -5063,7 +5063,7 @@ static BOOL ScrCmd_123 (ScriptContext * ctx) static BOOL ScrCmd_124 (ScriptContext * ctx) { - BOOL * v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL * v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5074,7 +5074,7 @@ static BOOL ScrCmd_124 (ScriptContext * ctx) static BOOL ScrCmd_2BD (ScriptContext * ctx) { - BOOL * v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL * v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5085,7 +5085,7 @@ static BOOL ScrCmd_2BD (ScriptContext * ctx) static BOOL ScrCmd_319 (ScriptContext * ctx) { - BOOL * v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL * v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5095,7 +5095,7 @@ static BOOL ScrCmd_319 (ScriptContext * ctx) static BOOL ScrCmd_318 (ScriptContext * ctx) { - BOOL * v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL * v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5106,7 +5106,7 @@ static BOOL ScrCmd_318 (ScriptContext * ctx) static BOOL ScrCmd_125 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->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(ctx); sub_02051480(ctx->taskManager, v2, 11, v1); @@ -5139,7 +5139,7 @@ static BOOL ScrCmd_128 (ScriptContext * ctx) static BOOL ScrCmd_129 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - BOOL * v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL * v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); sub_0205120C(ctx->taskManager, v1); return 1; @@ -5269,7 +5269,7 @@ static BOOL ScrCmd_136 (ScriptContext * ctx) static BOOL ScrCmd_137 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - StringTemplate ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u16 * v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205BC50(*v1); @@ -5280,7 +5280,7 @@ static BOOL ScrCmd_138 (ScriptContext * ctx) { u16 * v0 = ScriptContext_GetVarPointer(ctx); FieldSystem * fieldSystem = ctx->fieldSystem; - StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); *v0 = sub_0205BF44(ctx->fieldSystem->unk_7C, *v2); return 0; @@ -5305,8 +5305,8 @@ static BOOL ScrCmd_139 (ScriptContext * ctx) static BOOL ScrCmd_13C (ScriptContext * ctx) { - MapObject ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); - StringTemplate ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + MapObject ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u16 v2 = ScriptContext_ReadHalfWord(ctx); TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); UnkStruct_02014EC4 * v4 = sub_02014EC4(FieldSystem_SaveData(ctx->fieldSystem)); @@ -5346,10 +5346,10 @@ static BOOL sub_020437E8 (ScriptContext * ctx) static BOOL ScrCmd_13F (ScriptContext * ctx) { - MapObject ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); u16 v1 = ScriptContext_ReadHalfWord(ctx); u16 * v2 = ScriptContext_GetVarPointer(ctx); - StringTemplate ** v3 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v3 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); *v2 = sub_0205BCF4(ctx->fieldSystem->unk_7C, MapObject_Id(*v0), v1, *v3); return 0; @@ -5364,7 +5364,7 @@ static BOOL ScrCmd_2BA (ScriptContext * ctx) *v2 = sub_0205BA7C(ctx->fieldSystem->unk_7C); if (*v2 != 0) { - v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v0 = *v1; Heap_FreeToHeap(v0); } @@ -5375,7 +5375,7 @@ static BOOL ScrCmd_2BA (ScriptContext * ctx) static BOOL ScrCmd_140 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); u16 * v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205B780(fieldSystem->unk_7C, MapObject_Id(*v1)); @@ -5385,7 +5385,7 @@ static BOOL ScrCmd_140 (ScriptContext * ctx) static BOOL ScrCmd_146 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + MapObject ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); u16 v2 = ScriptContext_GetVar(ctx); u16 * v3 = ScriptContext_GetVarPointer(ctx); @@ -5519,7 +5519,7 @@ static BOOL ScrCmd_153 (ScriptContext * ctx) static BOOL ScrCmd_154 (ScriptContext * ctx) { TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); - StringTemplate ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); sub_0205C980(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), *v1); return 0; @@ -5723,7 +5723,7 @@ static BOOL ScrCmd_18C (ScriptContext * ctx) static BOOL ScrCmd_18F (ScriptContext * ctx) { - u16 ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_SAVE_TYPE); + u16 ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_SAVE_TYPE); u16 v1 = ScriptContext_GetVar(ctx); if (*v0 != NULL) { @@ -5921,8 +5921,8 @@ static BOOL ScrCmd_1AC (ScriptContext * ctx) static BOOL ScrCmd_19E (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); - MapObject ** v1 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + MapObject ** v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_TARGET_OBJECT); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_ReadHalfWord(ctx); @@ -5935,7 +5935,7 @@ static BOOL ScrCmd_19E (ScriptContext * ctx) static BOOL sub_020441C8 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 * v1 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); *v1 = ov23_02252C70((*v0)); @@ -5949,7 +5949,7 @@ static BOOL sub_020441C8 (ScriptContext * ctx) static BOOL ScrCmd_19F (ScriptContext * ctx) { - u8 * v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); + u8 * v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); *v0 = ov23_02252C9C(ScriptContext_GetVar(ctx)); ScriptContext_Pause(ctx, sub_02044240); @@ -5959,7 +5959,7 @@ static BOOL ScrCmd_19F (ScriptContext * ctx) static BOOL sub_02044240 (ScriptContext * ctx) { - u8 * v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); + u8 * v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_MESSAGE_ID); return FieldMessage_FinishedPrinting(*v0); } @@ -6146,7 +6146,7 @@ static BOOL ScrCmd_1CD (ScriptContext * ctx) u16 v3 = ScriptContext_GetVar(ctx); u16 v4 = ScriptContext_GetVar(ctx); u16 v5 = ScriptContext_GetVar(ctx); - void ** v6 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v6 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); switch (v1) { case 16: @@ -6298,7 +6298,7 @@ static BOOL ScrCmd_1E9 (ScriptContext * ctx) static BOOL ScrCmd_1EA (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E53C(ctx->fieldSystem, 32, 0); ScriptContext_Pause(ctx, sub_02041CC8); @@ -6308,7 +6308,7 @@ static BOOL ScrCmd_1EA (ScriptContext * ctx) static BOOL ScrCmd_1EB (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E53C(ctx->fieldSystem, 32, 1); ScriptContext_Pause(ctx, sub_02041CC8); @@ -6555,7 +6555,7 @@ static BOOL ScrCmd_21C (ScriptContext * ctx) static BOOL ScrCmd_226 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u8 v1 = ScriptContext_ReadByte(ctx); *v0 = ov6_02246184(11, v1); @@ -6564,7 +6564,7 @@ static BOOL ScrCmd_226 (ScriptContext * ctx) static BOOL ScrCmd_227 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov6_02246224((UnkStruct_ov6_02246204 *)*v0); @@ -6573,7 +6573,7 @@ static BOOL ScrCmd_227 (ScriptContext * ctx) static BOOL ScrCmd_228 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 * v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov6_0224622C((UnkStruct_ov6_02246204 *)*v0); @@ -6582,7 +6582,7 @@ static BOOL ScrCmd_228 (ScriptContext * ctx) static BOOL ScrCmd_229 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); u16 v1 = ScriptContext_GetVar(ctx); sub_0206C740(ctx->taskManager, (UnkStruct_ov6_02246204 *)*v0, v1, 11); @@ -6591,7 +6591,7 @@ static BOOL ScrCmd_229 (ScriptContext * ctx) static BOOL ScrCmd_22A (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR); ov6_02246204((UnkStruct_ov6_02246204 *)*v0); return 0; @@ -6834,7 +6834,7 @@ static BOOL ScrCmd_252 (ScriptContext * ctx) static BOOL ScrCmd_258 (ScriptContext * ctx) { - SysTask ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_TASK); + SysTask ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_TASK); *v0 = NULL; *v0 = ov5_021E1000(ctx->fieldSystem); @@ -6844,7 +6844,7 @@ static BOOL ScrCmd_258 (ScriptContext * ctx) static BOOL ScrCmd_259 (ScriptContext * ctx) { - SysTask ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_TASK); + SysTask ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_TASK); ov5_021E100C(*v0); return 1; @@ -7130,7 +7130,7 @@ static BOOL ScrCmd_270 (ScriptContext * ctx) static BOOL ScrCmd_273 (ScriptContext * ctx) { - StringTemplate ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v1 = ScriptContext_ReadByte(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -7201,7 +7201,7 @@ static BOOL ScrCmd_27D (ScriptContext * ctx) u32 v1; u16 * v2 = ScriptContext_GetVarPointer(ctx); u16 v3 = ScriptContext_GetVar(ctx); - StringTemplate ** v4 = FieldSystem_GetScriptMember(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v4 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); v0 = sub_02014EC4(ctx->fieldSystem->saveData); v1 = sub_02014EE4(v0); @@ -7507,7 +7507,7 @@ static BOOL ScrCmd_290 (ScriptContext * ctx) void ** v0; u16 v1 = ScriptContext_GetVar(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203D410(32, ctx->fieldSystem, v1); ScriptContext_Pause(ctx, sub_02041D60); @@ -7521,7 +7521,7 @@ static BOOL ScrCmd_291 (ScriptContext * ctx) v1 = ScriptContext_GetVarPointer(ctx); v2 = ScriptContext_GetVarPointer(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); GF_ASSERT(*v0 != 0); @@ -7699,7 +7699,7 @@ static BOOL ScrCmd_2AF (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; u16 * v1 = ScriptContext_GetVarPointer(ctx); - StringTemplate ** v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + StringTemplate ** v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); *v1 = sub_0205BC50(*v2); return 0; @@ -7768,7 +7768,7 @@ static BOOL ScrCmd_2BE (ScriptContext * ctx) static BOOL ScrCmd_2C1 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021E1FF4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 40); + UnkStruct_ov5_021E1FF4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 40); if (!SaveData_OverwriteCheck(fieldSystem->saveData)) { *v1 = ov5_021E1F98(fieldSystem, 4, 3); @@ -7781,7 +7781,7 @@ static BOOL ScrCmd_2C1 (ScriptContext * ctx) static BOOL ScrCmd_2C2 (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021E1FF4 ** v1 = FieldSystem_GetScriptMember(fieldSystem, 40); + UnkStruct_ov5_021E1FF4 ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, 40); if (!SaveData_OverwriteCheck(fieldSystem->saveData)) { ov5_021E1F7C(*v1); @@ -7799,7 +7799,7 @@ static BOOL ScrCmd_2C3 (ScriptContext * ctx) static BOOL ScrCmd_2C4 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); u8 v1 = ScriptContext_ReadByte(ctx); UnkStruct_ov104_02230BE4 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4)); @@ -7830,8 +7830,8 @@ static BOOL ScrCmd_2C4 (ScriptContext * ctx) static BOOL ScrCmd_2CA (ScriptContext * ctx) { FieldSystem * fieldSystem = ctx->fieldSystem; - Strbuf ** v1 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); - Window * v2 = FieldSystem_GetScriptMember(fieldSystem, SCRIPT_MANAGER_WINDOW); + Strbuf ** v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_MESSAGE_BUF); + Window * v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW); ov8_0224B67C(fieldSystem, v2, ctx->loader, *v1); return 1; @@ -7924,7 +7924,7 @@ static BOOL ScrCmd_2D8 (ScriptContext * ctx) BOOL ScrCmd_2C8 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -7937,7 +7937,7 @@ BOOL ScrCmd_2C8 (ScriptContext * ctx) BOOL ScrCmd_2E2 (ScriptContext * ctx) { - void ** v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + void ** v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); *v0 = sub_0203E608(ctx->fieldSystem, 32); ScriptContext_Pause(ctx, sub_02041D60); @@ -7950,7 +7950,7 @@ BOOL ScrCmd_2E3 (ScriptContext * ctx) void ** v0; FieldSystem * fieldSystem = ctx->fieldSystem; - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); Heap_FreeToHeap(*v0); *v0 = NULL; @@ -7966,7 +7966,7 @@ BOOL ScrCmd_2E4 (ScriptContext * ctx) u16 * v4 = ScriptContext_GetVarPointer(ctx); u16 * v5 = ScriptContext_GetVarPointer(ctx); - v0 = FieldSystem_GetScriptMember(ctx->fieldSystem, 19); + v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, 19); v1 = (UnkStruct_0203E608 *)*v0; *v4 = v1->unk_08[v3]; *v5 = v1->unk_0E[v3]; diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index 83ca95b6f3..04961170fd 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -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) diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 9cada75e3f..b62406a044 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -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; diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index e7ec91457e..5faede642d 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -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); diff --git a/src/unk_02048614.c b/src/unk_02048614.c index 14cddfffad..5bf7bfd57b 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -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; diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index 49bcda1ae1..83dcffa0f5 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -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; diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index ebfd42bbdf..f61392e2fd 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -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: diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index 4a71d69d4d..74a149ac8a 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -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; diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index a7a88619bb..e411d1a170 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -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); diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index 4c2b374480..1b5d141cf5 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -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); diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index f24e68515e..20b10b8e29 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -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; diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index b5ca7849f2..9927104a4f 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -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; diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c index 94a85035cd..fc6e6520fe 100644 --- a/src/unk_0204CA84.c +++ b/src/unk_0204CA84.c @@ -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); diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index f0ddaf35c5..abfc2da70a 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -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; diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 40672ff985..72e8953770 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -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); diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index e3e79f866e..c538e213fe 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -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: diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index feb6df982d..a277a3c4f4 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -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: diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index ed8b49b989..d654786f6b 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -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;