From 3a92f1d8b85894461cc37c8fbb0da1eb6cf149a2 Mon Sep 17 00:00:00 2001
From: AZero13 <83477269+AZero13@users.noreply.github.com>
Date: Tue, 14 Jul 2026 13:22:53 -0400
Subject: [PATCH] Alleviate some fakematches in battle_util.c

---
 src/battle_util.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 2032f8c0e281..8949cdbe5b89 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1211,12 +1211,8 @@ u8 DoFieldEndTurnEffects(void)
                 }
             }
 
-            // It's stupid, but won't match without it
-            {
-                u8 *var = &gBattleStruct->turnCountersTracker;
-                (*var)++;
-                gBattleStruct->turnSideTracker = 0;
-            }
+            *(&gBattleStruct->turnCountersTracker) = gBattleStruct->turnCountersTracker + 1;
+            gBattleStruct->turnSideTracker = 0;
             // fall through
         case ENDTURN_REFLECT:
             while (gBattleStruct->turnSideTracker < 2)
@@ -1824,13 +1820,8 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
                 return TRUE;
             }
         }
-        // Why do I have to keep doing this to match?
-        {
-            u8 *state = &gBattleStruct->wishPerishSongState;
-            *state = 1;
-            gBattleStruct->wishPerishSongBattlerId = 0;
-        }
-        // fall through
+        *(&gBattleStruct->wishPerishSongState) = 1;
+        gBattleStruct->wishPerishSongBattlerId = 0;
     case 1:
         while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount)
         {
@@ -1859,13 +1850,8 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
                 return TRUE;
             }
         }
-        // Hm...
-        {
-            u8 *state = &gBattleStruct->wishPerishSongState;
-            *state = 2;
-            gBattleStruct->wishPerishSongBattlerId = 0;
-        }
-        // fall through
+        *(&gBattleStruct->wishPerishSongState) = 2;
+        gBattleStruct->wishPerishSongBattlerId = 0;
     case 2:
         if ((gBattleTypeFlags & BATTLE_TYPE_ARENA)
          && gBattleStruct->arenaTurnCounter == 2