diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
| commit | fc761599b412206f80d961a6052dce49b9998689 (patch) | |
| tree | 1f3eb8f01ae005b8b509d1f120ce5d7bce230992 /include/battle.h | |
| parent | d343d1f19a74657489d987dbd97b84e7389ae295 (diff) | |
| parent | 4b4f716ae0c582068928a4ae7b31d9d10ac89eb5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 4b9144721..8f7141803 100644 --- a/include/battle.h +++ b/include/battle.h @@ -51,8 +51,7 @@ struct Trainer { /*0x00*/ u8 partyFlags; /*0x01*/ u8 trainerClass; - /*0x02*/ u8 encounterMusic:7; - /*0x02*/ u8 gender:1; + /*0x02*/ u8 encounterMusic_gender; /*0x03*/ u8 trainerPic; /*0x04*/ u8 trainerName[12]; /*0x10*/ u16 items[4]; |