diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 20:26:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 20:26:51 -0700 |
| commit | b58527a387a65b84d2aefd23e589a53844308d6a (patch) | |
| tree | 38c6f935a9f9aca85b4c42941fb842f04784945a /src/battle/battle_controller_player.c | |
| parent | b1d091e233b81262e0905ce06607cfa7c4d4c9dd (diff) | |
| parent | bdc22ceb2ca2ccfc68f3be1b45df31a5a147ced3 (diff) | |
Merge pull request #585 from PikalaxALT/contest_effect
[WIP] Decompile contest_effect
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; |