From 556a863ee33dbb03fc99ddfd9c3c0773e4b81c2c Mon Sep 17 00:00:00 2001
From: amiosi <44352097+amiosi@users.noreply.github.com>
Date: Wed, 30 Dec 2020 22:56:15 -0500
Subject: [PATCH 01/16] minimize pr (also text)

---
 src/data/battle_moves.h    | 76 ++++++++++++++++++++++++++++++--------
 src/data/text/abilities.h  |  2 +-
 src/data/text/move_names.h |  4 +-
 3 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 13cef869b9..e1ea9db773 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -356,7 +356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_STOMP] =
     {
-        .effect = EFFECT_FLINCH_MINIMIZE_HIT,
+        .effect = EFFECT_FLINCH_HIT,
         .power = 65,
         .type = TYPE_NORMAL,
         .accuracy = 100,
@@ -526,6 +526,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_BODY_SLAM] =
     {
+		#if B_UPDATED_MOVE_DATA >= GEN_6
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+		#endif
         .effect = EFFECT_PARALYZE_HIT,
         .power = 85,
         .type = TYPE_NORMAL,
@@ -534,7 +539,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 30,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -4728,7 +4732,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_NEEDLE_ARM] =
     {
-        .effect = EFFECT_FLINCH_MINIMIZE_HIT,
+		#if B_UPDATED_MOVE_DATA >= GEN_4
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+		#endif
+        .effect = EFFECT_FLINCH_HIT,
         .power = 60,
         .type = TYPE_GRASS,
         .accuracy = 100,
@@ -4736,7 +4745,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 30,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -4849,7 +4857,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_ASTONISH] =
     {
-        .effect = EFFECT_FLINCH_MINIMIZE_HIT,
+		#if B_UPDATED_MOVE_DATA >= GEN_4
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+		#endif
+		.effect = EFFECT_FLINCH_HIT,
         .power = 30,
         .type = TYPE_GHOST,
         .accuracy = 100,
@@ -4857,7 +4870,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 30,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -5098,17 +5110,21 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     {
         #if B_UPDATED_MOVE_DATA >= GEN_6
             .pp = 20,
+			.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+		#elif B_UPDATED_MOVE_DATA == GEN_4 || B_UPDATED_MOVE_DATA == GEN_5
+			.pp = 30,
+			.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
         #else
             .pp = 30,
+			.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
         #endif
-        .effect = EFFECT_FLINCH_MINIMIZE_HIT,
+        .effect = EFFECT_FLINCH_HIT,
         .power = 80,
         .type = TYPE_PSYCHIC,
         .accuracy = 100,
         .secondaryEffectChance = 10,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
         .split = SPLIT_SPECIAL,
     },
 
@@ -6378,6 +6394,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_DRAGON_RUSH] =
     {
+		#if B_UPDATED_MOVE_DATA >= GEN_6
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+		#endif
         .effect = EFFECT_FLINCH_HIT,
         .power = 100,
         .type = TYPE_DRAGON,
@@ -6386,7 +6407,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 20,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -7275,6 +7295,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_SHADOW_FORCE] =
     {
+		#if B_UPDATED_MOVE_DATA == GEN_6
+			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+		#endif
         .effect = EFFECT_SEMI_INVULNERABLE,
         .power = 120,
         .type = TYPE_GHOST,
@@ -7283,7 +7308,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -7530,6 +7554,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_HEAVY_SLAM] =
     {
+		#if B_UPDATED_MOVE_DATA >= GEN_7
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+		#endif
         .effect = EFFECT_HEAT_CRASH,
         .power = 1,
         .type = TYPE_STEEL,
@@ -7538,7 +7567,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -8294,6 +8322,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_HEAT_CRASH] =
     {
+		#if B_UPDATED_MOVE_DATA >= GEN_6
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+		#endif
         .effect = EFFECT_HEAT_CRASH,
         .power = 1,
         .type = TYPE_FIRE,
@@ -8302,7 +8335,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 0,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -8322,7 +8354,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_STEAMROLLER] =
     {
-        .effect = EFFECT_FLINCH_MINIMIZE_HIT,
+		#if B_UPDATED_MOVE_DATA >= GEN_6
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+		#endif
+        .effect = EFFECT_FLINCH_HIT,
         .power = 65,
         .type = TYPE_BUG,
         .accuracy = 100,
@@ -8330,7 +8367,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 30,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_SHEER_FORCE_BOOST,
         .split = SPLIT_PHYSICAL,
     },
 
@@ -8749,6 +8785,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_PHANTOM_FORCE] =
     {
+		#if B_UPDATED_MOVE_DATA == GEN_6
+			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+		#endif
         .effect = EFFECT_SEMI_INVULNERABLE,
         .power = 90,
         .type = TYPE_GHOST,
@@ -8757,7 +8798,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 100,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
         .split = SPLIT_PHYSICAL,
         .argument = MOVE_EFFECT_FEINT,
     },
@@ -10577,6 +10617,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_DOUBLE_IRON_BASH] =
     {
+		#if B_UPDATED_MOVE_DATA >= GEN_8
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST,
+		#else
+			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST,
+		#endif
         .effect = EFFECT_PLACEHOLDER,   //TODO (EFFECT_FLINCH_HIT + EFFECT_DOUBLE_HIT)
         .power = 60,
         .type = TYPE_STEEL,
@@ -10585,7 +10630,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .secondaryEffectChance = 30,
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
-        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST,
         .split = SPLIT_PHYSICAL,
     },
     
diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h
index 37fb15f254..faead30897 100644
--- a/src/data/text/abilities.h
+++ b/src/data/text/abilities.h
@@ -303,7 +303,7 @@ const u8 gAbilityNames[ABILITIES_COUNT_GEN8][ABILITY_NAME_LENGTH + 1] =
     [ABILITY_SOUNDPROOF] = _("Soundproof"),
     [ABILITY_RAIN_DISH] = _("Rain Dish"),
     [ABILITY_SAND_STREAM] = _("Sand Stream"),
-    [ABILITY_PRESSURE] = _("PRESSURE"),
+    [ABILITY_PRESSURE] = _("Pressure"),
     [ABILITY_THICK_FAT] = _("Thick Fat"),
     [ABILITY_EARLY_BIRD] = _("Early Bird"),
     [ABILITY_FLAME_BODY] = _("Flame Body"),
diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h
index 8df3a514dd..74c19f4982 100644
--- a/src/data/text/move_names.h
+++ b/src/data/text/move_names.h
@@ -185,7 +185,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_PROTECT] = _("Protect"),
     [MOVE_MACH_PUNCH] = _("Mach Punch"),
     [MOVE_SCARY_FACE] = _("Scary Face"),
-    [MOVE_FAINT_ATTACK] = _("Faint Attack"),
+    [MOVE_FAINT_ATTACK] = _("Feint Attack"),
     [MOVE_SWEET_KISS] = _("Sweet Kiss"),
     [MOVE_BELLY_DRUM] = _("Belly Drum"),
     [MOVE_SLUDGE_BOMB] = _("Sludge Bomb"),
@@ -567,7 +567,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_STICKY_WEB] = _("Sticky Web"),
     [MOVE_FELL_STINGER] = _("Fell Stinger"),
     [MOVE_PHANTOM_FORCE] = _("PhantomForce"),
-    [MOVE_TRICK_OR_TREAT] = _("Halloween"),
+    [MOVE_TRICK_OR_TREAT] = _("TrickOrTreat"),
     [MOVE_NOBLE_ROAR] = _("Noble Roar"),
     [MOVE_ION_DELUGE] = _("Ion Deluge"),
     [MOVE_PARABOLIC_CHARGE] = _("Parabolic Ch"),

From 8d1383f0d5fe38f42842e6db9ff16d2e6be90f43 Mon Sep 17 00:00:00 2001
From: amiosi <44352097+amiosi@users.noreply.github.com>
Date: Wed, 30 Dec 2020 23:51:08 -0500
Subject: [PATCH 02/16] no text

---
 src/data/text/abilities.h  | 2 +-
 src/data/text/move_names.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h
index faead30897..37fb15f254 100644
--- a/src/data/text/abilities.h
+++ b/src/data/text/abilities.h
@@ -303,7 +303,7 @@ const u8 gAbilityNames[ABILITIES_COUNT_GEN8][ABILITY_NAME_LENGTH + 1] =
     [ABILITY_SOUNDPROOF] = _("Soundproof"),
     [ABILITY_RAIN_DISH] = _("Rain Dish"),
     [ABILITY_SAND_STREAM] = _("Sand Stream"),
-    [ABILITY_PRESSURE] = _("Pressure"),
+    [ABILITY_PRESSURE] = _("PRESSURE"),
     [ABILITY_THICK_FAT] = _("Thick Fat"),
     [ABILITY_EARLY_BIRD] = _("Early Bird"),
     [ABILITY_FLAME_BODY] = _("Flame Body"),
diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h
index 74c19f4982..8df3a514dd 100644
--- a/src/data/text/move_names.h
+++ b/src/data/text/move_names.h
@@ -185,7 +185,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_PROTECT] = _("Protect"),
     [MOVE_MACH_PUNCH] = _("Mach Punch"),
     [MOVE_SCARY_FACE] = _("Scary Face"),
-    [MOVE_FAINT_ATTACK] = _("Feint Attack"),
+    [MOVE_FAINT_ATTACK] = _("Faint Attack"),
     [MOVE_SWEET_KISS] = _("Sweet Kiss"),
     [MOVE_BELLY_DRUM] = _("Belly Drum"),
     [MOVE_SLUDGE_BOMB] = _("Sludge Bomb"),
@@ -567,7 +567,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_STICKY_WEB] = _("Sticky Web"),
     [MOVE_FELL_STINGER] = _("Fell Stinger"),
     [MOVE_PHANTOM_FORCE] = _("PhantomForce"),
-    [MOVE_TRICK_OR_TREAT] = _("TrickOrTreat"),
+    [MOVE_TRICK_OR_TREAT] = _("Halloween"),
     [MOVE_NOBLE_ROAR] = _("Noble Roar"),
     [MOVE_ION_DELUGE] = _("Ion Deluge"),
     [MOVE_PARABOLIC_CHARGE] = _("Parabolic Ch"),

From c2a3c5687b8411af73fc5081e10682799f4fff72 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Sat, 2 Jan 2021 21:11:47 -0800
Subject: [PATCH 03/16] Add Fairy-type icon to fix Fairy TM info icon being
 blank.

---
 graphics/interface_fr/menu.png | Bin 1904 -> 2077 bytes
 src/menu.c                     |   1 +
 2 files changed, 1 insertion(+)

diff --git a/graphics/interface_fr/menu.png b/graphics/interface_fr/menu.png
index a04c981d5d4b4abc92491723d7f17d38186e8628..b16d008cb345e748e6a43de2355604dffb03cfdd 100644
GIT binary patch
delta 2004
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

delta 1833
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
X=atmNZDk_?00000NkvXXu0mjf#nd{Q

diff --git a/src/menu.c b/src/menu.c
index dca8adc2d2..6bb6065827 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -119,6 +119,7 @@ static const struct MenuInfoIcon sMenuInfoIcons[] =
     [TYPE_ICE + 1]      = { 32, 12, 0x4C },
     [TYPE_DRAGON + 1]   = { 32, 12, 0xA0 },
     [TYPE_DARK + 1]     = { 32, 12, 0x8C },
+    [TYPE_FAIRY + 1]    = { 32, 12, 0x4  },
     [MENU_INFO_ICON_TYPE]      = { 42, 12, 0xA8 },
     [MENU_INFO_ICON_POWER]     = { 42, 12, 0xC0 },
     [MENU_INFO_ICON_ACCURACY]  = { 42, 12, 0xC8 },

From 19b82dcf57871d6e757a03c8043f31f810587c51 Mon Sep 17 00:00:00 2001
From: amiosi <44352097+amiosi@users.noreply.github.com>
Date: Sun, 3 Jan 2021 19:12:47 -0500
Subject: [PATCH 04/16] tabs -> spaces

---
 src/data/battle_moves.h | 112 ++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index e1ea9db773..6485199039 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -526,11 +526,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_BODY_SLAM] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_6
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_6
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        #endif
         .effect = EFFECT_PARALYZE_HIT,
         .power = 85,
         .type = TYPE_NORMAL,
@@ -4732,11 +4732,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_NEEDLE_ARM] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_4
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_4
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+        #endif
         .effect = EFFECT_FLINCH_HIT,
         .power = 60,
         .type = TYPE_GRASS,
@@ -4857,12 +4857,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_ASTONISH] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_4
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
-		#endif
-		.effect = EFFECT_FLINCH_HIT,
+        #if B_UPDATED_MOVE_DATA >= GEN_4
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+        #endif
+        .effect = EFFECT_FLINCH_HIT,
         .power = 30,
         .type = TYPE_GHOST,
         .accuracy = 100,
@@ -5110,13 +5110,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     {
         #if B_UPDATED_MOVE_DATA >= GEN_6
             .pp = 20,
-			.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-		#elif B_UPDATED_MOVE_DATA == GEN_4 || B_UPDATED_MOVE_DATA == GEN_5
-			.pp = 30,
-			.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+            .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        #elif B_UPDATED_MOVE_DATA == GEN_4 || B_UPDATED_MOVE_DATA == GEN_5
+            .pp = 30,
+            .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
         #else
             .pp = 30,
-			.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+            .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
         #endif
         .effect = EFFECT_FLINCH_HIT,
         .power = 80,
@@ -6394,11 +6394,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_DRAGON_RUSH] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_6
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_6
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        #endif
         .effect = EFFECT_FLINCH_HIT,
         .power = 100,
         .type = TYPE_DRAGON,
@@ -7295,11 +7295,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_SHADOW_FORCE] =
     {
-		#if B_UPDATED_MOVE_DATA == GEN_6
-			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
-		#endif
+        #if B_UPDATED_MOVE_DATA == GEN_6
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+        #endif
         .effect = EFFECT_SEMI_INVULNERABLE,
         .power = 120,
         .type = TYPE_GHOST,
@@ -7554,11 +7554,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_HEAVY_SLAM] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_7
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_7
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+        #endif
         .effect = EFFECT_HEAT_CRASH,
         .power = 1,
         .type = TYPE_STEEL,
@@ -8322,11 +8322,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_HEAT_CRASH] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_6
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_6
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+        #endif
         .effect = EFFECT_HEAT_CRASH,
         .power = 1,
         .type = TYPE_FIRE,
@@ -8354,11 +8354,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_STEAMROLLER] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_6
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_6
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
+        #endif
         .effect = EFFECT_FLINCH_HIT,
         .power = 65,
         .type = TYPE_BUG,
@@ -8785,11 +8785,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_PHANTOM_FORCE] =
     {
-		#if B_UPDATED_MOVE_DATA == GEN_6
-			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
-		#endif
+        #if B_UPDATED_MOVE_DATA == GEN_6
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+        #endif
         .effect = EFFECT_SEMI_INVULNERABLE,
         .power = 90,
         .type = TYPE_GHOST,
@@ -10617,11 +10617,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_DOUBLE_IRON_BASH] =
     {
-		#if B_UPDATED_MOVE_DATA >= GEN_8
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST,
-		#else
-			.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST,
-		#endif
+        #if B_UPDATED_MOVE_DATA >= GEN_8
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST,
+        #else
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST,
+        #endif
         .effect = EFFECT_PLACEHOLDER,   //TODO (EFFECT_FLINCH_HIT + EFFECT_DOUBLE_HIT)
         .power = 60,
         .type = TYPE_STEEL,

From 5d02cc205947f94e2b5908a60ab8e43f5f6c2ee6 Mon Sep 17 00:00:00 2001
From: sbird <sbird@no.tld>
Date: Fri, 15 Jan 2021 16:04:09 +0100
Subject: [PATCH 05/16] [battle_engine] fix wrap style move damage

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

diff --git a/src/battle_util.c b/src/battle_util.c
index 453a1f8f3a..9494c27b60 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2341,9 +2341,9 @@ u8 DoBattlerEndTurnEffects(void)
                     PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleStruct->wrappedMove[gActiveBattler]);
                     gBattlescriptCurrInstr = BattleScript_WrapTurnDmg;
                     if (GetBattlerHoldEffect(gBattleStruct->wrappedBy[gActiveBattler], TRUE) == HOLD_EFFECT_BINDING_BAND)
-                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (B_BINDING_DAMAGE >= GEN_6) ? 6 : 8;
+                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / ((B_BINDING_DAMAGE >= GEN_6) ? 6 : 8);
                     else
-                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (B_BINDING_DAMAGE >= GEN_6) ? 8 : 16;
+                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / ((B_BINDING_DAMAGE >= GEN_6) ? 8 : 16);
 
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;

From 267bbe2f708b50f3a8187d6aaa5db2223ac89335 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Fri, 22 Jan 2021 18:52:00 -0300
Subject: [PATCH 06/16] Fixed Mind Blown's category

As it was pointed out by BigAngryDev on Discord, Mind Blown is supposed to be a Special move, not a Physical one.
---
 src/data/battle_moves.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 9f7aea69b3..fdc6b15f99 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -10288,7 +10288,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .target = MOVE_TARGET_FOES_AND_ALLY,
         .priority = 0,
         .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
-        .split = SPLIT_PHYSICAL,
+        .split = SPLIT_SPECIAL,
     },
 
     [MOVE_PLASMA_FISTS] =

From c6ea2c28f82fd0cb71431b3c280773db24ce5c75 Mon Sep 17 00:00:00 2001
From: amiosi <44352097+amiosi@users.noreply.github.com>
Date: Sun, 24 Jan 2021 18:22:51 -0500
Subject: [PATCH 07/16] fix steamroller

---
 src/data/battle_moves.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 4106212a79..6a22a0514e 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -8354,11 +8354,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_STEAMROLLER] =
     {
-        #if B_UPDATED_MOVE_DATA >= GEN_6
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
-        #else
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
-        #endif
         .effect = EFFECT_FLINCH_HIT,
         .power = 65,
         .type = TYPE_BUG,
@@ -8368,6 +8363,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .target = MOVE_TARGET_SELECTED,
         .priority = 0,
         .split = SPLIT_PHYSICAL,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_MINIMIZE,
     },
 
     [MOVE_COTTON_GUARD] =
@@ -8836,8 +8832,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
         .effect = EFFECT_ION_DELUGE,
         .power = 0,
         .type = TYPE_ELECTRIC,
-      
-      
         .accuracy = 0,
         .pp = 25,
         .secondaryEffectChance = 0,

From d0e0ff34b4bd2544eacb0dad8b313bcc1c3fab5a Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sun, 24 Jan 2021 23:09:23 -0300
Subject: [PATCH 08/16] Updated the list of abilities unaffected by Gastro Acid
 https://bulbapedia.bulbagarden.net/wiki/Category:Abilities_that_cannot_be_suppressed

---
 src/battle_script_commands.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 6c5f37a7d4..66d3154a41 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -11225,15 +11225,20 @@ static void Cmd_setgastroacid(void)
 {
     switch (gBattleMons[gBattlerTarget].ability)
     {
-    case ABILITY_MULTITYPE:
-    case ABILITY_STANCE_CHANGE:
-    case ABILITY_SCHOOLING:
-    case ABILITY_COMATOSE:
-    case ABILITY_SHIELDS_DOWN:
-    case ABILITY_DISGUISE:
-    case ABILITY_RKS_SYSTEM:
+    case ABILITY_AS_ONE_ICE_RIDER:
+    case ABILITY_AS_ONE_SHADOW_RIDER:
     case ABILITY_BATTLE_BOND:
+    case ABILITY_COMATOSE:
+    case ABILITY_DISGUISE:
+    case ABILITY_GULP_MISSILE:
+    case ABILITY_ICE_FACE:
+    case ABILITY_MULTITYPE:
     case ABILITY_POWER_CONSTRUCT:
+    case ABILITY_RKS_SYSTEM:
+    case ABILITY_SCHOOLING:
+    case ABILITY_SHIELDS_DOWN:
+    case ABILITY_STANCE_CHANGE:
+    case ABILITY_ZEN_MODE:
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
         break;
     default:

From 7c9ddd23c1c218e33d0f35080fd35eabc1b629bb Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Mon, 25 Jan 2021 14:55:51 -0300
Subject: [PATCH 09/16] Updated the list of untraceable abilities

---
 src/battle_util.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/battle_util.c b/src/battle_util.c
index 1487346195..3d3e22a0d6 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -777,9 +777,13 @@ static const u8 sAbilitiesNotTraced[ABILITIES_COUNT] =
     [ABILITY_DISGUISE] = 1,
     [ABILITY_FLOWER_GIFT] = 1,
     [ABILITY_FORECAST] = 1,
+    [ABILITY_GULP_MISSILE] = 1,
+    [ABILITY_HUNGER_SWITCH] = 1,
+    [ABILITY_ICE_FACE] = 1,
     [ABILITY_ILLUSION] = 1,
     [ABILITY_IMPOSTER] = 1,
     [ABILITY_MULTITYPE] = 1,
+    [ABILITY_NEUTRALIZING_GAS] = 1,
     [ABILITY_NONE] = 1,
     [ABILITY_POWER_CONSTRUCT] = 1,
     [ABILITY_POWER_OF_ALCHEMY] = 1,

From c4a7205b6f9ace4f0ca41196fc41167d921e1d24 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Mon, 25 Jan 2021 15:37:11 -0300
Subject: [PATCH 10/16] Added As One to the untraceable abilities list

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

diff --git a/src/battle_util.c b/src/battle_util.c
index 3d3e22a0d6..58219080ef 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -772,6 +772,8 @@ static const u8 sAbilitiesAffectedByMoldBreaker[] =
 
 static const u8 sAbilitiesNotTraced[ABILITIES_COUNT] =
 {
+    [ABILITY_AS_ONE_ICE_RIDER] = 1,
+    [ABILITY_AS_ONE_SHADOW_RIDER] = 1,
     [ABILITY_BATTLE_BOND] = 1,
     [ABILITY_COMATOSE] = 1,
     [ABILITY_DISGUISE] = 1,

From 34908a2252b9cc67c29f71790bd4aa9c0e0705c9 Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Wed, 27 Jan 2021 19:56:11 -0700
Subject: [PATCH 11/16] fix fire blast power

---
 src/data/battle_moves.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index fdc6b15f99..a5bbf6627e 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -1951,9 +1951,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     [MOVE_FIRE_BLAST] =
     {
         #if B_UPDATED_MOVE_DATA >= GEN_6
-            .power = 120,
-        #else
             .power = 110,
+        #else
+            .power = 120,
         #endif
         .effect = EFFECT_BURN_HIT,
         .type = TYPE_FIRE,

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 12/16] 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 ae2b8be1477f1ab7c529999e0059bc34422320b1 Mon Sep 17 00:00:00 2001
From: amiosi <44352097+amiosi@users.noreply.github.com>
Date: Fri, 29 Jan 2021 18:07:36 -0500
Subject: [PATCH 13/16] Update battle_moves.h

---
 src/data/battle_moves.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 14215ace5d..4455c7da5b 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -7296,9 +7296,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     [MOVE_SHADOW_FORCE] =
     {
         #if B_UPDATED_MOVE_DATA == GEN_6
-            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
         #else
-            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
         #endif
         .effect = EFFECT_SEMI_INVULNERABLE,
         .power = 120,
@@ -7555,9 +7555,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     [MOVE_HEAVY_SLAM] =
     {
         #if B_UPDATED_MOVE_DATA >= GEN_7
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
         #else
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
         #endif
         .effect = EFFECT_HEAT_CRASH,
         .power = 1,
@@ -8323,9 +8323,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     [MOVE_HEAT_CRASH] =
     {
         #if B_UPDATED_MOVE_DATA >= GEN_6
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
         #else
-            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+            .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
         #endif
         .effect = EFFECT_HEAT_CRASH,
         .power = 1,
@@ -8782,9 +8782,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
     [MOVE_PHANTOM_FORCE] =
     {
         #if B_UPDATED_MOVE_DATA == GEN_6
-            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
         #else
-            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
+            .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
         #endif
         .effect = EFFECT_SEMI_INVULNERABLE,
         .power = 90,

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 14/16] 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 15/16] 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();

From f69bff6605554322c00f301ff574c7153991bc36 Mon Sep 17 00:00:00 2001
From: Lukien <75408859+Lukien@users.noreply.github.com>
Date: Sun, 31 Jan 2021 22:43:16 -0500
Subject: [PATCH 16/16] Update battle_util.c

Added weather check for the ability Sand Force.
---
 src/battle_util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index b929b7499d..9ba2da4385 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -6624,7 +6624,8 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe
            MulModifier(&modifier, UQ_4_12(1.3));
         break;
     case ABILITY_SAND_FORCE:
-        if (moveType == TYPE_STEEL || moveType == TYPE_ROCK || moveType == TYPE_GROUND)
+        if ((moveType == TYPE_STEEL || moveType == TYPE_ROCK || moveType == TYPE_GROUND)
+            && WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SANDSTORM_ANY)
            MulModifier(&modifier, UQ_4_12(1.3));
         break;
     case ABILITY_RIVALRY: