diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
| commit | 04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch) | |
| tree | 5722c829dbad65bbbeb573084291ba0621b89df5 /src/battle_controller_player.c | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e1c632f37..9a48f4e16 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -3,6 +3,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_anim_special.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" #include "item.h" @@ -14,7 +15,6 @@ #include "constants/moves.h" #include "palette.h" #include "pokemon.h" -#include "rom3.h" #include "constants/songs.h" #include "sound.h" #include "string_util.h" @@ -818,10 +818,10 @@ void sub_802CA60(void) r9->unkC[gMoveSelectionCursor[gActiveBattler]] = r9->unkC[gUnknown_03004344]; r9->unkC[gUnknown_03004344] = i; - if (gDisableStructs[gActiveBattler].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBattler]]) + if (gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[gMoveSelectionCursor[gActiveBattler]]) { - gDisableStructs[gActiveBattler].unk18_b &= ~gBitTable[gMoveSelectionCursor[gActiveBattler]]; - gDisableStructs[gActiveBattler].unk18_b |= gBitTable[gUnknown_03004344]; + gDisableStructs[gActiveBattler].mimickedMoves &= ~gBitTable[gMoveSelectionCursor[gActiveBattler]]; + gDisableStructs[gActiveBattler].mimickedMoves |= gBitTable[gUnknown_03004344]; } sub_802E1B0(); |