From 43d42c95cfa0c7318a0748ee6a04af2ec30aa4db Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Mon, 4 Oct 2021 22:45:37 -0300
Subject: [PATCH] Terrain Pulse effect implemented

---
 data/battle_anim_scripts.s              |  2 +-
 data/battle_scripts_1.s                 |  1 +
 include/constants/battle_move_effects.h |  3 ++-
 src/battle_main.c                       | 17 +++++++++++++++++
 src/battle_util.c                       |  5 +++++
 src/data/battle_moves.h                 |  2 +-
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index c7b4020f3..0b630072a 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -13979,7 +13979,7 @@ Move_RISING_VOLTAGE::
 	end @to do:
 
 Move_TERRAIN_PULSE::
-	end @to do:
+	goto Move_DRAGON_PULSE @Temporary, needs to setup different animations based on terrain
 
 Move_SKITTER_SMACK::
 	end @to do:
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 5a9aec525..f018ff504 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -379,6 +379,7 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectDecorate                @ EFFECT_DECORATE
 	.4byte BattleScript_EffectHit                     @ EFFECT_SNIPE_SHOT
 	.4byte BattleScript_EffectTripleHit               @ EFFECT_TRIPLE_HIT
+	.4byte BattleScript_EffectHit                     @ EFFECT_TERRAIN_PULSE
 
 BattleScript_EffectDecorate:
 	attackcanceler
diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h
index 440e6e76b..966d35971 100644
--- a/include/constants/battle_move_effects.h
+++ b/include/constants/battle_move_effects.h
@@ -363,7 +363,8 @@
 #define EFFECT_DECORATE 357
 #define EFFECT_SNIPE_SHOT 358
 #define EFFECT_TRIPLE_HIT 359
+#define EFFECT_TERRAIN_PULSE 360
 
-#define NUM_BATTLE_MOVE_EFFECTS 360
+#define NUM_BATTLE_MOVE_EFFECTS 361
 
 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
diff --git a/src/battle_main.c b/src/battle_main.c
index 25db65f78..c7a5962ac 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5095,6 +5095,23 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk)
         if (ItemId_GetPocket(gBattleMons[battlerAtk].item) == POCKET_BERRIES)
             gBattleStruct->dynamicMoveType = gNaturalGiftTable[ITEM_TO_BERRY(gBattleMons[battlerAtk].item)].type;
     }
+    else if (gBattleMoves[move].effect == EFFECT_TERRAIN_PULSE)
+    {
+        if ((gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)
+            && IsBattlerGrounded(battlerAtk))
+        {
+            if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN)
+                gBattleStruct->dynamicMoveType = TYPE_ELECTRIC | 0x80;
+            else if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN)
+                gBattleStruct->dynamicMoveType = TYPE_GRASS | 0x80;
+            else if (gFieldStatuses & STATUS_FIELD_MISTY_TERRAIN)
+                gBattleStruct->dynamicMoveType = TYPE_FAIRY | 0x80;
+            else if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN)
+                gBattleStruct->dynamicMoveType = TYPE_PSYCHIC | 0x80;
+            else
+                gBattleStruct->dynamicMoveType = TYPE_NORMAL | 0x80;
+        }
+    }
 
     attackerAbility = GetBattlerAbility(battlerAtk);
     GET_MOVE_TYPE(move, moveType);
diff --git a/src/battle_util.c b/src/battle_util.c
index 462b58bd4..5ae5d80cb 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -7572,6 +7572,11 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
             basePower *= 2;
         #endif
         break;
+    case EFFECT_TERRAIN_PULSE:
+        if ((gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)
+            && IsBattlerGrounded(gBattlerAttacker))
+            basePower *= 2;
+        break;
     }
 
     // move-specific base power changes
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index a7a2752e0..542594e80 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -11332,7 +11332,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_TERRAIN_PULSE] =
     {
-        .effect = EFFECT_PLACEHOLDER,   //TODO
+        .effect = EFFECT_TERRAIN_PULSE,
         .power = 50,
         .type = TYPE_NORMAL,
         .accuracy = 100,