From c32f5849400483772a9f40b36f7342d42c3dd4ff Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sun, 8 Jan 2023 19:50:27 -0300
Subject: [PATCH] Applied review changes

---
 include/battle_util.h |  2 +-
 src/battle_util.c     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/battle_util.h b/include/battle_util.h
index a1f0ad0e8..2c81a361d 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -204,6 +204,6 @@ bool32 IsBattlerTerrainAffected(u8 battlerId, u32 terrainFlag);
 u32 GetBattlerFriendshipScore(u8 battlerId);
 u32 CountBattlerStatIncreases(u8 battlerId, bool32 countEvasionAcc);
 bool32 IsMyceliumMightOnField(void);
-void ChangeTypeBasedOnTerrain(u8 battlerId);
+bool8 ChangeTypeBasedOnTerrain(u8 battlerId);
 
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/src/battle_util.c b/src/battle_util.c
index dac4e00f5..0145babc7 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2069,7 +2069,7 @@ u32 GetBattlerFriendshipScore(u8 battlerId)
 
 static void TryToRevertMimicry(void)
 {
-    u8 i;
+    u32 i;
 
     for (i = 0; i < gBattlersCount; i++)
     {
@@ -4295,7 +4295,7 @@ static u8 ForewarnChooseMove(u32 battler)
     Free(data);
 }
 
-void ChangeTypeBasedOnTerrain(u8 battlerId)
+bool8 ChangeTypeBasedOnTerrain(u8 battlerId)
 {
     u8 battlerType;
     u16 terrainFlags = VarGet(VAR_TERRAIN) & STATUS_FIELD_TERRAIN_ANY;
@@ -4312,9 +4312,11 @@ void ChangeTypeBasedOnTerrain(u8 battlerId)
     else if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN)
         battlerType = TYPE_PSYCHIC;
     else // failsafe
-        battlerType = gSpeciesInfo[battlerId].type1;
+        return FALSE;
+
     SET_BATTLER_TYPE(battlerId, battlerType);
     PREPARE_TYPE_BUFFER(gBattleTextBuff1, battlerType);
+    return TRUE;
 }
 
 u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 moveArg)
@@ -6206,7 +6208,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
         switch (GetBattlerAbility(battler))
         {
         case ABILITY_MIMICRY:
-            if (!gSpecialStatuses[battler].terrainAbilityDone)
+            if (!gSpecialStatuses[battler].terrainAbilityDone && ChangeTypeBasedOnTerrain(battler))
             {
                 gSpecialStatuses[battler].terrainAbilityDone = TRUE;
                 ChangeTypeBasedOnTerrain(battler);