More formatting fixes

src/battle_gfx_sfx_util.c

@@ -1014,16 +1014,13 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite)
         palOffset = (battlerId * 16) + 0x100;
         LoadCompressedPalette(gSubstituteDollPal, palOffset, 32);
     }
-    else
+    else if (!IsContest())
-    {
-        if (!IsContest())
     {
         if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
             BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId);
         else
             BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId);
     }
-    }
 }
 
 void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId)

src/battle_main.c

@@ -4875,7 +4875,11 @@ static void SetActionsAndBattlersTurnOrder(void)
             {
                 u8 battler1 = gBattlerByTurnOrder[i];
                 u8 battler2 = gBattlerByTurnOrder[j];
-                if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM && gActionsByTurnOrder[i] != B_ACTION_SWITCH && gActionsByTurnOrder[j] != B_ACTION_SWITCH)
+
+                if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM
+                    && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM
+                    && gActionsByTurnOrder[i] != B_ACTION_SWITCH
+                    && gActionsByTurnOrder[j] != B_ACTION_SWITCH)
                 {
                     if (GetWhoStrikesFirst(battler1, battler2, FALSE))
                         SwapTurnOrder(i, j);

src/event_object_movement.c

@@ -8847,8 +8847,7 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct
     }
     else
     {
-        u8 i;
+        u8 i, firstFreeSlot;
-        u8 firstFreeSlot;
         bool32 found;
         for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
         {

src/link_rfu_2.c

@@ -1550,7 +1550,10 @@ static bool8 CheckForLeavingGroupMembers(void)
     {
         if (Rfu.partnerSendStatuses[i] == RFU_STATUS_JOIN_GROUP_OK
          || Rfu.partnerSendStatuses[i] == RFU_STATUS_JOIN_GROUP_NO)
+        {
             continue;
+        }
+
         if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS
          || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN)
         {

src/menu_specialized.c

@@ -894,8 +894,6 @@ static u8 *GetConditionMenuMonString(u8 *dst, u16 boxId, u16 monId)
     {
         return StringCopyPadded(dst, gText_EggNickname, 0, 12);
     }
-    else
-    {
     GetBoxOrPartyMonData(boxId, monId, MON_DATA_NICKNAME, dst);
     StringGetEnd10(dst);
     species = GetBoxOrPartyMonData(boxId, monId, MON_DATA_SPECIES, NULL);
@@ -907,8 +905,8 @@ static u8 *GetConditionMenuMonString(u8 *dst, u16 boxId, u16 monId)
     else
     {
         // Needed to match, feel free to remove.
-            boxId++;boxId--;
+        boxId++, boxId--;
-            monId++;monId--;
+        monId++, monId--;
 
         boxMon = GetBoxedMonPtr(boxId, monId);
         gender = GetBoxMonGender(boxMon);
@@ -963,7 +961,6 @@ static u8 *GetConditionMenuMonString(u8 *dst, u16 boxId, u16 monId)
     *str = EOS;
 
     return str;
-    }
 }
 
 // Buffers the string in src to dest up to n chars. If src is less than n chars, fill with spaces