Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-24 15:07:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename PSSBoxes -> PCBoxes

Browse Source
This commit is contained in:
lhearachel 2023-09-24 15:53:38 -07:00
parent 1407ff729f
commit e5da0ec849
37 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay006/battle_params.h
View File

@ -30,7 +30,7 @@ typedef struct {
UnkStruct_0207D3C0 * unk_E0;
UnkStruct_0207D99C * unk_E4;
UnkStruct_02026324 * unk_E8;
PSSBoxes * unk_EC;
PCBoxes * unk_EC;
UnkStruct_0202CC84 * unk_F0[4];
UnkStruct_02056B24 * unk_100;
UnkStruct_0202C878 * unk_104;

2
include/overlay016/ov16_0223DF00.h
View File

@ -80,7 +80,7 @@ int ov16_0223E1C4(BattleSystem * param0, int param1);
u8 BattleSystem_BattlerSlot(BattleSystem * param0, int param1);
u8 Battler_Side(BattleSystem * param0, int param1);
void * ov16_0223E220(BattleSystem * param0);
PSSBoxes * ov16_0223E228(BattleSystem * param0);
PCBoxes * ov16_0223E228(BattleSystem * param0);
int ov16_0223E22C(BattleSystem * param0);
int ov16_0223E240(BattleSystem * param0);
int ov16_0223E24C(BattleSystem * param0);

2
include/overlay019/ov19_021D0D80.h
View File

@ -34,7 +34,7 @@ u32 ov19_021D5E68(const UnkStruct_ov19_021D4DF0 * param0);
const UnkStruct_ov19_021D5BAC * ov19_021D5E70(const UnkStruct_ov19_021D4DF0 * param0);
u32 ov19_021D5E74(const UnkStruct_ov19_021D4DF0 * param0);
const UnkStruct_ov19_021D4F5C * ov19_021D5E8C(const UnkStruct_ov19_021D4DF0 * param0);
const PSSBoxes * ov19_021D5E90(const UnkStruct_ov19_021D4DF0 * param0);
const PCBoxes * ov19_021D5E90(const UnkStruct_ov19_021D4DF0 * param0);
u32 ov19_021D5E94(const UnkStruct_ov19_021D4DF0 * param0);
BoxPokemon * ov19_021D5E9C(const UnkStruct_ov19_021D4DF0 * param0);
u32 ov19_021D5EA0(const UnkStruct_ov19_021D4DF0 * param0);

2
include/overlay019/struct_ov19_021D4DF0.h
View File

@ -14,7 +14,7 @@
#include "overlay019/struct_ov19_021DF964.h"
typedef struct {
const PSSBoxes * unk_00;
const PCBoxes * unk_00;
const Party * unk_04;
UnkStruct_ov19_021D3CFC unk_08;
UnkStruct_ov19_021D5594 unk_14;

2
include/overlay061/ov61_0222AE60.h
View File

@ -12,7 +12,7 @@
void ov61_0222AE60(SaveData * param0, const UnkStruct_02029C68 * param1, UnkStruct_ov61_0222AE80 * param2);
void ov61_0222AE80(const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 * param1);
void ov61_0222AE88(SaveData * param0, const PSSBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4);
void ov61_0222AE88(SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4);
void ov61_0222AF88(SaveData * param0, UnkStruct_ov62_02239DA4 * param1, int param2);
void ov61_0222AFA4(SaveData * param0, const UnkStruct_02030A80 * param1, UnkStruct_ov61_0222AFC0 * param2);
void ov61_0222AFC0(const UnkStruct_ov61_0222AFC0 * param0, UnkStruct_02030A80 * param1);

2
include/overlay061/ov61_0222B008.h
View File

@ -13,7 +13,7 @@ int ov61_0222B008(UnkStruct_ov62_022349A8 * param0, const UnkStruct_ov62_0224113
void ov61_0222B0F0(UnkStruct_ov62_022349A8 * param0);
int ov61_0222B1B4(UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_02029C68 * param2);
int ov61_0222B1FC(UnkStruct_ov62_022349A8 * param0, int param1);
int ov61_0222B224(UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030A80 * param2, const PSSBoxes * param3, int param4);
int ov61_0222B224(UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030A80 * param2, const PCBoxes * param3, int param4);
int ov61_0222B290(UnkStruct_ov62_022349A8 * param0, int param1);
int ov61_0222B2B8(UnkStruct_ov62_022349A8 * param0);
int ov61_0222B2D8(UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_ov61_0222B2D8 param2[]);

2
include/overlay094/ov94_0223FB48.h
View File

@ -10,7 +10,7 @@ int ov94_0223FB48(UnkStruct_ov94_0223FD4C * param0, int param1);
int ov94_0223FBBC(UnkStruct_ov94_0223FD4C * param0, int param1);
int ov94_0223FBDC(UnkStruct_ov94_0223FD4C * param0, int param1);
int ov94_022411D0(int param0);
BoxPokemon * ov94_022411DC(Party * param0, PSSBoxes * param1, int param2, int param3);
BoxPokemon * ov94_022411DC(Party * param0, PCBoxes * param1, int param2, int param3);
BOOL ov94_02241498(Pokemon * param0);
#endif // POKEPLATINUM_OV94_0223FB48_H

8
include/savedata/save_table.h
View File

@ -68,7 +68,7 @@ enum SaveTableEntryID {
SAVE_TABLE_ENTRY_SENTENCE,
SAVE_TABLE_ENTRY_EMAIL,
SAVE_TABLE_ENTRY_WIFI_QUESTIONS,
SAVE_TABLE_ENTRY_PSS_BOXES,
SAVE_TABLE_ENTRY_PC_BOXES,
SAVE_TABLE_ENTRY_MAX
};
@ -100,14 +100,14 @@ extern const int gExtraSaveTableSize;
TVBroadcast* SaveData_TVBroadcast(SaveData *save);
/**
* @brief Loads the PSSBoxes sector of the save data.
* @brief Loads the PCBoxes sector of the save data.
*
* This routine does NOT perform any CRC on the sectors before loading them.
*
* @param save
* @return Address of the PSSBoxes sector of the save data.
* @return Address of the PCBoxes sector of the save data.
*/
PSSBoxes* SaveData_PSSBoxes(SaveData *save);
PCBoxes* SaveData_PCBoxes(SaveData *save);
/**
* @brief Loads the MysteryGift sector of the save data.

2
include/struct_decls/struct_020797DC_decl.h
View File

@ -1,6 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_020797DC_DECL_H
#define POKEPLATINUM_STRUCT_020797DC_DECL_H
typedef struct PSSBoxes PSSBoxes;
typedef struct PCBoxes PCBoxes;
#endif // POKEPLATINUM_STRUCT_020797DC_DECL_H

2
include/struct_defs/battle_system.h
View File

@ -60,7 +60,7 @@ struct BattleSystem {
UnkStruct_0207D3C0 * unk_58;
UnkStruct_0207D99C * unk_5C;
UnkStruct_02026324 * unk_60;
PSSBoxes * unk_64;
PCBoxes * unk_64;
Party *parties[4];
UnkStruct_0202CC84 * unk_78[4];
UnkStruct_02007768 * unk_88;

2
include/struct_defs/struct_0203E0FC.h
View File

@ -19,7 +19,7 @@ typedef struct {
UnkStruct_0202DA40 * unk_00;
UnkStruct_02025CCC * unk_04;
Party * unk_08;
PSSBoxes * unk_0C;
PCBoxes * unk_0C;
UnkStruct_02026324 * unk_10;
UnkStruct_0202B370 * unk_14;
UnkStruct_0202C878 * unk_18;

2
include/struct_defs/struct_0208737C.h
View File

@ -15,7 +15,7 @@ typedef struct {
Strbuf* unk_18;
u16 unk_1C[20];
int unk_44;
PSSBoxes * unk_48;
PCBoxes * unk_48;
UnkStruct_020279FC * unk_4C;
} UnkStruct_0208737C;

2
include/unk_0200B358.h
View File

@ -56,7 +56,7 @@ void sub_0200BC48(UnkStruct_0200B358 * param0, u32 param1, u32 param2);
void sub_0200BC80(UnkStruct_0200B358 * param0, u32 param1, u32 param2);
void sub_0200BCB8(UnkStruct_0200B358 * param0, u32 param1, u32 param2);
void sub_0200BCF0(UnkStruct_0200B358 * param0, u32 param1, u8 param2);
void sub_0200BD40(UnkStruct_0200B358 * param0, u32 param1, const PSSBoxes * param2, u32 param3);
void sub_0200BD40(UnkStruct_0200B358 * param0, u32 param1, const PCBoxes * param2, u32 param3);
void sub_0200BD60(UnkStruct_0200B358 * param0, u32 param1, u32 param2);
void sub_0200BD98(UnkStruct_0200B358 * param0, u32 param1, u32 param2);
void sub_0200BDD0(UnkStruct_0200B358 * param0, u32 param1, u32 param2);

48
include/unk_020797C8.h
View File

@ -5,29 +5,29 @@
#include "pokemon.h"
#include "struct_decls/struct_020797DC_decl.h"
void PSSBoxes_Init(PSSBoxes * param0);
u32 PSSBoxes_SaveSize(void);
BOOL sub_02079868(PSSBoxes * param0, BoxPokemon * param1);
BOOL sub_020798A0(PSSBoxes * param0, u32 param1, BoxPokemon * param2);
BOOL sub_02079914(PSSBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3);
void sub_02079968(PSSBoxes * param0, u32 param1, u32 param2);
u32 sub_0207999C(const PSSBoxes * param0);
u32 sub_020799A0(const PSSBoxes * param0);
BOOL sub_020799F0(const PSSBoxes * param0, int * param1, int * param2);
u32 sub_02079A50(const PSSBoxes * param0);
void sub_02079A94(PSSBoxes * param0, u32 param1);
u32 sub_02079AA8(const PSSBoxes * param0, u32 param1);
void sub_02079AC4(PSSBoxes * param0, u32 param1, u32 param2);
void sub_02079AF4(const PSSBoxes * param0, u32 param1, Strbuf *param2);
void sub_02079B24(PSSBoxes * param0, u32 param1, const Strbuf *param2);
u32 sub_02079B54(const PSSBoxes * param0, u32 param1);
u32 sub_02079B98(const PSSBoxes * param0, u32 param1);
u32 sub_02079BEC(const PSSBoxes * param0);
u32 sub_02079C08(const PSSBoxes * param0, u32 param1, u32 param2, int param3, void * param4);
void sub_02079C50(PSSBoxes * param0, u32 param1, u32 param2, int param3, void * param4);
BoxPokemon * sub_02079C9C(const PSSBoxes * param0, u32 param1, u32 param2);
void sub_02079CD8(PSSBoxes * param0, u32 param1);
BOOL sub_02079CFC(const PSSBoxes * param0, u32 param1);
u32 sub_02079D20(const PSSBoxes * param0);
void PCBoxes_Init(PCBoxes * param0);
u32 PCBoxes_SaveSize(void);
BOOL sub_02079868(PCBoxes * param0, BoxPokemon * param1);
BOOL sub_020798A0(PCBoxes * param0, u32 param1, BoxPokemon * param2);
BOOL sub_02079914(PCBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3);
void sub_02079968(PCBoxes * param0, u32 param1, u32 param2);
u32 sub_0207999C(const PCBoxes * param0);
u32 sub_020799A0(const PCBoxes * param0);
BOOL sub_020799F0(const PCBoxes * param0, int * param1, int * param2);
u32 sub_02079A50(const PCBoxes * param0);
void sub_02079A94(PCBoxes * param0, u32 param1);
u32 sub_02079AA8(const PCBoxes * param0, u32 param1);
void sub_02079AC4(PCBoxes * param0, u32 param1, u32 param2);
void sub_02079AF4(const PCBoxes * param0, u32 param1, Strbuf *param2);
void sub_02079B24(PCBoxes * param0, u32 param1, const Strbuf *param2);
u32 sub_02079B54(const PCBoxes * param0, u32 param1);
u32 sub_02079B98(const PCBoxes * param0, u32 param1);
u32 sub_02079BEC(const PCBoxes * param0);
u32 sub_02079C08(const PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4);
void sub_02079C50(PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4);
BoxPokemon * sub_02079C9C(const PCBoxes * param0, u32 param1, u32 param2);
void sub_02079CD8(PCBoxes * param0, u32 param1);
BOOL sub_02079CFC(const PCBoxes * param0, u32 param1);
u32 sub_02079D20(const PCBoxes * param0);
#endif // POKEPLATINUM_UNK_020797C8_H

2
src/overlay013/ov13_022264F4.c
View File

@ -477,7 +477,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0)
{
Party * v7 = ov16_0223DF20(v0->unk_00, v0->unk_10);
PSSBoxes * v8 = ov16_0223E228(v0->unk_00);
PCBoxes * v8 = ov16_0223E228(v0->unk_00);
if ((Party_GetCurrentCount(v7) == 6) && (sub_020799A0(v8) == 18)) {
MessageLoader_GetStrbuf(param0->unk_10, 45, param0->unk_18);

4
src/overlay016/ov16_0223DF00.c
View File

@ -118,7 +118,7 @@ int ov16_0223E1C4(BattleSystem * param0, int param1);
u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler);
u8 Battler_Side(BattleSystem * param0, int param1);
void * ov16_0223E220(BattleSystem * param0);
PSSBoxes * ov16_0223E228(BattleSystem * param0);
PCBoxes * ov16_0223E228(BattleSystem * param0);
int ov16_0223E22C(BattleSystem * param0);
int ov16_0223E240(BattleSystem * param0);
int ov16_0223E24C(BattleSystem * param0);
@ -496,7 +496,7 @@ void * ov16_0223E220 (BattleSystem * param0)
return param0->unk_1AC;
}
PSSBoxes * ov16_0223E228 (BattleSystem * param0)
PCBoxes * ov16_0223E228 (BattleSystem * param0)
{
return param0->unk_64;
}

2
src/overlay016/ov16_022405FC.c
View File

@ -8625,7 +8625,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1)
v2->unk_28 = 32;
} else {
{
PSSBoxes * v24;
PCBoxes * v24;
u32 v25;
u32 v26;
int v27;

20
src/overlay019/ov19_021D0D80.c
View File

@ -116,7 +116,7 @@ typedef struct {
u8 unk_04[NELEMS(Unk_ov19_021DFDF0)];
u16 unk_08[NELEMS(Unk_ov19_021DFDF0)];
BoxPokemon * unk_10;
PSSBoxes * unk_14;
PCBoxes * unk_14;
Party * unk_18;
BOOL unk_1C;
} UnkStruct_ov19_021D38E0;
@ -126,7 +126,7 @@ typedef struct UnkStruct_ov19_021D5DF8_t {
UnkStruct_ov19_021D61B0 * unk_114;
UnkStruct_02042434 * unk_118;
SaveData * unk_11C;
PSSBoxes * unk_120;
PCBoxes * unk_120;
Party * unk_124;
UnkStruct_0208737C * unk_128;
UnkStruct_02098D38 unk_12C;
@ -221,15 +221,15 @@ static void ov19_021D4DE4(UnkStruct_ov19_021D4DE4 * param0, int param1);
static void ov19_021D4DF0(UnkStruct_ov19_021D5DF8 * param0);
static void ov19_021D4E30(UnkStruct_ov19_021D5594 * param0);
static void ov19_021D4E50(UnkStruct_ov19_021D5594 * param0);
static void ov19_021D4E5C(PSSBoxes * param0, UnkStruct_ov19_021D4F5C * param1);
static void ov19_021D4E5C(PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1);
static void ov19_021D4E7C(UnkStruct_ov19_021D4F5C * param0);
static void ov19_021D4E88(UnkStruct_ov19_021D5BAC * param0);
static void ov19_021D4EC0(UnkStruct_ov19_021D5BAC * param0);
static void ov19_021D4EE4(UnkStruct_ov19_021D4EE4 * param0);
static void ov19_021D4F18(UnkStruct_ov19_021D4EE4 * param0);
static void ov19_021D4F34(UnkStruct_ov19_021D4F34 * param0);
static void ov19_021D4F40(const PSSBoxes * param0, UnkStruct_ov19_021D4F5C * param1);
static void ov19_021D4F5C(UnkStruct_ov19_021D4DF0 * param0, PSSBoxes * param1);
static void ov19_021D4F40(const PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1);
static void ov19_021D4F5C(UnkStruct_ov19_021D4DF0 * param0, PCBoxes * param1);
static BOOL ov19_021D4F74(u32 param0, UnkStruct_ov19_021D5DF8 * param1);
static BOOL ov19_021D4FDC(UnkStruct_ov19_021D4DF0 * param0, int param1, int param2);
static int ov19_021D5150(u32 param0, UnkStruct_ov19_021D5DF8 * param1);
@ -3309,7 +3309,7 @@ static void ov19_021D4BB0 (u32 param0, u32 param1, void * param2)
static void ov19_021D4BE0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 * param1)
{
param0->unk_120 = SaveData_PSSBoxes(param1->unk_00);
param0->unk_120 = SaveData_PCBoxes(param1->unk_00);
param0->unk_11C = param1->unk_00;
param0->unk_124 = Party_GetFromSavedata(param1->unk_00);
param0->unk_1A4 = sub_02025E44(param1->unk_00);
@ -3415,7 +3415,7 @@ static void ov19_021D4E50 (UnkStruct_ov19_021D5594 * param0)
Heap_FreeToHeap(param0->unk_00);
}
static void ov19_021D4E5C (PSSBoxes * param0, UnkStruct_ov19_021D4F5C * param1)
static void ov19_021D4E5C (PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1)
{
param1->unk_00 = sub_0207999C(param0);
param1->unk_04 = Strbuf_Init(20, 9);
@ -3478,13 +3478,13 @@ static void ov19_021D4F34 (UnkStruct_ov19_021D4F34 * param0)
param0->unk_04 = 0;
}
static void ov19_021D4F40 (const PSSBoxes * param0, UnkStruct_ov19_021D4F5C * param1)
static void ov19_021D4F40 (const PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1)
{
param1->unk_01 = sub_02079AA8(param0, param1->unk_00);
sub_02079AF4(param0, param1->unk_00, param1->unk_04);
}
static void ov19_021D4F5C (UnkStruct_ov19_021D4DF0 * param0, PSSBoxes * param1)
static void ov19_021D4F5C (UnkStruct_ov19_021D4DF0 * param0, PCBoxes * param1)
{
UnkStruct_ov19_021D4F5C * v0 = &(param0->unk_40);
v0->unk_01 = sub_02079AA8(param1, v0->unk_00);
@ -4525,7 +4525,7 @@ const UnkStruct_ov19_021D4F5C * ov19_021D5E8C (const UnkStruct_ov19_021D4DF0 * p
return &(param0->unk_40);
}
const PSSBoxes * ov19_021D5E90 (const UnkStruct_ov19_021D4DF0 * param0)
const PCBoxes * ov19_021D5E90 (const UnkStruct_ov19_021D4DF0 * param0)
{
return param0->unk_00;
}

4
src/overlay019/ov19_021D79F8.c
View File

@ -382,7 +382,7 @@ static void ov19_021D7F9C (UnkStruct_ov19_021D8318 * param0, fx32 param1)
static void ov19_021D803C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, int param2, int param3)
{
const PSSBoxes * v0;
const PCBoxes * v0;
BoxPokemon * v1;
int v2, v3;
u32 v4;
@ -425,7 +425,7 @@ static void ov19_021D8114 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
static void ov19_021D813C (UnkStruct_ov19_021D8318 * param0, u32 param1)
{
const PSSBoxes * v0;
const PCBoxes * v0;
BoxPokemon * v1;
u32 v2, v3;

4
src/overlay019/ov19_021DB8E4.c
View File

@ -231,7 +231,7 @@ BOOL ov19_021DBBA0 (UnkStruct_ov19_021DBA9C * param0)
void ov19_021DBBA8 (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy * param4)
{
const PSSBoxes * v0;
const PCBoxes * v0;
BoxPokemon * v1;
u32 v2, v3, v4, v5;
u8 v6, v7;
@ -416,7 +416,7 @@ static void ov19_021DBF18 (UnkStruct_ov19_021DBA9C * param0)
static void ov19_021DBF4C (UnkStruct_ov19_021DBA9C * param0)
{
const PSSBoxes * v0;
const PCBoxes * v0;
UnkStruct_0205AA50 * v1;
u32 v2, v3;

6
src/overlay019/ov19_021DF964.c
View File

@ -121,7 +121,7 @@ void ov19_021DFAD0 (UnkStruct_ov19_021D4DF0 * param0)
void ov19_021DFB50 (UnkStruct_ov19_021D4DF0 * param0)
{
UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74);
const PSSBoxes * v1 = ov19_021D5E90(param0);
const PCBoxes * v1 = ov19_021D5E90(param0);
ov19_021DFCF8(v0);
ov19_021DFD08(v0, UnkEnum_021DFB94_00);
@ -139,7 +139,7 @@ void ov19_021DFB50 (UnkStruct_ov19_021D4DF0 * param0)
void ov19_021DFB94 (UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1)
{
UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74);
const PSSBoxes * v1 = ov19_021D5E90(param0);
const PCBoxes * v1 = ov19_021D5E90(param0);
u32 v2;
ov19_021DFCF8(v0);
@ -176,7 +176,7 @@ void ov19_021DFC04 (UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1)
{UnkEnum_021DFB94_22, UnkEnum_021DFB94_23, UnkEnum_021DFB94_24, UnkEnum_021DFB94_25},
};
UnkStruct_ov19_021DF964 * v1 = &(param0->unk_74);
const PSSBoxes * v2 = ov19_021D5E90(param0);
const PCBoxes * v2 = ov19_021D5E90(param0);
int v3;
ov19_021DFCF8(v1);

2
src/overlay061/ov61_0222AE60.c
View File

@ -30,7 +30,7 @@ void ov61_0222AE80 (const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 *
sub_0202A824(param0, param1);
}
void ov61_0222AE88 (SaveData * param0, const PSSBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4)
void ov61_0222AE88 (SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4)
{
Strbuf* v0;
int v1;

2
src/overlay061/ov61_0222B008.c
View File

@ -191,7 +191,7 @@ int ov61_0222B1FC (UnkStruct_ov62_022349A8 * param0, int param1)
return 1;
}
int ov61_0222B224 (UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030A80 * param2, const PSSBoxes * param3, int param4)
int ov61_0222B224 (UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030A80 * param2, const PCBoxes * param3, int param4)
{
if (ov61_0222BBBC(param0) == 0) {
return 0;

12
src/overlay062/ov62_02239D60.c
View File

@ -65,7 +65,7 @@ typedef struct {
} UnkStruct_ov62_02239DBC_sub1;
typedef struct {
PSSBoxes * unk_00;
PCBoxes * unk_00;
UnkStruct_ov62_02239DA4 unk_04;
int unk_1A0;
int unk_1A4;
@ -102,7 +102,7 @@ static void ov62_02239F98(u32 param0, u32 param1, void * param2);
static void ov62_0223A0AC(UnkStruct_0208C06C * param0);
static void ov62_0223A110(UnkStruct_0208C06C * param0);
static void ov62_0223A138(UnkStruct_ov62_02239DBC * param0);
static void ov62_0223A154(SaveData * param0, const PSSBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3);
static void ov62_0223A154(SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3);
static BOOL ov62_0223A17C(UnkStruct_0208C06C * param0);
static BOOL ov62_0223A2A8(UnkStruct_0208C06C * param0);
static BOOL ov62_0223A394(UnkStruct_0208C06C * param0);
@ -446,7 +446,7 @@ static void ov62_0223A138 (UnkStruct_ov62_02239DBC * param0)
}
}
static void ov62_0223A154 (SaveData * param0, const PSSBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3)
static void ov62_0223A154 (SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3)
{
memset(param3, 0, sizeof(UnkStruct_ov62_02239DA4));
ov61_0222AE88(param0, param1, param2, param3, 102);
@ -465,7 +465,7 @@ static BOOL ov62_0223A17C (UnkStruct_0208C06C * param0)
sub_02019EBC(param0->unk_14.unk_10, 6);
sub_02019EBC(param0->unk_14.unk_10, 7);
v0->unk_00 = SaveData_PSSBoxes(param0->unk_830);
v0->unk_00 = SaveData_PCBoxes(param0->unk_830);
ov62_0223A154(param0->unk_830, v0->unk_00, v0->unk_1A0, &v0->unk_04);
ov62_0223A138(v0);
ov62_022315C8(&v0->unk_1A4, &v0->unk_1A8, 0);
@ -1237,7 +1237,7 @@ static void ov62_0223B158 (UnkStruct_0208C06C * param0)
UnkStruct_ov62_02239DBC * v0 = param0->unk_860;
{
PSSBoxes * v1 = SaveData_PSSBoxes(param0->unk_830);
PCBoxes * v1 = SaveData_PCBoxes(param0->unk_830);
if ((v0->unk_04.unk_176 >= 16) && (v0->unk_04.unk_176 < (16 + 8))) {
v0->unk_04.unk_176 = 0;
@ -1269,7 +1269,7 @@ static void ov62_0223B230 (UnkStruct_0208C06C * param0)
UnkStruct_ov62_02239DBC * v0 = param0->unk_860;
{
PSSBoxes * v1 = SaveData_PSSBoxes(param0->unk_830);
PCBoxes * v1 = SaveData_PCBoxes(param0->unk_830);
if ((v0->unk_04.unk_176 >= 16) && (v0->unk_04.unk_176 < (16 + 8))) {
v0->unk_04.unk_176 = 0;

12
src/overlay094/ov94_0223FB48.c
View File

@ -95,8 +95,8 @@ static void ov94_02240EAC(BoxPokemon * param0, UnkStruct_02022550 * param1, UnkS
void * ov94_02240DD0(NARC * param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3);
static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_0223BA88_sub3 * param1);
static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_02022550 ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3);
static int ov94_0224121C(Party * param0, PSSBoxes * param1, int param2, int param3);
static int ov94_022412F4(Party * param0, PSSBoxes * param1, int param2, int param3);
static int ov94_0224121C(Party * param0, PCBoxes * param1, int param2, int param3);
static int ov94_022412F4(Party * param0, PCBoxes * param1, int param2, int param3);
static int ov94_02240BB0(UnkStruct_ov94_0223FD4C * param0);
static int ov94_0224123C(BoxPokemon * param0);
static int ov94_02241278(BoxPokemon * param0);
@ -1139,7 +1139,7 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1)
u16 v0[30], v1, v2;
Pokemon * v3;
BoxPokemon * v4;
PSSBoxes * v5 = param0->unk_00->unk_0C;
PCBoxes * v5 = param0->unk_00->unk_0C;
NARC * v6;
UnkStruct_ov94_02240FA0 * v7;
@ -1213,7 +1213,7 @@ int ov94_022411D0 (int param0)
}
}
BoxPokemon * ov94_022411DC (Party * param0, PSSBoxes * param1, int param2, int param3)
BoxPokemon * ov94_022411DC (Party * param0, PCBoxes * param1, int param2, int param3)
{
if (ov94_022411D0(param2)) {
if (param3 > (Party_GetCurrentCount(param0) - 1)) {
@ -1226,7 +1226,7 @@ BoxPokemon * ov94_022411DC (Party * param0, PSSBoxes * param1, int param2, int p
return sub_02079C9C(param1, param2, param3);
}
static int ov94_0224121C (Party * param0, PSSBoxes * param1, int param2, int param3)
static int ov94_0224121C (Party * param0, PCBoxes * param1, int param2, int param3)
{
if (ov94_022411D0(param2)) {
if (Party_GetCurrentCount(param0) < 2) {
@ -1316,7 +1316,7 @@ static int ov94_022412C8 (BoxPokemon * param0)
return 0;
}
static int ov94_022412F4 (Party * param0, PSSBoxes * param1, int param2, int param3)
static int ov94_022412F4 (Party * param0, PCBoxes * param1, int param2, int param3)
{
BoxPokemon * v0 = ov94_022411DC(param0, param1, param2, param3);

6
src/savedata/save_table.c
View File

@ -83,7 +83,7 @@ const SaveTableEntry gSaveTable[] = {
{ SAVE_TABLE_ENTRY_SENTENCE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Sentence_SaveSize, (SaveEntryInitFunc)Sentence_Init },
{ SAVE_TABLE_ENTRY_EMAIL, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Email_SaveSize, (SaveEntryInitFunc)Email_Init },
{ SAVE_TABLE_ENTRY_WIFI_QUESTIONS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)WiFiQuestion_SaveSize, (SaveEntryInitFunc)WiFiQuestion_Init },
{ SAVE_TABLE_ENTRY_PSS_BOXES, SAVE_BLOCK_ID_BOXES, (SaveEntrySizeFunc)PSSBoxes_SaveSize, (SaveEntryInitFunc)PSSBoxes_Init },
{ SAVE_TABLE_ENTRY_PC_BOXES, SAVE_BLOCK_ID_BOXES, (SaveEntrySizeFunc)PCBoxes_SaveSize, (SaveEntryInitFunc)PCBoxes_Init },
};
const int gSaveTableSize = NELEMS(gSaveTable);
@ -94,9 +94,9 @@ TVBroadcast* SaveData_TVBroadcast(SaveData *save)
return SaveData_Get(save, SAVE_TABLE_ENTRY_TV_BROADCAST);
}
PSSBoxes* SaveData_PSSBoxes(SaveData *save)
PCBoxes* SaveData_PCBoxes(SaveData *save)
{
return SaveData_Get(save, SAVE_TABLE_ENTRY_PSS_BOXES);
return SaveData_Get(save, SAVE_TABLE_ENTRY_PC_BOXES);
}
MysteryGift* SaveData_MysteryGift(SaveData *save)

2
src/unk_0200B358.c
View File

@ -616,7 +616,7 @@ void sub_0200BCF0 (UnkStruct_0200B358 * param0, u32 param1, u8 param2)
MessageLoader_Free(v0);
}
void sub_0200BD40 (UnkStruct_0200B358 * param0, u32 param1, const PSSBoxes * param2, u32 param3)
void sub_0200BD40 (UnkStruct_0200B358 * param0, u32 param1, const PCBoxes * param2, u32 param3)
{
sub_02079AF4(param2, param3, param0->unk_0C);
sub_0200B448(param0, param1, param0->unk_0C, NULL);

16
src/unk_0202440C.c
View File

@ -93,7 +93,7 @@ const SaveTableEntry gSaveTable[] = {
{ SAVE_TABLE_ENTRY_SENTENCE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Sentence_SaveSize, (SaveEntryInitFunc)Sentence_Init },
{ SAVE_TABLE_ENTRY_EMAIL, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Email_SaveSize, (SaveEntryInitFunc)Email_Init },
{ SAVE_TABLE_ENTRY_WIFI_QUESTIONS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)WiFiQuestion_SaveSize, (SaveEntryInitFunc)WiFiQuestion_Init },
{ SAVE_TABLE_ENTRY_PSS_BOXES, SAVE_BLOCK_ID_BOXES, (SaveEntrySizeFunc)PSSBoxes_SaveSize, (SaveEntryInitFunc)PSSBoxes_Init },
{ SAVE_TABLE_ENTRY_PC_BOXES, SAVE_BLOCK_ID_BOXES, (SaveEntrySizeFunc)PCBoxes_SaveSize, (SaveEntryInitFunc)PCBoxes_Init },
};
const int gSaveTableSize = NELEMS(gSaveTable);
@ -104,7 +104,7 @@ TVBroadcast * SaveData_TVBroadcast (SaveData * param0)
return SaveData_Get(param0, 27);
}
PSSBoxes * SaveData_PSSBoxes (SaveData * param0)
PCBoxes * SaveData_PCBoxes (SaveData * param0)
{
return SaveData_Get(param0, 37);
}
@ -121,12 +121,12 @@ PalParkTransfer * SaveData_PalParkTransfer (SaveData * param0)
}
const SaveTableEntry gExtraSaveTable[] = {
{EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, SAVE_PAGE_MAX, (SaveEntrySizeFunc)HallOfFame_SaveSize, (SaveEntryInitFunc)HallOfFame_Init},
{EXTRA_SAVE_TABLE_ENTRY_FRONTIER, SAVE_PAGE_MAX + 3, (SaveEntrySizeFunc)Frontier_Extra_SaveSize, (SaveEntryInitFunc)Frontier_Extra_Init},
{EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS, SAVE_PAGE_MAX + 4, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init},
{EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_0, SAVE_PAGE_MAX + 6, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init},
{EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_1, SAVE_PAGE_MAX + 8, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init},
{EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_2, SAVE_PAGE_MAX + 10, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init},
{ EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, SAVE_PAGE_MAX, (SaveEntrySizeFunc)HallOfFame_SaveSize, (SaveEntryInitFunc)HallOfFame_Init },
{ EXTRA_SAVE_TABLE_ENTRY_FRONTIER, SAVE_PAGE_MAX + 3, (SaveEntrySizeFunc)Frontier_Extra_SaveSize, (SaveEntryInitFunc)Frontier_Extra_Init },
{ EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS, SAVE_PAGE_MAX + 4, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init },
{ EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_0, SAVE_PAGE_MAX + 6, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init },
{ EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_1, SAVE_PAGE_MAX + 8, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init },
{ EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_2, SAVE_PAGE_MAX + 10, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init },
};
const int gExtraSaveTableSize = NELEMS(gExtraSaveTable);

2
src/unk_0203D1B8.c
View File

@ -1397,7 +1397,7 @@ void sub_0203E0FC (UnkStruct_0203CDB0 * param0, int param1)
v0->unk_00 = sub_0202DA40(param0->unk_0C);
v0->unk_04 = sub_02025CCC(param0->unk_0C);
v0->unk_08 = SaveData_Get(param0->unk_0C, 2);
v0->unk_0C = SaveData_PSSBoxes(param0->unk_0C);
v0->unk_0C = SaveData_PCBoxes(param0->unk_0C);
v0->unk_10 = sub_02027560(param0->unk_0C);
v0->unk_14 = sub_0202B370(param0->unk_0C);
v0->unk_18 = sub_0202C878(param0->unk_0C);

8
src/unk_0203F6C4.c
View File

@ -6823,7 +6823,7 @@ static BOOL sub_02045068 (UnkStruct_0203E724 * param0)
UnkStruct_0203CDB0 * v0 = param0->unk_34;
TrainerInfo * v1 = sub_02025E38(sub_0203D174(param0->unk_34));
u16 * v2 = inline_0204FCAC(param0);
PSSBoxes * v3 = SaveData_PSSBoxes(v0->unk_0C);
PCBoxes * v3 = SaveData_PCBoxes(v0->unk_0C);
u16 v4 = inline_02049538(param0);
u16 v5 = inline_02049538(param0);
u16 v6 = inline_02049538(param0);
@ -6923,7 +6923,7 @@ static BOOL sub_0204521C (UnkStruct_0203E724 * param0)
u16 * v0 = inline_0204FCAC(param0);
u16 v1;
v1 = sub_02079A50(SaveData_PSSBoxes(param0->unk_34->unk_0C));
v1 = sub_02079A50(SaveData_PCBoxes(param0->unk_34->unk_0C));
*v0 = 18 * (5 * 6) - v1;
return 0;
@ -8319,10 +8319,10 @@ static u32 sub_0204676C (SaveData * param0)
}
{
PSSBoxes * v8;
PCBoxes * v8;
u32 v9;
v8 = SaveData_PSSBoxes(param0);
v8 = SaveData_PCBoxes(param0);
for (v9 = 0; v9 < 18; v9++) {
for (v0 = 0; v0 < (5 * 6); v0++) {

2
src/unk_020474B8.c
View File

@ -218,7 +218,7 @@ BOOL sub_02047818 (UnkStruct_0203E724 * param0)
{
BoxPokemon * v0;
UnkStruct_0203CDB0 * v1 = param0->unk_34;
PSSBoxes * v2 = SaveData_PSSBoxes(v1->unk_0C);
PCBoxes * v2 = SaveData_PCBoxes(v1->unk_0C);
UnkStruct_0200B358 ** v3 = sub_0203F098(v1, 15);
u8 v4 = (*((param0)->unk_08++));
u16 v5 = inline_02049538(param0);

2
src/unk_020480A8.c
View File

@ -38,7 +38,7 @@ BOOL sub_020480D8 (UnkStruct_0203E724 * param0)
UnkStruct_0203CDB0 * v0 = param0->unk_34;
Pokemon * v1;
BoxPokemon * v2;
PSSBoxes * v3 = SaveData_PSSBoxes(v0->unk_0C);
PCBoxes * v3 = SaveData_PCBoxes(v0->unk_0C);
u16 * v4 = inline_0204FCAC(param0);
u16 * v5 = inline_0204FCAC(param0);
u16 * v6 = inline_0204FCAC(param0);

2
src/unk_0204C500.c
View File

@ -63,7 +63,7 @@ BOOL sub_0204C554 (UnkStruct_0203E724 * param0)
BOOL sub_0204C59C (UnkStruct_0203E724 * param0)
{
PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->unk_34->unk_0C);
PSSBoxes * v1 = SaveData_PSSBoxes(param0->unk_34->unk_0C);
PCBoxes * v1 = SaveData_PCBoxes(param0->unk_34->unk_0C);
Pokemon * v2 = Pokemon_New(32);
TrainerInfo * v3 = sub_02025E38(param0->unk_34->unk_0C);
UnkStruct_02026324 * v4 = sub_02027560(param0->unk_34->unk_0C);

2
src/unk_0204CFFC.c
View File

@ -463,7 +463,7 @@ BOOL sub_0204D94C (UnkStruct_0203E724 * param0)
Pokemon * v3;
UnkStruct_0203CDB0 * v4 = param0->unk_34;
u16 * v5 = inline_0204FCAC(param0);
PSSBoxes * v6 = SaveData_PSSBoxes(v4->unk_0C);
PCBoxes * v6 = SaveData_PCBoxes(v4->unk_0C);
v0 = Party_GetCurrentCount(Party_GetFromSavedata(v4->unk_0C));

2
src/unk_02050A74.c
View File

@ -515,7 +515,7 @@ static BOOL sub_02051074 (UnkStruct_020508D4 * param0)
sub_0203E8E0(param0, 8809, NULL, NULL);
}
} else {
PSSBoxes * v7 = SaveData_PSSBoxes(v0->unk_0C);
PCBoxes * v7 = SaveData_PCBoxes(v0->unk_0C);
Party * v8 = Party_GetFromSavedata(v0->unk_0C);
if ((sub_020799A0(v7) == 18) && (Party_GetCurrentCount(v8) == 6)) {

8
src/unk_02051D8C.c
View File

@ -186,7 +186,7 @@ BattleParams * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * param1)
Party_AddPokemon(v4->parties[1], v5);
Heap_FreeToHeap(v5);
v4->unk_EC = SaveData_PSSBoxes(param1->unk_0C);
v4->unk_EC = SaveData_PCBoxes(param1->unk_0C);
v4->unk_E4 = param1->unk_98;
v4->unk_190 = NULL;
v4->unk_11C = sub_0202CD88(param1->unk_0C);
@ -280,7 +280,7 @@ void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, Sav
sub_02027A10(v5, param0->unk_108);
sub_020521A4(param0, v4, 0);
param0->unk_EC = SaveData_PSSBoxes(param2);
param0->unk_EC = SaveData_PCBoxes(param2);
param0->unk_130 = sub_0203A138(param3);
param0->unk_13C = MapHeader_GetMapEvolutionMethod(param3);
param0->unk_140 = sub_0208C324(param2);
@ -341,7 +341,7 @@ void sub_02052348 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, int
sub_02027A10(v7, param0->unk_108);
sub_020521A4(param0, v6, 0);
param0->unk_EC = SaveData_PSSBoxes(param1->unk_0C);
param0->unk_EC = SaveData_PCBoxes(param1->unk_0C);
param0->unk_138 = sub_02055BA8(param1);
param0->unk_E4 = param1->unk_98;
param0->unk_190 = param1->unk_BC;
@ -411,7 +411,7 @@ void sub_020524E4 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, con
sub_02027A10(v4, param0->unk_108);
sub_020521A4(param0, v3, 0);
param0->unk_EC = SaveData_PSSBoxes(param1->unk_0C);
param0->unk_EC = SaveData_PCBoxes(param1->unk_0C);
param0->unk_138 = sub_02055BA8(param1);
param0->unk_E4 = param1->unk_98;
param0->unk_190 = param1->unk_BC;

58
src/unk_020797C8.c
View File

@ -7,28 +7,28 @@
#include "pokemon.h"
#include "unk_020797C8.h"
typedef struct PSSBoxes {
typedef struct PCBoxes {
u32 unk_00;
BoxPokemon unk_04[18][30];
u16 unk_10E4[18][20];
u8 unk_13B4[18];
u8 unk_13C6;
} PSSBoxes;
} PCBoxes;
static void sub_020797DC(PSSBoxes * param0);
static void sub_020797DC(PCBoxes * param0);
void PSSBoxes_Init (PSSBoxes * param0)
void PCBoxes_Init (PCBoxes * param0)
{
sub_020797DC(param0);
sub_02024804();
}
u32 PSSBoxes_SaveSize (void)
u32 PCBoxes_SaveSize (void)
{
return sizeof(PSSBoxes);
return sizeof(PCBoxes);
}
static void sub_020797DC (PSSBoxes * param0)
static void sub_020797DC (PCBoxes * param0)
{
u32 v0, v1;
MessageLoader * v2;
@ -61,7 +61,7 @@ static void sub_020797DC (PSSBoxes * param0)
param0->unk_00 = 0;
}
BOOL sub_02079868 (PSSBoxes * param0, BoxPokemon * param1)
BOOL sub_02079868 (PCBoxes * param0, BoxPokemon * param1)
{
u32 v0;
@ -83,7 +83,7 @@ BOOL sub_02079868 (PSSBoxes * param0, BoxPokemon * param1)
return 0;
}
BOOL sub_020798A0 (PSSBoxes * param0, u32 param1, BoxPokemon * param2)
BOOL sub_020798A0 (PCBoxes * param0, u32 param1, BoxPokemon * param2)
{
u32 v0;
@ -105,7 +105,7 @@ BOOL sub_020798A0 (PSSBoxes * param0, u32 param1, BoxPokemon * param2)
return 0;
}
BOOL sub_02079914 (PSSBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3)
BOOL sub_02079914 (PCBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3)
{
sub_0207896C(param3);
BoxPokemon_SetShayminForm(param3, 0);
@ -125,7 +125,7 @@ BOOL sub_02079914 (PSSBoxes * param0, u32 param1, u32 param2, BoxPokemon * param
return 0;
}
void sub_02079968 (PSSBoxes * param0, u32 param1, u32 param2)
void sub_02079968 (PCBoxes * param0, u32 param1, u32 param2)
{
if (param1 == 0xffffffff) {
param1 = param0->unk_00;
@ -139,12 +139,12 @@ void sub_02079968 (PSSBoxes * param0, u32 param1, u32 param2)
}
}
u32 sub_0207999C (const PSSBoxes * param0)
u32 sub_0207999C (const PCBoxes * param0)
{
return param0->unk_00;
}
u32 sub_020799A0 (const PSSBoxes * param0)
u32 sub_020799A0 (const PCBoxes * param0)
{
int v0, v1;
@ -169,7 +169,7 @@ u32 sub_020799A0 (const PSSBoxes * param0)
return(18);
}
BOOL sub_020799F0 (const PSSBoxes * param0, int * param1, int * param2)
BOOL sub_020799F0 (const PCBoxes * param0, int * param1, int * param2)
{
int v0, v1;
@ -203,7 +203,7 @@ BOOL sub_020799F0 (const PSSBoxes * param0, int * param1, int * param2)
return(18);
}
u32 sub_02079A50 (const PSSBoxes * param0)
u32 sub_02079A50 (const PCBoxes * param0)
{
int v0, v1;
u32 v2;
@ -221,7 +221,7 @@ u32 sub_02079A50 (const PSSBoxes * param0)
return v2;
}
void sub_02079A94 (PSSBoxes * param0, u32 param1)
void sub_02079A94 (PCBoxes * param0, u32 param1)
{
if (param1 < 18) {
param0->unk_00 = param1;
@ -231,7 +231,7 @@ void sub_02079A94 (PSSBoxes * param0, u32 param1)
}
}
u32 sub_02079AA8 (const PSSBoxes * param0, u32 param1)
u32 sub_02079AA8 (const PCBoxes * param0, u32 param1)
{
if (param1 < 18) {
return param0->unk_13B4[param1];
@ -241,7 +241,7 @@ u32 sub_02079AA8 (const PSSBoxes * param0, u32 param1)
}
}
void sub_02079AC4 (PSSBoxes * param0, u32 param1, u32 param2)
void sub_02079AC4 (PCBoxes * param0, u32 param1, u32 param2)
{
if (param1 == 0xffffffff) {
param1 = param0->unk_00;
@ -259,7 +259,7 @@ void sub_02079AC4 (PSSBoxes * param0, u32 param1, u32 param2)
}
}
void sub_02079AF4 (const PSSBoxes * param0, u32 param1, Strbuf *param2)
void sub_02079AF4 (const PCBoxes * param0, u32 param1, Strbuf *param2)
{
if (param1 == 0xffffffff) {
param1 = param0->unk_00;
@ -272,7 +272,7 @@ void sub_02079AF4 (const PSSBoxes * param0, u32 param1, Strbuf *param2)
}
}
void sub_02079B24 (PSSBoxes * param0, u32 param1, const Strbuf *param2)
void sub_02079B24 (PCBoxes * param0, u32 param1, const Strbuf *param2)
{
if (param1 == 0xffffffff) {
param1 = param0->unk_00;
@ -284,7 +284,7 @@ void sub_02079B24 (PSSBoxes * param0, u32 param1, const Strbuf *param2)
}
}
u32 sub_02079B54 (const PSSBoxes * param0, u32 param1)
u32 sub_02079B54 (const PCBoxes * param0, u32 param1)
{
if (param1 == 0xffffffff) {
param1 = param0->unk_00;
@ -308,7 +308,7 @@ u32 sub_02079B54 (const PSSBoxes * param0, u32 param1)
return 0;
}
u32 sub_02079B98 (const PSSBoxes * param0, u32 param1)
u32 sub_02079B98 (const PCBoxes * param0, u32 param1)
{
if (param1 == 0xffffffff) {
param1 = param0->unk_00;
@ -334,7 +334,7 @@ u32 sub_02079B98 (const PSSBoxes * param0, u32 param1)
return 0;
}
u32 sub_02079BEC (const PSSBoxes * param0)
u32 sub_02079BEC (const PCBoxes * param0)
{
u32 v0, v1;
@ -345,7 +345,7 @@ u32 sub_02079BEC (const PSSBoxes * param0)
return v0;
}
u32 sub_02079C08 (const PSSBoxes * param0, u32 param1, u32 param2, int param3, void * param4)
u32 sub_02079C08 (const PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4)
{
GF_ASSERT((param1 < 18) || (param1 == 0xffffffff));
GF_ASSERT(param2 < (5 * 6));
@ -357,7 +357,7 @@ u32 sub_02079C08 (const PSSBoxes * param0, u32 param1, u32 param2, int param3, v
return BoxPokemon_GetValue((BoxPokemon *)(&param0->unk_04[param1][param2]), param3, param4);
}
void sub_02079C50 (PSSBoxes * param0, u32 param1, u32 param2, int param3, void * param4)
void sub_02079C50 (PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4)
{
GF_ASSERT((param1 < 18) || (param1 == 0xffffffff));
GF_ASSERT(param2 < (5 * 6));
@ -370,7 +370,7 @@ void sub_02079C50 (PSSBoxes * param0, u32 param1, u32 param2, int param3, void *
sub_02024804();
}
BoxPokemon * sub_02079C9C (const PSSBoxes * param0, u32 param1, u32 param2)
BoxPokemon * sub_02079C9C (const PCBoxes * param0, u32 param1, u32 param2)
{
GF_ASSERT(((param1 < 18) || (param1 == 0xffffffff)));
GF_ASSERT((param2 < (5 * 6)));
@ -382,7 +382,7 @@ BoxPokemon * sub_02079C9C (const PSSBoxes * param0, u32 param1, u32 param2)
return (BoxPokemon *)&(param0->unk_04[param1][param2]);
}
void sub_02079CD8 (PSSBoxes * param0, u32 param1)
void sub_02079CD8 (PCBoxes * param0, u32 param1)
{
GF_ASSERT(param1 < 8);
@ -390,14 +390,14 @@ void sub_02079CD8 (PSSBoxes * param0, u32 param1)
sub_02024804();
}
BOOL sub_02079CFC (const PSSBoxes * param0, u32 param1)
BOOL sub_02079CFC (const PCBoxes * param0, u32 param1)
{
GF_ASSERT(param1 < 8);
return (param0->unk_13C6 & (1 << param1)) != 0;
}
u32 sub_02079D20 (const PSSBoxes * param0)
u32 sub_02079D20 (const PCBoxes * param0)
{
u32 v0, v1;