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_controller_player_partner.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_controller_player_partner.c')
| -rw-r--r-- | src/battle_controller_player_partner.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index d2f85f85e..7569604d8 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -31,7 +31,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern const struct BattleMove gBattleMoves[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 bank, struct Pokemon *mon); @@ -1521,7 +1520,7 @@ static void PlayerPartnerHandleChooseMove(void) BattleAI_SetupAIData(0xF); chosenMoveId = BattleAI_ChooseMoveOrAction(); - if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_x10 | MOVE_TARGET_USER)) + if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_USER_OR_SELECTED)) gBattlerTarget = gActiveBattler; if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH) { |