diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
| commit | ab3b8cd51a88f02dbdb72c276a1c35591e8331f4 (patch) | |
| tree | 29d5e0c8c1aa2ddd211b65c0160af98044d76678 /include/global.h | |
| parent | 6543d7f2d6e7e12e159588f494895ba02b7d5090 (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h index 2e3a106eb..3421517d7 100644 --- a/include/global.h +++ b/include/global.h @@ -238,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; @@ -251,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]; }; |