diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
| commit | 9e4bf55716fb5a27bc2f6eee4a489e48327eac3f (patch) | |
| tree | 8b31e761c5b2b03e2b5200baec6755f6a3273fe5 /src/battle/battle_controller_player.c | |
| parent | f150a5cd9f15c368a3e520168b56acd3628d6852 (diff) | |
| parent | ed5847cb41c48357d83b92823e08393a1ca54bdd (diff) | |
Merge remote-tracking branch 'upstream/master' into nakamura
Diffstat (limited to 'src/battle/battle_controller_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 3e259a21b..f9190eb39 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -614,7 +614,7 @@ struct ChooseMoveStruct u8 pp[4]; u8 unkC[0x12-0xC]; u8 unk12; - u8 unk13; + u8 effectStringId; u8 filler14[0x20-0x14]; }; @@ -637,7 +637,7 @@ void sub_802C68C(void) PlaySE(SE_SELECT); if (r6->moves[gMoveSelectionCursor[gActiveBank]] == MOVE_CURSE) - r4 = (r6->unk12 != TYPE_GHOST && (r6->unk13 ^ 7)) ? 0x10 : 0; + r4 = (r6->unk12 != TYPE_GHOST && (r6->effectStringId ^ 7)) ? 0x10 : 0; else r4 = gBattleMoves[r6->moves[gMoveSelectionCursor[gActiveBank]]].target; |