diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-28 23:58:29 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-28 23:58:29 +0100 |
| commit | a28dfd6da4d74e093297c998a887741d1562e64d (patch) | |
| tree | 8155f4ce85e1ba928b0a4bcf69d6bf07bf74a6c7 /src/battle_util.c | |
| parent | fed5f03097aef2dd39e33abdece1daaaf27da39f (diff) | |
| parent | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff) | |
Merge branch 'master' into clear_battle_files
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index a457ce15d..662e5b2a6 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -23,7 +23,6 @@ #include "link.h" #include "berry.h" -extern const struct BattleMove gBattleMoves[]; extern u8 weather_get_current(void); @@ -3255,8 +3254,8 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) else targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); break; + case MOVE_TARGET_USER_OR_SELECTED: case MOVE_TARGET_USER: - case MOVE_TARGET_x10: targetBank = gBattlerAttacker; break; } |