From abb67e96e8b6de05b9364bc02cd71b8a33abe6b3 Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Sun, 21 Nov 2021 21:49:47 +1300
Subject: [PATCH] Finish Expanding Force

Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
---
 src/battle_controller_player.c | 7 +++++++
 src/battle_script_commands.c   | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index e1cb2f54f0..a970c38b72 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -609,6 +609,13 @@ static void HandleInputChooseMove(void)
             else
                 moveTarget = MOVE_TARGET_SELECTED;
         }
+        else if (moveInfo->moves[gMoveSelectionCursor[gActiveBattler]] == MOVE_EXPANDING_FORCE)
+        {
+            if (IsBattlerTerrainAffected(gActiveBattler, STATUS_FIELD_PSYCHIC_TERRAIN))
+                moveTarget = MOVE_TARGET_BOTH;
+            else
+                moveTarget = MOVE_TARGET_SELECTED;
+        }
         else
         {
             moveTarget = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].target;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index b17a7555b8..31a2d4fc6a 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5246,7 +5246,9 @@ static void Cmd_moveend(void)
             if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE)
                 && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
                 && !gProtectStructs[gBattlerAttacker].chargingTurn
-                && (gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH || gBattleMoves[gCurrentMove].target == MOVE_TARGET_FOES_AND_ALLY)
+                && (gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
+                    || gBattleMoves[gCurrentMove].target == MOVE_TARGET_FOES_AND_ALLY 
+                    || (gBattleMoves[gCurrentMove].effect == EFFECT_EXPANDING_FORCE && IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_PSYCHIC_TERRAIN)))
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
                 u8 battlerId;