diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
| commit | bc4cc9f78a705636228c39311bb6e3c393f090d3 (patch) | |
| tree | d2b59408df53676ffb65e217cc1a62cbcba05f97 /src/battle_controller_player.c | |
| parent | 37e86d75788f4ed364db19aabce11e6e054a1084 (diff) | |
| parent | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index a6a6ac0f3..70b0a6160 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -696,10 +696,10 @@ static void HandleMoveSwitching(void) moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]] = moveInfo->maxPp[gMultiUsePlayerCursor]; moveInfo->maxPp[gMultiUsePlayerCursor] = 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[gMultiUsePlayerCursor]; + gDisableStructs[gActiveBattler].mimickedMoves &= (~gBitTable[gMoveSelectionCursor[gActiveBattler]]); + gDisableStructs[gActiveBattler].mimickedMoves |= gBitTable[gMultiUsePlayerCursor]; } MoveSelectionDisplayMoveNames(); |