diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /include/apprentice.h | |
parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'include/apprentice.h')
-rw-r--r-- | include/apprentice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/apprentice.h b/include/apprentice.h index ca0b04800..195106c53 100644 --- a/include/apprentice.h +++ b/include/apprentice.h @@ -9,7 +9,8 @@ struct ApprenticeTrainer u16 otId; u8 facilityClass; u16 species[APPRENTICE_SPECIES_COUNT]; - u8 rest[14]; + u8 id; + u16 easyChatWords[6]; }; extern const struct ApprenticeTrainer gApprentices[]; |