fixing formatting

pret · Jan 29, 2024 · 4ab62fb · 4ab62fb
1 parent 98d93b3
commit 4ab62fb
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 38 deletions.
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
@@ -38,7 +38,7 @@ enum PokemonDataParam {
     MON_DATA_3,
     MON_DATA_4,
     MON_DATA_SPECIES,
-    MON_DATA_HELD_ITEM, // 6
+    MON_DATA_HELD_ITEM,
     MON_DATA_OT_ID,
     MON_DATA_EXP,
     MON_DATA_FRIENDSHIP,
@@ -192,10 +192,10 @@ enum PokemonDataParam {
     MON_DATA_OT_GENDER,
     MON_DATA_158,
     MON_DATA_159,
-    MON_DATA_STATUS_CONDITION, // 160
+    MON_DATA_STATUS_CONDITION,
     MON_DATA_LEVEL,
     MON_DATA_162,
-    MON_DATA_CURRENT_HP, //163
+    MON_DATA_CURRENT_HP,
     MON_DATA_MAX_HP,
     MON_DATA_ATK,
     MON_DATA_DEF,
@@ -204,7 +204,7 @@ enum PokemonDataParam {
     MON_DATA_SP_DEF,
     MON_DATA_170,
     MON_DATA_171,
-    MON_DATA_172, // data sanity?
+    MON_DATA_172, //!< possible data sanity check
     MON_DATA_173,
     MON_DATA_SPECIES_EGG,
     MON_DATA_COMBINED_IVS,

diff --git a/include/pokemon.h b/include/pokemon.h
@@ -801,10 +801,10 @@ int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMov
 
 void Pokemon_ApplyPokerus(Party *party);
 u8 Pokemon_HasPokerus(Party *party, u8 param1);
-void UpdatePokerusStatusInParty(Party *party, s32 param1);
+void Party_UpdatePokerusStatus(Party *party, s32 param1);
 void Pokemon_ValidatePokerus(Party *party);
-BOOL IsPokemonInfectedWithPokerus(Pokemon *mon);
-BOOL CanPokemonSpreadPokerus(Pokemon *mon);
+BOOL Pokemon_InfectedWithPokerus(Pokemon *mon);
+BOOL Pokemon_CanSpreadPokerus(Pokemon *mon);
 
 /**
  * @brief Sets Arceus' form based on its held item. Has no effect if the given Pokemon is not an Arceus
@@ -953,10 +953,10 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie
  * @param delay                 Number of frames until playback will begin.
  */
 void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
-BOOL IsPokemonEligibleForAction(Pokemon *mon);
+BOOL Pokemon_IsEligibleForAction(Pokemon *mon);
 void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2);
+void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
+void Pokemon_GiveHeldItem(Pokemon *mon, u32 param1, int param2);
 BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);
 BOOL CanPokemonFormLearnTM(u16 monSpecies, int monForm, u8 tmID);
 

diff --git a/src/main.c b/src/main.c
@@ -84,7 +84,7 @@ void NitroMain (void)
     Unk_02101D28.unk_10.unk_00 = -1;
     Unk_02101D28.unk_10.unk_08 = sub_020244AC();
 
-    sub_02003B60(GetChatotCryFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
+    sub_02003B60(GetChatotCryDataFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
     sub_02022844();
 
     if (sub_02038FFC(3) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
@@ -1686,7 +1686,7 @@ static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param
         }
     }
 
-    AssignHeldItemToPokemon(param2, param3->battleType, v0);
+    Pokemon_GiveHeldItem(param2, param3->battleType, v0);
 
     {
         u8 v1;

diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
@@ -1233,7 +1233,7 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0)
         param0->unk_00++;
 
         {
-            IsPokemonEligibleForAction(param0->unk_5C);
+            Pokemon_IsEligibleForAction(param0->unk_5C);
         }
     }
 

diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
@@ -332,7 +332,7 @@ int ov19_021D0E58 (UnkStruct_020067E8 * param0, int * param1)
     if (Party_HasSpecies(v0->unk_124, 441) == 0) {
         ChatotCry * v1 = GetChatotCryDataFromSave(v0->unk_11C);
 
-        ResetChatotCryStatus(v1);
+        ResetChatotCryDataStatus(v1);
     }
 
     ov19_021D64A0(v0->unk_114);

diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
@@ -700,7 +700,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0)
         }
         break;
     case 14:
-        ov88_0223D140(GetChatotCryFromSave(param0->unk_04));
+        ov88_0223D140(GetChatotCryDataFromSave(param0->unk_04));
         param0->unk_4C++;
         break;
     case 15:

diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
@@ -361,7 +361,7 @@ void ov104_0222E134 (SaveData * param0, Pokemon * param1)
     TrainerInfo * v5 = sub_02025E38(param0);
 
     v0 = Pokemon_GetValue(param1, MON_DATA_OT_ID, NULL);
-    PostCapturePokemonProcessing(param1, sub_02025E38(param0), 4, 0, 0, 11);
+    Pokemon_UpdateAfterCatch(param1, sub_02025E38(param0), 4, 0, 0, 11);
 
     v3 = sub_0203A138(562);
     sub_0209304C(param1, v5, v4, v3, 11);

diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
@@ -308,7 +308,7 @@ void ov104_0223BA24 (Party * param0)
 
 void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, Pokemon * param1)
 {
-    PostCapturePokemonProcessing(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
+    Pokemon_UpdateAfterCatch(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
     return;
 }
 

diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
@@ -294,7 +294,7 @@ BOOL ov104_0223C000 (u8 param0)
 
 void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, Pokemon * param1)
 {
-    PostCapturePokemonProcessing(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
+    Pokemon_UpdateAfterCatch(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
     return;
 }
 

diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
@@ -132,7 +132,7 @@ int ov118_021D0DBC (GameWindowLayout * param0)
         v0->unk_00++;
         break;
     case 7:
-        IsPokemonEligibleForAction(v1);
+        Pokemon_IsEligibleForAction(v1);
         v0->unk_00++;
         break;
     case 8:

diff --git a/src/pokemon.c b/src/pokemon.c
@@ -3785,7 +3785,7 @@ u8 Pokemon_HasPokerus(Party *party, u8 param1)
     return result;
 }
 
-void UpdatePokerusStatusInParty(Party *party, s32 param1)
+void Party_UpdatePokerusStatus(Party *party, s32 param1)
 {
     int currentPartyCount = Party_GetCurrentCount(party);
 
@@ -3846,7 +3846,7 @@ void Pokemon_ValidatePokerus(Party *party)
     }
 }
 
-BOOL IsPokemonInfectedWithPokerus(Pokemon *mon)
+BOOL Pokemon_InfectedWithPokerus(Pokemon *mon)
 {
     return IsBoxPokemonInfectedWithPokerus(&mon->box);
 }
@@ -3856,7 +3856,7 @@ static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon)
     return (BoxPokemon_GetValue(boxMon, MON_DATA_POKERUS, NULL) & 0xf) != 0;
 }
 
-BOOL CanPokemonSpreadPokerus(Pokemon *mon)
+BOOL Pokemon_CanSpreadPokerus(Pokemon *mon)
 {
     return CanBoxPokemonSpreadPokerus(&mon->box);
 }
@@ -4215,7 +4215,7 @@ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16
     Sound_PlayDelayedPokemonCry(crymod, species, pan, volume, heapID, delay, form);
 }
 
-BOOL IsPokemonEligibleForAction(Pokemon *mon)
+BOOL Pokemon_IsEligibleForAction(Pokemon *mon)
 {
     int monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
     int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
@@ -4244,7 +4244,7 @@ static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *pa
     BoxPokemon_SetValue(boxMon, MON_DATA_158, &param4);
 }
 
-void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
+void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
     PostCaptureBoxPokemonProcessing(&mon->box, param1, monPokeball, param3, param4, param5);
 }
@@ -4259,7 +4259,7 @@ static const u16 sHeldItemChance[][2] = {
     {20, 80}
 };
 
-void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2)
+void Pokemon_GiveHeldItem(Pokemon *mon, u32 param1, int param2)
 {
     if (param1 & (0x1 | 0x80)) {
         return;

diff --git a/src/unk_02006224.c b/src/unk_02006224.c
@@ -49,7 +49,7 @@ BOOL IsChatotCryStructReadyForProcessing (const ChatotCry * cry)
     u8 * v0 = sub_02003D5C(31);
     u8 * v1 = sub_02003D5C(54);
 
-    if (IsChatotCryValid(cry) == 0) {
+    if (IsChatotCryDataValid(cry) == 0) {
         return 0;
     }
 
@@ -153,7 +153,7 @@ MICResult StopMicSampling (void)
 
 void StoreMicDataInChatotCryStruct (ChatotCry * param0)
 {
-    StoreProcessedAudioInChatotCry(param0, (const s8 *)sub_02005014());
+    StoreProcessedAudioInChatotCryData(param0, (const s8 *)sub_02005014());
     return;
 }
 
@@ -209,7 +209,7 @@ int Sound_Chatter (ChatotCry * param0)
     const s8 * v0;
     s8 v1;
 
-    if (IsChatotCryValid(param0) == 0) {
+    if (IsChatotCryDataValid(param0) == 0) {
         return 0;
     }
 

diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
@@ -121,7 +121,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0)
     v8.unk_14 = sub_0202A750(param0->unk_34->unk_0C);
     v8.unk_18 = sub_02025E44(param0->unk_34->unk_0C);
     v8.unk_1C = param0->unk_34->unk_0C;
-    v8.unk_20 = GetChatotCryFromSave(param0->unk_34->unk_0C);
+    v8.unk_20 = GetChatotCryDataFromSave(param0->unk_34->unk_0C);
 
     *v2 = sub_02093800(&v8);
 

diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c
@@ -223,7 +223,7 @@ BOOL sub_020484F8 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    if (IsChatotCryStructReadyForProcessing(GetChatotCryFromSave(param0->unk_34->unk_0C)) == 1) {
+    if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->unk_34->unk_0C)) == 1) {
         *v0 = 1;
         return 0;
     }
@@ -253,7 +253,7 @@ BOOL sub_0204855C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048568 (UnkStruct_0203E724 * param0)
 {
-    StoreMicDataInChatotCryStruct(GetChatotCryFromSave(param0->unk_34->unk_0C));
+    StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->unk_34->unk_0C));
     return 1;
 }
 

diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
@@ -100,7 +100,7 @@ BattleParams * sub_02051D8C (int param0, u32 param1)
     }
 
     for (v0 = 0; v0 < 4; v0++) {
-        v1->unk_F0[v0] = AllocateAndInitializeChatotCry(param0);
+        v1->unk_F0[v0] = AllocateAndInitializeChatotCryData(param0);
     }
 
     v1->unk_E0 = sub_0207D3C0(param0);
@@ -247,7 +247,7 @@ void sub_02052184 (BattleParams * param0, const TrainerInfo * param1, int param2
 
 void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2)
 {
-    CopyChatotCry(param0->unk_F0[param2], param1);
+    CopyChatotCryData(param0->unk_F0[param2], param1);
 }
 
 void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)

diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
@@ -101,7 +101,7 @@ static void sub_02055AC0 (UnkStruct_0203CDB0 * param0, s32 param1)
         Party * v0;
 
         v0 = Party_GetFromSavedata(param0->unk_0C);
-        UpdatePokerusStatusInParty(v0, param1);
+        Party_UpdatePokerusStatus(v0, param1);
     }
 
     {

diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c
@@ -1102,9 +1102,9 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStru
     param2->unk_4E = Pokemon_GetValue(param1, MON_DATA_FORM, NULL);
     param2->unk_50_0 = sub_0208E9F0(param1);
 
-    if (CanPokemonSpreadPokerus(param1) == 1) {
+    if (Pokemon_CanSpreadPokerus(param1) == 1) {
         param2->unk_50_30 = 2;
-    } else if (IsPokemonInfectedWithPokerus(param1) == 1) {
+    } else if (Pokemon_InfectedWithPokerus(param1) == 1) {
         param2->unk_50_30 = 1;
 
         if (param2->unk_50_0 == 7) {

diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
@@ -445,10 +445,10 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0)
     }
 
     for (v2 = 0; v2 < 4; v2++) {
-        v0->unk_14C[v2] = AllocateAndInitializeChatotCry(20);
+        v0->unk_14C[v2] = AllocateAndInitializeChatotCryData(20);
     }
 
-    CopyChatotCry(v0->unk_14C[0], param0->unk_20);
+    CopyChatotCryData(v0->unk_14C[0], param0->unk_20);
 
     {
         Pokemon_Copy(param0->unk_08, v0->unk_00.unk_00[0]);
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        AssignHeldItemToPokemon(param2, param3->battleType, v0);
+        Pokemon_GiveHeldItem(param2, param3->battleType, v0);
         {
             u8 v1;
@@ Expand Down @@