From a20745422bc9db472142f9825f4a0becfdcb38b5 Mon Sep 17 00:00:00 2001
From: PokeCodec <doremylover456@gmail.com>
Date: Tue, 28 Jul 2020 11:24:45 -0400
Subject: [PATCH 1/2] Remove unused variable remaining from ruby

---
 src/contest.c    | 26 +++++++++-----------------
 src/fldeff_cut.c | 15 +++++----------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/contest.c b/src/contest.c
index af9e734fa6..4470ec2a2c 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -999,8 +999,6 @@ void ResetLinkContestBoolean(void)
 
 static void SetupContestGpuRegs(void)
 {
-    u16 savedIme;
-
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@@ -3410,8 +3408,7 @@ static void GetAllChosenMoves(void)
 
 static void RankContestants(void)
 {
-    s32 i;
-    s32 j;
+    s32 i, j;
     s16 arr[CONTESTANT_COUNT];
 
     for (i = 0; i < CONTESTANT_COUNT; i++)
@@ -3486,8 +3483,7 @@ static bool8 ContestantCanUseTurn(u8 contestant)
 {
     if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns)
         return FALSE;
-    else
-        return TRUE;
+    return TRUE;
 }
 
 static void SetContestantStatusesForNextRound(void)
@@ -3541,8 +3537,7 @@ bool8 Contest_IsMonsTurnDisabled(u8 contestant)
 {
     if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns)
         return TRUE;
-    else
-        return FALSE;
+    return FALSE;
 }
 
 static void CalculateTotalPointsForContestant(u8 contestant)
@@ -4485,17 +4480,14 @@ static void CalculateAppealMoveImpact(u8 contestant)
             eContestantStatus[contestant].comboAppealBonus = eContestantStatus[contestant].baseAppeal * eContestantStatus[contestant].completedCombo;
             eContestantStatus[contestant].completedComboFlag = TRUE; // Redundant with completedCombo, used by AI
         }
+        else if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0)
+        {
+            eContestantStatus[contestant].hasJudgesAttention = TRUE;
+            eContestantStatus[contestant].usedComboMove = TRUE;
+        }
         else
         {
-            if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0)
-            {
-                eContestantStatus[contestant].hasJudgesAttention = TRUE;
-                eContestantStatus[contestant].usedComboMove = TRUE;
-            }
-            else
-            {
-                eContestantStatus[contestant].hasJudgesAttention = FALSE;
-            }
+            eContestantStatus[contestant].hasJudgesAttention = FALSE;
         }
     }
     if (eContestantStatus[contestant].repeatedMove)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 34868342fb..1a4260900e 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -227,9 +227,7 @@ bool8 SetUpFieldMove_Cut(void)
                 y = gPlayerFacingPosition.y + sHyperCutStruct[i].y;
                 tileCuttable = TRUE;
 
-                j = 0;
-                do
-                {
+                for (j = 0; j < 2; ++j) {
                     if (sHyperCutStruct[i].unk2[j] == 0)
                         break;
                     if (cutTiles[(u8)(sHyperCutStruct[i].unk2[j] - 1)] == FALSE)
@@ -237,13 +235,13 @@ bool8 SetUpFieldMove_Cut(void)
                         tileCuttable = FALSE;
                         break;
                     }
-                } while (++j <= 1);
+                }
 
                 if (tileCuttable == TRUE)
                 {
                     if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height)
                     {
-                        u8 tileArrayId = ((sHyperCutStruct[i].y * 5) + 12) + (sHyperCutStruct[i].x);
+                        const u8 tileArrayId = ((sHyperCutStruct[i].y * 5) + 12) + (sHyperCutStruct[i].x);
                         tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
                         if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
                         || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE)
@@ -253,11 +251,8 @@ bool8 SetUpFieldMove_Cut(void)
                             sHyperCutTiles[tileArrayId] = TRUE;
                             ret = TRUE;
                         }
-                        else
-                        {
-                            if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE)
-                                sHyperCutTiles[tileArrayId] = TRUE;
-                        }
+                        else if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE)
+                            sHyperCutTiles[tileArrayId] = TRUE;
                     }
                 }
             }

From cc018fe6c90ea84422af94cd5e613d0d9e52da95 Mon Sep 17 00:00:00 2001
From: PokeCodec <doremylover456@gmail.com>
Date: Sun, 23 Aug 2020 17:22:15 -0400
Subject: [PATCH 2/2] Remove const

---
 src/fldeff_cut.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 1a4260900e..939c15dbf0 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -241,7 +241,7 @@ bool8 SetUpFieldMove_Cut(void)
                 {
                     if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height)
                     {
-                        const u8 tileArrayId = ((sHyperCutStruct[i].y * 5) + 12) + (sHyperCutStruct[i].x);
+                        u8 tileArrayId = ((sHyperCutStruct[i].y * 5) + 12) + (sHyperCutStruct[i].x);
                         tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
                         if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
                         || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE)