diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-03-01 09:13:29 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-03-01 09:13:29 +0530 |
| commit | 85492c0dacb5222ebbd43f652c44448ca89de0f9 (patch) | |
| tree | ccb4168b0cb800398a810789e59c108003def9bd /src/battle_util.c | |
| parent | 2f9d69f67fef723e3a92bb19c73952f6896e27ad (diff) | |
| parent | c0357cea46635ec3867d18e43b341fb7a4a2fef2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
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; } |