diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
| commit | 7b8b5b5c8c02156d7cdaa76212ad68f01b1600c9 (patch) | |
| tree | 32b1c3ce14f272708fdc4b5b944a8dc9c14d07e3 /include/contest.h | |
| parent | 27aae9da9a570b6787171e33fa29c43c507187c1 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into gflib
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/contest.h b/include/contest.h index 8ef208aea..2b1b95af5 100644 --- a/include/contest.h +++ b/include/contest.h @@ -227,7 +227,7 @@ struct ContestPokemon u8 aiPool_Cute:1; // 0x10 u8 aiPool_Smart:1; // 0x20 u8 aiPool_Tough:1; // 0x40 - /*0x1E*/ u16 moves[4]; // moves + /*0x1E*/ u16 moves[MAX_MON_MOVES]; // moves /*0x26*/ u8 cool; // cool /*0x27*/ u8 beauty; // beauty /*0x28*/ u8 cute; // cute |