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_controller_player_partner.c | |
| parent | 2f9d69f67fef723e3a92bb19c73952f6896e27ad (diff) | |
| parent | c0357cea46635ec3867d18e43b341fb7a4a2fef2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
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) { |