3 files changed, 12 insertions, 13 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 096bd878f..21f53b5d7 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -291,8 +291,8 @@ void InitBattle(void)
         SetWildMonHeldItem();
     }
     gMain.inBattle = TRUE;
-    for (i = 0; i < 6; i++)
-        AdjustFriendship(&gPlayerParty[i], 3);
+    for (i = 0; i < PARTY_SIZE; i++)
+        AdjustFriendship(&gPlayerParty[i], FRIENDSHIP_EVENT_LEAGUE_BATTLE);
     gBattleCommunication[0] = 0;
 }
 
@@ -304,7 +304,7 @@ void sub_800E9EC(void)
     u32 status;
     s32 i;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
         hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 8f5ea7cae..950ccb6ae 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -203,7 +203,6 @@ void PlayBGM(u16 songID);
 void MonGainEVs(struct Pokemon*, u16 defeatedSpecies);
 extern u8 gBattleBufferB[4][0x200];
 void HandleLowHpMusicChange(struct Pokemon*, u8 bank);
-void AdjustFriendship(struct Pokemon*, u8 value);
 bool8 IsTradedMon(struct Pokemon*);
 void BattleScriptPop(void);
 void SwitchInClearSetData(void);
@@ -5133,10 +5132,10 @@ static void atk19_tryfaintmon(void)
                     gBattleResults.playerFaintCounter++;
                 if (gBattleMons[bank].level > gBattleMons[gActiveBattler].level)
                 {
-                    if (gBattleMons[bank].level - gBattleMons[gActiveBattler].level > 0x1D)
-                        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], 8);
+                    if (gBattleMons[bank].level - gBattleMons[gActiveBattler].level > 29)
+                        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], FRIENDSHIP_EVENT_FAINT_LARGE);
                     else
-                        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], 6);
+                        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], FRIENDSHIP_EVENT_FAINT_SMALL);
                 }
             }
             else
@@ -5569,7 +5568,7 @@ static void atk23_getexp(void)
                 gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterID];
                 gBattlescriptCurrInstr = BattleScript_LevelUp;
                 gBattleMoveDamage = (gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8));
-                AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterID], 0);
+                AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterID], FRIENDSHIP_EVENT_GROW_LEVEL);
 
                 // update battle mon structure after level up
                 if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterID && gBattleMons[0].hp)
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index be376a9f1..923cf05a4 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -232,16 +232,16 @@ void sub_8094B6C(u8 a, u8 b, u8 c)
     }
 }
 
-u8 sub_8094C20(u8 a)
+u8 sub_8094C20(u8 monIndex)
 {
     u8 retVal;
-    u8 val = a & 1;
+    u8 val = monIndex & 1;
 
-    a /= 2;
+    monIndex /= 2;
     if (val)
-        retVal = gUnknown_02038470[a] & 0xF;
+        retVal = gUnknown_02038470[monIndex] & 0xF;
     else
-        retVal = gUnknown_02038470[a] >> 4;
+        retVal = gUnknown_02038470[monIndex] >> 4;
     return retVal;
 }