diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-30 17:07:25 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-30 17:07:25 -0400 |
| commit | 32b86c14aa57c6e055670daf76f8e1dbccfe00c3 (patch) | |
| tree | 6ce53635f2ed8bbfc9890d0d26fa11cd82d7d5bf /src/battle/battle_controller_player.c | |
| parent | ca3d39512ce4857f6389888045c5d6d562331302 (diff) | |
rename some funcs and fields
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; |