From 77afb01477a7fd377f889fdb5d4c8feb97fadc2a Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun, 11 Aug 2024 00:23:51 +0200
Subject: [PATCH] Fixes Zigzgoon battle being able to use a Gimmick (#5129)

* Fixes Zigzgoon battle being able to use a Gimmick

* add commit

* Update src/battle_terastal.c

* Update src/battle_dynamax.c
---
 src/battle_dynamax.c  | 4 ++++
 src/battle_terastal.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c
index 06a26718a9..cdcf05f7db 100644
--- a/src/battle_dynamax.c
+++ b/src/battle_dynamax.c
@@ -76,6 +76,10 @@ bool32 CanDynamax(u32 battler)
     u16 species = gBattleMons[battler].species;
     u16 holdEffect = GetBattlerHoldEffect(battler, FALSE);
 
+    // Prevents Zigzagoon from dynamaxing in vanilla.
+    if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT)
+        return FALSE;
+
     // Check if Player has a Dynamax Band.
     if (!TESTING && (GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT
         || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)))
diff --git a/src/battle_terastal.c b/src/battle_terastal.c
index 6866c6aaad..a0580a73d2 100644
--- a/src/battle_terastal.c
+++ b/src/battle_terastal.c
@@ -63,6 +63,10 @@ bool32 CanTerastallize(u32 battler)
 {
     u32 holdEffect = GetBattlerHoldEffect(battler, FALSE);
 
+    // Prevents Zigzagoon from terastalizing in vanilla.
+    if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT)
+        return FALSE;
+
     if (TESTING || GetBattlerSide(battler) == B_SIDE_OPPONENT)
     {
         // Skip all other checks in this block, go to HasTrainerUsedGimmick