Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-30 20:36:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Save_PCStorage_Get -> SaveArray_PCStorage_Get

Browse Source
This commit is contained in:
red031000
2023-08-24 19:47:13 +01:00
parent 70439f1a6b
commit 24516ac2a9
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/asm/scrcmd_5.s
View File

@@ -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

2
arm9/asm/unk_020377F0.s
View File

@@ -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

8
arm9/asm/unk_020476CC.s
View File

@@ -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]

2
arm9/global.inc
View File

@@ -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

2
arm9/overlays/14/asm/overlay_14.s
View File

@@ -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]

2
arm9/src/encounter.c
View File

@@ -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);

4
arm9/src/scrcmd.c
View File

@@ -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;
}

4
arm9/src/scrcmd_13.c
View File

@@ -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

4
arm9/src/scrcmd_names.c
View File

@@ -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);

2
arm9/src/scrcmd_party.c
View File

@@ -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;

2
arm9/src/unk_02022504.c
View File

@@ -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);
}

2
include/unk_02022504.h
View File

@@ -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);