From 4fb236c6956834fbe2f661a8229b172950445afc Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 17 Feb 2023 18:44:03 -0300 Subject: [PATCH 1/7] Fixed placeholder MON_DATA names --- include/constants/pokemon.h | 8 ++++---- src/pokemon.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 77f2e47ab..6d2530ad1 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -272,7 +272,7 @@ #define MON_DATA_NICKNAME_2 118 // ??? #define MON_DATA_NICKNAME_3 119 // ??? #define MON_DATA_NICKNAME_4 120 -#define MON_DATA_UNK_120 121 +#define MON_DATA_UNK_121 121 #define MON_DATA_GAME_VERSION 122 #define MON_DATA_COOL_RIBBON 123 #define MON_DATA_COOL_RIBBON_GREAT 124 @@ -294,7 +294,7 @@ #define MON_DATA_TOUGH_RIBBON_GREAT 140 #define MON_DATA_TOUGH_RIBBON_ULTRA 141 #define MON_DATA_TOUGH_RIBBON_MASTER 142 -#define MON_DATA_SINNOH_RIBBON_142 143 +#define MON_DATA_SINNOH_RIBBON_143 143 #define MON_DATA_OT_NAME 144 // ??? #define MON_DATA_OT_NAME_2 145 #define MON_DATA_EGG_MET_YEAR 146 @@ -310,7 +310,7 @@ #define MON_DATA_MET_LEVEL 156 #define MON_DATA_MET_GENDER 157 #define MON_DATA_ENCOUNTER_TYPE 158 // HGSS -#define MON_DATA_RESERVED_158 159 +#define MON_DATA_RESERVED_159 159 #define MON_DATA_STATUS 160 #define MON_DATA_LEVEL 161 #define MON_DATA_CAPSULE 162 @@ -327,7 +327,7 @@ #define MON_DATA_SANITY_IS_EGG 173 #define MON_DATA_SPECIES2 174 #define MON_DATA_IVS_WORD 175 -#define MON_DATA_UNK_175 176 +#define MON_DATA_UNK_176 176 #define MON_DATA_TYPE_1 177 #define MON_DATA_TYPE_2 178 #define MON_DATA_SPECIES_NAME 179 diff --git a/src/pokemon.c b/src/pokemon.c index de5d518cc..eb6bbdb57 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -752,7 +752,7 @@ static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest) { CopyU16ArrayToString(dest, blockC->nickname); } break; - case MON_DATA_UNK_120: + case MON_DATA_UNK_121: ret = blockC->Unused; break; case MON_DATA_GAME_VERSION: @@ -778,7 +778,7 @@ static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest) { case MON_DATA_TOUGH_RIBBON_GREAT: case MON_DATA_TOUGH_RIBBON_ULTRA: case MON_DATA_TOUGH_RIBBON_MASTER: - case MON_DATA_SINNOH_RIBBON_142: + case MON_DATA_SINNOH_RIBBON_143: if (blockC->sinnohRibbons2 & (1ll << (attr - MON_DATA_COOL_RIBBON))) { ret = TRUE; } else { @@ -854,7 +854,7 @@ static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest) { (blockB->spatkIV << 20) | \ (blockB->spdefIV << 25); break; - case MON_DATA_UNK_175: + case MON_DATA_UNK_176: if ((blockA->species == SPECIES_NIDORAN_F || blockA->species == SPECIES_NIDORAN_M) && !blockB->isNicknamed) { ret = FALSE; } else { @@ -1216,7 +1216,7 @@ static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * value) case MON_DATA_NICKNAME_3: CopyStringToU16Array(value, blockC->nickname, POKEMON_NAME_LENGTH + 1); break; - case MON_DATA_UNK_120: + case MON_DATA_UNK_121: blockC->Unused = VALUE(u8); break; case MON_DATA_GAME_VERSION: @@ -1242,7 +1242,7 @@ static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * value) case MON_DATA_TOUGH_RIBBON_GREAT: case MON_DATA_TOUGH_RIBBON_ULTRA: case MON_DATA_TOUGH_RIBBON_MASTER: - case MON_DATA_SINNOH_RIBBON_142: + case MON_DATA_SINNOH_RIBBON_143: mask = 1 << (attr - MON_DATA_COOL_RIBBON); if (VALUE(u8)) { blockC->sinnohRibbons2 |= mask; @@ -1644,7 +1644,7 @@ static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value) { case MON_DATA_NICKNAME_2: case MON_DATA_NICKNAME_3: case MON_DATA_NICKNAME_4: - case MON_DATA_UNK_120: + case MON_DATA_UNK_121: case MON_DATA_GAME_VERSION: case MON_DATA_COOL_RIBBON: case MON_DATA_COOL_RIBBON_GREAT: @@ -1666,7 +1666,7 @@ static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value) { case MON_DATA_TOUGH_RIBBON_GREAT: case MON_DATA_TOUGH_RIBBON_ULTRA: case MON_DATA_TOUGH_RIBBON_MASTER: - case MON_DATA_SINNOH_RIBBON_142: + case MON_DATA_SINNOH_RIBBON_143: case MON_DATA_OT_NAME: case MON_DATA_OT_NAME_2: case MON_DATA_EGG_MET_YEAR: @@ -1684,7 +1684,7 @@ static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value) { case MON_DATA_MET_LEVEL: case MON_DATA_MET_GENDER: case MON_DATA_ENCOUNTER_TYPE: - case MON_DATA_RESERVED_158: + case MON_DATA_RESERVED_159: case MON_DATA_STATUS: case MON_DATA_LEVEL: case MON_DATA_CAPSULE: @@ -1701,7 +1701,7 @@ static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value) { case MON_DATA_SANITY_IS_EGG: case MON_DATA_SPECIES2: case MON_DATA_IVS_WORD: - case MON_DATA_UNK_175: + case MON_DATA_UNK_176: case MON_DATA_TYPE_1: case MON_DATA_TYPE_2: case MON_DATA_SPECIES_NAME: From 7e11de9e7b66e16d2db5ce1181ded55998f4558c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 17 Feb 2023 19:37:05 -0300 Subject: [PATCH 2/7] Renamed POKEMON struct to Pokemon --- asm/unk_0206D494.s | 4 +- include/battle_system.h | 2 +- include/bug_contest.h | 2 +- include/bug_contest_internal.h | 2 +- include/field_blackthorn_tutors.h | 4 +- include/field_follow_poke.h | 2 +- include/field_system.h | 2 +- include/get_egg.h | 6 +- include/mail.h | 2 +- include/mail_misc.h | 8 +- include/mystery_gift.h | 4 +- include/npc_trade.h | 2 +- include/overlay_02.h | 6 +- include/party.h | 6 +- include/party_menu.h | 2 +- include/pokedex.h | 4 +- include/pokemon.h | 120 +++++++++++------------ include/pokemon_icon_idx.h | 4 +- include/pokemon_mood.h | 4 +- include/pokemon_types_def.h | 6 +- include/script_pokemon_util.h | 6 +- include/trainer_data.h | 2 +- include/unk_0200E398.h | 2 +- include/unk_0202EB30.h | 2 +- include/unk_0203E348.h | 2 +- include/unk_020557E0.h | 2 +- include/unk_0206979C.h | 2 +- include/unk_0206D494.h | 4 +- include/unk_0208E600.h | 4 +- include/unk_02092BE8.h | 2 +- include/update_dex_received.h | 2 +- include/use_item_on_mon.h | 16 +-- src/battle_arcade_game_board.c | 10 +- src/battle_command.c | 14 +-- src/choose_starter.c | 4 +- src/choose_starter_app.c | 2 +- src/encounter.c | 2 +- src/field_blackthorn_tutors.c | 2 +- src/field_follow_poke.c | 6 +- src/field_roamer.c | 2 +- src/get_egg.c | 48 ++++----- src/hall_of_fame.c | 2 +- src/mail.c | 4 +- src/mail_misc.c | 8 +- src/npc_trade.c | 20 ++-- src/overlay_01_rock_smash_item.c | 2 +- src/overlay_36.c | 2 +- src/overlay_94.c | 2 +- src/overlay_bug_contest.c | 6 +- src/party.c | 10 +- src/pokedex.c | 8 +- src/pokemon.c | 158 +++++++++++++++--------------- src/pokemon_icon_idx.c | 4 +- src/pokemon_mood.c | 6 +- src/save_flypoints.c | 2 +- src/scrcmd_12.c | 4 +- src/scrcmd_c.c | 22 ++--- src/scrcmd_daycare.c | 2 +- src/scrcmd_lottery.c | 2 +- src/scrcmd_move_relearner.c | 8 +- src/scrcmd_party.c | 78 +++++++-------- src/scrcmd_pokemon_misc.c | 32 +++--- src/scrcmd_size_record.c | 8 +- src/scrcmd_strbuf.c | 8 +- src/script_pokemon_util.c | 24 ++--- src/trainer_data.c | 6 +- src/unk_02092BE8.c | 2 +- src/update_dex_received.c | 2 +- src/use_item_on_mon.c | 22 ++--- 69 files changed, 391 insertions(+), 391 deletions(-) diff --git a/asm/unk_0206D494.s b/asm/unk_0206D494.s index a6edb492d..23d1e71e9 100644 --- a/asm/unk_0206D494.s +++ b/asm/unk_0206D494.s @@ -515,7 +515,7 @@ _0206D892: thumb_func_start MonIsInGameTradePoke MonIsInGameTradePoke: ; 0x0206D894 - ; BOOL MonIsInGameTradePoke(struct Pokemon *poke, int tradeno); + ; BOOL MonIsInGameTradePoke(Pokemon *poke, int tradeno); push {r3, r4, r5, r6, lr} sub sp, #4 add r5, r0, #0 @@ -673,7 +673,7 @@ _0206D9CC: .word gGameVersion thumb_func_start MonIsInGameTradePokeEx MonIsInGameTradePokeEx: ; 0x0206D9D0 - ; BOOL MonIsInGameTradePokeEx(struct Pokemon *poke, struct InGameTrade *trade, int tradeno); + ; BOOL MonIsInGameTradePokeEx(Pokemon *poke, struct InGameTrade *trade, int tradeno); push {r3, r4, r5, r6, r7, lr} sub sp, #8 add r5, r1, #0 diff --git a/include/battle_system.h b/include/battle_system.h index 12eb36e4e..fbe27a3de 100644 --- a/include/battle_system.h +++ b/include/battle_system.h @@ -12,7 +12,7 @@ int BattleSys_Random(BattleSystem *bsys); PLAYERPROFILE *BattleSys_GetPlayerProfile(BattleSystem *bsys, int a1); PARTY *BattleSys_GetParty(BattleSystem *bsys, int battlerId); int BattleSys_GetPartySize(BattleSystem *bsys, int battlerId); -POKEMON *BattleSystem_GetPartyMon(BattleSystem *bsys, int battlerId, int index); +Pokemon *BattleSystem_GetPartyMon(BattleSystem *bsys, int battlerId, int index); int BattleSys_GetTerrainId(BattleSystem *bsys); int ov12_0223ABB8(BattleSystem *bsys, int battlerId, int a2); void BattleSys_RecoverStatus(BattleSystem *bsys, int battlerIdA, int battlerIdB, int a2, int itemWork); diff --git a/include/bug_contest.h b/include/bug_contest.h index 4b673c96f..f04c02482 100644 --- a/include/bug_contest.h +++ b/include/bug_contest.h @@ -16,6 +16,6 @@ void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n); void BugContest_InitOpponents(BUGCONTEST *bugContest); void BugContest_InitEncounters(BUGCONTEST *bugContest); -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, POKEMON *pokemon); +u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon); #endif //POKEHEARTGOLD_BUG_CONTEST_H diff --git a/include/bug_contest_internal.h b/include/bug_contest_internal.h index f67b9fe8c..550870ced 100644 --- a/include/bug_contest_internal.h +++ b/include/bug_contest_internal.h @@ -39,7 +39,7 @@ typedef struct BUGCONTEST { SAVEDATA *saveData; // Pointer to save data PARTY *party_bak; // Player's party is held for the contest PARTY *party_cur; // Only the lead Pokemon - POKEMON *pokemon; // The Pokemon you caught in the contest + Pokemon *pokemon; // The Pokemon you caught in the contest u8 lead_mon_idx; // Slot number of the Pokemon you battled with u8 party_cur_num; // Size of the party pre-contest u8 day_of_week; // Used to choose NPCs and encounters diff --git a/include/field_blackthorn_tutors.h b/include/field_blackthorn_tutors.h index 7f4fcf3e3..ed3243c94 100644 --- a/include/field_blackthorn_tutors.h +++ b/include/field_blackthorn_tutors.h @@ -5,7 +5,7 @@ #include "pokemon_types_def.h" struct MoveRelearner { - POKEMON *pokemon; + Pokemon *pokemon; PLAYERPROFILE *profile; OPTIONS *options; u8 filler_0C[4]; @@ -17,7 +17,7 @@ struct MoveRelearner { struct MoveRelearner *MoveRelearner_new(HeapID heapId); void MoveRelearner_delete(struct MoveRelearner *moveRelearner); -u16 *GetEligibleLevelUpMoves(POKEMON *pokemon, HeapID heapId); +u16 *GetEligibleLevelUpMoves(Pokemon *pokemon, HeapID heapId); BOOL sub_0209186C(const u16 *ptr); #endif //POKEHEARTGOLD_FIELD_BLACKTHORN_TUTORS_H diff --git a/include/field_follow_poke.h b/include/field_follow_poke.h index 0ed9c3332..7bd583b1c 100644 --- a/include/field_follow_poke.h +++ b/include/field_follow_poke.h @@ -33,7 +33,7 @@ struct FieldSystemUnk108 *FsysUnkSub108_Alloc(HeapID heapId); void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by); void FsysUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood); s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk); -void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, POKEMON *pokemon, u16 species, u32 personality); +void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *pokemon, u16 species, u32 personality); void FsysUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0); int SpeciesToOverworldModelIndexOffset(int species); int OverworldModelLookupFormeCount(int species); diff --git a/include/field_system.h b/include/field_system.h index 9140e589c..9ac33d4f8 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -73,7 +73,7 @@ struct FieldSystemUnk108 { u32 personality; u16 species; u16 isRegistered; - POKEMON *pokemon; + Pokemon *pokemon; }; struct FieldSystemUnkSub0 { diff --git a/include/get_egg.h b/include/get_egg.h index 798dc9d44..0a2a29b3d 100644 --- a/include/get_egg.h +++ b/include/get_egg.h @@ -10,15 +10,15 @@ int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon); u16 Sav2_DayCare_BufferMonNickAndRetrievalPrice(DAYCARE *dayCare, u8 slot, MSGFMT *msgFmt); u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MSGFMT *msgFmt); void Sav2_DayCare_ResetEggStats(DAYCARE *dayCare); -void SetEggStats(POKEMON *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); +void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); void GiveEggToPlayer(DAYCARE *dayCare, PARTY *party, PLAYERPROFILE* profile); BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys); -POKEMON *sub_0206CE44(PARTY *party); +Pokemon *sub_0206CE44(PARTY *party); void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt); void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MSGFMT *msgFmt); u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MSGFMT *msgFmt); u8 Sav2_DayCare_GetState(DAYCARE *dayCare); u8 Sav2_DayCare_CalcCompatibility(DAYCARE *dayCare); -void sub_0206D328(POKEMON *pokemon, HeapID heapId); +void sub_0206D328(Pokemon *pokemon, HeapID heapId); #endif diff --git a/include/mail.h b/include/mail.h index f54149686..62f1cda30 100644 --- a/include/mail.h +++ b/include/mail.h @@ -39,6 +39,6 @@ u32 Mailbox_CountMessages(MAILBOX *mailbox, int unused); void Mailbox_FetchMailToBuffer(MAIL *msgs, int n, int i, MAIL *dest); int MailArray_GetFirstEmptySlotIdx(MAIL *msgs, int n); u32 MailArray_CountMessages(MAIL *msgs, int n); -MAIL *CreateKenyaMail(POKEMON *pokemon, u8 mailType, u8 gender, STRING *name, u8 otId); +MAIL *CreateKenyaMail(Pokemon *pokemon, u8 mailType, u8 gender, STRING *name, u8 otId); #endif //POKEHEARTGOLD_MAIL_H diff --git a/include/mail_misc.h b/include/mail_misc.h index 830b9ef64..683c98c25 100644 --- a/include/mail_misc.h +++ b/include/mail_misc.h @@ -63,12 +63,12 @@ int sub_02090E44(Unk02090C94 *a0); void sub_02090E5C(Unk02090C94 *a0); Unk02090E68 *sub_02090E68(SAVEDATA *saveData, u16 a1, u8 partyIdx, u8 a3, HeapID heapId); Unk02090E68 *sub_02090EC0(SAVEDATA *saveData, int n, u16 i, HeapID heapId); -Unk02090E68 *sub_02090F00(SAVEDATA *saveData, POKEMON *pokemon, HeapID heapId); +Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *pokemon, HeapID heapId); Unk02090E68 *sub_02090F38(SAVEDATA *saveData, u8 mailType, HeapID heapId); u32 sub_02090F6C(Unk02090E68 *a0); -BOOL sub_02090F70(Unk02090E68 *a0, POKEMON *pokemon); +BOOL sub_02090F70(Unk02090E68 *a0, Pokemon *pokemon); void sub_02090F90(Unk02090E68 *a0); -int sub_02090FA8(MAILBOX *mailbox, POKEMON *pokemon, HeapID heapId); -int sub_02091004(MAIL *msgs, int i, POKEMON *pokemon, HeapID heapId); +int sub_02090FA8(MAILBOX *mailbox, Pokemon *pokemon, HeapID heapId); +int sub_02091004(MAIL *msgs, int i, Pokemon *pokemon, HeapID heapId); #endif //POKEHEARTGOLD_MAIL_MISC_H diff --git a/include/mystery_gift.h b/include/mystery_gift.h index 0949143ee..668ef2cd0 100644 --- a/include/mystery_gift.h +++ b/include/mystery_gift.h @@ -24,7 +24,7 @@ enum MysteryGiftTag { typedef struct MG_POKEMON_TAG { BOOL fixedOT; - POKEMON mon; + Pokemon mon; u8 ribbons[10]; } MG_POKEMON_TAG; @@ -38,7 +38,7 @@ typedef struct { u16 flag; union { MG_POKEMON_TAG pokemon; - POKEMON egg; + Pokemon egg; u32 item; u16 ruleset[24]; int base_decoration; diff --git a/include/npc_trade.h b/include/npc_trade.h index 77bda4971..e0b8f584e 100644 --- a/include/npc_trade.h +++ b/include/npc_trade.h @@ -40,6 +40,6 @@ int NPCTradeWork_GetOfferedSpecies(NPC_TRADE_WORK *work); int NPCTradeWork_GetRequestedSpecies(NPC_TRADE_WORK *work); int NPCTradeWork_GetUnusedFlag(NPC_TRADE_WORK *work); void NPCTrade_ReceiveMonToSlot(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot); -void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot, TRADE_ANIM_WORK *anim_work, POKEMON *my_mon_buf, POKEMON *trade_mon_buf); +void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf); #endif //POKEHEARTGOLD_NPC_TRADE_H diff --git a/include/overlay_02.h b/include/overlay_02.h index eb0d12bb0..de840b1e2 100644 --- a/include/overlay_02.h +++ b/include/overlay_02.h @@ -39,8 +39,8 @@ UNK_0201F79C_Sub *ov02_0224B418(FieldSystem *fsys, int gender); BOOL ov02_0224B43C(UNK_0201F79C_Sub *unk); void ov02_0224B448(UNK_0201F79C_Sub *unk); struct FieldLongWarpTaskData *CreateFieldEscapeRopeTaskEnv(FieldSystem *fsys, HeapID heapId); -struct FieldLongWarpTaskData *CreateFieldTeleportTaskEnv(FieldSystem *fsys, POKEMON *pokemon, u8 slotno, HeapID heapId); -struct FieldLongWarpTaskData *CreateFieldDigTaskEnv(FieldSystem *fsys, POKEMON *pokemon, u8 slotno, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldTeleportTaskEnv(FieldSystem *fsys, Pokemon *pokemon, u8 slotno, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldDigTaskEnv(FieldSystem *fsys, Pokemon *pokemon, u8 slotno, HeapID heapId); BOOL Task_FieldEscapeRope(TaskManager *taskManager); BOOL Task_FieldTeleport(TaskManager *taskManager); BOOL Task_FieldDig(TaskManager *taskManager); @@ -49,7 +49,7 @@ void *ov02_0224C1D8(FieldSystem *fsys, int a1, int a2); u8 ov02_02251EE8(GearPhoneRingManager *a0, u8 *a1); // TODO: define the struct, figure out what a1 is -void *ov02_02249458(FieldSystem *fsys, int a1, POKEMON *pokemon, int gender); +void *ov02_02249458(FieldSystem *fsys, int a1, Pokemon *pokemon, int gender); BOOL ov02_0224953C(void *work); void ov02_02249548(void *work); diff --git a/include/party.h b/include/party.h index 5ea2dc7c3..d0844eb94 100644 --- a/include/party.h +++ b/include/party.h @@ -8,15 +8,15 @@ u32 PartyCore_sizeof(void); PARTY * SavArray_Party_alloc(HeapID heapId); void SavArray_Party_init(PARTY *party); void InitPartyWithMaxSize(PARTY *party, int maxSize); -BOOL AddMonToParty(PARTY *party, const POKEMON *pokemon); +BOOL AddMonToParty(PARTY *party, const Pokemon *pokemon); BOOL RemoveMonFromParty(PARTY *party, int slot); int GetPartyMaxCount(const PARTY *party); int GetPartyCount(const PARTY *party); -POKEMON *GetPartyMonByIndex(PARTY *party, int slot); +Pokemon *GetPartyMonByIndex(PARTY *party, int slot); void Party_GetUnkSubSlot(const PARTY *party, PARTY_EXTRA_SUB *dest, int slot); void Party_SetUnkSubSlot(PARTY *party, const PARTY_EXTRA_SUB *src, int slot); void Party_ResetUnkSubSlot(PARTY *party, int slot); -void Party_SafeCopyMonToSlot_ResetUnkSub(PARTY *party, int slot, POKEMON *src); +void Party_SafeCopyMonToSlot_ResetUnkSub(PARTY *party, int slot, Pokemon *src); BOOL Party_SwapSlots(PARTY *party, int slotA, int slotB); void Party_copy(const PARTY *src, PARTY *dest); BOOL PartyHasMon(PARTY *party, u16 species); diff --git a/include/party_menu.h b/include/party_menu.h index 6a0f48579..2d279680f 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -39,7 +39,7 @@ struct FieldUseMoveEnv { }; struct TeleportFieldEnv { - POKEMON *pokemon; + Pokemon *pokemon; struct FlyTaskStruct *flySub; // waste of space }; diff --git a/include/pokedex.h b/include/pokedex.h index 6adbc01bd..829b1965d 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -64,8 +64,8 @@ int Pokedex_SpeciesGetLastSeenGender(POKEDEX *pokedex, u16 species, u32 a2); int Pokedex_GetSeenFormeByIdx_Unown(POKEDEX *pokedex, int idx, u32 caught); u32 Pokedex_GetSeenFormeNum_Unown(POKEDEX *pokedex, BOOL caught); int Pokedex_GetSeenFormeByIdx_Shellos(POKEDEX *pokedex, int a1); -void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, POKEMON *pokemon); -void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, POKEMON *pokemon); +void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *pokemon); +void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *pokemon); void Pokedex_SetNatDexFlag(POKEDEX *pokedex); void sub_0202A57C(POKEDEX *pokedex); BOOL Pokedex_HasCaughtMonWithLanguage(POKEDEX *pokedex, u32 species, u32 language); diff --git a/include/pokemon.h b/include/pokemon.h index 404256af0..f4deb8db3 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -28,27 +28,27 @@ extern const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS]; -void ZeroMonData(POKEMON * pokemon); +void ZeroMonData(Pokemon * pokemon); void ZeroBoxMonData(BOXMON * boxmon); u32 SizeOfStructPokemon(void); -POKEMON * AllocMonZeroed(HeapID heap_id); -BOOL AcquireMonLock(POKEMON * mon); -BOOL ReleaseMonLock(POKEMON * mon, BOOL decrypt_result); +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); -void CreateMon(POKEMON * pokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId); +void CreateMon(Pokemon * pokemon, 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 CreateMonWithNature(POKEMON * pokemon, u16 species, u8 level, u8 fixedIv, u8 nature); -void CreateMonWithGenderNatureLetter(POKEMON * pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter); +void CreateMonWithNature(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 nature); +void CreateMonWithGenderNatureLetter(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter); u32 GenPersonalityByGenderAndNature(u16 species, u8 gender, u8 nature); -void CreateMonWithFixedIVs(POKEMON * pokemon, int species, int level, int ivs, int personality); -void CalcMonLevelAndStats(POKEMON * pokemon); -void CalcMonStats(POKEMON * pokemon); -u32 GetMonData(POKEMON * pokemon, int attr, void * ptr); +void CreateMonWithFixedIVs(Pokemon * pokemon, int species, int level, int ivs, int personality); +void CalcMonLevelAndStats(Pokemon * pokemon); +void CalcMonStats(Pokemon * pokemon); +u32 GetMonData(Pokemon * pokemon, int attr, void * ptr); u32 GetBoxMonData(BOXMON * boxmon, int attr, void * ptr); -void SetMonData(POKEMON * pokemon, int attr, void * ptr); +void SetMonData(Pokemon * pokemon, int attr, void * ptr); void SetBoxMonData(BOXMON * boxmon, int attr, void * ptr); -void AddMonData(POKEMON * pokemon, int attr, int amount); +void AddMonData(Pokemon * pokemon, int attr, int amount); //void AddBoxMonData(BOXMON * boxmon, int attr, int amount); BASE_STATS * AllocAndLoadMonPersonal_HandleAlternateForme(int species, int form, HeapID heap_id); BASE_STATS * AllocAndLoadMonPersonal(int species, HeapID heap_id); @@ -56,53 +56,53 @@ int GetPersonalAttr(const BASE_STATS *baseStats, BaseStat attr); void FreeMonPersonal(BASE_STATS * personal); int GetMonBaseStat_HandleAlternateForme(int species, int form, BaseStat stat_id); int GetMonBaseStat(int species, BaseStat stat_id); -u8 GetPercentProgressTowardsNextLevel(POKEMON * pokemon); -u32 CalcMonExpToNextLevel(POKEMON * pokemon); +u8 GetPercentProgressTowardsNextLevel(Pokemon * pokemon); +u32 CalcMonExpToNextLevel(Pokemon * pokemon); u32 CalcBoxMonExpToNextLevel(BOXMON * pokemon); -u32 GetMonBaseExperienceAtCurrentLevel(POKEMON * pokemon); +u32 GetMonBaseExperienceAtCurrentLevel(Pokemon * pokemon); u32 GetMonExpBySpeciesAndLevel(int species, int level); void LoadGrowthTable(int growthRate, u32 * table); u32 GetExpByGrowthRateAndLevel(int rate, int level); -int CalcMonLevel(POKEMON * pokemon); +int CalcMonLevel(Pokemon * pokemon); int CalcBoxMonLevel(BOXMON * boxmon); int CalcLevelBySpeciesAndExp(u16 species, u32 experience); int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 species, u32 experience); u8 GetBoxMonNature(BOXMON * boxmon); -u8 GetMonNature(POKEMON * mon); +u8 GetMonNature(Pokemon * mon); u8 GetNatureFromPersonality(u32 pid); -void MonApplyFriendshipMod(POKEMON * pokemon, u8 kind, u16 location); -u8 GetMonGender(POKEMON * pokemon); +void MonApplyFriendshipMod(Pokemon * pokemon, u8 kind, u16 location); +u8 GetMonGender(Pokemon * pokemon); u8 GetBoxMonGender(BOXMON * boxmon); u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid); -u8 MonIsShiny(POKEMON * pokemon); +u8 MonIsShiny(Pokemon * pokemon); u8 BoxMonIsShiny(BOXMON * boxmon); u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid); u32 GenerateShinyPersonality(u32 otid); u32 GetArceusTypeByHeldItemEffect(u16 plate); u8 GetBoxMonUnownLetter(BOXMON * boxmon); -u8 GetMonUnownLetter(POKEMON * pokemon); -u32 TryAppendMonMove(POKEMON *pokemon, u16 move); +u8 GetMonUnownLetter(Pokemon * pokemon); +u32 TryAppendMonMove(Pokemon *pokemon, u16 move); u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move); void BoxMonSetMoveInSlot(BOXMON *boxmon, u16 move, u8 slot); -void DeleteMonFirstMoveAndAppend(POKEMON *pokemon, u16 move); +void DeleteMonFirstMoveAndAppend(Pokemon *pokemon, u16 move); void DeleteBoxMonFirstMoveAndAppend(BOXMON *boxmon, u16 move); void LoadWotbl_HandleAlternateForme(int species, int forme, u16 *wotbl); -void MonSwapMoves(POKEMON *pokemon, int a, int b); +void MonSwapMoves(Pokemon *pokemon, int a, int b); void BoxMonSwapMoves(BOXMON *boxmon, int a, int b); -BOXMON *Mon_GetBoxMon(POKEMON *pokemon); +BOXMON *Mon_GetBoxMon(Pokemon *pokemon); -u16 GetMonEvolution(PARTY * party, POKEMON * pokemon, u8 context, u16 usedItem, int *method_ret); +u16 GetMonEvolution(PARTY * party, Pokemon * pokemon, u8 context, u16 usedItem, int *method_ret); u16 ReadFromPersonalPmsNarc(u16 species); u16 GetEggSpecies(u16 species); -void MonSetMoveInSlot(POKEMON * pokemon, u16 move, u8 slot); -void CopyBoxPokemonToPokemon(const BOXMON * src, POKEMON * dest); +void MonSetMoveInSlot(Pokemon * pokemon, u16 move, u8 slot); +void CopyBoxPokemonToPokemon(const BOXMON * 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 CopyPokemonToPokemon(const Pokemon * src, Pokemon * dest); void CopyBoxPokemonToBoxPokemon(const BOXMON * src, BOXMON * dest); -void CopyPokemonToBoxPokemon(const POKEMON * src, BOXMON * dest); -s8 MonGetFlavorPreference(POKEMON * pokemon, int flavor); +void CopyPokemonToBoxPokemon(const Pokemon * src, BOXMON * dest); +s8 MonGetFlavorPreference(Pokemon * pokemon, int flavor); s8 BoxMonGetFlavorPreference(BOXMON * boxmon, int flavor); s8 GetFlavorPreferenceFromPID(u32 personality, int flavor); int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest); @@ -110,24 +110,24 @@ 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 * pokemon); +BOOL Pokemon_HasPokerus(Pokemon * pokemon); BOOL BoxMon_HasPokerus(BOXMON * boxmon); -BOOL Pokemon_IsImmuneToPokerus(POKEMON * pokemon); +BOOL Pokemon_IsImmuneToPokerus(Pokemon * pokemon); BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon); -void Pokemon_UpdateArceusForme(POKEMON * pokemon); +void Pokemon_UpdateArceusForme(Pokemon * pokemon); void BoxMon_UpdateArceusForme(BOXMON * boxmon); -s32 Mon_UpdateGiratinaForme(POKEMON * pokemon); +s32 Mon_UpdateGiratinaForme(Pokemon * pokemon); s32 BoxMon_UpdateGiratinaForme(BOXMON * boxmon); -void Mon_UpdateShayminForme(POKEMON *pokemon, int forme); +void Mon_UpdateShayminForme(Pokemon *pokemon, int forme); void BoxMon_UpdateShayminForme(BOXMON *pokemon, int forme); -void UpdateMonAbility(POKEMON *boxmon); +void UpdateMonAbility(Pokemon *boxmon); void UpdateBoxMonAbility(BOXMON *boxmon); int LowestFlagNo(u32 mask); BOOL IsPokemonLegendaryOrMythical(u16 species, u16 forme); u16 GetLegendaryMon(u32 idx); -void Pokemon_RemoveCapsule(POKEMON * pokemon); +void Pokemon_RemoveCapsule(Pokemon * pokemon); void RestoreBoxMonPP(BOXMON * boxmon); -BOOL SetTrMonCapsule(int a0, POKEMON *pokemon, HeapID heap_id); +BOOL SetTrMonCapsule(int a0, Pokemon *pokemon, HeapID heap_id); int GetMonBaseStatEx_HandleAlternateForme(NARC *narc, int species, int forme, BaseStat attr); u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex); @@ -149,32 +149,32 @@ void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C * void sub_02070D84(s32 trainer_class, s32 a1, struct UnkStruct_02070D3C *a2); u32 sub_02070D90(void); u32 sub_02070D94(void); -BOXMON * Mon_GetBoxMon(POKEMON * pokemon); -BOOL Pokemon_TryLevelUp(POKEMON * pokemon); +BOXMON * Mon_GetBoxMon(Pokemon * pokemon); +BOOL Pokemon_TryLevelUp(Pokemon * pokemon); void InitBoxMonMoveset(BOXMON * boxmon); -void MonSetMoveInSlot_ResetPpUp(POKEMON* pokemon, u16 move, u8 slot); -u32 MonTryLearnMoveOnLevelUp(POKEMON * pokemon, int * last_i, u16 * sp0); -void MonDeleteMoveSlot(POKEMON * pokemon, u32 slot); -BOOL MonHasMove(POKEMON* pokemon, u16 move); +void MonSetMoveInSlot_ResetPpUp(Pokemon* pokemon, u16 move, u8 slot); +u32 MonTryLearnMoveOnLevelUp(Pokemon * pokemon, int * last_i, u16 * sp0); +void MonDeleteMoveSlot(Pokemon * pokemon, u32 slot); +BOOL MonHasMove(Pokemon* pokemon, u16 move); u16 SpeciesToJohtoDexNo(u16 species); -void Mon_ForceSetGiratinaOriginForme(POKEMON *pokemon); +void Mon_ForceSetGiratinaOriginForme(Pokemon *pokemon); void Party_UpdateAllGiratina_DistortionWorld(PARTY *party, BOOL force_origin); -BOOL Mon_CanUseGracidea(POKEMON *pokemon); +BOOL Mon_CanUseGracidea(Pokemon *pokemon); void Party_ResetAllShayminToLandForme(PARTY *party); BOOL Party_TryResetShaymin(PARTY *party, int min_max, const RTCTime *time); -BOOL Mon_UpdateRotomForme(POKEMON *pokemon, int forme, int defaultSlot); +BOOL Mon_UpdateRotomForme(Pokemon *pokemon, int forme, int defaultSlot); void sub_02071FDC(SOUND_CHATOT *r6, u32 r5, u16 r4, s32 unused, s32 sp18, u32 sp1C, u32 sp20, u32 sp24); 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 *pokemon); -void sub_020720FC(POKEMON * pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id); +void sub_020720D4(Pokemon *pokemon); +void sub_020720FC(Pokemon * pokemon, 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_0207217C(POKEMON *pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id); +void sub_0207217C(Pokemon *pokemon, 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 WildMonSetRandomHeldItem(struct Pokemon * pokemon, u32 a1, u32 a2); -BOOL GetMonTMHMCompat(POKEMON *pokemon, u8 tmhm); +void WildMonSetRandomHeldItem(Pokemon * pokemon, u32 a1, u32 a2); +BOOL GetMonTMHMCompat(Pokemon *pokemon, u8 tmhm); BOOL GetBoxMonTMHMCompat(BOXMON *boxmon, u8 tmhm); BOOL GetTMHMCompatBySpeciesAndForme(u16 species, u32 forme, u8 tmhm); -void SetMonPersonality(struct Pokemon * r5, u32 personality); +void SetMonPersonality(Pokemon * r5, u32 personality); u32 ChangePersonalityToNatureGenderAndAbility(u32 pid, u16 species, u8 nature, u8 gender, u8 ability, BOOL gen_mode); void LoadMonPersonal(int species, BASE_STATS *personal); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *personal); @@ -185,7 +185,7 @@ u32 CalcMonChecksum(void * _data, u32 size); int ResolveMonForme(int species, int forme); u32 MaskOfFlagNo(int flagno); BOOL SpeciesIsMythical(u16 species); -BOOL MonCheckFrontierIneligibility(POKEMON *pokemon); +BOOL MonCheckFrontierIneligibility(Pokemon *pokemon); BOOL BoxmonBelongsToPlayer(BOXMON * 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); @@ -194,13 +194,13 @@ void sub_020729A4(NARC *narc, u8 *ret, u16 a2, u16 a3); void sub_020729D8(NARC *narc, s8 *ret, u16 a2, u16 a3); void sub_020729FC(NARC *narc, s8 *ret, u16 a2, u16 a3); void sub_02072A20(NARC *narc, u8 *ret, u16 a2, u16 a3); -void sub_02072A98(POKEMON *pokemon, struct UnkPokemonStruct_02072A98 *dest); -void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, POKEMON *pokemon); +void sub_02072A98(Pokemon *pokemon, struct UnkPokemonStruct_02072A98 *dest); +void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *pokemon); u32 _u32_getDigitN(u32 num, u8 digit); s16 PokeathlonStatScoreToStars(s16 a0); void CalcBoxMonPokeathlonPerformance(BOXMON *boxmon, struct PokeathlonTodayPerformance *dest); -void CalcMonPokeathlonPerformance(POKEMON *pokemon, struct PokeathlonTodayPerformance *dest); +void CalcMonPokeathlonPerformance(Pokemon *pokemon, struct PokeathlonTodayPerformance *dest); void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BOXMON *boxmon, const s8 *aprijuice, HeapID heap_id); -void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, POKEMON *pokemon, const s8 *aprijuice, HeapID heap_id); +void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *pokemon, const s8 *aprijuice, HeapID heap_id); #endif //POKEDIAMOND_POKEMON_H diff --git a/include/pokemon_icon_idx.h b/include/pokemon_icon_idx.h index e5b596baf..0c7f8b586 100644 --- a/include/pokemon_icon_idx.h +++ b/include/pokemon_icon_idx.h @@ -4,13 +4,13 @@ #include "pokemon_types_def.h" u32 Boxmon_GetIconNaix(BOXMON *boxmon); -u32 Pokemon_GetIconNaix(POKEMON *pokemon); +u32 Pokemon_GetIconNaix(Pokemon *pokemon); 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 Pokemon_GetIconPalette(POKEMON *pokemon); +const u8 Pokemon_GetIconPalette(Pokemon *pokemon); u32 sub_02074490(void); u32 sub_02074494(void); u32 sub_02074498(void); diff --git a/include/pokemon_mood.h b/include/pokemon_mood.h index 76e13ed8e..3d4cf7c1a 100644 --- a/include/pokemon_mood.h +++ b/include/pokemon_mood.h @@ -3,7 +3,7 @@ #include "pokemon.h" -void ApplyItemEffectOnMonMood(POKEMON *pokemon, u16 itemId); -void ApplyMonMoodModifier(POKEMON *pokemon, int modifierId); +void ApplyItemEffectOnMonMood(Pokemon *pokemon, u16 itemId); +void ApplyMonMoodModifier(Pokemon *pokemon, int modifierId); #endif //POKEHEARTGOLD_POKEMON_MOOD_H diff --git a/include/pokemon_types_def.h b/include/pokemon_types_def.h index e604fe8cd..6a2a1aadc 100644 --- a/include/pokemon_types_def.h +++ b/include/pokemon_types_def.h @@ -171,10 +171,10 @@ typedef struct PartyPokemon { /* 0x0D4 */ CAPSULE sealCoords; // seal coords } PARTYMON; -typedef struct Pokemon { +typedef struct { /* 0x000 */ BOXMON box; /* 0x088 */ PARTYMON party; -} POKEMON; // size: 0xEC +} Pokemon; // size: 0xEC struct UnkPokemonStruct_02072A98 { /* 0x00 */ u32 pid; @@ -270,7 +270,7 @@ struct Evolution { typedef struct PARTY { int maxCount; int curCount; - struct Pokemon mons[PARTY_SIZE]; + Pokemon mons[PARTY_SIZE]; } PARTY_CORE; typedef struct PARTY_EXTRA_SUB { diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h index 33a81e939..33df97afe 100644 --- a/include/script_pokemon_util.h +++ b/include/script_pokemon_util.h @@ -9,11 +9,11 @@ BOOL GiveEgg(HeapID heapId, SAVEDATA *saveData, int species, u8 metLocation, Map void PartyMonSetMoveInSlot(PARTY *party, int mon_slot, int move_slot, u16 moveId); int GetIdxOfFirstPartyMonWithMove(PARTY *party, u16 move); int CountAlivePokemon(PARTY *party); -POKEMON *GetFirstAliveMonInParty_CrashIfNone(PARTY *party); +Pokemon *GetFirstAliveMonInParty_CrashIfNone(PARTY *party); u8 GetIdxOfFirstAliveMonInParty_CrashIfNone(PARTY *party); -POKEMON *GetFirstNonEggInParty(PARTY *party); +Pokemon *GetFirstNonEggInParty(PARTY *party); BOOL HasEnoughAlivePokemonForDoubleBattle(PARTY *party); BOOL ApplyPoisonStep(PARTY *party, u16 location); -BOOL SurvivePoisoning(POKEMON *pokemon); +BOOL SurvivePoisoning(Pokemon *pokemon); #endif //POKEHEARTGOLD_SCRIPT_POKEMON_UTIL_H diff --git a/include/trainer_data.h b/include/trainer_data.h index 32ae7a1d3..5c122e1ef 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -108,7 +108,7 @@ void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, STRING * str, HeapID void TrainerData_ReadTrPoke(u32 idx, TRPOKE * dest); void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id); void TrMon_OverridePidGender(int species, int forme, int overrideParam, u32 *pid); -void TrMon_FrustrationCheckAndSetFriendship(POKEMON *pokemon); +void TrMon_FrustrationCheckAndSetFriendship(Pokemon *pokemon); #endif //PM_ASM #endif //POKEHEARTGOLD_TRAINER_DATA_H diff --git a/include/unk_0200E398.h b/include/unk_0200E398.h index 45feb4ff3..aa2dd8a47 100644 --- a/include/unk_0200E398.h +++ b/include/unk_0200E398.h @@ -15,6 +15,6 @@ void sub_0200E5D4(WINDOW *window, BOOL dont_copy_to_vram); struct WaitingIconManager *sub_0200F0AC(WINDOW *window, u16 tileNum); void sub_0200F450(struct WaitingIconManager *mgr); struct PokepicManager *sub_0200F4A0(BGCONFIG *bgConfig, enum GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, u16 species, u8 gender, HeapID heapId); -struct PokepicManager *sub_0200F4F8(BGCONFIG *bgConfig, enum GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, POKEMON *pokemon, HeapID heapId); +struct PokepicManager *sub_0200F4F8(BGCONFIG *bgConfig, enum GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, Pokemon *pokemon, HeapID heapId); #endif //POKEHEARTGOLD_UNK_0200E398_H diff --git a/include/unk_0202EB30.h b/include/unk_0202EB30.h index 573149940..0fd84cd2c 100644 --- a/include/unk_0202EB30.h +++ b/include/unk_0202EB30.h @@ -4,7 +4,7 @@ #include "pokemon_types_def.h" struct UnkStruct_0202EB30 { - POKEMON pokemon[PARTY_SIZE]; + Pokemon pokemon[PARTY_SIZE]; u32 unk_588[20]; s64 unk_5D8[20]; u32 unk_678; diff --git a/include/unk_0203E348.h b/include/unk_0203E348.h index 9d5f7d39d..9889bf7ec 100644 --- a/include/unk_0203E348.h +++ b/include/unk_0203E348.h @@ -38,7 +38,7 @@ struct PartyMenuAppData { struct ChooseStarterAppArgs { int cursorPos; OPTIONS *options; - POKEMON starters[3]; + Pokemon starters[3]; }; struct DressupSomethingAppData { diff --git a/include/unk_020557E0.h b/include/unk_020557E0.h index c043e2064..2968dad35 100644 --- a/include/unk_020557E0.h +++ b/include/unk_020557E0.h @@ -7,7 +7,7 @@ void sub_020557E0(FieldSystem *fsys); void sub_020557F8(FieldSystem *fsys); void sub_02055828(FieldSystem *fsys); -void sub_0202EC70(struct UnkStruct_0202EB30 *a0, int i, POKEMON *pokemon); +void sub_0202EC70(struct UnkStruct_0202EB30 *a0, int i, Pokemon *pokemon); int sub_020558D0(FieldSystem *fsys); int sub_020558E0(FieldSystem *fsys); int sub_020558F0(FieldSystem *fsys); diff --git a/include/unk_0206979C.h b/include/unk_0206979C.h index 84a9d58fc..19968ea28 100644 --- a/include/unk_0206979C.h +++ b/include/unk_0206979C.h @@ -5,7 +5,7 @@ #include "pokemon_types_def.h" #include "player_data.h" -void SetEggStats(POKEMON *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); +void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); void sub_02069978(NNSG3dRenderObj *a0, UnkOv01_021FFECC_sub *a1); void sub_020699BC(int a0, VecFx32 *a1); diff --git a/include/unk_0206D494.h b/include/unk_0206D494.h index a2440167e..38b4c1ab1 100644 --- a/include/unk_0206D494.h +++ b/include/unk_0206D494.h @@ -5,8 +5,8 @@ #include "script.h" #include "task.h" -BOOL MonIsInGameTradePoke(POKEMON *pokemon, u8 tradeno); -BOOL sub_0206D8D0(POKEMON *pokemon, SAVEDATA *saveData); +BOOL MonIsInGameTradePoke(Pokemon *pokemon, u8 tradeno); +BOOL sub_0206D8D0(Pokemon *pokemon, SAVEDATA *saveData); BUGCONTEST *FieldSys_BugContest_get(FieldSystem *fsys); u16 *BugContest_GetSportBallsAddr(BUGCONTEST *contest); void FieldSys_IncrementBugContestTimer(FieldSystem *fsys, int a1); diff --git a/include/unk_0208E600.h b/include/unk_0208E600.h index 19c92a57a..9fcbffe86 100644 --- a/include/unk_0208E600.h +++ b/include/unk_0208E600.h @@ -3,7 +3,7 @@ #include "pokemon_types_def.h" -void MonSetTrainerMemo(POKEMON *pokemon, PLAYERPROFILE *profile, int strat, int mapsec, HeapID heapId); -BOOL sub_0208E9E0(u8 eventNo, POKEMON *pokemon, BOOL isMine); +void MonSetTrainerMemo(Pokemon *pokemon, PLAYERPROFILE *profile, int strat, int mapsec, HeapID heapId); +BOOL sub_0208E9E0(u8 eventNo, Pokemon *pokemon, BOOL isMine); #endif //POKEHEARTGOLD_UNK_0208E600_H diff --git a/include/unk_02092BE8.h b/include/unk_02092BE8.h index fd1587ff3..0a4d70890 100644 --- a/include/unk_02092BE8.h +++ b/include/unk_02092BE8.h @@ -53,7 +53,7 @@ void sub_02092FA8(GearPhoneRingManager* ptr); void GearPhone_ToggleRinging(GearPhoneRingManager* ptr, BOOL a1); BOOL sub_02093070(FieldSystem* sys); BOOL sub_020930C4(FieldSystem* sys); -BOOL sub_02093134(FieldSystem* sys, POKEMON * pkmn); +BOOL sub_02093134(FieldSystem* sys, Pokemon * pkmn); BOOL sub_0209316C(FieldSystem* sys); #endif //POKEHEARTGOLD_UNK_02092BE8_H diff --git a/include/update_dex_received.h b/include/update_dex_received.h index 13cdaced9..16d654ec4 100644 --- a/include/update_dex_received.h +++ b/include/update_dex_received.h @@ -3,6 +3,6 @@ #include "pokemon_types_def.h" -void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, POKEMON *pokemon); +void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *pokemon); #endif //POKEHEARTGOLD_UPDATE_DEX_RECEIVED_H diff --git a/include/use_item_on_mon.h b/include/use_item_on_mon.h index c400e662e..be38df22a 100644 --- a/include/use_item_on_mon.h +++ b/include/use_item_on_mon.h @@ -5,17 +5,17 @@ typedef struct ItemData ITEMDATA; -BOOL CanUseItemOnPokemon(POKEMON *pokemon, u16 itemID, s32 moveIdx, HeapID heapID); +BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapID); BOOL CanUseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, s32 moveIdx, HeapID heapID); -BOOL UseItemOnPokemon(POKEMON *pokemon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID); +BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID); BOOL UseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, u16 moveIdx, u16 location, HeapID heapID); -BOOL MonMoveCanRestorePP(POKEMON *pokemon, int moveIdx); -BOOL MonMoveRestorePP(POKEMON *pokemon, int moveIdx, int ppRestore); -BOOL BoostMonMovePpUpBy(POKEMON *pokemon, int moveIdx, int nPpUp); -void RestoreMonHPBy(POKEMON *pokemon, u32 hp, u32 maxHp, u32 restoration); +BOOL MonMoveCanRestorePP(Pokemon *pokemon, int moveIdx); +BOOL MonMoveRestorePP(Pokemon *pokemon, int moveIdx, int ppRestore); +BOOL BoostMonMovePpUpBy(Pokemon *pokemon, int moveIdx, int nPpUp); +void RestoreMonHPBy(Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration); s32 TryModEV(s32 ev, s32 evSum, s32 by); -BOOL CanItemModFriendship(POKEMON *pokemon, ITEMDATA *itemData); -BOOL DoItemFriendshipMod(POKEMON *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapID); +BOOL CanItemModFriendship(Pokemon *pokemon, ITEMDATA *itemData); +BOOL DoItemFriendshipMod(Pokemon *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapID); void HealParty(PARTY *party); #endif //POKEHEARTGOLD_USE_ITEM_ON_MON_H diff --git a/src/battle_arcade_game_board.c b/src/battle_arcade_game_board.c index e7f046c2c..9e46e305a 100644 --- a/src/battle_arcade_game_board.c +++ b/src/battle_arcade_game_board.c @@ -75,7 +75,7 @@ static void *BattleArcadeObj_Delete(BATTLE_ARCADE_OBJECT *obj); static void BattleArcadeObj_SetVisible(BATTLE_ARCADE_OBJECT *obj, int flag); static void BattleArcadeObj_SetPos(BATTLE_ARCADE_OBJECT *obj, u16 x, u16 y); static void BattleArcadeObj_SetAnimation(BATTLE_ARCADE_OBJECT *obj, u32 val); -static void ov84_0223F894(BATTLE_ARCADE_OBJECT *obj, POKEMON *mon); +static void ov84_0223F894(BATTLE_ARCADE_OBJECT *obj, Pokemon *mon); static void ov84_0223F8A8(BATTLE_ARCADE_OBJECT *obj, int flag); static void ov84_0223F8B4(BGCONFIG *config, WINDOW *window); static void ov84_0223F8E4(WINDOW *window); @@ -1152,7 +1152,7 @@ static u8 ov84_0223F178(GAME_BOARD_WORK *work, u8 a1) { static void ov84_0223F1BC(GAME_BOARD_WORK *work) { u8 partyCount, opponentPartyCount, i; - POKEMON *mon; + Pokemon *mon; partyCount = BattleArcade_GetMonCount(work->type, 1); opponentPartyCount = BattleArcade_GetOpponentMonCount(work->type, 1); @@ -1317,8 +1317,8 @@ static void ov84_0223F538(GAME_BOARD_SUB_3E8 *work) { static void ov84_0223F5E4(GAME_BOARD_SUB_3E8 *work, PARTY *playerParty, PARTY *opponentParty, u8 type) { u32 i; - POKEMON *playerMon; - POKEMON *opponentMon; + Pokemon *playerMon; + Pokemon *opponentMon; NARC *narc = NARC_ctor(20, HEAP_ID_GAME_BOARD); work->resourceObj[3][1] = AddPlttResObjFromNarc(work->resourceMan[1], 20, sub_02074490(), FALSE, 3, 1, 3, HEAP_ID_GAME_BOARD); @@ -1411,7 +1411,7 @@ static void BattleArcadeObj_SetAnimation(BATTLE_ARCADE_OBJECT *obj, u32 val) { sub_02024950(obj->sprite, val); } -static void ov84_0223F894(BATTLE_ARCADE_OBJECT *obj, POKEMON *mon) { +static void ov84_0223F894(BATTLE_ARCADE_OBJECT *obj, Pokemon *mon) { sub_02024AA8(obj->sprite, Pokemon_GetIconPalette(mon)); } diff --git a/src/battle_command.c b/src/battle_command.c index 1cadf74e2..32460ae23 100644 --- a/src/battle_command.c +++ b/src/battle_command.c @@ -1190,7 +1190,7 @@ BOOL BtlCmd_ShouldGetExp(BattleSystem *bsys, BATTLECONTEXT *ctx) { int expShareMonsCnt = 0; u16 totalExp; u16 itemNo; - POKEMON *mon; + Pokemon *mon; for (int i = 0; i < GetPartyCount(BattleSys_GetParty(bsys, 0)); i++) { mon = BattleSystem_GetPartyMon(bsys, 0, i); if (GetMonData(mon, MON_DATA_SPECIES, 0) && GetMonData(mon, MON_DATA_HP, 0)) { @@ -3129,7 +3129,7 @@ BOOL BtlCmd_TryWhirlwind(BattleSystem *bsys, BATTLECONTEXT *ctx) { if (battleType & BATTLE_TYPE_TRAINER) { PARTY *party; - POKEMON *mon; + Pokemon *mon; int partySize; int cnt = 0; int cntMax; @@ -3721,7 +3721,7 @@ BOOL BtlCmd_BeatUpDamageCalc(BattleSystem *bsys, BATTLECONTEXT *ctx) { int species; int forme; int level; - POKEMON *mon; + Pokemon *mon; BattleScriptIncrementPointer(ctx, 1); @@ -3866,7 +3866,7 @@ BOOL BtlCmd_TryAssist(BattleSystem *bsys, BATTLECONTEXT *ctx) { u16 avaliableMoves[6*4]; u16 move; int i, j, monCnt, moveCnt; - POKEMON *mon; + Pokemon *mon; BattleScriptIncrementPointer(ctx, 1); @@ -4855,7 +4855,7 @@ BOOL BtlCmd_Pickup(BattleSystem *bsys, BATTLECONTEXT *ctx) { int rnd, i, j, k; u16 species, item; u8 ability, lvl; - POKEMON *mon; + Pokemon *mon; BattleScriptIncrementPointer(ctx, 1); @@ -5478,7 +5478,7 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { int battlerId; int partyHp = 0; - POKEMON *mon; + Pokemon *mon; BattleScriptIncrementPointer(ctx, 1); @@ -5656,7 +5656,7 @@ BOOL BtlCmd_TryNaturalCure(BattleSystem *bsys, BATTLECONTEXT *ctx) { int battlerId = GetBattlerIDBySide(bsys, ctx, side); if (ctx->battleMons[battlerId].hp && ctx->selectedMonIndex[battlerId] != 6) { - POKEMON *mon = BattleSystem_GetPartyMon(bsys, battlerId, ctx->selectedMonIndex[battlerId]); + Pokemon *mon = BattleSystem_GetPartyMon(bsys, battlerId, ctx->selectedMonIndex[battlerId]); int ability = GetMonData(mon, MON_DATA_ABILITY, 0); int status = GetMonData(mon, MON_DATA_STATUS, 0); if (ctx->battleMons[battlerId].ability != ABILITY_NATURAL_CURE && !CheckNaturalCureOnSwitch(ctx, ability, status)) { diff --git a/src/choose_starter.c b/src/choose_starter.c index 305275d4d..e115e2861 100644 --- a/src/choose_starter.c +++ b/src/choose_starter.c @@ -51,7 +51,7 @@ static BOOL CreateStarter(TaskManager *taskManager) { env->args->cursorPos = 0; env->args->options = Sav2_PlayerData_GetOptionsAddr(fsys->savedata); for (i = 0; i < (int)NELEMS(species); i++) { - POKEMON *pokemon = &env->args->starters[i]; + Pokemon *pokemon = &env->args->starters[i]; PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(fsys->savedata); ZeroMonData(pokemon); CreateMon(pokemon, species[i], 5, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); @@ -75,7 +75,7 @@ static BOOL CreateStarter(TaskManager *taskManager) { case 3: { POKEDEX *pokedex = Sav2_Pokedex_get(fsys->savedata); party = SavArray_PlayerParty_get(fsys->savedata); - POKEMON *myChoice = &env->args->starters[env->args->cursorPos]; + Pokemon *myChoice = &env->args->starters[env->args->cursorPos]; if (AddMonToParty(party, myChoice)) { UpdatePokedexWithReceivedSpecies(fsys->savedata, myChoice); } diff --git a/src/choose_starter_app.c b/src/choose_starter_app.c index 56fc05795..3500a4c7b 100644 --- a/src/choose_starter_app.c +++ b/src/choose_starter_app.c @@ -191,7 +191,7 @@ struct ChooseStarterAppWork { STRING *strbuf; struct StarterChooseMonSpriteData monSpriteData; GFCameraTranslationWrapper *cameraTranslation; - POKEMON *choices[3]; // 578 + Pokemon *choices[3]; // 578 int modelAnimState; GXRgb edgeColorTable[8]; }; // size=0x598 diff --git a/src/encounter.c b/src/encounter.c index 7a8ce9079..c0c1ba1cf 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -832,7 +832,7 @@ void sub_020515FC(FieldSystem *fsys, PARTY *party, int battleFlags) { } static void sub_02051660(FieldSystem *fsys, BATTLE_SETUP *setup) { - POKEMON *mon; + Pokemon *mon; u32 battleFlags = setup->flags; int winFlag = setup->winFlag; diff --git a/src/field_blackthorn_tutors.c b/src/field_blackthorn_tutors.c index 97aaaea61..d7b0a3140 100644 --- a/src/field_blackthorn_tutors.c +++ b/src/field_blackthorn_tutors.c @@ -13,7 +13,7 @@ void MoveRelearner_delete(struct MoveRelearner *moveRelearner) { FreeToHeap(moveRelearner); } -u16 *GetEligibleLevelUpMoves(POKEMON *pokemon, HeapID heapId) { +u16 *GetEligibleLevelUpMoves(Pokemon *pokemon, HeapID heapId) { u16 cur_moveset[MON_MOVES]; // sp+10 u16 species; // sp+0C u8 forme; // sp+08 diff --git a/src/field_follow_poke.c b/src/field_follow_poke.c index e5a3dd750..d974bc6d9 100644 --- a/src/field_follow_poke.c +++ b/src/field_follow_poke.c @@ -1507,7 +1507,7 @@ LocalMapObject *sub_020699F8(MapObjectMan *mapObjectMan, int x, int y, int direc FieldSystem *fsys; PARTY *party; int partyCount; - POKEMON *pokemon; + Pokemon *pokemon; int species; int forme; int gender; @@ -1563,7 +1563,7 @@ void sub_02069B74(MapObjectMan *mapObjectMan, u32 mapno) { FieldSystem *fsys; PARTY *party; int partyCount; - POKEMON *pokemon; + Pokemon *pokemon; int species; int forme; u8 gender; @@ -1983,7 +1983,7 @@ s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk) { return GetMonData(unk->pokemon, MON_DATA_MOOD, NULL); } -void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, POKEMON *pokemon, u16 species, u32 personality) { +void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *pokemon, u16 species, u32 personality) { s8 mood; if (species != SPECIES_NONE && (a0->isRegistered == 0 || a0->species != species || a0->personality != personality)) { a0->species = species; diff --git a/src/field_roamer.c b/src/field_roamer.c index 17770e9d3..b7a18f952 100644 --- a/src/field_roamer.c +++ b/src/field_roamer.c @@ -171,7 +171,7 @@ void Save_CreateRoamerByID(SAVEDATA *saveData, u8 idx) { PLAYERPROFILE *profile; ROAMER_SAVE *roamerSave = Save_Roamers_get(saveData); ROAMER *roamerStats = Roamers_GetRoamMonStats(roamerSave, idx); - POKEMON *pokemon; + Pokemon *pokemon; u16 species; u8 level; diff --git a/src/get_egg.c b/src/get_egg.c index dce3847c2..c5e48dd6e 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -21,7 +21,7 @@ static u8 Sav2_DayCare_CountMonsInDayCare(DAYCARE *daycare); static int Sav2_DayCare_GetAvailableSlot(DAYCARE *daycare); static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON *daycareMon, SAVEDATA *saveData); static void Sav2_DayCare_Compaction(DAYCARE *daycare); -static void Daycare_LearnLevelUpMoves(POKEMON *pokemon); +static void Daycare_LearnLevelUpMoves(Pokemon *pokemon); static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt); static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps); static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *msgFmt); @@ -30,20 +30,20 @@ static void Daycare_GetBothBoxMonsPtr(DAYCARE *dayCare, BOXMON **boxmons); static int Daycare_EverstoneCheck(DAYCARE *dayCare); static void GenerateEggPID(DAYCARE *dayCare); static void _IVList_Remove(u8 *ptr, int idx); -static void InheritIVs(POKEMON *egg, DAYCARE *dayCare); -static u8 LoadEggMoves(POKEMON *pokemon, u16 *dest); -static void InheritMoves(POKEMON *egg, BOXMON *dad, BOXMON *mom); +static void InheritIVs(Pokemon *egg, DAYCARE *dayCare); +static u8 LoadEggMoves(Pokemon *pokemon, u16 *dest); +static void InheritMoves(Pokemon *egg, BOXMON *dad, BOXMON *mom); static u16 Daycare_BreedingIncenseCheck(u16 species, DAYCARE *dayCare); -static void Daycare_LightBallCheck(POKEMON *egg, DAYCARE *dayCare); +static void Daycare_LightBallCheck(Pokemon *egg, DAYCARE *dayCare); static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx); -static void SetBreedEggStats(POKEMON *pokemon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme); +static void SetBreedEggStats(Pokemon *pokemon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme); static u8 GetEggCyclesToSubtract(PARTY *party); static BOOL sub_0206CB88(const u16 *a0, const u16 *a1); static u8 ComputeCompatibilityBetweenBoxMons(BOXMON **parents); static u8 Sav2_DayCare_CalcCompatibilityInternal(DAYCARE *dayCare); static u8 sub_0206CCD8(FieldSystem *fsys); static u8 ConvertDayCareCompatibilityScore(u32 compatibility); -static void sub_0206D038(POKEMON *pokemon, HeapID heapId); +static void sub_0206D038(Pokemon *pokemon, HeapID heapId); static BOOL DayCare_TryGetForcedInheritedIV(DAYCARE *dayCare, u8 *a1, u8 *a2); static BOOL PowerItemIdToInheritedIvIdx(u16 itemId, u8 *a1); @@ -84,7 +84,7 @@ static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON u8 mood; DAYCAREMAIL *daycareMail; BOXMON *boxmon; - POKEMON *partymon; + Pokemon *partymon; const u16 *playerNamePtr; partymon = GetPartyMonByIndex(party, partyIdx); @@ -128,7 +128,7 @@ static void Sav2_DayCare_Compaction(DAYCARE *daycare) { } } -static void Daycare_LearnLevelUpMoves(POKEMON *pokemon) { +static void Daycare_LearnLevelUpMoves(Pokemon *pokemon) { int i; int last_i; u16 learned; @@ -154,7 +154,7 @@ static void Daycare_LearnLevelUpMoves(POKEMON *pokemon) { static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt) { u32 exp; - POKEMON *pokemon; + Pokemon *pokemon; BOXMON *boxmon; DAYCAREMAIL *daycareMail; u16 species; @@ -192,7 +192,7 @@ u16 Sav2_DayCare_RetrieveMon(PARTY *party, MSGFMT *msgFmt, DAYCARE *daycare, u8 } static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps) { - POKEMON *pokemon_tmp; + Pokemon *pokemon_tmp; BOXMON *boxmon_tmp; u32 exp; u32 level; @@ -341,7 +341,7 @@ static void _IVList_Remove(u8 *ptr, int idx) { } } -static void InheritIVs(POKEMON *egg, DAYCARE *dayCare) { +static void InheritIVs(Pokemon *egg, DAYCARE *dayCare) { u8 sp10[3]; u8 spA[6]; u8 sp7[3]; @@ -406,7 +406,7 @@ static void InheritIVs(POKEMON *egg, DAYCARE *dayCare) { } } -static u8 LoadEggMoves(POKEMON *pokemon, u16 *dest) { +static u8 LoadEggMoves(Pokemon *pokemon, u16 *dest) { u16 n; u16 *kowaza_list; u16 offset; @@ -444,7 +444,7 @@ struct EggMoveSearch { u16 baby_egg_moves[16]; }; -static void InheritMoves(POKEMON *egg, BOXMON *dad, BOXMON *mom) { +static void InheritMoves(Pokemon *egg, BOXMON *dad, BOXMON *mom) { u16 sp1C; u16 egg_species; u16 learnset_size; @@ -562,7 +562,7 @@ static u16 Daycare_BreedingIncenseCheck(u16 species, DAYCARE *dayCare) { return species; } -static void Daycare_LightBallCheck(POKEMON *egg, DAYCARE *dayCare) { +static void Daycare_LightBallCheck(Pokemon *egg, DAYCARE *dayCare) { BOXMON *parents[2]; int item1, item2; @@ -622,7 +622,7 @@ static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx) { return pms; } -void SetEggStats(POKEMON *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5) { +void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5) { u32 otId; u32 gender; u16 pokeball; @@ -661,7 +661,7 @@ void SetEggStats(POKEMON *pokemon, int species, u8 metLocation, PLAYERPROFILE *p MonSetTrainerMemo(pokemon, profile, a4, a5, 0); } -static void SetBreedEggStats(POKEMON *pokemon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme) { +static void SetBreedEggStats(Pokemon *pokemon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme) { u16 pokeball; u8 metLevel; u8 friendship; @@ -696,7 +696,7 @@ static void SetBreedEggStats(POKEMON *pokemon, u16 species, DAYCARE *dayCare, u3 } void GiveEggToPlayer(DAYCARE *dayCare, PARTY *party, PLAYERPROFILE* profile) { - POKEMON *pokemon; + Pokemon *pokemon; u16 species; u8 gender_idx[2]; u8 isEgg; @@ -857,7 +857,7 @@ BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys) { u8 steps; u8 compat; u8 to_sub; - POKEMON *pokemon; + Pokemon *pokemon; Daycare_GetBothBoxMonsPtr(dayCare, parents); n = 0; @@ -902,9 +902,9 @@ BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys) { return FALSE; } -POKEMON *sub_0206CE44(PARTY *party) { +Pokemon *sub_0206CE44(PARTY *party) { int i, n; - POKEMON *pokemon; + Pokemon *pokemon; n = GetPartyCount(party); for (i = 0; i < n; i++) { @@ -1004,7 +1004,7 @@ u8 Sav2_DayCare_CalcCompatibility(DAYCARE *dayCare) { return ConvertDayCareCompatibilityScore(Sav2_DayCare_CalcCompatibilityInternal(dayCare)); } -static void sub_0206D038(POKEMON *pokemon, HeapID heapId) { +static void sub_0206D038(Pokemon *pokemon, HeapID heapId) { u16 moves[MON_MOVES]; u8 pp[MON_MOVES]; u32 otId; @@ -1025,7 +1025,7 @@ static void sub_0206D038(POKEMON *pokemon, HeapID heapId) { STRING *string; u8 i; u32 pid; - POKEMON *tmpMon; + Pokemon *tmpMon; string = String_ctor(OT_NAME_LENGTH + 1, heapId); tmpMon = AllocMonZeroed(heapId); @@ -1094,7 +1094,7 @@ static void sub_0206D038(POKEMON *pokemon, HeapID heapId) { FreeToHeap(tmpMon); } -void sub_0206D328(POKEMON *pokemon, HeapID heapId) { +void sub_0206D328(Pokemon *pokemon, HeapID heapId) { u16 nickname[POKEMON_NAME_LENGTH + 1]; u8 isEgg = 70; u8 hasNickname = FALSE; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2189bfc70..d90114193 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -34,7 +34,7 @@ void Sav2_HOF_RecordParty(HALL_OF_FAME *hof, PARTY *party, RTCDate *date) { MI_CpuClear16(team->party, sizeof(team->party)); for (i = 0, j = 0; i < npokes; i++) { - POKEMON *pokemon = GetPartyMonByIndex(party, i); + Pokemon *pokemon = GetPartyMonByIndex(party, i); BOOL lock = AcquireMonLock(pokemon); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { team->party[j].species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); diff --git a/src/mail.c b/src/mail.c index 5ae1535ff..1580ce68e 100644 --- a/src/mail.c +++ b/src/mail.c @@ -94,7 +94,7 @@ void Mail_SetNewMessageDetails(MAIL *mail, u8 mailType, u8 mon_no, SAVEDATA *sav u32 icon, isEgg, forme; PLAYERPROFILE *profile; PARTY *party; - POKEMON *pokemon; + Pokemon *pokemon; Mail_init(mail); mail->mail_type = mailType; @@ -136,7 +136,7 @@ void Mail_SetNewMessageDetails(MAIL *mail, u8 mailType, u8 mon_no, SAVEDATA *sav } } -MAIL *CreateKenyaMail(POKEMON *pokemon, u8 mailType, u8 gender, STRING *name, u8 otId) { +MAIL *CreateKenyaMail(Pokemon *pokemon, u8 mailType, u8 gender, STRING *name, u8 otId) { u8 r0; u32 r5; u16 species; diff --git a/src/mail_misc.c b/src/mail_misc.c index 61248d799..a0fce3450 100644 --- a/src/mail_misc.c +++ b/src/mail_misc.c @@ -195,7 +195,7 @@ Unk02090E68 *sub_02090EC0(SAVEDATA *saveData, int n, u16 i, HeapID heapId) { return ptr; } -Unk02090E68 *sub_02090F00(SAVEDATA *saveData, POKEMON *pokemon, HeapID heapId) { +Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *pokemon, HeapID heapId) { Unk02090E68 *ptr = AllocFromHeapAtEnd(heapId, sizeof(Unk02090E68)); MI_CpuFill8(ptr, 0, sizeof(Unk02090E68)); @@ -227,7 +227,7 @@ u32 sub_02090F6C(Unk02090E68 *a0) { return a0->unk4; } -BOOL sub_02090F70(Unk02090E68 *a0, POKEMON *pokemon) { +BOOL sub_02090F70(Unk02090E68 *a0, Pokemon *pokemon) { if (sub_02090F6C(a0) == 0) { return FALSE; } @@ -242,7 +242,7 @@ void sub_02090F90(Unk02090E68 *a0) { FreeToHeap(a0); } -int sub_02090FA8(MAILBOX *mailbox, POKEMON *pokemon, HeapID heapId) { +int sub_02090FA8(MAILBOX *mailbox, Pokemon *pokemon, HeapID heapId) { int item = ITEM_NONE; int idx = Mailbox_GetFirstEmptySlotIdx(mailbox); @@ -260,7 +260,7 @@ int sub_02090FA8(MAILBOX *mailbox, POKEMON *pokemon, HeapID heapId) { return -1; } -int sub_02091004(MAIL *msgs, int i, POKEMON *pokemon, HeapID heapId) { +int sub_02091004(MAIL *msgs, int i, Pokemon *pokemon, HeapID heapId) { int item = ITEM_NONE; MAIL *mail = Mailbox_AllocAndFetchMailI(msgs, 0, i, heapId); diff --git a/src/npc_trade.c b/src/npc_trade.c index 3235bb530..37b21351c 100644 --- a/src/npc_trade.c +++ b/src/npc_trade.c @@ -14,14 +14,14 @@ struct _NPC_TRADE_WORK { NPC_TRADE *trade_dat; - POKEMON *pokemon; + Pokemon *pokemon; PLAYERPROFILE *profile; u32 tradeno; HeapID heapId; }; static STRING *_GetNpcTradeName(HeapID heapId, s32 msgno); -static void _CreateTradeMon(POKEMON *pokemon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId); +static void _CreateTradeMon(Pokemon *pokemon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId); NPC_TRADE_WORK *NPCTrade_AllocWork(HeapID heapId, u32 tradeno) { NPC_TRADE_WORK *ret; @@ -56,9 +56,9 @@ void NPCTrade_DeleteWork(NPC_TRADE_WORK *work) { void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 mapno) { PARTY *party; - POKEMON *pokemon; + Pokemon *pokemon; NPC_TRADE *trade_dat; - POKEMON *givenMon; + Pokemon *givenMon; STRING *name; MAIL *mail; u8 mailno; @@ -84,9 +84,9 @@ void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 ma MAIL *NPCTrade_MakeKenyaMail(void) { PARTY *party; - POKEMON *pokemon; + Pokemon *pokemon; NPC_TRADE *trade_dat; - POKEMON *givenMon; + Pokemon *givenMon; STRING *name; MAIL *mail; u8 mailno; @@ -105,7 +105,7 @@ MAIL *NPCTrade_MakeKenyaMail(void) { int NPCTrade_CanGiveUpLoanMon(FieldSystem *fsys, u8 tradeno, u8 idx) { PARTY *party; - POKEMON *pokemon, *cur_poke; + Pokemon *pokemon, *cur_poke; u8 capsule; u16 heldItem; int i, n, party_count; @@ -158,8 +158,8 @@ void NPCTrade_ReceiveMonToSlot(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot UpdatePokedexWithReceivedSpecies(fsys->savedata, work->pokemon); } -void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot, TRADE_ANIM_WORK *anim_work, POKEMON *my_mon_buf, POKEMON *trade_mon_buf) { - POKEMON *my_poke; +void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf) { + Pokemon *my_poke; u32 time_of_day; my_poke = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); @@ -191,7 +191,7 @@ static STRING *_GetNpcTradeName(HeapID heapId, s32 msgno) { return ret; } -static void _CreateTradeMon(POKEMON *pokemon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId) { +static void _CreateTradeMon(Pokemon *pokemon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId) { STRING *name; u8 nickname_flag; u32 mapsec; diff --git a/src/overlay_01_rock_smash_item.c b/src/overlay_01_rock_smash_item.c index e8d487bb5..56a329044 100644 --- a/src/overlay_01_rock_smash_item.c +++ b/src/overlay_01_rock_smash_item.c @@ -136,7 +136,7 @@ static BOOL CheckRockSmashItemDrop(FieldSystem *fsys, RockSmashItemCheckWork *en GF_ASSERT(FALSE); return FALSE; } - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), 0); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), 0); if (GetMonData(mon, MON_DATA_IS_EGG, NULL) == 0) { ability = GetMonData(mon, MON_DATA_ABILITY, NULL); } else { diff --git a/src/overlay_36.c b/src/overlay_36.c index 7198ef092..ee1eeb5c2 100644 --- a/src/overlay_36.c +++ b/src/overlay_36.c @@ -203,7 +203,7 @@ static void InitGameStateAfterOakSpeech_Internal(HeapID heap_id, SAVEDATA* saved // Put an email from your friend into your PC. friend_names_msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0445_bin, 3); MAILBOX* mailbox = Sav2_Mailbox_get(savedata); - POKEMON* friend_pokemon = AllocMonZeroed(3); + Pokemon* friend_pokemon = AllocMonZeroed(3); CreateMon(friend_pokemon, SPECIES_MARILL, 1, 0, FALSE, 0, OT_ID_PLAYER_ID, 0); diff --git a/src/overlay_94.c b/src/overlay_94.c index e61a77862..6c18aa448 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -43,7 +43,7 @@ void PartyMenu_InitIconFormeChangeWork(PartyMenuStruct* unkPtr) { BOOL PartyMenu_AnimateIconFormeChange(PartyMenuStruct* unkPtr) { IconFormeChangeWork* work = unkPtr->iconFormeChange; - POKEMON* pokemon = GetPartyMonByIndex(unkPtr->unk654->party, unkPtr->partyMonIndex); + Pokemon* pokemon = GetPartyMonByIndex(unkPtr->unk654->party, unkPtr->partyMonIndex); switch (work->state) { case 0: diff --git a/src/overlay_bug_contest.c b/src/overlay_bug_contest.c index c486c35f9..f4a40e681 100644 --- a/src/overlay_bug_contest.c +++ b/src/overlay_bug_contest.c @@ -28,7 +28,7 @@ void BugContest_BackUpParty(BUGCONTEST *bugContest); void BugContest_InitOpponents(BUGCONTEST *bugContest); void BugContest_InitEncounters(BUGCONTEST *bugContest); void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, POKEMON *pokemon); +u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon); BUGCONTEST *BugContest_new(FieldSystem *fsys, u32 weekday) { BUGCONTEST *bugContest; @@ -202,7 +202,7 @@ void BugContest_BackUpParty(BUGCONTEST *bugContest) { } void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest) { - POKEMON *pokemon; + Pokemon *pokemon; PARTY_EXTRA_SUB sub; // Restore the player's party to its prior state, but keep the @@ -306,7 +306,7 @@ void BugContest_InitEncounters(BUGCONTEST *bugContest) { FS_CloseFile(&file); } -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, POKEMON *pokemon) { +u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon) { u16 score = 0; int i; u16 species; diff --git a/src/party.c b/src/party.c index 7ca5923dd..1180920f8 100644 --- a/src/party.c +++ b/src/party.c @@ -40,7 +40,7 @@ void InitPartyWithMaxSize(PARTY *party, int maxSize) { MI_CpuClear8(&party->extra, 5 * party->core.maxCount); } -BOOL AddMonToParty(PARTY *party, const POKEMON *pokemon) { +BOOL AddMonToParty(PARTY *party, const Pokemon *pokemon) { if (party->core.curCount >= party->core.maxCount) { return FALSE; } @@ -71,7 +71,7 @@ int GetPartyCount(const PARTY *party) { return party->core.curCount; } -POKEMON *GetPartyMonByIndex(PARTY *party, int slot) { +Pokemon *GetPartyMonByIndex(PARTY *party, int slot) { PARTY_ASSERT_SLOT(party, slot); return &party->core.mons[slot]; } @@ -91,7 +91,7 @@ void Party_ResetUnkSubSlot(PARTY *party, int slot) { MI_CpuClear8(&party->extra.unk_00[slot], sizeof(PARTY_EXTRA_SUB)); } -void Party_SafeCopyMonToSlot_ResetUnkSub(PARTY *party, int slot, POKEMON *src) { +void Party_SafeCopyMonToSlot_ResetUnkSub(PARTY *party, int slot, Pokemon *src) { PARTY_ASSERT_SLOT(party, slot); { BOOL valid = GetMonData(&party->core.mons[slot], MON_DATA_SPECIES_EXISTS, NULL) - GetMonData(src, MON_DATA_SPECIES_EXISTS, NULL); @@ -103,11 +103,11 @@ void Party_SafeCopyMonToSlot_ResetUnkSub(PARTY *party, int slot, POKEMON *src) { BOOL Party_SwapSlots(PARTY *party, int slotA, int slotB) { PARTY_EXTRA_SUB tmp_PARTY_EXTRA_SUB; - POKEMON *tmp_POKEMON; + Pokemon *tmp_POKEMON; PARTY_ASSERT_SLOT(party, slotA); PARTY_ASSERT_SLOT(party, slotB); - tmp_POKEMON = AllocFromHeap(0, sizeof(POKEMON)); + tmp_POKEMON = AllocFromHeap(0, sizeof(Pokemon)); *tmp_POKEMON = party->core.mons[slotA]; party->core.mons[slotA] = party->core.mons[slotB]; party->core.mons[slotB] = *tmp_POKEMON; diff --git a/src/pokedex.c b/src/pokedex.c index 75d5da903..f8e20a1a3 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -314,7 +314,7 @@ static BOOL Pokedex_CheckSeenDeoxysForme(POKEDEX *pokedex, u32 forme) { return FALSE; } -static void Pokedex_SetSeenDeoxysForme(POKEDEX *pokedex, u16 species, POKEMON *pokemon) { +static void Pokedex_SetSeenDeoxysForme(POKEDEX *pokedex, u16 species, Pokemon *pokemon) { u8 forme; forme = GetMonData(pokemon, MON_DATA_FORME, NULL); @@ -377,7 +377,7 @@ static void Pokedex_SetSeenRotomForme(POKEDEX *pokedex, u32 species, u32 forme) } } -static void Pokedex_TryAppendSeenForme(POKEDEX *pokedex, u16 species, POKEMON *pokemon) { +static void Pokedex_TryAppendSeenForme(POKEDEX *pokedex, u16 species, Pokemon *pokemon) { u32 forme; forme = GetMonData(pokemon, MON_DATA_FORME, NULL); @@ -762,7 +762,7 @@ static u32 Pokedex_GetSeenFormeNum_Deoxys(POKEDEX *pokedex) { return Pokedex_CountSeenDeoxysFormes(pokedex); } -void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, POKEMON *pokemon) { +void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *pokemon) { u16 species; u32 personality; u32 gender; @@ -790,7 +790,7 @@ void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, POKEMON *pokemon) { } } -void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, POKEMON *pokemon) { +void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *pokemon) { u16 species; u32 language; u32 personality; diff --git a/src/pokemon.c b/src/pokemon.c index eb6bbdb57..243659366 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -27,11 +27,11 @@ u32 CalcMonChecksum(void *data, u32 size); void InitBoxMonMoveset(BOXMON *boxmon); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *dest); u16 ModifyStatByNature(u8 nature, u16 stat, u8 statID); -static u32 GetMonDataInternal(POKEMON * pokemon, int attr, void * dest); +static u32 GetMonDataInternal(Pokemon * pokemon, int attr, void * dest); static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest); -static void SetMonDataInternal(POKEMON * pokemon, int attr, const void * data); +static void SetMonDataInternal(Pokemon * pokemon, int attr, const void * data); static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * data); -static void AddMonDataInternal(POKEMON * pokemon, int attr, int value); +static void AddMonDataInternal(Pokemon * pokemon, int attr, int value); static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value); PokemonDataBlock *GetSubstruct(BOXMON *boxmon, u32 pid, u8 which_struct); void LoadMonPersonal(int species, BASE_STATS *dest); @@ -48,7 +48,7 @@ u8 sub_020708D8(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid); void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C *a3); int TrainerClassToBackpicID(int trainer_class, int a1); void LoadMonEvolutionTable(u16 species, struct Evolution *evoTable); -BOOL MonHasMove(POKEMON *pokemon, u16 move_id); +BOOL MonHasMove(Pokemon *pokemon, u16 move_id); void sub_0207213C(BOXMON *boxmon, PLAYERPROFILE *playerProfile, 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); @@ -95,8 +95,8 @@ static const s8 sFlavorPreferencesByNature[NATURE_NUM][FLAVOR_MAX] = { { 0, 0, 0, 0, 0}, }; -void ZeroMonData(POKEMON *pokemon) { - MI_CpuClearFast(pokemon, sizeof(POKEMON)); +void ZeroMonData(Pokemon *pokemon) { + MI_CpuClearFast(pokemon, sizeof(Pokemon)); ENCRYPT_BOX(&pokemon->box); ENCRYPT_PTY(pokemon); } @@ -107,16 +107,16 @@ void ZeroBoxMonData(BOXMON *boxmon) { } u32 SizeOfStructPokemon(void) { - return sizeof(POKEMON); + return sizeof(Pokemon); } -POKEMON *AllocMonZeroed(HeapID heapId) { - POKEMON *ret = (POKEMON *)AllocFromHeap(heapId, sizeof(POKEMON)); +Pokemon *AllocMonZeroed(HeapID heapId) { + Pokemon *ret = (Pokemon *)AllocFromHeap(heapId, sizeof(Pokemon)); ZeroMonData(ret); return ret; } -BOOL AcquireMonLock(POKEMON *pokemon) { +BOOL AcquireMonLock(Pokemon *pokemon) { BOOL locked = FALSE; if (!pokemon->box.party_lock) { locked = TRUE; @@ -129,7 +129,7 @@ BOOL AcquireMonLock(POKEMON *pokemon) { return locked; } -BOOL ReleaseMonLock(POKEMON *pokemon, BOOL locked) { +BOOL ReleaseMonLock(Pokemon *pokemon, BOOL locked) { BOOL prev = FALSE; if (pokemon->box.party_lock == TRUE && locked == TRUE) { prev = TRUE; @@ -162,7 +162,7 @@ BOOL ReleaseBoxMonLock(BOXMON *boxmon, BOOL locked) { } return prev; } -void CreateMon(POKEMON * pokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { +void CreateMon(Pokemon * pokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { MAIL * mail; u32 capsule; CAPSULE seal_coords; @@ -252,7 +252,7 @@ void CreateBoxMon(BOXMON * boxPokemon, int species, int level, int fixedIV, int ReleaseBoxMonLock(boxPokemon, decry); } -void CreateMonWithNature(POKEMON * pokemon, u16 species, u8 level, u8 fixedIv, u8 nature) { +void CreateMonWithNature(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 nature) { u32 personality; do { personality = (u32)(LCRandom() | (LCRandom() << 16)); @@ -260,7 +260,7 @@ void CreateMonWithNature(POKEMON * pokemon, u16 species, u8 level, u8 fixedIv, u CreateMon(pokemon, (int)species, (int)level, (int)fixedIv, TRUE, (int)personality, (int)0, (int)0); } -void CreateMonWithGenderNatureLetter(POKEMON * pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter) { +void CreateMonWithGenderNatureLetter(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter) { u32 pid = 0; u16 test = 0; if (letter != 0 && letter < 29) { @@ -294,13 +294,13 @@ u32 GenPersonalityByGenderAndNature(u16 species, u8 gender, u8 nature) { return (u32)pid; } -void CreateMonWithFixedIVs(POKEMON * pokemon, int species, int level, int ivs, int personality) { +void CreateMonWithFixedIVs(Pokemon * pokemon, int species, int level, int ivs, int personality) { CreateMon(pokemon, species, level, 0, 1, personality, 0, 0); SetMonData(pokemon, MON_DATA_IVS_WORD, &ivs); CalcMonLevelAndStats(pokemon); } -void CalcMonLevelAndStats(POKEMON * pokemon) { +void CalcMonLevelAndStats(Pokemon * pokemon) { BOOL decry = AcquireMonLock(pokemon); u32 level = (u32)CalcMonLevel(pokemon); SetMonData(pokemon, MON_DATA_LEVEL, &level); @@ -308,7 +308,7 @@ void CalcMonLevelAndStats(POKEMON * pokemon) { ReleaseMonLock(pokemon, decry); } -void CalcMonStats(POKEMON * pokemon) { +void CalcMonStats(Pokemon * pokemon) { BASE_STATS * baseStats; int level; int maxHp; @@ -404,7 +404,7 @@ void CalcMonStats(POKEMON * pokemon) { ReleaseMonLock(pokemon, decry); } -u32 GetMonData(POKEMON * pokemon, int attr, void * dest) { +u32 GetMonData(Pokemon * pokemon, int attr, void * dest) { u32 ret; u32 checksum; if (!pokemon->box.party_lock) { @@ -424,7 +424,7 @@ u32 GetMonData(POKEMON * pokemon, int attr, void * dest) { return ret; } -static u32 GetMonDataInternal(POKEMON * pokemon, int attr, void * dest) { +static u32 GetMonDataInternal(Pokemon * pokemon, int attr, void * dest) { switch (attr) { case MON_DATA_STATUS: return pokemon->party.status; @@ -887,7 +887,7 @@ static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest) { return ret; } -void SetMonData(POKEMON * pokemon, int attr, void * value) { +void SetMonData(Pokemon * pokemon, int attr, void * value) { u32 checksum; if (!pokemon->box.party_lock) { DECRYPT_PTY(pokemon); @@ -908,7 +908,7 @@ void SetMonData(POKEMON * pokemon, int attr, void * value) { } } -static void SetMonDataInternal(POKEMON * pokemon, int attr, const void * value) { +static void SetMonDataInternal(Pokemon * pokemon, int attr, const void * value) { #define VALUE(type) (*(const type *)value) switch (attr) { case MON_DATA_STATUS: @@ -1353,7 +1353,7 @@ static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * value) #undef VALUE } -void AddMonData(POKEMON * pokemon, int attr, int value) { +void AddMonData(Pokemon * pokemon, int attr, int value) { u32 checksum; if (!pokemon->box.party_lock) { DECRYPT_PTY(pokemon); @@ -1373,7 +1373,7 @@ void AddMonData(POKEMON * pokemon, int attr, int value) { } } -static void AddMonDataInternal(POKEMON * pokemon, int attr, int value) { +static void AddMonDataInternal(Pokemon * pokemon, int attr, int value) { s32 maxHp; switch (attr) { case MON_DATA_HP: @@ -1867,7 +1867,7 @@ int GetMonBaseStatEx_HandleAlternateForme(NARC *narc, int species, int forme, Ba return ret; } -u8 GetPercentProgressTowardsNextLevel(POKEMON * pokemon) { +u8 GetPercentProgressTowardsNextLevel(Pokemon * pokemon) { BOOL decry = AcquireMonLock(pokemon); u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); @@ -1878,7 +1878,7 @@ u8 GetPercentProgressTowardsNextLevel(POKEMON * pokemon) { return (u8)(100 * (cur - lo) / (hi - lo)); } -u32 CalcMonExpToNextLevel(POKEMON * pokemon) { +u32 CalcMonExpToNextLevel(Pokemon * pokemon) { return CalcBoxMonExpToNextLevel(&pokemon->box); } @@ -1890,7 +1890,7 @@ u32 CalcBoxMonExpToNextLevel(BOXMON * boxmon) { return hi - cur; } -u32 GetMonBaseExperienceAtCurrentLevel(POKEMON * pokemon) { +u32 GetMonBaseExperienceAtCurrentLevel(Pokemon * pokemon) { int species = (int)GetMonData(pokemon, MON_DATA_SPECIES, NULL); int level = (int)GetMonData(pokemon, MON_DATA_LEVEL, NULL); return GetMonExpBySpeciesAndLevel(species, level); @@ -1917,7 +1917,7 @@ u32 GetExpByGrowthRateAndLevel(int growthRate, int level) { return ret; } -int CalcMonLevel(POKEMON * pokemon) { +int CalcMonLevel(Pokemon * pokemon) { return CalcBoxMonLevel(&pokemon->box); } @@ -1950,7 +1950,7 @@ int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 specie return i - 1; } -u8 GetMonNature(POKEMON * pokemon) { +u8 GetMonNature(Pokemon * pokemon) { return GetBoxMonNature(&pokemon->box); } @@ -2032,7 +2032,7 @@ static const s8 sFriendshipModTable[FRIENDSHIP_EVENT_NUM][FRIENDSHIP_TIER_NUM] = { 3, 2, 1}, // FRIENDHSIP_EVENT_CONTEST_WIN }; -void MonApplyFriendshipMod(POKEMON * pokemon, u8 kind, u16 location) { +void MonApplyFriendshipMod(Pokemon * pokemon, u8 kind, u16 location) { u16 species; u8 effect; u8 tier; @@ -2068,7 +2068,7 @@ void MonApplyFriendshipMod(POKEMON * pokemon, u8 kind, u16 location) { SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); } -u8 GetMonGender(POKEMON *pokemon) { +u8 GetMonGender(Pokemon *pokemon) { return GetBoxMonGender(&pokemon->box); } @@ -2112,7 +2112,7 @@ BOOL BoxMonIsHoldingMail(BOXMON *boxmon) { return ItemIdIsMail(GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL)); } -u8 MonIsShiny(POKEMON *pokemon) { +u8 MonIsShiny(Pokemon *pokemon) { return BoxMonIsShiny(&pokemon->box); } @@ -2746,14 +2746,14 @@ void sub_02070D84(s32 trainer_class, s32 a1, struct UnkStruct_02070D3C *a2) { } u32 sub_02070D90(void) { - return sizeof(POKEMON); + return sizeof(Pokemon); } u32 sub_02070D94(void) { return sizeof(BOXMON); } -u8 GetMonUnownLetter(POKEMON * pokemon) { +u8 GetMonUnownLetter(Pokemon * pokemon) { return GetBoxMonUnownLetter(&pokemon->box); } @@ -2761,11 +2761,11 @@ u8 GetBoxMonUnownLetter(BOXMON * boxmon) { return (u8)GetBoxMonData(boxmon, MON_DATA_FORME, NULL); } -BOXMON * Mon_GetBoxMon(POKEMON * pokemon) { +BOXMON * Mon_GetBoxMon(Pokemon * pokemon) { return &pokemon->box; } -BOOL Pokemon_TryLevelUp(POKEMON * pokemon) { +BOOL Pokemon_TryLevelUp(Pokemon * pokemon) { u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); u8 level = (u8)(GetMonData(pokemon, MON_DATA_LEVEL, NULL) + 1); u32 exp = GetMonData(pokemon, MON_DATA_EXPERIENCE, NULL); @@ -2784,7 +2784,7 @@ BOOL Pokemon_TryLevelUp(POKEMON * pokemon) { return FALSE; } -u16 GetMonEvolution(PARTY *party, POKEMON *pokemon, u8 context, u16 usedItem, int *method_ret) { +u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, int *method_ret) { u16 species; u16 heldItem; u8 level; @@ -3062,7 +3062,7 @@ void InitBoxMonMoveset(BOXMON * boxmon) { ReleaseBoxMonLock(boxmon, decry); } -u32 TryAppendMonMove(POKEMON *pokemon, u16 move) { +u32 TryAppendMonMove(Pokemon *pokemon, u16 move) { return TryAppendBoxMonMove(Mon_GetBoxMon(pokemon), move); } @@ -3087,7 +3087,7 @@ u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move) { return ret; } -void DeleteMonFirstMoveAndAppend(POKEMON *pokemon, u16 move_id) { +void DeleteMonFirstMoveAndAppend(Pokemon *pokemon, u16 move_id) { DeleteBoxMonFirstMoveAndAppend(Mon_GetBoxMon(pokemon), move_id); } @@ -3117,7 +3117,7 @@ void DeleteBoxMonFirstMoveAndAppend(BOXMON * boxmon, u16 move) { ReleaseBoxMonLock(boxmon, decry); } -void MonSetMoveInSlot_ResetPpUp(POKEMON* pokemon, u16 move, u8 slot) { +void MonSetMoveInSlot_ResetPpUp(Pokemon* pokemon, u16 move, u8 slot) { int pp; int ppUp; @@ -3128,7 +3128,7 @@ void MonSetMoveInSlot_ResetPpUp(POKEMON* pokemon, u16 move, u8 slot) { SetMonData(pokemon, MON_DATA_MOVE1PP + slot, &pp); } -void MonSetMoveInSlot(POKEMON* pokemon, u16 move, u8 slot) { +void MonSetMoveInSlot(Pokemon* pokemon, u16 move, u8 slot) { BoxMonSetMoveInSlot(&pokemon->box, move, slot); } @@ -3142,7 +3142,7 @@ void BoxMonSetMoveInSlot(BOXMON* boxmon, u16 move, u8 slot) { SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot, &pp); } -u32 MonTryLearnMoveOnLevelUp(POKEMON * pokemon, int * last_i, u16 * sp0) { +u32 MonTryLearnMoveOnLevelUp(Pokemon * pokemon, int * last_i, u16 * sp0) { u32 ret = 0; u16 * wotbl = AllocFromHeap(0, 22 * sizeof(u16)); u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); @@ -3170,7 +3170,7 @@ u32 MonTryLearnMoveOnLevelUp(POKEMON * pokemon, int * last_i, u16 * sp0) { return ret; } -void MonSwapMoves(POKEMON *pokemon, int a, int b) { +void MonSwapMoves(Pokemon *pokemon, int a, int b) { BoxMonSwapMoves(&pokemon->box, a, b); } @@ -3194,7 +3194,7 @@ void BoxMonSwapMoves(BOXMON * boxmon, int slot1, int slot2) { SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot2, &ppUp[0]); } -void MonDeleteMoveSlot(POKEMON * pokemon, u32 slot) { +void MonDeleteMoveSlot(Pokemon * pokemon, u32 slot) { u16 move; u8 pp; u8 ppUp; @@ -3214,7 +3214,7 @@ void MonDeleteMoveSlot(POKEMON * pokemon, u32 slot) { SetMonData(pokemon, MON_DATA_MOVE1PPUP + 3, &ppUp); } -BOOL MonHasMove(POKEMON* pokemon, u16 move) { +BOOL MonHasMove(Pokemon* pokemon, u16 move) { int i; for (i = 0; i < 4; i++) { if (GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL) == move) { @@ -3228,7 +3228,7 @@ BOOL MonHasMove(POKEMON* pokemon, u16 move) { } } -void CopyBoxPokemonToPokemon(const BOXMON * src, POKEMON * dest) { +void CopyBoxPokemonToPokemon(const BOXMON * src, Pokemon * dest) { u32 sp0 = 0; CAPSULE sp4; struct Mail * mail; @@ -3253,7 +3253,7 @@ u8 Party_GetMaxLevel(PARTY * party) { u8 ret = 1; u8 level; for (i = 0; i < r7; i++) { - POKEMON * pokemon = GetPartyMonByIndex(party, i); + Pokemon * pokemon = GetPartyMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE && !GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); @@ -3274,7 +3274,7 @@ u16 *LoadSpeciesToJohtoDexNoLUT(void) { return AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_poketool_johtozukan, 0, 3); } -void CopyPokemonToPokemon(const POKEMON *src, POKEMON *dest) { +void CopyPokemonToPokemon(const Pokemon *src, Pokemon *dest) { *dest = *src; } @@ -3282,11 +3282,11 @@ void CopyBoxPokemonToBoxPokemon(const BOXMON *src, BOXMON *dest) { *dest = *src; } -void CopyPokemonToBoxPokemon(const POKEMON *src, BOXMON *dest) { +void CopyPokemonToBoxPokemon(const Pokemon *src, BOXMON *dest) { *dest = src->box; } -s8 MonGetFlavorPreference(POKEMON * pokemon, int flavor) { +s8 MonGetFlavorPreference(Pokemon * pokemon, int flavor) { return BoxMonGetFlavorPreference(&pokemon->box, flavor); } @@ -3313,7 +3313,7 @@ int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest) { void Party_GivePokerusAtRandom(PARTY * party) { int count = GetPartyCount(party); int idx; - POKEMON * pokemon; + Pokemon * pokemon; u8 sp0; switch (LCRandom()) { case 0x4000: @@ -3342,7 +3342,7 @@ u8 Party_MaskMonsWithPokerus(PARTY * party, u8 mask) { int i = 0; u32 flag = 1; u8 ret = 0; - POKEMON * pokemon; + Pokemon * pokemon; if (mask != 0) { do { if (mask & 1) { @@ -3367,7 +3367,7 @@ u8 Party_MaskMonsWithPokerus(PARTY * party, u8 mask) { void Party_UpdatePokerus(PARTY * party, int r5) { int i; u8 pokerus; - POKEMON * pokemon; + Pokemon * pokemon; int count = GetPartyCount(party); for (i = 0; i < count; i++) { pokemon = GetPartyMonByIndex(party, i); @@ -3391,7 +3391,7 @@ void Party_UpdatePokerus(PARTY * party, int r5) { void Party_SpreadPokerus(PARTY * party) { int count = GetPartyCount(party); int i; - POKEMON * pokemon; + Pokemon * pokemon; u8 pokerus; if ((LCRandom() % 3) == 0) { for (i = 0; i < count; i++) { @@ -3418,7 +3418,7 @@ void Party_SpreadPokerus(PARTY * party) { } } -BOOL Pokemon_HasPokerus(POKEMON * pokemon) { +BOOL Pokemon_HasPokerus(Pokemon * pokemon) { return BoxMon_HasPokerus(&pokemon->box); } @@ -3426,7 +3426,7 @@ BOOL BoxMon_HasPokerus(BOXMON * boxmon) { return (GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL) & 0xF) != 0; } -BOOL Pokemon_IsImmuneToPokerus(POKEMON * pokemon) { +BOOL Pokemon_IsImmuneToPokerus(Pokemon * pokemon) { return BoxMon_IsImmuneToPokerus(&pokemon->box); } @@ -3441,7 +3441,7 @@ BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon) { return FALSE; } -void Pokemon_UpdateArceusForme(POKEMON * pokemon) { +void Pokemon_UpdateArceusForme(Pokemon * pokemon) { BoxMon_UpdateArceusForme(&pokemon->box); } @@ -3495,7 +3495,7 @@ u32 GetArceusTypeByHeldItemEffect(u16 heldEffect) { } } -s32 Mon_UpdateGiratinaForme(POKEMON *pokemon) { +s32 Mon_UpdateGiratinaForme(Pokemon *pokemon) { s32 ret = BoxMon_UpdateGiratinaForme(&pokemon->box); if (ret != -1) { CalcMonLevelAndStats(pokemon); @@ -3520,7 +3520,7 @@ s32 BoxMon_UpdateGiratinaForme(BOXMON *boxmon) { return -1; } -void Mon_ForceSetGiratinaOriginForme(POKEMON *pokemon) { +void Mon_ForceSetGiratinaOriginForme(Pokemon *pokemon) { s32 forme = GIRATINA_ORIGIN; if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_GIRATINA) { SetBoxMonData(&pokemon->box, MON_DATA_FORME, &forme); @@ -3532,7 +3532,7 @@ void Mon_ForceSetGiratinaOriginForme(POKEMON *pokemon) { void Party_UpdateAllGiratina_DistortionWorld(PARTY *party, BOOL force_origin) { int npoke = GetPartyCount(party); int i; - POKEMON *pokemon; + Pokemon *pokemon; for (i = 0; i < npoke; i++) { pokemon = GetPartyMonByIndex(party, i); if (force_origin) { @@ -3543,7 +3543,7 @@ void Party_UpdateAllGiratina_DistortionWorld(PARTY *party, BOOL force_origin) { } } -void Mon_UpdateShayminForme(POKEMON *pokemon, int forme) { +void Mon_UpdateShayminForme(Pokemon *pokemon, int forme) { BoxMon_UpdateShayminForme(&pokemon->box, forme); CalcMonLevelAndStats(pokemon); } @@ -3556,7 +3556,7 @@ void BoxMon_UpdateShayminForme(BOXMON *boxmon, int forme) { } } -BOOL Mon_CanUseGracidea(POKEMON *pokemon) { +BOOL Mon_CanUseGracidea(Pokemon *pokemon) { RTCTime time; int species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); int forme = GetMonData(pokemon, MON_DATA_FORME, NULL); @@ -3577,7 +3577,7 @@ void Party_ResetAllShayminToLandForme(PARTY *party) { int i; int species; int forme; - POKEMON *mon; + Pokemon *mon; for (i = 0; i < npoke; i++) { mon = GetPartyMonByIndex(party, i); species = GetMonData(mon, MON_DATA_SPECIES, NULL); @@ -3614,7 +3614,7 @@ BOOL Party_TryResetShaymin(PARTY *party, int min_max, const RTCTime *time) { } } -BOOL Mon_UpdateRotomForme(POKEMON *pokemon, int forme, int defaultSlot) { +BOOL Mon_UpdateRotomForme(Pokemon *pokemon, int forme, int defaultSlot) { static const u16 forme_moves[ROTOM_FORME_MAX] = { MOVE_NONE, MOVE_OVERHEAT, @@ -3704,11 +3704,11 @@ void sub_0207204C(SOUND_CHATOT *r7, u32 r6, u16 r5, s32 r4, s32 sp20, u32 sp24, } } -void sub_020720D4(POKEMON *pokemon) { +void sub_020720D4(Pokemon *pokemon) { PlayCry(GetMonData(pokemon, MON_DATA_SPECIES, NULL), GetMonData(pokemon, MON_DATA_FORME, NULL)); } -void sub_020720FC(POKEMON * pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { +void sub_020720FC(Pokemon * pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { u32 hp; sub_0207213C(&pokemon->box, a1, pokeball, a3, encounterType, heap_id); if (pokeball == ITEM_HEAL_BALL) { @@ -3726,7 +3726,7 @@ void sub_0207213C(BOXMON * boxmon, PLAYERPROFILE *playerProfile, u32 pokeball, u SetBoxMonData(boxmon, MON_DATA_ENCOUNTER_TYPE, &encounterType); } -void sub_0207217C(POKEMON *pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { +void sub_0207217C(Pokemon *pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { sub_02072190(&pokemon->box, a1, pokeball, a3, encounterType, heap_id); } @@ -3739,7 +3739,7 @@ static const u16 sItemOdds[2][2] = { {20, 80}, }; -void WildMonSetRandomHeldItem(struct Pokemon * pokemon, u32 a1, u32 a2) { +void WildMonSetRandomHeldItem(Pokemon * pokemon, u32 a1, u32 a2) { u32 chance; u16 species; u16 forme; @@ -3765,7 +3765,7 @@ void WildMonSetRandomHeldItem(struct Pokemon * pokemon, u32 a1, u32 a2) { } } -BOOL GetMonTMHMCompat(POKEMON *pokemon, u8 tmhm) { +BOOL GetMonTMHMCompat(Pokemon *pokemon, u8 tmhm) { return GetBoxMonTMHMCompat(&pokemon->box, tmhm); } @@ -3803,7 +3803,7 @@ BOOL GetTMHMCompatBySpeciesAndForme(u16 species, u32 forme, u8 tmhm) { return (GetMonBaseStat_HandleAlternateForme(species, forme, baseStat) & mask) != 0; } -void UpdateMonAbility(POKEMON *pokemon) { +void UpdateMonAbility(Pokemon *pokemon) { UpdateBoxMonAbility(&pokemon->box); } @@ -3826,7 +3826,7 @@ void UpdateBoxMonAbility(BOXMON *boxmon) { ReleaseBoxMonLock(boxmon, decry); } -void SetMonPersonality(struct Pokemon * r5, u32 personality) { +void SetMonPersonality(Pokemon * r5, u32 personality) { PokemonDataBlockA * r4; PokemonDataBlockB * r6; PokemonDataBlockC * r7; @@ -3835,7 +3835,7 @@ void SetMonPersonality(struct Pokemon * r5, u32 personality) { PokemonDataBlockB * sp10; PokemonDataBlockC * sp14; PokemonDataBlockD * sp18; - struct Pokemon * sp4; + Pokemon * sp4; sp4 = AllocMonZeroed(0); CopyPokemonToPokemon(r5, sp4); @@ -4108,7 +4108,7 @@ BOOL SpeciesIsMythical(u16 species) { return FALSE; } -BOOL MonCheckFrontierIneligibility(POKEMON *pokemon) { +BOOL MonCheckFrontierIneligibility(Pokemon *pokemon) { u16 species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); u16 forme = GetMonData(pokemon, MON_DATA_FORME, NULL); return IsPokemonLegendaryOrMythical(species, forme); @@ -4166,7 +4166,7 @@ int TrainerClassToBackpicID(int trainerClass, int a1) { return trainerClass; } -void Pokemon_RemoveCapsule(POKEMON * pokemon) { +void Pokemon_RemoveCapsule(Pokemon * pokemon) { u8 sp0 = 0; CAPSULE sp1; MI_CpuClearFast(&sp1, sizeof(sp1)); @@ -4230,7 +4230,7 @@ void sub_02072A20(NARC *narc, u8 *ret, u16 a2, u16 a3) { *ret = sp4.unk_58; } -BOOL SetTrMonCapsule(int a0, POKEMON *pokemon, HeapID heap_id) { +BOOL SetTrMonCapsule(int a0, Pokemon *pokemon, HeapID heap_id) { CAPSULE capsule; int data; NARC *narc; @@ -4246,7 +4246,7 @@ BOOL SetTrMonCapsule(int a0, POKEMON *pokemon, HeapID heap_id) { return TRUE; } -void sub_02072A98(POKEMON *pokemon, struct UnkPokemonStruct_02072A98 *dest) { +void sub_02072A98(Pokemon *pokemon, struct UnkPokemonStruct_02072A98 *dest) { PokemonDataBlockA *dbA; // r5 PokemonDataBlockB *dbB; // sp4 PokemonDataBlockC *dbC; // r7 @@ -4326,7 +4326,7 @@ void sub_02072A98(POKEMON *pokemon, struct UnkPokemonStruct_02072A98 *dest) { } } -void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, POKEMON *pokemon) { +void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *pokemon) { PokemonDataBlockA *dbA; // r5 PokemonDataBlockB *dbB; // r6 PokemonDataBlockC *dbC; // r7 @@ -4334,7 +4334,7 @@ void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, POKEMON *pokemon) BOXMON *boxmon; // sp4 int i; - MI_CpuClearFast(pokemon, sizeof(POKEMON)); + MI_CpuClearFast(pokemon, sizeof(Pokemon)); boxmon = Mon_GetBoxMon(pokemon); dbA = &GetSubstruct(boxmon, src->pid, 0)->blockA; dbB = &GetSubstruct(boxmon, src->pid, 1)->blockB; @@ -5009,7 +5009,7 @@ void CalcBoxMonPokeathlonPerformance(BOXMON *boxmon, struct PokeathlonTodayPerfo dest->stats[PERFORMANCE_STAMINA].hi = data.minmax[ARCPERF_STAMINA][1]; } -void CalcMonPokeathlonPerformance(POKEMON *pokemon, struct PokeathlonTodayPerformance *dest) { +void CalcMonPokeathlonPerformance(Pokemon *pokemon, struct PokeathlonTodayPerformance *dest) { CalcBoxMonPokeathlonPerformance(Mon_GetBoxMon(pokemon), dest); } @@ -5042,6 +5042,6 @@ void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BOXMON * } } -void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, POKEMON *pokemon, const s8 *aprijuice, HeapID heap_id) { +void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *pokemon, const s8 *aprijuice, HeapID heap_id) { CalcBoxmonPokeathlonStars(dest, Mon_GetBoxMon(pokemon), aprijuice, heap_id); } diff --git a/src/pokemon_icon_idx.c b/src/pokemon_icon_idx.c index 0f8725aa4..135fe6bd5 100644 --- a/src/pokemon_icon_idx.c +++ b/src/pokemon_icon_idx.c @@ -20,7 +20,7 @@ u32 Boxmon_GetIconNaix(BOXMON *boxmon) { return ret; } -u32 Pokemon_GetIconNaix(POKEMON *pokemon) { +u32 Pokemon_GetIconNaix(Pokemon *pokemon) { return Boxmon_GetIconNaix(Mon_GetBoxMon(pokemon)); } @@ -195,7 +195,7 @@ const u8 Boxmon_GetIconPalette(BOXMON *boxmon) { return GetMonIconPaletteEx(species, forme, isEgg); } -const u8 Pokemon_GetIconPalette(POKEMON *pokemon) { +const u8 Pokemon_GetIconPalette(Pokemon *pokemon) { return Boxmon_GetIconPalette(Mon_GetBoxMon(pokemon)); } diff --git a/src/pokemon_mood.c b/src/pokemon_mood.c index d96ffc1fe..de45bcff5 100644 --- a/src/pokemon_mood.c +++ b/src/pokemon_mood.c @@ -12,7 +12,7 @@ static const s8 sMoodModifiers[] = { 30 }; -static void MonAdjustMood(POKEMON *pokemon, s8 unk1) { +static void MonAdjustMood(Pokemon *pokemon, s8 unk1) { s8 mood; s32 adjustedMood; @@ -83,14 +83,14 @@ static s8 ItemIdGetMoodEffect(u16 itemId) { return moodEffect; } -void ApplyItemEffectOnMonMood(POKEMON *pokemon, u16 itemId) { +void ApplyItemEffectOnMonMood(Pokemon *pokemon, u16 itemId) { s8 moodEffect = ItemIdGetMoodEffect(itemId); if (moodEffect != 0) { MonAdjustMood(pokemon, moodEffect); } } -void ApplyMonMoodModifier(POKEMON *pokemon, int modifierId) { +void ApplyMonMoodModifier(Pokemon *pokemon, int modifierId) { s8 mood; u16 species; s32 adjustedMood; diff --git a/src/save_flypoints.c b/src/save_flypoints.c index 29e61e1f9..cab544918 100644 --- a/src/save_flypoints.c +++ b/src/save_flypoints.c @@ -128,7 +128,7 @@ void Fsys_SyncMapObjectsToSave(FieldSystem *fsys) { void Fsys_RestoreMapObjectsFromSave(FieldSystem *fsys) { struct SavedMapObjectList *unk = Save_MapObjects_get(fsys->savedata); struct SavedMapObject *follower = SaveMapObjects_SearchSpriteId(unk->subs, 64, SPRITE_TSURE_POKE_SHAYMIN_SKY); - POKEMON *pokemon; + Pokemon *pokemon; int species; int forme; diff --git a/src/scrcmd_12.c b/src/scrcmd_12.c index 52e248abb..8a6b4552f 100644 --- a/src/scrcmd_12.c +++ b/src/scrcmd_12.c @@ -41,7 +41,7 @@ BOOL ScrCmd_508(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_509(SCRIPTCONTEXT *ctx) { struct UnkStruct_0202EB30 *unkStruct = sub_020270F8(ctx->fsys->savedata); - POKEMON *pokemon = AllocMonZeroed(32); + Pokemon *pokemon = AllocMonZeroed(32); u16 *retPtr = ScriptGetVarPointer(ctx); if (sub_0202EC98(unkStruct) == PARTY_SIZE) { *retPtr = TRUE; @@ -55,7 +55,7 @@ BOOL ScrCmd_509(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_510(SCRIPTCONTEXT *ctx) { struct UnkStruct_0202EB30 *unkStruct = sub_020270F8(ctx->fsys->savedata); PC_STORAGE *storage = GetStoragePCPointer(ctx->fsys->savedata); - POKEMON *pokemon = AllocMonZeroed(32); + Pokemon *pokemon = AllocMonZeroed(32); PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(ctx->fsys->savedata); POKEDEX *pokedex = Sav2_Pokedex_get(ctx->fsys->savedata); int i; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 11c18fabb..575b14256 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1852,7 +1852,7 @@ BOOL ScrCmd_452(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_547(SCRIPTCONTEXT *ctx) { struct PokepicManager **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_GENERIC_WORK_PTR); u16 partyIdx = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); LoadUserFrameGfx1(ctx->fsys->bgConfig, 3, 0x3D9, 0xB, 0, 4); *p_work = sub_0200F4F8(ctx->fsys->bgConfig, 3, 10, 5, 11, 0x3D9, pokemon, 4); return FALSE; @@ -2097,7 +2097,7 @@ BOOL ScrCmd_NicknameInput(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; u16 partyPos = ScriptGetVar(ctx); BUGCONTEST *contest; - POKEMON *pokemon; + Pokemon *pokemon; u16 nickname[20]; u16 *var_ret; int species; @@ -2288,7 +2288,7 @@ BOOL sub_0204378C(SCRIPTCONTEXT *ctx); BOOL ScrCmd_183(SCRIPTCONTEXT *ctx) { void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_GENERIC_WORK_PTR); u16 partyIdx = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); int playerGender = PlayerAvatar_GetGender(ctx->fsys->playerAvatar); *p_work = ov02_02249458(ctx->fsys, 0, pokemon, playerGender); SetupNativeScript(ctx, sub_0204378C); @@ -3528,7 +3528,7 @@ BOOL ScrCmd_NatDexFlagAction(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_GetEVTotal(SCRIPTCONTEXT *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); u16 partyIdx = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); int hpEv = GetMonData(pokemon, MON_DATA_HP_EV, NULL); int atkEv = GetMonData(pokemon, MON_DATA_ATK_EV, NULL); @@ -3637,7 +3637,7 @@ BOOL ScrCmd_502(SCRIPTCONTEXT *ctx) { void Script_SetMonSeenFlagBySpecies(FieldSystem *fsys, u16 species) { POKEDEX *pokedex = Sav2_Pokedex_get(fsys->savedata); - POKEMON *pokemon = AllocMonZeroed(32); + Pokemon *pokemon = AllocMonZeroed(32); ZeroMonData(pokemon); CreateMon(pokemon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); Pokedex_SetMonSeenFlag(pokedex, pokemon); @@ -3696,7 +3696,7 @@ BOOL ScrCmd_518(SCRIPTCONTEXT *ctx) { int i; for (i = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(party, i); + Pokemon *pokemon = GetPartyMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) { SetMonData(pokemon, MON_DATA_FORME, &forme); CalcMonLevelAndStats(pokemon); @@ -3725,7 +3725,7 @@ BOOL ScrCmd_519(SCRIPTCONTEXT *ctx) { for (i = 0; i < partyCount; i++) { int j; BOOL hasMultiple; - POKEMON *pokemon = GetPartyMonByIndex(party, i); + Pokemon *pokemon = GetPartyMonByIndex(party, i); u32 species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); u32 forme = GetMonData(pokemon, MON_DATA_FORME, NULL); if (species == SPECIES_BURMY) { @@ -4287,7 +4287,7 @@ u32 sub_020467A8(SAVEDATA *saveData) { int i, j; for (i = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(party, i); + Pokemon *pokemon = GetPartyMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { ret |= 1 << GetMonData(pokemon, MON_DATA_FORME, NULL); } @@ -4311,7 +4311,7 @@ u32 sub_020467A8(SAVEDATA *saveData) { } } - POKEMON *walkerMon = AllocMonZeroed(32); + Pokemon *walkerMon = AllocMonZeroed(32); BOXMON *walkerBoxMon = Mon_GetBoxMon(walkerMon); POKEWALKER *pokeWalker = Sav2_Pokewalker_get(saveData); if (Pokewalker_TryGetBoxMon(pokeWalker, walkerBoxMon)) { @@ -4367,7 +4367,7 @@ BOOL ScrCmd_696(SCRIPTCONTEXT *ctx) { u16 r5 = ScriptGetVar(ctx); PARTY *party = SavArray_PlayerParty_get(ctx->fsys->savedata); int i, partyCount; - POKEMON *pokemon; + Pokemon *pokemon; Party_UpdateAllGiratina_DistortionWorld(party, r5); partyCount = GetPartyCount(party); @@ -4384,7 +4384,7 @@ BOOL ScrCmd_FollowerPokeIsEventTrigger(SCRIPTCONTEXT *ctx) { u8 r4 = ScriptReadByte(ctx); u16 r7 = ScriptGetVar(ctx); u16 *r6 = ScriptGetVarPointer(ctx); - POKEMON *pokemon; + Pokemon *pokemon; int species; *r6 = 0; diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index a7374842c..cfe590318 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -200,7 +200,7 @@ static LocalMapObject* CreateDayCareMonSpriteInternal(MapObjectMan* object_man, } BOOL ScrCmd_DayCareSanitizeMon(SCRIPTCONTEXT* ctx) { - POKEMON* party_mon; + Pokemon* party_mon; FieldSystem* fsys = ctx->fsys; u16 party_slot = ScriptGetVar(ctx); diff --git a/src/scrcmd_lottery.c b/src/scrcmd_lottery.c index 0f9aae05e..ebd01db0a 100644 --- a/src/scrcmd_lottery.c +++ b/src/scrcmd_lottery.c @@ -43,7 +43,7 @@ BOOL ScrCmd_LotoIdSearch(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (monDigit = 0, monPosition = 0, i = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { otid = GetMonData(pokemon, MON_DATA_OTID, NULL) & 0xffff; digitCount = LotoId_CountDigitsMatched(lotoId, otid); diff --git a/src/scrcmd_move_relearner.c b/src/scrcmd_move_relearner.c index e8544b93e..a4ea0a494 100644 --- a/src/scrcmd_move_relearner.c +++ b/src/scrcmd_move_relearner.c @@ -31,14 +31,14 @@ BOOL ScrCmd_466(SCRIPTCONTEXT *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); PARTY *party = SavArray_PlayerParty_get(ctx->fsys->savedata); - POKEMON *pokemon = GetPartyMonByIndex(party, slot); + Pokemon *pokemon = GetPartyMonByIndex(party, slot); u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, 32); *retPtr = sub_0209186C(eligibleMoves); FreeToHeap(eligibleMoves); return FALSE; } -static void CreateMoveRelearner(SCRIPTCONTEXT *ctx, int a1, POKEMON *pokemon, u16 *eligibleMoves) { +static void CreateMoveRelearner(SCRIPTCONTEXT *ctx, int a1, Pokemon *pokemon, u16 *eligibleMoves) { void **unkAC = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_AC); struct MoveRelearner *moveRelearner = MoveRelearner_new(32); *unkAC = moveRelearner; @@ -56,7 +56,7 @@ static void CreateMoveRelearner(SCRIPTCONTEXT *ctx, int a1, POKEMON *pokemon, u1 BOOL ScrCmd_MoveRelearnerInit(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, 32); CreateMoveRelearner(ctx, 1, pokemon, eligibleMoves); return TRUE; @@ -65,7 +65,7 @@ BOOL ScrCmd_MoveRelearnerInit(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_MoveTutorInit(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); u16 *eligibleMoves = AllocFromHeap(32, 4); eligibleMoves[0] = move; eligibleMoves[1] = 0xffff; diff --git a/src/scrcmd_party.c b/src/scrcmd_party.c index 1d9b8bf8d..e3bb19ba5 100644 --- a/src/scrcmd_party.c +++ b/src/scrcmd_party.c @@ -43,7 +43,7 @@ BOOL ScrCmd_GetPartyMonSpecies(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 *species = ScriptGetVarPointer(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { *species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); } @@ -62,7 +62,7 @@ BOOL ScrCmd_PartymonIsMine(SCRIPTCONTEXT *ctx) { u16 *slot = ScriptGetVarPointer(ctx); u16 *mine = ScriptGetVarPointer(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), *slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), *slot); u16 pokemonID = GetMonData(pokemon, MON_DATA_OTID, NULL); u16 playerID = PlayerProfile_GetTrainerID(profile); @@ -86,7 +86,7 @@ BOOL ScrCmd_GiveEgg(SCRIPTCONTEXT *ctx) { PARTY *party = SavArray_PlayerParty_get(fsys->savedata); u8 partyCount = GetPartyCount(party); if (partyCount < PARTY_SIZE) { - POKEMON *pokemon = AllocMonZeroed(11); + Pokemon *pokemon = AllocMonZeroed(11); ZeroMonData(pokemon); int val = sub_02017FE4(MAPSECTYPE_GIFT, offset); SetEggStats(pokemon, species, 1, profile, 3, val); @@ -113,7 +113,7 @@ BOOL ScrCmd_MonHasMove(SCRIPTCONTEXT *ctx) { u16 move = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); *hasMove = FALSE; if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { return FALSE; @@ -135,7 +135,7 @@ BOOL ScrCmd_GetPartySlotWithMove(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = PARTY_SIZE; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { continue; } @@ -154,7 +154,7 @@ BOOL ScrCmd_SurvivePoisoning(SCRIPTCONTEXT *ctx) { u16 *poison = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); *poison = SurvivePoisoning(pokemon); return FALSE; @@ -168,7 +168,7 @@ BOOL ScrCmd_PartyCountMonsAtOrBelowLevel(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0, *levelCount = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_LEVEL, NULL) <= level) { count++; } @@ -183,7 +183,7 @@ BOOL ScrCmd_MonGetLevel(SCRIPTCONTEXT *ctx) { u16 *level = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); *level = 0; if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { *level = GetMonData(pokemon, MON_DATA_LEVEL, NULL); @@ -203,7 +203,7 @@ BOOL ScrCmd_MonGetNature(SCRIPTCONTEXT *ctx) { return FALSE; } - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { *nature = 0; return FALSE; @@ -221,7 +221,7 @@ BOOL ScrCmd_GetPartySlotWithNature(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon , MON_DATA_IS_EGG, NULL) && GetMonNature(pokemon) == nature) { *slot = i; break; @@ -236,7 +236,7 @@ BOOL ScrCmd_MonGetFriendship(SCRIPTCONTEXT *ctx) { u16 *friendship = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); *friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); return FALSE; @@ -248,7 +248,7 @@ BOOL ScrCmd_MonAddFriendship(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 map = MapHeader_GetMapSec(ctx->fsys->location->mapId); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); u16 friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); if (friendshipModifier != 0) { if (GetMonData(pokemon, MON_DATA_POKEBALL, NULL) == BALL_LUXURY) { @@ -278,7 +278,7 @@ BOOL ScrCmd_MonSubtractFriendship(SCRIPTCONTEXT *ctx) { u16 friendshipModifier = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); u16 friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); if (friendshipModifier > friendship) { friendship = 0; @@ -296,7 +296,7 @@ BOOL ScrCmd_MonGetContestValue(SCRIPTCONTEXT *ctx) { u16 contestAttribute = ScriptGetVar(ctx); u16 *contestValue = ScriptGetVarPointer(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); *contestValue = GetMonData(pokemon, contestAttribute + MON_DATA_COOL, NULL); return FALSE; @@ -320,7 +320,7 @@ BOOL ScrCmd_GetMonTypes(SCRIPTCONTEXT *ctx) { u16 *type2 = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); *type1 = GetMonData(pokemon, MON_DATA_TYPE_1, NULL); *type2 = GetMonData(pokemon, MON_DATA_TYPE_2, NULL); @@ -341,7 +341,7 @@ BOOL ScrCmd_PartyCountNotEgg(SCRIPTCONTEXT *ctx) { int partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { count++; } @@ -360,7 +360,7 @@ BOOL ScrCmd_CountAliveMons(SCRIPTCONTEXT *ctx) { int partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { if (i != slot) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_HP, NULL) != 0) { count++; } @@ -379,7 +379,7 @@ BOOL ScrCmd_CountAliveMonsAndPC(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_HP, NULL) != 0) { count++; } @@ -396,7 +396,7 @@ BOOL ScrCmd_PartyCountEgg(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { count++; } @@ -413,7 +413,7 @@ BOOL ScrCmd_PartyHasPokerus(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *pokerus = FALSE; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (GetMonData(pokemon, MON_DATA_POKERUS, NULL)) { *pokerus = TRUE; break; @@ -427,7 +427,7 @@ BOOL ScrCmd_MonGetGender(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 *gender = ScriptGetVarPointer(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); *gender = GetMonData(pokemon, MON_DATA_GENDER, NULL); return FALSE; @@ -438,7 +438,7 @@ BOOL ScrCmd_CountMonMoves(SCRIPTCONTEXT *ctx) { u16 *moveCount = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { *moveCount = 0; return FALSE; @@ -470,7 +470,7 @@ BOOL ScrCmd_MonForgetMove(SCRIPTCONTEXT *ctx) { u16 pokemonSlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); MonDeleteMoveSlot(pokemon, moveSlot); return FALSE; @@ -482,7 +482,7 @@ BOOL ScrCmd_MonGetMove(SCRIPTCONTEXT *ctx) { u16 pokemonSlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); *move = GetMonData(pokemon, moveSlot + MON_DATA_MOVE1, NULL); return FALSE; @@ -494,7 +494,7 @@ BOOL ScrCmd_KenyaCheck(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u8 val = ScriptReadByte(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); if (!ItemIdIsMail(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL))) { *kenya = FALSE; return FALSE; @@ -530,7 +530,7 @@ BOOL ScrCmd_KenyaCheckPartyOrMailbox(SCRIPTCONTEXT *ctx) { UnloadOverlayByID(FS_OVERLAY_ID(npc_trade)); for (i = 0; i < GetPartyCount(party); i++) { - POKEMON *pokemon = GetPartyMonByIndex(party, i); + Pokemon *pokemon = GetPartyMonByIndex(party, i); if (ItemIdIsMail(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL))) { GetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); if (Mail_compare(kenyaMail, mail)) { @@ -567,7 +567,7 @@ BOOL ScrCmd_MonGiveMail(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 item; - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); if (!ItemIdIsMail(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL))) { return FALSE; } @@ -590,7 +590,7 @@ BOOL ScrCmd_PlayerHasSpecies(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *playerHasSpecies = FALSE; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL) == species) { *playerHasSpecies = TRUE; break; @@ -613,7 +613,7 @@ BOOL ScrCmd_CountPartyMonsOfSpecies(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *speciesCount = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { u16 monSpecies = GetMonData(pokemon, MON_DATA_SPECIES, NULL); if (species == 0) { @@ -642,7 +642,7 @@ BOOL ScrCmd_GetPartySlotWithSpecies(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL) == species) { *slot = i; break; @@ -655,7 +655,7 @@ BOOL ScrCmd_GetPartySlotWithSpecies(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_MonGetRibbonCount(SCRIPTCONTEXT *ctx) { u16 *ribbons = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); u16 i, count; for (i = 0, count = 0; i < RIBBON_MAX; i++) { @@ -678,7 +678,7 @@ BOOL ScrCmd_GetPartyRibbonCount(SCRIPTCONTEXT *ctx) { for (i = 0, count = 0; i < RIBBON_MAX; i++) { for (j = 0; j < partyCount; j++) { - POKEMON *pokemon = GetPartyMonByIndex(party, j); + Pokemon *pokemon = GetPartyMonByIndex(party, j); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, GetRibbonAttr(i, RIBBONDAT_MONDATNO), NULL)) { count++; break; @@ -695,7 +695,7 @@ BOOL ScrCmd_MonHasRibbon(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 ribbon = ScriptGetVar(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); *hasRibbon = GetMonData(pokemon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), NULL); return FALSE; @@ -706,7 +706,7 @@ BOOL ScrCmd_GiveRibbon(SCRIPTCONTEXT *ctx) { u16 ribbon = ScriptGetVar(ctx); u8 hasRibbon = TRUE; - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); SetMonData(pokemon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), &hasRibbon); return FALSE; @@ -721,7 +721,7 @@ BOOL ScrCmd_PartyLegalCheck(SCRIPTCONTEXT *ctx) { for (i = 0; i < RIBBON_MAX; i++) { for (j = 0; j < partyCount; j++) { - POKEMON *pokemon = GetPartyMonByIndex(party, j); + Pokemon *pokemon = GetPartyMonByIndex(party, j); if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_CHECKSUM_FAILED, NULL)) { *legal = TRUE; return FALSE; @@ -741,7 +741,7 @@ BOOL ScrCmd_GetPartySlotWithFatefulEncounter(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { if ((u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL) == species && GetMonData(pokemon, MON_DATA_FATEFUL_ENCOUNTER, NULL) == TRUE) { *slot = i; @@ -761,7 +761,7 @@ BOOL ScrCmd_MonHasItem(SCRIPTCONTEXT *ctx) { int partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *hasItem = FALSE; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); if (GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL) == item) { *hasItem = TRUE; break; @@ -775,7 +775,7 @@ BOOL ScrCmd_GetPartymonForme(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 *forme = ScriptGetVarPointer(ctx); - POKEMON *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); *forme = GetMonData(pokemon, MON_DATA_FORME, NULL); return FALSE; @@ -783,7 +783,7 @@ BOOL ScrCmd_GetPartymonForme(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_MonAddContestValue(SCRIPTCONTEXT *ctx) { - POKEMON *pokemon; + Pokemon *pokemon; u8 contestValue = 0; u16 slot = ScriptGetVar(ctx); u8 contestAttribute = ScriptReadByte(ctx); diff --git a/src/scrcmd_pokemon_misc.c b/src/scrcmd_pokemon_misc.c index 9b918bf39..a1ee61ef4 100644 --- a/src/scrcmd_pokemon_misc.c +++ b/src/scrcmd_pokemon_misc.c @@ -68,7 +68,7 @@ static void ov01_02201064(struct ListMenu *listMenu, s32 a1, u8 unused); static void ov01_02201088(struct ListMenu *listMenu, s32 unused1, u8 unused2); static void ov01_022010CC(SysTask *sysTask, void *work); static void ov01_0220116C(SCR_648_STRUCT *unkPtr); -static void GetHiddenPowerPowerType(POKEMON *mon, s32 *power, s32 *type); +static void GetHiddenPowerPowerType(Pokemon *mon, s32 *power, s32 *type); static LocalMapObject *ov01_02201F98(MapObjectMan *mapObjectMan, u8 unkA, u16 species, u16 forme, u32 gender, u32 x, u32 y, u32 mapId); extern u16 ov01_02209AE0[10]; @@ -340,7 +340,7 @@ BOOL ScrCmd_StatJudge(SCRIPTCONTEXT *ctx) { u16 *ivTotal = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); u16 *highestIvIndex = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); u16 *highestIv = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), monIndex); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), monIndex); ivList[0] = GetMonData(mon, MON_DATA_HP_IV, 0); ivList[1] = GetMonData(mon, MON_DATA_ATK_IV, 0); ivList[2] = GetMonData(mon, MON_DATA_DEF_IV, 0); @@ -380,7 +380,7 @@ BOOL ScrCmd_CommSanitizeParty(SCRIPTCONTEXT *ctx) { int partyCount, i, forme; u32 species, data; u32 heldItems[6]; - POKEMON *mon; + Pokemon *mon; int count = 0; FieldSystem *fsys = ctx->fsys; u16 *success = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); @@ -436,7 +436,7 @@ BOOL ScrCmd_SetMonForme(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; u16 index = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16 forme = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), index); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), index); SetMonData(mon, MON_DATA_FORME, &forme); return FALSE; } @@ -444,7 +444,7 @@ BOOL ScrCmd_SetMonForme(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_CountTranformedRotomsInParty(SCRIPTCONTEXT *ctx) { int i, partyCount, count; u32 species, forme, isEgg; - POKEMON *mon; + Pokemon *mon; PARTY *party; FieldSystem *fsys = ctx->fsys; u16 *rotomCount = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); @@ -477,7 +477,7 @@ BOOL ScrCmd_UpdateRotomForme(SCRIPTCONTEXT *ctx) { int defaultSlot = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); VarGet(ctx->fsys, ScriptReadHalfword(ctx)); //unsused variable u32 forme = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *rotom = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), rotomIndex); + Pokemon *rotom = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), rotomIndex); Mon_UpdateRotomForme(rotom, forme, defaultSlot); Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(fsys->savedata), rotom); return FALSE; @@ -488,7 +488,7 @@ BOOL ScrCmd_GetHiddenPowerType(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; int partyIndex = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16 *typePtr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), partyIndex); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), partyIndex); u16 species = GetMonData(mon, MON_DATA_SPECIES, 0); @@ -521,7 +521,7 @@ BOOL ScrCmd_GetHiddenPowerType(SCRIPTCONTEXT *ctx) { return FALSE; } -static void GetHiddenPowerPowerType(POKEMON *mon, s32 *power, s32 *type) { +static void GetHiddenPowerPowerType(Pokemon *mon, s32 *power, s32 *type) { int hpIv = GetMonData(mon, MON_DATA_HP_IV, 0); int atkIv = GetMonData(mon, MON_DATA_ATK_IV, 0); int defIv = GetMonData(mon, MON_DATA_DEF_IV, 0); @@ -554,7 +554,7 @@ static void GetHiddenPowerPowerType(POKEMON *mon, s32 *power, s32 *type) { BOOL ScrCmd_SetFavoriteMon(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), 0); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), 0); SAVE_MISC_DATA *data = Sav2_Misc_get(fsys->savedata); u32 species = GetMonData(mon, MON_DATA_SPECIES, 0); u32 forme = GetMonData(mon, MON_DATA_FORME, 0); @@ -581,7 +581,7 @@ BOOL ScrCmd_GetPartyMonForme(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; u32 index = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16 *forme = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), index); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), index); *forme = GetMonData(mon, MON_DATA_FORME, 0); return FALSE; } @@ -997,7 +997,7 @@ BOOL ScrCmd_GiveTogepiEgg(SCRIPTCONTEXT *ctx) { u8 pp; u32 personality; u16 moveData; - POKEMON *togepi; + Pokemon *togepi; PLAYERPROFILE *profile; PARTY *party; FieldSystem *fsys = ctx->fsys; @@ -1044,7 +1044,7 @@ BOOL ScrCmd_777(SCRIPTCONTEXT *ctx) { u32 partyIndex = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16 *unkPtr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIndex); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIndex); *unkPtr = sub_0206D8D0(mon, ctx->fsys->savedata); @@ -1058,7 +1058,7 @@ BOOL ScrCmd_GiveSpikyEarPichu(SCRIPTCONTEXT *ctx) { u8 forme; u8 maxPP; u16 heldItem; - POKEMON *pichu; + Pokemon *pichu; PARTY *party; FieldSystem *fsys; PLAYERPROFILE *profile; @@ -1218,7 +1218,7 @@ BOOL ScrCmd_GetBuenasPassword(SCRIPTCONTEXT *ctx) { return FALSE; } -static u32 MonGetShinyLeafCount(POKEMON *mon) { +static u32 MonGetShinyLeafCount(Pokemon *mon) { int c; u32 shinyLeafCount = 0; @@ -1242,7 +1242,7 @@ BOOL ScrCmd_GetShinyLeafCount(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_TryGiveShinyLeafCrown(SCRIPTCONTEXT *ctx) { u32 monIndex = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - POKEMON *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), monIndex); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), monIndex); if (MonGetShinyLeafCount(GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), monIndex)) == 5) { u8 data = TRUE; SetMonData(mon, MON_DATA_SHINY_LEAF_CROWN, &data); @@ -1370,7 +1370,7 @@ BOOL ScrCmd_CheckKyogreGroudonInParty(SCRIPTCONTEXT *ctx) { unkVar = *(ctx->script_ptr); for (c = 0; c < partyCount; c++) { - POKEMON *mon = GetPartyMonByIndex(playerParty, c); + Pokemon *mon = GetPartyMonByIndex(playerParty, c); u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); u8 gameVer = GetMonData(mon, MON_DATA_GAME_VERSION, NULL); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index c755fda77..efea62a63 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -23,7 +23,7 @@ static const u16 sBigMonSizeTable[][3] = { {1700, 1, 65510}, }; -static u32 GetMonSizeHash(POKEMON *pokemon) { +static u32 GetMonSizeHash(Pokemon *pokemon) { u16 pid_lo; u16 hpIv_lo; u16 atkIv_lo; @@ -78,7 +78,7 @@ static void FormatSizeRecord(FieldSystem *fsys, u8 idx0, u8 idx1, u16 species, u }; BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx) { - POKEMON *pokemon; + Pokemon *pokemon; vu16 rand, record; u16 slot; u16 species; @@ -114,7 +114,7 @@ BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_SizeRecordUpdate(SCRIPTCONTEXT *ctx) { - POKEMON *pokemon; + Pokemon *pokemon; u16 slot; FieldSystem *fsys; @@ -142,7 +142,7 @@ BOOL ScrCmd_BufferRecordSize(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_BufferMonSize(SCRIPTCONTEXT *ctx) { - POKEMON *pokemon; + Pokemon *pokemon; FieldSystem *fsys; u16 idx0; u16 idx1; diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index a7753a195..15c63d482 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -63,7 +63,7 @@ BOOL ScrCmd_BufferMonSpeciesName(SCRIPTCONTEXT* ctx) { u16 party_mon_idx = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - POKEMON* party_mon = GetPartyMonByIndex(party, party_mon_idx); + Pokemon* party_mon = GetPartyMonByIndex(party, party_mon_idx); BufferBoxMonSpeciesName(*msg_fmt, idx, &party_mon->box); return FALSE; @@ -170,7 +170,7 @@ BOOL ScrCmd_BufferPartyMonNick(SCRIPTCONTEXT* ctx) { u16 party_mon_idx = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - POKEMON* party_mon = GetPartyMonByIndex(party, party_mon_idx); + Pokemon* party_mon = GetPartyMonByIndex(party, party_mon_idx); BufferBoxMonNickname(*msg_fmt, idx, &party_mon->box); return FALSE; @@ -352,7 +352,7 @@ BOOL ScrCmd_BufferPartyMonMoveName(SCRIPTCONTEXT* ctx) { u16 move_slot = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - POKEMON* party_mon = GetPartyMonByIndex(party, party_slot); + Pokemon* party_mon = GetPartyMonByIndex(party, party_slot); u16 move_id = GetMonData(party_mon, MON_DATA_MOVE1 + move_slot, NULL); BufferMoveName(*msg_fmt, idx, move_id); @@ -427,7 +427,7 @@ BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(SCRIPTCONTEXT* ctx) { u16 party_mon_slot = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - POKEMON* party_mon = GetPartyMonByIndex(party, party_mon_slot); + Pokemon* party_mon = GetPartyMonByIndex(party, party_mon_slot); BufferBoxMonSpeciesNameWithArticle(*msg_fmt, idx, &party_mon->box); return FALSE; diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index 1f3d66cbb..60a79967d 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -5,7 +5,7 @@ #include "script_pokemon_util.h" #include "constants/items.h" -static BOOL MonNotFaintedOrEgg(POKEMON *pokemon) { +static BOOL MonNotFaintedOrEgg(Pokemon *pokemon) { if (GetMonData(pokemon, MON_DATA_HP, NULL) == 0) { return FALSE; } @@ -14,7 +14,7 @@ static BOOL MonNotFaintedOrEgg(POKEMON *pokemon) { BOOL GiveMon(HeapID heapId, SAVEDATA *saveData, int species, int level, int forme, u8 ability, u16 heldItem, int ball, int encounterType) { PARTY *party; - POKEMON *pokemon; + Pokemon *pokemon; PLAYERPROFILE *profile; u32 sp1C; BOOL result; @@ -45,7 +45,7 @@ BOOL GiveEgg(HeapID heapId, SAVEDATA *saveData, int species, u8 metLocation, Map #pragma unused(heapId) PLAYERPROFILE *profile; PARTY *party; - POKEMON *pokemon; + Pokemon *pokemon; BOOL result; profile = Sav2_PlayerData_GetProfileAddr(saveData); @@ -65,7 +65,7 @@ void PartyMonSetMoveInSlot(PARTY *party, int mon_slot, int move_slot, u16 moveId int GetIdxOfFirstPartyMonWithMove(PARTY *party, u16 move) { int i; int n; - POKEMON *pokemon; + Pokemon *pokemon; n = GetPartyCount(party); for (i = 0; i < n; i++) { @@ -87,7 +87,7 @@ int CountAlivePokemon(PARTY *party) { int i; int n; int c; - POKEMON *pokemon; + Pokemon *pokemon; n = GetPartyCount(party); c = 0; @@ -100,10 +100,10 @@ int CountAlivePokemon(PARTY *party) { return c; } -POKEMON *GetFirstAliveMonInParty_CrashIfNone(PARTY *party) { +Pokemon *GetFirstAliveMonInParty_CrashIfNone(PARTY *party) { int i; int n; - POKEMON *pokemon; + Pokemon *pokemon; n = GetPartyCount(party); for (i = 0; i < n; i++) { @@ -119,7 +119,7 @@ POKEMON *GetFirstAliveMonInParty_CrashIfNone(PARTY *party) { u8 GetIdxOfFirstAliveMonInParty_CrashIfNone(PARTY *party) { int i; int n; - POKEMON *pokemon; + Pokemon *pokemon; n = GetPartyCount(party); for (i = 0; i < n; i++) { @@ -132,10 +132,10 @@ u8 GetIdxOfFirstAliveMonInParty_CrashIfNone(PARTY *party) { return 0; } -POKEMON *GetFirstNonEggInParty(PARTY *party) { +Pokemon *GetFirstNonEggInParty(PARTY *party) { u16 i; u16 n; - POKEMON *pokemon; + Pokemon *pokemon; n = GetPartyCount(party); for (i = 0; i < n; i++) { @@ -157,7 +157,7 @@ BOOL ApplyPoisonStep(PARTY *party, u16 location) { int n_poisoned; int n_fainted; u32 hp; - POKEMON *pokemon; + Pokemon *pokemon; n_poisoned = 0; n_fainted = 0; @@ -191,7 +191,7 @@ BOOL ApplyPoisonStep(PARTY *party, u16 location) { } } -BOOL SurvivePoisoning(POKEMON *pokemon) { +BOOL SurvivePoisoning(Pokemon *pokemon) { u32 status; if ((GetMonData(pokemon, MON_DATA_STATUS, NULL) & STATUS_POISON_ANY) && GetMonData(pokemon, MON_DATA_HP, NULL) == 1) { status = 0; diff --git a/src/trainer_data.c b/src/trainer_data.c index a72bd57f9..1aab0825e 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -260,7 +260,7 @@ TrainerGender TrainerClass_GetGenderOrTrainerCount(int trainerClass) { } void TrMon_OverridePidGender(int species, int forme, int overrideParam, u32 *pid); -void TrMon_FrustrationCheckAndSetFriendship(POKEMON *pokemon); +void TrMon_FrustrationCheckAndSetFriendship(Pokemon *pokemon); void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) { // enemies -> r4 @@ -273,7 +273,7 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) u32 personality; u32 seed_bak; u8 iv; - POKEMON * pokemon; + Pokemon * pokemon; // We abuse the global RNG for personality value generation, // so back up the overworld state here. @@ -451,7 +451,7 @@ void TrMon_OverridePidGender(int species, int forme, int overrideParam, u32 *pid } } -void TrMon_FrustrationCheckAndSetFriendship(POKEMON *pokemon) { +void TrMon_FrustrationCheckAndSetFriendship(Pokemon *pokemon) { u8 friendship = FRIENDSHIP_MAX; int i; diff --git a/src/unk_02092BE8.c b/src/unk_02092BE8.c index d0ca10d16..17a124d1b 100644 --- a/src/unk_02092BE8.c +++ b/src/unk_02092BE8.c @@ -304,7 +304,7 @@ BOOL sub_020930C4(FieldSystem* sys) { return FALSE; } -BOOL sub_02093134(FieldSystem* sys, POKEMON * pkmn) { +BOOL sub_02093134(FieldSystem* sys, Pokemon * pkmn) { if (sub_0206D8D0(pkmn, sys->savedata) == 0) { return FALSE; } diff --git a/src/update_dex_received.c b/src/update_dex_received.c index beb4c6c69..32a5c01aa 100644 --- a/src/update_dex_received.c +++ b/src/update_dex_received.c @@ -5,7 +5,7 @@ #include "constants/pokewalker_courses.h" #include "constants/species.h" -void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, POKEMON *pokemon) { +void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *pokemon) { BOOL isEgg; u16 species; isEgg = GetMonData(pokemon, MON_DATA_IS_EGG, NULL); diff --git a/src/use_item_on_mon.c b/src/use_item_on_mon.c index 8e91f54c4..b6ce06478 100644 --- a/src/use_item_on_mon.c +++ b/src/use_item_on_mon.c @@ -6,7 +6,7 @@ #include "constants/items.h" #include "move.h" -BOOL CanUseItemOnPokemon(POKEMON *pokemon, u16 itemID, s32 moveIdx, HeapID heapID) { +BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapID) { int atkEv; int defEv; int speedEv; @@ -212,11 +212,11 @@ BOOL CanUseItemOnPokemon(POKEMON *pokemon, u16 itemID, s32 moveIdx, HeapID heapI } BOOL CanUseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, s32 moveIdx, HeapID heapID) { - POKEMON *pokemon = GetPartyMonByIndex(party, partyIdx); + Pokemon *pokemon = GetPartyMonByIndex(party, partyIdx); return CanUseItemOnPokemon(pokemon, itemID, moveIdx, heapID); } -BOOL UseItemOnPokemon(POKEMON *pokemon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID) { +BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID) { s32 stack_data[8]; #define sp70 stack_data[7] #define sp6C stack_data[6] @@ -468,11 +468,11 @@ BOOL UseItemOnPokemon(POKEMON *pokemon, u16 itemID, u16 moveIdx, u16 location, H #undef sp54 BOOL UseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, u16 moveIdx, u16 location, HeapID heapID) { - POKEMON *pokemon = GetPartyMonByIndex(party, partyIdx); + Pokemon *pokemon = GetPartyMonByIndex(party, partyIdx); return UseItemOnPokemon(pokemon, itemID, moveIdx, location, heapID); } -BOOL MonMoveCanRestorePP(POKEMON *pokemon, int moveIdx) { +BOOL MonMoveCanRestorePP(Pokemon *pokemon, int moveIdx) { u16 moveID = GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL); if (moveID == MOVE_NONE) { return FALSE; @@ -483,7 +483,7 @@ BOOL MonMoveCanRestorePP(POKEMON *pokemon, int moveIdx) { return (u8)(pp < GetMoveMaxPP(moveID, ppUp)); } -BOOL MonMoveRestorePP(POKEMON *pokemon, int moveIdx, int ppRestore) { +BOOL MonMoveRestorePP(Pokemon *pokemon, int moveIdx, int ppRestore) { u16 move_id = GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL); if (move_id == MOVE_NONE) { return FALSE; @@ -508,7 +508,7 @@ BOOL MonMoveRestorePP(POKEMON *pokemon, int moveIdx, int ppRestore) { return FALSE; } -BOOL BoostMonMovePpUpBy(POKEMON *pokemon, int moveIdx, int nPpUp) { +BOOL BoostMonMovePpUpBy(Pokemon *pokemon, int moveIdx, int nPpUp) { u16 move; u8 pp; @@ -540,7 +540,7 @@ BOOL BoostMonMovePpUpBy(POKEMON *pokemon, int moveIdx, int nPpUp) { return TRUE; } -void RestoreMonHPBy(POKEMON *pokemon, u32 hp, u32 maxHp, u32 restoration) { +void RestoreMonHPBy(Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration) { if (maxHp == 1) { restoration = 1; } else if (restoration == HP_RESTORE_ALL) { @@ -587,7 +587,7 @@ s32 TryModEV(s32 ev, s32 evSum, s32 by) { return ev; } -BOOL CanItemModFriendship(POKEMON *pokemon, ITEMDATA *itemData) { +BOOL CanItemModFriendship(Pokemon *pokemon, ITEMDATA *itemData) { s32 friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); if (friendship >= 255) { return FALSE; @@ -608,7 +608,7 @@ BOOL CanItemModFriendship(POKEMON *pokemon, ITEMDATA *itemData) { return FALSE; } -BOOL DoItemFriendshipMod(POKEMON *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapID) { +BOOL DoItemFriendshipMod(Pokemon *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapID) { if (friendship == 255 && mod > 0) { return FALSE; } @@ -649,7 +649,7 @@ void HealParty(PARTY * party) { int partyCount = GetPartyCount(party); for (i = 0; i < partyCount; i++) { - POKEMON *pokemon = GetPartyMonByIndex(party, i); + Pokemon *pokemon = GetPartyMonByIndex(party, i); if (GetMonData(pokemon, MON_DATA_SPECIES_EXISTS, NULL)) { u32 sp8 = GetMonData(pokemon, MON_DATA_MAXHP, NULL); SetMonData(pokemon, MON_DATA_HP, &sp8); From e5c3435ccb12aaf5aa7a8bd3bf7707d78cb5b364 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 17 Feb 2023 21:16:54 -0300 Subject: [PATCH 3/7] Standarized pointer usage and variable names of Pokemon struct --- include/bug_contest.h | 2 +- include/bug_contest_internal.h | 2 +- include/field_blackthorn_tutors.h | 4 +- include/field_follow_poke.h | 2 +- include/field_system.h | 2 +- include/get_egg.h | 4 +- include/mail.h | 2 +- include/mail_misc.h | 8 +- include/overlay_02.h | 6 +- include/party.h | 2 +- include/party_menu.h | 2 +- include/pokedex.h | 4 +- include/pokemon.h | 120 ++--- include/pokemon_icon_idx.h | 4 +- include/pokemon_mood.h | 4 +- include/script_pokemon_util.h | 2 +- include/trainer_data.h | 2 +- include/unk_0200E398.h | 2 +- include/unk_020557E0.h | 2 +- include/unk_0206979C.h | 2 +- include/unk_0206D494.h | 4 +- include/unk_0208E600.h | 4 +- include/unk_02092BE8.h | 2 +- include/update_dex_received.h | 2 +- include/use_item_on_mon.h | 16 +- src/choose_starter.c | 10 +- src/field_blackthorn_tutors.c | 10 +- src/field_follow_poke.c | 64 +-- src/field_move.c | 6 +- src/field_roamer.c | 16 +- src/get_egg.c | 214 ++++---- src/hall_of_fame.c | 30 +- src/mail.c | 22 +- src/mail_misc.c | 22 +- src/npc_trade.c | 101 ++-- src/overlay_36.c | 10 +- src/overlay_94.c | 14 +- src/overlay_bug_contest.c | 36 +- src/party.c | 4 +- src/pokedex.c | 36 +- src/pokemon.c | 792 +++++++++++++++--------------- src/pokemon_icon_idx.c | 8 +- src/pokemon_mood.c | 18 +- src/save_flypoints.c | 8 +- src/scrcmd_12.c | 16 +- src/scrcmd_c.c | 86 ++-- src/scrcmd_daycare.c | 18 +- src/scrcmd_lottery.c | 12 +- src/scrcmd_move_relearner.c | 18 +- src/scrcmd_party.c | 214 ++++---- src/scrcmd_pokemon_misc.c | 56 +-- src/scrcmd_size_record.c | 36 +- src/scrcmd_strbuf.c | 16 +- src/script_pokemon_util.c | 104 ++-- src/trainer_data.c | 62 +-- src/unk_02092BE8.c | 4 +- src/update_dex_received.c | 8 +- src/use_item_on_mon.c | 198 ++++---- 58 files changed, 1237 insertions(+), 1238 deletions(-) diff --git a/include/bug_contest.h b/include/bug_contest.h index f04c02482..c32a222f4 100644 --- a/include/bug_contest.h +++ b/include/bug_contest.h @@ -16,6 +16,6 @@ void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n); void BugContest_InitOpponents(BUGCONTEST *bugContest); void BugContest_InitEncounters(BUGCONTEST *bugContest); -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon); +u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon); #endif //POKEHEARTGOLD_BUG_CONTEST_H diff --git a/include/bug_contest_internal.h b/include/bug_contest_internal.h index 550870ced..12c0fa494 100644 --- a/include/bug_contest_internal.h +++ b/include/bug_contest_internal.h @@ -39,7 +39,7 @@ typedef struct BUGCONTEST { SAVEDATA *saveData; // Pointer to save data PARTY *party_bak; // Player's party is held for the contest PARTY *party_cur; // Only the lead Pokemon - Pokemon *pokemon; // The Pokemon you caught in the contest + Pokemon *mon; // The Pokemon you caught in the contest u8 lead_mon_idx; // Slot number of the Pokemon you battled with u8 party_cur_num; // Size of the party pre-contest u8 day_of_week; // Used to choose NPCs and encounters diff --git a/include/field_blackthorn_tutors.h b/include/field_blackthorn_tutors.h index ed3243c94..a3c6bd705 100644 --- a/include/field_blackthorn_tutors.h +++ b/include/field_blackthorn_tutors.h @@ -5,7 +5,7 @@ #include "pokemon_types_def.h" struct MoveRelearner { - Pokemon *pokemon; + Pokemon *mon; PLAYERPROFILE *profile; OPTIONS *options; u8 filler_0C[4]; @@ -17,7 +17,7 @@ struct MoveRelearner { struct MoveRelearner *MoveRelearner_new(HeapID heapId); void MoveRelearner_delete(struct MoveRelearner *moveRelearner); -u16 *GetEligibleLevelUpMoves(Pokemon *pokemon, HeapID heapId); +u16 *GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId); BOOL sub_0209186C(const u16 *ptr); #endif //POKEHEARTGOLD_FIELD_BLACKTHORN_TUTORS_H diff --git a/include/field_follow_poke.h b/include/field_follow_poke.h index 7bd583b1c..0d6e22156 100644 --- a/include/field_follow_poke.h +++ b/include/field_follow_poke.h @@ -33,7 +33,7 @@ struct FieldSystemUnk108 *FsysUnkSub108_Alloc(HeapID heapId); void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by); void FsysUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood); s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk); -void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *pokemon, u16 species, u32 personality); +void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, u32 personality); void FsysUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0); int SpeciesToOverworldModelIndexOffset(int species); int OverworldModelLookupFormeCount(int species); diff --git a/include/field_system.h b/include/field_system.h index 9ac33d4f8..b7443ce31 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -73,7 +73,7 @@ struct FieldSystemUnk108 { u32 personality; u16 species; u16 isRegistered; - Pokemon *pokemon; + Pokemon *mon; }; struct FieldSystemUnkSub0 { diff --git a/include/get_egg.h b/include/get_egg.h index 0a2a29b3d..7a62bca92 100644 --- a/include/get_egg.h +++ b/include/get_egg.h @@ -10,7 +10,7 @@ int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon); u16 Sav2_DayCare_BufferMonNickAndRetrievalPrice(DAYCARE *dayCare, u8 slot, MSGFMT *msgFmt); u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MSGFMT *msgFmt); void Sav2_DayCare_ResetEggStats(DAYCARE *dayCare); -void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); +void SetEggStats(Pokemon *mon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); void GiveEggToPlayer(DAYCARE *dayCare, PARTY *party, PLAYERPROFILE* profile); BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys); Pokemon *sub_0206CE44(PARTY *party); @@ -19,6 +19,6 @@ void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_i u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MSGFMT *msgFmt); u8 Sav2_DayCare_GetState(DAYCARE *dayCare); u8 Sav2_DayCare_CalcCompatibility(DAYCARE *dayCare); -void sub_0206D328(Pokemon *pokemon, HeapID heapId); +void sub_0206D328(Pokemon *mon, HeapID heapId); #endif diff --git a/include/mail.h b/include/mail.h index 62f1cda30..4063a2696 100644 --- a/include/mail.h +++ b/include/mail.h @@ -39,6 +39,6 @@ u32 Mailbox_CountMessages(MAILBOX *mailbox, int unused); void Mailbox_FetchMailToBuffer(MAIL *msgs, int n, int i, MAIL *dest); int MailArray_GetFirstEmptySlotIdx(MAIL *msgs, int n); u32 MailArray_CountMessages(MAIL *msgs, int n); -MAIL *CreateKenyaMail(Pokemon *pokemon, u8 mailType, u8 gender, STRING *name, u8 otId); +MAIL *CreateKenyaMail(Pokemon *mon, u8 mailType, u8 gender, STRING *name, u8 otId); #endif //POKEHEARTGOLD_MAIL_H diff --git a/include/mail_misc.h b/include/mail_misc.h index 683c98c25..d546cd355 100644 --- a/include/mail_misc.h +++ b/include/mail_misc.h @@ -63,12 +63,12 @@ int sub_02090E44(Unk02090C94 *a0); void sub_02090E5C(Unk02090C94 *a0); Unk02090E68 *sub_02090E68(SAVEDATA *saveData, u16 a1, u8 partyIdx, u8 a3, HeapID heapId); Unk02090E68 *sub_02090EC0(SAVEDATA *saveData, int n, u16 i, HeapID heapId); -Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *pokemon, HeapID heapId); +Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *mon, HeapID heapId); Unk02090E68 *sub_02090F38(SAVEDATA *saveData, u8 mailType, HeapID heapId); u32 sub_02090F6C(Unk02090E68 *a0); -BOOL sub_02090F70(Unk02090E68 *a0, Pokemon *pokemon); +BOOL sub_02090F70(Unk02090E68 *a0, Pokemon *mon); void sub_02090F90(Unk02090E68 *a0); -int sub_02090FA8(MAILBOX *mailbox, Pokemon *pokemon, HeapID heapId); -int sub_02091004(MAIL *msgs, int i, Pokemon *pokemon, HeapID heapId); +int sub_02090FA8(MAILBOX *mailbox, Pokemon *mon, HeapID heapId); +int sub_02091004(MAIL *msgs, int i, Pokemon *mon, HeapID heapId); #endif //POKEHEARTGOLD_MAIL_MISC_H diff --git a/include/overlay_02.h b/include/overlay_02.h index de840b1e2..90878b36f 100644 --- a/include/overlay_02.h +++ b/include/overlay_02.h @@ -39,8 +39,8 @@ UNK_0201F79C_Sub *ov02_0224B418(FieldSystem *fsys, int gender); BOOL ov02_0224B43C(UNK_0201F79C_Sub *unk); void ov02_0224B448(UNK_0201F79C_Sub *unk); struct FieldLongWarpTaskData *CreateFieldEscapeRopeTaskEnv(FieldSystem *fsys, HeapID heapId); -struct FieldLongWarpTaskData *CreateFieldTeleportTaskEnv(FieldSystem *fsys, Pokemon *pokemon, u8 slotno, HeapID heapId); -struct FieldLongWarpTaskData *CreateFieldDigTaskEnv(FieldSystem *fsys, Pokemon *pokemon, u8 slotno, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldTeleportTaskEnv(FieldSystem *fsys, Pokemon *mon, u8 slotno, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldDigTaskEnv(FieldSystem *fsys, Pokemon *mon, u8 slotno, HeapID heapId); BOOL Task_FieldEscapeRope(TaskManager *taskManager); BOOL Task_FieldTeleport(TaskManager *taskManager); BOOL Task_FieldDig(TaskManager *taskManager); @@ -49,7 +49,7 @@ void *ov02_0224C1D8(FieldSystem *fsys, int a1, int a2); u8 ov02_02251EE8(GearPhoneRingManager *a0, u8 *a1); // TODO: define the struct, figure out what a1 is -void *ov02_02249458(FieldSystem *fsys, int a1, Pokemon *pokemon, int gender); +void *ov02_02249458(FieldSystem *fsys, int a1, Pokemon *mon, int gender); BOOL ov02_0224953C(void *work); void ov02_02249548(void *work); diff --git a/include/party.h b/include/party.h index d0844eb94..d6b6e2cc2 100644 --- a/include/party.h +++ b/include/party.h @@ -8,7 +8,7 @@ u32 PartyCore_sizeof(void); PARTY * SavArray_Party_alloc(HeapID heapId); void SavArray_Party_init(PARTY *party); void InitPartyWithMaxSize(PARTY *party, int maxSize); -BOOL AddMonToParty(PARTY *party, const Pokemon *pokemon); +BOOL AddMonToParty(PARTY *party, const Pokemon *mon); BOOL RemoveMonFromParty(PARTY *party, int slot); int GetPartyMaxCount(const PARTY *party); int GetPartyCount(const PARTY *party); diff --git a/include/party_menu.h b/include/party_menu.h index 2d279680f..c445c4810 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -39,7 +39,7 @@ struct FieldUseMoveEnv { }; struct TeleportFieldEnv { - Pokemon *pokemon; + Pokemon *mon; struct FlyTaskStruct *flySub; // waste of space }; diff --git a/include/pokedex.h b/include/pokedex.h index 829b1965d..36ab52fab 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -64,8 +64,8 @@ int Pokedex_SpeciesGetLastSeenGender(POKEDEX *pokedex, u16 species, u32 a2); int Pokedex_GetSeenFormeByIdx_Unown(POKEDEX *pokedex, int idx, u32 caught); u32 Pokedex_GetSeenFormeNum_Unown(POKEDEX *pokedex, BOOL caught); int Pokedex_GetSeenFormeByIdx_Shellos(POKEDEX *pokedex, int a1); -void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *pokemon); -void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *pokemon); +void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *mon); +void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *mon); void Pokedex_SetNatDexFlag(POKEDEX *pokedex); void sub_0202A57C(POKEDEX *pokedex); BOOL Pokedex_HasCaughtMonWithLanguage(POKEDEX *pokedex, u32 species, u32 language); diff --git a/include/pokemon.h b/include/pokemon.h index f4deb8db3..cd3c68333 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -28,27 +28,27 @@ extern const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS]; -void ZeroMonData(Pokemon * pokemon); +void ZeroMonData(Pokemon *mon); void ZeroBoxMonData(BOXMON * boxmon); u32 SizeOfStructPokemon(void); -Pokemon * AllocMonZeroed(HeapID heap_id); -BOOL AcquireMonLock(Pokemon * mon); -BOOL ReleaseMonLock(Pokemon * mon, BOOL decrypt_result); +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); -void CreateMon(Pokemon * pokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId); +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 CreateMonWithNature(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 nature); -void CreateMonWithGenderNatureLetter(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter); +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 * pokemon, int species, int level, int ivs, int personality); -void CalcMonLevelAndStats(Pokemon * pokemon); -void CalcMonStats(Pokemon * pokemon); -u32 GetMonData(Pokemon * pokemon, int attr, void * ptr); +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); -void SetMonData(Pokemon * pokemon, int attr, void * ptr); +void SetMonData(Pokemon *mon, int attr, void * ptr); void SetBoxMonData(BOXMON * boxmon, int attr, void * ptr); -void AddMonData(Pokemon * pokemon, int attr, int amount); +void AddMonData(Pokemon *mon, int attr, int amount); //void AddBoxMonData(BOXMON * boxmon, int attr, int amount); BASE_STATS * AllocAndLoadMonPersonal_HandleAlternateForme(int species, int form, HeapID heap_id); BASE_STATS * AllocAndLoadMonPersonal(int species, HeapID heap_id); @@ -56,53 +56,53 @@ int GetPersonalAttr(const BASE_STATS *baseStats, BaseStat attr); void FreeMonPersonal(BASE_STATS * personal); int GetMonBaseStat_HandleAlternateForme(int species, int form, BaseStat stat_id); int GetMonBaseStat(int species, BaseStat stat_id); -u8 GetPercentProgressTowardsNextLevel(Pokemon * pokemon); -u32 CalcMonExpToNextLevel(Pokemon * pokemon); +u8 GetPercentProgressTowardsNextLevel(Pokemon *mon); +u32 CalcMonExpToNextLevel(Pokemon *mon); u32 CalcBoxMonExpToNextLevel(BOXMON * pokemon); -u32 GetMonBaseExperienceAtCurrentLevel(Pokemon * pokemon); +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 * pokemon); +int CalcMonLevel(Pokemon *mon); int CalcBoxMonLevel(BOXMON * boxmon); int CalcLevelBySpeciesAndExp(u16 species, u32 experience); int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 species, u32 experience); u8 GetBoxMonNature(BOXMON * boxmon); -u8 GetMonNature(Pokemon * mon); +u8 GetMonNature(Pokemon *mon); u8 GetNatureFromPersonality(u32 pid); -void MonApplyFriendshipMod(Pokemon * pokemon, u8 kind, u16 location); -u8 GetMonGender(Pokemon * pokemon); +void MonApplyFriendshipMod(Pokemon *mon, u8 kind, u16 location); +u8 GetMonGender(Pokemon *mon); u8 GetBoxMonGender(BOXMON * boxmon); u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid); -u8 MonIsShiny(Pokemon * pokemon); +u8 MonIsShiny(Pokemon *mon); u8 BoxMonIsShiny(BOXMON * boxmon); u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid); u32 GenerateShinyPersonality(u32 otid); u32 GetArceusTypeByHeldItemEffect(u16 plate); u8 GetBoxMonUnownLetter(BOXMON * boxmon); -u8 GetMonUnownLetter(Pokemon * pokemon); -u32 TryAppendMonMove(Pokemon *pokemon, u16 move); +u8 GetMonUnownLetter(Pokemon *mon); +u32 TryAppendMonMove(Pokemon *mon, u16 move); u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move); void BoxMonSetMoveInSlot(BOXMON *boxmon, u16 move, u8 slot); -void DeleteMonFirstMoveAndAppend(Pokemon *pokemon, u16 move); +void DeleteMonFirstMoveAndAppend(Pokemon *mon, u16 move); void DeleteBoxMonFirstMoveAndAppend(BOXMON *boxmon, u16 move); void LoadWotbl_HandleAlternateForme(int species, int forme, u16 *wotbl); -void MonSwapMoves(Pokemon *pokemon, int a, int b); +void MonSwapMoves(Pokemon *mon, int a, int b); void BoxMonSwapMoves(BOXMON *boxmon, int a, int b); -BOXMON *Mon_GetBoxMon(Pokemon *pokemon); +BOXMON *Mon_GetBoxMon(Pokemon *mon); -u16 GetMonEvolution(PARTY * party, Pokemon * pokemon, u8 context, u16 usedItem, int *method_ret); +u16 GetMonEvolution(PARTY * party, Pokemon *mon, u8 context, u16 usedItem, int *method_ret); u16 ReadFromPersonalPmsNarc(u16 species); u16 GetEggSpecies(u16 species); -void MonSetMoveInSlot(Pokemon * pokemon, u16 move, u8 slot); -void CopyBoxPokemonToPokemon(const BOXMON * src, Pokemon * dest); +void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot); +void CopyBoxPokemonToPokemon(const BOXMON * 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 CopyPokemonToPokemon(const Pokemon *src, Pokemon *dest); void CopyBoxPokemonToBoxPokemon(const BOXMON * src, BOXMON * dest); -void CopyPokemonToBoxPokemon(const Pokemon * src, BOXMON * dest); -s8 MonGetFlavorPreference(Pokemon * pokemon, int flavor); +void CopyPokemonToBoxPokemon(const Pokemon *src, BOXMON * dest); +s8 MonGetFlavorPreference(Pokemon *mon, int flavor); s8 BoxMonGetFlavorPreference(BOXMON * boxmon, int flavor); s8 GetFlavorPreferenceFromPID(u32 personality, int flavor); int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest); @@ -110,24 +110,24 @@ 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 * pokemon); +BOOL Pokemon_HasPokerus(Pokemon *mon); BOOL BoxMon_HasPokerus(BOXMON * boxmon); -BOOL Pokemon_IsImmuneToPokerus(Pokemon * pokemon); +BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon); BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon); -void Pokemon_UpdateArceusForme(Pokemon * pokemon); +void Pokemon_UpdateArceusForme(Pokemon *mon); void BoxMon_UpdateArceusForme(BOXMON * boxmon); -s32 Mon_UpdateGiratinaForme(Pokemon * pokemon); +s32 Mon_UpdateGiratinaForme(Pokemon *mon); s32 BoxMon_UpdateGiratinaForme(BOXMON * boxmon); -void Mon_UpdateShayminForme(Pokemon *pokemon, int forme); +void Mon_UpdateShayminForme(Pokemon *mon, int forme); void BoxMon_UpdateShayminForme(BOXMON *pokemon, int forme); -void UpdateMonAbility(Pokemon *boxmon); +void UpdateMonAbility(Pokemon *mon); void UpdateBoxMonAbility(BOXMON *boxmon); int LowestFlagNo(u32 mask); BOOL IsPokemonLegendaryOrMythical(u16 species, u16 forme); u16 GetLegendaryMon(u32 idx); -void Pokemon_RemoveCapsule(Pokemon * pokemon); +void Pokemon_RemoveCapsule(Pokemon *mon); void RestoreBoxMonPP(BOXMON * boxmon); -BOOL SetTrMonCapsule(int a0, Pokemon *pokemon, HeapID heap_id); +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); @@ -149,32 +149,32 @@ void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C * void sub_02070D84(s32 trainer_class, s32 a1, struct UnkStruct_02070D3C *a2); u32 sub_02070D90(void); u32 sub_02070D94(void); -BOXMON * Mon_GetBoxMon(Pokemon * pokemon); -BOOL Pokemon_TryLevelUp(Pokemon * pokemon); +BOXMON * Mon_GetBoxMon(Pokemon *mon); +BOOL Pokemon_TryLevelUp(Pokemon *mon); void InitBoxMonMoveset(BOXMON * boxmon); -void MonSetMoveInSlot_ResetPpUp(Pokemon* pokemon, u16 move, u8 slot); -u32 MonTryLearnMoveOnLevelUp(Pokemon * pokemon, int * last_i, u16 * sp0); -void MonDeleteMoveSlot(Pokemon * pokemon, u32 slot); -BOOL MonHasMove(Pokemon* pokemon, u16 move); +void MonSetMoveInSlot_ResetPpUp(Pokemon *mon, u16 move, u8 slot); +u32 MonTryLearnMoveOnLevelUp(Pokemon *mon, int * last_i, u16 * sp0); +void MonDeleteMoveSlot(Pokemon *mon, u32 slot); +BOOL MonHasMove(Pokemon *mon, u16 move); u16 SpeciesToJohtoDexNo(u16 species); -void Mon_ForceSetGiratinaOriginForme(Pokemon *pokemon); +void Mon_ForceSetGiratinaOriginForme(Pokemon *mon); void Party_UpdateAllGiratina_DistortionWorld(PARTY *party, BOOL force_origin); -BOOL Mon_CanUseGracidea(Pokemon *pokemon); +BOOL Mon_CanUseGracidea(Pokemon *mon); void Party_ResetAllShayminToLandForme(PARTY *party); BOOL Party_TryResetShaymin(PARTY *party, int min_max, const RTCTime *time); -BOOL Mon_UpdateRotomForme(Pokemon *pokemon, int forme, int defaultSlot); +BOOL Mon_UpdateRotomForme(Pokemon *mon, int forme, int defaultSlot); void sub_02071FDC(SOUND_CHATOT *r6, u32 r5, u16 r4, s32 unused, s32 sp18, u32 sp1C, u32 sp20, u32 sp24); 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 *pokemon); -void sub_020720FC(Pokemon * pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id); +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_0207217C(Pokemon *pokemon, PLAYERPROFILE *a1, 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 WildMonSetRandomHeldItem(Pokemon * pokemon, u32 a1, u32 a2); -BOOL GetMonTMHMCompat(Pokemon *pokemon, u8 tmhm); +void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2); +BOOL GetMonTMHMCompat(Pokemon *mon, u8 tmhm); BOOL GetBoxMonTMHMCompat(BOXMON *boxmon, u8 tmhm); BOOL GetTMHMCompatBySpeciesAndForme(u16 species, u32 forme, u8 tmhm); -void SetMonPersonality(Pokemon * r5, u32 personality); +void SetMonPersonality(Pokemon *mon, u32 personality); u32 ChangePersonalityToNatureGenderAndAbility(u32 pid, u16 species, u8 nature, u8 gender, u8 ability, BOOL gen_mode); void LoadMonPersonal(int species, BASE_STATS *personal); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *personal); @@ -185,7 +185,7 @@ u32 CalcMonChecksum(void * _data, u32 size); int ResolveMonForme(int species, int forme); u32 MaskOfFlagNo(int flagno); BOOL SpeciesIsMythical(u16 species); -BOOL MonCheckFrontierIneligibility(Pokemon *pokemon); +BOOL MonCheckFrontierIneligibility(Pokemon *mon); BOOL BoxmonBelongsToPlayer(BOXMON * 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); @@ -194,13 +194,13 @@ void sub_020729A4(NARC *narc, u8 *ret, u16 a2, u16 a3); void sub_020729D8(NARC *narc, s8 *ret, u16 a2, u16 a3); void sub_020729FC(NARC *narc, s8 *ret, u16 a2, u16 a3); void sub_02072A20(NARC *narc, u8 *ret, u16 a2, u16 a3); -void sub_02072A98(Pokemon *pokemon, struct UnkPokemonStruct_02072A98 *dest); -void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *pokemon); +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 CalcMonPokeathlonPerformance(Pokemon *pokemon, struct PokeathlonTodayPerformance *dest); +void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformance *dest); void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BOXMON *boxmon, const s8 *aprijuice, HeapID heap_id); -void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *pokemon, const s8 *aprijuice, HeapID heap_id); +void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *mon, const s8 *aprijuice, HeapID heap_id); #endif //POKEDIAMOND_POKEMON_H diff --git a/include/pokemon_icon_idx.h b/include/pokemon_icon_idx.h index 0c7f8b586..a375a567c 100644 --- a/include/pokemon_icon_idx.h +++ b/include/pokemon_icon_idx.h @@ -4,13 +4,13 @@ #include "pokemon_types_def.h" u32 Boxmon_GetIconNaix(BOXMON *boxmon); -u32 Pokemon_GetIconNaix(Pokemon *pokemon); +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 Pokemon_GetIconPalette(Pokemon *pokemon); +const u8 Pokemon_GetIconPalette(Pokemon *mon); u32 sub_02074490(void); u32 sub_02074494(void); u32 sub_02074498(void); diff --git a/include/pokemon_mood.h b/include/pokemon_mood.h index 3d4cf7c1a..3ea8a8edb 100644 --- a/include/pokemon_mood.h +++ b/include/pokemon_mood.h @@ -3,7 +3,7 @@ #include "pokemon.h" -void ApplyItemEffectOnMonMood(Pokemon *pokemon, u16 itemId); -void ApplyMonMoodModifier(Pokemon *pokemon, int modifierId); +void ApplyItemEffectOnMonMood(Pokemon *mon, u16 itemId); +void ApplyMonMoodModifier(Pokemon *mon, int modifierId); #endif //POKEHEARTGOLD_POKEMON_MOOD_H diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h index 33df97afe..98aa59385 100644 --- a/include/script_pokemon_util.h +++ b/include/script_pokemon_util.h @@ -14,6 +14,6 @@ u8 GetIdxOfFirstAliveMonInParty_CrashIfNone(PARTY *party); Pokemon *GetFirstNonEggInParty(PARTY *party); BOOL HasEnoughAlivePokemonForDoubleBattle(PARTY *party); BOOL ApplyPoisonStep(PARTY *party, u16 location); -BOOL SurvivePoisoning(Pokemon *pokemon); +BOOL SurvivePoisoning(Pokemon *mon); #endif //POKEHEARTGOLD_SCRIPT_POKEMON_UTIL_H diff --git a/include/trainer_data.h b/include/trainer_data.h index 5c122e1ef..d17c4c9b6 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -108,7 +108,7 @@ void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, STRING * str, HeapID void TrainerData_ReadTrPoke(u32 idx, TRPOKE * dest); void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id); void TrMon_OverridePidGender(int species, int forme, int overrideParam, u32 *pid); -void TrMon_FrustrationCheckAndSetFriendship(Pokemon *pokemon); +void TrMon_FrustrationCheckAndSetFriendship(Pokemon *mon); #endif //PM_ASM #endif //POKEHEARTGOLD_TRAINER_DATA_H diff --git a/include/unk_0200E398.h b/include/unk_0200E398.h index aa2dd8a47..544a515ce 100644 --- a/include/unk_0200E398.h +++ b/include/unk_0200E398.h @@ -15,6 +15,6 @@ void sub_0200E5D4(WINDOW *window, BOOL dont_copy_to_vram); struct WaitingIconManager *sub_0200F0AC(WINDOW *window, u16 tileNum); void sub_0200F450(struct WaitingIconManager *mgr); struct PokepicManager *sub_0200F4A0(BGCONFIG *bgConfig, enum GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, u16 species, u8 gender, HeapID heapId); -struct PokepicManager *sub_0200F4F8(BGCONFIG *bgConfig, enum GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, Pokemon *pokemon, HeapID heapId); +struct PokepicManager *sub_0200F4F8(BGCONFIG *bgConfig, enum GFBgLayer layer, int x, int y, u8 paletteNum, u16 baseTile, Pokemon *mon, HeapID heapId); #endif //POKEHEARTGOLD_UNK_0200E398_H diff --git a/include/unk_020557E0.h b/include/unk_020557E0.h index 2968dad35..fe7a533c6 100644 --- a/include/unk_020557E0.h +++ b/include/unk_020557E0.h @@ -7,7 +7,7 @@ void sub_020557E0(FieldSystem *fsys); void sub_020557F8(FieldSystem *fsys); void sub_02055828(FieldSystem *fsys); -void sub_0202EC70(struct UnkStruct_0202EB30 *a0, int i, Pokemon *pokemon); +void sub_0202EC70(struct UnkStruct_0202EB30 *a0, int i, Pokemon *mon); int sub_020558D0(FieldSystem *fsys); int sub_020558E0(FieldSystem *fsys); int sub_020558F0(FieldSystem *fsys); diff --git a/include/unk_0206979C.h b/include/unk_0206979C.h index 19968ea28..480771a00 100644 --- a/include/unk_0206979C.h +++ b/include/unk_0206979C.h @@ -5,7 +5,7 @@ #include "pokemon_types_def.h" #include "player_data.h" -void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); +void SetEggStats(Pokemon *mon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5); void sub_02069978(NNSG3dRenderObj *a0, UnkOv01_021FFECC_sub *a1); void sub_020699BC(int a0, VecFx32 *a1); diff --git a/include/unk_0206D494.h b/include/unk_0206D494.h index 38b4c1ab1..622afa06f 100644 --- a/include/unk_0206D494.h +++ b/include/unk_0206D494.h @@ -5,8 +5,8 @@ #include "script.h" #include "task.h" -BOOL MonIsInGameTradePoke(Pokemon *pokemon, u8 tradeno); -BOOL sub_0206D8D0(Pokemon *pokemon, SAVEDATA *saveData); +BOOL MonIsInGameTradePoke(Pokemon *mon, u8 tradeno); +BOOL sub_0206D8D0(Pokemon *mon, SAVEDATA *saveData); BUGCONTEST *FieldSys_BugContest_get(FieldSystem *fsys); u16 *BugContest_GetSportBallsAddr(BUGCONTEST *contest); void FieldSys_IncrementBugContestTimer(FieldSystem *fsys, int a1); diff --git a/include/unk_0208E600.h b/include/unk_0208E600.h index 9fcbffe86..5346afc4d 100644 --- a/include/unk_0208E600.h +++ b/include/unk_0208E600.h @@ -3,7 +3,7 @@ #include "pokemon_types_def.h" -void MonSetTrainerMemo(Pokemon *pokemon, PLAYERPROFILE *profile, int strat, int mapsec, HeapID heapId); -BOOL sub_0208E9E0(u8 eventNo, Pokemon *pokemon, BOOL isMine); +void MonSetTrainerMemo(Pokemon *mon, PLAYERPROFILE *profile, int strat, int mapsec, HeapID heapId); +BOOL sub_0208E9E0(u8 eventNo, Pokemon *mon, BOOL isMine); #endif //POKEHEARTGOLD_UNK_0208E600_H diff --git a/include/unk_02092BE8.h b/include/unk_02092BE8.h index 0a4d70890..813dba830 100644 --- a/include/unk_02092BE8.h +++ b/include/unk_02092BE8.h @@ -53,7 +53,7 @@ void sub_02092FA8(GearPhoneRingManager* ptr); void GearPhone_ToggleRinging(GearPhoneRingManager* ptr, BOOL a1); BOOL sub_02093070(FieldSystem* sys); BOOL sub_020930C4(FieldSystem* sys); -BOOL sub_02093134(FieldSystem* sys, Pokemon * pkmn); +BOOL sub_02093134(FieldSystem* sys, Pokemon *mon); BOOL sub_0209316C(FieldSystem* sys); #endif //POKEHEARTGOLD_UNK_02092BE8_H diff --git a/include/update_dex_received.h b/include/update_dex_received.h index 16d654ec4..35553b5a1 100644 --- a/include/update_dex_received.h +++ b/include/update_dex_received.h @@ -3,6 +3,6 @@ #include "pokemon_types_def.h" -void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *pokemon); +void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *mon); #endif //POKEHEARTGOLD_UPDATE_DEX_RECEIVED_H diff --git a/include/use_item_on_mon.h b/include/use_item_on_mon.h index be38df22a..bef2879a7 100644 --- a/include/use_item_on_mon.h +++ b/include/use_item_on_mon.h @@ -5,17 +5,17 @@ typedef struct ItemData ITEMDATA; -BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapID); +BOOL CanUseItemOnPokemon(Pokemon *mon, u16 itemID, s32 moveIdx, HeapID heapID); BOOL CanUseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, s32 moveIdx, HeapID heapID); -BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID); +BOOL UseItemOnPokemon(Pokemon *mon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID); BOOL UseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, u16 moveIdx, u16 location, HeapID heapID); -BOOL MonMoveCanRestorePP(Pokemon *pokemon, int moveIdx); -BOOL MonMoveRestorePP(Pokemon *pokemon, int moveIdx, int ppRestore); -BOOL BoostMonMovePpUpBy(Pokemon *pokemon, int moveIdx, int nPpUp); -void RestoreMonHPBy(Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration); +BOOL MonMoveCanRestorePP(Pokemon *mon, int moveIdx); +BOOL MonMoveRestorePP(Pokemon *mon, int moveIdx, int ppRestore); +BOOL BoostMonMovePpUpBy(Pokemon *mon, int moveIdx, int nPpUp); +void RestoreMonHPBy(Pokemon *mon, u32 hp, u32 maxHp, u32 restoration); s32 TryModEV(s32 ev, s32 evSum, s32 by); -BOOL CanItemModFriendship(Pokemon *pokemon, ITEMDATA *itemData); -BOOL DoItemFriendshipMod(Pokemon *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapID); +BOOL CanItemModFriendship(Pokemon *mon, ITEMDATA *itemData); +BOOL DoItemFriendshipMod(Pokemon *mon, s32 friendship, s32 mod, u16 location, HeapID heapID); void HealParty(PARTY *party); #endif //POKEHEARTGOLD_USE_ITEM_ON_MON_H diff --git a/src/choose_starter.c b/src/choose_starter.c index e115e2861..7e23990fc 100644 --- a/src/choose_starter.c +++ b/src/choose_starter.c @@ -51,14 +51,14 @@ static BOOL CreateStarter(TaskManager *taskManager) { env->args->cursorPos = 0; env->args->options = Sav2_PlayerData_GetOptionsAddr(fsys->savedata); for (i = 0; i < (int)NELEMS(species); i++) { - Pokemon *pokemon = &env->args->starters[i]; + Pokemon *mon = &env->args->starters[i]; PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(fsys->savedata); - ZeroMonData(pokemon); - CreateMon(pokemon, species[i], 5, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); - sub_020720FC(pokemon, profile, BALL_POKE, mapsec, 12, 11); + ZeroMonData(mon); + CreateMon(mon, species[i], 5, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); + sub_020720FC(mon, profile, BALL_POKE, mapsec, 12, 11); { int item = ITEM_NONE; - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item); + SetMonData(mon, MON_DATA_HELD_ITEM, &item); } } } diff --git a/src/field_blackthorn_tutors.c b/src/field_blackthorn_tutors.c index d7b0a3140..382f18c4c 100644 --- a/src/field_blackthorn_tutors.c +++ b/src/field_blackthorn_tutors.c @@ -13,7 +13,7 @@ void MoveRelearner_delete(struct MoveRelearner *moveRelearner) { FreeToHeap(moveRelearner); } -u16 *GetEligibleLevelUpMoves(Pokemon *pokemon, HeapID heapId) { +u16 *GetEligibleLevelUpMoves(Pokemon *mon, HeapID heapId) { u16 cur_moveset[MON_MOVES]; // sp+10 u16 species; // sp+0C u8 forme; // sp+08 @@ -22,11 +22,11 @@ u16 *GetEligibleLevelUpMoves(Pokemon *pokemon, HeapID heapId) { u16 *wotbl; u8 i, j, ct; - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - level = GetMonData(pokemon, MON_DATA_LEVEL, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + level = GetMonData(mon, MON_DATA_LEVEL, NULL); for (i = 0; i < MON_MOVES; i++) { - cur_moveset[i] = GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL); + cur_moveset[i] = GetMonData(mon, MON_DATA_MOVE1 + i, NULL); } wotbl = AllocFromHeap(heapId, WOTBL_MAX * 2); diff --git a/src/field_follow_poke.c b/src/field_follow_poke.c index d974bc6d9..4e7d23571 100644 --- a/src/field_follow_poke.c +++ b/src/field_follow_poke.c @@ -1507,7 +1507,7 @@ LocalMapObject *sub_020699F8(MapObjectMan *mapObjectMan, int x, int y, int direc FieldSystem *fsys; PARTY *party; int partyCount; - Pokemon *pokemon; + Pokemon *mon; int species; int forme; int gender; @@ -1522,20 +1522,20 @@ LocalMapObject *sub_020699F8(MapObjectMan *mapObjectMan, int x, int y, int direc SavFollowPoke_SetUnused2bitField(0, Sav2_FollowPoke_get(fsys->savedata)); if (partyCount != 0) { if (CountAlivePokemon(party) == 0) { - pokemon = GetFirstNonEggInParty(party); + mon = GetFirstNonEggInParty(party); } else { - pokemon = GetFirstAliveMonInParty_CrashIfNone(party); + mon = GetFirstAliveMonInParty_CrashIfNone(party); } - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); fsys->followMon.mapObject = NULL; if (GetFollowPokePermissionBySpeciesAndMap(species, mapno)) { - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - gender = GetMonData(pokemon, MON_DATA_GENDER, NULL); - shiny = MonIsShiny(pokemon); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + gender = GetMonData(mon, MON_DATA_GENDER, NULL); + shiny = MonIsShiny(mon); fsys->followMon.mapObject = CreateFollowingSpriteFieldObject(mapObjectMan, species, forme, gender, direction, x, y, shiny); fsys->followMon.active = TRUE; FollowPokeFsysParamSet(fsys, species, forme, shiny, gender); - FsysUnkSub108_Set(fsys->unk108, pokemon, species, GetMonData(pokemon, MON_DATA_PERSONALITY, NULL)); + FsysUnkSub108_Set(fsys->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); player_unk = PlayerAvatar_GetState(fsys->playerAvatar); if (player_unk == 0 || player_unk == 3) { SavFollowPoke_SetUnused2bitField(1, Sav2_FollowPoke_get(fsys->savedata)); @@ -1563,7 +1563,7 @@ void sub_02069B74(MapObjectMan *mapObjectMan, u32 mapno) { FieldSystem *fsys; PARTY *party; int partyCount; - Pokemon *pokemon; + Pokemon *mon; int species; int forme; u8 gender; @@ -1576,17 +1576,17 @@ void sub_02069B74(MapObjectMan *mapObjectMan, u32 mapno) { partyCount = GetPartyCount(party); FsysFollowMonClear(&fsys->followMon); if (partyCount != 0) { - pokemon = GetFirstAliveMonInParty_CrashIfNone(party); - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - FsysUnkSub108_Set(fsys->unk108, pokemon, species, GetMonData(pokemon, MON_DATA_PERSONALITY, NULL)); + mon = GetFirstAliveMonInParty_CrashIfNone(party); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + FsysUnkSub108_Set(fsys->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); if (GetFollowPokePermissionBySpeciesAndMap(species, mapno)) { followPokeObj = GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke); if (followPokeObj == NULL) { fsys->followMon.unk15 = 1; } else { - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - gender = GetMonGender(pokemon); - shiny = MonIsShiny(pokemon); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + gender = GetMonGender(mon); + shiny = MonIsShiny(mon); fsys->followMon.mapObject = followPokeObj; fsys->followMon.active = TRUE; FollowPokeFsysParamSet(fsys, species, forme, shiny, gender); @@ -1615,9 +1615,9 @@ void sub_02069B74(MapObjectMan *mapObjectMan, u32 mapno) { } else { followPokeObj = GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke); if (followPokeObj != NULL) { - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - gender = GetMonGender(pokemon); - shiny = MonIsShiny(pokemon); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + gender = GetMonGender(mon); + shiny = MonIsShiny(mon); FollowPokeFsysParamSet(fsys, species, forme, shiny, gender); FollowPokeMapObjectSetParams(followPokeObj, species, forme, shiny); MapObject_SetGfxID(followPokeObj, FollowingPokemon_GetSpriteID(species, forme, gender)); @@ -1942,19 +1942,19 @@ struct FieldSystemUnk108 *FsysUnkSub108_Alloc(HeapID heapId) { ret->species = 0; ret->personality = 0; ret->isRegistered = 0; - ret->pokemon = 0; + ret->mon = 0; return ret; } void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by) { s8 mood; - if (unk->pokemon == NULL) { + if (unk->mon == NULL) { GF_ASSERT(0); return; } - mood = GetMonData(unk->pokemon, MON_DATA_MOOD, NULL); + mood = GetMonData(unk->mon, MON_DATA_MOOD, NULL); if (mood + by > 127) { mood = 127; } else if (mood + by < -127) { @@ -1962,52 +1962,52 @@ void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by) { } else { mood += by; } - SetMonData(unk->pokemon, MON_DATA_MOOD, &mood); + SetMonData(unk->mon, MON_DATA_MOOD, &mood); } void FsysUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood) { - if (unk->pokemon == NULL) { + if (unk->mon == NULL) { GF_ASSERT(0); return; } - SetMonData(unk->pokemon, MON_DATA_MOOD, &mood); + SetMonData(unk->mon, MON_DATA_MOOD, &mood); } s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk) { - if (unk->pokemon == NULL) { + if (unk->mon == NULL) { GF_ASSERT(0); return 0; } - return GetMonData(unk->pokemon, MON_DATA_MOOD, NULL); + return GetMonData(unk->mon, MON_DATA_MOOD, NULL); } -void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *pokemon, u16 species, u32 personality) { +void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, u32 personality) { s8 mood; if (species != SPECIES_NONE && (a0->isRegistered == 0 || a0->species != species || a0->personality != personality)) { a0->species = species; a0->personality = personality; mood = 0; a0->isRegistered = 1; - a0->pokemon = pokemon; - SetMonData(pokemon, MON_DATA_MOOD, &mood); + a0->mon = mon; + SetMonData(mon, MON_DATA_MOOD, &mood); } } void FsysUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0) { s8 mood; - if (a0->pokemon == NULL) { + if (a0->mon == NULL) { GF_ASSERT(0); return; } - mood = GetMonData(a0->pokemon, MON_DATA_MOOD, NULL); + mood = GetMonData(a0->mon, MON_DATA_MOOD, NULL); if (mood < 0) { mood++; } else if (mood > 0) { mood--; } - SetMonData(a0->pokemon, MON_DATA_MOOD, &mood); + SetMonData(a0->mon, MON_DATA_MOOD, &mood); } int SpeciesToOverworldModelIndexOffset(int species) { diff --git a/src/field_move.c b/src/field_move.c index e0e7028c2..1610a5d1a 100644 --- a/src/field_move.c +++ b/src/field_move.c @@ -517,7 +517,7 @@ static void FieldMoveMenuUse_Teleport(struct FieldMoveUseData *useData, const st static BOOL Task_UseTeleportInField(TaskManager *taskManager) { FieldSystem *fsys = TaskManager_GetSys(taskManager); struct TeleportFieldEnv *env = TaskManager_GetEnv(taskManager); - struct FieldLongWarpTaskData *newEnv = CreateFieldTeleportTaskEnv(fsys, env->pokemon, env->flySub->partySlot, 4); + struct FieldLongWarpTaskData *newEnv = CreateFieldTeleportTaskEnv(fsys, env->mon, env->flySub->partySlot, 4); FreeToHeap(env->flySub); FreeToHeap(env); TaskManager_Jump(taskManager, Task_FieldTeleport, newEnv); @@ -559,7 +559,7 @@ static void FieldMoveMenuUse_Dig(struct FieldMoveUseData *useData, const struct static BOOL Task_UseDigInField(TaskManager *taskManager) { FieldSystem *fsys = TaskManager_GetSys(taskManager); struct TeleportFieldEnv *env = TaskManager_GetEnv(taskManager); - struct FieldLongWarpTaskData *newEnv = CreateFieldDigTaskEnv(fsys, env->pokemon, env->flySub->partySlot, 11); + struct FieldLongWarpTaskData *newEnv = CreateFieldDigTaskEnv(fsys, env->mon, env->flySub->partySlot, 11); FreeToHeap(env->flySub); FreeToHeap(env); TaskManager_Jump(taskManager, Task_FieldDig, newEnv); @@ -688,7 +688,7 @@ static BOOL Task_UseHeadbuttInField(TaskManager *taskManager) { static struct TeleportFieldEnv *sub_020689A4(HeapID heapId, u8 slotno, SAVEDATA *saveData) { struct TeleportFieldEnv *ret = AllocFromHeapAtEnd(heapId, sizeof(struct TeleportFieldEnv)); - ret->pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(saveData), slotno); + ret->mon = GetPartyMonByIndex(SavArray_PlayerParty_get(saveData), slotno); ret->flySub = NULL; return ret; } diff --git a/src/field_roamer.c b/src/field_roamer.c index b7a18f952..936afb251 100644 --- a/src/field_roamer.c +++ b/src/field_roamer.c @@ -171,7 +171,7 @@ void Save_CreateRoamerByID(SAVEDATA *saveData, u8 idx) { PLAYERPROFILE *profile; ROAMER_SAVE *roamerSave = Save_Roamers_get(saveData); ROAMER *roamerStats = Roamers_GetRoamMonStats(roamerSave, idx); - Pokemon *pokemon; + Pokemon *mon; u16 species; u8 level; @@ -201,15 +201,15 @@ void Save_CreateRoamerByID(SAVEDATA *saveData, u8 idx) { SetRoamerData(roamerStats, ROAMER_DATA_LEVEL, level); profile = Sav2_PlayerData_GetProfileAddr(saveData); - pokemon = AllocMonZeroed((HeapID)4); - ZeroMonData(pokemon); - CreateMon(pokemon, species, level, 32, FALSE, 0, OT_ID_PRESET, PlayerProfile_GetTrainerID_VisibleHalf(profile)); + mon = AllocMonZeroed((HeapID)4); + ZeroMonData(mon); + CreateMon(mon, species, level, 32, FALSE, 0, OT_ID_PRESET, PlayerProfile_GetTrainerID_VisibleHalf(profile)); SetRoamerData(roamerStats, ROAMER_DATA_STATUS, 0); SetRoamerData(roamerStats, ROAMER_DATA_ACTIVE, TRUE); - SetRoamerData(roamerStats, ROAMER_DATA_IVS, GetMonData(pokemon, MON_DATA_IVS_WORD, NULL)); - SetRoamerData(roamerStats, ROAMER_DATA_PERSONALITY, GetMonData(pokemon, MON_DATA_PERSONALITY, NULL)); - SetRoamerData(roamerStats, ROAMER_DATA_HP, GetMonData(pokemon, MON_DATA_MAXHP, NULL)); - FreeToHeap(pokemon); + SetRoamerData(roamerStats, ROAMER_DATA_IVS, GetMonData(mon, MON_DATA_IVS_WORD, NULL)); + SetRoamerData(roamerStats, ROAMER_DATA_PERSONALITY, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); + SetRoamerData(roamerStats, ROAMER_DATA_HP, GetMonData(mon, MON_DATA_MAXHP, NULL)); + FreeToHeap(mon); RoamerLocationSetRandom(roamerSave, idx, PlayerLocationHistoryGetBack(roamerSave)); } diff --git a/src/get_egg.c b/src/get_egg.c index c5e48dd6e..cc6bc7fc8 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -21,7 +21,7 @@ static u8 Sav2_DayCare_CountMonsInDayCare(DAYCARE *daycare); static int Sav2_DayCare_GetAvailableSlot(DAYCARE *daycare); static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON *daycareMon, SAVEDATA *saveData); static void Sav2_DayCare_Compaction(DAYCARE *daycare); -static void Daycare_LearnLevelUpMoves(Pokemon *pokemon); +static void Daycare_LearnLevelUpMoves(Pokemon *mon); static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt); static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps); static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *msgFmt); @@ -31,19 +31,19 @@ static int Daycare_EverstoneCheck(DAYCARE *dayCare); static void GenerateEggPID(DAYCARE *dayCare); static void _IVList_Remove(u8 *ptr, int idx); static void InheritIVs(Pokemon *egg, DAYCARE *dayCare); -static u8 LoadEggMoves(Pokemon *pokemon, u16 *dest); +static u8 LoadEggMoves(Pokemon *mon, u16 *dest); static void InheritMoves(Pokemon *egg, BOXMON *dad, BOXMON *mom); static u16 Daycare_BreedingIncenseCheck(u16 species, DAYCARE *dayCare); static void Daycare_LightBallCheck(Pokemon *egg, DAYCARE *dayCare); static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx); -static void SetBreedEggStats(Pokemon *pokemon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme); +static void SetBreedEggStats(Pokemon *mon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme); static u8 GetEggCyclesToSubtract(PARTY *party); static BOOL sub_0206CB88(const u16 *a0, const u16 *a1); static u8 ComputeCompatibilityBetweenBoxMons(BOXMON **parents); static u8 Sav2_DayCare_CalcCompatibilityInternal(DAYCARE *dayCare); static u8 sub_0206CCD8(FieldSystem *fsys); static u8 ConvertDayCareCompatibilityScore(u32 compatibility); -static void sub_0206D038(Pokemon *pokemon, HeapID heapId); +static void sub_0206D038(Pokemon *mon, HeapID heapId); static BOOL DayCare_TryGetForcedInheritedIV(DAYCARE *dayCare, u8 *a1, u8 *a2); static BOOL PowerItemIdToInheritedIvIdx(u16 itemId, u8 *a1); @@ -84,20 +84,20 @@ static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON u8 mood; DAYCAREMAIL *daycareMail; BOXMON *boxmon; - Pokemon *partymon; + Pokemon *partyMon; const u16 *playerNamePtr; - partymon = GetPartyMonByIndex(party, partyIdx); + partyMon = GetPartyMonByIndex(party, partyIdx); daycareMail = DayCareMon_GetExtras(daycareMon); boxmon = DayCareMon_GetBoxMon(daycareMon); playerNamePtr = PlayerProfile_GetNamePtr(Sav2_PlayerData_GetProfileAddr(saveData)); - GetMonData(partymon, MON_DATA_NICKNAME, nickname); - if (BoxMonIsHoldingMail(Mon_GetBoxMon(partymon))) { - GetMonData(partymon, MON_DATA_MAIL_STRUCT, DayCareMail_GetMailPtr(daycareMail)); + GetMonData(partyMon, MON_DATA_NICKNAME, nickname); + if (BoxMonIsHoldingMail(Mon_GetBoxMon(partyMon))) { + GetMonData(partyMon, MON_DATA_MAIL_STRUCT, DayCareMail_GetMailPtr(daycareMail)); } mood = 0; - SetMonData(partymon, MON_DATA_MOOD, &mood); - CopyPokemonToBoxPokemon(partymon, boxmon); + SetMonData(partyMon, MON_DATA_MOOD, &mood); + CopyPokemonToBoxPokemon(partyMon, boxmon); BoxMon_UpdateShayminForme(boxmon, SHAYMIN_LAND); DayCareMon_SetSteps(daycareMon, 0); RemoveMonFromParty(party, partyIdx); @@ -128,58 +128,58 @@ static void Sav2_DayCare_Compaction(DAYCARE *daycare) { } } -static void Daycare_LearnLevelUpMoves(Pokemon *pokemon) { +static void Daycare_LearnLevelUpMoves(Pokemon *mon) { int i; int last_i; u16 learned; int stat; for (i = 0, last_i = 0; i < MAX_LEVEL; i++) { - if (!Pokemon_TryLevelUp(pokemon)) { + if (!Pokemon_TryLevelUp(mon)) { break; } last_i = 0; for ( - stat = MonTryLearnMoveOnLevelUp(pokemon, &last_i, &learned); + stat = MonTryLearnMoveOnLevelUp(mon, &last_i, &learned); stat != 0; - stat = MonTryLearnMoveOnLevelUp(pokemon, &last_i, &learned) + stat = MonTryLearnMoveOnLevelUp(mon, &last_i, &learned) ) { if (stat == MOVE_APPEND_FULL) { - DeleteMonFirstMoveAndAppend(pokemon, learned); + DeleteMonFirstMoveAndAppend(mon, learned); } } } - CalcMonLevelAndStats(pokemon); + CalcMonLevelAndStats(mon); } static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt) { u32 exp; - Pokemon *pokemon; + Pokemon *mon; BOXMON *boxmon; DAYCAREMAIL *daycareMail; u16 species; - pokemon = AllocMonZeroed(4); + mon = AllocMonZeroed(4); boxmon = DayCareMon_GetBoxMon(daycareMon); daycareMail = DayCareMon_GetExtras(daycareMon); BufferBoxMonNickname(msgFmt, 0, boxmon); species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - CopyBoxPokemonToPokemon(boxmon, pokemon); - if (GetMonData(pokemon, MON_DATA_LEVEL, NULL) != MAX_LEVEL) { - exp = GetMonData(pokemon, MON_DATA_EXPERIENCE, NULL); + CopyBoxPokemonToPokemon(boxmon, mon); + if (GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_LEVEL) { + exp = GetMonData(mon, MON_DATA_EXPERIENCE, NULL); exp += DayCareMon_GetSteps(daycareMon); - SetMonData(pokemon, MON_DATA_EXPERIENCE, &exp); - Daycare_LearnLevelUpMoves(pokemon); + SetMonData(mon, MON_DATA_EXPERIENCE, &exp); + Daycare_LearnLevelUpMoves(mon); } if (BoxMonIsHoldingMail(boxmon)) { - SetMonData(pokemon, MON_DATA_MAIL_STRUCT, DayCareMail_GetMailPtr(daycareMail)); + SetMonData(mon, MON_DATA_MAIL_STRUCT, DayCareMail_GetMailPtr(daycareMail)); } - AddMonToParty(party, pokemon); + AddMonToParty(party, mon); ZeroBoxMonData(boxmon); DayCareMon_SetSteps(daycareMon, 0); - FreeToHeap(pokemon); + FreeToHeap(mon); return species; } @@ -192,19 +192,19 @@ u16 Sav2_DayCare_RetrieveMon(PARTY *party, MSGFMT *msgFmt, DAYCARE *daycare, u8 } static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps) { - Pokemon *pokemon_tmp; + Pokemon *tmpMon; BOXMON *boxmon_tmp; u32 exp; u32 level; - pokemon_tmp = AllocMonZeroed(11); - boxmon_tmp = Mon_GetBoxMon(pokemon_tmp); + tmpMon = AllocMonZeroed(11); + boxmon_tmp = Mon_GetBoxMon(tmpMon); CopyBoxPokemonToBoxPokemon(boxmon, boxmon_tmp); exp = GetBoxMonData(boxmon_tmp, MON_DATA_EXPERIENCE, NULL); exp += steps; SetBoxMonData(boxmon_tmp, MON_DATA_EXPERIENCE, &exp); level = CalcBoxMonLevel(boxmon_tmp); - FreeToHeap(pokemon_tmp); + FreeToHeap(tmpMon); return level; } @@ -406,7 +406,7 @@ static void InheritIVs(Pokemon *egg, DAYCARE *dayCare) { } } -static u8 LoadEggMoves(Pokemon *pokemon, u16 *dest) { +static u8 LoadEggMoves(Pokemon *mon, u16 *dest) { u16 n; u16 *kowaza_list; u16 offset; @@ -418,7 +418,7 @@ static u8 LoadEggMoves(Pokemon *pokemon, u16 *dest) { n = 0; offset = 0; - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); for (i = 0; i < 0x7FD; i++) { if (species + 20000 == kowaza_list[i]) { offset = i + 1; @@ -622,7 +622,7 @@ static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx) { return pms; } -void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5) { +void SetEggStats(Pokemon *mon, int species, u8 metLocation, PLAYERPROFILE *profile, int a4, int a5) { u32 otId; u32 gender; u16 pokeball; @@ -632,36 +632,36 @@ void SetEggStats(Pokemon *pokemon, int species, u8 metLocation, PLAYERPROFILE *p STRING *name; friendship = GetMonBaseStat(species, BASE_EGG_CYCLES); - CreateMon(pokemon, species, 1, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); + CreateMon(mon, species, 1, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); metLevel = 0; pokeball = BALL_POKE; - SetMonData(pokemon, MON_DATA_POKEBALL, &pokeball); - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); - SetMonData(pokemon, MON_DATA_MET_LEVEL, &metLevel); + SetMonData(mon, MON_DATA_POKEBALL, &pokeball); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel); if (metLocation != MAPSEC_MYSTERY_ZONE) { - SetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, &metLocation); + SetMonData(mon, MON_DATA_EGG_MET_LOCATION, &metLocation); } isEgg = TRUE; - SetMonData(pokemon, MON_DATA_IS_EGG, &isEgg); + SetMonData(mon, MON_DATA_IS_EGG, &isEgg); name = GetSpeciesName(SPECIES_EGG, 4); - SetMonData(pokemon, MON_DATA_NICKNAME_3, name); + SetMonData(mon, MON_DATA_NICKNAME_3, name); String_dtor(name); if (a4 == 4) { otId = PlayerProfile_GetTrainerID(profile); gender = PlayerProfile_GetTrainerGender(profile); name = PlayerProfile_GetPlayerName_NewString(profile, 32); - SetMonData(pokemon, MON_DATA_OT_NAME_2, name); - SetMonData(pokemon, MON_DATA_OTID, &otId); - SetMonData(pokemon, MON_DATA_MET_GENDER, &gender); + SetMonData(mon, MON_DATA_OT_NAME_2, name); + SetMonData(mon, MON_DATA_OTID, &otId); + SetMonData(mon, MON_DATA_MET_GENDER, &gender); String_dtor(name); } - MonSetTrainerMemo(pokemon, profile, a4, a5, 0); + MonSetTrainerMemo(mon, profile, a4, a5, 0); } -static void SetBreedEggStats(Pokemon *pokemon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme) { +static void SetBreedEggStats(Pokemon *mon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme) { u16 pokeball; u8 metLevel; u8 friendship; @@ -681,45 +681,45 @@ static void SetBreedEggStats(Pokemon *pokemon, u16 species, DAYCARE *dayCare, u3 } } } - CreateMon(pokemon, species, 1, 32, TRUE, pid, OT_ID_PLAYER_ID, 0); + CreateMon(mon, species, 1, 32, TRUE, pid, OT_ID_PLAYER_ID, 0); metLevel = 0; pokeball = BALL_POKE; - SetMonData(pokemon, MON_DATA_POKEBALL, &pokeball); - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); - SetMonData(pokemon, MON_DATA_MET_LEVEL, &metLevel); - SetMonData(pokemon, MON_DATA_FORME, &forme); + SetMonData(mon, MON_DATA_POKEBALL, &pokeball); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel); + SetMonData(mon, MON_DATA_FORME, &forme); name = GetSpeciesName(SPECIES_EGG, 4); - SetMonData(pokemon, MON_DATA_NICKNAME_3, name); + SetMonData(mon, MON_DATA_NICKNAME_3, name); String_dtor(name); } void GiveEggToPlayer(DAYCARE *dayCare, PARTY *party, PLAYERPROFILE* profile) { - Pokemon *pokemon; + Pokemon *mon; u16 species; u8 gender_idx[2]; u8 isEgg; u32 otId; u8 mom_forme; - pokemon = AllocMonZeroed(4); + mon = AllocMonZeroed(4); species = Daycare_GetEggSpecies(dayCare, gender_idx); species = Daycare_BreedingIncenseCheck(species, dayCare); otId = PlayerProfile_GetTrainerID(profile); mom_forme = GetBoxMonData(Daycare_GetBoxMonI(dayCare, gender_idx[0]), MON_DATA_FORME, NULL); - SetBreedEggStats(pokemon, species, dayCare, otId, mom_forme); - InheritIVs(pokemon, dayCare); - InheritMoves(pokemon, Daycare_GetBoxMonI(dayCare, gender_idx[1]), Daycare_GetBoxMonI(dayCare, gender_idx[0])); - MonSetTrainerMemo(pokemon, profile, 3, sub_02017FE4(1, 0), 4); + SetBreedEggStats(mon, species, dayCare, otId, mom_forme); + InheritIVs(mon, dayCare); + InheritMoves(mon, Daycare_GetBoxMonI(dayCare, gender_idx[1]), Daycare_GetBoxMonI(dayCare, gender_idx[0])); + MonSetTrainerMemo(mon, profile, 3, sub_02017FE4(1, 0), 4); if (species == SPECIES_PICHU) { - Daycare_LightBallCheck(pokemon, dayCare); + Daycare_LightBallCheck(mon, dayCare); } isEgg = TRUE; - SetMonData(pokemon, MON_DATA_IS_EGG, &isEgg); - AddMonToParty(party, pokemon); + SetMonData(mon, MON_DATA_IS_EGG, &isEgg); + AddMonToParty(party, mon); Sav2_DayCare_ResetEggStats(dayCare); - FreeToHeap(pokemon); + FreeToHeap(mon); } static u8 GetEggCyclesToSubtract(PARTY *party) { @@ -857,7 +857,7 @@ BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys) { u8 steps; u8 compat; u8 to_sub; - Pokemon *pokemon; + Pokemon *mon; Daycare_GetBothBoxMonsPtr(dayCare, parents); n = 0; @@ -883,16 +883,16 @@ BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys) { Sav2_DayCare_SetEggCycleCounter(dayCare, 0); to_sub = GetEggCyclesToSubtract(party); for (i = 0; i < GetPartyCount(party); i++) { - pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && !GetMonData(pokemon, MON_DATA_CHECKSUM_FAILED, NULL)) { - friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL) && !GetMonData(mon, MON_DATA_CHECKSUM_FAILED, NULL)) { + friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendship != 0) { if (friendship >= to_sub) { friendship -= to_sub; } else { friendship -= 1; } - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); } else { return TRUE; } @@ -904,14 +904,14 @@ BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys) { Pokemon *sub_0206CE44(PARTY *party) { int i, n; - Pokemon *pokemon; + Pokemon *mon; n = GetPartyCount(party); for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (!GetMonData(pokemon, MON_DATA_CHECKSUM_FAILED, NULL) && GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && - GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL) == 0) { - return pokemon; + mon = GetPartyMonByIndex(party, i); + if (!GetMonData(mon, MON_DATA_CHECKSUM_FAILED, NULL) && GetMonData(mon, MON_DATA_IS_EGG, NULL) && + GetMonData(mon, MON_DATA_FRIENDSHIP, NULL) == 0) { + return mon; } } return NULL; @@ -1004,7 +1004,7 @@ u8 Sav2_DayCare_CalcCompatibility(DAYCARE *dayCare) { return ConvertDayCareCompatibilityScore(Sav2_DayCare_CalcCompatibilityInternal(dayCare)); } -static void sub_0206D038(Pokemon *pokemon, HeapID heapId) { +static void sub_0206D038(Pokemon *mon, HeapID heapId) { u16 moves[MON_MOVES]; u8 pp[MON_MOVES]; u32 otId; @@ -1029,25 +1029,25 @@ static void sub_0206D038(Pokemon *pokemon, HeapID heapId) { string = String_ctor(OT_NAME_LENGTH + 1, heapId); tmpMon = AllocMonZeroed(heapId); - species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = (u16)GetMonData(mon, MON_DATA_SPECIES, NULL); for (i = 0; i < MON_MOVES; i++) { - moves[i] = GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL); - pp[i] = GetMonData(pokemon, MON_DATA_MOVE1PP + i, NULL); + moves[i] = GetMonData(mon, MON_DATA_MOVE1 + i, NULL); + pp[i] = GetMonData(mon, MON_DATA_MOVE1PP + i, NULL); } - pid = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); + pid = GetMonData(mon, MON_DATA_PERSONALITY, NULL); for (i = 0; i < NUM_STATS; i++) { - ivs[i] = GetMonData(pokemon, MON_DATA_HP_IV + i, NULL); - } - language = GetMonData(pokemon, MON_DATA_GAME_LANGUAGE, NULL); - version = GetMonData(pokemon, MON_DATA_GAME_VERSION, NULL); - markings = GetMonData(pokemon, MON_DATA_MARKINGS, NULL); - pokerus = GetMonData(pokemon, MON_DATA_POKERUS, NULL); - fateful = GetMonData(pokemon, MON_DATA_FATEFUL_ENCOUNTER, NULL); - GetMonData(pokemon, MON_DATA_OT_NAME_2, string); - otGender = GetMonData(pokemon, MON_DATA_MET_GENDER, NULL); - otId = GetMonData(pokemon, MON_DATA_OTID, NULL); - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - if (species == SPECIES_MANAPHY && GetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, NULL) == sub_02017FE4(2, 1)) { + ivs[i] = GetMonData(mon, MON_DATA_HP_IV + i, NULL); + } + language = GetMonData(mon, MON_DATA_GAME_LANGUAGE, NULL); + version = GetMonData(mon, MON_DATA_GAME_VERSION, NULL); + markings = GetMonData(mon, MON_DATA_MARKINGS, NULL); + pokerus = GetMonData(mon, MON_DATA_POKERUS, NULL); + fateful = GetMonData(mon, MON_DATA_FATEFUL_ENCOUNTER, NULL); + GetMonData(mon, MON_DATA_OT_NAME_2, string); + otGender = GetMonData(mon, MON_DATA_MET_GENDER, NULL); + otId = GetMonData(mon, MON_DATA_OTID, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + if (species == SPECIES_MANAPHY && GetMonData(mon, MON_DATA_EGG_MET_LOCATION, NULL) == sub_02017FE4(2, 1)) { if (CalcShininessByOtIdAndPersonality(otId, pid)) { do { pid = PRandom(pid); @@ -1073,41 +1073,41 @@ static void sub_0206D038(Pokemon *pokemon, HeapID heapId) { SetMonData(tmpMon, MON_DATA_MET_GENDER, &otGender); SetMonData(tmpMon, MON_DATA_OTID, &otId); SetMonData(tmpMon, MON_DATA_FORME, &forme); - metLoc = GetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, NULL); - metYear = GetMonData(pokemon, MON_DATA_EGG_MET_YEAR, NULL); - metMonth = GetMonData(pokemon, MON_DATA_EGG_MET_MONTH, NULL); - metDay = GetMonData(pokemon, MON_DATA_EGG_MET_DAY, NULL); + metLoc = GetMonData(mon, MON_DATA_EGG_MET_LOCATION, NULL); + metYear = GetMonData(mon, MON_DATA_EGG_MET_YEAR, NULL); + metMonth = GetMonData(mon, MON_DATA_EGG_MET_MONTH, NULL); + metDay = GetMonData(mon, MON_DATA_EGG_MET_DAY, NULL); SetMonData(tmpMon, MON_DATA_EGG_MET_LOCATION, &metLoc); SetMonData(tmpMon, MON_DATA_EGG_MET_YEAR, &metYear); SetMonData(tmpMon, MON_DATA_EGG_MET_MONTH, &metMonth); SetMonData(tmpMon, MON_DATA_EGG_MET_DAY, &metDay); - metLoc = GetMonData(pokemon, MON_DATA_MET_LOCATION, NULL); - metYear = GetMonData(pokemon, MON_DATA_MET_YEAR, NULL); - metMonth = GetMonData(pokemon, MON_DATA_MET_MONTH, NULL); - metDay = GetMonData(pokemon, MON_DATA_MET_DAY, NULL); + metLoc = GetMonData(mon, MON_DATA_MET_LOCATION, NULL); + metYear = GetMonData(mon, MON_DATA_MET_YEAR, NULL); + metMonth = GetMonData(mon, MON_DATA_MET_MONTH, NULL); + metDay = GetMonData(mon, MON_DATA_MET_DAY, NULL); SetMonData(tmpMon, MON_DATA_MET_LOCATION, &metLoc); SetMonData(tmpMon, MON_DATA_MET_YEAR, &metYear); SetMonData(tmpMon, MON_DATA_MET_MONTH, &metMonth); SetMonData(tmpMon, MON_DATA_MET_DAY, &metDay); - CopyPokemonToPokemon(tmpMon, pokemon); + CopyPokemonToPokemon(tmpMon, mon); String_dtor(string); FreeToHeap(tmpMon); } -void sub_0206D328(Pokemon *pokemon, HeapID heapId) { +void sub_0206D328(Pokemon *mon, HeapID heapId) { u16 nickname[POKEMON_NAME_LENGTH + 1]; u8 isEgg = 70; u8 hasNickname = FALSE; u8 pokeball = BALL_POKE; u8 metLevel = 0; - sub_0206D038(pokemon, heapId); - SetMonData(pokemon, MON_DATA_IS_EGG, &isEgg); - GetSpeciesNameIntoArray(GetMonData(pokemon, MON_DATA_SPECIES, NULL), 0, nickname); - SetMonData(pokemon, MON_DATA_NICKNAME, nickname); - SetMonData(pokemon, MON_DATA_HAS_NICKNAME, &hasNickname); - SetMonData(pokemon, MON_DATA_POKEBALL, &pokeball); - SetMonData(pokemon, MON_DATA_MET_LEVEL, &metLevel); - CalcMonLevelAndStats(pokemon); + sub_0206D038(mon, heapId); + SetMonData(mon, MON_DATA_IS_EGG, &isEgg); + GetSpeciesNameIntoArray(GetMonData(mon, MON_DATA_SPECIES, NULL), 0, nickname); + SetMonData(mon, MON_DATA_NICKNAME, nickname); + SetMonData(mon, MON_DATA_HAS_NICKNAME, &hasNickname); + SetMonData(mon, MON_DATA_POKEBALL, &pokeball); + SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel); + CalcMonLevelAndStats(mon); } static BOOL DayCare_TryGetForcedInheritedIV(DAYCARE *dayCare, u8 *a1, u8 *a2) { diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index d90114193..f86bf2ddb 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -34,22 +34,22 @@ void Sav2_HOF_RecordParty(HALL_OF_FAME *hof, PARTY *party, RTCDate *date) { MI_CpuClear16(team->party, sizeof(team->party)); for (i = 0, j = 0; i < npokes; i++) { - Pokemon *pokemon = GetPartyMonByIndex(party, i); - BOOL lock = AcquireMonLock(pokemon); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - team->party[j].species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - team->party[j].level = GetMonData(pokemon, MON_DATA_LEVEL, NULL); - team->party[j].forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - team->party[j].personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); - team->party[j].otid = GetMonData(pokemon, MON_DATA_OTID, NULL); - team->party[j].moves[0] = GetMonData(pokemon, MON_DATA_MOVE1, NULL); - team->party[j].moves[1] = GetMonData(pokemon, MON_DATA_MOVE2, NULL); - team->party[j].moves[2] = GetMonData(pokemon, MON_DATA_MOVE3, NULL); - team->party[j].moves[3] = GetMonData(pokemon, MON_DATA_MOVE4, NULL); + Pokemon *mon = GetPartyMonByIndex(party, i); + BOOL lock = AcquireMonLock(mon); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + team->party[j].species = GetMonData(mon, MON_DATA_SPECIES, NULL); + team->party[j].level = GetMonData(mon, MON_DATA_LEVEL, NULL); + team->party[j].forme = GetMonData(mon, MON_DATA_FORME, NULL); + team->party[j].personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); + team->party[j].otid = GetMonData(mon, MON_DATA_OTID, NULL); + team->party[j].moves[0] = GetMonData(mon, MON_DATA_MOVE1, NULL); + team->party[j].moves[1] = GetMonData(mon, MON_DATA_MOVE2, NULL); + team->party[j].moves[2] = GetMonData(mon, MON_DATA_MOVE3, NULL); + team->party[j].moves[3] = GetMonData(mon, MON_DATA_MOVE4, NULL); if (string != NULL) { - GetMonData(pokemon, MON_DATA_NICKNAME_3, string); + GetMonData(mon, MON_DATA_NICKNAME_3, string); CopyStringToU16Array(string, team->party[j].nickname, POKEMON_NAME_LENGTH + 1); - GetMonData(pokemon, MON_DATA_OT_NAME_2, string); + GetMonData(mon, MON_DATA_OT_NAME_2, string); CopyStringToU16Array(string, team->party[j].otname, OT_NAME_LENGTH + 1); } else { team->party[j].nickname[0] = EOS; @@ -57,7 +57,7 @@ void Sav2_HOF_RecordParty(HALL_OF_FAME *hof, PARTY *party, RTCDate *date) { } j++; } - ReleaseMonLock(pokemon, lock); + ReleaseMonLock(mon, lock); } team->year = date->year; team->month = date->month; diff --git a/src/mail.c b/src/mail.c index 1580ce68e..5fd249d89 100644 --- a/src/mail.c +++ b/src/mail.c @@ -94,7 +94,7 @@ void Mail_SetNewMessageDetails(MAIL *mail, u8 mailType, u8 mon_no, SAVEDATA *sav u32 icon, isEgg, forme; PLAYERPROFILE *profile; PARTY *party; - Pokemon *pokemon; + Pokemon *mon; Mail_init(mail); mail->mail_type = mailType; @@ -109,11 +109,11 @@ void Mail_SetNewMessageDetails(MAIL *mail, u8 mailType, u8 mon_no, SAVEDATA *sav // Get the Pokemon icon data mail->forme_flags = 0; for (i = mon_no, j = 0; i < GetPartyCount(party); i++) { - pokemon = GetPartyMonByIndex(party, i); - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - isEgg = GetMonData(pokemon, MON_DATA_IS_EGG, NULL); - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - icon = Pokemon_GetIconNaix(pokemon); + mon = GetPartyMonByIndex(party, i); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + isEgg = GetMonData(mon, MON_DATA_IS_EGG, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + icon = Pokemon_GetIconNaix(mon); pal = GetMonIconPaletteEx(species, forme, isEgg); mail->mon_icons[j].icon = icon; @@ -136,7 +136,7 @@ void Mail_SetNewMessageDetails(MAIL *mail, u8 mailType, u8 mon_no, SAVEDATA *sav } } -MAIL *CreateKenyaMail(Pokemon *pokemon, u8 mailType, u8 gender, STRING *name, u8 otId) { +MAIL *CreateKenyaMail(Pokemon *mon, u8 mailType, u8 gender, STRING *name, u8 otId) { u8 r0; u32 r5; u16 species; @@ -165,10 +165,10 @@ MAIL *CreateKenyaMail(Pokemon *pokemon, u8 mailType, u8 gender, STRING *name, u8 ret->forme_flags = 0; - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - isEgg = GetMonData(pokemon, MON_DATA_IS_EGG, NULL); - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - r5 = Pokemon_GetIconNaix(pokemon); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + isEgg = GetMonData(mon, MON_DATA_IS_EGG, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); + r5 = Pokemon_GetIconNaix(mon); r0 = GetMonIconPaletteEx(species, forme, isEgg); ret->mon_icons[0].icon = r5; ret->mon_icons[0].pal = r0; diff --git a/src/mail_misc.c b/src/mail_misc.c index a0fce3450..351927a07 100644 --- a/src/mail_misc.c +++ b/src/mail_misc.c @@ -195,7 +195,7 @@ Unk02090E68 *sub_02090EC0(SAVEDATA *saveData, int n, u16 i, HeapID heapId) { return ptr; } -Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *pokemon, HeapID heapId) { +Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *mon, HeapID heapId) { Unk02090E68 *ptr = AllocFromHeapAtEnd(heapId, sizeof(Unk02090E68)); MI_CpuFill8(ptr, 0, sizeof(Unk02090E68)); @@ -204,7 +204,7 @@ Unk02090E68 *sub_02090F00(SAVEDATA *saveData, Pokemon *pokemon, HeapID heapId) { MAIL *mail = Mail_new(heapId); ptr->mail = mail; - GetMonData(pokemon, MON_DATA_MAIL_STRUCT, ptr->mail); + GetMonData(mon, MON_DATA_MAIL_STRUCT, ptr->mail); return ptr; } @@ -227,11 +227,11 @@ u32 sub_02090F6C(Unk02090E68 *a0) { return a0->unk4; } -BOOL sub_02090F70(Unk02090E68 *a0, Pokemon *pokemon) { +BOOL sub_02090F70(Unk02090E68 *a0, Pokemon *mon) { if (sub_02090F6C(a0) == 0) { return FALSE; } - SetMonData(pokemon, MON_DATA_MAIL_STRUCT, a0->mail); + SetMonData(mon, MON_DATA_MAIL_STRUCT, a0->mail); return TRUE; } @@ -242,25 +242,25 @@ void sub_02090F90(Unk02090E68 *a0) { FreeToHeap(a0); } -int sub_02090FA8(MAILBOX *mailbox, Pokemon *pokemon, HeapID heapId) { +int sub_02090FA8(MAILBOX *mailbox, Pokemon *mon, HeapID heapId) { int item = ITEM_NONE; int idx = Mailbox_GetFirstEmptySlotIdx(mailbox); if (idx != -1) { MAIL *mail = Mail_new(heapId); - GetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); + GetMonData(mon, MON_DATA_MAIL_STRUCT, mail); Mailbox_CopyMailToSlotI(&mailbox->msgs[0], 0, idx, mail); Mail_init(mail); - SetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item); + SetMonData(mon, MON_DATA_MAIL_STRUCT, mail); + SetMonData(mon, MON_DATA_HELD_ITEM, &item); FreeToHeap(mail); return idx; } return -1; } -int sub_02091004(MAIL *msgs, int i, Pokemon *pokemon, HeapID heapId) { +int sub_02091004(MAIL *msgs, int i, Pokemon *mon, HeapID heapId) { int item = ITEM_NONE; MAIL *mail = Mailbox_AllocAndFetchMailI(msgs, 0, i, heapId); @@ -269,8 +269,8 @@ int sub_02091004(MAIL *msgs, int i, Pokemon *pokemon, HeapID heapId) { } item = MailToItemId(Mail_GetType(mail)); - SetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item); + SetMonData(mon, MON_DATA_MAIL_STRUCT, mail); + SetMonData(mon, MON_DATA_HELD_ITEM, &item); Mailbox_DeleteSlotI(msgs, 0, i); FreeToHeap(mail); diff --git a/src/npc_trade.c b/src/npc_trade.c index 37b21351c..86ecc0701 100644 --- a/src/npc_trade.c +++ b/src/npc_trade.c @@ -14,14 +14,14 @@ struct _NPC_TRADE_WORK { NPC_TRADE *trade_dat; - Pokemon *pokemon; + Pokemon *mon; PLAYERPROFILE *profile; u32 tradeno; HeapID heapId; }; static STRING *_GetNpcTradeName(HeapID heapId, s32 msgno); -static void _CreateTradeMon(Pokemon *pokemon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId); +static void _CreateTradeMon(Pokemon *mon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId); NPC_TRADE_WORK *NPCTrade_AllocWork(HeapID heapId, u32 tradeno) { NPC_TRADE_WORK *ret; @@ -33,7 +33,7 @@ NPC_TRADE_WORK *NPCTrade_AllocWork(HeapID heapId, u32 tradeno) { ret->trade_dat = GfGfxLoader_LoadFromNarc(NARC_a_1_1_2, tradeno, FALSE, heapId, FALSE); ret->heapId = heapId; ret->tradeno = tradeno; - ret->pokemon = AllocMonZeroed(heapId); + ret->mon = AllocMonZeroed(heapId); ret->profile = PlayerProfile_new(heapId); PlayerProfile_init(ret->profile); { @@ -49,74 +49,73 @@ NPC_TRADE_WORK *NPCTrade_AllocWork(HeapID heapId, u32 tradeno) { void NPCTrade_DeleteWork(NPC_TRADE_WORK *work) { FreeToHeap(work->trade_dat); - FreeToHeap(work->pokemon); + FreeToHeap(work->mon); FreeToHeap(work->profile); FreeToHeap(work); } void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 mapno) { PARTY *party; - Pokemon *pokemon; + Pokemon *mon; NPC_TRADE *trade_dat; - Pokemon *givenMon; + Pokemon *kenya; STRING *name; MAIL *mail; u8 mailno; - pokemon = AllocMonZeroed(11); + mon = AllocMonZeroed(11); trade_dat = GfGfxLoader_LoadFromNarc(NARC_a_1_1_2, tradeno, FALSE, 11, TRUE); - _CreateTradeMon(pokemon, trade_dat, level, tradeno, mapno, 7, 11); - UpdatePokedexWithReceivedSpecies(fsys->savedata, pokemon); + _CreateTradeMon(mon, trade_dat, level, tradeno, mapno, 7, 11); + UpdatePokedexWithReceivedSpecies(fsys->savedata, mon); party = SavArray_PlayerParty_get(fsys->savedata); - AddMonToParty(party, pokemon); + AddMonToParty(party, mon); if (tradeno == 7) { - givenMon = GetPartyMonByIndex(party, GetPartyCount(party) - 1); + kenya = GetPartyMonByIndex(party, GetPartyCount(party) - 1); name = _GetNpcTradeName(11, tradeno + TRADE_MAX); mailno = ItemToMailId(trade_dat->heldItem); - mail = CreateKenyaMail(pokemon, mailno, trade_dat->gender, name, trade_dat->otId); - SetMonData(givenMon, MON_DATA_MAIL_STRUCT, mail); + mail = CreateKenyaMail(mon, mailno, trade_dat->gender, name, trade_dat->otId); + SetMonData(kenya, MON_DATA_MAIL_STRUCT, mail); String_dtor(name); FreeToHeap(mail); } FreeToHeap(trade_dat); - FreeToHeap(pokemon); + FreeToHeap(mon); } MAIL *NPCTrade_MakeKenyaMail(void) { PARTY *party; - Pokemon *pokemon; + Pokemon *mon; NPC_TRADE *trade_dat; - Pokemon *givenMon; STRING *name; MAIL *mail; u8 mailno; - pokemon = AllocMonZeroed(11); + mon = AllocMonZeroed(11); trade_dat = GfGfxLoader_LoadFromNarc(NARC_a_1_1_2, 7, FALSE, 11, TRUE); - _CreateTradeMon(pokemon, trade_dat, 20, 7, MAP_R35R0101, 7, 11); + _CreateTradeMon(mon, trade_dat, 20, 7, MAP_R35R0101, 7, 11); name = _GetNpcTradeName(11, 7 + TRADE_MAX); mailno = ItemToMailId(trade_dat->heldItem); - mail = CreateKenyaMail(pokemon, mailno, trade_dat->gender, name, trade_dat->otId); + mail = CreateKenyaMail(mon, mailno, trade_dat->gender, name, trade_dat->otId); String_dtor(name); FreeToHeap(trade_dat); - FreeToHeap(pokemon); + FreeToHeap(mon); return mail; } int NPCTrade_CanGiveUpLoanMon(FieldSystem *fsys, u8 tradeno, u8 idx) { PARTY *party; - Pokemon *pokemon, *cur_poke; + Pokemon *mon, *cur_poke; u8 capsule; u16 heldItem; int i, n, party_count; party = SavArray_PlayerParty_get(fsys->savedata); - pokemon = GetPartyMonByIndex(party, idx); - if (!MonIsInGameTradePoke(pokemon, tradeno)) { + mon = GetPartyMonByIndex(party, idx); + if (!MonIsInGameTradePoke(mon, tradeno)) { return 1; } - capsule = GetMonData(pokemon, MON_DATA_CAPSULE, NULL); + capsule = GetMonData(mon, MON_DATA_CAPSULE, NULL); if (capsule != 0) { return 3; } @@ -133,7 +132,7 @@ int NPCTrade_CanGiveUpLoanMon(FieldSystem *fsys, u8 tradeno, u8 idx) { return 4; } - heldItem = GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL); + heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, NULL); if (heldItem != ITEM_NONE) { return 2; } @@ -154,8 +153,8 @@ int NPCTradeWork_GetUnusedFlag(NPC_TRADE_WORK *work) { } void NPCTrade_ReceiveMonToSlot(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot) { - Party_SafeCopyMonToSlot_ResetUnkSub(SavArray_PlayerParty_get(fsys->savedata), slot, work->pokemon); - UpdatePokedexWithReceivedSpecies(fsys->savedata, work->pokemon); + Party_SafeCopyMonToSlot_ResetUnkSub(SavArray_PlayerParty_get(fsys->savedata), slot, work->mon); + UpdatePokedexWithReceivedSpecies(fsys->savedata, work->mon); } void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf) { @@ -163,9 +162,9 @@ void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPC_TRADE_WORK *work, int slot, u32 time_of_day; my_poke = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - _CreateTradeMon(work->pokemon, work->trade_dat, GetMonData(my_poke, MON_DATA_LEVEL, NULL), work->tradeno, fsys->location->mapId, 1, work->heapId); + _CreateTradeMon(work->mon, work->trade_dat, GetMonData(my_poke, MON_DATA_LEVEL, NULL), work->tradeno, fsys->location->mapId, 1, work->heapId); CopyPokemonToPokemon(my_poke, my_mon_buf); - CopyPokemonToPokemon(work->pokemon, trade_mon_buf); + CopyPokemonToPokemon(work->mon, trade_mon_buf); anim_work->my_boxmon = Mon_GetBoxMon(my_mon_buf); anim_work->trade_boxmon = Mon_GetBoxMon(trade_mon_buf); anim_work->trade_profile = work->profile; @@ -191,47 +190,47 @@ static STRING *_GetNpcTradeName(HeapID heapId, s32 msgno) { return ret; } -static void _CreateTradeMon(Pokemon *pokemon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId) { +static void _CreateTradeMon(Pokemon *mon, NPC_TRADE *trade_dat, u32 level, u32 tradeno, u32 mapno, u32 met_level_strat, HeapID heapId) { STRING *name; u8 nickname_flag; u32 mapsec; int heapId_2; - CreateMon(pokemon, trade_dat->give_species, level, 32, TRUE, trade_dat->pid, OT_ID_PRESET, trade_dat->otId); + CreateMon(mon, trade_dat->give_species, level, 32, TRUE, trade_dat->pid, OT_ID_PRESET, trade_dat->otId); heapId_2 = heapId; name = _GetNpcTradeName(heapId_2, tradeno); - SetMonData(pokemon, MON_DATA_NICKNAME_3, name); + SetMonData(mon, MON_DATA_NICKNAME_3, name); String_dtor(name); nickname_flag = TRUE; - SetMonData(pokemon, MON_DATA_HAS_NICKNAME, &nickname_flag); + SetMonData(mon, MON_DATA_HAS_NICKNAME, &nickname_flag); - SetMonData(pokemon, MON_DATA_HP_IV, &trade_dat->hpIv); - SetMonData(pokemon, MON_DATA_ATK_IV, &trade_dat->atkIv); - SetMonData(pokemon, MON_DATA_DEF_IV, &trade_dat->defIv); - SetMonData(pokemon, MON_DATA_SPEED_IV, &trade_dat->speedIv); - SetMonData(pokemon, MON_DATA_SPATK_IV, &trade_dat->spAtkIv); - SetMonData(pokemon, MON_DATA_SPDEF_IV, &trade_dat->spDefIv); + SetMonData(mon, MON_DATA_HP_IV, &trade_dat->hpIv); + SetMonData(mon, MON_DATA_ATK_IV, &trade_dat->atkIv); + SetMonData(mon, MON_DATA_DEF_IV, &trade_dat->defIv); + SetMonData(mon, MON_DATA_SPEED_IV, &trade_dat->speedIv); + SetMonData(mon, MON_DATA_SPATK_IV, &trade_dat->spAtkIv); + SetMonData(mon, MON_DATA_SPDEF_IV, &trade_dat->spDefIv); - SetMonData(pokemon, MON_DATA_COOL, &trade_dat->cool); - SetMonData(pokemon, MON_DATA_BEAUTY, &trade_dat->beauty); - SetMonData(pokemon, MON_DATA_CUTE, &trade_dat->cute); - SetMonData(pokemon, MON_DATA_SMART, &trade_dat->smart); - SetMonData(pokemon, MON_DATA_TOUGH, &trade_dat->tough); + SetMonData(mon, MON_DATA_COOL, &trade_dat->cool); + SetMonData(mon, MON_DATA_BEAUTY, &trade_dat->beauty); + SetMonData(mon, MON_DATA_CUTE, &trade_dat->cute); + SetMonData(mon, MON_DATA_SMART, &trade_dat->smart); + SetMonData(mon, MON_DATA_TOUGH, &trade_dat->tough); - SetMonData(pokemon, MON_DATA_HELD_ITEM, &trade_dat->heldItem); + SetMonData(mon, MON_DATA_HELD_ITEM, &trade_dat->heldItem); name = _GetNpcTradeName(heapId_2, TRADE_MAX + tradeno); - SetMonData(pokemon, MON_DATA_OT_NAME_2, name); + SetMonData(mon, MON_DATA_OT_NAME_2, name); String_dtor(name); - SetMonData(pokemon, MON_DATA_MET_GENDER, &trade_dat->gender); - SetMonData(pokemon, MON_DATA_GAME_LANGUAGE, &trade_dat->language); + SetMonData(mon, MON_DATA_MET_GENDER, &trade_dat->gender); + SetMonData(mon, MON_DATA_GAME_LANGUAGE, &trade_dat->language); mapsec = MapHeader_GetMapSec(mapno); - MonSetTrainerMemo(pokemon, NULL, met_level_strat, mapsec, heapId); + MonSetTrainerMemo(mon, NULL, met_level_strat, mapsec, heapId); - CalcMonLevelAndStats(pokemon); - GF_ASSERT(!MonIsShiny(pokemon)); + CalcMonLevelAndStats(mon); + GF_ASSERT(!MonIsShiny(mon)); } diff --git a/src/overlay_36.c b/src/overlay_36.c index ee1eeb5c2..b9dbb233a 100644 --- a/src/overlay_36.c +++ b/src/overlay_36.c @@ -203,17 +203,17 @@ static void InitGameStateAfterOakSpeech_Internal(HeapID heap_id, SAVEDATA* saved // Put an email from your friend into your PC. friend_names_msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0445_bin, 3); MAILBOX* mailbox = Sav2_Mailbox_get(savedata); - Pokemon* friend_pokemon = AllocMonZeroed(3); + Pokemon *mon = AllocMonZeroed(3); - CreateMon(friend_pokemon, SPECIES_MARILL, 1, 0, FALSE, 0, OT_ID_PLAYER_ID, 0); + CreateMon(mon, SPECIES_MARILL, 1, 0, FALSE, 0, OT_ID_PLAYER_ID, 0); MAIL* mail; if (PlayerProfile_GetTrainerGender(profile) == PLAYER_GENDER_MALE) { author_name = NewString_ReadMsgData(friend_names_msgdata, msg_0445_00001); - mail = CreateKenyaMail(friend_pokemon, MAIL_AIR, MON_FEMALE, author_name, 0); + mail = CreateKenyaMail(mon, MAIL_AIR, MON_FEMALE, author_name, 0); } else { author_name = NewString_ReadMsgData(friend_names_msgdata, msg_0445_00000); - mail = CreateKenyaMail(friend_pokemon, MAIL_AIR, MON_MALE, author_name, 0); + mail = CreateKenyaMail(mon, MAIL_AIR, MON_MALE, author_name, 0); } MAIL_MESSAGE mail_message; @@ -227,7 +227,7 @@ static void InitGameStateAfterOakSpeech_Internal(HeapID heap_id, SAVEDATA* saved Mail_SetMessage(mail, &mail_message, 2); Mailbox_CopyMailToSlotI(mailbox->msgs, FALSE, 0, mail); - FreeToHeap(friend_pokemon); + FreeToHeap(mon); String_dtor(author_name); FreeToHeap(mail); DestroyMsgData(friend_names_msgdata); diff --git a/src/overlay_94.c b/src/overlay_94.c index 6c18aa448..7ebd75d12 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -43,19 +43,19 @@ void PartyMenu_InitIconFormeChangeWork(PartyMenuStruct* unkPtr) { BOOL PartyMenu_AnimateIconFormeChange(PartyMenuStruct* unkPtr) { IconFormeChangeWork* work = unkPtr->iconFormeChange; - Pokemon* pokemon = GetPartyMonByIndex(unkPtr->unk654->party, unkPtr->partyMonIndex); + Pokemon *mon = GetPartyMonByIndex(unkPtr->unk654->party, unkPtr->partyMonIndex); switch (work->state) { case 0: - work->species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + work->species = GetMonData(mon, MON_DATA_SPECIES, NULL); switch (work->species) { case SPECIES_GIRATINA: - Mon_UpdateGiratinaForme(pokemon); + Mon_UpdateGiratinaForme(mon); work->duration = 65; work->fileId = NARC_particle_giratina; break; case SPECIES_SHAYMIN: - Mon_UpdateShayminForme(pokemon, SHAYMIN_SKY); + Mon_UpdateShayminForme(mon, SHAYMIN_SKY); work->duration = 35; work->fileId = NARC_particle_shaymin; break; @@ -64,7 +64,7 @@ BOOL PartyMenu_AnimateIconFormeChange(PartyMenuStruct* unkPtr) { GF_ASSERT(FALSE); break; } - Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(FieldSys_GetSaveDataPtr(unkPtr->unk654->fsys)), pokemon); + Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(FieldSys_GetSaveDataPtr(unkPtr->unk654->fsys)), mon); work->state++; break; case 1: @@ -97,7 +97,7 @@ BOOL PartyMenu_AnimateIconFormeChange(PartyMenuStruct* unkPtr) { work->state++; break; case 7: - sub_020720D4(pokemon); + sub_020720D4(mon); work->state++; break; case 8: @@ -107,7 +107,7 @@ BOOL PartyMenu_AnimateIconFormeChange(PartyMenuStruct* unkPtr) { break; case 9: STRING* str = NewString_ReadMsgData(unkPtr->msgData, msg_0300_00188); //" changed Forme!" - BufferBoxMonNickname(unkPtr->unk7c4, 0, Mon_GetBoxMon(pokemon)); + BufferBoxMonNickname(unkPtr->unk7c4, 0, Mon_GetBoxMon(mon)); StringExpandPlaceholders(unkPtr->unk7c4, unkPtr->unk7c8, str); String_dtor(str); sub_0207DAEC(unkPtr, -1, 1); diff --git a/src/overlay_bug_contest.c b/src/overlay_bug_contest.c index f4a40e681..85b08cacc 100644 --- a/src/overlay_bug_contest.c +++ b/src/overlay_bug_contest.c @@ -28,7 +28,7 @@ void BugContest_BackUpParty(BUGCONTEST *bugContest); void BugContest_InitOpponents(BUGCONTEST *bugContest); void BugContest_InitEncounters(BUGCONTEST *bugContest); void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon); +u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon); BUGCONTEST *BugContest_new(FieldSystem *fsys, u32 weekday) { BUGCONTEST *bugContest; @@ -38,7 +38,7 @@ BUGCONTEST *BugContest_new(FieldSystem *fsys, u32 weekday) { bugContest->heapId = 3; bugContest->saveData = fsys->savedata; bugContest->sport_balls = 20; - bugContest->pokemon = AllocMonZeroed(bugContest->heapId); + bugContest->mon = AllocMonZeroed(bugContest->heapId); bugContest->national_dex = Pokedex_GetNatDexFlag(Sav2_Pokedex_get(bugContest->saveData)); bugContest->day_of_week = weekday; BugContest_BackUpParty(bugContest); @@ -50,7 +50,7 @@ BUGCONTEST *BugContest_new(FieldSystem *fsys, u32 weekday) { void BugContest_delete(BUGCONTEST *bugContest) { BugContest_RestoreParty_RetrieveCaughtPokemon(bugContest); - FreeToHeap(bugContest->pokemon); + FreeToHeap(bugContest->mon); FreeToHeap(bugContest); } @@ -63,8 +63,8 @@ void BugContest_Judge(BUGCONTEST *bugContest) { // Judge the player's caught Pokemon player = &bugContest->contestants[BUGCONTESTANT_PLAYER]; player->id = BUGCONTESTANT_PLAYER; - player->score = BugContest_JudgePlayerMon(bugContest, bugContest->pokemon); - player->data.species = GetMonData(bugContest->pokemon, MON_DATA_SPECIES, NULL); + player->score = BugContest_JudgePlayerMon(bugContest, bugContest->mon); + player->data.species = GetMonData(bugContest->mon, MON_DATA_SPECIES, NULL); // Init the rankings list for (i = 0; i < BUGCONTESTANT_COUNT; i++) { @@ -157,7 +157,7 @@ BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MSGFMT *msgFmt, u8 s } string = String_ctor(POKEMON_NAME_LENGTH+1+1, bugContest->heapId); - GetMonData(bugContest->pokemon, MON_DATA_NICKNAME_3, string); + GetMonData(bugContest->mon, MON_DATA_NICKNAME_3, string); BufferString(msgFmt, slot, string, 2, 1, 2); String_dtor(string); return bugContest->party_cur_num >= PARTY_SIZE; @@ -202,26 +202,26 @@ void BugContest_BackUpParty(BUGCONTEST *bugContest) { } void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest) { - Pokemon *pokemon; + Pokemon *mon; PARTY_EXTRA_SUB sub; // Restore the player's party to its prior state, but keep the // state of the Pokemon you used intact. - pokemon = AllocMonZeroed(bugContest->heapId); - CopyPokemonToPokemon(GetPartyMonByIndex(bugContest->party_cur, 0), pokemon); + mon = AllocMonZeroed(bugContest->heapId); + CopyPokemonToPokemon(GetPartyMonByIndex(bugContest->party_cur, 0), mon); Party_GetUnkSubSlot(bugContest->party_cur, &sub, 0); Party_copy(bugContest->party_bak, bugContest->party_cur); - Party_SafeCopyMonToSlot_ResetUnkSub(bugContest->party_cur, bugContest->lead_mon_idx, pokemon); + Party_SafeCopyMonToSlot_ResetUnkSub(bugContest->party_cur, bugContest->lead_mon_idx, mon); Party_SetUnkSubSlot(bugContest->party_cur, &sub, bugContest->lead_mon_idx); - FreeToHeap(pokemon); + FreeToHeap(mon); FreeToHeap(bugContest->party_bak); bugContest->party_bak = NULL; if (bugContest->caught_poke) { if (bugContest->party_cur_num >= PARTY_SIZE) { - PCStorage_PlaceMonInFirstEmptySlotInAnyBox(GetStoragePCPointer(bugContest->saveData), Mon_GetBoxMon(bugContest->pokemon)); + PCStorage_PlaceMonInFirstEmptySlotInAnyBox(GetStoragePCPointer(bugContest->saveData), Mon_GetBoxMon(bugContest->mon)); } else { - AddMonToParty(bugContest->party_cur, bugContest->pokemon); + AddMonToParty(bugContest->party_cur, bugContest->mon); } } } @@ -306,7 +306,7 @@ void BugContest_InitEncounters(BUGCONTEST *bugContest) { FS_CloseFile(&file); } -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon) { +u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon) { u16 score = 0; int i; u16 species; @@ -316,7 +316,7 @@ u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon) { if (!bugContest->caught_poke) { return score; } - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); for (i = 0; i < BUGMON_COUNT; i++) { if (bugContest->encounters[i].species == species) { bugmon = &bugContest->encounters[i]; @@ -329,12 +329,12 @@ u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon) { return 0; } - score += GetMonData(pokemon, MON_DATA_LEVEL, NULL) * 100 / bugmon->lvlmax; + score += GetMonData(mon, MON_DATA_LEVEL, NULL) * 100 / bugmon->lvlmax; stat_total = 0; for (i = 0; i < NUM_STATS; i++) { - stat_total += GetMonData(pokemon, MON_DATA_HP_IV + i, NULL); + stat_total += GetMonData(mon, MON_DATA_HP_IV + i, NULL); } score += stat_total * 100 / (31 * NUM_STATS); - score += GetMonData(pokemon, MON_DATA_HP, NULL) * 100 / GetMonData(pokemon, MON_DATA_MAXHP, NULL); + score += GetMonData(mon, MON_DATA_HP, NULL) * 100 / GetMonData(mon, MON_DATA_MAXHP, NULL); return score; } diff --git a/src/party.c b/src/party.c index 1180920f8..cc7a1947e 100644 --- a/src/party.c +++ b/src/party.c @@ -40,11 +40,11 @@ void InitPartyWithMaxSize(PARTY *party, int maxSize) { MI_CpuClear8(&party->extra, 5 * party->core.maxCount); } -BOOL AddMonToParty(PARTY *party, const Pokemon *pokemon) { +BOOL AddMonToParty(PARTY *party, const Pokemon *mon) { if (party->core.curCount >= party->core.maxCount) { return FALSE; } - party->core.mons[party->core.curCount] = *pokemon; + party->core.mons[party->core.curCount] = *mon; MI_CpuClear8(&party->extra.unk_00[party->core.curCount], sizeof(PARTY_EXTRA_SUB)); party->core.curCount++; return TRUE; diff --git a/src/pokedex.c b/src/pokedex.c index f8e20a1a3..65dca8bff 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -314,10 +314,10 @@ static BOOL Pokedex_CheckSeenDeoxysForme(POKEDEX *pokedex, u32 forme) { return FALSE; } -static void Pokedex_SetSeenDeoxysForme(POKEDEX *pokedex, u16 species, Pokemon *pokemon) { +static void Pokedex_SetSeenDeoxysForme(POKEDEX *pokedex, u16 species, Pokemon *mon) { u8 forme; - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); if (species == SPECIES_DEOXYS) { if (!Pokedex_CheckSeenDeoxysForme(pokedex, forme)) { Pokedex_DeoxysFormeFlagAction(pokedex, forme, Pokedex_CountSeenDeoxysFormes(pokedex)); @@ -377,10 +377,10 @@ static void Pokedex_SetSeenRotomForme(POKEDEX *pokedex, u32 species, u32 forme) } } -static void Pokedex_TryAppendSeenForme(POKEDEX *pokedex, u16 species, Pokemon *pokemon) { +static void Pokedex_TryAppendSeenForme(POKEDEX *pokedex, u16 species, Pokemon *mon) { u32 forme; - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); switch (species) { case SPECIES_UNOWN: Pokedex_TryAppendUnownLetter(pokedex, forme, FALSE); @@ -391,7 +391,7 @@ static void Pokedex_TryAppendSeenForme(POKEDEX *pokedex, u16 species, Pokemon *p break; case SPECIES_PICHU: if (forme == 0) { - if (GetMonGender(pokemon) == MON_MALE) { + if (GetMonGender(mon) == MON_MALE) { forme = 0; } else { forme = 1; @@ -406,7 +406,7 @@ static void Pokedex_TryAppendSeenForme(POKEDEX *pokedex, u16 species, Pokemon *p Pokedex_SetSeenForme_2max(pokedex, species, forme); break; case SPECIES_DEOXYS: - Pokedex_SetSeenDeoxysForme(pokedex, species, pokemon); + Pokedex_SetSeenDeoxysForme(pokedex, species, mon); break; case SPECIES_SHAYMIN: case SPECIES_GIRATINA: @@ -762,15 +762,15 @@ static u32 Pokedex_GetSeenFormeNum_Deoxys(POKEDEX *pokedex) { return Pokedex_CountSeenDeoxysFormes(pokedex); } -void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *pokemon) { +void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *mon) { u16 species; u32 personality; u32 gender; u8 seenGender; - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); - gender = GetMonGender(pokemon); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); + gender = GetMonGender(mon); ASSERT_POKEDEX(pokedex); if (!DexSpeciesIsInvalid(species)) { @@ -785,22 +785,22 @@ void Pokedex_SetMonSeenFlag(POKEDEX *pokedex, Pokemon *pokemon) { Pokedex_SetSeenGenderFlag(pokedex, gender, 1, species); } } - Pokedex_TryAppendSeenForme(pokedex, species, pokemon); + Pokedex_TryAppendSeenForme(pokedex, species, mon); SetDexFlag((u8 *)pokedex->seenSpecies, species); } } -void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *pokemon) { +void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *mon) { u16 species; u32 language; u32 personality; u32 gender; u32 gender_ct; - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - language = GetMonData(pokemon, MON_DATA_GAME_LANGUAGE, NULL); - personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); - gender = GetMonGender(pokemon); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + language = GetMonData(mon, MON_DATA_GAME_LANGUAGE, NULL); + personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); + gender = GetMonGender(mon); ASSERT_POKEDEX(pokedex); if (!DexSpeciesIsInvalid(species)) { @@ -815,9 +815,9 @@ void Pokedex_SetMonCaughtFlag(POKEDEX *pokedex, Pokemon *pokemon) { Pokedex_SetSeenGenderFlag(pokedex, gender, 1, species); } } - Pokedex_TryAppendSeenForme(pokedex, species, pokemon); + Pokedex_TryAppendSeenForme(pokedex, species, mon); if (species == SPECIES_UNOWN) { - Pokedex_TryAppendUnownLetter(pokedex, GetMonUnownLetter(pokemon), TRUE); + Pokedex_TryAppendUnownLetter(pokedex, GetMonUnownLetter(mon), TRUE); } Pokedex_SetCaughtLanguage(pokedex, species, language); if (language != GAME_LANGUAGE) { diff --git a/src/pokemon.c b/src/pokemon.c index 243659366..aabbf523d 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -27,11 +27,11 @@ u32 CalcMonChecksum(void *data, u32 size); void InitBoxMonMoveset(BOXMON *boxmon); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *dest); u16 ModifyStatByNature(u8 nature, u16 stat, u8 statID); -static u32 GetMonDataInternal(Pokemon * pokemon, int attr, void * dest); +static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest); static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest); -static void SetMonDataInternal(Pokemon * pokemon, int attr, const void * data); +static void SetMonDataInternal(Pokemon *mon, int attr, const void * data); static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * data); -static void AddMonDataInternal(Pokemon * pokemon, int attr, int value); +static void AddMonDataInternal(Pokemon *mon, int attr, int value); static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value); PokemonDataBlock *GetSubstruct(BOXMON *boxmon, u32 pid, u8 which_struct); void LoadMonPersonal(int species, BASE_STATS *dest); @@ -48,7 +48,7 @@ u8 sub_020708D8(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid); void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C *a3); int TrainerClassToBackpicID(int trainer_class, int a1); void LoadMonEvolutionTable(u16 species, struct Evolution *evoTable); -BOOL MonHasMove(Pokemon *pokemon, u16 move_id); +BOOL MonHasMove(Pokemon *mon, u16 move_id); void sub_0207213C(BOXMON *boxmon, PLAYERPROFILE *playerProfile, 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); @@ -95,10 +95,10 @@ static const s8 sFlavorPreferencesByNature[NATURE_NUM][FLAVOR_MAX] = { { 0, 0, 0, 0, 0}, }; -void ZeroMonData(Pokemon *pokemon) { - MI_CpuClearFast(pokemon, sizeof(Pokemon)); - ENCRYPT_BOX(&pokemon->box); - ENCRYPT_PTY(pokemon); +void ZeroMonData(Pokemon *mon) { + MI_CpuClearFast(mon, sizeof(Pokemon)); + ENCRYPT_BOX(&mon->box); + ENCRYPT_PTY(mon); } void ZeroBoxMonData(BOXMON *boxmon) { @@ -111,33 +111,33 @@ u32 SizeOfStructPokemon(void) { } Pokemon *AllocMonZeroed(HeapID heapId) { - Pokemon *ret = (Pokemon *)AllocFromHeap(heapId, sizeof(Pokemon)); - ZeroMonData(ret); - return ret; + Pokemon *mon = (Pokemon *)AllocFromHeap(heapId, sizeof(Pokemon)); + ZeroMonData(mon); + return mon; } -BOOL AcquireMonLock(Pokemon *pokemon) { +BOOL AcquireMonLock(Pokemon *mon) { BOOL locked = FALSE; - if (!pokemon->box.party_lock) { + if (!mon->box.party_lock) { locked = TRUE; - GF_ASSERT(!pokemon->box.box_lock); - pokemon->box.party_lock = TRUE; - pokemon->box.box_lock = TRUE; - DECRYPT_PTY(pokemon); - DECRYPT_BOX(&pokemon->box); + GF_ASSERT(!mon->box.box_lock); + mon->box.party_lock = TRUE; + mon->box.box_lock = TRUE; + DECRYPT_PTY(mon); + DECRYPT_BOX(&mon->box); } return locked; } -BOOL ReleaseMonLock(Pokemon *pokemon, BOOL locked) { +BOOL ReleaseMonLock(Pokemon *mon, BOOL locked) { BOOL prev = FALSE; - if (pokemon->box.party_lock == TRUE && locked == TRUE) { + if (mon->box.party_lock == TRUE && locked == TRUE) { prev = TRUE; - pokemon->box.party_lock = FALSE; - pokemon->box.box_lock = FALSE; - ENCRYPT_PTY(pokemon); - pokemon->box.checksum = CHECKSUM(&pokemon->box); - ENCRYPT_BOX(&pokemon->box); + mon->box.party_lock = FALSE; + mon->box.box_lock = FALSE; + ENCRYPT_PTY(mon); + mon->box.checksum = CHECKSUM(&mon->box); + ENCRYPT_BOX(&mon->box); } return prev; } @@ -162,24 +162,24 @@ BOOL ReleaseBoxMonLock(BOXMON *boxmon, BOOL locked) { } return prev; } -void CreateMon(Pokemon * pokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { +void CreateMon(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { MAIL * mail; u32 capsule; CAPSULE seal_coords; - ZeroMonData(pokemon); - CreateBoxMon(&pokemon->box, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId); + ZeroMonData(mon); + CreateBoxMon(&mon->box, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId); // Not your average encryption call - MonEncryptSegment((u16 *)&pokemon->party, sizeof(pokemon->party), 0); - ENCRYPT_PTY(pokemon); - SetMonData(pokemon, MON_DATA_LEVEL, &level); + MonEncryptSegment((u16 *)&mon->party, sizeof(mon->party), 0); + ENCRYPT_PTY(mon); + SetMonData(mon, MON_DATA_LEVEL, &level); mail = Mail_new(0); - SetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); + SetMonData(mon, MON_DATA_MAIL_STRUCT, mail); FreeToHeap(mail); capsule = 0; - SetMonData(pokemon, MON_DATA_CAPSULE, &capsule); + SetMonData(mon, MON_DATA_CAPSULE, &capsule); MI_CpuClearFast(&seal_coords, sizeof(seal_coords)); - SetMonData(pokemon, MON_DATA_SEAL_COORDS, &seal_coords); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_SEAL_COORDS, &seal_coords); + CalcMonLevelAndStats(mon); } void CreateBoxMon(BOXMON * boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { @@ -252,15 +252,15 @@ void CreateBoxMon(BOXMON * boxPokemon, int species, int level, int fixedIV, int ReleaseBoxMonLock(boxPokemon, decry); } -void CreateMonWithNature(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 nature) { +void CreateMonWithNature(Pokemon *mon, u16 species, u8 level, u8 fixedIv, u8 nature) { u32 personality; do { personality = (u32)(LCRandom() | (LCRandom() << 16)); } while (nature != GetNatureFromPersonality(personality)); - CreateMon(pokemon, (int)species, (int)level, (int)fixedIv, TRUE, (int)personality, (int)0, (int)0); + CreateMon(mon, (int)species, (int)level, (int)fixedIv, TRUE, (int)personality, (int)0, (int)0); } -void CreateMonWithGenderNatureLetter(Pokemon * pokemon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter) { +void CreateMonWithGenderNatureLetter(Pokemon *mon, u16 species, u8 level, u8 fixedIv, u8 gender, u8 nature, u8 letter) { u32 pid = 0; u16 test = 0; if (letter != 0 && letter < 29) { @@ -271,7 +271,7 @@ void CreateMonWithGenderNatureLetter(Pokemon * pokemon, u16 species, u8 level, u } else { pid = GenPersonalityByGenderAndNature(species, gender, nature); } - CreateMon(pokemon, (int)species, (int)level, (int)fixedIv, 1, (int)pid, 0, 0); + CreateMon(mon, (int)species, (int)level, (int)fixedIv, 1, (int)pid, 0, 0); } u32 GenPersonalityByGenderAndNature(u16 species, u8 gender, u8 nature) { @@ -294,21 +294,21 @@ u32 GenPersonalityByGenderAndNature(u16 species, u8 gender, u8 nature) { return (u32)pid; } -void CreateMonWithFixedIVs(Pokemon * pokemon, int species, int level, int ivs, int personality) { - CreateMon(pokemon, species, level, 0, 1, personality, 0, 0); - SetMonData(pokemon, MON_DATA_IVS_WORD, &ivs); - CalcMonLevelAndStats(pokemon); +void CreateMonWithFixedIVs(Pokemon *mon, int species, int level, int ivs, int personality) { + CreateMon(mon, species, level, 0, 1, personality, 0, 0); + SetMonData(mon, MON_DATA_IVS_WORD, &ivs); + CalcMonLevelAndStats(mon); } -void CalcMonLevelAndStats(Pokemon * pokemon) { - BOOL decry = AcquireMonLock(pokemon); - u32 level = (u32)CalcMonLevel(pokemon); - SetMonData(pokemon, MON_DATA_LEVEL, &level); - CalcMonStats(pokemon); - ReleaseMonLock(pokemon, decry); +void CalcMonLevelAndStats(Pokemon *mon) { + BOOL decry = AcquireMonLock(mon); + u32 level = (u32)CalcMonLevel(mon); + SetMonData(mon, MON_DATA_LEVEL, &level); + CalcMonStats(mon); + ReleaseMonLock(mon, decry); } -void CalcMonStats(Pokemon * pokemon) { +void CalcMonStats(Pokemon *mon) { BASE_STATS * baseStats; int level; int maxHp; @@ -334,24 +334,24 @@ void CalcMonStats(Pokemon * pokemon) { int newSpatk; int newSpdef; - BOOL decry = AcquireMonLock(pokemon); - level = (int)GetMonData(pokemon, MON_DATA_LEVEL, NULL); - maxHp = (int)GetMonData(pokemon, MON_DATA_MAXHP, NULL); - hp = (int)GetMonData(pokemon, MON_DATA_HP, NULL); - hpIv = (int)GetMonData(pokemon, MON_DATA_HP_IV, NULL); - hpEv = (int)GetMonData(pokemon, MON_DATA_HP_EV, NULL); - atkIv = (int)GetMonData(pokemon, MON_DATA_ATK_IV, NULL); - atkEv = (int)GetMonData(pokemon, MON_DATA_ATK_EV, NULL); - defIv = (int)GetMonData(pokemon, MON_DATA_DEF_IV, NULL); - defEv = (int)GetMonData(pokemon, MON_DATA_DEF_EV, NULL); - speedIv = (int)GetMonData(pokemon, MON_DATA_SPEED_IV, NULL); - speedEv = (int)GetMonData(pokemon, MON_DATA_SPEED_EV, NULL); - spatkIv = (int)GetMonData(pokemon, MON_DATA_SPATK_IV, NULL); - spatkEv = (int)GetMonData(pokemon, MON_DATA_SPATK_EV, NULL); - spdefIv = (int)GetMonData(pokemon, MON_DATA_SPDEF_IV, NULL); - spdefEv = (int)GetMonData(pokemon, MON_DATA_SPDEF_EV, NULL); - forme = (int)GetMonData(pokemon, MON_DATA_FORME, NULL); - species = (int)GetMonData(pokemon, MON_DATA_SPECIES, NULL); + BOOL decry = AcquireMonLock(mon); + level = (int)GetMonData(mon, MON_DATA_LEVEL, NULL); + maxHp = (int)GetMonData(mon, MON_DATA_MAXHP, NULL); + hp = (int)GetMonData(mon, MON_DATA_HP, NULL); + hpIv = (int)GetMonData(mon, MON_DATA_HP_IV, NULL); + hpEv = (int)GetMonData(mon, MON_DATA_HP_EV, NULL); + atkIv = (int)GetMonData(mon, MON_DATA_ATK_IV, NULL); + atkEv = (int)GetMonData(mon, MON_DATA_ATK_EV, NULL); + defIv = (int)GetMonData(mon, MON_DATA_DEF_IV, NULL); + defEv = (int)GetMonData(mon, MON_DATA_DEF_EV, NULL); + speedIv = (int)GetMonData(mon, MON_DATA_SPEED_IV, NULL); + speedEv = (int)GetMonData(mon, MON_DATA_SPEED_EV, NULL); + spatkIv = (int)GetMonData(mon, MON_DATA_SPATK_IV, NULL); + spatkEv = (int)GetMonData(mon, MON_DATA_SPATK_EV, NULL); + spdefIv = (int)GetMonData(mon, MON_DATA_SPDEF_IV, NULL); + spdefEv = (int)GetMonData(mon, MON_DATA_SPDEF_EV, NULL); + forme = (int)GetMonData(mon, MON_DATA_FORME, NULL); + species = (int)GetMonData(mon, MON_DATA_SPECIES, NULL); baseStats = (BASE_STATS *)AllocFromHeap(0, sizeof(BASE_STATS)); LoadMonBaseStats_HandleAlternateForme(species, forme, baseStats); @@ -361,27 +361,27 @@ void CalcMonStats(Pokemon * pokemon) { } else { newMaxHp = (baseStats->hp * 2 + hpIv + hpEv / 4) * level / 100 + level + 10; } - SetMonData(pokemon, MON_DATA_MAXHP, &newMaxHp); + SetMonData(mon, MON_DATA_MAXHP, &newMaxHp); newAtk = (baseStats->atk * 2 + atkIv + atkEv / 4) * level / 100 + 5; - newAtk = ModifyStatByNature(GetMonNature(pokemon), (u16)newAtk, STAT_ATK); - SetMonData(pokemon, MON_DATA_ATK, &newAtk); + newAtk = ModifyStatByNature(GetMonNature(mon), (u16)newAtk, STAT_ATK); + SetMonData(mon, MON_DATA_ATK, &newAtk); newDef = (baseStats->def * 2 + defIv + defEv / 4) * level / 100 + 5; - newDef = ModifyStatByNature(GetMonNature(pokemon), (u16)newDef, STAT_DEF); - SetMonData(pokemon, MON_DATA_DEF, &newDef); + newDef = ModifyStatByNature(GetMonNature(mon), (u16)newDef, STAT_DEF); + SetMonData(mon, MON_DATA_DEF, &newDef); newSpeed = (baseStats->speed * 2 + speedIv + speedEv / 4) * level / 100 + 5; - newSpeed = ModifyStatByNature(GetMonNature(pokemon), (u16)newSpeed, STAT_SPEED); - SetMonData(pokemon, MON_DATA_SPEED, &newSpeed); + newSpeed = ModifyStatByNature(GetMonNature(mon), (u16)newSpeed, STAT_SPEED); + SetMonData(mon, MON_DATA_SPEED, &newSpeed); newSpatk = (baseStats->spatk * 2 + spatkIv + spatkEv / 4) * level / 100 + 5; - newSpatk = ModifyStatByNature(GetMonNature(pokemon), (u16)newSpatk, STAT_SPATK); - SetMonData(pokemon, MON_DATA_SPATK, &newSpatk); + newSpatk = ModifyStatByNature(GetMonNature(mon), (u16)newSpatk, STAT_SPATK); + SetMonData(mon, MON_DATA_SPATK, &newSpatk); newSpdef = (baseStats->spdef * 2 + spdefIv + spdefEv / 4) * level / 100 + 5; - newSpdef = ModifyStatByNature(GetMonNature(pokemon), (u16)newSpdef, STAT_SPDEF); - SetMonData(pokemon, MON_DATA_SPDEF, &newSpdef); + newSpdef = ModifyStatByNature(GetMonNature(mon), (u16)newSpdef, STAT_SPDEF); + SetMonData(mon, MON_DATA_SPDEF, &newSpdef); FreeToHeap(baseStats); @@ -399,61 +399,61 @@ void CalcMonStats(Pokemon * pokemon) { } } if (hp != 0) { - SetMonData(pokemon, MON_DATA_HP, &hp); + SetMonData(mon, MON_DATA_HP, &hp); } - ReleaseMonLock(pokemon, decry); + ReleaseMonLock(mon, decry); } -u32 GetMonData(Pokemon * pokemon, int attr, void * dest) { +u32 GetMonData(Pokemon *mon, int attr, void * dest) { u32 ret; u32 checksum; - if (!pokemon->box.party_lock) { - DECRYPT_PTY(pokemon); - DECRYPT_BOX(&pokemon->box); - checksum = CHECKSUM(&pokemon->box); - if (checksum != pokemon->box.checksum) { - GF_ASSERT(checksum == pokemon->box.checksum); - pokemon->box.checksum_fail = TRUE; + if (!mon->box.party_lock) { + DECRYPT_PTY(mon); + DECRYPT_BOX(&mon->box); + checksum = CHECKSUM(&mon->box); + if (checksum != mon->box.checksum) { + GF_ASSERT(checksum == mon->box.checksum); + mon->box.checksum_fail = TRUE; } } - ret = GetMonDataInternal(pokemon, attr, dest); - if (!pokemon->box.party_lock) { - ENCRYPT_PTY(pokemon); - ENCRYPT_BOX(&pokemon->box); + ret = GetMonDataInternal(mon, attr, dest); + if (!mon->box.party_lock) { + ENCRYPT_PTY(mon); + ENCRYPT_BOX(&mon->box); } return ret; } -static u32 GetMonDataInternal(Pokemon * pokemon, int attr, void * dest) { +static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest) { switch (attr) { case MON_DATA_STATUS: - return pokemon->party.status; + return mon->party.status; case MON_DATA_LEVEL: - return pokemon->party.level; + return mon->party.level; case MON_DATA_CAPSULE: - return pokemon->party.capsule; + return mon->party.capsule; case MON_DATA_HP: - return pokemon->party.hp; + return mon->party.hp; case MON_DATA_MAXHP: - return pokemon->party.maxHp; + return mon->party.maxHp; case MON_DATA_ATK: - return pokemon->party.atk; + return mon->party.atk; case MON_DATA_DEF: - return pokemon->party.def; + return mon->party.def; case MON_DATA_SPEED: - return pokemon->party.speed; + return mon->party.speed; case MON_DATA_SPATK: - return pokemon->party.spatk; + return mon->party.spatk; case MON_DATA_SPDEF: - return pokemon->party.spdef; + return mon->party.spdef; case MON_DATA_MAIL_STRUCT: - Mail_copy(&pokemon->party.mail, dest); + Mail_copy(&mon->party.mail, dest); return 1; case MON_DATA_SEAL_COORDS: - CopyCapsule(&pokemon->party.sealCoords, dest); + CopyCapsule(&mon->party.sealCoords, dest); return 1; default: - return GetBoxMonDataInternal(&pokemon->box, attr, dest); + return GetBoxMonDataInternal(&mon->box, attr, dest); } } @@ -887,68 +887,68 @@ static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest) { return ret; } -void SetMonData(Pokemon * pokemon, int attr, void * value) { +void SetMonData(Pokemon *mon, int attr, void * value) { u32 checksum; - if (!pokemon->box.party_lock) { - DECRYPT_PTY(pokemon); - DECRYPT_BOX(&pokemon->box); - checksum = CHECKSUM(&pokemon->box); - if (checksum != pokemon->box.checksum) { - GF_ASSERT(checksum == pokemon->box.checksum); - pokemon->box.checksum_fail = TRUE; - ENCRYPT_BOX(&pokemon->box); + if (!mon->box.party_lock) { + DECRYPT_PTY(mon); + DECRYPT_BOX(&mon->box); + checksum = CHECKSUM(&mon->box); + if (checksum != mon->box.checksum) { + GF_ASSERT(checksum == mon->box.checksum); + mon->box.checksum_fail = TRUE; + ENCRYPT_BOX(&mon->box); return; } } - SetMonDataInternal(pokemon, attr, value); - if (!pokemon->box.party_lock) { - ENCRYPT_PTY(pokemon); - pokemon->box.checksum = CHECKSUM(&pokemon->box); - ENCRYPT_BOX(&pokemon->box); + SetMonDataInternal(mon, attr, value); + if (!mon->box.party_lock) { + ENCRYPT_PTY(mon); + mon->box.checksum = CHECKSUM(&mon->box); + ENCRYPT_BOX(&mon->box); } } -static void SetMonDataInternal(Pokemon * pokemon, int attr, const void * value) { +static void SetMonDataInternal(Pokemon *mon, int attr, const void * value) { #define VALUE(type) (*(const type *)value) switch (attr) { case MON_DATA_STATUS: - pokemon->party.status = VALUE(u32); + mon->party.status = VALUE(u32); break; case MON_DATA_LEVEL: - pokemon->party.level = VALUE(u8); + mon->party.level = VALUE(u8); break; case MON_DATA_CAPSULE: - pokemon->party.capsule = VALUE(u8); + mon->party.capsule = VALUE(u8); break; case MON_DATA_HP: - pokemon->party.hp = VALUE(u16); + mon->party.hp = VALUE(u16); break; case MON_DATA_MAXHP: - pokemon->party.maxHp = VALUE(u16); + mon->party.maxHp = VALUE(u16); break; case MON_DATA_ATK: - pokemon->party.atk = VALUE(u16); + mon->party.atk = VALUE(u16); break; case MON_DATA_DEF: - pokemon->party.def = VALUE(u16); + mon->party.def = VALUE(u16); break; case MON_DATA_SPEED: - pokemon->party.speed = VALUE(u16); + mon->party.speed = VALUE(u16); break; case MON_DATA_SPATK: - pokemon->party.spatk = VALUE(u16); + mon->party.spatk = VALUE(u16); break; case MON_DATA_SPDEF: - pokemon->party.spdef = VALUE(u16); + mon->party.spdef = VALUE(u16); break; case MON_DATA_MAIL_STRUCT: - Mail_copy((const MAIL *)value, &pokemon->party.mail); + Mail_copy((const MAIL *)value, &mon->party.mail); break; case MON_DATA_SEAL_COORDS: - CopyCapsule((const CAPSULE *)value, &pokemon->party.sealCoords); + CopyCapsule((const CAPSULE *)value, &mon->party.sealCoords); break; default: - SetBoxMonDataInternal(&pokemon->box, attr, value); + SetBoxMonDataInternal(&mon->box, attr, value); break; } #undef VALUE @@ -1353,35 +1353,35 @@ static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * value) #undef VALUE } -void AddMonData(Pokemon * pokemon, int attr, int value) { +void AddMonData(Pokemon *mon, int attr, int value) { u32 checksum; - if (!pokemon->box.party_lock) { - DECRYPT_PTY(pokemon); - DECRYPT_BOX(&pokemon->box); - checksum = CHECKSUM(&pokemon->box); - if (checksum != pokemon->box.checksum) { - GF_ASSERT(checksum == pokemon->box.checksum); - ENCRYPT_BOX(&pokemon->box); + if (!mon->box.party_lock) { + DECRYPT_PTY(mon); + DECRYPT_BOX(&mon->box); + checksum = CHECKSUM(&mon->box); + if (checksum != mon->box.checksum) { + GF_ASSERT(checksum == mon->box.checksum); + ENCRYPT_BOX(&mon->box); return; } } - AddMonDataInternal(pokemon, attr, value); - if (!pokemon->box.party_lock) { - ENCRYPT_PTY(pokemon); - pokemon->box.checksum = CHECKSUM(&pokemon->box); - ENCRYPT_BOX(&pokemon->box); + AddMonDataInternal(mon, attr, value); + if (!mon->box.party_lock) { + ENCRYPT_PTY(mon); + mon->box.checksum = CHECKSUM(&mon->box); + ENCRYPT_BOX(&mon->box); } } -static void AddMonDataInternal(Pokemon * pokemon, int attr, int value) { +static void AddMonDataInternal(Pokemon *mon, int attr, int value) { s32 maxHp; switch (attr) { case MON_DATA_HP: - maxHp = pokemon->party.maxHp; - if ((s32)(pokemon->party.hp + value) > maxHp) { - pokemon->party.hp = (u16)maxHp; + maxHp = mon->party.maxHp; + if ((s32)(mon->party.hp + value) > maxHp) { + mon->party.hp = (u16)maxHp; } else { - pokemon->party.hp += value; + mon->party.hp += value; } break; case MON_DATA_STATUS: @@ -1398,7 +1398,7 @@ static void AddMonDataInternal(Pokemon * pokemon, int attr, int value) { GF_ASSERT(0); break; default: - AddBoxMonDataInternal(&pokemon->box, attr, value); + AddBoxMonDataInternal(&mon->box, attr, value); break; } } @@ -1867,19 +1867,19 @@ int GetMonBaseStatEx_HandleAlternateForme(NARC *narc, int species, int forme, Ba return ret; } -u8 GetPercentProgressTowardsNextLevel(Pokemon * pokemon) { - BOOL decry = AcquireMonLock(pokemon); - u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); - u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); +u8 GetPercentProgressTowardsNextLevel(Pokemon *mon) { + BOOL decry = AcquireMonLock(mon); + u16 species = (u16)GetMonData(mon, MON_DATA_SPECIES, NULL); + u8 level = (u8)GetMonData(mon, MON_DATA_LEVEL, NULL); u32 lo = GetMonExpBySpeciesAndLevel(species, level); u32 hi = GetMonExpBySpeciesAndLevel(species, level + 1); - u32 cur = GetMonData(pokemon, MON_DATA_EXPERIENCE, NULL); - ReleaseMonLock(pokemon, decry); + u32 cur = GetMonData(mon, MON_DATA_EXPERIENCE, NULL); + ReleaseMonLock(mon, decry); return (u8)(100 * (cur - lo) / (hi - lo)); } -u32 CalcMonExpToNextLevel(Pokemon * pokemon) { - return CalcBoxMonExpToNextLevel(&pokemon->box); +u32 CalcMonExpToNextLevel(Pokemon *mon) { + return CalcBoxMonExpToNextLevel(&mon->box); } u32 CalcBoxMonExpToNextLevel(BOXMON * boxmon) { @@ -1890,9 +1890,9 @@ u32 CalcBoxMonExpToNextLevel(BOXMON * boxmon) { return hi - cur; } -u32 GetMonBaseExperienceAtCurrentLevel(Pokemon * pokemon) { - int species = (int)GetMonData(pokemon, MON_DATA_SPECIES, NULL); - int level = (int)GetMonData(pokemon, MON_DATA_LEVEL, NULL); +u32 GetMonBaseExperienceAtCurrentLevel(Pokemon *mon) { + int species = (int)GetMonData(mon, MON_DATA_SPECIES, NULL); + int level = (int)GetMonData(mon, MON_DATA_LEVEL, NULL); return GetMonExpBySpeciesAndLevel(species, level); } @@ -1917,8 +1917,8 @@ u32 GetExpByGrowthRateAndLevel(int growthRate, int level) { return ret; } -int CalcMonLevel(Pokemon * pokemon) { - return CalcBoxMonLevel(&pokemon->box); +int CalcMonLevel(Pokemon *mon) { + return CalcBoxMonLevel(&mon->box); } int CalcBoxMonLevel(BOXMON * boxmon) { @@ -1950,8 +1950,8 @@ int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 specie return i - 1; } -u8 GetMonNature(Pokemon * pokemon) { - return GetBoxMonNature(&pokemon->box); +u8 GetMonNature(Pokemon *mon) { + return GetBoxMonNature(&mon->box); } u8 GetBoxMonNature(BOXMON * boxmon) { @@ -2032,7 +2032,7 @@ static const s8 sFriendshipModTable[FRIENDSHIP_EVENT_NUM][FRIENDSHIP_TIER_NUM] = { 3, 2, 1}, // FRIENDHSIP_EVENT_CONTEST_WIN }; -void MonApplyFriendshipMod(Pokemon * pokemon, u8 kind, u16 location) { +void MonApplyFriendshipMod(Pokemon *mon, u8 kind, u16 location) { u16 species; u8 effect; u8 tier; @@ -2042,21 +2042,21 @@ void MonApplyFriendshipMod(Pokemon * pokemon, u8 kind, u16 location) { if (kind == FRIENDSHIP_EVENT_WALKING && (LCRandom() & 1)) return; - species = (u16)GetMonData(pokemon, MON_DATA_SPECIES2, NULL); + species = (u16)GetMonData(mon, MON_DATA_SPECIES2, NULL); if (species == SPECIES_NONE || species == SPECIES_EGG) return; - effect = (u8)GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, 0); + effect = (u8)GetItemAttr((u16)GetMonData(mon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, 0); tier = FRIENDSHIP_TIER_LOW; - friendship = (s16)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + friendship = (s16)GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendship >= FRIENDSHIP_TIER_MID_MIN) tier++; if (friendship >= FRIENDSHIP_TIER_HI_MIN) tier++; mod = sFriendshipModTable[kind][tier]; - if (mod > 0 && GetMonData(pokemon, MON_DATA_DP_POKEBALL, NULL) == BALL_LUXURY) + if (mod > 0 && GetMonData(mon, MON_DATA_DP_POKEBALL, NULL) == BALL_LUXURY) mod++; - if (mod > 0 && GetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, NULL) == location) + if (mod > 0 && GetMonData(mon, MON_DATA_EGG_MET_LOCATION, NULL) == location) mod++; if (mod > 0 && effect == HOLD_EFFECT_FRIENDSHIP_UP) mod = (s8)(mod * 150 / 100); @@ -2065,11 +2065,11 @@ void MonApplyFriendshipMod(Pokemon * pokemon, u8 kind, u16 location) { friendship = 0; if (friendship > FRIENDSHIP_MAX) friendship = FRIENDSHIP_MAX; - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); } -u8 GetMonGender(Pokemon *pokemon) { - return GetBoxMonGender(&pokemon->box); +u8 GetMonGender(Pokemon *mon) { + return GetBoxMonGender(&mon->box); } u8 GetBoxMonGender(BOXMON *boxmon) { @@ -2112,8 +2112,8 @@ BOOL BoxMonIsHoldingMail(BOXMON *boxmon) { return ItemIdIsMail(GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL)); } -u8 MonIsShiny(Pokemon *pokemon) { - return BoxMonIsShiny(&pokemon->box); +u8 MonIsShiny(Pokemon *mon) { + return BoxMonIsShiny(&mon->box); } u8 BoxMonIsShiny(BOXMON *boxmon) { @@ -2753,38 +2753,38 @@ u32 sub_02070D94(void) { return sizeof(BOXMON); } -u8 GetMonUnownLetter(Pokemon * pokemon) { - return GetBoxMonUnownLetter(&pokemon->box); +u8 GetMonUnownLetter(Pokemon *mon) { + return GetBoxMonUnownLetter(&mon->box); } u8 GetBoxMonUnownLetter(BOXMON * boxmon) { return (u8)GetBoxMonData(boxmon, MON_DATA_FORME, NULL); } -BOXMON * Mon_GetBoxMon(Pokemon * pokemon) { - return &pokemon->box; +BOXMON * Mon_GetBoxMon(Pokemon *mon) { + return &mon->box; } -BOOL Pokemon_TryLevelUp(Pokemon * pokemon) { - u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); - u8 level = (u8)(GetMonData(pokemon, MON_DATA_LEVEL, NULL) + 1); - u32 exp = GetMonData(pokemon, MON_DATA_EXPERIENCE, NULL); +BOOL Pokemon_TryLevelUp(Pokemon *mon) { + u16 species = (u16)GetMonData(mon, MON_DATA_SPECIES, NULL); + u8 level = (u8)(GetMonData(mon, MON_DATA_LEVEL, NULL) + 1); + u32 exp = GetMonData(mon, MON_DATA_EXPERIENCE, NULL); u32 growthrate = (u32)GetMonBaseStat(species, BASE_GROWTH_RATE); u32 maxexp = GetExpByGrowthRateAndLevel((int)growthrate, 100); if (exp > maxexp) { exp = maxexp; - SetMonData(pokemon, MON_DATA_EXPERIENCE, &exp); + SetMonData(mon, MON_DATA_EXPERIENCE, &exp); } if (level > 100) return FALSE; if (exp >= GetExpByGrowthRateAndLevel((int)growthrate, level)) { - SetMonData(pokemon, MON_DATA_LEVEL, &level); + SetMonData(mon, MON_DATA_LEVEL, &level); return TRUE; } return FALSE; } -u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, int *method_ret) { +u16 GetMonEvolution(PARTY *party, Pokemon *mon, u8 context, u16 usedItem, int *method_ret) { u16 species; u16 heldItem; u8 level; @@ -2798,10 +2798,10 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in struct Evolution *evoTable; int method_local; - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - heldItem = GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL); - pid = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); - beauty = GetMonData(pokemon, MON_DATA_BEAUTY, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, NULL); + pid = GetMonData(mon, MON_DATA_PERSONALITY, NULL); + beauty = GetMonData(mon, MON_DATA_BEAUTY, NULL); pid_hi = (u16)((pid & 0xFFFF0000) >> 16); holdEffect = GetItemAttr(heldItem, ITEMATTR_HOLD_EFFECT, 0); // Kadabra bypasses Everstone because he's just that broken. @@ -2809,7 +2809,7 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in return SPECIES_NONE; } // Spiky-ear Pichu cannot evolve - if (species == SPECIES_PICHU && GetMonData(pokemon, MON_DATA_FORME, 0) == 1) { + if (species == SPECIES_PICHU && GetMonData(mon, MON_DATA_FORME, 0) == 1) { return SPECIES_NONE; } if (method_ret == NULL) { @@ -2819,8 +2819,8 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in LoadMonEvolutionTable(species, evoTable); switch (context) { case EVOCTX_LEVELUP: - level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); - friendship = (u16)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + level = (u8)GetMonData(mon, MON_DATA_LEVEL, NULL); + friendship = (u16)GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); for (i = 0; i < 7; i++) { switch (evoTable[i].method) { case EVO_NONE: @@ -2856,19 +2856,19 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in case EVO_STONE: break; case EVO_LEVEL_ATK_GT_DEF: - if (evoTable[i].param <= level && GetMonData(pokemon, MON_DATA_ATK, NULL) > GetMonData(pokemon, MON_DATA_DEF, NULL)) { + if (evoTable[i].param <= level && GetMonData(mon, MON_DATA_ATK, NULL) > GetMonData(mon, MON_DATA_DEF, NULL)) { target = evoTable[i].target; *method_ret = EVO_LEVEL_ATK_GT_DEF; } break; case EVO_LEVEL_ATK_EQ_DEF: - if (evoTable[i].param <= level && GetMonData(pokemon, MON_DATA_ATK, NULL) == GetMonData(pokemon, MON_DATA_DEF, NULL)) { + if (evoTable[i].param <= level && GetMonData(mon, MON_DATA_ATK, NULL) == GetMonData(mon, MON_DATA_DEF, NULL)) { target = evoTable[i].target; *method_ret = EVO_LEVEL_ATK_EQ_DEF; } break; case EVO_LEVEL_ATK_LT_DEF: - if (evoTable[i].param <= level && GetMonData(pokemon, MON_DATA_ATK, NULL) < GetMonData(pokemon, MON_DATA_DEF, NULL)) { + if (evoTable[i].param <= level && GetMonData(mon, MON_DATA_ATK, NULL) < GetMonData(mon, MON_DATA_DEF, NULL)) { target = evoTable[i].target; *method_ret = EVO_LEVEL_ATK_LT_DEF; } @@ -2917,7 +2917,7 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in } break; case EVO_HAS_MOVE: - if (MonHasMove(pokemon, evoTable[i].param) == TRUE) { + if (MonHasMove(mon, evoTable[i].param) == TRUE) { target = evoTable[i].target; *method_ret = EVO_HAS_MOVE; } @@ -2929,13 +2929,13 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in } break; case EVO_LEVEL_MALE: - if (GetMonData(pokemon, MON_DATA_GENDER, NULL) == MON_MALE && evoTable[i].param <= level) { + if (GetMonData(mon, MON_DATA_GENDER, NULL) == MON_MALE && evoTable[i].param <= level) { target = evoTable[i].target; *method_ret = EVO_LEVEL_MALE; } break; case EVO_LEVEL_FEMALE: - if (GetMonData(pokemon, MON_DATA_GENDER, NULL) == MON_FEMALE && evoTable[i].param <= level) { + if (GetMonData(mon, MON_DATA_GENDER, NULL) == MON_FEMALE && evoTable[i].param <= level) { target = evoTable[i].target; *method_ret = EVO_LEVEL_FEMALE; } @@ -2991,12 +2991,12 @@ u16 GetMonEvolution(PARTY *party, Pokemon *pokemon, u8 context, u16 usedItem, in *method_ret = 0; break; } - if (evoTable[i].method == EVO_STONE_MALE && GetMonData(pokemon, MON_DATA_GENDER, NULL) == MON_MALE && usedItem == evoTable[i].param) { + if (evoTable[i].method == EVO_STONE_MALE && GetMonData(mon, MON_DATA_GENDER, NULL) == MON_MALE && usedItem == evoTable[i].param) { target = evoTable[i].target; *method_ret = 0; break; } - if (evoTable[i].method == EVO_STONE_FEMALE && GetMonData(pokemon, MON_DATA_GENDER, NULL) == MON_FEMALE && usedItem == evoTable[i].param) { + if (evoTable[i].method == EVO_STONE_FEMALE && GetMonData(mon, MON_DATA_GENDER, NULL) == MON_FEMALE && usedItem == evoTable[i].param) { target = evoTable[i].target; *method_ret = 0; break; @@ -3062,8 +3062,8 @@ void InitBoxMonMoveset(BOXMON * boxmon) { ReleaseBoxMonLock(boxmon, decry); } -u32 TryAppendMonMove(Pokemon *pokemon, u16 move) { - return TryAppendBoxMonMove(Mon_GetBoxMon(pokemon), move); +u32 TryAppendMonMove(Pokemon *mon, u16 move) { + return TryAppendBoxMonMove(Mon_GetBoxMon(mon), move); } u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move) { @@ -3087,8 +3087,8 @@ u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move) { return ret; } -void DeleteMonFirstMoveAndAppend(Pokemon *pokemon, u16 move_id) { - DeleteBoxMonFirstMoveAndAppend(Mon_GetBoxMon(pokemon), move_id); +void DeleteMonFirstMoveAndAppend(Pokemon *mon, u16 move_id) { + DeleteBoxMonFirstMoveAndAppend(Mon_GetBoxMon(mon), move_id); } void DeleteBoxMonFirstMoveAndAppend(BOXMON * boxmon, u16 move) { @@ -3117,19 +3117,19 @@ void DeleteBoxMonFirstMoveAndAppend(BOXMON * boxmon, u16 move) { ReleaseBoxMonLock(boxmon, decry); } -void MonSetMoveInSlot_ResetPpUp(Pokemon* pokemon, u16 move, u8 slot) { +void MonSetMoveInSlot_ResetPpUp(Pokemon *mon, u16 move, u8 slot) { int pp; int ppUp; - MonSetMoveInSlot(pokemon, move, slot); + MonSetMoveInSlot(mon, move, slot); ppUp = 0; - SetMonData(pokemon, MON_DATA_MOVE1PPUP + slot, &ppUp); + SetMonData(mon, MON_DATA_MOVE1PPUP + slot, &ppUp); pp = GetMoveMaxPP(move, 0); - SetMonData(pokemon, MON_DATA_MOVE1PP + slot, &pp); + SetMonData(mon, MON_DATA_MOVE1PP + slot, &pp); } -void MonSetMoveInSlot(Pokemon* pokemon, u16 move, u8 slot) { - BoxMonSetMoveInSlot(&pokemon->box, move, slot); +void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot) { + BoxMonSetMoveInSlot(&mon->box, move, slot); } void BoxMonSetMoveInSlot(BOXMON* boxmon, u16 move, u8 slot) { @@ -3142,12 +3142,12 @@ void BoxMonSetMoveInSlot(BOXMON* boxmon, u16 move, u8 slot) { SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot, &pp); } -u32 MonTryLearnMoveOnLevelUp(Pokemon * pokemon, int * last_i, u16 * sp0) { +u32 MonTryLearnMoveOnLevelUp(Pokemon *mon, int * last_i, u16 * sp0) { u32 ret = 0; u16 * wotbl = AllocFromHeap(0, 22 * sizeof(u16)); - u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL); - u32 forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); + u16 species = (u16)GetMonData(mon, MON_DATA_SPECIES, NULL); + u32 forme = GetMonData(mon, MON_DATA_FORME, NULL); + u8 level = (u8)GetMonData(mon, MON_DATA_LEVEL, NULL); LoadWotbl_HandleAlternateForme(species, (int)forme, wotbl); if (wotbl[*last_i] == WOTBL_END) { @@ -3164,14 +3164,14 @@ u32 MonTryLearnMoveOnLevelUp(Pokemon * pokemon, int * last_i, u16 * sp0) { if ((wotbl[*last_i] & WOTBL_LEVEL_MASK) == (level << WOTBL_LEVEL_SHIFT)) { *sp0 = WOTBL_MOVE(wotbl[*last_i]); (*last_i)++; - ret = TryAppendMonMove(pokemon, *sp0); + ret = TryAppendMonMove(mon, *sp0); } FreeToHeap(wotbl); return ret; } -void MonSwapMoves(Pokemon *pokemon, int a, int b) { - BoxMonSwapMoves(&pokemon->box, a, b); +void MonSwapMoves(Pokemon *mon, int a, int b) { + BoxMonSwapMoves(&mon->box, a, b); } void BoxMonSwapMoves(BOXMON * boxmon, int slot1, int slot2) { @@ -3194,30 +3194,30 @@ void BoxMonSwapMoves(BOXMON * boxmon, int slot1, int slot2) { SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot2, &ppUp[0]); } -void MonDeleteMoveSlot(Pokemon * pokemon, u32 slot) { +void MonDeleteMoveSlot(Pokemon *mon, u32 slot) { u16 move; u8 pp; u8 ppUp; for (; slot < 3; slot++) { - move = (u16)GetMonData(pokemon, (int)(MON_DATA_MOVE1 + slot + 1), NULL); - pp = (u8)GetMonData(pokemon, (int)(MON_DATA_MOVE1PP + slot + 1), NULL); - ppUp = (u8)GetMonData(pokemon, (int)(MON_DATA_MOVE1PPUP + slot + 1), NULL); - SetMonData(pokemon, (int)(MON_DATA_MOVE1 + slot), &move); - SetMonData(pokemon, (int)(MON_DATA_MOVE1PP + slot), &pp); - SetMonData(pokemon, (int)(MON_DATA_MOVE1PPUP + slot), &ppUp); + move = (u16)GetMonData(mon, (int)(MON_DATA_MOVE1 + slot + 1), NULL); + pp = (u8)GetMonData(mon, (int)(MON_DATA_MOVE1PP + slot + 1), NULL); + ppUp = (u8)GetMonData(mon, (int)(MON_DATA_MOVE1PPUP + slot + 1), NULL); + SetMonData(mon, (int)(MON_DATA_MOVE1 + slot), &move); + SetMonData(mon, (int)(MON_DATA_MOVE1PP + slot), &pp); + SetMonData(mon, (int)(MON_DATA_MOVE1PPUP + slot), &ppUp); } move = MOVE_NONE; pp = 0; ppUp = 0; - SetMonData(pokemon, MON_DATA_MOVE1 + 3, &move); - SetMonData(pokemon, MON_DATA_MOVE1PP + 3, &pp); - SetMonData(pokemon, MON_DATA_MOVE1PPUP + 3, &ppUp); + SetMonData(mon, MON_DATA_MOVE1 + 3, &move); + SetMonData(mon, MON_DATA_MOVE1PP + 3, &pp); + SetMonData(mon, MON_DATA_MOVE1PPUP + 3, &ppUp); } -BOOL MonHasMove(Pokemon* pokemon, u16 move) { +BOOL MonHasMove(Pokemon *mon, u16 move) { int i; for (i = 0; i < 4; i++) { - if (GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL) == move) { + if (GetMonData(mon, MON_DATA_MOVE1 + i, NULL) == move) { break; } } @@ -3228,7 +3228,7 @@ BOOL MonHasMove(Pokemon* pokemon, u16 move) { } } -void CopyBoxPokemonToPokemon(const BOXMON * src, Pokemon * dest) { +void CopyBoxPokemonToPokemon(const BOXMON * src, Pokemon *dest) { u32 sp0 = 0; CAPSULE sp4; struct Mail * mail; @@ -3253,10 +3253,10 @@ u8 Party_GetMaxLevel(PARTY * party) { u8 ret = 1; u8 level; for (i = 0; i < r7; i++) { - Pokemon * pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE - && !GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, NULL); + Pokemon *mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_NONE + && !GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + level = (u8)GetMonData(mon, MON_DATA_LEVEL, NULL); if (level > ret) ret = level; } @@ -3286,8 +3286,8 @@ void CopyPokemonToBoxPokemon(const Pokemon *src, BOXMON *dest) { *dest = src->box; } -s8 MonGetFlavorPreference(Pokemon * pokemon, int flavor) { - return BoxMonGetFlavorPreference(&pokemon->box, flavor); +s8 MonGetFlavorPreference(Pokemon *mon, int flavor) { + return BoxMonGetFlavorPreference(&mon->box, flavor); } s8 BoxMonGetFlavorPreference(BOXMON * boxmon, int flavor) { @@ -3313,7 +3313,7 @@ int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest) { void Party_GivePokerusAtRandom(PARTY * party) { int count = GetPartyCount(party); int idx; - Pokemon * pokemon; + Pokemon *mon; u8 sp0; switch (LCRandom()) { case 0x4000: @@ -3321,8 +3321,8 @@ void Party_GivePokerusAtRandom(PARTY * party) { case 0xC000: do { idx = LCRandom() % count; - pokemon = GetPartyMonByIndex(party, idx); - } while (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_NONE || GetMonData(pokemon, MON_DATA_IS_EGG, NULL)); + mon = GetPartyMonByIndex(party, idx); + } while (GetMonData(mon, MON_DATA_SPECIES, NULL) == SPECIES_NONE || GetMonData(mon, MON_DATA_IS_EGG, NULL)); if (!Party_MaskMonsWithPokerus(party, (u8)MaskOfFlagNo(idx))) { do { sp0 = (u8)LCRandom(); @@ -3333,7 +3333,7 @@ void Party_GivePokerusAtRandom(PARTY * party) { sp0 |= sp0 << 4; sp0 &= 0xF3; sp0++; - SetMonData(pokemon, MON_DATA_POKERUS, &sp0); + SetMonData(mon, MON_DATA_POKERUS, &sp0); } } } @@ -3342,12 +3342,12 @@ u8 Party_MaskMonsWithPokerus(PARTY * party, u8 mask) { int i = 0; u32 flag = 1; u8 ret = 0; - Pokemon * pokemon; + Pokemon *mon; if (mask != 0) { do { if (mask & 1) { - pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_POKERUS, NULL)) { + mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_POKERUS, NULL)) { ret |= flag; } } @@ -3357,8 +3357,8 @@ u8 Party_MaskMonsWithPokerus(PARTY * party, u8 mask) { } while (mask != 0); } else { - pokemon = GetPartyMonByIndex(party, 0); - if (GetMonData(pokemon, MON_DATA_POKERUS, NULL)) + mon = GetPartyMonByIndex(party, 0); + if (GetMonData(mon, MON_DATA_POKERUS, NULL)) ret++; } return ret; @@ -3367,12 +3367,12 @@ u8 Party_MaskMonsWithPokerus(PARTY * party, u8 mask) { void Party_UpdatePokerus(PARTY * party, int r5) { int i; u8 pokerus; - Pokemon * pokemon; + Pokemon *mon; int count = GetPartyCount(party); for (i = 0; i < count; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE) { - pokerus = (u8)GetMonData(pokemon, MON_DATA_POKERUS, NULL); + mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_NONE) { + pokerus = (u8)GetMonData(mon, MON_DATA_POKERUS, NULL); if (pokerus & 0xF) { if ((pokerus & 0xF) < r5 || r5 > 4) { pokerus &= 0xF0; @@ -3382,7 +3382,7 @@ void Party_UpdatePokerus(PARTY * party, int r5) { if (pokerus == 0) { pokerus = 0x10; // immune } - SetMonData(pokemon, MON_DATA_POKERUS, &pokerus); + SetMonData(mon, MON_DATA_POKERUS, &pokerus); } } } @@ -3391,24 +3391,24 @@ void Party_UpdatePokerus(PARTY * party, int r5) { void Party_SpreadPokerus(PARTY * party) { int count = GetPartyCount(party); int i; - Pokemon * pokemon; + Pokemon *mon; u8 pokerus; if ((LCRandom() % 3) == 0) { for (i = 0; i < count; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE) { - pokerus = (u8)GetMonData(pokemon, MON_DATA_POKERUS, NULL); + mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_NONE) { + pokerus = (u8)GetMonData(mon, MON_DATA_POKERUS, NULL); if (pokerus & 0xF) { if (i != 0) { - pokemon = GetPartyMonByIndex(party, i - 1); - if (!(GetMonData(pokemon, MON_DATA_POKERUS, NULL) & 0xF0)) { - SetMonData(pokemon, MON_DATA_POKERUS, &pokerus); + mon = GetPartyMonByIndex(party, i - 1); + if (!(GetMonData(mon, MON_DATA_POKERUS, NULL) & 0xF0)) { + SetMonData(mon, MON_DATA_POKERUS, &pokerus); } } if (i < count - 1) { - pokemon = GetPartyMonByIndex(party, i + 1); - if (!(GetMonData(pokemon, MON_DATA_POKERUS, NULL) & 0xF0)) { - SetMonData(pokemon, MON_DATA_POKERUS, &pokerus); + mon = GetPartyMonByIndex(party, i + 1); + if (!(GetMonData(mon, MON_DATA_POKERUS, NULL) & 0xF0)) { + SetMonData(mon, MON_DATA_POKERUS, &pokerus); i++; // don't infect the rest of the party } } @@ -3418,16 +3418,16 @@ void Party_SpreadPokerus(PARTY * party) { } } -BOOL Pokemon_HasPokerus(Pokemon * pokemon) { - return BoxMon_HasPokerus(&pokemon->box); +BOOL Pokemon_HasPokerus(Pokemon *mon) { + return BoxMon_HasPokerus(&mon->box); } BOOL BoxMon_HasPokerus(BOXMON * boxmon) { return (GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL) & 0xF) != 0; } -BOOL Pokemon_IsImmuneToPokerus(Pokemon * pokemon) { - return BoxMon_IsImmuneToPokerus(&pokemon->box); +BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon) { + return BoxMon_IsImmuneToPokerus(&mon->box); } BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon) { @@ -3441,8 +3441,8 @@ BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon) { return FALSE; } -void Pokemon_UpdateArceusForme(Pokemon * pokemon) { - BoxMon_UpdateArceusForme(&pokemon->box); +void Pokemon_UpdateArceusForme(Pokemon *mon) { + BoxMon_UpdateArceusForme(&mon->box); } void BoxMon_UpdateArceusForme(BOXMON * boxmon) { @@ -3495,10 +3495,10 @@ u32 GetArceusTypeByHeldItemEffect(u16 heldEffect) { } } -s32 Mon_UpdateGiratinaForme(Pokemon *pokemon) { - s32 ret = BoxMon_UpdateGiratinaForme(&pokemon->box); +s32 Mon_UpdateGiratinaForme(Pokemon *mon) { + s32 ret = BoxMon_UpdateGiratinaForme(&mon->box); if (ret != -1) { - CalcMonLevelAndStats(pokemon); + CalcMonLevelAndStats(mon); } return ret; } @@ -3520,32 +3520,32 @@ s32 BoxMon_UpdateGiratinaForme(BOXMON *boxmon) { return -1; } -void Mon_ForceSetGiratinaOriginForme(Pokemon *pokemon) { +void Mon_ForceSetGiratinaOriginForme(Pokemon *mon) { s32 forme = GIRATINA_ORIGIN; - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_GIRATINA) { - SetBoxMonData(&pokemon->box, MON_DATA_FORME, &forme); - UpdateBoxMonAbility(&pokemon->box); - CalcMonLevelAndStats(pokemon); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) == SPECIES_GIRATINA) { + SetBoxMonData(&mon->box, MON_DATA_FORME, &forme); + UpdateBoxMonAbility(&mon->box); + CalcMonLevelAndStats(mon); } } void Party_UpdateAllGiratina_DistortionWorld(PARTY *party, BOOL force_origin) { int npoke = GetPartyCount(party); int i; - Pokemon *pokemon; + Pokemon *mon; for (i = 0; i < npoke; i++) { - pokemon = GetPartyMonByIndex(party, i); + mon = GetPartyMonByIndex(party, i); if (force_origin) { - Mon_ForceSetGiratinaOriginForme(pokemon); + Mon_ForceSetGiratinaOriginForme(mon); } else { - Mon_UpdateGiratinaForme(pokemon); + Mon_UpdateGiratinaForme(mon); } } } -void Mon_UpdateShayminForme(Pokemon *pokemon, int forme) { - BoxMon_UpdateShayminForme(&pokemon->box, forme); - CalcMonLevelAndStats(pokemon); +void Mon_UpdateShayminForme(Pokemon *mon, int forme) { + BoxMon_UpdateShayminForme(&mon->box, forme); + CalcMonLevelAndStats(mon); } void BoxMon_UpdateShayminForme(BOXMON *boxmon, int forme) { @@ -3556,13 +3556,13 @@ void BoxMon_UpdateShayminForme(BOXMON *boxmon, int forme) { } } -BOOL Mon_CanUseGracidea(Pokemon *pokemon) { +BOOL Mon_CanUseGracidea(Pokemon *mon) { RTCTime time; - int species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - int forme = GetMonData(pokemon, MON_DATA_FORME, NULL); - int status = GetMonData(pokemon, MON_DATA_STATUS, NULL); - int hp = GetMonData(pokemon, MON_DATA_HP, NULL); - BOOL fatefulEncounter = GetMonData(pokemon, MON_DATA_FATEFUL_ENCOUNTER, NULL); + int species = GetMonData(mon, MON_DATA_SPECIES, NULL); + int forme = GetMonData(mon, MON_DATA_FORME, NULL); + int status = GetMonData(mon, MON_DATA_STATUS, NULL); + int hp = GetMonData(mon, MON_DATA_HP, NULL); + BOOL fatefulEncounter = GetMonData(mon, MON_DATA_FATEFUL_ENCOUNTER, NULL); GF_RTC_CopyTime(&time); if (species == SPECIES_SHAYMIN && forme == SHAYMIN_LAND && hp != 0 && fatefulEncounter == TRUE && !(status & MON_STATUS_FRZ_MASK) && (time.hour >= 4 && time.hour < 20)) { @@ -3614,7 +3614,7 @@ BOOL Party_TryResetShaymin(PARTY *party, int min_max, const RTCTime *time) { } } -BOOL Mon_UpdateRotomForme(Pokemon *pokemon, int forme, int defaultSlot) { +BOOL Mon_UpdateRotomForme(Pokemon *mon, int forme, int defaultSlot) { static const u16 forme_moves[ROTOM_FORME_MAX] = { MOVE_NONE, MOVE_OVERHEAT, @@ -3627,20 +3627,20 @@ BOOL Mon_UpdateRotomForme(Pokemon *pokemon, int forme, int defaultSlot) { int i, j; int cur_move; int new_move; - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_ROTOM) { + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_ROTOM) { return FALSE; } - GetMonData(pokemon, MON_DATA_FORME, NULL); + GetMonData(mon, MON_DATA_FORME, NULL); new_move = forme_moves[forme]; for (i = 0; i < MON_MOVES; i++) { - cur_move = GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL); + cur_move = GetMonData(mon, MON_DATA_MOVE1 + i, NULL); for (j = ROTOM_HEAT; j < (unsigned)ROTOM_FORME_MAX; j++) { if (cur_move != MOVE_NONE && cur_move == forme_moves[j]) { if (new_move != MOVE_NONE) { - MonSetMoveInSlot_ResetPpUp(pokemon, new_move, i); + MonSetMoveInSlot_ResetPpUp(mon, new_move, i); new_move = MOVE_NONE; } else { - MonDeleteMoveSlot(pokemon, i); + MonDeleteMoveSlot(mon, i); i--; } break; @@ -3649,21 +3649,21 @@ BOOL Mon_UpdateRotomForme(Pokemon *pokemon, int forme, int defaultSlot) { } if (new_move != MOVE_NONE) { for (i = 0; i < MON_MOVES; i++) { - if (GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL) == MOVE_NONE) { - MonSetMoveInSlot_ResetPpUp(pokemon, new_move, i); + if (GetMonData(mon, MON_DATA_MOVE1 + i, NULL) == MOVE_NONE) { + MonSetMoveInSlot_ResetPpUp(mon, new_move, i); break; } } if (i == MON_MOVES) { - MonSetMoveInSlot_ResetPpUp(pokemon, new_move, defaultSlot); + MonSetMoveInSlot_ResetPpUp(mon, new_move, defaultSlot); } } - if (GetMonData(pokemon, MON_DATA_MOVE1, NULL) == MOVE_NONE) { - MonSetMoveInSlot_ResetPpUp(pokemon, MOVE_THUNDER_SHOCK, 0); + if (GetMonData(mon, MON_DATA_MOVE1, NULL) == MOVE_NONE) { + MonSetMoveInSlot_ResetPpUp(mon, MOVE_THUNDER_SHOCK, 0); } - SetMonData(pokemon, MON_DATA_FORME, &forme); - UpdateMonAbility(pokemon); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_FORME, &forme); + UpdateMonAbility(mon); + CalcMonLevelAndStats(mon); return TRUE; } @@ -3704,18 +3704,18 @@ void sub_0207204C(SOUND_CHATOT *r7, u32 r6, u16 r5, s32 r4, s32 sp20, u32 sp24, } } -void sub_020720D4(Pokemon *pokemon) { - PlayCry(GetMonData(pokemon, MON_DATA_SPECIES, NULL), GetMonData(pokemon, MON_DATA_FORME, NULL)); +void sub_020720D4(Pokemon *mon) { + PlayCry(GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_FORME, NULL)); } -void sub_020720FC(Pokemon * pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { +void sub_020720FC(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { u32 hp; - sub_0207213C(&pokemon->box, a1, pokeball, a3, encounterType, heap_id); + sub_0207213C(&mon->box, a1, pokeball, a3, encounterType, heap_id); if (pokeball == ITEM_HEAL_BALL) { - hp = GetMonData(pokemon, MON_DATA_MAXHP, NULL); - SetMonData(pokemon, MON_DATA_HP, &hp); + hp = GetMonData(mon, MON_DATA_MAXHP, NULL); + SetMonData(mon, MON_DATA_HP, &hp); hp = 0; - SetMonData(pokemon, MON_DATA_STATUS, &hp); + SetMonData(mon, MON_DATA_STATUS, &hp); } } @@ -3726,8 +3726,8 @@ void sub_0207213C(BOXMON * boxmon, PLAYERPROFILE *playerProfile, u32 pokeball, u SetBoxMonData(boxmon, MON_DATA_ENCOUNTER_TYPE, &encounterType); } -void sub_0207217C(Pokemon *pokemon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { - sub_02072190(&pokemon->box, a1, pokeball, a3, encounterType, heap_id); +void sub_0207217C(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { + sub_02072190(&mon->box, a1, pokeball, a3, encounterType, heap_id); } void sub_02072190(BOXMON *boxmon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { @@ -3739,7 +3739,7 @@ static const u16 sItemOdds[2][2] = { {20, 80}, }; -void WildMonSetRandomHeldItem(Pokemon * pokemon, u32 a1, u32 a2) { +void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2) { u32 chance; u16 species; u16 forme; @@ -3747,26 +3747,26 @@ void WildMonSetRandomHeldItem(Pokemon * pokemon, u32 a1, u32 a2) { u16 item2; if (!(a1 & 0x81)) { chance = (u32)(LCRandom() % 100); - species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, 0); - forme = (u16)GetMonData(pokemon, MON_DATA_FORME, 0); + species = (u16)GetMonData(mon, MON_DATA_SPECIES, 0); + forme = (u16)GetMonData(mon, MON_DATA_FORME, 0); item1 = (u16)GetMonBaseStat_HandleAlternateForme(species, forme, BASE_ITEM_1); item2 = (u16)GetMonBaseStat_HandleAlternateForme(species, forme, BASE_ITEM_2); if (item1 == item2 && item1 != ITEM_NONE) { - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item1); + SetMonData(mon, MON_DATA_HELD_ITEM, &item1); } else { if (chance >= sItemOdds[a2][0]) { if (chance < sItemOdds[a2][1]) { - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item1); + SetMonData(mon, MON_DATA_HELD_ITEM, &item1); } else { - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item2); + SetMonData(mon, MON_DATA_HELD_ITEM, &item2); } } } } } -BOOL GetMonTMHMCompat(Pokemon *pokemon, u8 tmhm) { - return GetBoxMonTMHMCompat(&pokemon->box, tmhm); +BOOL GetMonTMHMCompat(Pokemon *mon, u8 tmhm) { + return GetBoxMonTMHMCompat(&mon->box, tmhm); } BOOL GetBoxMonTMHMCompat(BOXMON *boxmon, u8 tmhm) { @@ -3803,8 +3803,8 @@ BOOL GetTMHMCompatBySpeciesAndForme(u16 species, u32 forme, u8 tmhm) { return (GetMonBaseStat_HandleAlternateForme(species, forme, baseStat) & mask) != 0; } -void UpdateMonAbility(Pokemon *pokemon) { - UpdateBoxMonAbility(&pokemon->box); +void UpdateMonAbility(Pokemon *mon) { + UpdateBoxMonAbility(&mon->box); } void UpdateBoxMonAbility(BOXMON *boxmon) { @@ -3826,7 +3826,7 @@ void UpdateBoxMonAbility(BOXMON *boxmon) { ReleaseBoxMonLock(boxmon, decry); } -void SetMonPersonality(Pokemon * r5, u32 personality) { +void SetMonPersonality(Pokemon *mon, u32 personality) { PokemonDataBlockA * r4; PokemonDataBlockB * r6; PokemonDataBlockC * r7; @@ -3835,31 +3835,31 @@ void SetMonPersonality(Pokemon * r5, u32 personality) { PokemonDataBlockB * sp10; PokemonDataBlockC * sp14; PokemonDataBlockD * sp18; - Pokemon * sp4; - - sp4 = AllocMonZeroed(0); - CopyPokemonToPokemon(r5, sp4); - r4 = &GetSubstruct(&sp4->box, r5->box.pid, 0)->blockA; - r6 = &GetSubstruct(&sp4->box, r5->box.pid, 1)->blockB; - r7 = &GetSubstruct(&sp4->box, r5->box.pid, 2)->blockC; - sp8 = &GetSubstruct(&sp4->box, r5->box.pid, 3)->blockD; - spC = &GetSubstruct(&r5->box, personality, 0)->blockA; - sp10 = &GetSubstruct(&r5->box, personality, 1)->blockB; - sp14 = &GetSubstruct(&r5->box, personality, 2)->blockC; - sp18 = &GetSubstruct(&r5->box, personality, 3)->blockD; - - DECRYPT_BOX(&sp4->box); - DECRYPT_PTY(r5); - DECRYPT_BOX(&r5->box); - r5->box.pid = personality; + Pokemon *tmpMon; + + tmpMon = AllocMonZeroed(0); + CopyPokemonToPokemon(mon, tmpMon); + r4 = &GetSubstruct(&tmpMon->box, mon->box.pid, 0)->blockA; + r6 = &GetSubstruct(&tmpMon->box, mon->box.pid, 1)->blockB; + r7 = &GetSubstruct(&tmpMon->box, mon->box.pid, 2)->blockC; + sp8 = &GetSubstruct(&tmpMon->box, mon->box.pid, 3)->blockD; + spC = &GetSubstruct(&mon->box, personality, 0)->blockA; + sp10 = &GetSubstruct(&mon->box, personality, 1)->blockB; + sp14 = &GetSubstruct(&mon->box, personality, 2)->blockC; + sp18 = &GetSubstruct(&mon->box, personality, 3)->blockD; + + DECRYPT_BOX(&tmpMon->box); + DECRYPT_PTY(mon); + DECRYPT_BOX(&mon->box); + mon->box.pid = personality; *spC = *r4; *sp10 = *r6; *sp14 = *r7; *sp18 = *sp8; - r5->box.checksum = CHECKSUM(&r5->box); - ENCRYPT_BOX(&r5->box); - ENCRYPT_PTY(r5); - FreeToHeap(sp4); + mon->box.checksum = CHECKSUM(&mon->box); + ENCRYPT_BOX(&mon->box); + ENCRYPT_PTY(mon); + FreeToHeap(tmpMon); } u32 ChangePersonalityToNatureGenderAndAbility(u32 pid, u16 species, u8 nature, u8 gender, u8 ability, BOOL gen_mode) { @@ -4108,9 +4108,9 @@ BOOL SpeciesIsMythical(u16 species) { return FALSE; } -BOOL MonCheckFrontierIneligibility(Pokemon *pokemon) { - u16 species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - u16 forme = GetMonData(pokemon, MON_DATA_FORME, NULL); +BOOL MonCheckFrontierIneligibility(Pokemon *mon) { + u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); + u16 forme = GetMonData(mon, MON_DATA_FORME, NULL); return IsPokemonLegendaryOrMythical(species, forme); } @@ -4166,12 +4166,12 @@ int TrainerClassToBackpicID(int trainerClass, int a1) { return trainerClass; } -void Pokemon_RemoveCapsule(Pokemon * pokemon) { +void Pokemon_RemoveCapsule(Pokemon *mon) { u8 sp0 = 0; CAPSULE sp1; MI_CpuClearFast(&sp1, sizeof(sp1)); - SetMonData(pokemon, MON_DATA_CAPSULE, &sp0); - SetMonData(pokemon, MON_DATA_SEAL_COORDS, &sp1); + SetMonData(mon, MON_DATA_CAPSULE, &sp0); + SetMonData(mon, MON_DATA_SEAL_COORDS, &sp1); } void RestoreBoxMonPP(BOXMON * boxmon) { @@ -4230,7 +4230,7 @@ void sub_02072A20(NARC *narc, u8 *ret, u16 a2, u16 a3) { *ret = sp4.unk_58; } -BOOL SetTrMonCapsule(int a0, Pokemon *pokemon, HeapID heap_id) { +BOOL SetTrMonCapsule(int a0, Pokemon *mon, HeapID heap_id) { CAPSULE capsule; int data; NARC *narc; @@ -4240,13 +4240,13 @@ BOOL SetTrMonCapsule(int a0, Pokemon *pokemon, HeapID heap_id) { narc = NARC_ctor(NARC_application_custom_ball_edit_gs_cb_data, heap_id); data = 1; NARC_ReadFromMember(narc, 0, (a0 - 1) * sizeof(CAPSULE), sizeof(CAPSULE), &capsule); - SetMonData(pokemon, MON_DATA_CAPSULE, &data); - SetMonData(pokemon, MON_DATA_SEAL_COORDS, &capsule); + SetMonData(mon, MON_DATA_CAPSULE, &data); + SetMonData(mon, MON_DATA_SEAL_COORDS, &capsule); NARC_dtor(narc); return TRUE; } -void sub_02072A98(Pokemon *pokemon, struct UnkPokemonStruct_02072A98 *dest) { +void sub_02072A98(Pokemon *mon, struct UnkPokemonStruct_02072A98 *dest) { PokemonDataBlockA *dbA; // r5 PokemonDataBlockB *dbB; // sp4 PokemonDataBlockC *dbC; // r7 @@ -4254,11 +4254,11 @@ void sub_02072A98(Pokemon *pokemon, struct UnkPokemonStruct_02072A98 *dest) { BOXMON *boxmon; // r6 int i; - if (!pokemon->box.party_lock) { - DECRYPT_PTY(pokemon); - DECRYPT_BOX(&pokemon->box); + if (!mon->box.party_lock) { + DECRYPT_PTY(mon); + DECRYPT_BOX(&mon->box); } - boxmon = Mon_GetBoxMon(pokemon); + boxmon = Mon_GetBoxMon(mon); dbA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; dbB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; dbC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; @@ -4309,24 +4309,24 @@ void sub_02072A98(Pokemon *pokemon, struct UnkPokemonStruct_02072A98 *dest) { } dest->pokeball = dbD->pokeball; - dest->status = pokemon->party.status; - dest->level = pokemon->party.level; - dest->capsule = pokemon->party.capsule; - dest->hp = pokemon->party.hp; - dest->maxHp = pokemon->party.maxHp; - dest->atk = pokemon->party.atk; - dest->def = pokemon->party.def; - dest->speed = pokemon->party.speed; - dest->spatk = pokemon->party.spatk; - dest->spdef = pokemon->party.spdef; - - if (!pokemon->box.party_lock) { - ENCRYPT_PTY(pokemon); - ENCRYPT_BOX(&pokemon->box); + dest->status = mon->party.status; + dest->level = mon->party.level; + dest->capsule = mon->party.capsule; + dest->hp = mon->party.hp; + dest->maxHp = mon->party.maxHp; + dest->atk = mon->party.atk; + dest->def = mon->party.def; + dest->speed = mon->party.speed; + dest->spatk = mon->party.spatk; + dest->spdef = mon->party.spdef; + + if (!mon->box.party_lock) { + ENCRYPT_PTY(mon); + ENCRYPT_BOX(&mon->box); } } -void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *pokemon) { +void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *mon) { PokemonDataBlockA *dbA; // r5 PokemonDataBlockB *dbB; // r6 PokemonDataBlockC *dbC; // r7 @@ -4334,8 +4334,8 @@ void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *pokemon) BOXMON *boxmon; // sp4 int i; - MI_CpuClearFast(pokemon, sizeof(Pokemon)); - boxmon = Mon_GetBoxMon(pokemon); + MI_CpuClearFast(mon, sizeof(Pokemon)); + boxmon = Mon_GetBoxMon(mon); dbA = &GetSubstruct(boxmon, src->pid, 0)->blockA; dbB = &GetSubstruct(boxmon, src->pid, 1)->blockB; dbC = &GetSubstruct(boxmon, src->pid, 2)->blockC; @@ -4391,20 +4391,20 @@ void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *pokemon) dbD->pokeball = BALL_POKE; } - pokemon->party.status = src->status; - pokemon->party.level = src->level; - pokemon->party.capsule = src->capsule; - pokemon->party.hp = src->hp; - pokemon->party.maxHp = src->maxHp; - pokemon->party.atk = src->atk; - pokemon->party.def = src->def; - pokemon->party.speed = src->speed; - pokemon->party.spatk = src->spatk; - pokemon->party.spdef = src->spdef; + mon->party.status = src->status; + mon->party.level = src->level; + mon->party.capsule = src->capsule; + mon->party.hp = src->hp; + mon->party.maxHp = src->maxHp; + mon->party.atk = src->atk; + mon->party.def = src->def; + mon->party.speed = src->speed; + mon->party.spatk = src->spatk; + mon->party.spdef = src->spdef; - ENCRYPT_PTY(pokemon); - pokemon->box.checksum = CHECKSUM(&pokemon->box); - ENCRYPT_BOX(&pokemon->box); + ENCRYPT_PTY(mon); + mon->box.checksum = CHECKSUM(&mon->box); + ENCRYPT_BOX(&mon->box); } u32 _u32_getDigitN(u32 num, u8 digit) { @@ -5009,8 +5009,8 @@ void CalcBoxMonPokeathlonPerformance(BOXMON *boxmon, struct PokeathlonTodayPerfo dest->stats[PERFORMANCE_STAMINA].hi = data.minmax[ARCPERF_STAMINA][1]; } -void CalcMonPokeathlonPerformance(Pokemon *pokemon, struct PokeathlonTodayPerformance *dest) { - CalcBoxMonPokeathlonPerformance(Mon_GetBoxMon(pokemon), dest); +void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformance *dest) { + CalcBoxMonPokeathlonPerformance(Mon_GetBoxMon(mon), dest); } void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BOXMON *boxmon, const s8 *aprijuice, HeapID heap_id) { @@ -5042,6 +5042,6 @@ void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BOXMON * } } -void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *pokemon, const s8 *aprijuice, HeapID heap_id) { - CalcBoxmonPokeathlonStars(dest, Mon_GetBoxMon(pokemon), aprijuice, heap_id); +void CalcMonPokeathlonStars(struct PokeathlonPerformanceStars *dest, Pokemon *mon, const s8 *aprijuice, HeapID heap_id) { + CalcBoxmonPokeathlonStars(dest, Mon_GetBoxMon(mon), aprijuice, heap_id); } diff --git a/src/pokemon_icon_idx.c b/src/pokemon_icon_idx.c index 135fe6bd5..2a19d3fb2 100644 --- a/src/pokemon_icon_idx.c +++ b/src/pokemon_icon_idx.c @@ -20,8 +20,8 @@ u32 Boxmon_GetIconNaix(BOXMON *boxmon) { return ret; } -u32 Pokemon_GetIconNaix(Pokemon *pokemon) { - return Boxmon_GetIconNaix(Mon_GetBoxMon(pokemon)); +u32 Pokemon_GetIconNaix(Pokemon *mon) { + return Boxmon_GetIconNaix(Mon_GetBoxMon(mon)); } u32 GetMonIconNaixEx(u32 species, BOOL isEgg, u32 forme) { @@ -195,8 +195,8 @@ const u8 Boxmon_GetIconPalette(BOXMON *boxmon) { return GetMonIconPaletteEx(species, forme, isEgg); } -const u8 Pokemon_GetIconPalette(Pokemon *pokemon) { - return Boxmon_GetIconPalette(Mon_GetBoxMon(pokemon)); +const u8 Pokemon_GetIconPalette(Pokemon *mon) { + return Boxmon_GetIconPalette(Mon_GetBoxMon(mon)); } u32 sub_02074490(void) { diff --git a/src/pokemon_mood.c b/src/pokemon_mood.c index de45bcff5..51b48ae2f 100644 --- a/src/pokemon_mood.c +++ b/src/pokemon_mood.c @@ -12,11 +12,11 @@ static const s8 sMoodModifiers[] = { 30 }; -static void MonAdjustMood(Pokemon *pokemon, s8 unk1) { +static void MonAdjustMood(Pokemon *mon, s8 unk1) { s8 mood; s32 adjustedMood; - mood = GetMonData(pokemon, MON_DATA_MOOD, NULL); + mood = GetMonData(mon, MON_DATA_MOOD, NULL); adjustedMood = mood + unk1; if (adjustedMood > 127) { @@ -27,7 +27,7 @@ static void MonAdjustMood(Pokemon *pokemon, s8 unk1) { mood = adjustedMood; - SetMonData(pokemon, MON_DATA_MOOD, &mood); + SetMonData(mon, MON_DATA_MOOD, &mood); } static s8 ItemIdGetMoodEffect(u16 itemId) { @@ -83,22 +83,22 @@ static s8 ItemIdGetMoodEffect(u16 itemId) { return moodEffect; } -void ApplyItemEffectOnMonMood(Pokemon *pokemon, u16 itemId) { +void ApplyItemEffectOnMonMood(Pokemon *mon, u16 itemId) { s8 moodEffect = ItemIdGetMoodEffect(itemId); if (moodEffect != 0) { - MonAdjustMood(pokemon, moodEffect); + MonAdjustMood(mon, moodEffect); } } -void ApplyMonMoodModifier(Pokemon *pokemon, int modifierId) { +void ApplyMonMoodModifier(Pokemon *mon, int modifierId) { s8 mood; u16 species; s32 adjustedMood; - species = GetMonData(pokemon, MON_DATA_SPECIES2, NULL); + species = GetMonData(mon, MON_DATA_SPECIES2, NULL); if (species != 0 && species != SPECIES_EGG) { - mood = GetMonData(pokemon, MON_DATA_MOOD, NULL); + mood = GetMonData(mon, MON_DATA_MOOD, NULL); adjustedMood = mood + sMoodModifiers[modifierId]; @@ -110,6 +110,6 @@ void ApplyMonMoodModifier(Pokemon *pokemon, int modifierId) { mood = adjustedMood; - SetMonData(pokemon, MON_DATA_MOOD, &mood); + SetMonData(mon, MON_DATA_MOOD, &mood); } } diff --git a/src/save_flypoints.c b/src/save_flypoints.c index cab544918..939bf4a37 100644 --- a/src/save_flypoints.c +++ b/src/save_flypoints.c @@ -128,14 +128,14 @@ void Fsys_SyncMapObjectsToSave(FieldSystem *fsys) { void Fsys_RestoreMapObjectsFromSave(FieldSystem *fsys) { struct SavedMapObjectList *unk = Save_MapObjects_get(fsys->savedata); struct SavedMapObject *follower = SaveMapObjects_SearchSpriteId(unk->subs, 64, SPRITE_TSURE_POKE_SHAYMIN_SKY); - Pokemon *pokemon; + Pokemon *mon; int species; int forme; if (follower != NULL && follower->objId == obj_partner_poke) { - pokemon = GetFirstAliveMonInParty_CrashIfNone(SavArray_PlayerParty_get(fsys->savedata)); - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - forme = GetMonData(pokemon, MON_DATA_FORME, NULL); + mon = GetFirstAliveMonInParty_CrashIfNone(SavArray_PlayerParty_get(fsys->savedata)); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + forme = GetMonData(mon, MON_DATA_FORME, NULL); if (species != SPECIES_SHAYMIN) { GF_ASSERT(0); } else if (forme == SHAYMIN_LAND) { diff --git a/src/scrcmd_12.c b/src/scrcmd_12.c index 8a6b4552f..b7af5029c 100644 --- a/src/scrcmd_12.c +++ b/src/scrcmd_12.c @@ -41,33 +41,33 @@ BOOL ScrCmd_508(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_509(SCRIPTCONTEXT *ctx) { struct UnkStruct_0202EB30 *unkStruct = sub_020270F8(ctx->fsys->savedata); - Pokemon *pokemon = AllocMonZeroed(32); + Pokemon *mon = AllocMonZeroed(32); u16 *retPtr = ScriptGetVarPointer(ctx); if (sub_0202EC98(unkStruct) == PARTY_SIZE) { *retPtr = TRUE; } else { *retPtr = FALSE; } - FreeToHeap(pokemon); + FreeToHeap(mon); return FALSE; } BOOL ScrCmd_510(SCRIPTCONTEXT *ctx) { struct UnkStruct_0202EB30 *unkStruct = sub_020270F8(ctx->fsys->savedata); PC_STORAGE *storage = GetStoragePCPointer(ctx->fsys->savedata); - Pokemon *pokemon = AllocMonZeroed(32); + Pokemon *mon = AllocMonZeroed(32); PLAYERPROFILE *profile = Sav2_PlayerData_GetProfileAddr(ctx->fsys->savedata); POKEDEX *pokedex = Sav2_Pokedex_get(ctx->fsys->savedata); int i; for (i = 0; i < PARTY_SIZE; i++) { - sub_0202EC70(unkStruct, i, pokemon); - MonSetTrainerMemo(pokemon, profile, 2, 0, 32); - GF_ASSERT(PCStorage_PlaceMonInFirstEmptySlotInAnyBox(storage, Mon_GetBoxMon(pokemon))); - UpdatePokedexWithReceivedSpecies(ctx->fsys->savedata, pokemon); + sub_0202EC70(unkStruct, i, mon); + MonSetTrainerMemo(mon, profile, 2, 0, 32); + GF_ASSERT(PCStorage_PlaceMonInFirstEmptySlotInAnyBox(storage, Mon_GetBoxMon(mon))); + UpdatePokedexWithReceivedSpecies(ctx->fsys->savedata, mon); } - FreeToHeap(pokemon); + FreeToHeap(mon); sub_0202EB74(unkStruct); sub_02093070(ctx->fsys); return FALSE; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 575b14256..5bb073a49 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1852,9 +1852,9 @@ BOOL ScrCmd_452(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_547(SCRIPTCONTEXT *ctx) { struct PokepicManager **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_GENERIC_WORK_PTR); u16 partyIdx = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); LoadUserFrameGfx1(ctx->fsys->bgConfig, 3, 0x3D9, 0xB, 0, 4); - *p_work = sub_0200F4F8(ctx->fsys->bgConfig, 3, 10, 5, 11, 0x3D9, pokemon, 4); + *p_work = sub_0200F4F8(ctx->fsys->bgConfig, 3, 10, 5, 11, 0x3D9, mon, 4); return FALSE; } @@ -2097,7 +2097,7 @@ BOOL ScrCmd_NicknameInput(SCRIPTCONTEXT *ctx) { FieldSystem *fsys = ctx->fsys; u16 partyPos = ScriptGetVar(ctx); BUGCONTEST *contest; - Pokemon *pokemon; + Pokemon *mon; u16 nickname[20]; u16 *var_ret; int species; @@ -2107,13 +2107,13 @@ BOOL ScrCmd_NicknameInput(SCRIPTCONTEXT *ctx) { if (!contest->caught_poke) { return TRUE; } - pokemon = contest->pokemon; + mon = contest->mon; } else { - pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), partyPos); + mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), partyPos); } - GetMonData(pokemon, MON_DATA_NICKNAME, nickname); + GetMonData(mon, MON_DATA_NICKNAME, nickname); var_ret = ScriptGetVarPointer(ctx); - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); CreateNamingScreen(ctx->taskman, NAMINGSCREEN_POKEMON, species, POKEMON_NAME_LENGTH, partyPos, nickname, var_ret); return TRUE; } @@ -2288,9 +2288,9 @@ BOOL sub_0204378C(SCRIPTCONTEXT *ctx); BOOL ScrCmd_183(SCRIPTCONTEXT *ctx) { void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_GENERIC_WORK_PTR); u16 partyIdx = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); int playerGender = PlayerAvatar_GetGender(ctx->fsys->playerAvatar); - *p_work = ov02_02249458(ctx->fsys, 0, pokemon, playerGender); + *p_work = ov02_02249458(ctx->fsys, 0, mon, playerGender); SetupNativeScript(ctx, sub_0204378C); return TRUE; } @@ -3528,14 +3528,14 @@ BOOL ScrCmd_NatDexFlagAction(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_GetEVTotal(SCRIPTCONTEXT *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); u16 partyIdx = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); - - int hpEv = GetMonData(pokemon, MON_DATA_HP_EV, NULL); - int atkEv = GetMonData(pokemon, MON_DATA_ATK_EV, NULL); - int defEv = GetMonData(pokemon, MON_DATA_DEF_EV, NULL); - int speedEv = GetMonData(pokemon, MON_DATA_SPEED_EV, NULL); - int spAtkEv = GetMonData(pokemon, MON_DATA_SPATK_EV, NULL); - int spDefEv = GetMonData(pokemon, MON_DATA_SPDEF_EV, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), partyIdx); + + int hpEv = GetMonData(mon, MON_DATA_HP_EV, NULL); + int atkEv = GetMonData(mon, MON_DATA_ATK_EV, NULL); + int defEv = GetMonData(mon, MON_DATA_DEF_EV, NULL); + int speedEv = GetMonData(mon, MON_DATA_SPEED_EV, NULL); + int spAtkEv = GetMonData(mon, MON_DATA_SPATK_EV, NULL); + int spDefEv = GetMonData(mon, MON_DATA_SPDEF_EV, NULL); *p_ret = hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv; return FALSE; } @@ -3637,11 +3637,11 @@ BOOL ScrCmd_502(SCRIPTCONTEXT *ctx) { void Script_SetMonSeenFlagBySpecies(FieldSystem *fsys, u16 species) { POKEDEX *pokedex = Sav2_Pokedex_get(fsys->savedata); - Pokemon *pokemon = AllocMonZeroed(32); - ZeroMonData(pokemon); - CreateMon(pokemon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); - Pokedex_SetMonSeenFlag(pokedex, pokemon); - FreeToHeap(pokemon); + Pokemon *mon = AllocMonZeroed(32); + ZeroMonData(mon); + CreateMon(mon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); + Pokedex_SetMonSeenFlag(pokedex, mon); + FreeToHeap(mon); } BOOL ScrCmd_687(SCRIPTCONTEXT *ctx) { @@ -3696,11 +3696,11 @@ BOOL ScrCmd_518(SCRIPTCONTEXT *ctx) { int i; for (i = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) { - SetMonData(pokemon, MON_DATA_FORME, &forme); - CalcMonLevelAndStats(pokemon); - Pokedex_SetMonCaughtFlag(pokedex, pokemon); + Pokemon *mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) { + SetMonData(mon, MON_DATA_FORME, &forme); + CalcMonLevelAndStats(mon); + Pokedex_SetMonCaughtFlag(pokedex, mon); } } return TRUE; @@ -3725,9 +3725,9 @@ BOOL ScrCmd_519(SCRIPTCONTEXT *ctx) { for (i = 0; i < partyCount; i++) { int j; BOOL hasMultiple; - Pokemon *pokemon = GetPartyMonByIndex(party, i); - u32 species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - u32 forme = GetMonData(pokemon, MON_DATA_FORME, NULL); + Pokemon *mon = GetPartyMonByIndex(party, i); + u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); + u32 forme = GetMonData(mon, MON_DATA_FORME, NULL); if (species == SPECIES_BURMY) { hasMultiple = FALSE; for (j = 0, sp18[i] = forme; j < i; j++) { @@ -4287,9 +4287,9 @@ u32 sub_020467A8(SAVEDATA *saveData) { int i, j; for (i = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - ret |= 1 << GetMonData(pokemon, MON_DATA_FORME, NULL); + Pokemon *mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + ret |= 1 << GetMonData(mon, MON_DATA_FORME, NULL); } } @@ -4367,14 +4367,14 @@ BOOL ScrCmd_696(SCRIPTCONTEXT *ctx) { u16 r5 = ScriptGetVar(ctx); PARTY *party = SavArray_PlayerParty_get(ctx->fsys->savedata); int i, partyCount; - Pokemon *pokemon; + Pokemon *mon; Party_UpdateAllGiratina_DistortionWorld(party, r5); partyCount = GetPartyCount(party); for (i = 0; i < partyCount; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(fsys->savedata), pokemon); + mon = GetPartyMonByIndex(party, i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(fsys->savedata), mon); } } return FALSE; @@ -4384,27 +4384,27 @@ BOOL ScrCmd_FollowerPokeIsEventTrigger(SCRIPTCONTEXT *ctx) { u8 r4 = ScriptReadByte(ctx); u16 r7 = ScriptGetVar(ctx); u16 *r6 = ScriptGetVarPointer(ctx); - Pokemon *pokemon; + Pokemon *mon; int species; *r6 = 0; - pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), r7); + mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), r7); if (r4 >= 4) { return FALSE; } - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL) || GetMonData(pokemon, MON_DATA_CHECKSUM_FAILED, NULL)) { + if (GetMonData(mon, MON_DATA_IS_EGG, NULL) || GetMonData(mon, MON_DATA_CHECKSUM_FAILED, NULL)) { return FALSE; } - if (!sub_0208E9E0(r4, pokemon, GetMonData(pokemon, MON_DATA_OTID, NULL) == PlayerProfile_GetTrainerID( + if (!sub_0208E9E0(r4, mon, GetMonData(mon, MON_DATA_OTID, NULL) == PlayerProfile_GetTrainerID( Sav2_PlayerData_GetProfileAddr(ctx->fsys->savedata)))) { return FALSE; } - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); switch (r4) { case 0: - if ((species == SPECIES_PICHU || species == SPECIES_PIKACHU || species == SPECIES_RAICHU) && MonIsShiny(pokemon)) { + if ((species == SPECIES_PICHU || species == SPECIES_PIKACHU || species == SPECIES_RAICHU) && MonIsShiny(mon)) { *r6 = 1; } break; diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index cfe590318..2123dd428 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -200,13 +200,13 @@ static LocalMapObject* CreateDayCareMonSpriteInternal(MapObjectMan* object_man, } BOOL ScrCmd_DayCareSanitizeMon(SCRIPTCONTEXT* ctx) { - Pokemon* party_mon; + Pokemon *mon; FieldSystem* fsys = ctx->fsys; u16 party_slot = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - party_mon = GetPartyMonByIndex(party, party_slot); + mon = GetPartyMonByIndex(party, party_slot); *ret_ptr = 0; @@ -214,7 +214,7 @@ BOOL ScrCmd_DayCareSanitizeMon(SCRIPTCONTEXT* ctx) { return FALSE; } - u32 held_item = GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL); + u32 held_item = GetMonData(mon, MON_DATA_HELD_ITEM, NULL); if (held_item == ITEM_GRISEOUS_ORB) { BAG_DATA* bag = Sav2_Bag_get(fsys->savedata); if (!Bag_AddItem(bag, ITEM_GRISEOUS_ORB, 1, 11)) { @@ -223,21 +223,21 @@ BOOL ScrCmd_DayCareSanitizeMon(SCRIPTCONTEXT* ctx) { } u32 no_item = ITEM_NONE; - SetMonData(party_mon, MON_DATA_HELD_ITEM, &no_item); + SetMonData(mon, MON_DATA_HELD_ITEM, &no_item); } - s32 forme = GetMonData(party_mon, MON_DATA_FORME, NULL); + s32 forme = GetMonData(mon, MON_DATA_FORME, NULL); if (forme > 0) { - u32 species = GetMonData(party_mon, MON_DATA_SPECIES, NULL); + u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); switch (species) { case SPECIES_GIRATINA: - Mon_UpdateGiratinaForme(party_mon); + Mon_UpdateGiratinaForme(mon); break; case SPECIES_ROTOM: - Mon_UpdateRotomForme(party_mon, 0, 0); + Mon_UpdateRotomForme(mon, 0, 0); break; case SPECIES_SHAYMIN: - Mon_UpdateShayminForme(party_mon, 0); + Mon_UpdateShayminForme(mon, 0); break; } } diff --git a/src/scrcmd_lottery.c b/src/scrcmd_lottery.c index ebd01db0a..4833d617e 100644 --- a/src/scrcmd_lottery.c +++ b/src/scrcmd_lottery.c @@ -43,9 +43,9 @@ BOOL ScrCmd_LotoIdSearch(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (monDigit = 0, monPosition = 0, i = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - otid = GetMonData(pokemon, MON_DATA_OTID, NULL) & 0xffff; + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + otid = GetMonData(mon, MON_DATA_OTID, NULL) & 0xffff; digitCount = LotoId_CountDigitsMatched(lotoId, otid); if (digitCount != 0 && monDigit < digitCount) { monDigit = digitCount; @@ -56,9 +56,9 @@ BOOL ScrCmd_LotoIdSearch(SCRIPTCONTEXT *ctx) { for (boxDigit = 0, boxPosition = 0, ii = 0; ii < NUM_BOXES; ii++) { for (j = 0; j < MONS_PER_BOX; j++) { - BOXMON *pokemon = PCStorage_GetMonByIndexPair(storage, ii, j); - if (GetBoxMonData(pokemon, MON_DATA_SPECIES, NULL) != 0 && !GetBoxMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - otid = GetBoxMonData(pokemon, MON_DATA_OTID, NULL) & 0xffff; + BOXMON *boxMon = PCStorage_GetMonByIndexPair(storage, ii, j); + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) != 0 && !GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL)) { + otid = GetBoxMonData(boxMon, MON_DATA_OTID, NULL) & 0xffff; digitCount = LotoId_CountDigitsMatched(lotoId, otid); if (digitCount != 0 && boxDigit < digitCount) { boxDigit = digitCount; diff --git a/src/scrcmd_move_relearner.c b/src/scrcmd_move_relearner.c index a4ea0a494..d82815b7b 100644 --- a/src/scrcmd_move_relearner.c +++ b/src/scrcmd_move_relearner.c @@ -31,19 +31,19 @@ BOOL ScrCmd_466(SCRIPTCONTEXT *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); PARTY *party = SavArray_PlayerParty_get(ctx->fsys->savedata); - Pokemon *pokemon = GetPartyMonByIndex(party, slot); - u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, 32); + Pokemon *mon = GetPartyMonByIndex(party, slot); + u16 *eligibleMoves = GetEligibleLevelUpMoves(mon, 32); *retPtr = sub_0209186C(eligibleMoves); FreeToHeap(eligibleMoves); return FALSE; } -static void CreateMoveRelearner(SCRIPTCONTEXT *ctx, int a1, Pokemon *pokemon, u16 *eligibleMoves) { +static void CreateMoveRelearner(SCRIPTCONTEXT *ctx, int a1, Pokemon *mon, u16 *eligibleMoves) { void **unkAC = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_AC); struct MoveRelearner *moveRelearner = MoveRelearner_new(32); *unkAC = moveRelearner; - moveRelearner->pokemon = pokemon; + moveRelearner->mon = mon; moveRelearner->profile = Sav2_PlayerData_GetProfileAddr(FieldSys_GetSaveDataPtr(ctx->fsys)); moveRelearner->options = Sav2_PlayerData_GetOptionsAddr(ctx->fsys->savedata); moveRelearner->eligibleMoves = eligibleMoves; @@ -56,20 +56,20 @@ static void CreateMoveRelearner(SCRIPTCONTEXT *ctx, int a1, Pokemon *pokemon, u1 BOOL ScrCmd_MoveRelearnerInit(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - u16 *eligibleMoves = GetEligibleLevelUpMoves(pokemon, 32); - CreateMoveRelearner(ctx, 1, pokemon, eligibleMoves); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + u16 *eligibleMoves = GetEligibleLevelUpMoves(mon, 32); + CreateMoveRelearner(ctx, 1, mon, eligibleMoves); return TRUE; } BOOL ScrCmd_MoveTutorInit(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); u16 *eligibleMoves = AllocFromHeap(32, 4); eligibleMoves[0] = move; eligibleMoves[1] = 0xffff; - CreateMoveRelearner(ctx, 0, pokemon, eligibleMoves); + CreateMoveRelearner(ctx, 0, mon, eligibleMoves); return TRUE; } diff --git a/src/scrcmd_party.c b/src/scrcmd_party.c index e3bb19ba5..642aaa40d 100644 --- a/src/scrcmd_party.c +++ b/src/scrcmd_party.c @@ -43,9 +43,9 @@ BOOL ScrCmd_GetPartyMonSpecies(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 *species = ScriptGetVarPointer(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - *species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + *species = GetMonData(mon, MON_DATA_SPECIES, NULL); } else { *species = SPECIES_NONE; @@ -62,8 +62,8 @@ BOOL ScrCmd_PartymonIsMine(SCRIPTCONTEXT *ctx) { u16 *slot = ScriptGetVarPointer(ctx); u16 *mine = ScriptGetVarPointer(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), *slot); - u16 pokemonID = GetMonData(pokemon, MON_DATA_OTID, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), *slot); + u16 pokemonID = GetMonData(mon, MON_DATA_OTID, NULL); u16 playerID = PlayerProfile_GetTrainerID(profile); if (pokemonID == playerID) { @@ -86,12 +86,12 @@ BOOL ScrCmd_GiveEgg(SCRIPTCONTEXT *ctx) { PARTY *party = SavArray_PlayerParty_get(fsys->savedata); u8 partyCount = GetPartyCount(party); if (partyCount < PARTY_SIZE) { - Pokemon *pokemon = AllocMonZeroed(11); - ZeroMonData(pokemon); + Pokemon *mon = AllocMonZeroed(11); + ZeroMonData(mon); int val = sub_02017FE4(MAPSECTYPE_GIFT, offset); - SetEggStats(pokemon, species, 1, profile, 3, val); - AddMonToParty(party, pokemon); - FreeToHeap(pokemon); + SetEggStats(mon, species, 1, profile, 3, val); + AddMonToParty(party, mon); + FreeToHeap(mon); } return FALSE; @@ -113,14 +113,14 @@ BOOL ScrCmd_MonHasMove(SCRIPTCONTEXT *ctx) { u16 move = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); *hasMove = FALSE; - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { return FALSE; } - if (GetMonData(pokemon, MON_DATA_MOVE1, NULL) == move || GetMonData(pokemon, MON_DATA_MOVE2, NULL) == move || - GetMonData(pokemon, MON_DATA_MOVE3, NULL) == move || GetMonData(pokemon, MON_DATA_MOVE4, NULL) == move) { + if (GetMonData(mon, MON_DATA_MOVE1, NULL) == move || GetMonData(mon, MON_DATA_MOVE2, NULL) == move || + GetMonData(mon, MON_DATA_MOVE3, NULL) == move || GetMonData(mon, MON_DATA_MOVE4, NULL) == move) { *hasMove = TRUE; } @@ -135,13 +135,13 @@ BOOL ScrCmd_GetPartySlotWithMove(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = PARTY_SIZE; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { continue; } - if (GetMonData(pokemon, MON_DATA_MOVE1, NULL) == move || GetMonData(pokemon, MON_DATA_MOVE2, NULL) == move || - GetMonData(pokemon, MON_DATA_MOVE3, NULL) == move || GetMonData(pokemon, MON_DATA_MOVE4, NULL) == move) { + if (GetMonData(mon, MON_DATA_MOVE1, NULL) == move || GetMonData(mon, MON_DATA_MOVE2, NULL) == move || + GetMonData(mon, MON_DATA_MOVE3, NULL) == move || GetMonData(mon, MON_DATA_MOVE4, NULL) == move) { *slot = i; break; } @@ -154,8 +154,8 @@ BOOL ScrCmd_SurvivePoisoning(SCRIPTCONTEXT *ctx) { u16 *poison = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - *poison = SurvivePoisoning(pokemon); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + *poison = SurvivePoisoning(mon); return FALSE; } @@ -168,8 +168,8 @@ BOOL ScrCmd_PartyCountMonsAtOrBelowLevel(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0, *levelCount = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_LEVEL, NULL) <= level) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_LEVEL, NULL) <= level) { count++; } } @@ -183,10 +183,10 @@ BOOL ScrCmd_MonGetLevel(SCRIPTCONTEXT *ctx) { u16 *level = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); *level = 0; - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - *level = GetMonData(pokemon, MON_DATA_LEVEL, NULL); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + *level = GetMonData(mon, MON_DATA_LEVEL, NULL); } return FALSE; @@ -203,13 +203,13 @@ BOOL ScrCmd_MonGetNature(SCRIPTCONTEXT *ctx) { return FALSE; } - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { *nature = 0; return FALSE; } - *nature = GetMonNature(pokemon); + *nature = GetMonNature(mon); return FALSE; } @@ -221,8 +221,8 @@ BOOL ScrCmd_GetPartySlotWithNature(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon , MON_DATA_IS_EGG, NULL) && GetMonNature(pokemon) == nature) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon , MON_DATA_IS_EGG, NULL) && GetMonNature(mon) == nature) { *slot = i; break; } @@ -236,8 +236,8 @@ BOOL ScrCmd_MonGetFriendship(SCRIPTCONTEXT *ctx) { u16 *friendship = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - *friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + *friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); return FALSE; } @@ -248,18 +248,18 @@ BOOL ScrCmd_MonAddFriendship(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 map = MapHeader_GetMapSec(ctx->fsys->location->mapId); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - u16 friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + u16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendshipModifier != 0) { - if (GetMonData(pokemon, MON_DATA_POKEBALL, NULL) == BALL_LUXURY) { + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == BALL_LUXURY) { friendshipModifier++; } - if (map == GetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, NULL)) { + if (map == GetMonData(mon, MON_DATA_EGG_MET_LOCATION, NULL)) { friendshipModifier++; } - if (GetItemAttr(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, 11) == HOLD_EFFECT_FRIENDSHIP_UP) { + if (GetItemAttr(GetMonData(mon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, 11) == HOLD_EFFECT_FRIENDSHIP_UP) { friendshipModifier = friendshipModifier * 150 / 100; } } @@ -268,7 +268,7 @@ BOOL ScrCmd_MonAddFriendship(SCRIPTCONTEXT *ctx) { if (friendship > FRIENDSHIP_MAX) { friendship = FRIENDSHIP_MAX; } - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); return FALSE; } @@ -278,15 +278,15 @@ BOOL ScrCmd_MonSubtractFriendship(SCRIPTCONTEXT *ctx) { u16 friendshipModifier = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - u16 friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + u16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendshipModifier > friendship) { friendship = 0; } else { friendship -= friendshipModifier; } - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); return FALSE; } @@ -296,8 +296,8 @@ BOOL ScrCmd_MonGetContestValue(SCRIPTCONTEXT *ctx) { u16 contestAttribute = ScriptGetVar(ctx); u16 *contestValue = ScriptGetVarPointer(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - *contestValue = GetMonData(pokemon, contestAttribute + MON_DATA_COOL, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + *contestValue = GetMonData(mon, contestAttribute + MON_DATA_COOL, NULL); return FALSE; } @@ -320,9 +320,9 @@ BOOL ScrCmd_GetMonTypes(SCRIPTCONTEXT *ctx) { u16 *type2 = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - *type1 = GetMonData(pokemon, MON_DATA_TYPE_1, NULL); - *type2 = GetMonData(pokemon, MON_DATA_TYPE_2, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + *type1 = GetMonData(mon, MON_DATA_TYPE_1, NULL); + *type2 = GetMonData(mon, MON_DATA_TYPE_2, NULL); return FALSE; } @@ -341,8 +341,8 @@ BOOL ScrCmd_PartyCountNotEgg(SCRIPTCONTEXT *ctx) { int partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { count++; } } @@ -360,8 +360,8 @@ BOOL ScrCmd_CountAliveMons(SCRIPTCONTEXT *ctx) { int partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { if (i != slot) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_HP, NULL) != 0) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_HP, NULL) != 0) { count++; } } @@ -379,8 +379,8 @@ BOOL ScrCmd_CountAliveMonsAndPC(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_HP, NULL) != 0) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_HP, NULL) != 0) { count++; } } @@ -396,8 +396,8 @@ BOOL ScrCmd_PartyCountEgg(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { count++; } } @@ -413,8 +413,8 @@ BOOL ScrCmd_PartyHasPokerus(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *pokerus = FALSE; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (GetMonData(pokemon, MON_DATA_POKERUS, NULL)) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (GetMonData(mon, MON_DATA_POKERUS, NULL)) { *pokerus = TRUE; break; } @@ -427,8 +427,8 @@ BOOL ScrCmd_MonGetGender(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 *gender = ScriptGetVarPointer(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - *gender = GetMonData(pokemon, MON_DATA_GENDER, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + *gender = GetMonData(mon, MON_DATA_GENDER, NULL); return FALSE; } @@ -438,26 +438,26 @@ BOOL ScrCmd_CountMonMoves(SCRIPTCONTEXT *ctx) { u16 *moveCount = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { *moveCount = 0; return FALSE; } u8 count = 0; - if (GetMonData(pokemon, MON_DATA_MOVE1, NULL) != MOVE_NONE) { + if (GetMonData(mon, MON_DATA_MOVE1, NULL) != MOVE_NONE) { count++; } - if (GetMonData(pokemon, MON_DATA_MOVE2, NULL) != MOVE_NONE) { + if (GetMonData(mon, MON_DATA_MOVE2, NULL) != MOVE_NONE) { count++; } - if (GetMonData(pokemon, MON_DATA_MOVE3, NULL) != MOVE_NONE) { + if (GetMonData(mon, MON_DATA_MOVE3, NULL) != MOVE_NONE) { count++; } - if (GetMonData(pokemon, MON_DATA_MOVE4, NULL) != MOVE_NONE) { + if (GetMonData(mon, MON_DATA_MOVE4, NULL) != MOVE_NONE) { count++; } @@ -470,8 +470,8 @@ BOOL ScrCmd_MonForgetMove(SCRIPTCONTEXT *ctx) { u16 pokemonSlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); - MonDeleteMoveSlot(pokemon, moveSlot); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); + MonDeleteMoveSlot(mon, moveSlot); return FALSE; } @@ -482,8 +482,8 @@ BOOL ScrCmd_MonGetMove(SCRIPTCONTEXT *ctx) { u16 pokemonSlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); - *move = GetMonData(pokemon, moveSlot + MON_DATA_MOVE1, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), pokemonSlot); + *move = GetMonData(mon, moveSlot + MON_DATA_MOVE1, NULL); return FALSE; } @@ -494,8 +494,8 @@ BOOL ScrCmd_KenyaCheck(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u8 val = ScriptReadByte(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - if (!ItemIdIsMail(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL))) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + if (!ItemIdIsMail(GetMonData(mon, MON_DATA_HELD_ITEM, NULL))) { *kenya = FALSE; return FALSE; } @@ -508,7 +508,7 @@ BOOL ScrCmd_KenyaCheck(SCRIPTCONTEXT *ctx) { HandleLoadOverlay(FS_OVERLAY_ID(npc_trade), OVY_LOAD_ASYNC); MAIL *kenyaMail = NPCTrade_MakeKenyaMail(); MAIL *mail = Mail_new(11); - GetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); + GetMonData(mon, MON_DATA_MAIL_STRUCT, mail); *kenya = Mail_compare(kenyaMail, mail); FreeToHeap(mail); FreeToHeap(kenyaMail); @@ -530,9 +530,9 @@ BOOL ScrCmd_KenyaCheckPartyOrMailbox(SCRIPTCONTEXT *ctx) { UnloadOverlayByID(FS_OVERLAY_ID(npc_trade)); for (i = 0; i < GetPartyCount(party); i++) { - Pokemon *pokemon = GetPartyMonByIndex(party, i); - if (ItemIdIsMail(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL))) { - GetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); + Pokemon *mon = GetPartyMonByIndex(party, i); + if (ItemIdIsMail(GetMonData(mon, MON_DATA_HELD_ITEM, NULL))) { + GetMonData(mon, MON_DATA_MAIL_STRUCT, mail); if (Mail_compare(kenyaMail, mail)) { *kenya = TRUE; FreeToHeap(mail); @@ -567,16 +567,16 @@ BOOL ScrCmd_MonGiveMail(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 item; - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - if (!ItemIdIsMail(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL))) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + if (!ItemIdIsMail(GetMonData(mon, MON_DATA_HELD_ITEM, NULL))) { return FALSE; } item = ITEM_NONE; MAIL *mail = Mail_new(11); Mail_init(mail); - SetMonData(pokemon, MON_DATA_MAIL_STRUCT, mail); - SetMonData(pokemon, MON_DATA_HELD_ITEM, &item); + SetMonData(mon, MON_DATA_MAIL_STRUCT, mail); + SetMonData(mon, MON_DATA_HELD_ITEM, &item); FreeToHeap(mail); return FALSE; @@ -590,8 +590,8 @@ BOOL ScrCmd_PlayerHasSpecies(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *playerHasSpecies = FALSE; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL) == species) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(mon, MON_DATA_SPECIES, NULL) == species) { *playerHasSpecies = TRUE; break; } @@ -613,9 +613,9 @@ BOOL ScrCmd_CountPartyMonsOfSpecies(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *speciesCount = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - u16 monSpecies = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + u16 monSpecies = GetMonData(mon, MON_DATA_SPECIES, NULL); if (species == 0) { array[i] = monSpecies; for (j = 0; j < i; j++) { @@ -642,8 +642,8 @@ BOOL ScrCmd_GetPartySlotWithSpecies(SCRIPTCONTEXT *ctx) { u8 partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL) == species) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(mon, MON_DATA_SPECIES, NULL) == species) { *slot = i; break; } @@ -655,11 +655,11 @@ BOOL ScrCmd_GetPartySlotWithSpecies(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_MonGetRibbonCount(SCRIPTCONTEXT *ctx) { u16 *ribbons = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); u16 i, count; for (i = 0, count = 0; i < RIBBON_MAX; i++) { - if (GetMonData(pokemon, GetRibbonAttr(i, RIBBONDAT_MONDATNO), NULL)) { + if (GetMonData(mon, GetRibbonAttr(i, RIBBONDAT_MONDATNO), NULL)) { count++; } } @@ -678,8 +678,8 @@ BOOL ScrCmd_GetPartyRibbonCount(SCRIPTCONTEXT *ctx) { for (i = 0, count = 0; i < RIBBON_MAX; i++) { for (j = 0; j < partyCount; j++) { - Pokemon *pokemon = GetPartyMonByIndex(party, j); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, GetRibbonAttr(i, RIBBONDAT_MONDATNO), NULL)) { + Pokemon *mon = GetPartyMonByIndex(party, j); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, GetRibbonAttr(i, RIBBONDAT_MONDATNO), NULL)) { count++; break; } @@ -695,8 +695,8 @@ BOOL ScrCmd_MonHasRibbon(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 ribbon = ScriptGetVar(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - *hasRibbon = GetMonData(pokemon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + *hasRibbon = GetMonData(mon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), NULL); return FALSE; } @@ -706,8 +706,8 @@ BOOL ScrCmd_GiveRibbon(SCRIPTCONTEXT *ctx) { u16 ribbon = ScriptGetVar(ctx); u8 hasRibbon = TRUE; - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - SetMonData(pokemon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), &hasRibbon); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + SetMonData(mon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), &hasRibbon); return FALSE; } @@ -721,8 +721,8 @@ BOOL ScrCmd_PartyLegalCheck(SCRIPTCONTEXT *ctx) { for (i = 0; i < RIBBON_MAX; i++) { for (j = 0; j < partyCount; j++) { - Pokemon *pokemon = GetPartyMonByIndex(party, j); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL) && GetMonData(pokemon, MON_DATA_CHECKSUM_FAILED, NULL)) { + Pokemon *mon = GetPartyMonByIndex(party, j); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_CHECKSUM_FAILED, NULL)) { *legal = TRUE; return FALSE; } @@ -741,9 +741,9 @@ BOOL ScrCmd_GetPartySlotWithFatefulEncounter(SCRIPTCONTEXT *ctx) { partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - if ((u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL) == species && GetMonData(pokemon, MON_DATA_FATEFUL_ENCOUNTER, NULL) == TRUE) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + if ((u16)GetMonData(mon, MON_DATA_SPECIES, NULL) == species && GetMonData(mon, MON_DATA_FATEFUL_ENCOUNTER, NULL) == TRUE) { *slot = i; break; } @@ -761,8 +761,8 @@ BOOL ScrCmd_MonHasItem(SCRIPTCONTEXT *ctx) { int partyCount = GetPartyCount(SavArray_PlayerParty_get(fsys->savedata)); for (i = 0, *hasItem = FALSE; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); - if (GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL) == item) { + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), i); + if (GetMonData(mon, MON_DATA_HELD_ITEM, NULL) == item) { *hasItem = TRUE; break; } @@ -775,15 +775,15 @@ BOOL ScrCmd_GetPartymonForme(SCRIPTCONTEXT *ctx) { u16 slot = ScriptGetVar(ctx); u16 *forme = ScriptGetVarPointer(ctx); - Pokemon *pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - *forme = GetMonData(pokemon, MON_DATA_FORME, NULL); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + *forme = GetMonData(mon, MON_DATA_FORME, NULL); return FALSE; } BOOL ScrCmd_MonAddContestValue(SCRIPTCONTEXT *ctx) { - Pokemon *pokemon; + Pokemon *mon; u8 contestValue = 0; u16 slot = ScriptGetVar(ctx); u8 contestAttribute = ScriptReadByte(ctx); @@ -793,13 +793,13 @@ BOOL ScrCmd_MonAddContestValue(SCRIPTCONTEXT *ctx) { return FALSE; } - pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); - if (GetMonData(pokemon, MON_DATA_SHEEN, NULL) == 255) { + mon = GetPartyMonByIndex(SavArray_PlayerParty_get(ctx->fsys->savedata), slot); + if (GetMonData(mon, MON_DATA_SHEEN, NULL) == 255) { return FALSE; } contestAttribute += MON_DATA_COOL; - contestValue = GetMonData(pokemon, contestAttribute, NULL); + contestValue = GetMonData(mon, contestAttribute, NULL); if ((contestModifier + contestValue) > 255) { contestValue = 255; @@ -807,7 +807,7 @@ BOOL ScrCmd_MonAddContestValue(SCRIPTCONTEXT *ctx) { else { contestValue += contestModifier; } - SetMonData(pokemon, contestAttribute, &contestValue); + SetMonData(mon, contestAttribute, &contestValue); return FALSE; } diff --git a/src/scrcmd_pokemon_misc.c b/src/scrcmd_pokemon_misc.c index a1ee61ef4..2d2796a08 100644 --- a/src/scrcmd_pokemon_misc.c +++ b/src/scrcmd_pokemon_misc.c @@ -477,9 +477,9 @@ BOOL ScrCmd_UpdateRotomForme(SCRIPTCONTEXT *ctx) { int defaultSlot = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); VarGet(ctx->fsys, ScriptReadHalfword(ctx)); //unsused variable u32 forme = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - Pokemon *rotom = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), rotomIndex); - Mon_UpdateRotomForme(rotom, forme, defaultSlot); - Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(fsys->savedata), rotom); + Pokemon *mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), rotomIndex); + Mon_UpdateRotomForme(mon, forme, defaultSlot); + Pokedex_SetMonCaughtFlag(Sav2_Pokedex_get(fsys->savedata), mon); return FALSE; } @@ -997,7 +997,7 @@ BOOL ScrCmd_GiveTogepiEgg(SCRIPTCONTEXT *ctx) { u8 pp; u32 personality; u16 moveData; - Pokemon *togepi; + Pokemon *mon; PLAYERPROFILE *profile; PARTY *party; FieldSystem *fsys = ctx->fsys; @@ -1009,13 +1009,13 @@ BOOL ScrCmd_GiveTogepiEgg(SCRIPTCONTEXT *ctx) { return FALSE; } - togepi = AllocMonZeroed(0xb); - ZeroMonData(togepi); + mon = AllocMonZeroed(0xb); + ZeroMonData(mon); - SetEggStats(togepi, SPECIES_TOGEPI, 1, profile, 3, sub_02017FE4(1, 0xd)); + SetEggStats(mon, SPECIES_TOGEPI, 1, profile, 3, sub_02017FE4(1, 0xd)); for (i = 0; i < 4; i++) { - if (!GetMonData(togepi, MON_DATA_MOVE1 + i, 0)) { + if (!GetMonData(mon, MON_DATA_MOVE1 + i, 0)) { break; } } @@ -1025,16 +1025,16 @@ BOOL ScrCmd_GiveTogepiEgg(SCRIPTCONTEXT *ctx) { } moveData = MOVE_EXTRASENSORY; - SetMonData(togepi, MON_DATA_MOVE1 + i, &moveData); + SetMonData(mon, MON_DATA_MOVE1 + i, &moveData); - pp = GetMonData(togepi, MON_DATA_MOVE1MAXPP + i, 0); - SetMonData(togepi, MON_DATA_MOVE1PP + i, &pp); + pp = GetMonData(mon, MON_DATA_MOVE1MAXPP + i, 0); + SetMonData(mon, MON_DATA_MOVE1PP + i, &pp); - AddMonToParty(party, togepi); + AddMonToParty(party, mon); - FreeToHeap(togepi); + FreeToHeap(mon); - SaveMisc_SetTogepiPersonalityGender(Sav2_Misc_get(fsys->savedata), GetMonData(togepi, MON_DATA_PERSONALITY, 0), GetMonData(togepi, MON_DATA_GENDER, 0)); + SaveMisc_SetTogepiPersonalityGender(Sav2_Misc_get(fsys->savedata), GetMonData(mon, MON_DATA_PERSONALITY, 0), GetMonData(mon, MON_DATA_GENDER, 0)); return FALSE; } @@ -1058,7 +1058,7 @@ BOOL ScrCmd_GiveSpikyEarPichu(SCRIPTCONTEXT *ctx) { u8 forme; u8 maxPP; u16 heldItem; - Pokemon *pichu; + Pokemon *mon; PARTY *party; FieldSystem *fsys; PLAYERPROFILE *profile; @@ -1070,34 +1070,34 @@ BOOL ScrCmd_GiveSpikyEarPichu(SCRIPTCONTEXT *ctx) { if (GetPartyCount(party) >= 6) { return FALSE; } - pichu = AllocMonZeroed(0xb); - ZeroMonData(pichu); + mon = AllocMonZeroed(0xb); + ZeroMonData(mon); u32 trId = PlayerProfile_GetTrainerID(profile); u32 unkA = ChangePersonalityToNatureGenderAndAbility(trId, 0xac, NATURE_NAUGHTY, MON_FEMALE, 0, 0); - CreateMon(pichu, SPECIES_PICHU, 30, 0x20, 1, unkA, 1, trId); + CreateMon(mon, SPECIES_PICHU, 30, 0x20, 1, unkA, 1, trId); forme = 1; - SetMonData(pichu, MON_DATA_FORME, &forme); + SetMonData(mon, MON_DATA_FORME, &forme); for (i = 0; i < 4; i++) { - SetMonData(pichu, MON_DATA_MOVE1 + i, &sSpikyEarPichuMoveset[i]); - maxPP = GetMonData(pichu, MON_DATA_MOVE1MAXPP + i, 0); - SetMonData(pichu, MON_DATA_MOVE1PP + i, &maxPP); + SetMonData(mon, MON_DATA_MOVE1 + i, &sSpikyEarPichuMoveset[i]); + maxPP = GetMonData(mon, MON_DATA_MOVE1MAXPP + i, 0); + SetMonData(mon, MON_DATA_MOVE1PP + i, &maxPP); } heldItem = ITEM_ZAP_PLATE; - SetMonData(pichu, MON_DATA_HELD_ITEM, &heldItem); + SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem); u32 unkB = sub_02017FE4(0, MapHeader_GetMapSec(ctx->fsys->location->mapId)); - sub_020720FC(pichu, profile, 4, unkB, 0x18, 0xb); + sub_020720FC(mon, profile, 4, unkB, 0x18, 0xb); - AddMonToParty(party, pichu); + AddMonToParty(party, mon); - FreeToHeap(pichu); + FreeToHeap(mon); - UpdatePokedexWithReceivedSpecies(fsys->savedata, pichu); + UpdatePokedexWithReceivedSpecies(fsys->savedata, mon); return FALSE; } @@ -1457,7 +1457,7 @@ BOOL ScrCmd_JudgeBugContest(SCRIPTCONTEXT *ctx) { if (bugContest->caught_poke == 0) { *species = 0; } else { - *species = GetMonData(bugContest->pokemon, MON_DATA_SPECIES, NULL); + *species = GetMonData(bugContest->mon, MON_DATA_SPECIES, NULL); } return FALSE; diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index efea62a63..2614f7fea 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -23,7 +23,7 @@ static const u16 sBigMonSizeTable[][3] = { {1700, 1, 65510}, }; -static u32 GetMonSizeHash(Pokemon *pokemon) { +static u32 GetMonSizeHash(Pokemon *mon) { u16 pid_lo; u16 hpIv_lo; u16 atkIv_lo; @@ -33,13 +33,13 @@ static u32 GetMonSizeHash(Pokemon *pokemon) { u16 spDefIv_lo; u16 ret, ret2; - pid_lo = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); - hpIv_lo = GetMonData(pokemon, MON_DATA_HP_IV, NULL) & 0xF; - atkIv_lo = GetMonData(pokemon, MON_DATA_ATK_IV, NULL) & 0xF; - defIv_lo = GetMonData(pokemon, MON_DATA_DEF_IV, NULL) & 0xF; - spdIv_lo = GetMonData(pokemon, MON_DATA_SPEED_IV, NULL) & 0xF; - spAtkIv_lo = GetMonData(pokemon, MON_DATA_SPATK_IV, NULL) & 0xF; - spDefIv_lo = GetMonData(pokemon, MON_DATA_SPDEF_IV, NULL) & 0xF; + pid_lo = GetMonData(mon, MON_DATA_PERSONALITY, NULL); + hpIv_lo = GetMonData(mon, MON_DATA_HP_IV, NULL) & 0xF; + atkIv_lo = GetMonData(mon, MON_DATA_ATK_IV, NULL) & 0xF; + defIv_lo = GetMonData(mon, MON_DATA_DEF_IV, NULL) & 0xF; + spdIv_lo = GetMonData(mon, MON_DATA_SPEED_IV, NULL) & 0xF; + spAtkIv_lo = GetMonData(mon, MON_DATA_SPATK_IV, NULL) & 0xF; + spDefIv_lo = GetMonData(mon, MON_DATA_SPDEF_IV, NULL) & 0xF; ret = ((spDefIv_lo ^ spAtkIv_lo) * spdIv_lo) ^ (pid_lo >> 8); ret2 = ((atkIv_lo ^ defIv_lo) * hpIv_lo) ^ ((u8)pid_lo); @@ -78,7 +78,7 @@ static void FormatSizeRecord(FieldSystem *fsys, u8 idx0, u8 idx1, u16 species, u }; BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx) { - Pokemon *pokemon; + Pokemon *mon; vu16 rand, record; u16 slot; u16 species; @@ -90,9 +90,9 @@ BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx) { fsys = ctx->fsys; ret_p = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); slot = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); - rand = GetMonSizeHash(pokemon); + mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); + rand = GetMonSizeHash(mon); cm1 = GetMonSize(species, rand); record = ScriptState_GetFishingCompetitionLengthRecord(SavArray_Flags_get(fsys->savedata)); cm2 = GetMonSize(species, record); @@ -114,14 +114,14 @@ BOOL ScrCmd_SizeRecordCompare(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_SizeRecordUpdate(SCRIPTCONTEXT *ctx) { - Pokemon *pokemon; + Pokemon *mon; u16 slot; FieldSystem *fsys; fsys = ctx->fsys; slot = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - ScriptState_SetFishingCompetitionLengthRecord(SavArray_Flags_get(fsys->savedata), GetMonSizeHash(pokemon)); + mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + ScriptState_SetFishingCompetitionLengthRecord(SavArray_Flags_get(fsys->savedata), GetMonSizeHash(mon)); return FALSE; } @@ -142,7 +142,7 @@ BOOL ScrCmd_BufferRecordSize(SCRIPTCONTEXT *ctx) { } BOOL ScrCmd_BufferMonSize(SCRIPTCONTEXT *ctx) { - Pokemon *pokemon; + Pokemon *mon; FieldSystem *fsys; u16 idx0; u16 idx1; @@ -152,7 +152,7 @@ BOOL ScrCmd_BufferMonSize(SCRIPTCONTEXT *ctx) { idx0 = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); idx1 = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); slot = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); - pokemon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); - FormatSizeRecord(fsys, idx0, idx1, GetMonData(pokemon, MON_DATA_SPECIES, NULL), GetMonSizeHash(pokemon)); + mon = GetPartyMonByIndex(SavArray_PlayerParty_get(fsys->savedata), slot); + FormatSizeRecord(fsys, idx0, idx1, GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonSizeHash(mon)); return FALSE; } diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index 15c63d482..15fbd0921 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -63,8 +63,8 @@ BOOL ScrCmd_BufferMonSpeciesName(SCRIPTCONTEXT* ctx) { u16 party_mon_idx = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - Pokemon* party_mon = GetPartyMonByIndex(party, party_mon_idx); - BufferBoxMonSpeciesName(*msg_fmt, idx, &party_mon->box); + Pokemon *mon = GetPartyMonByIndex(party, party_mon_idx); + BufferBoxMonSpeciesName(*msg_fmt, idx, &mon->box); return FALSE; } @@ -170,8 +170,8 @@ BOOL ScrCmd_BufferPartyMonNick(SCRIPTCONTEXT* ctx) { u16 party_mon_idx = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - Pokemon* party_mon = GetPartyMonByIndex(party, party_mon_idx); - BufferBoxMonNickname(*msg_fmt, idx, &party_mon->box); + Pokemon *mon = GetPartyMonByIndex(party, party_mon_idx); + BufferBoxMonNickname(*msg_fmt, idx, &mon->box); return FALSE; } @@ -352,8 +352,8 @@ BOOL ScrCmd_BufferPartyMonMoveName(SCRIPTCONTEXT* ctx) { u16 move_slot = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - Pokemon* party_mon = GetPartyMonByIndex(party, party_slot); - u16 move_id = GetMonData(party_mon, MON_DATA_MOVE1 + move_slot, NULL); + Pokemon *mon = GetPartyMonByIndex(party, party_slot); + u16 move_id = GetMonData(mon, MON_DATA_MOVE1 + move_slot, NULL); BufferMoveName(*msg_fmt, idx, move_id); return FALSE; @@ -427,8 +427,8 @@ BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(SCRIPTCONTEXT* ctx) { u16 party_mon_slot = ScriptGetVar(ctx); PARTY* party = SavArray_PlayerParty_get(fsys->savedata); - Pokemon* party_mon = GetPartyMonByIndex(party, party_mon_slot); - BufferBoxMonSpeciesNameWithArticle(*msg_fmt, idx, &party_mon->box); + Pokemon *mon = GetPartyMonByIndex(party, party_mon_slot); + BufferBoxMonSpeciesNameWithArticle(*msg_fmt, idx, &mon->box); return FALSE; } diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index 60a79967d..ea9e3861d 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -5,16 +5,16 @@ #include "script_pokemon_util.h" #include "constants/items.h" -static BOOL MonNotFaintedOrEgg(Pokemon *pokemon) { - if (GetMonData(pokemon, MON_DATA_HP, NULL) == 0) { +static BOOL MonNotFaintedOrEgg(Pokemon *mon) { + if (GetMonData(mon, MON_DATA_HP, NULL) == 0) { return FALSE; } - return !GetMonData(pokemon, MON_DATA_IS_EGG, NULL); + return !GetMonData(mon, MON_DATA_IS_EGG, NULL); } BOOL GiveMon(HeapID heapId, SAVEDATA *saveData, int species, int level, int forme, u8 ability, u16 heldItem, int ball, int encounterType) { PARTY *party; - Pokemon *pokemon; + Pokemon *mon; PLAYERPROFILE *profile; u32 sp1C; BOOL result; @@ -22,21 +22,21 @@ BOOL GiveMon(HeapID heapId, SAVEDATA *saveData, int species, int level, int form profile = Sav2_PlayerData_GetProfileAddr(saveData); party = SavArray_PlayerParty_get(saveData); { - pokemon = AllocMonZeroed(heapId); - ZeroMonData(pokemon); - CreateMon(pokemon, species, level, 32, FALSE, 0, 0, 0); - sub_020720FC(pokemon, profile, ITEM_POKE_BALL, ball, encounterType, heapId); + mon = AllocMonZeroed(heapId); + ZeroMonData(mon); + CreateMon(mon, species, level, 32, FALSE, 0, 0, 0); + sub_020720FC(mon, profile, ITEM_POKE_BALL, ball, encounterType, heapId); sp1C = heldItem; - SetMonData(pokemon, MON_DATA_HELD_ITEM, &sp1C); - SetMonData(pokemon, MON_DATA_FORME, &forme); + SetMonData(mon, MON_DATA_HELD_ITEM, &sp1C); + SetMonData(mon, MON_DATA_FORME, &forme); if (ability != 0) { - SetMonData(pokemon, MON_DATA_ABILITY, &ability); + SetMonData(mon, MON_DATA_ABILITY, &ability); } - result = AddMonToParty(party, pokemon); + result = AddMonToParty(party, mon); if (result) { - UpdatePokedexWithReceivedSpecies(saveData, pokemon); + UpdatePokedexWithReceivedSpecies(saveData, mon); } - FreeToHeap(pokemon); + FreeToHeap(mon); } return result; } @@ -45,16 +45,16 @@ BOOL GiveEgg(HeapID heapId, SAVEDATA *saveData, int species, u8 metLocation, Map #pragma unused(heapId) PLAYERPROFILE *profile; PARTY *party; - Pokemon *pokemon; + Pokemon *mon; BOOL result; profile = Sav2_PlayerData_GetProfileAddr(saveData); party = SavArray_PlayerParty_get(saveData); - pokemon = AllocMonZeroed(32); - ZeroMonData(pokemon); - SetEggStats(pokemon, species, metLocation, profile, 4, sub_02017FE4(sp20, sp24)); - result = AddMonToParty(party, pokemon); - FreeToHeap(pokemon); + mon = AllocMonZeroed(32); + ZeroMonData(mon); + SetEggStats(mon, species, metLocation, profile, 4, sub_02017FE4(sp20, sp24)); + result = AddMonToParty(party, mon); + FreeToHeap(mon); return result; } @@ -65,18 +65,18 @@ void PartyMonSetMoveInSlot(PARTY *party, int mon_slot, int move_slot, u16 moveId int GetIdxOfFirstPartyMonWithMove(PARTY *party, u16 move) { int i; int n; - Pokemon *pokemon; + Pokemon *mon; n = GetPartyCount(party); for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { + mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { continue; } - if (GetMonData(pokemon, MON_DATA_MOVE1, NULL) == move - || GetMonData(pokemon, MON_DATA_MOVE2, NULL) == move - || GetMonData(pokemon, MON_DATA_MOVE3, NULL) == move - || GetMonData(pokemon, MON_DATA_MOVE4, NULL) == move) { + if (GetMonData(mon, MON_DATA_MOVE1, NULL) == move + || GetMonData(mon, MON_DATA_MOVE2, NULL) == move + || GetMonData(mon, MON_DATA_MOVE3, NULL) == move + || GetMonData(mon, MON_DATA_MOVE4, NULL) == move) { return i; } } @@ -87,13 +87,13 @@ int CountAlivePokemon(PARTY *party) { int i; int n; int c; - Pokemon *pokemon; + Pokemon *mon; n = GetPartyCount(party); c = 0; for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (MonNotFaintedOrEgg(pokemon)) { + mon = GetPartyMonByIndex(party, i); + if (MonNotFaintedOrEgg(mon)) { c++; } } @@ -103,13 +103,13 @@ int CountAlivePokemon(PARTY *party) { Pokemon *GetFirstAliveMonInParty_CrashIfNone(PARTY *party) { int i; int n; - Pokemon *pokemon; + Pokemon *mon; n = GetPartyCount(party); for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (MonNotFaintedOrEgg(pokemon)) { - return pokemon; + mon = GetPartyMonByIndex(party, i); + if (MonNotFaintedOrEgg(mon)) { + return mon; } } GF_ASSERT(0); @@ -119,12 +119,12 @@ Pokemon *GetFirstAliveMonInParty_CrashIfNone(PARTY *party) { u8 GetIdxOfFirstAliveMonInParty_CrashIfNone(PARTY *party) { int i; int n; - Pokemon *pokemon; + Pokemon *mon; n = GetPartyCount(party); for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (MonNotFaintedOrEgg(pokemon)) { + mon = GetPartyMonByIndex(party, i); + if (MonNotFaintedOrEgg(mon)) { return i; } } @@ -135,13 +135,13 @@ u8 GetIdxOfFirstAliveMonInParty_CrashIfNone(PARTY *party) { Pokemon *GetFirstNonEggInParty(PARTY *party) { u16 i; u16 n; - Pokemon *pokemon; + Pokemon *mon; n = GetPartyCount(party); for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (!GetMonData(pokemon, MON_DATA_IS_EGG, NULL)) { - return pokemon; + mon = GetPartyMonByIndex(party, i); + if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { + return mon; } } return NULL; @@ -157,28 +157,28 @@ BOOL ApplyPoisonStep(PARTY *party, u16 location) { int n_poisoned; int n_fainted; u32 hp; - Pokemon *pokemon; + Pokemon *mon; n_poisoned = 0; n_fainted = 0; n = GetPartyCount(party); for (i = 0; i < n; i++) { - pokemon = GetPartyMonByIndex(party, i); - if (!MonNotFaintedOrEgg(pokemon)) { + mon = GetPartyMonByIndex(party, i); + if (!MonNotFaintedOrEgg(mon)) { continue; } - if (!(GetMonData(pokemon, MON_DATA_STATUS, NULL) & (STATUS_POISON_ANY))) { + if (!(GetMonData(mon, MON_DATA_STATUS, NULL) & (STATUS_POISON_ANY))) { continue; } - hp = GetMonData(pokemon, MON_DATA_HP, NULL); + hp = GetMonData(mon, MON_DATA_HP, NULL); if (hp > 1) { hp--; } - SetMonData(pokemon, MON_DATA_HP, &hp); + SetMonData(mon, MON_DATA_HP, &hp); if (hp == 1) { n_fainted++; - MonApplyFriendshipMod(pokemon, FRIENDSHIP_EVENT_HEAL_FIELD_PSN, location); - ApplyMonMoodModifier(pokemon, 5); + MonApplyFriendshipMod(mon, FRIENDSHIP_EVENT_HEAL_FIELD_PSN, location); + ApplyMonMoodModifier(mon, 5); } n_poisoned++; } @@ -191,11 +191,11 @@ BOOL ApplyPoisonStep(PARTY *party, u16 location) { } } -BOOL SurvivePoisoning(Pokemon *pokemon) { +BOOL SurvivePoisoning(Pokemon *mon) { u32 status; - if ((GetMonData(pokemon, MON_DATA_STATUS, NULL) & STATUS_POISON_ANY) && GetMonData(pokemon, MON_DATA_HP, NULL) == 1) { + if ((GetMonData(mon, MON_DATA_STATUS, NULL) & STATUS_POISON_ANY) && GetMonData(mon, MON_DATA_HP, NULL) == 1) { status = 0; - SetMonData(pokemon, MON_DATA_STATUS, &status); + SetMonData(mon, MON_DATA_STATUS, &status); return TRUE; } else { return FALSE; diff --git a/src/trainer_data.c b/src/trainer_data.c index 1aab0825e..edce90c7b 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -260,7 +260,7 @@ TrainerGender TrainerClass_GetGenderOrTrainerCount(int trainerClass) { } void TrMon_OverridePidGender(int species, int forme, int overrideParam, u32 *pid); -void TrMon_FrustrationCheckAndSetFriendship(Pokemon *pokemon); +void TrMon_FrustrationCheckAndSetFriendship(Pokemon *mon); void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) { // enemies -> r4 @@ -273,14 +273,14 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) u32 personality; u32 seed_bak; u8 iv; - Pokemon * pokemon; + Pokemon *mon; // We abuse the global RNG for personality value generation, // so back up the overworld state here. seed_bak = GetLCRNGSeed(); InitPartyWithMaxSize(enemies->party[party_id], PARTY_SIZE); data = (TRPOKE *)AllocFromHeap(heap_id, sizeof(TRPOKE) * PARTY_SIZE); - pokemon = AllocMonZeroed(heap_id); + mon = AllocMonZeroed(heap_id); TrainerData_ReadTrPoke(enemies->trainerId[party_id], data); // If a Pokemon's gender ratio is 50/50, the generated Pokemon will be the same @@ -328,7 +328,7 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) // Difficulty is a number between 0 and 250 which directly corresponds // to the (uniform) IV spread of the generated Pokemon. iv = (u8)((monSpecies[i].difficulty * 31) / 255); - CreateMon(pokemon, species, monSpecies[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); + CreateMon(mon, species, monSpecies[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); // If you were treating the trainer type as a bitfield, you'd put the // checks for held item and moves here. You'd also treat the trpoke @@ -336,12 +336,12 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) // Starting in Platinum, enemy trainer could have // personalized ball capsules. - SetTrMonCapsule(monSpecies[i].capsule, pokemon, heap_id); - SetMonData(pokemon, MON_DATA_FORME, &forme); + SetTrMonCapsule(monSpecies[i].capsule, mon, heap_id); + SetMonData(mon, MON_DATA_FORME, &forme); // Starting in HGSS, an AI Pokemon with Frustration // will have minimum friendship. - TrMon_FrustrationCheckAndSetFriendship(pokemon); - AddMonToParty(enemies->party[party_id], pokemon); + TrMon_FrustrationCheckAndSetFriendship(mon); + AddMonToParty(enemies->party[party_id], mon); } break; } @@ -361,14 +361,14 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) } personality = (personality << 8) + pid_gender; iv = (u8)((monSpeciesMoves[i].difficulty * 31) / 255); - CreateMon(pokemon, species, monSpeciesMoves[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); + CreateMon(mon, species, monSpeciesMoves[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); for (j = 0; j < MON_MOVES; j++) { - MonSetMoveInSlot(pokemon, monSpeciesMoves[i].moves[j], (u8)j); + MonSetMoveInSlot(mon, monSpeciesMoves[i].moves[j], (u8)j); } - SetTrMonCapsule(monSpeciesMoves[i].capsule, pokemon, heap_id); - SetMonData(pokemon, MON_DATA_FORME, &forme); - TrMon_FrustrationCheckAndSetFriendship(pokemon); - AddMonToParty(enemies->party[party_id], pokemon); + SetTrMonCapsule(monSpeciesMoves[i].capsule, mon, heap_id); + SetMonData(mon, MON_DATA_FORME, &forme); + TrMon_FrustrationCheckAndSetFriendship(mon); + AddMonToParty(enemies->party[party_id], mon); } break; } @@ -388,12 +388,12 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) } personality = (personality << 8) + pid_gender; iv = (u8)((monSpeciesItem[i].difficulty * 31) / 255); - CreateMon(pokemon, species, monSpeciesItem[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); - SetMonData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItem[i].item); - SetTrMonCapsule(monSpeciesItem[i].capsule, pokemon, heap_id); - SetMonData(pokemon, MON_DATA_FORME, &forme); - TrMon_FrustrationCheckAndSetFriendship(pokemon); - AddMonToParty(enemies->party[party_id], pokemon); + CreateMon(mon, species, monSpeciesItem[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); + SetMonData(mon, MON_DATA_HELD_ITEM, &monSpeciesItem[i].item); + SetTrMonCapsule(monSpeciesItem[i].capsule, mon, heap_id); + SetMonData(mon, MON_DATA_FORME, &forme); + TrMon_FrustrationCheckAndSetFriendship(mon); + AddMonToParty(enemies->party[party_id], mon); } break; } @@ -413,21 +413,21 @@ void CreateNPCTrainerParty(BATTLE_SETUP *enemies, int party_id, HeapID heap_id) } personality = (personality << 8) + pid_gender; iv = (u8)((monSpeciesItemMoves[i].difficulty * 31) / 255); - CreateMon(pokemon, species, monSpeciesItemMoves[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); - SetMonData(pokemon, MON_DATA_HELD_ITEM, &monSpeciesItemMoves[i].item); + CreateMon(mon, species, monSpeciesItemMoves[i].level, iv, TRUE, (s32)personality, OT_ID_RANDOM_NO_SHINY, 0); + SetMonData(mon, MON_DATA_HELD_ITEM, &monSpeciesItemMoves[i].item); for (j = 0; j < MON_MOVES; j++) { - MonSetMoveInSlot(pokemon, monSpeciesItemMoves[i].moves[j], (u8)j); + MonSetMoveInSlot(mon, monSpeciesItemMoves[i].moves[j], (u8)j); } - SetTrMonCapsule(monSpeciesItemMoves[i].capsule, pokemon, heap_id); - SetMonData(pokemon, MON_DATA_FORME, &forme); - TrMon_FrustrationCheckAndSetFriendship(pokemon); - AddMonToParty(enemies->party[party_id], pokemon); + SetTrMonCapsule(monSpeciesItemMoves[i].capsule, mon, heap_id); + SetMonData(mon, MON_DATA_FORME, &forme); + TrMon_FrustrationCheckAndSetFriendship(mon); + AddMonToParty(enemies->party[party_id], mon); } break; } } FreeToHeap(data); - FreeToHeap(pokemon); + FreeToHeap(mon); SetLCRNGSeed(seed_bak); // Restore the RNG state } @@ -451,14 +451,14 @@ void TrMon_OverridePidGender(int species, int forme, int overrideParam, u32 *pid } } -void TrMon_FrustrationCheckAndSetFriendship(Pokemon *pokemon) { +void TrMon_FrustrationCheckAndSetFriendship(Pokemon *mon) { u8 friendship = FRIENDSHIP_MAX; int i; for (i = 0; i < MON_MOVES; i++) { - if (GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL) == MOVE_FRUSTRATION) { + if (GetMonData(mon, MON_DATA_MOVE1 + i, NULL) == MOVE_FRUSTRATION) { friendship = 0; } } - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &friendship); + SetMonData(mon, MON_DATA_FRIENDSHIP, &friendship); } diff --git a/src/unk_02092BE8.c b/src/unk_02092BE8.c index 17a124d1b..251e58a9b 100644 --- a/src/unk_02092BE8.c +++ b/src/unk_02092BE8.c @@ -304,8 +304,8 @@ BOOL sub_020930C4(FieldSystem* sys) { return FALSE; } -BOOL sub_02093134(FieldSystem* sys, Pokemon * pkmn) { - if (sub_0206D8D0(pkmn, sys->savedata) == 0) { +BOOL sub_02093134(FieldSystem* sys, Pokemon *mon) { + if (sub_0206D8D0(mon, sys->savedata) == 0) { return FALSE; } sub_02092E14(Fsys_GetGearPhoneRingManager(sys), 0, 1); diff --git a/src/update_dex_received.c b/src/update_dex_received.c index 32a5c01aa..d7be924e3 100644 --- a/src/update_dex_received.c +++ b/src/update_dex_received.c @@ -5,16 +5,16 @@ #include "constants/pokewalker_courses.h" #include "constants/species.h" -void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *pokemon) { +void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *mon) { BOOL isEgg; u16 species; - isEgg = GetMonData(pokemon, MON_DATA_IS_EGG, NULL); + isEgg = GetMonData(mon, MON_DATA_IS_EGG, NULL); if (!isEgg) { - species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); + species = GetMonData(mon, MON_DATA_SPECIES, NULL); POKEDEX *pokedex = Sav2_Pokedex_get(saveData); GAME_STATS *gameStats = Sav2_GameStats_get(saveData); GameStats_IncSpeciesCaught(gameStats, pokedex, species); - Pokedex_SetMonCaughtFlag(pokedex, pokemon); + Pokedex_SetMonCaughtFlag(pokedex, mon); if (species == SPECIES_JIRACHI) { POKEWALKER *pokeWalker = Sav2_Pokewalker_get(saveData); Pokewalker_UnlockCourse(pokeWalker, WALKER_COURSE_NIGHT_SKY_S_EDGE); diff --git a/src/use_item_on_mon.c b/src/use_item_on_mon.c index b6ce06478..fb4aaf237 100644 --- a/src/use_item_on_mon.c +++ b/src/use_item_on_mon.c @@ -6,7 +6,7 @@ #include "constants/items.h" #include "move.h" -BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapID) { +BOOL CanUseItemOnPokemon(Pokemon *mon, u16 itemID, s32 moveIdx, HeapID heapID) { int atkEv; int defEv; int speedEv; @@ -20,7 +20,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI return FALSE; } - u32 status = GetMonData(pokemon, MON_DATA_STATUS, NULL); + u32 status = GetMonData(mon, MON_DATA_STATUS, NULL); // Sleep if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SLP_HEAL) && (status & MON_STATUS_SLP_MASK)) { FreeToHeap(itemData); @@ -51,55 +51,55 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI return TRUE; } - u32 hp = GetMonData(pokemon, MON_DATA_HP, NULL); + u32 hp = GetMonData(mon, MON_DATA_HP, NULL); if ((GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE_ALL)) && !GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) { if (hp == 0) { FreeToHeap(itemData); return TRUE; } - } else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < GetMonData(pokemon, MON_DATA_MAXHP, NULL)) { + } else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < GetMonData(mon, MON_DATA_MAXHP, NULL)) { FreeToHeap(itemData); return TRUE; } - if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP) && GetMonData(pokemon, MON_DATA_LEVEL, NULL) < MAX_LEVEL) { + if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP) && GetMonData(mon, MON_DATA_LEVEL, NULL) < MAX_LEVEL) { FreeToHeap(itemData); return TRUE; } - if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_EVOLVE) && GetMonEvolution(NULL, pokemon, EVOCTX_ITEM_USE, itemID, NULL) != SPECIES_NONE) { + if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_EVOLVE) && GetMonEvolution(NULL, mon, EVOCTX_ITEM_USE, itemID, NULL) != SPECIES_NONE) { FreeToHeap(itemData); return TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_UP) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_MAX)) { - if (GetMonData(pokemon, MON_DATA_MOVE1PPUP + moveIdx, NULL) < 3 && GetMoveMaxPP(GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL), 0) >= 5) { + if (GetMonData(mon, MON_DATA_MOVE1PPUP + moveIdx, NULL) < 3 && GetMoveMaxPP(GetMonData(mon, MON_DATA_MOVE1 + moveIdx, NULL), 0) >= 5) { FreeToHeap(itemData); return TRUE; } } - if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE) && MonMoveCanRestorePP(pokemon, moveIdx) == TRUE) { + if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE) && MonMoveCanRestorePP(mon, moveIdx) == TRUE) { FreeToHeap(itemData); return TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_ALL)) { for (int i = 0; i < MON_MOVES; i++) { - if (MonMoveCanRestorePP(pokemon, i) == TRUE) { + if (MonMoveCanRestorePP(mon, i) == TRUE) { FreeToHeap(itemData); return TRUE; } } } - hpEv = GetMonData(pokemon, MON_DATA_HP_EV, NULL); - atkEv = GetMonData(pokemon, MON_DATA_ATK_EV, NULL); - defEv = GetMonData(pokemon, MON_DATA_DEF_EV, NULL); - speedEv = GetMonData(pokemon, MON_DATA_SPEED_EV, NULL); - spAtkEv = GetMonData(pokemon, MON_DATA_SPATK_EV, NULL); - spDefEv = GetMonData(pokemon, MON_DATA_SPDEF_EV, NULL); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) { + hpEv = GetMonData(mon, MON_DATA_HP_EV, NULL); + atkEv = GetMonData(mon, MON_DATA_ATK_EV, NULL); + defEv = GetMonData(mon, MON_DATA_DEF_EV, NULL); + speedEv = GetMonData(mon, MON_DATA_SPEED_EV, NULL); + spAtkEv = GetMonData(mon, MON_DATA_SPATK_EV, NULL); + spDefEv = GetMonData(mon, MON_DATA_SPDEF_EV, NULL); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) { int dHpEv = GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP_PARAM); if (dHpEv > 0) { if (hpEv < MAX_EV && (hpEv + atkEv + defEv + speedEv + spAtkEv + spDefEv) < MAX_EV_SUM) { @@ -110,7 +110,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI if (hpEv > 0) { FreeToHeap(itemData); return TRUE; - } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { + } else if (CanItemModFriendship(mon, itemData) == TRUE) { FreeToHeap(itemData); return TRUE; } @@ -128,7 +128,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI if (atkEv > 0) { FreeToHeap(itemData); return TRUE; - } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { + } else if (CanItemModFriendship(mon, itemData) == TRUE) { FreeToHeap(itemData); return TRUE; } @@ -146,7 +146,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI if (defEv > 0) { FreeToHeap(itemData); return TRUE; - } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { + } else if (CanItemModFriendship(mon, itemData) == TRUE) { FreeToHeap(itemData); return TRUE; } @@ -164,7 +164,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI if (speedEv > 0) { FreeToHeap(itemData); return TRUE; - } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { + } else if (CanItemModFriendship(mon, itemData) == TRUE) { FreeToHeap(itemData); return TRUE; } @@ -182,7 +182,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI if (spAtkEv > 0) { FreeToHeap(itemData); return TRUE; - } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { + } else if (CanItemModFriendship(mon, itemData) == TRUE) { FreeToHeap(itemData); return TRUE; } @@ -200,7 +200,7 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI if (spDefEv > 0) { FreeToHeap(itemData); return TRUE; - } else if (CanItemModFriendship(pokemon, itemData) == TRUE) { + } else if (CanItemModFriendship(mon, itemData) == TRUE) { FreeToHeap(itemData); return TRUE; } @@ -212,11 +212,11 @@ BOOL CanUseItemOnPokemon(Pokemon *pokemon, u16 itemID, s32 moveIdx, HeapID heapI } BOOL CanUseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, s32 moveIdx, HeapID heapID) { - Pokemon *pokemon = GetPartyMonByIndex(party, partyIdx); - return CanUseItemOnPokemon(pokemon, itemID, moveIdx, heapID); + Pokemon *mon = GetPartyMonByIndex(party, partyIdx); + return CanUseItemOnPokemon(mon, itemID, moveIdx, heapID); } -BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID) { +BOOL UseItemOnPokemon(Pokemon *mon, u16 itemID, u16 moveIdx, u16 location, HeapID heapID) { s32 stack_data[8]; #define sp70 stack_data[7] #define sp6C stack_data[6] @@ -238,7 +238,7 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H hadEffect = FALSE; effectFound = FALSE; - sp58 = sp54 = GetMonData(pokemon, MON_DATA_STATUS, NULL); + sp58 = sp54 = GetMonData(mon, MON_DATA_STATUS, NULL); if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_SLP_HEAL)) { sp58 &= ~MON_STATUS_SLP_MASK; effectFound = TRUE; @@ -265,34 +265,34 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H } if (sp54 != sp58) { - SetMonData(pokemon, MON_DATA_STATUS, &sp58); + SetMonData(mon, MON_DATA_STATUS, &sp58); hadEffect = TRUE; } - sp54 = GetMonData(pokemon, MON_DATA_HP, NULL); - sp58 = GetMonData(pokemon, MON_DATA_MAXHP, NULL); + sp54 = GetMonData(mon, MON_DATA_HP, NULL); + sp58 = GetMonData(mon, MON_DATA_MAXHP, NULL); if ((GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE_ALL)) && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) { if (sp54 == 0) { - RestoreMonHPBy(pokemon, sp54, sp58, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE_PARAM)); + RestoreMonHPBy(mon, sp54, sp58, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE_PARAM)); hadEffect = TRUE; } effectFound = TRUE; } else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE)) { if (sp54 < sp58) { - RestoreMonHPBy(pokemon, sp54, sp58, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE_PARAM)); + RestoreMonHPBy(mon, sp54, sp58, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE_PARAM)); hadEffect = TRUE; } effectFound = TRUE; } - sp5C = GetMonData(pokemon, MON_DATA_LEVEL, NULL); + sp5C = GetMonData(mon, MON_DATA_LEVEL, NULL); if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) { if (sp5C < MAX_LEVEL) { - AddMonData(pokemon, MON_DATA_EXPERIENCE, CalcMonExpToNextLevel(pokemon)); - CalcMonLevelAndStats(pokemon); + AddMonData(mon, MON_DATA_EXPERIENCE, CalcMonExpToNextLevel(mon)); + CalcMonLevelAndStats(mon); if (sp54 == 0) { - sp60 = GetMonData(pokemon, MON_DATA_MAXHP, NULL); - RestoreMonHPBy(pokemon, sp54, sp60, sp60 - sp58); + sp60 = GetMonData(mon, MON_DATA_MAXHP, NULL); + RestoreMonHPBy(mon, sp54, sp60, sp60 - sp58); } hadEffect = TRUE; } @@ -304,45 +304,45 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_UP)) { - if (BoostMonMovePpUpBy(pokemon, moveIdx, 1) == TRUE) { + if (BoostMonMovePpUpBy(mon, moveIdx, 1) == TRUE) { hadEffect = TRUE; } effectFound = TRUE; } else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_MAX)) { - if (BoostMonMovePpUpBy(pokemon, moveIdx, 3) == TRUE) { + if (BoostMonMovePpUpBy(mon, moveIdx, 3) == TRUE) { hadEffect = TRUE; } effectFound = TRUE; } if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE)) { - if (MonMoveRestorePP(pokemon, moveIdx, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_PARAM)) == 1) { + if (MonMoveRestorePP(mon, moveIdx, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_PARAM)) == 1) { hadEffect = TRUE; } effectFound = TRUE; } else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_ALL)) { sp54 = 0; for (; sp54 < MON_MOVES; sp54++) { - if (MonMoveRestorePP(pokemon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_PARAM)) == 1) { + if (MonMoveRestorePP(mon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_RESTORE_PARAM)) == 1) { hadEffect = TRUE; } } effectFound = TRUE; } - sp54 = GetMonData(pokemon, MON_DATA_HP_EV, NULL); - sp58 = GetMonData(pokemon, MON_DATA_ATK_EV, NULL); - sp5C = GetMonData(pokemon, MON_DATA_DEF_EV, NULL); - sp60 = GetMonData(pokemon, MON_DATA_SPEED_EV, NULL); - sp64 = GetMonData(pokemon, MON_DATA_SPATK_EV, NULL); - sp68 = GetMonData(pokemon, MON_DATA_SPDEF_EV, NULL); - if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA &&GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) { + sp54 = GetMonData(mon, MON_DATA_HP_EV, NULL); + sp58 = GetMonData(mon, MON_DATA_ATK_EV, NULL); + sp5C = GetMonData(mon, MON_DATA_DEF_EV, NULL); + sp60 = GetMonData(mon, MON_DATA_SPEED_EV, NULL); + sp64 = GetMonData(mon, MON_DATA_SPATK_EV, NULL); + sp68 = GetMonData(mon, MON_DATA_SPDEF_EV, NULL); + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_SHEDINJA &&GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP)) { sp70 = GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_EV_UP_PARAM); sp6C = TryModEV(sp54, sp58 + sp5C + sp60 + sp64 + sp68, sp70); if (sp6C != -1) { sp54 = sp6C; - SetMonData(pokemon, MON_DATA_HP_EV, &sp54); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_HP_EV, &sp54); + CalcMonLevelAndStats(mon); hadEffect = TRUE; } @@ -356,8 +356,8 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H sp6C = TryModEV(sp58, sp54 + sp5C + sp60 + sp64 + sp68, sp70); if (sp6C != -1) { sp58 = sp6C; - SetMonData(pokemon, MON_DATA_ATK_EV, &sp58); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_ATK_EV, &sp58); + CalcMonLevelAndStats(mon); hadEffect = TRUE; } @@ -371,8 +371,8 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H sp6C = TryModEV(sp5C, sp54 + sp58 + sp60 + sp64 + sp68, sp70); if (sp6C != -1) { sp5C = sp6C; - SetMonData(pokemon, MON_DATA_DEF_EV, &sp5C); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_DEF_EV, &sp5C); + CalcMonLevelAndStats(mon); hadEffect = TRUE; } @@ -386,8 +386,8 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H sp6C = TryModEV(sp60, sp54 + sp58 + sp5C + sp64 + sp68, sp70); if (sp6C != -1) { sp60 = sp6C; - SetMonData(pokemon, MON_DATA_SPEED_EV, &sp60); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_SPEED_EV, &sp60); + CalcMonLevelAndStats(mon); hadEffect = TRUE; } @@ -401,8 +401,8 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H sp6C = TryModEV(sp64, sp54 + sp58 + sp5C + sp60 + sp68, sp70); if (sp6C != -1) { sp64 = sp6C; - SetMonData(pokemon, MON_DATA_SPATK_EV, &sp64); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_SPATK_EV, &sp64); + CalcMonLevelAndStats(mon); hadEffect = TRUE; } @@ -416,8 +416,8 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H sp6C = TryModEV(sp68, sp54 + sp58 + sp5C + sp60 + sp64, sp70); if (sp6C != -1) { sp68 = sp6C; - SetMonData(pokemon, MON_DATA_SPDEF_EV, &sp68); - CalcMonLevelAndStats(pokemon); + SetMonData(mon, MON_DATA_SPDEF_EV, &sp68); + CalcMonLevelAndStats(mon); hadEffect = TRUE; } @@ -431,25 +431,25 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H return FALSE; } - sp54 = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); + sp54 = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (sp54 < 100) { if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO)) { - ApplyItemEffectOnMonMood(pokemon, itemID); - DoItemFriendshipMod(pokemon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO_PARAM), location, heapID); + ApplyItemEffectOnMonMood(mon, itemID); + DoItemFriendshipMod(mon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_LO_PARAM), location, heapID); FreeToHeap(itemData); return hadEffect; } } else if (sp54 >= 100 && sp54 < 200) { if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_MED)) { - ApplyItemEffectOnMonMood(pokemon, itemID); - DoItemFriendshipMod(pokemon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_MED_PARAM), location, heapID); + ApplyItemEffectOnMonMood(mon, itemID); + DoItemFriendshipMod(mon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_MED_PARAM), location, heapID); FreeToHeap(itemData); return hadEffect; } } else if (sp54 >= 200 && sp54 <= 255) { if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_HI)) { - ApplyItemEffectOnMonMood(pokemon, itemID); - DoItemFriendshipMod(pokemon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_HI_PARAM), location, heapID); + ApplyItemEffectOnMonMood(mon, itemID); + DoItemFriendshipMod(mon, sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_FRIENDSHIP_MOD_HI_PARAM), location, heapID); FreeToHeap(itemData); return hadEffect; } @@ -468,31 +468,31 @@ BOOL UseItemOnPokemon(Pokemon *pokemon, u16 itemID, u16 moveIdx, u16 location, H #undef sp54 BOOL UseItemOnMonInParty(PARTY *party, u16 itemID, s32 partyIdx, u16 moveIdx, u16 location, HeapID heapID) { - Pokemon *pokemon = GetPartyMonByIndex(party, partyIdx); - return UseItemOnPokemon(pokemon, itemID, moveIdx, location, heapID); + Pokemon *mon = GetPartyMonByIndex(party, partyIdx); + return UseItemOnPokemon(mon, itemID, moveIdx, location, heapID); } -BOOL MonMoveCanRestorePP(Pokemon *pokemon, int moveIdx) { - u16 moveID = GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL); +BOOL MonMoveCanRestorePP(Pokemon *mon, int moveIdx) { + u16 moveID = GetMonData(mon, MON_DATA_MOVE1 + moveIdx, NULL); if (moveID == MOVE_NONE) { return FALSE; } - u8 pp = GetMonData(pokemon, MON_DATA_MOVE1PP + moveIdx, NULL); - u8 ppUp = GetMonData(pokemon, MON_DATA_MOVE1PPUP + moveIdx, NULL); + u8 pp = GetMonData(mon, MON_DATA_MOVE1PP + moveIdx, NULL); + u8 ppUp = GetMonData(mon, MON_DATA_MOVE1PPUP + moveIdx, NULL); return (u8)(pp < GetMoveMaxPP(moveID, ppUp)); } -BOOL MonMoveRestorePP(Pokemon *pokemon, int moveIdx, int ppRestore) { - u16 move_id = GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL); +BOOL MonMoveRestorePP(Pokemon *mon, int moveIdx, int ppRestore) { + u16 move_id = GetMonData(mon, MON_DATA_MOVE1 + moveIdx, NULL); if (move_id == MOVE_NONE) { return FALSE; } int ppAttr = MON_DATA_MOVE1PP + moveIdx; - u8 pp = GetMonData(pokemon, ppAttr, NULL); + u8 pp = GetMonData(mon, ppAttr, NULL); int ppUpAttr = MON_DATA_MOVE1PPUP + moveIdx; - u8 maxPp = GetMoveMaxPP(move_id, GetMonData(pokemon, ppUpAttr, NULL)); + u8 maxPp = GetMoveMaxPP(move_id, GetMonData(mon, ppUpAttr, NULL)); if (pp < maxPp) { if (ppRestore == PP_RESTORE_ALL) { pp = maxPp; @@ -502,29 +502,29 @@ BOOL MonMoveRestorePP(Pokemon *pokemon, int moveIdx, int ppRestore) { pp = maxPp; } } - SetMonData(pokemon, ppAttr, &pp); + SetMonData(mon, ppAttr, &pp); return TRUE; } return FALSE; } -BOOL BoostMonMovePpUpBy(Pokemon *pokemon, int moveIdx, int nPpUp) { +BOOL BoostMonMovePpUpBy(Pokemon *mon, int moveIdx, int nPpUp) { u16 move; u8 pp; int ppUpAttr = MON_DATA_MOVE1PPUP + moveIdx; - u8 ppUp = GetMonData(pokemon, ppUpAttr, NULL); + u8 ppUp = GetMonData(mon, ppUpAttr, NULL); if (ppUp == 3) { return FALSE; } - move = GetMonData(pokemon, MON_DATA_MOVE1 + moveIdx, NULL); + move = GetMonData(mon, MON_DATA_MOVE1 + moveIdx, NULL); if (GetMoveMaxPP(move, 0) < 5) { return FALSE; } int ppAttr = MON_DATA_MOVE1PP + moveIdx; - pp = GetMonData(pokemon, ppAttr, NULL); + pp = GetMonData(mon, ppAttr, NULL); u8 maxPp = GetMoveMaxPP(move, ppUp); if ((u32)(ppUp + nPpUp) > 3) { ppUp = 3; @@ -534,13 +534,13 @@ BOOL BoostMonMovePpUpBy(Pokemon *pokemon, int moveIdx, int nPpUp) { u8 newMaxPp = GetMoveMaxPP(move, ppUp); pp = pp + newMaxPp - maxPp; - SetMonData(pokemon, ppUpAttr, &ppUp); - SetMonData(pokemon, ppAttr, &pp); + SetMonData(mon, ppUpAttr, &ppUp); + SetMonData(mon, ppAttr, &pp); return TRUE; } -void RestoreMonHPBy(Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration) { +void RestoreMonHPBy(Pokemon *mon, u32 hp, u32 maxHp, u32 restoration) { if (maxHp == 1) { restoration = 1; } else if (restoration == HP_RESTORE_ALL) { @@ -557,7 +557,7 @@ void RestoreMonHPBy(Pokemon *pokemon, u32 hp, u32 maxHp, u32 restoration) { hp = hp + restoration; } - SetMonData(pokemon, MON_DATA_HP, &hp); + SetMonData(mon, MON_DATA_HP, &hp); } s32 TryModEV(s32 ev, s32 evSum, s32 by) { @@ -587,8 +587,8 @@ s32 TryModEV(s32 ev, s32 evSum, s32 by) { return ev; } -BOOL CanItemModFriendship(Pokemon *pokemon, ITEMDATA *itemData) { - s32 friendship = GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); +BOOL CanItemModFriendship(Pokemon *mon, ITEMDATA *itemData) { + s32 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendship >= 255) { return FALSE; } @@ -608,7 +608,7 @@ BOOL CanItemModFriendship(Pokemon *pokemon, ITEMDATA *itemData) { return FALSE; } -BOOL DoItemFriendshipMod(Pokemon *pokemon, s32 friendship, s32 mod, u16 location, HeapID heapID) { +BOOL DoItemFriendshipMod(Pokemon *mon, s32 friendship, s32 mod, u16 location, HeapID heapID) { if (friendship == 255 && mod > 0) { return FALSE; } @@ -618,15 +618,15 @@ BOOL DoItemFriendshipMod(Pokemon *pokemon, s32 friendship, s32 mod, u16 location } if (mod > 0) { - if (GetMonData(pokemon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) { + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) { mod++; } - if (location == GetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, NULL)) { + if (location == GetMonData(mon, MON_DATA_EGG_MET_LOCATION, NULL)) { mod++; } - if (GetItemAttr(GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, heapID) == HOLD_EFFECT_FRIENDSHIP_UP) { + if (GetItemAttr(GetMonData(mon, MON_DATA_HELD_ITEM, NULL), ITEMATTR_HOLD_EFFECT, heapID) == HOLD_EFFECT_FRIENDSHIP_UP) { mod = mod * 150 / 100; } } @@ -640,7 +640,7 @@ BOOL DoItemFriendshipMod(Pokemon *pokemon, s32 friendship, s32 mod, u16 location mod = 0; } - SetMonData(pokemon, MON_DATA_FRIENDSHIP, &mod); + SetMonData(mon, MON_DATA_FRIENDSHIP, &mod); return TRUE; } @@ -649,17 +649,17 @@ void HealParty(PARTY * party) { int partyCount = GetPartyCount(party); for (i = 0; i < partyCount; i++) { - Pokemon *pokemon = GetPartyMonByIndex(party, i); - if (GetMonData(pokemon, MON_DATA_SPECIES_EXISTS, NULL)) { - u32 sp8 = GetMonData(pokemon, MON_DATA_MAXHP, NULL); - SetMonData(pokemon, MON_DATA_HP, &sp8); + Pokemon *mon = GetPartyMonByIndex(party, i); + if (GetMonData(mon, MON_DATA_SPECIES_EXISTS, NULL)) { + u32 sp8 = GetMonData(mon, MON_DATA_MAXHP, NULL); + SetMonData(mon, MON_DATA_HP, &sp8); sp8 = 0; - SetMonData(pokemon, MON_DATA_STATUS, &sp8); + SetMonData(mon, MON_DATA_STATUS, &sp8); for (j = 0; j < MON_MOVES; j++) { - if (MonMoveCanRestorePP(pokemon, j) == 1) { - MonMoveRestorePP(pokemon, j, PP_RESTORE_ALL); + if (MonMoveCanRestorePP(mon, j) == 1) { + MonMoveRestorePP(mon, j, PP_RESTORE_ALL); } } } From 053f6d6d80b0caf88c47e4c46bbd01356266ab5d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 17 Feb 2023 22:01:10 -0300 Subject: [PATCH 4/7] Renamed BOXMON to BoxPokemon --- include/daycare.h | 4 +- include/msgfmt.h | 8 +-- include/pokemon.h | 88 +++++++++++------------ include/pokemon_icon_idx.h | 4 +- include/pokemon_storage_system.h | 10 +-- include/pokemon_types_def.h | 6 +- include/pokewalker.h | 6 +- include/trade_anim.h | 4 +- include/unk_02078834.h | 2 +- src/daycare.c | 2 +- src/get_egg.c | 56 +++++++-------- src/msgfmt.c | 8 +-- src/pokemon.c | 118 +++++++++++++++---------------- src/pokemon_icon_idx.c | 8 +-- src/pokemon_storage_system.c | 12 ++-- src/pokewalker.c | 16 ++--- src/scrcmd_c.c | 6 +- src/scrcmd_daycare.c | 2 +- src/scrcmd_lottery.c | 2 +- src/scrcmd_strbuf.c | 2 +- 20 files changed, 182 insertions(+), 182 deletions(-) diff --git a/include/daycare.h b/include/daycare.h index 1226bce5e..0b3b482cd 100644 --- a/include/daycare.h +++ b/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); diff --git a/include/msgfmt.h b/include/msgfmt.h index 542b89348..320049327 100644 --- a/include/msgfmt.h +++ b/include/msgfmt.h @@ -39,10 +39,10 @@ void ScrStrBufs_InitSub(MSGFMT_FIELD *field); void SetStringAsPlaceholder(MSGFMT *msgFmt, u32 fieldno, const STRING *string, const MSGFMT_FIELD_ATTRS *attrs); void BufferRivalsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData); void BufferFriendsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData); -void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); -void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon); +void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); +void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); +void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); +void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); void BufferMoveName(MSGFMT *msgFmt, u32 fieldno, u32 moveId); void BufferRibbonNameOrDesc(MSGFMT *msgFmt, u32 fieldno, u32 decoId); void BufferAbilityName(MSGFMT *msgFmt, u32 fieldno, u32 abilityId); diff --git a/include/pokemon.h b/include/pokemon.h index cd3c68333..aa1a53b5d 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -29,15 +29,15 @@ 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 * mon); +BOOL ReleaseBoxMonLock(BoxPokemon * mon, 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 * boxPokemon, 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); @@ -45,11 +45,11 @@ void CreateMonWithFixedIVs(Pokemon *mon, int species, int level, int ivs, int pe 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,52 +58,52 @@ 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 * pokemon); 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); @@ -111,47 +111,47 @@ 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 *pokemon, 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 diff --git a/include/pokemon_icon_idx.h b/include/pokemon_icon_idx.h index a375a567c..407fc7844 100644 --- a/include/pokemon_icon_idx.h +++ b/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); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 83cb5943d..5cbb90751 100644 --- a/include/pokemon_storage_system.h +++ b/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<mons[i]; } -BOXMON* DayCareMon_GetBoxMon(DAYCAREMON* dcmon) { +BoxPokemon* DayCareMon_GetBoxMon(DAYCAREMON* dcmon) { return &dcmon->mon; } diff --git a/src/get_egg.c b/src/get_egg.c index cc6bc7fc8..3ad70b61d 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -23,23 +23,23 @@ static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON static void Sav2_DayCare_Compaction(DAYCARE *daycare); static void Daycare_LearnLevelUpMoves(Pokemon *mon); static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt); -static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps); +static int GetDayCareUpdatedLevel(BoxPokemon *boxmon, u32 steps); static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *msgFmt); static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MSGFMT *msgFmt); -static void Daycare_GetBothBoxMonsPtr(DAYCARE *dayCare, BOXMON **boxmons); +static void Daycare_GetBothBoxMonsPtr(DAYCARE *dayCare, BoxPokemon **boxmons); static int Daycare_EverstoneCheck(DAYCARE *dayCare); static void GenerateEggPID(DAYCARE *dayCare); static void _IVList_Remove(u8 *ptr, int idx); static void InheritIVs(Pokemon *egg, DAYCARE *dayCare); static u8 LoadEggMoves(Pokemon *mon, u16 *dest); -static void InheritMoves(Pokemon *egg, BOXMON *dad, BOXMON *mom); +static void InheritMoves(Pokemon *egg, BoxPokemon *dad, BoxPokemon *mom); static u16 Daycare_BreedingIncenseCheck(u16 species, DAYCARE *dayCare); static void Daycare_LightBallCheck(Pokemon *egg, DAYCARE *dayCare); static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx); static void SetBreedEggStats(Pokemon *mon, u16 species, DAYCARE *dayCare, u32 otId, u8 forme); static u8 GetEggCyclesToSubtract(PARTY *party); static BOOL sub_0206CB88(const u16 *a0, const u16 *a1); -static u8 ComputeCompatibilityBetweenBoxMons(BOXMON **parents); +static u8 ComputeCompatibilityBetweenBoxMons(BoxPokemon **parents); static u8 Sav2_DayCare_CalcCompatibilityInternal(DAYCARE *dayCare); static u8 sub_0206CCD8(FieldSystem *fsys); static u8 ConvertDayCareCompatibilityScore(u32 compatibility); @@ -47,7 +47,7 @@ static void sub_0206D038(Pokemon *mon, HeapID heapId); static BOOL DayCare_TryGetForcedInheritedIV(DAYCARE *dayCare, u8 *a1, u8 *a2); static BOOL PowerItemIdToInheritedIvIdx(u16 itemId, u8 *a1); -BOXMON *Daycare_GetBoxMonI(DAYCARE *daycare, int idx) { +BoxPokemon *Daycare_GetBoxMonI(DAYCARE *daycare, int idx) { return DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, idx)); } @@ -83,7 +83,7 @@ static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DAYCAREMON u16 nickname[POKEMON_NAME_LENGTH + 1]; u8 mood; DAYCAREMAIL *daycareMail; - BOXMON *boxmon; + BoxPokemon *boxmon; Pokemon *partyMon; const u16 *playerNamePtr; @@ -114,8 +114,8 @@ void Sav2_DayCare_PutMonIn(PARTY *party, u8 partyIdx, DAYCARE *dayCare, SAVEDATA static void Sav2_DayCare_Compaction(DAYCARE *daycare) { DAYCAREMON *mon1; DAYCAREMON *mon2; - BOXMON *boxmon1; - BOXMON *boxmon2; + BoxPokemon *boxmon1; + BoxPokemon *boxmon2; mon1 = Sav2_DayCare_GetMonX(daycare, 0); mon2 = Sav2_DayCare_GetMonX(daycare, 1); @@ -155,7 +155,7 @@ static void Daycare_LearnLevelUpMoves(Pokemon *mon) { static int Sav2_DayCare_MoveMonToParty(PARTY *party, DAYCAREMON *daycareMon, MSGFMT *msgFmt) { u32 exp; Pokemon *mon; - BOXMON *boxmon; + BoxPokemon *boxmon; DAYCAREMAIL *daycareMail; u16 species; @@ -191,9 +191,9 @@ u16 Sav2_DayCare_RetrieveMon(PARTY *party, MSGFMT *msgFmt, DAYCARE *daycare, u8 return ret; } -static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps) { +static int GetDayCareUpdatedLevel(BoxPokemon *boxmon, u32 steps) { Pokemon *tmpMon; - BOXMON *boxmon_tmp; + BoxPokemon *boxmon_tmp; u32 exp; u32 level; @@ -209,7 +209,7 @@ static int GetDayCareUpdatedLevel(BOXMON *boxmon, u32 steps) { } int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon) { - BOXMON *boxmon; + BoxPokemon *boxmon; u8 cur_level; u8 new_level; @@ -220,7 +220,7 @@ int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon) { } static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *msgFmt) { - BOXMON *boxmon; + BoxPokemon *boxmon; int levelGrowth; boxmon = DayCareMon_GetBoxMon(daycareMon); @@ -231,7 +231,7 @@ static u8 DayCareMon_BufferLevelGrowthAndNick(DAYCAREMON *daycareMon, MSGFMT *ms } static u16 DayCareMon_BufferNickAndRetrievalPrice(DAYCAREMON *daycareMon, MSGFMT *msgFmt) { - BOXMON *boxmon; + BoxPokemon *boxmon; u16 levelGrowth; u16 price; boxmon = DayCareMon_GetBoxMon(daycareMon); @@ -257,13 +257,13 @@ u8 Sav2_DayCare_BufferGrowthAndNick(DAYCARE *dayCare, u32 slot, MSGFMT *msgFmt) } } -static void Daycare_GetBothBoxMonsPtr(DAYCARE *dayCare, BOXMON **boxmons) { +static void Daycare_GetBothBoxMonsPtr(DAYCARE *dayCare, BoxPokemon **boxmons) { boxmons[0] = Daycare_GetBoxMonI(dayCare, 0); boxmons[1] = Daycare_GetBoxMonI(dayCare, 1); } static int Daycare_EverstoneCheck(DAYCARE *dayCare) { - BOXMON *boxmons[2]; + BoxPokemon *boxmons[2]; int i; u8 everstone_idx; u8 num_everstones; @@ -351,7 +351,7 @@ static void InheritIVs(Pokemon *egg, DAYCARE *dayCare) { u8 i; u8 r6; u8 j; - BOXMON *boxmon; + BoxPokemon *boxmon; for (i = 0; i < 6; i++) { spA[i] = i; @@ -444,7 +444,7 @@ struct EggMoveSearch { u16 baby_egg_moves[16]; }; -static void InheritMoves(Pokemon *egg, BOXMON *dad, BOXMON *mom) { +static void InheritMoves(Pokemon *egg, BoxPokemon *dad, BoxPokemon *mom) { u16 sp1C; u16 egg_species; u16 learnset_size; @@ -539,7 +539,7 @@ static const u16 _020FF4AE[][3] = { }; static u16 Daycare_BreedingIncenseCheck(u16 species, DAYCARE *dayCare) { - BOXMON *parents[2]; + BoxPokemon *parents[2]; u16 i; u16 row_ndx; u16 item1, item2; @@ -563,7 +563,7 @@ static u16 Daycare_BreedingIncenseCheck(u16 species, DAYCARE *dayCare) { } static void Daycare_LightBallCheck(Pokemon *egg, DAYCARE *dayCare) { - BOXMON *parents[2]; + BoxPokemon *parents[2]; int item1, item2; Daycare_GetBothBoxMonsPtr(dayCare, parents); @@ -583,7 +583,7 @@ static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx) { u16 mom; u16 pms; u16 swp; - BOXMON *parents[2]; + BoxPokemon *parents[2]; Daycare_GetBothBoxMonsPtr(dayCare, parents); for (i = 0; i < 2; i++) { @@ -751,7 +751,7 @@ static BOOL sub_0206CB88(const u16 *a0, const u16 *a1) { return FALSE; } -static u8 ComputeCompatibilityBetweenBoxMons(BOXMON **parents) { +static u8 ComputeCompatibilityBetweenBoxMons(BoxPokemon **parents) { u16 eggGroups[2][2]; u16 species[2]; u32 otIds[2]; @@ -811,7 +811,7 @@ static u8 ComputeCompatibilityBetweenBoxMons(BOXMON **parents) { } static u8 Sav2_DayCare_CalcCompatibilityInternal(DAYCARE *dayCare) { - BOXMON *parents[2]; + BoxPokemon *parents[2]; Daycare_GetBothBoxMonsPtr(dayCare, parents); return ComputeCompatibilityBetweenBoxMons(parents); } @@ -851,7 +851,7 @@ static u8 sub_0206CCD8(FieldSystem *fsys) { BOOL HandleDayCareStep(DAYCARE *dayCare, PARTY *party, FieldSystem *fsys) { u32 friendship; - BOXMON *parents[2]; + BoxPokemon *parents[2]; int cycle_ctr; u32 i, n; u8 steps; @@ -918,7 +918,7 @@ Pokemon *sub_0206CE44(PARTY *party) { } void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt) { - BOXMON *parents[2]; + BoxPokemon *parents[2]; Daycare_GetBothBoxMonsPtr(dayCare, parents); if (GetBoxMonData(parents[0], MON_DATA_SPECIES, NULL)) { @@ -932,7 +932,7 @@ void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt) { void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MSGFMT *msgFmt) { DAYCAREMON *daycareMon; - BOXMON *boxmon; + BoxPokemon *boxmon; u8 level; u8 gender; u16 species; @@ -955,8 +955,8 @@ void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_i } u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MSGFMT *msgFmt) { - BOXMON *mon1; - BOXMON *mon2; + BoxPokemon *mon1; + BoxPokemon *mon2; u16 species1; u16 species2; diff --git a/src/msgfmt.c b/src/msgfmt.c index e68939c1b..c9a525e23 100644 --- a/src/msgfmt.c +++ b/src/msgfmt.c @@ -122,11 +122,11 @@ void BufferSpeciesName(MSGFMT *msgFmt, u32 fieldno, u16 species) { DestroyMsgData(msgData); } -void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { BufferSpeciesName(msgFmt, fieldno, GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL)); } -void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { BufferSpeciesNameWithArticle(msgFmt, fieldno, GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL)); } @@ -137,12 +137,12 @@ void BufferSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 species) { DestroyMsgData(msgData); } -void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { GetBoxMonData(boxmon, MON_DATA_NICKNAME_3, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BOXMON *boxmon) { +void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } diff --git a/src/pokemon.c b/src/pokemon.c index aabbf523d..d7e91f374 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -24,33 +24,33 @@ void MonEncryptSegment(void *data, u32 size, u32 key); void MonDecryptSegment(void *data, u32 size, u32 key); u32 CalcMonChecksum(void *data, u32 size); -void InitBoxMonMoveset(BOXMON *boxmon); +void InitBoxMonMoveset(BoxPokemon *boxmon); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *dest); u16 ModifyStatByNature(u8 nature, u16 stat, u8 statID); static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest); -static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest); +static u32 GetBoxMonDataInternal(BoxPokemon * boxmon, int attr, void * dest); static void SetMonDataInternal(Pokemon *mon, int attr, const void * data); -static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * data); +static void SetBoxMonDataInternal(BoxPokemon * boxmon, int attr, const void * data); static void AddMonDataInternal(Pokemon *mon, int attr, int value); -static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value); -PokemonDataBlock *GetSubstruct(BOXMON *boxmon, u32 pid, u8 which_struct); +static void AddBoxMonDataInternal(BoxPokemon * boxmon, int attr, int value); +PokemonDataBlock *GetSubstruct(BoxPokemon *boxmon, u32 pid, u8 which_struct); void LoadMonPersonal(int species, BASE_STATS *dest); int ResolveMonForme(int species, int forme); u8 GetGenderBySpeciesAndPersonality_PreloadedPersonal(const BASE_STATS *personal, u16 species, u32 pid); u32 MaskOfFlagNo(int flagno); -void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BOXMON *boxmon, u8 whichFacing, BOOL a3); +void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxmon, u8 whichFacing, BOOL a3); void DP_GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct *a0, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 pid); void GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct *a0, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 pid); u8 sub_02070438(u16 species, u8 forme); -u8 sub_02070854(BOXMON *boxmon, u8 whichFacing, BOOL a2); +u8 sub_02070854(BoxPokemon *boxmon, u8 whichFacing, BOOL a2); u8 sub_02070A64(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid); u8 sub_020708D8(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid); void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C *a3); int TrainerClassToBackpicID(int trainer_class, int a1); void LoadMonEvolutionTable(u16 species, struct Evolution *evoTable); BOOL MonHasMove(Pokemon *mon, u16 move_id); -void sub_0207213C(BOXMON *boxmon, PLAYERPROFILE *playerProfile, 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_0207213C(BoxPokemon *boxmon, PLAYERPROFILE *playerProfile, 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); #define ENCRY_ARGS_PTY(mon) (u16 *)&(mon)->party, sizeof((mon)->party), (mon)->box.pid #define ENCRY_ARGS_BOX(boxmon) (u16 *)&(boxmon)->substructs, sizeof((boxmon)->substructs), (boxmon)->checksum @@ -101,8 +101,8 @@ void ZeroMonData(Pokemon *mon) { ENCRYPT_PTY(mon); } -void ZeroBoxMonData(BOXMON *boxmon) { - MI_CpuClearFast(boxmon, sizeof(BOXMON)); +void ZeroBoxMonData(BoxPokemon *boxmon) { + MI_CpuClearFast(boxmon, sizeof(BoxPokemon)); ENCRYPT_BOX(boxmon); } @@ -142,7 +142,7 @@ BOOL ReleaseMonLock(Pokemon *mon, BOOL locked) { return prev; } -BOOL AcquireBoxMonLock(BOXMON *boxmon) { +BOOL AcquireBoxMonLock(BoxPokemon *boxmon) { BOOL locked = FALSE; if (!boxmon->box_lock) { locked = TRUE; @@ -152,7 +152,7 @@ BOOL AcquireBoxMonLock(BOXMON *boxmon) { return locked; } -BOOL ReleaseBoxMonLock(BOXMON *boxmon, BOOL locked) { +BOOL ReleaseBoxMonLock(BoxPokemon *boxmon, BOOL locked) { BOOL prev = FALSE; if (boxmon->box_lock == TRUE && locked == TRUE) { prev = TRUE; @@ -182,7 +182,7 @@ void CreateMon(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPe CalcMonLevelAndStats(mon); } -void CreateBoxMon(BOXMON * boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { +void CreateBoxMon(BoxPokemon * boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { BOOL decry; u32 exp; u32 iv; @@ -457,7 +457,7 @@ static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest) { } } -u32 GetBoxMonData(BOXMON * boxmon, int attr, void * dest) { +u32 GetBoxMonData(BoxPokemon * boxmon, int attr, void * dest) { u32 ret; u32 checksum; if (!boxmon->box_lock) { @@ -475,7 +475,7 @@ u32 GetBoxMonData(BOXMON * boxmon, int attr, void * dest) { return ret; } -static u32 GetBoxMonDataInternal(BOXMON * boxmon, int attr, void * dest) { +static u32 GetBoxMonDataInternal(BoxPokemon * boxmon, int attr, void * dest) { u32 ret = 0; PokemonDataBlockA * blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; PokemonDataBlockB * blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; @@ -954,7 +954,7 @@ static void SetMonDataInternal(Pokemon *mon, int attr, const void * value) { #undef VALUE } -void SetBoxMonData(BOXMON * boxmon, int attr, void * value) { +void SetBoxMonData(BoxPokemon * boxmon, int attr, void * value) { u32 checksum; if (!boxmon->box_lock) { DECRYPT_BOX(boxmon); @@ -974,7 +974,7 @@ void SetBoxMonData(BOXMON * boxmon, int attr, void * value) { } -static void SetBoxMonDataInternal(BOXMON * boxmon, int attr, const void * value) { +static void SetBoxMonDataInternal(BoxPokemon * boxmon, int attr, const void * value) { #define VALUE(type) (*(const type *)value) u8 flag; u64 mask; @@ -1403,7 +1403,7 @@ static void AddMonDataInternal(Pokemon *mon, int attr, int value) { } } -static void AddBoxMonDataInternal(BOXMON * boxmon, int attr, int value) { +static void AddBoxMonDataInternal(BoxPokemon * boxmon, int attr, int value) { PokemonDataBlockA *blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; PokemonDataBlockB *blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; PokemonDataBlockC *blockC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; @@ -1882,7 +1882,7 @@ u32 CalcMonExpToNextLevel(Pokemon *mon) { return CalcBoxMonExpToNextLevel(&mon->box); } -u32 CalcBoxMonExpToNextLevel(BOXMON * boxmon) { +u32 CalcBoxMonExpToNextLevel(BoxPokemon * boxmon) { u16 species = (u16)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); u16 level = (u16)(CalcBoxMonLevel(boxmon) + 1); u32 cur = GetBoxMonData(boxmon, MON_DATA_EXPERIENCE, NULL); @@ -1921,7 +1921,7 @@ int CalcMonLevel(Pokemon *mon) { return CalcBoxMonLevel(&mon->box); } -int CalcBoxMonLevel(BOXMON * boxmon) { +int CalcBoxMonLevel(BoxPokemon * boxmon) { BOOL decry = AcquireBoxMonLock(boxmon); int species = (int)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); int exp = (int)GetBoxMonData(boxmon, MON_DATA_EXPERIENCE, NULL); @@ -1954,7 +1954,7 @@ u8 GetMonNature(Pokemon *mon) { return GetBoxMonNature(&mon->box); } -u8 GetBoxMonNature(BOXMON * boxmon) { +u8 GetBoxMonNature(BoxPokemon * boxmon) { BOOL decry = AcquireBoxMonLock(boxmon); u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); ReleaseBoxMonLock(boxmon, decry); @@ -2072,7 +2072,7 @@ u8 GetMonGender(Pokemon *mon) { return GetBoxMonGender(&mon->box); } -u8 GetBoxMonGender(BOXMON *boxmon) { +u8 GetBoxMonGender(BoxPokemon *boxmon) { BOOL decry = AcquireBoxMonLock(boxmon); u16 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); @@ -2108,7 +2108,7 @@ u8 GetGenderBySpeciesAndPersonality_PreloadedPersonal(const BASE_STATS *personal } } -BOOL BoxMonIsHoldingMail(BOXMON *boxmon) { +BOOL BoxMonIsHoldingMail(BoxPokemon *boxmon) { return ItemIdIsMail(GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL)); } @@ -2116,7 +2116,7 @@ u8 MonIsShiny(Pokemon *mon) { return BoxMonIsShiny(&mon->box); } -u8 BoxMonIsShiny(BOXMON *boxmon) { +u8 BoxMonIsShiny(BoxPokemon *boxmon) { u32 otid = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); return CalcShininessByOtIdAndPersonality(otid, pid); @@ -2148,15 +2148,15 @@ u32 GenerateShinyPersonality(u32 otid) { return (u32)((r5 << 16) | r6); } -void GetPokemonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BOXMON *boxmon, u8 whichFacing) { +void GetPokemonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxmon, u8 whichFacing) { GetBoxmonSpriteCharAndPlttNarcIds(a0, boxmon, whichFacing, FALSE); } -void sub_02070130(struct SomeDrawPokemonStruct *a0, BOXMON *boxmon, u8 whichFacing) { +void sub_02070130(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxmon, u8 whichFacing) { GetBoxmonSpriteCharAndPlttNarcIds(a0, boxmon, whichFacing, TRUE); } -void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BOXMON *boxmon, u8 whichFacing, BOOL sp14) { +void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BoxPokemon *boxmon, u8 whichFacing, BOOL sp14) { BOOL decry = AcquireBoxMonLock(boxmon); u16 species = GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL); u8 gender = GetBoxMonGender(boxmon); @@ -2466,15 +2466,15 @@ void DP_GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct * spC, u16 } } -u8 sub_0207083C(BOXMON *boxmon, u8 whichFacing) { +u8 sub_0207083C(BoxPokemon *boxmon, u8 whichFacing) { return sub_02070854(boxmon, whichFacing, FALSE); } -u8 sub_02070848(BOXMON *boxmon, u8 whichFacing) { +u8 sub_02070848(BoxPokemon *boxmon, u8 whichFacing) { return sub_02070854(boxmon, whichFacing, TRUE); } -u8 sub_02070854(BOXMON *boxmon, u8 whichFacing, BOOL a2) { +u8 sub_02070854(BoxPokemon *boxmon, u8 whichFacing, BOOL a2) { u16 species = GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL); u8 gender = GetBoxMonGender(boxmon); u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); @@ -2750,18 +2750,18 @@ u32 sub_02070D90(void) { } u32 sub_02070D94(void) { - return sizeof(BOXMON); + return sizeof(BoxPokemon); } u8 GetMonUnownLetter(Pokemon *mon) { return GetBoxMonUnownLetter(&mon->box); } -u8 GetBoxMonUnownLetter(BOXMON * boxmon) { +u8 GetBoxMonUnownLetter(BoxPokemon * boxmon) { return (u8)GetBoxMonData(boxmon, MON_DATA_FORME, NULL); } -BOXMON * Mon_GetBoxMon(Pokemon *mon) { +BoxPokemon * Mon_GetBoxMon(Pokemon *mon) { return &mon->box; } @@ -3037,7 +3037,7 @@ u16 GetEggSpecies(u16 species) { } } -void InitBoxMonMoveset(BOXMON * boxmon) { +void InitBoxMonMoveset(BoxPokemon * boxmon) { BOOL decry; u16 * wotbl; int i; @@ -3066,7 +3066,7 @@ u32 TryAppendMonMove(Pokemon *mon, u16 move) { return TryAppendBoxMonMove(Mon_GetBoxMon(mon), move); } -u32 TryAppendBoxMonMove(BOXMON *boxmon, u16 move) { +u32 TryAppendBoxMonMove(BoxPokemon *boxmon, u16 move) { u32 ret = MOVE_APPEND_FULL; int i; BOOL decry = AcquireBoxMonLock(boxmon); @@ -3091,7 +3091,7 @@ void DeleteMonFirstMoveAndAppend(Pokemon *mon, u16 move_id) { DeleteBoxMonFirstMoveAndAppend(Mon_GetBoxMon(mon), move_id); } -void DeleteBoxMonFirstMoveAndAppend(BOXMON * boxmon, u16 move) { +void DeleteBoxMonFirstMoveAndAppend(BoxPokemon * boxmon, u16 move) { BOOL decry = AcquireBoxMonLock(boxmon); int i; u16 moves[4]; @@ -3132,7 +3132,7 @@ void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot) { BoxMonSetMoveInSlot(&mon->box, move, slot); } -void BoxMonSetMoveInSlot(BOXMON* boxmon, u16 move, u8 slot) { +void BoxMonSetMoveInSlot(BoxPokemon* boxmon, u16 move, u8 slot) { u8 ppUp; u8 pp; @@ -3174,7 +3174,7 @@ void MonSwapMoves(Pokemon *mon, int a, int b) { BoxMonSwapMoves(&mon->box, a, b); } -void BoxMonSwapMoves(BOXMON * boxmon, int slot1, int slot2) { +void BoxMonSwapMoves(BoxPokemon * boxmon, int slot1, int slot2) { u16 moves[2]; u8 pp[2]; u8 ppUp[2]; @@ -3228,7 +3228,7 @@ BOOL MonHasMove(Pokemon *mon, u16 move) { } } -void CopyBoxPokemonToPokemon(const BOXMON * src, Pokemon *dest) { +void CopyBoxPokemonToPokemon(const BoxPokemon * src, Pokemon *dest) { u32 sp0 = 0; CAPSULE sp4; struct Mail * mail; @@ -3278,11 +3278,11 @@ void CopyPokemonToPokemon(const Pokemon *src, Pokemon *dest) { *dest = *src; } -void CopyBoxPokemonToBoxPokemon(const BOXMON *src, BOXMON *dest) { +void CopyBoxPokemonToBoxPokemon(const BoxPokemon *src, BoxPokemon *dest) { *dest = *src; } -void CopyPokemonToBoxPokemon(const Pokemon *src, BOXMON *dest) { +void CopyPokemonToBoxPokemon(const Pokemon *src, BoxPokemon *dest) { *dest = src->box; } @@ -3290,7 +3290,7 @@ s8 MonGetFlavorPreference(Pokemon *mon, int flavor) { return BoxMonGetFlavorPreference(&mon->box, flavor); } -s8 BoxMonGetFlavorPreference(BOXMON * boxmon, int flavor) { +s8 BoxMonGetFlavorPreference(BoxPokemon * boxmon, int flavor) { u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); return GetFlavorPreferenceFromPID(personality, flavor); } @@ -3422,7 +3422,7 @@ BOOL Pokemon_HasPokerus(Pokemon *mon) { return BoxMon_HasPokerus(&mon->box); } -BOOL BoxMon_HasPokerus(BOXMON * boxmon) { +BOOL BoxMon_HasPokerus(BoxPokemon * boxmon) { return (GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL) & 0xF) != 0; } @@ -3430,7 +3430,7 @@ BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon) { return BoxMon_IsImmuneToPokerus(&mon->box); } -BOOL BoxMon_IsImmuneToPokerus(BOXMON * boxmon) { +BOOL BoxMon_IsImmuneToPokerus(BoxPokemon * boxmon) { u8 pokerus = (u8)GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL); if (pokerus & 0xF) { return FALSE; @@ -3445,7 +3445,7 @@ void Pokemon_UpdateArceusForme(Pokemon *mon) { BoxMon_UpdateArceusForme(&mon->box); } -void BoxMon_UpdateArceusForme(BOXMON * boxmon) { +void BoxMon_UpdateArceusForme(BoxPokemon * boxmon) { u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); u32 ability = GetBoxMonData(boxmon, MON_DATA_ABILITY, NULL); u32 heldItem = GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL); @@ -3503,7 +3503,7 @@ s32 Mon_UpdateGiratinaForme(Pokemon *mon) { return ret; } -s32 BoxMon_UpdateGiratinaForme(BOXMON *boxmon) { +s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxmon) { int species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); int heldItem = GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL); int forme; @@ -3548,7 +3548,7 @@ void Mon_UpdateShayminForme(Pokemon *mon, int forme) { CalcMonLevelAndStats(mon); } -void BoxMon_UpdateShayminForme(BOXMON *boxmon, int forme) { +void BoxMon_UpdateShayminForme(BoxPokemon *boxmon, int forme) { if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_SHAYMIN) { GF_ASSERT(forme <= 1); SetBoxMonData(boxmon, MON_DATA_FORME, &forme); @@ -3719,7 +3719,7 @@ void sub_020720FC(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 enc } } -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) { sub_0208F270(boxmon, playerProfile, 0, a3, heap_id); SetBoxMonData(boxmon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); SetBoxMonData(boxmon, MON_DATA_POKEBALL, &pokeball); @@ -3730,7 +3730,7 @@ void sub_0207217C(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 enc sub_02072190(&mon->box, a1, pokeball, a3, encounterType, 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) { sub_0207213C(boxmon, a1, pokeball, a3, encounterType, heap_id); } @@ -3769,7 +3769,7 @@ BOOL GetMonTMHMCompat(Pokemon *mon, u8 tmhm) { return GetBoxMonTMHMCompat(&mon->box, tmhm); } -BOOL GetBoxMonTMHMCompat(BOXMON *boxmon, u8 tmhm) { +BOOL GetBoxMonTMHMCompat(BoxPokemon *boxmon, u8 tmhm) { u16 species; u32 forme; @@ -3807,7 +3807,7 @@ void UpdateMonAbility(Pokemon *mon) { UpdateBoxMonAbility(&mon->box); } -void UpdateBoxMonAbility(BOXMON *boxmon) { +void UpdateBoxMonAbility(BoxPokemon *boxmon) { BOOL decry = AcquireBoxMonLock(boxmon); int species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); int pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); @@ -3949,7 +3949,7 @@ u32 CalcMonChecksum(void * _data, u32 size) { return ret; } -PokemonDataBlock *GetSubstruct(BOXMON *boxmon, u32 pid, u8 which) { +PokemonDataBlock *GetSubstruct(BoxPokemon *boxmon, u32 pid, u8 which) { static const u8 offsets[32][4] = { {0x00, 0x20, 0x40, 0x60}, {0x00, 0x20, 0x60, 0x40}, @@ -4114,7 +4114,7 @@ BOOL MonCheckFrontierIneligibility(Pokemon *mon) { return IsPokemonLegendaryOrMythical(species, forme); } -BOOL BoxmonBelongsToPlayer(BOXMON * boxmon, PLAYERPROFILE * profile, HeapID heap_id) { +BOOL BoxmonBelongsToPlayer(BoxPokemon * boxmon, PLAYERPROFILE * profile, HeapID heap_id) { u32 myId = PlayerProfile_GetTrainerID(profile); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); u32 myGender = PlayerProfile_GetTrainerGender(profile); @@ -4174,7 +4174,7 @@ void Pokemon_RemoveCapsule(Pokemon *mon) { SetMonData(mon, MON_DATA_SEAL_COORDS, &sp1); } -void RestoreBoxMonPP(BOXMON * boxmon) { +void RestoreBoxMonPP(BoxPokemon * boxmon) { int i; u8 pp; BOOL decry = AcquireBoxMonLock(boxmon); @@ -4251,7 +4251,7 @@ void sub_02072A98(Pokemon *mon, struct UnkPokemonStruct_02072A98 *dest) { PokemonDataBlockB *dbB; // sp4 PokemonDataBlockC *dbC; // r7 PokemonDataBlockD *dbD; // ip - BOXMON *boxmon; // r6 + BoxPokemon *boxmon; // r6 int i; if (!mon->box.party_lock) { @@ -4331,7 +4331,7 @@ void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *mon) { PokemonDataBlockB *dbB; // r6 PokemonDataBlockC *dbC; // r7 PokemonDataBlockD *dbD; // ip - BOXMON *boxmon; // sp4 + BoxPokemon *boxmon; // sp4 int i; MI_CpuClearFast(mon, sizeof(Pokemon)); @@ -4968,7 +4968,7 @@ static const s8 sPokeathlonPerformanceNatureMods[NATURE_NUM][5] = { { 0, -10, 10, 0, 0}, }; -void CalcBoxMonPokeathlonPerformance(BOXMON *boxmon, struct PokeathlonTodayPerformance *dest) { +void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxmon, struct PokeathlonTodayPerformance *dest) { u32 pid; u32 nature; struct PokeathlonBasePerformance data; @@ -5013,7 +5013,7 @@ void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformanc CalcBoxMonPokeathlonPerformance(Mon_GetBoxMon(mon), 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) { #pragma unused(heap_id) int i; struct PokeathlonTodayPerformance basePerf; diff --git a/src/pokemon_icon_idx.c b/src/pokemon_icon_idx.c index 2a19d3fb2..056da6618 100644 --- a/src/pokemon_icon_idx.c +++ b/src/pokemon_icon_idx.c @@ -2,9 +2,9 @@ #include "pokemon_icon_idx.h" #include "constants/species.h" -static u16 _BoxMonGetForme(BOXMON *boxmon); +static u16 _BoxMonGetForme(BoxPokemon *boxmon); -u32 Boxmon_GetIconNaix(BOXMON *boxmon) { +u32 Boxmon_GetIconNaix(BoxPokemon *boxmon) { BOOL encry; int species; BOOL isEgg; @@ -78,7 +78,7 @@ u32 GetBattleMonIconNaixEx(u32 species, BOOL isEgg, u32 forme) { return GetMonIconNaixEx(species, isEgg, forme); } -static u16 _BoxMonGetForme(BOXMON *boxmon) { +static u16 _BoxMonGetForme(BoxPokemon *boxmon) { switch (GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL)) { case SPECIES_UNOWN: return GetBoxMonUnownLetter(boxmon); @@ -181,7 +181,7 @@ const u8 GetBattleMonIconPaletteEx(u32 species, u32 forme, BOOL isEgg) { return GetMonIconPaletteEx(species, forme, isEgg); } -const u8 Boxmon_GetIconPalette(BOXMON *boxmon) { +const u8 Boxmon_GetIconPalette(BoxPokemon *boxmon) { BOOL encry; u32 species; u32 forme; diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c2f04542a..a8500cb7a 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -4,7 +4,7 @@ #include "msgdata/msg/msg_0024.h" void PCStorage_InitializeBoxes(PC_STORAGE *storage); -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE *storage, u32 boxno, BOXMON *boxmon); +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE *storage, u32 boxno, BoxPokemon *boxmon); void PCStorage_SetBoxModified(PC_STORAGE *storage, u8 boxno); void PCStorage_init(PC_STORAGE *storage) { @@ -46,7 +46,7 @@ void PCStorage_InitializeBoxes(PC_STORAGE *storage) { storage->curBox = 0; } -BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BOXMON *boxmon) { +BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon *boxmon) { u32 i = storage->curBox; do { RestoreBoxMonPP(boxmon); @@ -62,7 +62,7 @@ BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BOXMON *box return FALSE; } -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BOXMON* boxmon) { +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon* boxmon) { u32 i; RestoreBoxMonPP(boxmon); if (boxno == -1u) { @@ -78,7 +78,7 @@ BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BOXMO return FALSE; } -BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BOXMON* boxmon) { +BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon* boxmon) { RestoreBoxMonPP(boxmon); if (boxno == -1u) { boxno = storage->curBox; @@ -93,7 +93,7 @@ BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slot } void PCStorage_SwapMonsInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 from, u32 to) { - BOXMON temp; + BoxPokemon temp; temp = storage->boxes[boxno].mons[from]; storage->boxes[boxno].mons[from] = storage->boxes[boxno].mons[to]; @@ -309,7 +309,7 @@ u32 PCStorage_GetMonDataByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, return GetBoxMonData(&storage->boxes[boxno].mons[slotno], attr, ptr); } -BOXMON* PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno) { +BoxPokemon* PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno) { GF_ASSERT(boxno < NUM_BOXES || boxno == -1u); GF_ASSERT(slotno < MONS_PER_BOX); if (boxno == -1u) { diff --git a/src/pokewalker.c b/src/pokewalker.c index a83d818f0..f2f1a2f81 100644 --- a/src/pokewalker.c +++ b/src/pokewalker.c @@ -55,17 +55,17 @@ void sub_020326A4(POKEWALKER *pokeWalker, u16 a1, u16 a2) { pokeWalker->unk_002 = a2; } -void Pokewalker_SetBoxMon(POKEWALKER *pokeWalker, BOXMON *boxmon) { - MI_CpuCopyFast(boxmon, &pokeWalker->pokemon, sizeof(BOXMON)); +void Pokewalker_SetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxmon) { + MI_CpuCopyFast(boxmon, &pokeWalker->pokemon, sizeof(BoxPokemon)); } void Pokewalker_ClearBoxMon(POKEWALKER *pokeWalker) { - MI_CpuClearFast(&pokeWalker->pokemon, sizeof(BOXMON)); + MI_CpuClearFast(&pokeWalker->pokemon, sizeof(BoxPokemon)); } -BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BOXMON *boxmon) { +BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxmon) { if (pokewalkerHasBoxmon(pokeWalker)) { - MI_CpuCopyFast(&pokeWalker->pokemon, boxmon, sizeof(BOXMON)); + MI_CpuCopyFast(&pokeWalker->pokemon, boxmon, sizeof(BoxPokemon)); return TRUE; } return FALSE; @@ -73,16 +73,16 @@ BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BOXMON *boxmon) { static BOOL pokewalkerHasBoxmon(POKEWALKER *pokeWalker) { // This is an annoying hack to get it matching. - // Should just memcmp with (BOXMON){} + // Should just memcmp with (BoxPokemon){} u8 * ptr = (u8 *)pokeWalker; int i; - for (i = 0; i < (int)sizeof(BOXMON); i++) { + for (i = 0; i < (int)sizeof(BoxPokemon); i++) { if (ptr[i + offsetof(POKEWALKER, pokemon)] != 0) { break; } } - if (i == sizeof(BOXMON)) { + if (i == sizeof(BoxPokemon)) { return FALSE; } return TRUE; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 5bb073a49..a8bb9ee15 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -4295,7 +4295,7 @@ u32 sub_020467A8(SAVEDATA *saveData) { DAYCARE *dayCare = Sav2_DayCare_get(saveData); for (i = 0; i < 2; i++) { - BOXMON *boxmon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, i)); + BoxPokemon *boxmon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, i)); if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL)) { ret |= 1 << GetBoxMonData(boxmon, MON_DATA_FORME, NULL); } @@ -4304,7 +4304,7 @@ u32 sub_020467A8(SAVEDATA *saveData) { PC_STORAGE *pcStorage = GetStoragePCPointer(saveData); for (i = 0; i < (u32)NUM_BOXES; i++) { for (j = 0; j < MONS_PER_BOX; j++) { - BOXMON *boxmon = PCStorage_GetMonByIndexPair(pcStorage, i, j); + BoxPokemon *boxmon = PCStorage_GetMonByIndexPair(pcStorage, i, j); if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL)) { ret |= 1 << GetBoxMonData(boxmon, MON_DATA_FORME, NULL); } @@ -4312,7 +4312,7 @@ u32 sub_020467A8(SAVEDATA *saveData) { } Pokemon *walkerMon = AllocMonZeroed(32); - BOXMON *walkerBoxMon = Mon_GetBoxMon(walkerMon); + BoxPokemon *walkerBoxMon = Mon_GetBoxMon(walkerMon); POKEWALKER *pokeWalker = Sav2_Pokewalker_get(saveData); if (Pokewalker_TryGetBoxMon(pokeWalker, walkerBoxMon)) { if (GetBoxMonData(walkerBoxMon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(walkerBoxMon, MON_DATA_IS_EGG, NULL)) { diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 2123dd428..44650cad9 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -162,7 +162,7 @@ BOOL ScrCmd_UpdateDayCareMonObjects(SCRIPTCONTEXT* ctx) { DeleteMapObject(mon_map_object); } - BOXMON* dc_box_mon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, dc_mon_idx)); + BoxPokemon* dc_box_mon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, dc_mon_idx)); if (GetBoxMonData(dc_box_mon, MON_DATA_SPECIES, NULL) == SPECIES_NONE) { continue; } diff --git a/src/scrcmd_lottery.c b/src/scrcmd_lottery.c index c749a8506..c8f92f02c 100644 --- a/src/scrcmd_lottery.c +++ b/src/scrcmd_lottery.c @@ -56,7 +56,7 @@ BOOL ScrCmd_LotoIdSearch(SCRIPTCONTEXT *ctx) { for (boxDigit = 0, boxPosition = 0, ii = 0; ii < NUM_BOXES; ii++) { for (j = 0; j < MONS_PER_BOX; j++) { - BOXMON *boxMon = PCStorage_GetMonByIndexPair(storage, ii, j); + BoxPokemon *boxMon = PCStorage_GetMonByIndexPair(storage, ii, j); if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) != 0 && !GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL)) { otid = GetBoxMonData(boxMon, MON_DATA_OTID, NULL) & 0xffff; digitCount = LotoId_CountDigitsMatched(lotoId, otid); diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index 15fbd0921..4919a228d 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -183,7 +183,7 @@ BOOL ScrCmd_BufferBoxMonNick(SCRIPTCONTEXT* ctx) { u8 idx = ScriptReadByte(ctx); u16 box_mon_slot = ScriptGetVar(ctx); - BOXMON* box_mon = PCStorage_GetMonByIndexPair(pc, box_mon_slot / MONS_PER_BOX, box_mon_slot % MONS_PER_BOX); + BoxPokemon* box_mon = PCStorage_GetMonByIndexPair(pc, box_mon_slot / MONS_PER_BOX, box_mon_slot % MONS_PER_BOX); BufferBoxMonNickname(*msg_fmt, idx, box_mon); return FALSE; From df584795a8cc02389e49c44452d2222b93c20dcd Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 17 Feb 2023 22:14:17 -0300 Subject: [PATCH 5/7] Set BoxPokemon pointer stars to the right --- include/daycare.h | 2 +- include/pokemon.h | 52 ++++++++++++++++---------------- include/pokemon_storage_system.h | 6 ++-- src/daycare.c | 2 +- src/pokemon.c | 52 ++++++++++++++++---------------- src/pokemon_storage_system.c | 6 ++-- src/scrcmd_daycare.c | 2 +- src/scrcmd_strbuf.c | 2 +- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/daycare.h b/include/daycare.h index 0b3b482cd..ce9fbee58 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -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); -BoxPokemon* DayCareMon_GetBoxMon(DAYCAREMON* dcmon); +BoxPokemon *DayCareMon_GetBoxMon(DAYCAREMON* dcmon); DAYCAREMAIL* DayCareMon_GetExtras(DAYCAREMON* dcmon); int DayCareMon_GetSteps(DAYCAREMON* dcmon); MAIL* DayCareMail_GetMailPtr(DAYCAREMAIL* dcmail); diff --git a/include/pokemon.h b/include/pokemon.h index aa1a53b5d..6eb31ae6d 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -29,15 +29,15 @@ extern const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS]; void ZeroMonData(Pokemon *mon); -void ZeroBoxMonData(BoxPokemon * 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(BoxPokemon * mon); -BOOL ReleaseBoxMonLock(BoxPokemon * mon, BOOL decrypt_result); +BOOL AcquireBoxMonLock(BoxPokemon *mon); +BOOL ReleaseBoxMonLock(BoxPokemon *mon, BOOL decrypt_result); void CreateMon(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId); -void CreateBoxMon(BoxPokemon * boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId); +void CreateBoxMon(BoxPokemon *boxPokemon, 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); @@ -45,11 +45,11 @@ void CreateMonWithFixedIVs(Pokemon *mon, int species, int level, int ivs, int pe void CalcMonLevelAndStats(Pokemon *mon); void CalcMonStats(Pokemon *mon); u32 GetMonData(Pokemon *mon, int attr, void * ptr); -u32 GetBoxMonData(BoxPokemon * boxmon, int attr, void * ptr); +u32 GetBoxMonData(BoxPokemon *boxmon, int attr, void * ptr); void SetMonData(Pokemon *mon, int attr, void * ptr); -void SetBoxMonData(BoxPokemon * boxmon, int attr, void * ptr); +void SetBoxMonData(BoxPokemon *boxmon, int attr, void * ptr); void AddMonData(Pokemon *mon, int attr, int amount); -//void AddBoxMonData(BoxPokemon * 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,28 +58,28 @@ 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(BoxPokemon * pokemon); +u32 CalcBoxMonExpToNextLevel(BoxPokemon *pokemon); 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(BoxPokemon * boxmon); +int CalcBoxMonLevel(BoxPokemon *boxmon); int CalcLevelBySpeciesAndExp(u16 species, u32 experience); int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 species, u32 experience); -u8 GetBoxMonNature(BoxPokemon * 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(BoxPokemon * boxmon); +u8 GetBoxMonGender(BoxPokemon *boxmon); u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid); u8 MonIsShiny(Pokemon *mon); -u8 BoxMonIsShiny(BoxPokemon * boxmon); +u8 BoxMonIsShiny(BoxPokemon *boxmon); u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid); u32 GenerateShinyPersonality(u32 otid); u32 GetArceusTypeByHeldItemEffect(u16 plate); -u8 GetBoxMonUnownLetter(BoxPokemon * boxmon); +u8 GetBoxMonUnownLetter(BoxPokemon *boxmon); u8 GetMonUnownLetter(Pokemon *mon); u32 TryAppendMonMove(Pokemon *mon, u16 move); u32 TryAppendBoxMonMove(BoxPokemon *boxmon, u16 move); @@ -95,15 +95,15 @@ u16 GetMonEvolution(PARTY * party, Pokemon *mon, u8 context, u16 usedItem, int * u16 ReadFromPersonalPmsNarc(u16 species); u16 GetEggSpecies(u16 species); void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot); -void CopyBoxPokemonToPokemon(const BoxPokemon * 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 BoxPokemon * src, BoxPokemon * dest); -void CopyPokemonToBoxPokemon(const Pokemon *src, BoxPokemon * dest); +void CopyBoxPokemonToBoxPokemon(const BoxPokemon *src, BoxPokemon *dest); +void CopyPokemonToBoxPokemon(const Pokemon *src, BoxPokemon *dest); s8 MonGetFlavorPreference(Pokemon *mon, int flavor); -s8 BoxMonGetFlavorPreference(BoxPokemon * 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); @@ -111,13 +111,13 @@ 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(BoxPokemon * boxmon); +BOOL BoxMon_HasPokerus(BoxPokemon *boxmon); BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon); -BOOL BoxMon_IsImmuneToPokerus(BoxPokemon * boxmon); +BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxmon); void Pokemon_UpdateArceusForme(Pokemon *mon); -void BoxMon_UpdateArceusForme(BoxPokemon * boxmon); +void BoxMon_UpdateArceusForme(BoxPokemon *boxmon); s32 Mon_UpdateGiratinaForme(Pokemon *mon); -s32 BoxMon_UpdateGiratinaForme(BoxPokemon * boxmon); +s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxmon); void Mon_UpdateShayminForme(Pokemon *mon, int forme); void BoxMon_UpdateShayminForme(BoxPokemon *pokemon, int forme); void UpdateMonAbility(Pokemon *mon); @@ -126,7 +126,7 @@ int LowestFlagNo(u32 mask); BOOL IsPokemonLegendaryOrMythical(u16 species, u16 forme); u16 GetLegendaryMon(u32 idx); void Pokemon_RemoveCapsule(Pokemon *mon); -void RestoreBoxMonPP(BoxPokemon * 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); @@ -149,9 +149,9 @@ void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C * void sub_02070D84(s32 trainer_class, s32 a1, struct UnkStruct_02070D3C *a2); u32 sub_02070D90(void); u32 sub_02070D94(void); -BoxPokemon * Mon_GetBoxMon(Pokemon *mon); +BoxPokemon *Mon_GetBoxMon(Pokemon *mon); BOOL Pokemon_TryLevelUp(Pokemon *mon); -void InitBoxMonMoveset(BoxPokemon * 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,7 +167,7 @@ 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(BoxPokemon * 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(BoxPokemon *boxmon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id); void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2); @@ -186,7 +186,7 @@ int ResolveMonForme(int species, int forme); u32 MaskOfFlagNo(int flagno); BOOL SpeciesIsMythical(u16 species); BOOL MonCheckFrontierIneligibility(Pokemon *mon); -BOOL BoxmonBelongsToPlayer(BoxPokemon * 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); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 5cbb90751..4f6466287 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -30,8 +30,8 @@ BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon void PCStorage_init(PC_STORAGE *storage); u32 PCStorage_sizeof(void); void PCStorage_InitializeBoxes(PC_STORAGE *storage); -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon* boxmon); -BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon* 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); -BoxPokemon* 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); diff --git a/src/daycare.c b/src/daycare.c index 834819810..de958db87 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -16,7 +16,7 @@ DAYCAREMON* Sav2_DayCare_GetMonX(DAYCARE* daycare, int i) { return &daycare->mons[i]; } -BoxPokemon* DayCareMon_GetBoxMon(DAYCAREMON* dcmon) { +BoxPokemon *DayCareMon_GetBoxMon(DAYCAREMON* dcmon) { return &dcmon->mon; } diff --git a/src/pokemon.c b/src/pokemon.c index d7e91f374..6eb782cdb 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -28,11 +28,11 @@ void InitBoxMonMoveset(BoxPokemon *boxmon); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *dest); u16 ModifyStatByNature(u8 nature, u16 stat, u8 statID); static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest); -static u32 GetBoxMonDataInternal(BoxPokemon * boxmon, int attr, void * dest); +static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest); static void SetMonDataInternal(Pokemon *mon, int attr, const void * data); -static void SetBoxMonDataInternal(BoxPokemon * boxmon, int attr, const void * data); +static void SetBoxMonDataInternal(BoxPokemon *boxmon, int attr, const void * data); static void AddMonDataInternal(Pokemon *mon, int attr, int value); -static void AddBoxMonDataInternal(BoxPokemon * boxmon, int attr, int value); +static void AddBoxMonDataInternal(BoxPokemon *boxmon, int attr, int value); PokemonDataBlock *GetSubstruct(BoxPokemon *boxmon, u32 pid, u8 which_struct); void LoadMonPersonal(int species, BASE_STATS *dest); int ResolveMonForme(int species, int forme); @@ -182,7 +182,7 @@ void CreateMon(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPe CalcMonLevelAndStats(mon); } -void CreateBoxMon(BoxPokemon * boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { +void CreateBoxMon(BoxPokemon *boxPokemon, int species, int level, int fixedIV, int hasFixedPersonality, int fixedPersonality, int otIdType, int fixedOtId) { BOOL decry; u32 exp; u32 iv; @@ -457,7 +457,7 @@ static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest) { } } -u32 GetBoxMonData(BoxPokemon * boxmon, int attr, void * dest) { +u32 GetBoxMonData(BoxPokemon *boxmon, int attr, void * dest) { u32 ret; u32 checksum; if (!boxmon->box_lock) { @@ -475,7 +475,7 @@ u32 GetBoxMonData(BoxPokemon * boxmon, int attr, void * dest) { return ret; } -static u32 GetBoxMonDataInternal(BoxPokemon * boxmon, int attr, void * dest) { +static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { u32 ret = 0; PokemonDataBlockA * blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; PokemonDataBlockB * blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; @@ -954,7 +954,7 @@ static void SetMonDataInternal(Pokemon *mon, int attr, const void * value) { #undef VALUE } -void SetBoxMonData(BoxPokemon * boxmon, int attr, void * value) { +void SetBoxMonData(BoxPokemon *boxmon, int attr, void * value) { u32 checksum; if (!boxmon->box_lock) { DECRYPT_BOX(boxmon); @@ -974,7 +974,7 @@ void SetBoxMonData(BoxPokemon * boxmon, int attr, void * value) { } -static void SetBoxMonDataInternal(BoxPokemon * boxmon, int attr, const void * value) { +static void SetBoxMonDataInternal(BoxPokemon *boxmon, int attr, const void * value) { #define VALUE(type) (*(const type *)value) u8 flag; u64 mask; @@ -1403,7 +1403,7 @@ static void AddMonDataInternal(Pokemon *mon, int attr, int value) { } } -static void AddBoxMonDataInternal(BoxPokemon * boxmon, int attr, int value) { +static void AddBoxMonDataInternal(BoxPokemon *boxmon, int attr, int value) { PokemonDataBlockA *blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; PokemonDataBlockB *blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; PokemonDataBlockC *blockC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; @@ -1882,7 +1882,7 @@ u32 CalcMonExpToNextLevel(Pokemon *mon) { return CalcBoxMonExpToNextLevel(&mon->box); } -u32 CalcBoxMonExpToNextLevel(BoxPokemon * boxmon) { +u32 CalcBoxMonExpToNextLevel(BoxPokemon *boxmon) { u16 species = (u16)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); u16 level = (u16)(CalcBoxMonLevel(boxmon) + 1); u32 cur = GetBoxMonData(boxmon, MON_DATA_EXPERIENCE, NULL); @@ -1921,7 +1921,7 @@ int CalcMonLevel(Pokemon *mon) { return CalcBoxMonLevel(&mon->box); } -int CalcBoxMonLevel(BoxPokemon * boxmon) { +int CalcBoxMonLevel(BoxPokemon *boxmon) { BOOL decry = AcquireBoxMonLock(boxmon); int species = (int)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); int exp = (int)GetBoxMonData(boxmon, MON_DATA_EXPERIENCE, NULL); @@ -1954,7 +1954,7 @@ u8 GetMonNature(Pokemon *mon) { return GetBoxMonNature(&mon->box); } -u8 GetBoxMonNature(BoxPokemon * boxmon) { +u8 GetBoxMonNature(BoxPokemon *boxmon) { BOOL decry = AcquireBoxMonLock(boxmon); u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); ReleaseBoxMonLock(boxmon, decry); @@ -2757,11 +2757,11 @@ u8 GetMonUnownLetter(Pokemon *mon) { return GetBoxMonUnownLetter(&mon->box); } -u8 GetBoxMonUnownLetter(BoxPokemon * boxmon) { +u8 GetBoxMonUnownLetter(BoxPokemon *boxmon) { return (u8)GetBoxMonData(boxmon, MON_DATA_FORME, NULL); } -BoxPokemon * Mon_GetBoxMon(Pokemon *mon) { +BoxPokemon *Mon_GetBoxMon(Pokemon *mon) { return &mon->box; } @@ -3037,7 +3037,7 @@ u16 GetEggSpecies(u16 species) { } } -void InitBoxMonMoveset(BoxPokemon * boxmon) { +void InitBoxMonMoveset(BoxPokemon *boxmon) { BOOL decry; u16 * wotbl; int i; @@ -3091,7 +3091,7 @@ void DeleteMonFirstMoveAndAppend(Pokemon *mon, u16 move_id) { DeleteBoxMonFirstMoveAndAppend(Mon_GetBoxMon(mon), move_id); } -void DeleteBoxMonFirstMoveAndAppend(BoxPokemon * boxmon, u16 move) { +void DeleteBoxMonFirstMoveAndAppend(BoxPokemon *boxmon, u16 move) { BOOL decry = AcquireBoxMonLock(boxmon); int i; u16 moves[4]; @@ -3132,7 +3132,7 @@ void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot) { BoxMonSetMoveInSlot(&mon->box, move, slot); } -void BoxMonSetMoveInSlot(BoxPokemon* boxmon, u16 move, u8 slot) { +void BoxMonSetMoveInSlot(BoxPokemon *boxmon, u16 move, u8 slot) { u8 ppUp; u8 pp; @@ -3174,7 +3174,7 @@ void MonSwapMoves(Pokemon *mon, int a, int b) { BoxMonSwapMoves(&mon->box, a, b); } -void BoxMonSwapMoves(BoxPokemon * boxmon, int slot1, int slot2) { +void BoxMonSwapMoves(BoxPokemon *boxmon, int slot1, int slot2) { u16 moves[2]; u8 pp[2]; u8 ppUp[2]; @@ -3228,7 +3228,7 @@ BOOL MonHasMove(Pokemon *mon, u16 move) { } } -void CopyBoxPokemonToPokemon(const BoxPokemon * src, Pokemon *dest) { +void CopyBoxPokemonToPokemon(const BoxPokemon *src, Pokemon *dest) { u32 sp0 = 0; CAPSULE sp4; struct Mail * mail; @@ -3290,7 +3290,7 @@ s8 MonGetFlavorPreference(Pokemon *mon, int flavor) { return BoxMonGetFlavorPreference(&mon->box, flavor); } -s8 BoxMonGetFlavorPreference(BoxPokemon * boxmon, int flavor) { +s8 BoxMonGetFlavorPreference(BoxPokemon *boxmon, int flavor) { u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); return GetFlavorPreferenceFromPID(personality, flavor); } @@ -3422,7 +3422,7 @@ BOOL Pokemon_HasPokerus(Pokemon *mon) { return BoxMon_HasPokerus(&mon->box); } -BOOL BoxMon_HasPokerus(BoxPokemon * boxmon) { +BOOL BoxMon_HasPokerus(BoxPokemon *boxmon) { return (GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL) & 0xF) != 0; } @@ -3430,7 +3430,7 @@ BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon) { return BoxMon_IsImmuneToPokerus(&mon->box); } -BOOL BoxMon_IsImmuneToPokerus(BoxPokemon * boxmon) { +BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxmon) { u8 pokerus = (u8)GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL); if (pokerus & 0xF) { return FALSE; @@ -3445,7 +3445,7 @@ void Pokemon_UpdateArceusForme(Pokemon *mon) { BoxMon_UpdateArceusForme(&mon->box); } -void BoxMon_UpdateArceusForme(BoxPokemon * boxmon) { +void BoxMon_UpdateArceusForme(BoxPokemon *boxmon) { u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); u32 ability = GetBoxMonData(boxmon, MON_DATA_ABILITY, NULL); u32 heldItem = GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL); @@ -3719,7 +3719,7 @@ void sub_020720FC(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 enc } } -void sub_0207213C(BoxPokemon * 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) { sub_0208F270(boxmon, playerProfile, 0, a3, heap_id); SetBoxMonData(boxmon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); SetBoxMonData(boxmon, MON_DATA_POKEBALL, &pokeball); @@ -4114,7 +4114,7 @@ BOOL MonCheckFrontierIneligibility(Pokemon *mon) { return IsPokemonLegendaryOrMythical(species, forme); } -BOOL BoxmonBelongsToPlayer(BoxPokemon * boxmon, PLAYERPROFILE * profile, HeapID heap_id) { +BOOL BoxmonBelongsToPlayer(BoxPokemon *boxmon, PLAYERPROFILE * profile, HeapID heap_id) { u32 myId = PlayerProfile_GetTrainerID(profile); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); u32 myGender = PlayerProfile_GetTrainerGender(profile); @@ -4174,7 +4174,7 @@ void Pokemon_RemoveCapsule(Pokemon *mon) { SetMonData(mon, MON_DATA_SEAL_COORDS, &sp1); } -void RestoreBoxMonPP(BoxPokemon * boxmon) { +void RestoreBoxMonPP(BoxPokemon *boxmon) { int i; u8 pp; BOOL decry = AcquireBoxMonLock(boxmon); diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index a8500cb7a..d5ea1c500 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -62,7 +62,7 @@ BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon return FALSE; } -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon* boxmon) { +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon *boxmon) { u32 i; RestoreBoxMonPP(boxmon); if (boxno == -1u) { @@ -78,7 +78,7 @@ BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPo return FALSE; } -BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon* boxmon) { +BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon *boxmon) { RestoreBoxMonPP(boxmon); if (boxno == -1u) { boxno = storage->curBox; @@ -309,7 +309,7 @@ u32 PCStorage_GetMonDataByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, return GetBoxMonData(&storage->boxes[boxno].mons[slotno], attr, ptr); } -BoxPokemon* PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno) { +BoxPokemon *PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno) { GF_ASSERT(boxno < NUM_BOXES || boxno == -1u); GF_ASSERT(slotno < MONS_PER_BOX); if (boxno == -1u) { diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 44650cad9..20d738e1c 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -162,7 +162,7 @@ BOOL ScrCmd_UpdateDayCareMonObjects(SCRIPTCONTEXT* ctx) { DeleteMapObject(mon_map_object); } - BoxPokemon* dc_box_mon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, dc_mon_idx)); + BoxPokemon *dc_box_mon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, dc_mon_idx)); if (GetBoxMonData(dc_box_mon, MON_DATA_SPECIES, NULL) == SPECIES_NONE) { continue; } diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index 4919a228d..660cae178 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -183,7 +183,7 @@ BOOL ScrCmd_BufferBoxMonNick(SCRIPTCONTEXT* ctx) { u8 idx = ScriptReadByte(ctx); u16 box_mon_slot = ScriptGetVar(ctx); - BoxPokemon* box_mon = PCStorage_GetMonByIndexPair(pc, box_mon_slot / MONS_PER_BOX, box_mon_slot % MONS_PER_BOX); + BoxPokemon *box_mon = PCStorage_GetMonByIndexPair(pc, box_mon_slot / MONS_PER_BOX, box_mon_slot % MONS_PER_BOX); BufferBoxMonNickname(*msg_fmt, idx, box_mon); return FALSE; From 886d727c58d0f0810c915e5d27fe93f0be8911b5 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 18 Feb 2023 09:36:29 -0300 Subject: [PATCH 6/7] Standarized variable names of BoxPokemon struct --- include/msgfmt.h | 8 +- include/pokemon.h | 78 ++--- include/pokemon_icon_idx.h | 4 +- include/pokemon_storage_system.h | 6 +- include/pokewalker.h | 4 +- include/unk_02078834.h | 2 +- src/get_egg.c | 108 +++--- src/msgfmt.c | 16 +- src/pokemon.c | 554 +++++++++++++++---------------- src/pokemon_icon_idx.c | 34 +- src/pokemon_storage_system.c | 20 +- src/pokewalker.c | 8 +- src/scrcmd_c.c | 12 +- src/scrcmd_daycare.c | 12 +- 14 files changed, 433 insertions(+), 433 deletions(-) diff --git a/include/msgfmt.h b/include/msgfmt.h index 320049327..bf6b85b1f 100644 --- a/include/msgfmt.h +++ b/include/msgfmt.h @@ -39,10 +39,10 @@ void ScrStrBufs_InitSub(MSGFMT_FIELD *field); void SetStringAsPlaceholder(MSGFMT *msgFmt, u32 fieldno, const STRING *string, const MSGFMT_FIELD_ATTRS *attrs); void BufferRivalsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData); void BufferFriendsName(MSGFMT *msgFmt, u32 fieldno, SAVEDATA *saveData); -void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); -void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); -void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); -void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon); +void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon); +void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon); +void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon); +void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon); void BufferMoveName(MSGFMT *msgFmt, u32 fieldno, u32 moveId); void BufferRibbonNameOrDesc(MSGFMT *msgFmt, u32 fieldno, u32 decoId); void BufferAbilityName(MSGFMT *msgFmt, u32 fieldno, u32 abilityId); diff --git a/include/pokemon.h b/include/pokemon.h index 6eb31ae6d..6211337dc 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -29,15 +29,15 @@ extern const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS]; void ZeroMonData(Pokemon *mon); -void ZeroBoxMonData(BoxPokemon *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(BoxPokemon *mon); -BOOL ReleaseBoxMonLock(BoxPokemon *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(BoxPokemon *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); @@ -45,11 +45,11 @@ void CreateMonWithFixedIVs(Pokemon *mon, int species, int level, int ivs, int pe void CalcMonLevelAndStats(Pokemon *mon); void CalcMonStats(Pokemon *mon); u32 GetMonData(Pokemon *mon, int attr, void * ptr); -u32 GetBoxMonData(BoxPokemon *boxmon, int attr, void * ptr); +u32 GetBoxMonData(BoxPokemon *boxMon, int attr, void * ptr); void SetMonData(Pokemon *mon, int attr, void * ptr); -void SetBoxMonData(BoxPokemon *boxmon, int attr, void * ptr); +void SetBoxMonData(BoxPokemon *boxMon, int attr, void * ptr); void AddMonData(Pokemon *mon, int attr, int amount); -//void AddBoxMonData(BoxPokemon *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,37 +58,37 @@ 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(BoxPokemon *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(BoxPokemon *boxmon); +int CalcBoxMonLevel(BoxPokemon *boxMon); int CalcLevelBySpeciesAndExp(u16 species, u32 experience); int CalcLevelBySpeciesAndExp_PreloadedPersonal(BASE_STATS * personal, u16 species, u32 experience); -u8 GetBoxMonNature(BoxPokemon *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(BoxPokemon *boxmon); +u8 GetBoxMonGender(BoxPokemon *boxMon); u8 GetGenderBySpeciesAndPersonality(u16 species, u32 pid); u8 MonIsShiny(Pokemon *mon); -u8 BoxMonIsShiny(BoxPokemon *boxmon); +u8 BoxMonIsShiny(BoxPokemon *boxMon); u8 CalcShininessByOtIdAndPersonality(u32 otid, u32 pid); u32 GenerateShinyPersonality(u32 otid); u32 GetArceusTypeByHeldItemEffect(u16 plate); -u8 GetBoxMonUnownLetter(BoxPokemon *boxmon); +u8 GetBoxMonUnownLetter(BoxPokemon *boxMon); u8 GetMonUnownLetter(Pokemon *mon); u32 TryAppendMonMove(Pokemon *mon, u16 move); -u32 TryAppendBoxMonMove(BoxPokemon *boxmon, u16 move); -void BoxMonSetMoveInSlot(BoxPokemon *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(BoxPokemon *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(BoxPokemon *boxmon, int a, int b); +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); @@ -103,7 +103,7 @@ void CopyPokemonToPokemon(const Pokemon *src, Pokemon *dest); void CopyBoxPokemonToBoxPokemon(const BoxPokemon *src, BoxPokemon *dest); void CopyPokemonToBoxPokemon(const Pokemon *src, BoxPokemon *dest); s8 MonGetFlavorPreference(Pokemon *mon, int flavor); -s8 BoxMonGetFlavorPreference(BoxPokemon *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); @@ -111,38 +111,38 @@ 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(BoxPokemon *boxmon); +BOOL BoxMon_HasPokerus(BoxPokemon *boxMon); BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon); -BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxmon); +BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxMon); void Pokemon_UpdateArceusForme(Pokemon *mon); -void BoxMon_UpdateArceusForme(BoxPokemon *boxmon); +void BoxMon_UpdateArceusForme(BoxPokemon *boxMon); s32 Mon_UpdateGiratinaForme(Pokemon *mon); -s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxmon); +s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxMon); void Mon_UpdateShayminForme(Pokemon *mon, int forme); -void BoxMon_UpdateShayminForme(BoxPokemon *pokemon, int forme); +void BoxMon_UpdateShayminForme(BoxPokemon *boxMon, int forme); void UpdateMonAbility(Pokemon *mon); -void UpdateBoxMonAbility(BoxPokemon *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(BoxPokemon *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(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); +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(BoxPokemon *boxmon, u8 whichFacing); -u8 sub_02070848(BoxPokemon *boxmon, u8 whichFacing); -u8 sub_02070854(BoxPokemon *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); @@ -151,7 +151,7 @@ u32 sub_02070D90(void); u32 sub_02070D94(void); BoxPokemon *Mon_GetBoxMon(Pokemon *mon); BOOL Pokemon_TryLevelUp(Pokemon *mon); -void InitBoxMonMoveset(BoxPokemon *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(BoxPokemon *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(BoxPokemon *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(BoxPokemon *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(BoxPokemon *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(BoxPokemon *boxmon, struct PokeathlonTodayPerformance *dest); +void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxMon, struct PokeathlonTodayPerformance *dest); void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformance *dest); -void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BoxPokemon *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 diff --git a/include/pokemon_icon_idx.h b/include/pokemon_icon_idx.h index 407fc7844..0f9671b3a 100644 --- a/include/pokemon_icon_idx.h +++ b/include/pokemon_icon_idx.h @@ -3,13 +3,13 @@ #include "pokemon_types_def.h" -u32 Boxmon_GetIconNaix(BoxPokemon *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(BoxPokemon *boxmon); +const u8 Boxmon_GetIconPalette(BoxPokemon *boxMon); const u8 Pokemon_GetIconPalette(Pokemon *mon); u32 sub_02074490(void); u32 sub_02074494(void); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 4f6466287..fb6b518dc 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -26,12 +26,12 @@ struct PokemonStorageSystem { #define BOX_ALL_MODIFIED_FLAG ((u32)((1<baby_learnset); for (i = 0; i < MON_MOVES; i++) { - search->dad_moves[i] = GetBoxMonData(dad, MON_DATA_MOVE1 + i, NULL); - search->mom_moves[i] = GetBoxMonData(mom, MON_DATA_MOVE1 + i, NULL); + search->dad_moves[i] = GetBoxMonData(father, MON_DATA_MOVE1 + i, NULL); + search->mom_moves[i] = GetBoxMonData(mother, MON_DATA_MOVE1 + i, NULL); } r5 = LoadEggMoves(egg, search->baby_egg_moves); for (i = 0; i < MON_MOVES; i++) { @@ -580,7 +580,7 @@ static void Daycare_LightBallCheck(Pokemon *egg, DAYCARE *dayCare) { static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx) { u16 parent_species[2]; u16 i; - u16 mom; + u16 mother; u16 pms; u16 swp; BoxPokemon *parents[2]; @@ -595,8 +595,8 @@ static u16 Daycare_GetEggSpecies(DAYCARE *dayCare, u8 *gender_idx) { gender_idx[1] = i ^ 1; } } - mom = parent_species[gender_idx[0]]; - pms = ReadFromPersonalPmsNarc(mom); + mother = parent_species[gender_idx[0]]; + pms = ReadFromPersonalPmsNarc(mother); if (pms == SPECIES_NIDORAN_F) { if (Sav2_DayCare_GetEggPID(dayCare) & 0x8000) { pms = SPECIES_NIDORAN_M; @@ -932,22 +932,22 @@ void Sav2_DayCare_BufferStoredMonNicks(DAYCARE *dayCare, MSGFMT *msgFmt) { void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MSGFMT *msgFmt) { DAYCAREMON *daycareMon; - BoxPokemon *boxmon; + BoxPokemon *boxMon; u8 level; u8 gender; u16 species; daycareMon = Sav2_DayCare_GetMonX(dayCare, slot); - boxmon = Daycare_GetBoxMonI(dayCare, slot); - BufferBoxMonNickname(msgFmt, nickname_idx, boxmon); + boxMon = Daycare_GetBoxMonI(dayCare, slot); + BufferBoxMonNickname(msgFmt, nickname_idx, boxMon); - level = GetDayCareUpdatedLevel(boxmon, DayCareMon_GetSteps(daycareMon)); + level = GetDayCareUpdatedLevel(boxMon, DayCareMon_GetSteps(daycareMon)); BufferIntegerAsString(msgFmt, level_idx, level, 3, STRCONVMODE_LEFT_ALIGN, TRUE); - gender = GetBoxMonData(boxmon, MON_DATA_GENDER, NULL); + gender = GetBoxMonData(boxMon, MON_DATA_GENDER, NULL); if (gender != MON_GENDERLESS) { - species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - if ((species == SPECIES_NIDORAN_F || species == SPECIES_NIDORAN_M) && !GetBoxMonData(boxmon, MON_DATA_HAS_NICKNAME, NULL)) { + species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + if ((species == SPECIES_NIDORAN_F || species == SPECIES_NIDORAN_M) && !GetBoxMonData(boxMon, MON_DATA_HAS_NICKNAME, NULL)) { gender = MON_GENDERLESS; } } @@ -955,20 +955,20 @@ void Sav2_DayCare_BufferMonStats(DAYCARE *dayCare, u32 nickname_idx, u32 level_i } u16 Sav2_DayCare_BufferTailMonNick(DAYCARE *dayCare, MSGFMT *msgFmt) { - BoxPokemon *mon1; - BoxPokemon *mon2; + BoxPokemon *boxMon1; + BoxPokemon *boxMon2; u16 species1; u16 species2; - mon1 = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, 0)); - mon2 = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, 1)); - species1 = GetBoxMonData(mon1, MON_DATA_SPECIES, NULL); - species2 = GetBoxMonData(mon2, MON_DATA_SPECIES, NULL); + boxMon1 = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, 0)); + boxMon2 = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, 1)); + species1 = GetBoxMonData(boxMon1, MON_DATA_SPECIES, NULL); + species2 = GetBoxMonData(boxMon2, MON_DATA_SPECIES, NULL); if (species2 == SPECIES_NONE) { - BufferBoxMonNickname(msgFmt, 0, mon1); + BufferBoxMonNickname(msgFmt, 0, boxMon1); return species1; } else { - BufferBoxMonNickname(msgFmt, 0, mon2); + BufferBoxMonNickname(msgFmt, 0, boxMon2); return species2; } } diff --git a/src/msgfmt.c b/src/msgfmt.c index c9a525e23..44a43ecae 100644 --- a/src/msgfmt.c +++ b/src/msgfmt.c @@ -122,12 +122,12 @@ void BufferSpeciesName(MSGFMT *msgFmt, u32 fieldno, u16 species) { DestroyMsgData(msgData); } -void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { - BufferSpeciesName(msgFmt, fieldno, GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL)); +void BufferBoxMonSpeciesName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon) { + BufferSpeciesName(msgFmt, fieldno, GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL)); } -void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { - BufferSpeciesNameWithArticle(msgFmt, fieldno, GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL)); +void BufferBoxMonSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon) { + BufferSpeciesNameWithArticle(msgFmt, fieldno, GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL)); } void BufferSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 species) { @@ -137,13 +137,13 @@ void BufferSpeciesNameWithArticle(MSGFMT *msgFmt, u32 fieldno, u32 species) { DestroyMsgData(msgData); } -void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { - GetBoxMonData(boxmon, MON_DATA_NICKNAME_3, msgFmt->buffer); +void BufferBoxMonNickname(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon) { + GetBoxMonData(boxMon, MON_DATA_NICKNAME_3, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxmon) { - GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, msgFmt->buffer); +void BufferBoxMonOTName(MSGFMT *msgFmt, u32 fieldno, BoxPokemon *boxMon) { + GetBoxMonData(boxMon, MON_DATA_OT_NAME_2, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } diff --git a/src/pokemon.c b/src/pokemon.c index 6eb782cdb..c8a5d7924 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -24,41 +24,41 @@ void MonEncryptSegment(void *data, u32 size, u32 key); void MonDecryptSegment(void *data, u32 size, u32 key); u32 CalcMonChecksum(void *data, u32 size); -void InitBoxMonMoveset(BoxPokemon *boxmon); +void InitBoxMonMoveset(BoxPokemon *boxMon); void LoadMonBaseStats_HandleAlternateForme(int species, int forme, BASE_STATS *dest); u16 ModifyStatByNature(u8 nature, u16 stat, u8 statID); static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest); -static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest); +static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void * dest); static void SetMonDataInternal(Pokemon *mon, int attr, const void * data); -static void SetBoxMonDataInternal(BoxPokemon *boxmon, int attr, const void * data); +static void SetBoxMonDataInternal(BoxPokemon *boxMon, int attr, const void * data); static void AddMonDataInternal(Pokemon *mon, int attr, int value); -static void AddBoxMonDataInternal(BoxPokemon *boxmon, int attr, int value); -PokemonDataBlock *GetSubstruct(BoxPokemon *boxmon, u32 pid, u8 which_struct); +static void AddBoxMonDataInternal(BoxPokemon *boxMon, int attr, int value); +PokemonDataBlock *GetSubstruct(BoxPokemon *boxMon, u32 pid, u8 which_struct); void LoadMonPersonal(int species, BASE_STATS *dest); int ResolveMonForme(int species, int forme); u8 GetGenderBySpeciesAndPersonality_PreloadedPersonal(const BASE_STATS *personal, u16 species, u32 pid); u32 MaskOfFlagNo(int flagno); -void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxmon, u8 whichFacing, BOOL a3); +void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxMon, u8 whichFacing, BOOL a3); void DP_GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct *a0, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 pid); void GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct *a0, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 pid); u8 sub_02070438(u16 species, u8 forme); -u8 sub_02070854(BoxPokemon *boxmon, u8 whichFacing, BOOL a2); +u8 sub_02070854(BoxPokemon *boxMon, u8 whichFacing, BOOL a2); u8 sub_02070A64(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid); u8 sub_020708D8(u16 species, u8 gender, u8 whichFacing, u8 forme, u32 pid); void sub_02070D3C(s32 trainer_class, s32 a1, s32 a2, struct UnkStruct_02070D3C *a3); int TrainerClassToBackpicID(int trainer_class, int a1); void LoadMonEvolutionTable(u16 species, struct Evolution *evoTable); BOOL MonHasMove(Pokemon *mon, u16 move_id); -void sub_0207213C(BoxPokemon *boxmon, PLAYERPROFILE *playerProfile, 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 sub_0207213C(BoxPokemon *boxMon, PLAYERPROFILE *playerProfile, 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); #define ENCRY_ARGS_PTY(mon) (u16 *)&(mon)->party, sizeof((mon)->party), (mon)->box.pid -#define ENCRY_ARGS_BOX(boxmon) (u16 *)&(boxmon)->substructs, sizeof((boxmon)->substructs), (boxmon)->checksum +#define ENCRY_ARGS_BOX(boxMon) (u16 *)&(boxMon)->substructs, sizeof((boxMon)->substructs), (boxMon)->checksum #define ENCRYPT_PTY(mon) MonEncryptSegment(ENCRY_ARGS_PTY(mon)) -#define ENCRYPT_BOX(boxmon) MonEncryptSegment(ENCRY_ARGS_BOX(boxmon)) +#define ENCRYPT_BOX(boxMon) MonEncryptSegment(ENCRY_ARGS_BOX(boxMon)) #define DECRYPT_PTY(mon) MonDecryptSegment(ENCRY_ARGS_PTY(mon)) -#define DECRYPT_BOX(boxmon) MonDecryptSegment(ENCRY_ARGS_BOX(boxmon)) -#define CHECKSUM(boxmon) CalcMonChecksum((u16 *)(boxmon)->substructs, sizeof((boxmon)->substructs)) +#define DECRYPT_BOX(boxMon) MonDecryptSegment(ENCRY_ARGS_BOX(boxMon)) +#define CHECKSUM(boxMon) CalcMonChecksum((u16 *)(boxMon)->substructs, sizeof((boxMon)->substructs)) #define SHINY_CHECK(otid, pid) (( \ ((((otid) & 0xFFFF0000u) >> 16u)) ^ \ (((otid) & 0xFFFFu)) ^ \ @@ -101,9 +101,9 @@ void ZeroMonData(Pokemon *mon) { ENCRYPT_PTY(mon); } -void ZeroBoxMonData(BoxPokemon *boxmon) { - MI_CpuClearFast(boxmon, sizeof(BoxPokemon)); - ENCRYPT_BOX(boxmon); +void ZeroBoxMonData(BoxPokemon *boxMon) { + MI_CpuClearFast(boxMon, sizeof(BoxPokemon)); + ENCRYPT_BOX(boxMon); } u32 SizeOfStructPokemon(void) { @@ -142,23 +142,23 @@ BOOL ReleaseMonLock(Pokemon *mon, BOOL locked) { return prev; } -BOOL AcquireBoxMonLock(BoxPokemon *boxmon) { +BOOL AcquireBoxMonLock(BoxPokemon *boxMon) { BOOL locked = FALSE; - if (!boxmon->box_lock) { + if (!boxMon->box_lock) { locked = TRUE; - boxmon->box_lock = TRUE; - DECRYPT_BOX(boxmon); + boxMon->box_lock = TRUE; + DECRYPT_BOX(boxMon); } return locked; } -BOOL ReleaseBoxMonLock(BoxPokemon *boxmon, BOOL locked) { +BOOL ReleaseBoxMonLock(BoxPokemon *boxMon, BOOL locked) { BOOL prev = FALSE; - if (boxmon->box_lock == TRUE && locked == TRUE) { + if (boxMon->box_lock == TRUE && locked == TRUE) { prev = TRUE; - boxmon->box_lock = FALSE; - boxmon->checksum = CHECKSUM(boxmon); - ENCRYPT_BOX(boxmon); + boxMon->box_lock = FALSE; + boxMon->checksum = CHECKSUM(boxMon); + ENCRYPT_BOX(boxMon); } return prev; } @@ -182,16 +182,16 @@ void CreateMon(Pokemon *mon, int species, int level, int fixedIV, int hasFixedPe CalcMonLevelAndStats(mon); } -void CreateBoxMon(BoxPokemon *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) { BOOL decry; u32 exp; u32 iv; - ZeroBoxMonData(boxPokemon); - decry = AcquireBoxMonLock(boxPokemon); + ZeroBoxMonData(boxMon); + decry = AcquireBoxMonLock(boxMon); if (hasFixedPersonality == 0) { fixedPersonality = (LCRandom() | (LCRandom() << 16)); } - SetBoxMonData(boxPokemon, MON_DATA_PERSONALITY, &fixedPersonality); + SetBoxMonData(boxMon, MON_DATA_PERSONALITY, &fixedPersonality); if (otIdType == 2) { do { fixedOtId = (LCRandom() | (LCRandom() << 16)); @@ -199,57 +199,57 @@ void CreateBoxMon(BoxPokemon *boxPokemon, int species, int level, int fixedIV, i } else if (otIdType != 1) { fixedOtId = 0; } - SetBoxMonData(boxPokemon, MON_DATA_OTID, &fixedOtId); - SetBoxMonData(boxPokemon, MON_DATA_GAME_LANGUAGE, (void *)&gGameLanguage); - SetBoxMonData(boxPokemon, MON_DATA_SPECIES, &species); - SetBoxMonData(boxPokemon, MON_DATA_SPECIES_NAME, NULL); + SetBoxMonData(boxMon, MON_DATA_OTID, &fixedOtId); + SetBoxMonData(boxMon, MON_DATA_GAME_LANGUAGE, (void *)&gGameLanguage); + SetBoxMonData(boxMon, MON_DATA_SPECIES, &species); + SetBoxMonData(boxMon, MON_DATA_SPECIES_NAME, NULL); exp = GetMonExpBySpeciesAndLevel(species, level); - SetBoxMonData(boxPokemon, MON_DATA_EXPERIENCE, &exp); + SetBoxMonData(boxMon, MON_DATA_EXPERIENCE, &exp); exp = (u32)GetMonBaseStat(species, BASE_FRIENDSHIP); - SetBoxMonData(boxPokemon, MON_DATA_FRIENDSHIP, &exp); - SetBoxMonData(boxPokemon, MON_DATA_MET_LEVEL, &level); - SetBoxMonData(boxPokemon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); + SetBoxMonData(boxMon, MON_DATA_FRIENDSHIP, &exp); + SetBoxMonData(boxMon, MON_DATA_MET_LEVEL, &level); + SetBoxMonData(boxMon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); exp = ITEM_POKE_BALL; - SetBoxMonData(boxPokemon, MON_DATA_POKEBALL, &exp); - SetBoxMonData(boxPokemon, MON_DATA_DP_POKEBALL, &exp); + SetBoxMonData(boxMon, MON_DATA_POKEBALL, &exp); + SetBoxMonData(boxMon, MON_DATA_DP_POKEBALL, &exp); if (fixedIV < 0x20) { - SetBoxMonData(boxPokemon, MON_DATA_HP_IV, &fixedIV); - SetBoxMonData(boxPokemon, MON_DATA_ATK_IV, &fixedIV); - SetBoxMonData(boxPokemon, MON_DATA_DEF_IV, &fixedIV); - SetBoxMonData(boxPokemon, MON_DATA_SPEED_IV, &fixedIV); - SetBoxMonData(boxPokemon, MON_DATA_SPATK_IV, &fixedIV); - SetBoxMonData(boxPokemon, MON_DATA_SPDEF_IV, &fixedIV); + SetBoxMonData(boxMon, MON_DATA_HP_IV, &fixedIV); + SetBoxMonData(boxMon, MON_DATA_ATK_IV, &fixedIV); + SetBoxMonData(boxMon, MON_DATA_DEF_IV, &fixedIV); + SetBoxMonData(boxMon, MON_DATA_SPEED_IV, &fixedIV); + SetBoxMonData(boxMon, MON_DATA_SPATK_IV, &fixedIV); + SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &fixedIV); } else { exp = LCRandom(); iv = exp & 0x1F; - SetBoxMonData(boxPokemon, MON_DATA_HP_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_HP_IV, &iv); iv = (exp & 0x3E0) >> 5; - SetBoxMonData(boxPokemon, MON_DATA_ATK_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_ATK_IV, &iv); iv = (exp & 0x7C00) >> 10; - SetBoxMonData(boxPokemon, MON_DATA_DEF_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_DEF_IV, &iv); exp = LCRandom(); iv = exp & 0x1F; - SetBoxMonData(boxPokemon, MON_DATA_SPEED_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_SPEED_IV, &iv); iv = (exp & 0x3E0) >> 5; - SetBoxMonData(boxPokemon, MON_DATA_SPATK_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_SPATK_IV, &iv); iv = (exp & 0x7C00) >> 10; - SetBoxMonData(boxPokemon, MON_DATA_SPDEF_IV, &iv); + SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &iv); } exp = (u32)GetMonBaseStat(species, BASE_ABILITY_1); iv = (u32)GetMonBaseStat(species, BASE_ABILITY_2); if (iv != 0) { if (fixedPersonality & 1) { - SetBoxMonData(boxPokemon, MON_DATA_ABILITY, &iv); + SetBoxMonData(boxMon, MON_DATA_ABILITY, &iv); } else { - SetBoxMonData(boxPokemon, MON_DATA_ABILITY, &exp); + SetBoxMonData(boxMon, MON_DATA_ABILITY, &exp); } } else { - SetBoxMonData(boxPokemon, MON_DATA_ABILITY, &exp); + SetBoxMonData(boxMon, MON_DATA_ABILITY, &exp); } - exp = GetBoxMonGender(boxPokemon); - SetBoxMonData(boxPokemon, MON_DATA_GENDER, &exp); - InitBoxMonMoveset(boxPokemon); - ReleaseBoxMonLock(boxPokemon, decry); + exp = GetBoxMonGender(boxMon); + SetBoxMonData(boxMon, MON_DATA_GENDER, &exp); + InitBoxMonMoveset(boxMon); + ReleaseBoxMonLock(boxMon, decry); } void CreateMonWithNature(Pokemon *mon, u16 species, u8 level, u8 fixedIv, u8 nature) { @@ -457,49 +457,49 @@ static u32 GetMonDataInternal(Pokemon *mon, int attr, void * dest) { } } -u32 GetBoxMonData(BoxPokemon *boxmon, int attr, void * dest) { +u32 GetBoxMonData(BoxPokemon *boxMon, int attr, void * dest) { u32 ret; u32 checksum; - if (!boxmon->box_lock) { - DECRYPT_BOX(boxmon); - checksum = CHECKSUM(boxmon); - if (checksum != boxmon->checksum) { - GF_ASSERT(checksum == boxmon->checksum); - boxmon->checksum_fail = TRUE; + if (!boxMon->box_lock) { + DECRYPT_BOX(boxMon); + checksum = CHECKSUM(boxMon); + if (checksum != boxMon->checksum) { + GF_ASSERT(checksum == boxMon->checksum); + boxMon->checksum_fail = TRUE; } } - ret = GetBoxMonDataInternal(boxmon, attr, dest); - if (!boxmon->box_lock) { - ENCRYPT_BOX(boxmon); + ret = GetBoxMonDataInternal(boxMon, attr, dest); + if (!boxMon->box_lock) { + ENCRYPT_BOX(boxMon); } return ret; } -static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { +static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void * dest) { u32 ret = 0; - PokemonDataBlockA * blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; - PokemonDataBlockB * blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; - PokemonDataBlockC * blockC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; - PokemonDataBlockD * blockD = &GetSubstruct(boxmon, boxmon->pid, 3)->blockD; + PokemonDataBlockA * blockA = &GetSubstruct(boxMon, boxMon->pid, 0)->blockA; + PokemonDataBlockB * blockB = &GetSubstruct(boxMon, boxMon->pid, 1)->blockB; + PokemonDataBlockC * blockC = &GetSubstruct(boxMon, boxMon->pid, 2)->blockC; + PokemonDataBlockD * blockD = &GetSubstruct(boxMon, boxMon->pid, 3)->blockD; switch (attr) { default: ret = 0; break; case MON_DATA_PERSONALITY: - ret = boxmon->pid; + ret = boxMon->pid; break; case MON_DATA_PARTY_LOCK: - ret = boxmon->party_lock; + ret = boxMon->party_lock; break; case MON_DATA_BOX_LOCK: - ret = boxmon->box_lock; + ret = boxMon->box_lock; break; case MON_DATA_CHECKSUM_FAILED: - ret = boxmon->checksum_fail; + ret = boxMon->checksum_fail; break; case MON_DATA_CHECKSUM: - ret = boxmon->checksum; + ret = boxMon->checksum; break; case MON_DATA_SPECIES_EXISTS: if (blockA->species != SPECIES_NONE) { @@ -509,14 +509,14 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { } break; case MON_DATA_SANITY_IS_EGG: - ret = boxmon->checksum_fail; + ret = boxMon->checksum_fail; if (!ret) { ret = blockB->isEgg; } break; case MON_DATA_SPECIES2: ret = blockA->species; - if (ret != SPECIES_NONE && (blockB->isEgg || boxmon->checksum_fail)) { + if (ret != SPECIES_NONE && (blockB->isEgg || boxMon->checksum_fail)) { ret = SPECIES_EGG; } break; @@ -524,7 +524,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { ret = (u32)CalcLevelBySpeciesAndExp(blockA->species, blockA->exp); break; case MON_DATA_SPECIES: - if (boxmon->checksum_fail) { + if (boxMon->checksum_fail) { ret = SPECIES_EGG; } else { ret = blockA->species; @@ -666,7 +666,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { ret = blockB->spdefIV; break; case MON_DATA_IS_EGG: - ret = boxmon->checksum_fail; + ret = boxMon->checksum_fail; if (!ret) { ret = blockB->isEgg; } @@ -716,9 +716,9 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { ret = blockB->fatefulEncounter; break; case MON_DATA_GENDER: - ret = GetGenderBySpeciesAndPersonality(blockA->species, boxmon->pid); + ret = GetGenderBySpeciesAndPersonality(blockA->species, boxMon->pid); blockB->gender = (u8)ret; - boxmon->checksum = CHECKSUM(boxmon); + boxMon->checksum = CHECKSUM(boxMon); break; case MON_DATA_FORME: ret = blockB->alternateForm; @@ -730,7 +730,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { ret = blockB->Unused; break; case MON_DATA_NICKNAME: - if (boxmon->checksum_fail) { + if (boxMon->checksum_fail) { GetSpeciesNameIntoArray(SPECIES_MANAPHY_EGG, 0, dest); } else { u16 * dest16 = (u16 *)dest; @@ -744,7 +744,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxmon, int attr, void * dest) { ret = blockB->isNicknamed; // fallthrough case MON_DATA_NICKNAME_3: - if (boxmon->checksum_fail) { + if (boxMon->checksum_fail) { STRING * buffer = GetSpeciesName(SPECIES_MANAPHY_EGG, 0); StringCopy(dest, buffer); String_dtor(buffer); @@ -954,27 +954,27 @@ static void SetMonDataInternal(Pokemon *mon, int attr, const void * value) { #undef VALUE } -void SetBoxMonData(BoxPokemon *boxmon, int attr, void * value) { +void SetBoxMonData(BoxPokemon *boxMon, int attr, void * value) { u32 checksum; - if (!boxmon->box_lock) { - DECRYPT_BOX(boxmon); - checksum = CHECKSUM(boxmon); - if (checksum != boxmon->checksum) { - GF_ASSERT(checksum == boxmon->checksum); - boxmon->checksum_fail = TRUE; - ENCRYPT_BOX(boxmon); + if (!boxMon->box_lock) { + DECRYPT_BOX(boxMon); + checksum = CHECKSUM(boxMon); + if (checksum != boxMon->checksum) { + GF_ASSERT(checksum == boxMon->checksum); + boxMon->checksum_fail = TRUE; + ENCRYPT_BOX(boxMon); return; } } - SetBoxMonDataInternal(boxmon, attr, value); - if (!boxmon->box_lock) { - boxmon->checksum = CHECKSUM(boxmon); - ENCRYPT_BOX(boxmon); + SetBoxMonDataInternal(boxMon, attr, value); + if (!boxMon->box_lock) { + boxMon->checksum = CHECKSUM(boxMon); + ENCRYPT_BOX(boxMon); } } -static void SetBoxMonDataInternal(BoxPokemon *boxmon, int attr, const void * value) { +static void SetBoxMonDataInternal(BoxPokemon *boxMon, int attr, const void * value) { #define VALUE(type) (*(const type *)value) u8 flag; u64 mask; @@ -984,28 +984,28 @@ static void SetBoxMonDataInternal(BoxPokemon *boxmon, int attr, const void * val u16 namebuf3[POKEMON_NAME_LENGTH + 1]; STRING * speciesName; - PokemonDataBlockA *blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; - PokemonDataBlockB *blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; - PokemonDataBlockC *blockC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; - PokemonDataBlockD *blockD = &GetSubstruct(boxmon, boxmon->pid, 3)->blockD; + PokemonDataBlockA *blockA = &GetSubstruct(boxMon, boxMon->pid, 0)->blockA; + PokemonDataBlockB *blockB = &GetSubstruct(boxMon, boxMon->pid, 1)->blockB; + PokemonDataBlockC *blockC = &GetSubstruct(boxMon, boxMon->pid, 2)->blockC; + PokemonDataBlockD *blockD = &GetSubstruct(boxMon, boxMon->pid, 3)->blockD; switch (attr) { case MON_DATA_PERSONALITY: - boxmon->pid = VALUE(u32); + boxMon->pid = VALUE(u32); break; case MON_DATA_PARTY_LOCK: GF_ASSERT(0); - boxmon->party_lock = VALUE(u8); + boxMon->party_lock = VALUE(u8); break; case MON_DATA_BOX_LOCK: GF_ASSERT(0); - boxmon->box_lock = VALUE(u8); + boxMon->box_lock = VALUE(u8); break; case MON_DATA_CHECKSUM_FAILED: - boxmon->checksum_fail = VALUE(u8); + boxMon->checksum_fail = VALUE(u8); break; case MON_DATA_CHECKSUM: - boxmon->checksum = VALUE(u16); + boxMon->checksum = VALUE(u16); break; case MON_DATA_SPECIES: blockA->species = VALUE(u16); @@ -1188,7 +1188,7 @@ static void SetBoxMonDataInternal(BoxPokemon *boxmon, int attr, const void * val blockB->fatefulEncounter = VALUE(u8); break; case MON_DATA_GENDER: - blockB->gender = GetGenderBySpeciesAndPersonality(blockA->species, boxmon->pid); + blockB->gender = GetGenderBySpeciesAndPersonality(blockA->species, boxMon->pid); break; case MON_DATA_FORME: blockB->alternateForm = VALUE(u8); @@ -1403,11 +1403,11 @@ static void AddMonDataInternal(Pokemon *mon, int attr, int value) { } } -static void AddBoxMonDataInternal(BoxPokemon *boxmon, int attr, int value) { - PokemonDataBlockA *blockA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; - PokemonDataBlockB *blockB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; - PokemonDataBlockC *blockC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; - PokemonDataBlockD *blockD = &GetSubstruct(boxmon, boxmon->pid, 3)->blockD; +static void AddBoxMonDataInternal(BoxPokemon *boxMon, int attr, int value) { + PokemonDataBlockA *blockA = &GetSubstruct(boxMon, boxMon->pid, 0)->blockA; + PokemonDataBlockB *blockB = &GetSubstruct(boxMon, boxMon->pid, 1)->blockB; + PokemonDataBlockC *blockC = &GetSubstruct(boxMon, boxMon->pid, 2)->blockC; + PokemonDataBlockD *blockD = &GetSubstruct(boxMon, boxMon->pid, 3)->blockD; switch (attr) { case MON_DATA_EXPERIENCE: @@ -1882,10 +1882,10 @@ u32 CalcMonExpToNextLevel(Pokemon *mon) { return CalcBoxMonExpToNextLevel(&mon->box); } -u32 CalcBoxMonExpToNextLevel(BoxPokemon *boxmon) { - u16 species = (u16)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - u16 level = (u16)(CalcBoxMonLevel(boxmon) + 1); - u32 cur = GetBoxMonData(boxmon, MON_DATA_EXPERIENCE, NULL); +u32 CalcBoxMonExpToNextLevel(BoxPokemon *boxMon) { + u16 species = (u16)GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + u16 level = (u16)(CalcBoxMonLevel(boxMon) + 1); + u32 cur = GetBoxMonData(boxMon, MON_DATA_EXPERIENCE, NULL); u32 hi = GetMonExpBySpeciesAndLevel(species, level); return hi - cur; } @@ -1921,11 +1921,11 @@ int CalcMonLevel(Pokemon *mon) { return CalcBoxMonLevel(&mon->box); } -int CalcBoxMonLevel(BoxPokemon *boxmon) { - BOOL decry = AcquireBoxMonLock(boxmon); - int species = (int)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - int exp = (int)GetBoxMonData(boxmon, MON_DATA_EXPERIENCE, NULL); - ReleaseBoxMonLock(boxmon, decry); +int CalcBoxMonLevel(BoxPokemon *boxMon) { + BOOL decry = AcquireBoxMonLock(boxMon); + int species = (int)GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + int exp = (int)GetBoxMonData(boxMon, MON_DATA_EXPERIENCE, NULL); + ReleaseBoxMonLock(boxMon, decry); return CalcLevelBySpeciesAndExp((u16)species, (u32)exp); } @@ -1954,10 +1954,10 @@ u8 GetMonNature(Pokemon *mon) { return GetBoxMonNature(&mon->box); } -u8 GetBoxMonNature(BoxPokemon *boxmon) { - BOOL decry = AcquireBoxMonLock(boxmon); - u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); - ReleaseBoxMonLock(boxmon, decry); +u8 GetBoxMonNature(BoxPokemon *boxMon) { + BOOL decry = AcquireBoxMonLock(boxMon); + u32 personality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); + ReleaseBoxMonLock(boxMon, decry); return GetNatureFromPersonality(personality); } @@ -2072,11 +2072,11 @@ u8 GetMonGender(Pokemon *mon) { return GetBoxMonGender(&mon->box); } -u8 GetBoxMonGender(BoxPokemon *boxmon) { - BOOL decry = AcquireBoxMonLock(boxmon); - u16 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); - ReleaseBoxMonLock(boxmon, decry); +u8 GetBoxMonGender(BoxPokemon *boxMon) { + BOOL decry = AcquireBoxMonLock(boxMon); + u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + u32 pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); + ReleaseBoxMonLock(boxMon, decry); return GetGenderBySpeciesAndPersonality(species, pid); } @@ -2108,17 +2108,17 @@ u8 GetGenderBySpeciesAndPersonality_PreloadedPersonal(const BASE_STATS *personal } } -BOOL BoxMonIsHoldingMail(BoxPokemon *boxmon) { - return ItemIdIsMail(GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL)); +BOOL BoxMonIsHoldingMail(BoxPokemon *boxMon) { + return ItemIdIsMail(GetBoxMonData(boxMon, MON_DATA_HELD_ITEM, NULL)); } u8 MonIsShiny(Pokemon *mon) { return BoxMonIsShiny(&mon->box); } -u8 BoxMonIsShiny(BoxPokemon *boxmon) { - u32 otid = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); - u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); +u8 BoxMonIsShiny(BoxPokemon *boxMon) { + u32 otid = GetBoxMonData(boxMon, MON_DATA_OTID, NULL); + u32 pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); return CalcShininessByOtIdAndPersonality(otid, pid); } @@ -2148,36 +2148,36 @@ u32 GenerateShinyPersonality(u32 otid) { return (u32)((r5 << 16) | r6); } -void GetPokemonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxmon, u8 whichFacing) { - GetBoxmonSpriteCharAndPlttNarcIds(a0, boxmon, whichFacing, FALSE); +void GetPokemonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxMon, u8 whichFacing) { + GetBoxmonSpriteCharAndPlttNarcIds(a0, boxMon, whichFacing, FALSE); } -void sub_02070130(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxmon, u8 whichFacing) { - GetBoxmonSpriteCharAndPlttNarcIds(a0, boxmon, whichFacing, TRUE); +void sub_02070130(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxMon, u8 whichFacing) { + GetBoxmonSpriteCharAndPlttNarcIds(a0, boxMon, whichFacing, TRUE); } -void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BoxPokemon *boxmon, u8 whichFacing, BOOL sp14) { - BOOL decry = AcquireBoxMonLock(boxmon); - u16 species = GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL); - u8 gender = GetBoxMonGender(boxmon); - u8 shiny = BoxMonIsShiny(boxmon); - u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); +void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BoxPokemon *boxMon, u8 whichFacing, BOOL sp14) { + BOOL decry = AcquireBoxMonLock(boxMon); + u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL); + u8 gender = GetBoxMonGender(boxMon); + u8 shiny = BoxMonIsShiny(boxMon); + u32 pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); u8 forme; if (species == SPECIES_EGG) { - if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_MANAPHY) { + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) == SPECIES_MANAPHY) { forme = EGG_MANAPHY; } else { forme = EGG_STANDARD; } } else { - forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); } if (sp14 == TRUE) { DP_GetMonSpriteCharAndPlttNarcIdsEx(spC, species, gender, whichFacing, shiny, forme, pid); } else { GetMonSpriteCharAndPlttNarcIdsEx(spC, species, gender, whichFacing, shiny, forme, pid); } - ReleaseBoxMonLock(boxmon, decry); + ReleaseBoxMonLock(boxMon, decry); } void GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct * spC, u16 species, u8 gender, u8 whichFacing, u8 shiny, u8 forme, u32 personality) { @@ -2466,27 +2466,27 @@ void DP_GetMonSpriteCharAndPlttNarcIdsEx(struct SomeDrawPokemonStruct * spC, u16 } } -u8 sub_0207083C(BoxPokemon *boxmon, u8 whichFacing) { - return sub_02070854(boxmon, whichFacing, FALSE); +u8 sub_0207083C(BoxPokemon *boxMon, u8 whichFacing) { + return sub_02070854(boxMon, whichFacing, FALSE); } -u8 sub_02070848(BoxPokemon *boxmon, u8 whichFacing) { - return sub_02070854(boxmon, whichFacing, TRUE); +u8 sub_02070848(BoxPokemon *boxMon, u8 whichFacing) { + return sub_02070854(boxMon, whichFacing, TRUE); } -u8 sub_02070854(BoxPokemon *boxmon, u8 whichFacing, BOOL a2) { - u16 species = GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL); - u8 gender = GetBoxMonGender(boxmon); - u32 pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); +u8 sub_02070854(BoxPokemon *boxMon, u8 whichFacing, BOOL a2) { + u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL); + u8 gender = GetBoxMonGender(boxMon); + u32 pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); u8 forme; if (species == SPECIES_EGG) { - if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_MANAPHY) { + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) == SPECIES_MANAPHY) { forme = EGG_MANAPHY; } else { forme = EGG_STANDARD; } } else { - forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); } if (a2 == TRUE) { return sub_02070A64(species, gender, whichFacing, forme, pid); @@ -2757,8 +2757,8 @@ u8 GetMonUnownLetter(Pokemon *mon) { return GetBoxMonUnownLetter(&mon->box); } -u8 GetBoxMonUnownLetter(BoxPokemon *boxmon) { - return (u8)GetBoxMonData(boxmon, MON_DATA_FORME, NULL); +u8 GetBoxMonUnownLetter(BoxPokemon *boxMon) { + return (u8)GetBoxMonData(boxMon, MON_DATA_FORME, NULL); } BoxPokemon *Mon_GetBoxMon(Pokemon *mon) { @@ -3037,7 +3037,7 @@ u16 GetEggSpecies(u16 species) { } } -void InitBoxMonMoveset(BoxPokemon *boxmon) { +void InitBoxMonMoveset(BoxPokemon *boxMon) { BOOL decry; u16 * wotbl; int i; @@ -3046,35 +3046,35 @@ void InitBoxMonMoveset(BoxPokemon *boxmon) { u8 level; u16 move; wotbl = AllocFromHeap(0, 22 * sizeof(u16)); - decry = AcquireBoxMonLock(boxmon); - species = (u16)GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL); - level = (u8)CalcBoxMonLevel(boxmon); + decry = AcquireBoxMonLock(boxMon); + species = (u16)GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); + level = (u8)CalcBoxMonLevel(boxMon); LoadWotbl_HandleAlternateForme(species, (int)forme, wotbl); for (i = 0; wotbl[i] != WOTBL_END; i++) { if ((wotbl[i] & WOTBL_LEVEL_MASK) > (level << WOTBL_LEVEL_SHIFT)) break; move = WOTBL_MOVE(wotbl[i]); - if (TryAppendBoxMonMove(boxmon, move) == MOVE_APPEND_FULL) - DeleteBoxMonFirstMoveAndAppend(boxmon, move); + if (TryAppendBoxMonMove(boxMon, move) == MOVE_APPEND_FULL) + DeleteBoxMonFirstMoveAndAppend(boxMon, move); } FreeToHeap(wotbl); - ReleaseBoxMonLock(boxmon, decry); + ReleaseBoxMonLock(boxMon, decry); } u32 TryAppendMonMove(Pokemon *mon, u16 move) { return TryAppendBoxMonMove(Mon_GetBoxMon(mon), move); } -u32 TryAppendBoxMonMove(BoxPokemon *boxmon, u16 move) { +u32 TryAppendBoxMonMove(BoxPokemon *boxMon, u16 move) { u32 ret = MOVE_APPEND_FULL; int i; - BOOL decry = AcquireBoxMonLock(boxmon); + BOOL decry = AcquireBoxMonLock(boxMon); u16 cur_move; for (i = 0; i < 4; i++) { - cur_move = (u16)GetBoxMonData(boxmon, MON_DATA_MOVE1 + i, NULL); + cur_move = (u16)GetBoxMonData(boxMon, MON_DATA_MOVE1 + i, NULL); if (cur_move == MOVE_NONE) { - BoxMonSetMoveInSlot(boxmon, move, (u8)i); + BoxMonSetMoveInSlot(boxMon, move, (u8)i); ret = move; break; } @@ -3083,7 +3083,7 @@ u32 TryAppendBoxMonMove(BoxPokemon *boxmon, u16 move) { break; } } - ReleaseBoxMonLock(boxmon, decry); + ReleaseBoxMonLock(boxMon, decry); return ret; } @@ -3091,17 +3091,17 @@ void DeleteMonFirstMoveAndAppend(Pokemon *mon, u16 move_id) { DeleteBoxMonFirstMoveAndAppend(Mon_GetBoxMon(mon), move_id); } -void DeleteBoxMonFirstMoveAndAppend(BoxPokemon *boxmon, u16 move) { - BOOL decry = AcquireBoxMonLock(boxmon); +void DeleteBoxMonFirstMoveAndAppend(BoxPokemon *boxMon, u16 move) { + BOOL decry = AcquireBoxMonLock(boxMon); int i; u16 moves[4]; u8 pp[4]; u8 ppUp[4]; for (i = 0; i < 3; i++) { - moves[i] = (u16)GetBoxMonData(boxmon, MON_DATA_MOVE1 + i + 1, NULL); - pp[i] = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PP + i + 1, NULL); - ppUp[i] = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + i + 1, NULL); + moves[i] = (u16)GetBoxMonData(boxMon, MON_DATA_MOVE1 + i + 1, NULL); + pp[i] = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PP + i + 1, NULL); + ppUp[i] = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + i + 1, NULL); } moves[3] = move; @@ -3109,12 +3109,12 @@ void DeleteBoxMonFirstMoveAndAppend(BoxPokemon *boxmon, u16 move) { ppUp[3] = 0; for (i = 0; i < 4; i++) { - SetBoxMonData(boxmon, MON_DATA_MOVE1 + i, &moves[i]); - SetBoxMonData(boxmon, MON_DATA_MOVE1PP + i, &pp[i]); - SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + i, &ppUp[i]); + SetBoxMonData(boxMon, MON_DATA_MOVE1 + i, &moves[i]); + SetBoxMonData(boxMon, MON_DATA_MOVE1PP + i, &pp[i]); + SetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + i, &ppUp[i]); } - ReleaseBoxMonLock(boxmon, decry); + ReleaseBoxMonLock(boxMon, decry); } void MonSetMoveInSlot_ResetPpUp(Pokemon *mon, u16 move, u8 slot) { @@ -3132,14 +3132,14 @@ void MonSetMoveInSlot(Pokemon *mon, u16 move, u8 slot) { BoxMonSetMoveInSlot(&mon->box, move, slot); } -void BoxMonSetMoveInSlot(BoxPokemon *boxmon, u16 move, u8 slot) { +void BoxMonSetMoveInSlot(BoxPokemon *boxMon, u16 move, u8 slot) { u8 ppUp; u8 pp; - SetBoxMonData(boxmon, MON_DATA_MOVE1 + slot, &move); - ppUp = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot, NULL); + SetBoxMonData(boxMon, MON_DATA_MOVE1 + slot, &move); + ppUp = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + slot, NULL); pp = (u8)GetMoveMaxPP(move, ppUp); - SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot, &pp); + SetBoxMonData(boxMon, MON_DATA_MOVE1PP + slot, &pp); } u32 MonTryLearnMoveOnLevelUp(Pokemon *mon, int * last_i, u16 * sp0) { @@ -3174,24 +3174,24 @@ void MonSwapMoves(Pokemon *mon, int a, int b) { BoxMonSwapMoves(&mon->box, a, b); } -void BoxMonSwapMoves(BoxPokemon *boxmon, int slot1, int slot2) { +void BoxMonSwapMoves(BoxPokemon *boxMon, int slot1, int slot2) { u16 moves[2]; u8 pp[2]; u8 ppUp[2]; - moves[0] = (u16)GetBoxMonData(boxmon, MON_DATA_MOVE1 + slot1, NULL); - pp[0] = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot1, NULL); - ppUp[0] = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot1, NULL); - moves[1] = (u16)GetBoxMonData(boxmon, MON_DATA_MOVE1 + slot2, NULL); - pp[1] = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot2, NULL); - ppUp[1] = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot2, NULL); + moves[0] = (u16)GetBoxMonData(boxMon, MON_DATA_MOVE1 + slot1, NULL); + pp[0] = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PP + slot1, NULL); + ppUp[0] = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + slot1, NULL); + moves[1] = (u16)GetBoxMonData(boxMon, MON_DATA_MOVE1 + slot2, NULL); + pp[1] = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PP + slot2, NULL); + ppUp[1] = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + slot2, NULL); - SetBoxMonData(boxmon, MON_DATA_MOVE1 + slot1, &moves[1]); - SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot1, &pp[1]); - SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot1, &ppUp[1]); - SetBoxMonData(boxmon, MON_DATA_MOVE1 + slot2, &moves[0]); - SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot2, &pp[0]); - SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot2, &ppUp[0]); + SetBoxMonData(boxMon, MON_DATA_MOVE1 + slot1, &moves[1]); + SetBoxMonData(boxMon, MON_DATA_MOVE1PP + slot1, &pp[1]); + SetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + slot1, &ppUp[1]); + SetBoxMonData(boxMon, MON_DATA_MOVE1 + slot2, &moves[0]); + SetBoxMonData(boxMon, MON_DATA_MOVE1PP + slot2, &pp[0]); + SetBoxMonData(boxMon, MON_DATA_MOVE1PPUP + slot2, &ppUp[0]); } void MonDeleteMoveSlot(Pokemon *mon, u32 slot) { @@ -3290,8 +3290,8 @@ s8 MonGetFlavorPreference(Pokemon *mon, int flavor) { return BoxMonGetFlavorPreference(&mon->box, flavor); } -s8 BoxMonGetFlavorPreference(BoxPokemon *boxmon, int flavor) { - u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); +s8 BoxMonGetFlavorPreference(BoxPokemon *boxMon, int flavor) { + u32 personality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); return GetFlavorPreferenceFromPID(personality, flavor); } @@ -3422,16 +3422,16 @@ BOOL Pokemon_HasPokerus(Pokemon *mon) { return BoxMon_HasPokerus(&mon->box); } -BOOL BoxMon_HasPokerus(BoxPokemon *boxmon) { - return (GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL) & 0xF) != 0; +BOOL BoxMon_HasPokerus(BoxPokemon *boxMon) { + return (GetBoxMonData(boxMon, MON_DATA_POKERUS, NULL) & 0xF) != 0; } BOOL Pokemon_IsImmuneToPokerus(Pokemon *mon) { return BoxMon_IsImmuneToPokerus(&mon->box); } -BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxmon) { - u8 pokerus = (u8)GetBoxMonData(boxmon, MON_DATA_POKERUS, NULL); +BOOL BoxMon_IsImmuneToPokerus(BoxPokemon *boxMon) { + u8 pokerus = (u8)GetBoxMonData(boxMon, MON_DATA_POKERUS, NULL); if (pokerus & 0xF) { return FALSE; } @@ -3445,14 +3445,14 @@ void Pokemon_UpdateArceusForme(Pokemon *mon) { BoxMon_UpdateArceusForme(&mon->box); } -void BoxMon_UpdateArceusForme(BoxPokemon *boxmon) { - u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - u32 ability = GetBoxMonData(boxmon, MON_DATA_ABILITY, NULL); - u32 heldItem = GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL); +void BoxMon_UpdateArceusForme(BoxPokemon *boxMon) { + u32 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + u32 ability = GetBoxMonData(boxMon, MON_DATA_ABILITY, NULL); + u32 heldItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM, NULL); u32 forme; if (species == SPECIES_ARCEUS && ability == ABILITY_MULTITYPE) { forme = GetArceusTypeByHeldItemEffect((u16)GetItemAttr((u16)heldItem, 1, 0)); - SetBoxMonData(boxmon, MON_DATA_FORME, &forme); + SetBoxMonData(boxMon, MON_DATA_FORME, &forme); } } @@ -3503,9 +3503,9 @@ s32 Mon_UpdateGiratinaForme(Pokemon *mon) { return ret; } -s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxmon) { - int species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - int heldItem = GetBoxMonData(boxmon, MON_DATA_HELD_ITEM, NULL); +s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxMon) { + int species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + int heldItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM, NULL); int forme; if (species == SPECIES_GIRATINA) { if (heldItem == ITEM_GRISEOUS_ORB) { @@ -3513,8 +3513,8 @@ s32 BoxMon_UpdateGiratinaForme(BoxPokemon *boxmon) { } else { forme = GIRATINA_ALTERED; } - SetBoxMonData(boxmon, MON_DATA_FORME, &forme); - UpdateBoxMonAbility(boxmon); + SetBoxMonData(boxMon, MON_DATA_FORME, &forme); + UpdateBoxMonAbility(boxMon); return forme; } return -1; @@ -3548,11 +3548,11 @@ void Mon_UpdateShayminForme(Pokemon *mon, int forme) { CalcMonLevelAndStats(mon); } -void BoxMon_UpdateShayminForme(BoxPokemon *boxmon, int forme) { - if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_SHAYMIN) { +void BoxMon_UpdateShayminForme(BoxPokemon *boxMon, int forme) { + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) == SPECIES_SHAYMIN) { GF_ASSERT(forme <= 1); - SetBoxMonData(boxmon, MON_DATA_FORME, &forme); - UpdateBoxMonAbility(boxmon); + SetBoxMonData(boxMon, MON_DATA_FORME, &forme); + UpdateBoxMonAbility(boxMon); } } @@ -3719,19 +3719,19 @@ void sub_020720FC(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 enc } } -void sub_0207213C(BoxPokemon *boxmon, PLAYERPROFILE *playerProfile, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { - sub_0208F270(boxmon, playerProfile, 0, a3, heap_id); - SetBoxMonData(boxmon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); - SetBoxMonData(boxmon, MON_DATA_POKEBALL, &pokeball); - SetBoxMonData(boxmon, MON_DATA_ENCOUNTER_TYPE, &encounterType); +void sub_0207213C(BoxPokemon *boxMon, PLAYERPROFILE *playerProfile, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { + sub_0208F270(boxMon, playerProfile, 0, a3, heap_id); + SetBoxMonData(boxMon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); + SetBoxMonData(boxMon, MON_DATA_POKEBALL, &pokeball); + SetBoxMonData(boxMon, MON_DATA_ENCOUNTER_TYPE, &encounterType); } void sub_0207217C(Pokemon *mon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { sub_02072190(&mon->box, a1, pokeball, a3, encounterType, heap_id); } -void sub_02072190(BoxPokemon *boxmon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { - sub_0207213C(boxmon, a1, pokeball, a3, encounterType, heap_id); +void sub_02072190(BoxPokemon *boxMon, PLAYERPROFILE *a1, u32 pokeball, u32 a3, u32 encounterType, HeapID heap_id) { + sub_0207213C(boxMon, a1, pokeball, a3, encounterType, heap_id); } static const u16 sItemOdds[2][2] = { @@ -3769,12 +3769,12 @@ BOOL GetMonTMHMCompat(Pokemon *mon, u8 tmhm) { return GetBoxMonTMHMCompat(&mon->box, tmhm); } -BOOL GetBoxMonTMHMCompat(BoxPokemon *boxmon, u8 tmhm) { +BOOL GetBoxMonTMHMCompat(BoxPokemon *boxMon, u8 tmhm) { u16 species; u32 forme; - species = GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL); - forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + species = GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL); + forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); return GetTMHMCompatBySpeciesAndForme(species, forme, tmhm); } @@ -3807,23 +3807,23 @@ void UpdateMonAbility(Pokemon *mon) { UpdateBoxMonAbility(&mon->box); } -void UpdateBoxMonAbility(BoxPokemon *boxmon) { - BOOL decry = AcquireBoxMonLock(boxmon); - int species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - int pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); - int forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL); +void UpdateBoxMonAbility(BoxPokemon *boxMon) { + BOOL decry = AcquireBoxMonLock(boxMon); + int species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + int pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); + int forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); int ability1 = GetMonBaseStat_HandleAlternateForme(species, forme, BASE_ABILITY_1); int ability2 = GetMonBaseStat_HandleAlternateForme(species, forme, BASE_ABILITY_2); if (ability2 != ABILITY_NONE) { if (pid & 1) { - SetBoxMonData(boxmon, MON_DATA_ABILITY, &ability2); + SetBoxMonData(boxMon, MON_DATA_ABILITY, &ability2); } else { - SetBoxMonData(boxmon, MON_DATA_ABILITY, &ability1); + SetBoxMonData(boxMon, MON_DATA_ABILITY, &ability1); } } else { - SetBoxMonData(boxmon, MON_DATA_ABILITY, &ability1); + SetBoxMonData(boxMon, MON_DATA_ABILITY, &ability1); } - ReleaseBoxMonLock(boxmon, decry); + ReleaseBoxMonLock(boxMon, decry); } void SetMonPersonality(Pokemon *mon, u32 personality) { @@ -3949,7 +3949,7 @@ u32 CalcMonChecksum(void * _data, u32 size) { return ret; } -PokemonDataBlock *GetSubstruct(BoxPokemon *boxmon, u32 pid, u8 which) { +PokemonDataBlock *GetSubstruct(BoxPokemon *boxMon, u32 pid, u8 which) { static const u8 offsets[32][4] = { {0x00, 0x20, 0x40, 0x60}, {0x00, 0x20, 0x60, 0x40}, @@ -3987,7 +3987,7 @@ PokemonDataBlock *GetSubstruct(BoxPokemon *boxmon, u32 pid, u8 which) { pid = ((pid & 0x3E000) >> 13); GF_ASSERT(which <= 3); - return (PokemonDataBlock *)((char *)boxmon->substructs + offsets[pid][which]); + return (PokemonDataBlock *)((char *)boxMon->substructs + offsets[pid][which]); } int ResolveMonForme(int species, int forme) { @@ -4114,15 +4114,15 @@ BOOL MonCheckFrontierIneligibility(Pokemon *mon) { return IsPokemonLegendaryOrMythical(species, forme); } -BOOL BoxmonBelongsToPlayer(BoxPokemon *boxmon, PLAYERPROFILE * profile, HeapID heap_id) { +BOOL BoxmonBelongsToPlayer(BoxPokemon *boxMon, PLAYERPROFILE * profile, HeapID heap_id) { u32 myId = PlayerProfile_GetTrainerID(profile); - u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); + u32 otId = GetBoxMonData(boxMon, MON_DATA_OTID, NULL); u32 myGender = PlayerProfile_GetTrainerGender(profile); - u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL); + u32 otGender = GetBoxMonData(boxMon, MON_DATA_MET_GENDER, NULL); STRING * r7 = PlayerProfile_GetPlayerName_NewString(profile, heap_id); STRING * r6 = String_ctor(OT_NAME_LENGTH + 1, heap_id); BOOL ret = FALSE; - GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, r6); + GetBoxMonData(boxMon, MON_DATA_OT_NAME_2, r6); if (myId == otId && myGender == otGender && StringCompare(r7, r6) == 0) { ret = TRUE; } @@ -4174,17 +4174,17 @@ void Pokemon_RemoveCapsule(Pokemon *mon) { SetMonData(mon, MON_DATA_SEAL_COORDS, &sp1); } -void RestoreBoxMonPP(BoxPokemon *boxmon) { +void RestoreBoxMonPP(BoxPokemon *boxMon) { int i; u8 pp; - BOOL decry = AcquireBoxMonLock(boxmon); + BOOL decry = AcquireBoxMonLock(boxMon); for (i = 0; i < 4; i++) { - if (GetBoxMonData(boxmon, MON_DATA_MOVE1 + i, NULL) != MOVE_NONE) { - pp = (u8)GetBoxMonData(boxmon, MON_DATA_MOVE1MAXPP + i, NULL); - SetBoxMonData(boxmon, MON_DATA_MOVE1PP + i, &pp); + if (GetBoxMonData(boxMon, MON_DATA_MOVE1 + i, NULL) != MOVE_NONE) { + pp = (u8)GetBoxMonData(boxMon, MON_DATA_MOVE1MAXPP + i, NULL); + SetBoxMonData(boxMon, MON_DATA_MOVE1PP + i, &pp); } } - ReleaseBoxMonLock(boxmon, decry); + ReleaseBoxMonLock(boxMon, decry); } void sub_02072914(NARC *narc, struct UnkStruct_02072914_sub *dest, u16 a2, u16 a3) { @@ -4251,23 +4251,23 @@ void sub_02072A98(Pokemon *mon, struct UnkPokemonStruct_02072A98 *dest) { PokemonDataBlockB *dbB; // sp4 PokemonDataBlockC *dbC; // r7 PokemonDataBlockD *dbD; // ip - BoxPokemon *boxmon; // r6 + BoxPokemon *boxMon; // r6 int i; if (!mon->box.party_lock) { DECRYPT_PTY(mon); DECRYPT_BOX(&mon->box); } - boxmon = Mon_GetBoxMon(mon); - dbA = &GetSubstruct(boxmon, boxmon->pid, 0)->blockA; - dbB = &GetSubstruct(boxmon, boxmon->pid, 1)->blockB; - dbC = &GetSubstruct(boxmon, boxmon->pid, 2)->blockC; - dbD = &GetSubstruct(boxmon, boxmon->pid, 3)->blockD; + boxMon = Mon_GetBoxMon(mon); + dbA = &GetSubstruct(boxMon, boxMon->pid, 0)->blockA; + dbB = &GetSubstruct(boxMon, boxMon->pid, 1)->blockB; + dbC = &GetSubstruct(boxMon, boxMon->pid, 2)->blockC; + dbD = &GetSubstruct(boxMon, boxMon->pid, 3)->blockD; - dest->pid = boxmon->pid; + dest->pid = boxMon->pid; dest->party_lock = FALSE; dest->box_lock = FALSE; - dest->checksum_fail = boxmon->checksum_fail; + dest->checksum_fail = boxMon->checksum_fail; dest->species = dbA->species; dest->heldItem = dbA->heldItem; @@ -4331,20 +4331,20 @@ void sub_02072D64(const struct UnkPokemonStruct_02072A98 *src, Pokemon *mon) { PokemonDataBlockB *dbB; // r6 PokemonDataBlockC *dbC; // r7 PokemonDataBlockD *dbD; // ip - BoxPokemon *boxmon; // sp4 + BoxPokemon *boxMon; // sp4 int i; MI_CpuClearFast(mon, sizeof(Pokemon)); - boxmon = Mon_GetBoxMon(mon); - dbA = &GetSubstruct(boxmon, src->pid, 0)->blockA; - dbB = &GetSubstruct(boxmon, src->pid, 1)->blockB; - dbC = &GetSubstruct(boxmon, src->pid, 2)->blockC; - dbD = &GetSubstruct(boxmon, src->pid, 3)->blockD; + boxMon = Mon_GetBoxMon(mon); + dbA = &GetSubstruct(boxMon, src->pid, 0)->blockA; + dbB = &GetSubstruct(boxMon, src->pid, 1)->blockB; + dbC = &GetSubstruct(boxMon, src->pid, 2)->blockC; + dbD = &GetSubstruct(boxMon, src->pid, 3)->blockD; - boxmon->pid = src->pid; - boxmon->party_lock = FALSE; - boxmon->box_lock = FALSE; - boxmon->checksum_fail = src->checksum_fail; + boxMon->pid = src->pid; + boxMon->party_lock = FALSE; + boxMon->box_lock = FALSE; + boxMon->checksum_fail = src->checksum_fail; dbA->species = src->species; dbA->heldItem = src->heldItem; @@ -4968,7 +4968,7 @@ static const s8 sPokeathlonPerformanceNatureMods[NATURE_NUM][5] = { { 0, -10, 10, 0, 0}, }; -void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxmon, struct PokeathlonTodayPerformance *dest) { +void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxMon, struct PokeathlonTodayPerformance *dest) { u32 pid; u32 nature; struct PokeathlonBasePerformance data; @@ -4979,8 +4979,8 @@ void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxmon, struct PokeathlonTodayP u16 species; u16 forme; - pid = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL); - nature = GetBoxMonNature(boxmon); + pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); + nature = GetBoxMonNature(boxMon); GF_RTC_CopyDateTime(&date, &time); day = date.day; @@ -4989,8 +4989,8 @@ void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxmon, struct PokeathlonTodayP dest->stats[i].dailyMod = sPokeathlonPerformanceNatureMods[nature][i] + (2 * _u32_getDigitN(pid_digit + (day + (7 - i)) * (day + (i + 3)), 0) - 9); } - species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - forme = GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); ReadWholeNarcMemberByIdPair(&data, NARC_poketool_personal_performance, sPokeathlonPerformanceArcIdxs[species] + forme); dest->stats[PERFORMANCE_POWER].base = data.base[ARCPERF_POWER]; dest->stats[PERFORMANCE_POWER].lo = data.minmax[ARCPERF_POWER][0]; @@ -5013,13 +5013,13 @@ void CalcMonPokeathlonPerformance(Pokemon *mon, struct PokeathlonTodayPerformanc CalcBoxMonPokeathlonPerformance(Mon_GetBoxMon(mon), dest); } -void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BoxPokemon *boxmon, const s8 *aprijuice, HeapID heap_id) { +void CalcBoxmonPokeathlonStars(struct PokeathlonPerformanceStars *dest, BoxPokemon *boxMon, const s8 *aprijuice, HeapID heap_id) { #pragma unused(heap_id) int i; struct PokeathlonTodayPerformance basePerf; MI_CpuClear8(dest, sizeof(struct PokeathlonPerformanceStars)); - CalcBoxMonPokeathlonPerformance(boxmon, &basePerf); + CalcBoxMonPokeathlonPerformance(boxMon, &basePerf); for (i = PERFORMANCE_MIN; i < PERFORMANCE_MAX; i++) { s16 stars = ( aprijuice != NULL diff --git a/src/pokemon_icon_idx.c b/src/pokemon_icon_idx.c index 056da6618..a5b4ab026 100644 --- a/src/pokemon_icon_idx.c +++ b/src/pokemon_icon_idx.c @@ -2,21 +2,21 @@ #include "pokemon_icon_idx.h" #include "constants/species.h" -static u16 _BoxMonGetForme(BoxPokemon *boxmon); +static u16 _BoxMonGetForme(BoxPokemon *boxMon); -u32 Boxmon_GetIconNaix(BoxPokemon *boxmon) { +u32 Boxmon_GetIconNaix(BoxPokemon *boxMon) { BOOL encry; int species; BOOL isEgg; int forme; u32 ret; - encry = AcquireBoxMonLock(boxmon); - species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - isEgg = GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL); - forme = _BoxMonGetForme(boxmon); + encry = AcquireBoxMonLock(boxMon); + species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + isEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL); + forme = _BoxMonGetForme(boxMon); ret = GetMonIconNaixEx(species, isEgg, forme); - ReleaseBoxMonLock(boxmon, encry); + ReleaseBoxMonLock(boxMon, encry); return ret; } @@ -78,10 +78,10 @@ u32 GetBattleMonIconNaixEx(u32 species, BOOL isEgg, u32 forme) { return GetMonIconNaixEx(species, isEgg, forme); } -static u16 _BoxMonGetForme(BoxPokemon *boxmon) { - switch (GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL)) { +static u16 _BoxMonGetForme(BoxPokemon *boxMon) { + switch (GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL)) { case SPECIES_UNOWN: - return GetBoxMonUnownLetter(boxmon); + return GetBoxMonUnownLetter(boxMon); case SPECIES_DEOXYS: case SPECIES_SHELLOS: case SPECIES_GASTRODON: @@ -90,7 +90,7 @@ static u16 _BoxMonGetForme(BoxPokemon *boxmon) { case SPECIES_GIRATINA: case SPECIES_SHAYMIN: case SPECIES_ROTOM: - return GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + return GetBoxMonData(boxMon, MON_DATA_FORME, NULL); default: return 0; } @@ -181,17 +181,17 @@ const u8 GetBattleMonIconPaletteEx(u32 species, u32 forme, BOOL isEgg) { return GetMonIconPaletteEx(species, forme, isEgg); } -const u8 Boxmon_GetIconPalette(BoxPokemon *boxmon) { +const u8 Boxmon_GetIconPalette(BoxPokemon *boxMon) { BOOL encry; u32 species; u32 forme; BOOL isEgg; - encry = AcquireBoxMonLock(boxmon); - forme = _BoxMonGetForme(boxmon); - species = GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL); - isEgg = GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL); - ReleaseBoxMonLock(boxmon, encry); + encry = AcquireBoxMonLock(boxMon); + forme = _BoxMonGetForme(boxMon); + species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + isEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL); + ReleaseBoxMonLock(boxMon, encry); return GetMonIconPaletteEx(species, forme, isEgg); } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index d5ea1c500..0fff90df1 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -4,7 +4,7 @@ #include "msgdata/msg/msg_0024.h" void PCStorage_InitializeBoxes(PC_STORAGE *storage); -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE *storage, u32 boxno, BoxPokemon *boxmon); +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE *storage, u32 boxno, BoxPokemon *boxMon); void PCStorage_SetBoxModified(PC_STORAGE *storage, u8 boxno); void PCStorage_init(PC_STORAGE *storage) { @@ -46,11 +46,11 @@ void PCStorage_InitializeBoxes(PC_STORAGE *storage) { storage->curBox = 0; } -BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon *boxmon) { +BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon *boxMon) { u32 i = storage->curBox; do { - RestoreBoxMonPP(boxmon); - if (PCStorage_PlaceMonInBoxFirstEmptySlot(storage, i, boxmon)) { + RestoreBoxMonPP(boxMon); + if (PCStorage_PlaceMonInBoxFirstEmptySlot(storage, i, boxMon)) { PCStorage_SetBoxModified(storage, i); return TRUE; } @@ -62,15 +62,15 @@ BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon return FALSE; } -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon *boxmon) { +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon *boxMon) { u32 i; - RestoreBoxMonPP(boxmon); + RestoreBoxMonPP(boxMon); if (boxno == -1u) { boxno = storage->curBox; } for (i = 0; i < MONS_PER_BOX; i++) { if (GetBoxMonData(&storage->boxes[boxno].mons[i], MON_DATA_SPECIES, NULL) == SPECIES_NONE) { - storage->boxes[boxno].mons[i] = *boxmon; + storage->boxes[boxno].mons[i] = *boxMon; PCStorage_SetBoxModified(storage, boxno); return TRUE; } @@ -78,13 +78,13 @@ BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPo return FALSE; } -BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon *boxmon) { - RestoreBoxMonPP(boxmon); +BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon *boxMon) { + RestoreBoxMonPP(boxMon); if (boxno == -1u) { boxno = storage->curBox; } if (boxno < NUM_BOXES && slotno < MONS_PER_BOX) { - storage->boxes[boxno].mons[slotno] = *boxmon; + storage->boxes[boxno].mons[slotno] = *boxMon; PCStorage_SetBoxModified(storage, boxno); return TRUE; } diff --git a/src/pokewalker.c b/src/pokewalker.c index f2f1a2f81..81e4df227 100644 --- a/src/pokewalker.c +++ b/src/pokewalker.c @@ -55,17 +55,17 @@ void sub_020326A4(POKEWALKER *pokeWalker, u16 a1, u16 a2) { pokeWalker->unk_002 = a2; } -void Pokewalker_SetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxmon) { - MI_CpuCopyFast(boxmon, &pokeWalker->pokemon, sizeof(BoxPokemon)); +void Pokewalker_SetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxMon) { + MI_CpuCopyFast(boxMon, &pokeWalker->pokemon, sizeof(BoxPokemon)); } void Pokewalker_ClearBoxMon(POKEWALKER *pokeWalker) { MI_CpuClearFast(&pokeWalker->pokemon, sizeof(BoxPokemon)); } -BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxmon) { +BOOL Pokewalker_TryGetBoxMon(POKEWALKER *pokeWalker, BoxPokemon *boxMon) { if (pokewalkerHasBoxmon(pokeWalker)) { - MI_CpuCopyFast(&pokeWalker->pokemon, boxmon, sizeof(BoxPokemon)); + MI_CpuCopyFast(&pokeWalker->pokemon, boxMon, sizeof(BoxPokemon)); return TRUE; } return FALSE; diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index a8bb9ee15..de376ba8b 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -4295,18 +4295,18 @@ u32 sub_020467A8(SAVEDATA *saveData) { DAYCARE *dayCare = Sav2_DayCare_get(saveData); for (i = 0; i < 2; i++) { - BoxPokemon *boxmon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, i)); - if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL)) { - ret |= 1 << GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + BoxPokemon *boxMon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(dayCare, i)); + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL)) { + ret |= 1 << GetBoxMonData(boxMon, MON_DATA_FORME, NULL); } } PC_STORAGE *pcStorage = GetStoragePCPointer(saveData); for (i = 0; i < (u32)NUM_BOXES; i++) { for (j = 0; j < MONS_PER_BOX; j++) { - BoxPokemon *boxmon = PCStorage_GetMonByIndexPair(pcStorage, i, j); - if (GetBoxMonData(boxmon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(boxmon, MON_DATA_IS_EGG, NULL)) { - ret |= 1 << GetBoxMonData(boxmon, MON_DATA_FORME, NULL); + BoxPokemon *boxMon = PCStorage_GetMonByIndexPair(pcStorage, i, j); + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) == SPECIES_ROTOM && !GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL)) { + ret |= 1 << GetBoxMonData(boxMon, MON_DATA_FORME, NULL); } } } diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 20d738e1c..13b179ecc 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -162,15 +162,15 @@ BOOL ScrCmd_UpdateDayCareMonObjects(SCRIPTCONTEXT* ctx) { DeleteMapObject(mon_map_object); } - BoxPokemon *dc_box_mon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, dc_mon_idx)); - if (GetBoxMonData(dc_box_mon, MON_DATA_SPECIES, NULL) == SPECIES_NONE) { + BoxPokemon *boxMon = DayCareMon_GetBoxMon(Sav2_DayCare_GetMonX(daycare, dc_mon_idx)); + if (GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL) == SPECIES_NONE) { continue; } - forme = GetBoxMonData(dc_box_mon, MON_DATA_FORME, NULL); - species = GetBoxMonData(dc_box_mon, MON_DATA_SPECIES, NULL); - u32 gender = GetBoxMonData(dc_box_mon, MON_DATA_GENDER, NULL); - BOOL shiny = BoxMonIsShiny(dc_box_mon); + forme = GetBoxMonData(boxMon, MON_DATA_FORME, NULL); + species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); + u32 gender = GetBoxMonData(boxMon, MON_DATA_GENDER, NULL); + BOOL shiny = BoxMonIsShiny(boxMon); CreateDayCareMonSpriteInternal(fsys->mapObjectMan, (u8)dc_mon_idx, species, forme, gender, 1, x, y, fsys->location->mapId, shiny); } From d4959b9262085adf2596689dcd724aff2e6187b3 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 21 May 2023 12:02:56 -0400 Subject: [PATCH 7/7] Review change --- include/pokemon_types_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pokemon_types_def.h b/include/pokemon_types_def.h index 73da22dfb..06bd6d8a5 100644 --- a/include/pokemon_types_def.h +++ b/include/pokemon_types_def.h @@ -116,7 +116,7 @@ typedef union { PokemonDataBlockD blockD; } PokemonDataBlock; -typedef struct { +typedef struct BoxPokemon { /* 0x000 */ u32 pid; /* 0x004 */ u16 party_lock:1; u16 box_lock:1;