From 24516ac2a96f58b2e6185ca7dc1c2a41d46ffc5b Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 24 Aug 2023 19:47:13 +0100 Subject: [PATCH] Save_PCStorage_Get -> SaveArray_PCStorage_Get --- arm9/asm/scrcmd_5.s | 2 +- arm9/asm/unk_020377F0.s | 2 +- arm9/asm/unk_020476CC.s | 8 ++++---- arm9/global.inc | 2 +- arm9/overlays/14/asm/overlay_14.s | 2 +- arm9/src/encounter.c | 2 +- arm9/src/scrcmd.c | 4 ++-- arm9/src/scrcmd_13.c | 4 ++-- arm9/src/scrcmd_names.c | 4 ++-- arm9/src/scrcmd_party.c | 2 +- arm9/src/unk_02022504.c | 2 +- include/unk_02022504.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index b1d152af4..7e93600de 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -40,7 +40,7 @@ ScrCmd_Unk024F: ; 0x020411C4 add r0, #0x80 ldr r7, [r0, #0x0] ldr r0, [r7, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get str r0, [sp, #0x20] add r0, r4, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 10752d799..4d4557182 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -2127,7 +2127,7 @@ sub_020386E0: ; 0x020386E0 bl SaveArray_Get str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl Save_Pokedex_Get diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 744b1cf44..6ca73510b 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -285,7 +285,7 @@ sub_02047814: ; 0x02047814 add r0, r6, #0x0 bl FreeToHeap ldr r0, [r5, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r4, r1] @@ -519,7 +519,7 @@ sub_02047A78: ; 0x02047A78 mov r2, #0x0 bl sub_02047A64 ldr r0, [r4, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -719,7 +719,7 @@ _02047C98: bl sub_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r6, r1] @@ -903,7 +903,7 @@ _02047E2C: bl sub_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] diff --git a/arm9/global.inc b/arm9/global.inc index 3e4bf7211..6c0e67d3a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1427,7 +1427,7 @@ .extern sub_02022450 .extern Reset_To_File .extern Save_SafariZone_Get -.extern Save_PCStorage_Get +.extern SaveArray_PCStorage_Get .extern sub_0202251C .extern sub_02022528 .extern LoadHallOfFame diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 959b16bc6..3a13a5d5c 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -7519,7 +7519,7 @@ ov14_021DB220: ; 0x021DB220 add r4, r1, #0 add r5, r0, #0 ldr r0, [r4] - bl Save_PCStorage_Get + bl SaveArray_PCStorage_Get mov r1, #0x12 lsl r1, r1, #4 str r0, [r5, r1] diff --git a/arm9/src/encounter.c b/arm9/src/encounter.c index ffb5800eb..e1316834e 100644 --- a/arm9/src/encounter.c +++ b/arm9/src/encounter.c @@ -480,7 +480,7 @@ static BOOL Task_SafariEncounter(TaskManager *taskManager) { QueueScript(taskManager, 0x2269, NULL, NULL); } } else { - PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); + PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); Party *party = SaveArray_Party_Get(fieldSystem->saveData); if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && Party_GetCount(party) == PARTY_SIZE) { QueueScript(taskManager, 0x2276, NULL, NULL); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index ade3501a9..6066d0bb0 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -4046,7 +4046,7 @@ BOOL ScrCmd_GiveWallpaper(ScriptContext *ctx) { //0249 - used for easy chat unlo FieldSystem *fieldSystem = ctx->fieldSystem; PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)); u16 *var = ScriptGetVarPointer(ctx); - PCStorage *pcStorage = Save_PCStorage_Get(fieldSystem->saveData); + PCStorage *pcStorage = SaveArray_PCStorage_Get(fieldSystem->saveData); u16 unk0 = ScriptGetVar(ctx); u16 unk1 = ScriptGetVar(ctx); u16 unk2 = ScriptGetVar(ctx); @@ -4107,7 +4107,7 @@ static void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species BOOL ScrCmd_CountPCFreeSpace(ScriptContext *ctx) { //0252 u16 *var = ScriptGetVarPointer(ctx); - u16 count = PCStorage_CountMonsAndEggsInAllBoxes(Save_PCStorage_Get(ctx->fieldSystem->saveData)); + u16 count = PCStorage_CountMonsAndEggsInAllBoxes(SaveArray_PCStorage_Get(ctx->fieldSystem->saveData)); *var = MONS_PER_BOX * NUM_BOXES - count; return FALSE; } diff --git a/arm9/src/scrcmd_13.c b/arm9/src/scrcmd_13.c index 22fbc7442..5d91c5708 100644 --- a/arm9/src/scrcmd_13.c +++ b/arm9/src/scrcmd_13.c @@ -6,7 +6,7 @@ #include "pokemon_storage_system.h" #include "unk_0202C144.h" -extern struct PCStorage* Save_PCStorage_Get(struct SaveData* save); +extern struct PCStorage* SaveArray_PCStorage_Get(struct SaveData* save); extern void* sub_02022528(struct SaveData* save); extern void sub_0202BEDC(struct Pokemon* pokemon); extern void sub_0202BFD8(void* a0, s32 a1, struct Pokemon* pokemon); @@ -64,7 +64,7 @@ BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254 BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255 { void* unk = sub_02022528(ctx->fieldSystem->saveData); - struct PCStorage* pc = Save_PCStorage_Get(ctx->fieldSystem->saveData); + struct PCStorage* pc = SaveArray_PCStorage_Get(ctx->fieldSystem->saveData); struct Pokemon* pokemon = AllocMonZeroed(HEAP_ID_32); PlayerProfile* player = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->saveData); struct Pokedex* pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); // unused diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index 66f0b955f..84f6bf4ff 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -18,7 +18,7 @@ extern void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, int idx); extern u32 sub_020536D0(u32 gender, u32 avatar, u32 a2); extern u32 Save_VarsFlags_GetStarter(SaveVarsFlags *state); extern u32 sub_0205F398(SaveVarsFlags *state); -extern PCStorage *Save_PCStorage_Get(SaveData *save); +extern PCStorage *SaveArray_PCStorage_Get(SaveData *save); extern u32 sub_0205F3C0(SaveVarsFlags *state); extern u32 sub_02054C14(u32 number); @@ -168,7 +168,7 @@ BOOL ScrCmd_GetPokemonNickname(ScriptContext *ctx) //00D6 - todo: BufferPartyPok BOOL ScrCmd_Unk0251(ScriptContext *ctx) //0251 - todo: BufferBoxPokemonNickname? TextBoxPokemonNickname? { FieldSystem *fieldSystem = ctx->fieldSystem; - PCStorage *pc = Save_PCStorage_Get(fieldSystem->saveData); + PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 box_mon_idx = ScriptGetVar(ctx); diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index 0648b3275..1cab62464 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -479,7 +479,7 @@ BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); - pc = Save_PCStorage_Get(fieldSystem->saveData); + pc = SaveArray_PCStorage_Get(fieldSystem->saveData); party_count = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); u32 mons; diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c index fad6b2196..e99a01913 100644 --- a/arm9/src/unk_02022504.c +++ b/arm9/src/unk_02022504.c @@ -7,7 +7,7 @@ SafariZone *Save_SafariZone_Get(struct SaveData *save) return SaveArray_Get(save, SAVE_SAFARI_ZONE); } -struct PCStorage *Save_PCStorage_Get(struct SaveData *save) +struct PCStorage *SaveArray_PCStorage_Get(struct SaveData *save) { return SaveArray_Get(save, 35); } diff --git a/include/unk_02022504.h b/include/unk_02022504.h index 4b9e22a72..4f6fa6cf6 100644 --- a/include/unk_02022504.h +++ b/include/unk_02022504.h @@ -8,7 +8,7 @@ #include "unk_0202AC20.h" SafariZone *Save_SafariZone_Get(struct SaveData *save); -struct PCStorage *Save_PCStorage_Get(struct SaveData *save); +struct PCStorage *SaveArray_PCStorage_Get(struct SaveData *save); struct UnkStruct_0202AC20 * sub_0202251C(struct SaveData *save); void *sub_02022528(struct SaveData *save); HallOfFame *LoadHallOfFame(struct SaveData *save, HeapID heapId, int *ret_p);