diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
| commit | ed7ded0748b38b5266cdc6092446c7b184f75778 (patch) | |
| tree | 0779eacd2dc6107e2dc47370abf82a1793cde6ed /include/global.h | |
| parent | 975e28c01e70c63587c8633ffc3c50b7d1759dec (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h index b1c4add75..16a621568 100644 --- a/include/global.h +++ b/include/global.h @@ -41,6 +41,8 @@ enum VERSION_SAPPHIRE = 1, VERSION_RUBY = 2, VERSION_EMERALD = 3, + VERSION_FIRE_RED = 4, + VERSION_LEAF_GREEN = 5, }; enum LanguageId { @@ -236,12 +238,12 @@ extern struct SaveBlock2 *gSaveBlock2Ptr; struct SecretBaseRecord { - /*ID?*/ /*0x1A9C*/ u8 sbr_field_0; + /*0x1A9C*/ u8 secretBaseId; /*0x1A9D*/ u8 sbr_field_1_0:4; /*0x1A9D*/ u8 gender:1; /*0x1A9D*/ u8 sbr_field_1_5:1; /*0x1A9D*/ u8 sbr_field_1_6:2; - /*0x1A9E*/ u8 trainerName[7]; // 0xFF bytes? + /*0x1A9E*/ u8 trainerName[OT_NAME_LENGTH]; /*0x1AA5*/ u8 trainerId[4]; // byte 0 is used for determining trainer class /*0x1AA9*/ u8 language; /*0x1AAA*/ u16 sbr_field_e; @@ -249,10 +251,10 @@ struct SecretBaseRecord /*0x1AAD*/ u8 sbr_field_11; /*0x1AAE*/ u8 decorations[16]; /*0x1ABE*/ u8 decorationPos[16]; - /*0x1ACE*/ u32 partyPersonality[6]; - /*0x1AE6*/ u16 partyMoves[6 * 4]; - /*0x1B16*/ u16 partySpecies[6]; - /*0x1B22*/ u16 partyHeldItems[6]; + /*0x1AD0*/ u32 partyPersonality[6]; + /*0x1AE8*/ u16 partyMoves[6 * 4]; + /*0x1B18*/ u16 partySpecies[6]; + /*0x1B24*/ u16 partyHeldItems[6]; /*0x1B2E*/ u8 partyLevels[6]; /*0x1B34*/ u8 partyEVs[6]; }; |