From 9dc64b67cdbf75dc2b98470b408e18c327e79837 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Fri, 29 Jul 2022 15:38:23 -0400
Subject: [PATCH] Review changes

---
 include/sound.h              | 1 -
 src/battle_arena.c           | 2 +-
 src/battle_main.c            | 2 +-
 src/battle_script_commands.c | 6 ++----
 src/sound.c                  | 3 ++-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/sound.h b/include/sound.h
index a5463a456..b39a7306a 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -12,7 +12,6 @@ void StopMapMusic(void);
 void FadeOutMapMusic(u8 speed);
 void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed);
 void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed);
-void FadeInNewMapMusic(u16 songNum, u8 speed);
 bool8 IsNotWaitingForBGMStop(void);
 void PlayFanfareByFanfareNum(u8 fanfareNum);
 bool8 WaitFanfare(bool8 stop);
diff --git a/src/battle_arena.c b/src/battle_arena.c
index 9fb477a6d..e405e2795 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -719,7 +719,7 @@ void BattleArena_AddSkillPoints(u8 battler)
         }
         else if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
         {
-            if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[MISS_TYPE] != 1)
+            if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[MISS_TYPE] != B_MSG_PROTECTED)
                 skillPoints[battler] -= 2;
         }
         else if ((gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) && (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE))
diff --git a/src/battle_main.c b/src/battle_main.c
index 481b12eb4..d9469470e 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3286,7 +3286,7 @@ void FaintClearSetData(void)
     gProtectStructs[gActiveBattler].confusionSelfDmg = FALSE;
     gProtectStructs[gActiveBattler].targetNotAffected = FALSE;
     gProtectStructs[gActiveBattler].chargingTurn = FALSE;
-    gProtectStructs[gActiveBattler].fleeType = FALSE;
+    gProtectStructs[gActiveBattler].fleeType = 0;
     gProtectStructs[gActiveBattler].usedImprisonedMove = FALSE;
     gProtectStructs[gActiveBattler].loveImmobility = FALSE;
     gProtectStructs[gActiveBattler].usedDisabledMove = FALSE;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d456a57da..20a613c76 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3322,9 +3322,7 @@ static void Cmd_getexp(void)
             else
             {
                 // music change in wild battle after fainting a poke
-                if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-                 && gBattleMons[0].hp != 0
-                 && !gBattleStruct->wildVictorySong)
+                if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp != 0 && !gBattleStruct->wildVictorySong)
                 {
                     BattleStopLowHpSound();
                     PlayBGM(MUS_VICTORY_WILD);
@@ -3446,7 +3444,7 @@ static void Cmd_getexp(void)
                     gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
                     gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
                 }
-                // What is else if?
+
                 if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
                 {
                     gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL);
diff --git a/src/sound.c b/src/sound.c
index ad9993b54..aa6fb32ee 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -156,7 +156,8 @@ void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed)
     sMapMusicFadeInSpeed = fadeInSpeed;
 }
 
-void FadeInNewMapMusic(u16 songNum, u8 speed)
+// Unused
+static void FadeInNewMapMusic(u16 songNum, u8 speed)
 {
     FadeInNewBGM(songNum, speed);
     sCurrentMapMusic = songNum;