diff --git a/include/battle.h b/include/battle.h
index 22b60d6e4f..26c6b3e40a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -491,7 +491,7 @@ struct BattleStruct
     u8 turnEffectsBattlerId;
     u8 turnCountersTracker;
     u16 wrappedMove[MAX_BATTLERS_COUNT];
-    u8 moveTarget[MAX_BATTLERS_COUNT];
+    u16 moveTarget[MAX_BATTLERS_COUNT];
     u8 expGetterMonId;
     u8 wildVictorySong;
     u8 dynamicMoveType;
diff --git a/include/battle_util.h b/include/battle_util.h
index 7d1b99f347..ee7337ef2d 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -109,7 +109,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn);
 void ClearFuryCutterDestinyBondGrudge(u8 battlerId);
 void HandleAction_RunBattleScript(void);
 u32 SetRandomTarget(u32 battlerId);
-u8 GetMoveTarget(u16 move, u8 setTarget);
+u32 GetMoveTarget(u16 move, u8 setTarget);
 u8 IsMonDisobedient(void);
 u32 GetBattlerHoldEffect(u8 battlerId, bool32 checkNegating);
 u32 GetBattlerHoldEffectParam(u8 battlerId);
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 90294b4b4d..577b0ba609 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -386,7 +386,6 @@
 #define MOVE_TARGET_FOES_AND_ALLY       0x20
 #define MOVE_TARGET_OPPONENTS_FIELD     0x40
 #define MOVE_TARGET_ALLY                0x80
-
-#define MOVE_TARGET_ALL_BATTLERS        (MOVE_TARGET_BOTH | MOVE_TARGET_OPPONENTS_FIELD)
+#define MOVE_TARGET_ALL_BATTLERS        (0x100 | MOVE_TARGET_USER)
 
 #endif // GUARD_CONSTANTS_BATTLE_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 1524e16f4c..7478304127 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -216,7 +216,7 @@ struct BattleMove
     u8 accuracy;
     u8 pp;
     u8 secondaryEffectChance;
-    u8 target;
+    u16 target;
     s8 priority;
     u32 flags;
     u8 split;
diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c
index edfd764645..972dc0ed66 100644
--- a/src/battle_ai_main.c
+++ b/src/battle_ai_main.c
@@ -517,7 +517,7 @@ static s16 AI_CheckBadMove(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
     u8 atkPriority = GetMovePriority(battlerAtk, move);
     u16 moveEffect = gBattleMoves[move].effect;
     s32 moveType;
-    u8 moveTarget = gBattleMoves[move].target;
+    u16 moveTarget = gBattleMoves[move].target;
     u16 accuracy = AI_GetMoveAccuracy(battlerAtk, battlerDef, AI_DATA->atkAbility, AI_DATA->defAbility, AI_DATA->atkHoldEffect, AI_DATA->defHoldEffect, move);
     u8 effectiveness = AI_GetMoveEffectiveness(move, battlerAtk, battlerDef);
     bool32 isDoubleBattle = IsValidDoubleBattle(battlerAtk);
@@ -2514,7 +2514,7 @@ static s16 AI_DoubleBattle(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
     // move data
     u8 moveType = gBattleMoves[move].type;
     u16 effect = gBattleMoves[move].effect;
-    u8 target = gBattleMoves[move].target;
+    u16 target = gBattleMoves[move].target;
     // ally data
     u8 battlerAtkPartner = AI_DATA->battlerAtkPartner;
     u16 atkPartnerAbility = AI_DATA->atkPartnerAbility;
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 877e447508..e1cb2f54f0 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -590,7 +590,7 @@ static void TryShowAsTarget(u32 battlerId)
 
 static void HandleInputChooseMove(void)
 {
-    u8 moveTarget;
+    u16 moveTarget;
     u32 canSelectTarget = 0;
     struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
 
diff --git a/src/battle_util.c b/src/battle_util.c
index f3e1eb9aae..895e7436c3 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -7015,7 +7015,7 @@ u32 SetRandomTarget(u32 battlerId)
     return target;
 }
 
-u8 GetMoveTarget(u16 move, u8 setTarget)
+u32 GetMoveTarget(u16 move, u8 setTarget)
 {
     u8 targetBattler = 0;
     u32 i, moveTarget, side;