diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-28 16:55:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 16:55:45 -0600 |
| commit | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (patch) | |
| tree | 0efbe85b0619f840daf8411d76159da74bbec940 /src/battle_util.c | |
| parent | a57e04e14df2ee716e6432287ae5e83c0b76715b (diff) | |
| parent | 2fa00d01eee21702cba0e34396e893759133525e (diff) | |
Merge pull request #221 from DizzyEggg/data_to_c
Move some data to C
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; } |