diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-01 01:01:18 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-01 01:01:18 +0100 |
| commit | 988f0b7e19a4505bdd0e846550382661dcf53cc7 (patch) | |
| tree | 0e1ccb1aaa62828adbcf2108c7d8c59909ff55c4 /src/battle_util.c | |
| parent | d29b9d268fe46322c740fe5ac440641834686f9d (diff) | |
| parent | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff) | |
Merge branch 'master' into decompile_battle_link_817C95C
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; } |