diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 13:49:33 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 13:49:33 +0100 |
| commit | 96ab6f835388ec994c3636480f661beca0e00f24 (patch) | |
| tree | 43bb67d5e10d024f8c5ac6c1ca391178c00ea2ac /include | |
| parent | ab5977e7e4148afdb8b863d7b072b02f835ac831 (diff) | |
match secret base func and fix struct
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 19 | ||||
| -rw-r--r-- | include/pokemon.h | 1 |
2 files changed, 13 insertions, 7 deletions
diff --git a/include/global.h b/include/global.h index f358dafe7..c575d40cd 100644 --- a/include/global.h +++ b/include/global.h @@ -34,6 +34,8 @@ // Converts a number to Q4.12 fixed-point format #define Q_4_12(n) ((s16)((n) * 4096)) +#define PARTY_SIZE 6 + #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 @@ -295,6 +297,16 @@ struct SaveBlock2 extern struct SaveBlock2 *gSaveBlock2Ptr; +struct SecretBaseParty +{ + u32 personality[PARTY_SIZE]; + u16 moves[PARTY_SIZE * 4]; + u16 species[PARTY_SIZE]; + u16 heldItems[PARTY_SIZE]; + u8 levels[PARTY_SIZE]; + u8 EVs[PARTY_SIZE]; +}; + struct SecretBaseRecord { /*0x1A9C*/ u8 secretBaseId; @@ -310,12 +322,7 @@ struct SecretBaseRecord /*0x1AAD*/ u8 sbr_field_11; /*0x1AAE*/ u8 decorations[16]; /*0x1ABE*/ u8 decorationPos[16]; - /*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]; + /*0x1AD0*/ struct SecretBaseParty party; }; #include "constants/game_stat.h" diff --git a/include/pokemon.h b/include/pokemon.h index cdab96687..a3bcf695e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -128,7 +128,6 @@ #define NUMBER_OF_MON_TYPES 0x12 -#define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 #define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 |