From ec9693c7975d0d091ac3d4cd79a58de02d50a239 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 28 Jul 2018 18:41:57 +0200
Subject: [PATCH] ate abilities

---
 include/battle.h             |  1 +
 include/constants/battle.h   |  1 +
 src/battle_main.c            | 30 ++++++++++++++++++++++++++++++
 src/battle_script_commands.c |  1 +
 src/battle_util.c            | 20 ++++++++++++++++++++
 5 files changed, 53 insertions(+)

diff --git a/include/battle.h b/include/battle.h
index 7705cd22f0..b63e4a4b86 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -593,6 +593,7 @@ struct BattleStruct
     u8 presentBasePower;
     u8 roostTypes[MAX_BATTLERS_COUNT][3];
     u8 savedBattlerTarget;
+    bool8 ateBoost[MAX_BATTLERS_COUNT];
 };
 
 #define GET_MOVE_TYPE(move, typeArg)                        \
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 55aeb349f6..5202b95708 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -216,6 +216,7 @@
 #define STATUS_FIELD_MISTY_TERRAIN      0x80
 #define STATUS_FIELD_ELECTRIC_TERRAIN   0x100
 #define STATUS_FIELD_PSYCHIC_TERRAIN    0x200
+#define STATUS_FIELD_ION_DELUGE         0x400
 
 // Flags describing move's result
 #define MOVE_RESULT_MISSED             (1 << 0)
diff --git a/src/battle_main.c b/src/battle_main.c
index 21ac3a39e6..3fa9561021 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5295,6 +5295,8 @@ static void HandleAction_UseMove(void)
 {
     u8 side;
     u8 var = 4;
+    u32 attackerAbility;
+    u32 ateType;
 
     gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
 
@@ -5510,6 +5512,34 @@ static void HandleAction_UseMove(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
         sub_81A56E8(gBattlerAttacker);
 
+    attackerAbility = GetBattlerAbility(gBattlerAttacker);
+    // Set move type.
+    if (gFieldStatuses & STATUS_FIELD_ION_DELUGE) // All moves become Electric-type this turn.
+    {
+        gBattleStruct->dynamicMoveType = 0x80 | TYPE_ELECTRIC;
+    }
+    else if (gBattleMoves[gChosenMove].type == TYPE_NORMAL
+             && gBattleMoves[gChosenMove].effect != EFFECT_HIDDEN_POWER
+             && gBattleMoves[gChosenMove].effect != EFFECT_WEATHER_BALL
+             && ((attackerAbility == ABILITY_PIXILATE && (ateType = TYPE_FAIRY))
+                 || (attackerAbility == ABILITY_REFRIGERATE && (ateType = TYPE_ICE))
+                 || (attackerAbility == ABILITY_AERILATE && (ateType = TYPE_FLYING))
+                 || ((attackerAbility == ABILITY_GALVANIZE) && (ateType = TYPE_ELECTRIC))
+                )
+             )
+    {
+        gBattleStruct->dynamicMoveType = 0x80 | ateType;
+        gBattleStruct->ateBoost[gBattlerAttacker] = 1;
+    }
+    else if (gBattleMoves[gChosenMove].type != TYPE_NORMAL
+             && gBattleMoves[gChosenMove].effect != EFFECT_HIDDEN_POWER
+             && gBattleMoves[gChosenMove].effect != EFFECT_WEATHER_BALL
+             && attackerAbility == ABILITY_NORMALIZE)
+    {
+        gBattleStruct->dynamicMoveType = 0x80 | TYPE_NORMAL;
+        gBattleStruct->ateBoost[gBattlerAttacker] = 1;
+    }
+
     gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 77ddd61f37..75cc21c4a9 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4324,6 +4324,7 @@ static void atk49_moveend(void)
             break;
         case 17: // Clear bits active just while using a move.
             gProtectStructs[gBattlerAttacker].usesBouncedMove = 0;
+            gBattleStruct->ateBoost[gBattlerAttacker] = 0;
             gBattleScripting.atk49_state++;
             break;
         case ATK49_LAST_CASE:
diff --git a/src/battle_util.c b/src/battle_util.c
index 63b427c9fd..51a8288714 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -4669,6 +4669,26 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe
         if (moveType == TYPE_STEEL)
            MulModifier(&modifier, UQ_4_12(1.5));
         break;
+    case ABILITY_PIXILATE:
+        if (moveType == TYPE_FAIRY && gBattleStruct->ateBoost[battlerAtk])
+            MulModifier(&modifier, UQ_4_12(1.2));
+        break;
+    case ABILITY_GALVANIZE:
+        if (moveType == TYPE_ELECTRIC && gBattleStruct->ateBoost[battlerAtk])
+            MulModifier(&modifier, UQ_4_12(1.2));
+        break;
+    case ABILITY_REFRIGERATE:
+        if (moveType == TYPE_ICE && gBattleStruct->ateBoost[battlerAtk])
+            MulModifier(&modifier, UQ_4_12(1.2));
+        break;
+    case ABILITY_AERILATE:
+        if (moveType == TYPE_FLYING && gBattleStruct->ateBoost[battlerAtk])
+            MulModifier(&modifier, UQ_4_12(1.2));
+        break;
+    case ABILITY_NORMALIZE:
+        if (moveType == TYPE_NORMAL && gBattleStruct->ateBoost[battlerAtk])
+            MulModifier(&modifier, UQ_4_12(1.2));
+        break;
     }
 
     // field abilities