From a104c156cc236f81e80d26909bc9857b06d4ff74 Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Thu, 28 Jan 2021 09:00:46 -0700
Subject: [PATCH 1/3] thaw move list function

---
 src/battle_util.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 58219080ef..82bd049a27 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2834,6 +2834,28 @@ void TryClearRageAndFuryCutter(void)
     }
 }
 
+static bool32 IsThawingMove(u8 battlerId, u16 move)
+{
+    switch (move)
+    {
+    case MOVE_BURN_UP:
+        if (!IS_BATTLER_OF_TYPE(battlerId, TYPE_FIRE))
+            return FALSE;
+        //fallthrough
+    case MOVE_FLAME_WHEEL:
+    case MOVE_FLARE_BLITZ:
+    case MOVE_FUSION_FLARE:
+    case MOVE_PYRO_BALL:
+    case MOVE_SACRED_FIRE:
+    case MOVE_SCALD:
+    case MOVE_SCORCHING_SANDS:
+    case MOVE_STEAM_ERUPTION:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
 enum
 {
     CANCELLER_FLAGS,
@@ -3133,8 +3155,7 @@ u8 AtkCanceller_UnableToUseMove(void)
         case CANCELLER_THAW: // move thawing
             if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE)
             {
-                if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT
-                    || (gBattleMoves[gCurrentMove].effect == EFFECT_BURN_UP && IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_FIRE)))
+                if (IsThawingMove(gBattlerAttacker, gBattleMoves[gCurrentMove].effect))
                 {
                     gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();

From 949946933732b806d3ee12f3a02f68b79084a783 Mon Sep 17 00:00:00 2001
From: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Date: Sun, 31 Jan 2021 14:43:24 -0700
Subject: [PATCH 2/3] Update src/battle_util.c

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
---
 src/battle_util.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/battle_util.c b/src/battle_util.c
index 82bd049a27..53383caa86 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2849,6 +2849,7 @@ static bool32 IsThawingMove(u8 battlerId, u16 move)
     case MOVE_SACRED_FIRE:
     case MOVE_SCALD:
     case MOVE_SCORCHING_SANDS:
+    case MOVE_SIZZLY_SLIDE:
     case MOVE_STEAM_ERUPTION:
         return TRUE;
     default:

From 552f548700dcb77e6ab44141cc5101541b53bccc Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Sun, 31 Jan 2021 14:55:44 -0700
Subject: [PATCH 3/3] fix IsThawingMove

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

diff --git a/src/battle_util.c b/src/battle_util.c
index 82bd049a27..05c4ce9f37 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -3155,7 +3155,7 @@ u8 AtkCanceller_UnableToUseMove(void)
         case CANCELLER_THAW: // move thawing
             if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE)
             {
-                if (IsThawingMove(gBattlerAttacker, gBattleMoves[gCurrentMove].effect))
+                if (IsThawingMove(gBattlerAttacker, gCurrentMove))
                 {
                     gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();