diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-06 23:14:33 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-06 23:14:33 -0500 |
commit | 18124740a4d75ae95948f95ca6f63c320e51501c (patch) | |
tree | 508fd0c7c2e61796b7825083085d21eff66be047 /include/party_menu.h | |
parent | ba3247d5cd27070c51e28437e8880dec72d973b5 (diff) |
pushing so I can merge
Diffstat (limited to 'include/party_menu.h')
-rw-r--r-- | include/party_menu.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index f2615dac5..30a86e162 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -12,7 +12,8 @@ enum AILMENT_SLP, AILMENT_FRZ, AILMENT_BRN, - AILMENT_FNT = 7 + AILMENT_PKRS, + AILMENT_FNT }; enum @@ -35,12 +36,12 @@ struct Struct203CEC8 { s8 unkA; u8 unkB; u8 unkD; - u8 unkE; + s16 unkE; }; extern struct Struct203CEC8 gUnknown_0203CEC8; -extern const u16 gUnknown_0861500C[]; +extern const u16 gUnknown_0861500C[]; // tutor table bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); |