From 59cfbe55c1d7669957714379b060f81c4e7b70db Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sun, 17 Oct 2021 09:27:35 -0300
Subject: [PATCH] Gave Grav Apple a move effect of its own

---
 data/battle_scripts_1.s                 | 4 ++++
 include/constants/battle_move_effects.h | 3 ++-
 src/battle_util.c                       | 8 ++++----
 src/data/battle_moves.h                 | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index e4fdb3038e..7999091e0b 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -381,6 +381,10 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectTripleHit               @ EFFECT_TRIPLE_HIT
 	.4byte BattleScript_EffectRecoilHP25              @ EFFECT_RECOIL_HP_25
 	.4byte BattleScript_EffectStuffCheeks             @ EFFECT_STUFF_CHEEKS
+	.4byte BattleScript_EffectGravApple               @ EFFECT_GRAV_APPLE
+
+BattleScript_EffectGravApple:
+	goto BattleScript_EffectAttackerDefenseDownHit
 
 BattleScript_EffectStuffCheeks::
 	attackcanceler
diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h
index 9a6efb8471..20f6e110d1 100644
--- a/include/constants/battle_move_effects.h
+++ b/include/constants/battle_move_effects.h
@@ -365,7 +365,8 @@
 #define EFFECT_TRIPLE_HIT 359
 #define EFFECT_RECOIL_HP_25 360
 #define EFFECT_STUFF_CHEEKS 361
+#define EFFECT_GRAV_APPLE 362
 
-#define NUM_BATTLE_MOVE_EFFECTS 362
+#define NUM_BATTLE_MOVE_EFFECTS 363
 
 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
diff --git a/src/battle_util.c b/src/battle_util.c
index 2b72fc3bcb..fb485c2e71 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -7693,6 +7693,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
         #endif
         break;
     }
+    case EFFECT_GRAV_APPLE:
+        if (gFieldStatuses & STATUS_FIELD_GRAVITY)
+            MulModifier(&basePower, UQ_4_12(1.5));
+        break;
     }
 
     // move-specific base power changes
@@ -7702,10 +7706,6 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
         if (gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH)
             basePower = 20;
         break;
-    case MOVE_GRAV_APPLE:
-        if (gFieldStatuses & STATUS_FIELD_GRAVITY)
-            basePower = 120;
-        break;
     }
 
     if (basePower == 0)
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index a6b8d271c9..2dcdbf5b24 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -11103,7 +11103,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_GRAV_APPLE] =
     {
-        .effect = EFFECT_DEFENSE_DOWN_HIT,
+        .effect = EFFECT_GRAV_APPLE,
         .power = 80,
         .type = TYPE_GRASS,
         .accuracy = 100,