Merge pull request #123 from AsparagusEduardo/pret/doc/boxMon

BoxPokemon struct cleanup

include/daycare.h

@@ -12,7 +12,7 @@ typedef struct DAYCAREMAIL {
 } DAYCAREMAIL;
 
 typedef struct DAYCAREMON {
-    BOXMON mon;
+    BoxPokemon mon;
     DAYCAREMAIL mail;
     u32 steps;
 } DAYCAREMON;
@@ -27,7 +27,7 @@ typedef struct DAYCARE {
 u32 Sav2_Daycare_sizeof(void);
 void Sav2_Daycare_init(DAYCARE* daycare);
 DAYCAREMON* Sav2_DayCare_GetMonX(DAYCARE* daycare, int i);
-BOXMON* DayCareMon_GetBoxMon(DAYCAREMON* dcmon);
+BoxPokemon *DayCareMon_GetBoxMon(DAYCAREMON* dcmon);
 DAYCAREMAIL* DayCareMon_GetExtras(DAYCAREMON* dcmon);
 int DayCareMon_GetSteps(DAYCAREMON* dcmon);
 MAIL* DayCareMail_GetMailPtr(DAYCAREMAIL* dcmail);

include/message_format.h

@@ -39,10 +39,10 @@ void MessageFormat_InitFields(MessageFormatFields *fields);
 void SetStringAsPlaceholder(MessageFormat *messageFormat, u32 fieldno, const STRING *string, const MessageFormatAttrs *attrs);
 void BufferRivalsName(MessageFormat *messageFormat, u32 fieldno, SAVEDATA *saveData);
 void BufferFriendsName(MessageFormat *messageFormat, u32 fieldno, SAVEDATA *saveData);
-void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon);
-void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon);
-void BufferBoxMonNickname(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon);
-void BufferBoxMonOTName(MessageFormat *messageFormat, u32 fieldno, BOXMON *boxmon);
+void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 fieldno, BoxPokemon *boxmon);
+void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 fieldno, BoxPokemon *boxmon);
+void BufferBoxMonNickname(MessageFormat *messageFormat, u32 fieldno, BoxPokemon *boxmon);
+void BufferBoxMonOTName(MessageFormat *messageFormat, u32 fieldno, BoxPokemon *boxmon);
 void BufferMoveName(MessageFormat *messageFormat, u32 fieldno, u32 moveId);
 void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 fieldno, u32 decoId);
 void BufferAbilityName(MessageFormat *messageFormat, u32 fieldno, u32 abilityId);

include/pokemon.h

@@ -29,27 +29,27 @@
 extern const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS];
 
 void ZeroMonData(Pokemon *mon);
-void ZeroBoxMonData(BOXMON * boxmon);
+void ZeroBoxMonData(BoxPokemon *boxMon);
 u32 SizeOfStructPokemon(void);
 Pokemon *AllocMonZeroed(HeapID heap_id);
 BOOL AcquireMonLock(Pokemon *mon);
 BOOL ReleaseMonLock(Pokemon *mon, BOOL decrypt_result);
-BOOL AcquireBoxMonLock(BOXMON * mon);
-BOOL ReleaseBoxMonLock(BOXMON * mon, BOOL decrypt_result);
+BOOL AcquireBoxMonLock(BoxPokemon *boxMon);
+BOOL ReleaseBoxMonLock(BoxPokemon *boxMon, BOOL decrypt_result);
 void CreateMon(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId);
-void CreateBoxMon(BOXMON * boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId);
+void CreateBoxMon(BoxPokemon *boxMon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId);
 void CreateMonWithNature(Pokemon *mon, u16 species, u8 level, u8 fixedIv, u8 nature);
 void CreateMonWithGenderNatureLetter(Pokemon *mon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter);
 u32 GenPersonalityByGenderAndNature(u16 species, u8 gender, u8 nature);
 void CreateMonWithFixedIVs(Pokemon *mon, int species, int level, int ivs, int personality);
 void CalcMonLevelAndStats(Pokemon *mon);
 void CalcMonStats(Pokemon *mon);
 u32 GetMonData(Pokemon *mon, int attr, void * ptr);
-u32 GetBoxMonData(BOXMON * boxmon, int attr, void * ptr);
+u32 GetBoxMonData(BoxPokemon *boxMon, int attr, void * ptr);
 void SetMonData(Pokemon *mon, int attr, void * ptr);
-void SetBoxMonData(BOXMON * boxmon, int attr, void * ptr);
+void SetBoxMonData(BoxPokemon *boxMon, int attr, void * ptr);
 void AddMonData(Pokemon *mon, int attr, int amount);
-//void AddBoxMonData(BOXMON * boxmon, int attr, int amount);
+//void AddBoxMonData(BoxPokemon *boxMon, int attr, int amount);
 BASE_STATS * AllocAndLoadMonPersonal_HandleAlternateForme(int species, int form, HeapID heap_id);
 BASE_STATS * AllocAndLoadMonPersonal(int species, HeapID heap_id);
 int GetPersonalAttr(const BASE_STATS *baseStats, BaseStat attr);
@@ -58,100 +58,100 @@ int GetMonBaseStat_HandleAlternateForme(int species, int form, BaseStat stat_id)
 int GetMonBaseStat(int species, BaseStat stat_id);
 u8 GetPercentProgressTowardsNextLevel(Pokemon *mon);
 u32 CalcMonExpToNextLevel(Pokemon *mon);
-u32 CalcBoxMonExpToNextLevel(BOXMON * pokemon);
+u32 CalcBoxMonExpToNextLevel(BoxPokemon *boxMon);
 u32 GetMonBaseExperienceAtCurrentLevel(Pokemon *mon);
 u32 GetMonExpBySpeciesAndLevel(int species, int level);
 void LoadGrowthTable(int growthRate, u32 * table);
 u32 GetExpByGrowthRateAndLevel(int rate, int level);
 int CalcMonLevel(Pokemon *mon);
-int CalcBoxMonLevel(BOXMON * boxmon);
+int CalcBoxMonLevel(BoxPokemon *boxMon);
 int CalcLevelBySpeciesAndExp(u16 species, u32 experience);
 int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 species, u32 experience);
-u8 GetBoxMonNature(BOXMON * boxmon);
+u8 GetBoxMonNature(BoxPokemon *boxMon);
 u8 GetMonNature(Pokemon *mon);
 u8 GetNatureFromPersonality(u32 pid);
 void MonApplyFriendshipMod(Pokemon *mon, u8 kind, u16 location);
 u8 GetMonGender(Pokemon *mon);
-u8 GetBoxMonGender(BOXMON * boxmon);
+u8 GetBoxMonGender(BoxPokemon *boxMon);
 u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid);
 u8 MonIsShiny(Pokemon *mon);
-u8 BoxMonIsShiny(BOXMON * boxmon);
+u8 BoxMonIsShiny(BoxPokemon *boxMon);
 u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid);
 u32 GenerateShinyPersonality(u32 otid);
 u32 GetArceusTypeByHeldItemEffect(u16 plate);
-u8 GetBoxMonUnownLetter(BOXMON * boxmon);
+u8 GetBoxMonUnownLetter(BoxPokemon *boxMon);
 u8 GetMonUnownLetter(Pokemon *mon);
 u32 TryAppendMonMove(Pokemon *mon, u16 move);
-u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move);
-void BoxMonSetMoveInSlot(BOXMON *boxmon, u16 move, u8 slot);
+u32 TryAppendBoxMonMove(BoxPokemon *boxMon, u16 move);
+void BoxMonSetMoveInSlot(BoxPokemon *boxMon, u16 move, u8 slot);
 void DeleteMonFirstMoveAndAppend(Pokemon *mon, u16 move);
-void DeleteBoxMonFirstMoveAndAppend(BOXMON *boxmon, u16 move);
+void DeleteBoxMonFirstMoveAndAppend(BoxPokemon *boxMon, u16 move);
 void LoadWotbl_HandleAlternateForme(int species, int forme, u16 *wotbl);
 void MonSwapMoves(Pokemon *mon, int a, int b);
-void BoxMonSwapMoves(BOXMON *boxmon, int a, int b);
-BOXMON *Mon_GetBoxMon(Pokemon *mon);
+void BoxMonSwapMoves(BoxPokemon *boxMon, int a, int b);
+BoxPokemon *Mon_GetBoxMon(Pokemon *mon);
 
 u16 GetMonEvolution(PARTY * party, Pokemon *mon, u8 context, u16 usedItem, int *method_ret);
 u16 ReadFromPersonalPmsNarc(u16 species);
 u16 GetEggSpecies(u16 species);
 void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot);
-void CopyBoxPokemonToPokemon(const BOXMON * src, Pokemon *dest);
+void CopyBoxPokemonToPokemon(const BoxPokemon *src, Pokemon *dest);
 u8 Party_GetMaxLevel(PARTY * party);
 u16 SpeciesToSinnohDexNo(u16 species);
 u16 SinnohDexNoToSpecies(u16 sinnoh_dex);
 void CopyPokemonToPokemon(const Pokemon *src, Pokemon *dest);
-void CopyBoxPokemonToBoxPokemon(const BOXMON * src, BOXMON * dest);
-void CopyPokemonToBoxPokemon(const Pokemon *src, BOXMON * dest);
+void CopyBoxPokemonToBoxPokemon(const BoxPokemon *src, BoxPokemon *dest);
+void CopyPokemonToBoxPokemon(const Pokemon *src, BoxPokemon *dest);
 s8 MonGetFlavorPreference(Pokemon *mon, int flavor);
-s8 BoxMonGetFlavorPreference(BOXMON * boxmon, int flavor);
+s8 BoxMonGetFlavorPreference(BoxPokemon *boxMon, int flavor);
 s8 GetFlavorPreferenceFromPID(u32 personality, int flavor);
 int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest);
 void Party_GivePokerusAtRandom(PARTY * party);
 u8 Party_MaskMonsWithPokerus(PARTY * party, u8 mask);
 void Party_UpdatePokerus(PARTY * party, int r5);
 void Party_SpreadPokerus(PARTY * party);
 BOOL Pokemon_HasPokerus(Pokemon *mon);
-BOOL BoxMon_HasPokerus(BOXMON * boxmon);
+BOOL BoxMon_HasPokerus(BoxPokemon *boxMon);
 BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon);
-BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon);
+BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxMon);
 void Pokemon_UpdateArceusForme(Pokemon *mon);
-void BoxMon_UpdateArceusForme(BOXMON * boxmon);
+void BoxMon_UpdateArceusForme(BoxPokemon *boxMon);
 s32 Mon_UpdateGiratinaForme(Pokemon *mon);
-s32 BoxMon_UpdateGiratinaForme(BOXMON * boxmon);
+s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxMon);
 void Mon_UpdateShayminForme(Pokemon *mon, int forme);
-void BoxMon_UpdateShayminForme(BOXMON *pokemon, int forme);
+void BoxMon_UpdateShayminForme(BoxPokemon *boxMon, int forme);
 void UpdateMonAbility(Pokemon *mon);
-void UpdateBoxMonAbility(BOXMON *boxmon);
+void UpdateBoxMonAbility(BoxPokemon *boxMon);
 int LowestFlagNo(u32 mask);
 BOOL IsPokemonLegendaryOrMythical(u16 species, u16 forme);
 u16 GetLegendaryMon(u32 idx);
 void Pokemon_RemoveCapsule(Pokemon *mon);
-void RestoreBoxMonPP(BOXMON * boxmon);
+void RestoreBoxMonPP(BoxPokemon *boxMon);
 BOOL SetTrMonCapsule(int a0, Pokemon *mon, HeapID heap_id);
 
 int GetMonBaseStatEx_HandleAlternateForme(NARC *narc, int species, int forme, BaseStat attr);
 u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex);
 u8 GetGenderBySpeciesAndPersonality_PreloadedPersonal(const BASE_STATS *personal, u16 species, u32 pid);
-BOOL BoxMonIsHoldingMail(BOXMON *boxmon);
-void GetPokemonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BOXMON *boxmon, u8 whichFacing);
-void sub_02070130(struct SomeDrawPokemonStruct *a0, BOXMON *boxmon, u8 whichFacing);
-void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BOXMON *boxmon, u8 whichFacing, BOOL sp14);
+BOOL BoxMonIsHoldingMail(BoxPokemon *boxMon);
+void GetPokemonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxMon, u8 whichFacing);
+void sub_02070130(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxMon, u8 whichFacing);
+void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BoxPokemon *boxMon, u8 whichFacing, BOOL sp14);
 void GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct * spC, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 personality);
 u8 sub_02070438(u16 species, u8 forme);
 void sub_02070560(struct SomeDrawPokemonStruct * spC, u16 species, u8 whichFacing, u8 gender, u32 shiny);
 void DP_GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct * spC, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 personality);
-u8 sub_0207083C(BOXMON *boxmon, u8 whichFacing);
-u8 sub_02070848(BOXMON *boxmon, u8 whichFacing);
-u8 sub_02070854(BOXMON *boxmon, u8 whichFacing, BOOL a2);
+u8 sub_0207083C(BoxPokemon *boxMon, u8 whichFacing);
+u8 sub_02070848(BoxPokemon *boxMon, u8 whichFacing);
+u8 sub_02070854(BoxPokemon *boxMon, u8 whichFacing, BOOL a2);
 u8 sub_020708D8(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid);
 u8 sub_02070A64(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid);
 void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C *a3);
 void sub_02070D84(s32 trainer_class, s32 a1, struct UnkStruct_02070D3C *a2);
 u32 sub_02070D90(void);
 u32 sub_02070D94(void);
-BOXMON * Mon_GetBoxMon(Pokemon *mon);
+BoxPokemon *Mon_GetBoxMon(Pokemon *mon);
 BOOL Pokemon_TryLevelUp(Pokemon *mon);
-void InitBoxMonMoveset(BOXMON * boxmon);
+void InitBoxMonMoveset(BoxPokemon *boxMon);
 void MonSetMoveInSlot_ResetPpUp(Pokemon *mon, u16 move, u8 slot);
 u32 MonTryLearnMoveOnLevelUp(Pokemon *mon, int * last_i, u16 * sp0);
 void MonDeleteMoveSlot(Pokemon *mon, u32 slot);
@@ -167,12 +167,12 @@ void sub_02071FDC(SOUND_CHATOT *r6, u32 r5, u16 r4, s32 unused, s32 sp18, u32 sp
 void sub_0207204C(SOUND_CHATOT *r7, u32 r6, u16 r5, s32 r4, s32 sp20, u32 sp24, u32 sp28, u32 sp2C, u8 sp30);
 void sub_020720D4(Pokemon *mon);
 void sub_020720FC(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id);
-void sub_0207213C(BOXMON * boxmon, PLAYERPROFILE *playerProfile, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id);
+void sub_0207213C(BoxPokemon *boxMon, PLAYERPROFILE *playerProfile, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id);
 void sub_0207217C(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id);
-void sub_02072190(BOXMON *boxmon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id);
+void sub_02072190(BoxPokemon *boxMon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id);
 void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2);
 BOOL GetMonTMHMCompat(Pokemon *mon, u8 tmhm);
-BOOL GetBoxMonTMHMCompat(BOXMON *boxmon, u8 tmhm);
+BOOL GetBoxMonTMHMCompat(BoxPokemon *boxMon, u8 tmhm);
 BOOL GetTMHMCompatBySpeciesAndForme(u16 species, u32 forme, u8 tmhm);
 void SetMonPersonality(Pokemon *mon, u32 personality);
 u32 ChangePersonalityToNatureGenderAndAbility(u32 pid, u16 species, u8 nature, u8 gender, u8 ability, BOOL gen_mode);
@@ -186,7 +186,7 @@ int ResolveMonForme(int species, int forme);
 u32 MaskOfFlagNo(int flagno);
 BOOL SpeciesIsMythical(u16 species);
 BOOL MonCheckFrontierIneligibility(Pokemon *mon);
-BOOL BoxmonBelongsToPlayer(BOXMON * boxmon, PLAYERPROFILE * profile, HeapID heap_id);
+BOOL BoxmonBelongsToPlayer(BoxPokemon *boxMon, PLAYERPROFILE * profile, HeapID heap_id);
 int TrainerClassToBackpicID(int trainerClass, int a1);
 void sub_02072914(NARC *narc, struct UnkStruct_02072914_sub *dest, u16 a2, u16 a3);
 void sub_0207294C(NARC *narc, void *a1, void *a2, u16 a3, int a4, int a5, int a6);
@@ -198,9 +198,9 @@ void sub_02072A98(Pokemon *mon, struct UnkPokemonStruct_02072A98 *dest);
 void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *mon);
 u32 _u32_getDigitN(u32 num, u8 digit);
 s16 PokeathlonStatScoreToStars(s16 a0);
-void CalcBoxMonPokeathlonPerformance(BOXMON *boxmon, struct PokeathlonTodayPerformance *dest);
+void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxMon, struct PokeathlonTodayPerformance *dest);
 void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformance *dest);
-void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BOXMON *boxmon, const s8 *aprijuice, HeapID heap_id);
+void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BoxPokemon *boxMon, const s8 *aprijuice, HeapID heap_id);
 void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *mon, const s8 *aprijuice, HeapID heap_id);
 
 #endif //POKEDIAMOND_POKEMON_H

include/pokemon_icon_idx.h

@@ -3,13 +3,13 @@
 
 #include "pokemon_types_def.h"
 
-u32 Boxmon_GetIconNaix(BOXMON *boxmon);
+u32 Boxmon_GetIconNaix(BoxPokemon *boxMon);
 u32 Pokemon_GetIconNaix(Pokemon *mon);
 u32 GetMonIconNaixEx(u32 species, BOOL isEgg, u32 forme);
 u32 GetBattleMonIconNaixEx(u32 species, BOOL isEgg, u32 forme);
 const u8 GetMonIconPaletteEx(u32 species, u32 forme, u32 isEgg);
 const u8 GetBattleMonIconPaletteEx(u32 species, u32 forme, BOOL isEgg);
-const u8 Boxmon_GetIconPalette(BOXMON *boxmon);
+const u8 Boxmon_GetIconPalette(BoxPokemon *boxMon);
 const u8 Pokemon_GetIconPalette(Pokemon *mon);
 u32 sub_02074490(void);
 u32 sub_02074494(void);

include/pokemon_storage_system.h

@@ -9,7 +9,7 @@
 typedef struct PokemonStorageSystem PC_STORAGE;
 
 typedef struct PC_Box {
-    BOXMON mons[MONS_PER_BOX];
+    BoxPokemon mons[MONS_PER_BOX];
     u8 unk_FF0[16];
 } PC_BOX;
 
@@ -26,12 +26,12 @@ struct PokemonStorageSystem {
 #define BOX_ALL_MODIFIED_FLAG      ((u32)((1<<NUM_BOXES)-1))
 
 void PCStorage_GetBoxName(PC_STORAGE *pcStorage, u32 boxno, STRING *dest);
-BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BOXMON *boxmon);
+BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon *boxMon);
 void PCStorage_init(PC_STORAGE *storage);
 u32 PCStorage_sizeof(void);
 void PCStorage_InitializeBoxes(PC_STORAGE *storage);
-BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BOXMON* boxmon);
-BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BOXMON* boxmon);
+BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon *boxMon);
+BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon *boxMon);
 void PCStorage_SwapMonsInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 from, u32 to);
 void PCStorage_DeleteBoxMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno);
 int PCStorage_GetActiveBox(PC_STORAGE *storage);
@@ -48,7 +48,7 @@ int PCStorage_CountMonsAndEggsInBox(PC_STORAGE* storage, u32 boxno);
 int PCStorage_CountMonsInBox(PC_STORAGE* storage, u32 boxno);
 int PCStorage_CountMonsInAllBoxes(PC_STORAGE* storage);
 u32 PCStorage_GetMonDataByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, int attr, void *ptr);
-BOXMON* PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno);
+BoxPokemon *PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno);
 void PCStorage_UnlockBonusWallpaper(PC_STORAGE* storage, u32 wallpaper);
 BOOL PCStorage_IsBonusWallpaperUnlocked(PC_STORAGE* storage, u32 wallpaper);
 void PCStorage_SetBoxModified(PC_STORAGE* storage, u8 boxno);

include/pokemon_types_def.h

@@ -124,7 +124,7 @@ typedef struct BoxPokemon {
                 u16 Unused:13;    // Might be used for validity checks
     /* 0x006 */ u16 checksum;  // Stored checksum of pokemon
     /* 0x008 */ PokemonDataBlock substructs[4];
-} BOXMON;
+} BoxPokemon;
 
 union MailPatternData
 {
@@ -173,7 +173,7 @@ typedef struct PartyPokemon {
 } PARTYMON;
 
 typedef struct {
-    /* 0x000 */ BOXMON box;
+    /* 0x000 */ BoxPokemon box;
     /* 0x088 */ PARTYMON party;
 } Pokemon; // size: 0xEC
 

include/pokewalker.h

@@ -8,7 +8,7 @@
 typedef struct POKEWALKER {
     u16 unk_000;
     u16 unk_002;
-    BOXMON pokemon;
+    BoxPokemon pokemon;
     u8 filler_08C[0x6C];
     u16 unk_0F8;
     u16 unk_0FA;
@@ -31,9 +31,9 @@ void sub_02032650(POKEWALKER *pokeWalker, u32 a1, u32 a2);
 void sub_02032674(POKEWALKER *pokeWalker, u32 *a1, u32 *a2);
 void sub_02032688(POKEWALKER *pokeWalker, u16 *a1, u16 *a2);
 void sub_020326A4(POKEWALKER *pokeWalker, u16 a1, u16 a2);
-void Pokewalker_SetBoxMon(POKEWALKER *pokeWalker, BOXMON *boxmon);
+void Pokewalker_SetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxMon);
 void Pokewalker_ClearBoxMon(POKEWALKER *pokeWalker);
-BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BOXMON *boxmon);
+BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxMon);
 u16 sub_02032718(POKEWALKER *pokeWalker);
 void sub_02032720(POKEWALKER *pokeWalker, u16 a1);
 void *sub_02032728(POKEWALKER *pokeWalker);

include/trade_anim.h

@@ -5,8 +5,8 @@
 #include "player_data.h"
 
 typedef struct TRADE_ANIM_WORK {
-    BOXMON *my_boxmon;
-    BOXMON *trade_boxmon;
+    BoxPokemon *my_boxmon;
+    BoxPokemon *trade_boxmon;
     PLAYERPROFILE *trade_profile;
     int time_of_day;
     int is_ingame;

include/unk_02078834.h

@@ -3,7 +3,7 @@
 
 #include "task.h"
 
-void sub_0208F270(BOXMON *boxmon, PLAYERPROFILE *playerProfile, u32 a2, u32 a3, HeapID heap_id);
+void sub_0208F270(BoxPokemon *boxMon, PLAYERPROFILE *playerProfile, u32 a2, u32 a3, HeapID heap_id);
 void sub_02078B58(TaskManager *taskManager);
 void sub_02078B78(TaskManager *taskManager, u16 *var_p);
 

src/daycare.c

@@ -16,7 +16,7 @@ DAYCAREMON* Sav2_DayCare_GetMonX(DAYCARE* daycare, int i) {
     return &daycare->mons[i];
 }
 
-BOXMON* DayCareMon_GetBoxMon(DAYCAREMON* dcmon) {
+BoxPokemon *DayCareMon_GetBoxMon(DAYCAREMON* dcmon) {
     return &dcmon->mon;
 }