diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-25 21:00:41 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-25 21:00:41 +0200 |
commit | b051cbaaab8bacd0cdc65ce609a92bc9dd868a1f (patch) | |
tree | 8b4294d4ffcafba872544e3854b4db86cc5bdae7 /include/global.h | |
parent | 03b593d3c3c763f29ba6e7c27e06fcae8a62054a (diff) |
more record mixing decomp
Diffstat (limited to 'include/global.h')
-rw-r--r-- | include/global.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/global.h b/include/global.h index fe82ea9a7..b869da813 100644 --- a/include/global.h +++ b/include/global.h @@ -256,6 +256,13 @@ struct UnknownSaveBlock2Struct u8 field_EB; }; // sizeof = 0xEC +struct UnkRecordMixingStruct +{ + u8 field_0[0x34]; + u8 playerId[4]; + u8 field_38[10]; +}; + struct SaveBlock2 { /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH]; @@ -286,7 +293,7 @@ struct SaveBlock2 /*0xB2*/ u8 field_B2_0:3; /*0xB2*/ u8 field_B2_1:2; /*0xB3*/ u8 field_B3[0x29]; - /*0xDC*/ u8 field_0DC[0x110]; + /*0xDC*/ struct UnkRecordMixingStruct field_DC[4]; /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; @@ -605,9 +612,9 @@ struct ContestWinner u8 contestRank; }; -struct DaycareMiscMon +struct DayCareMail { - struct MailStruct mail; + struct MailStruct message; u8 OT_name[OT_NAME_LENGTH + 1]; u8 monName[POKEMON_NAME_LENGTH + 1]; u8 gameLanguage:4; @@ -617,7 +624,7 @@ struct DaycareMiscMon struct DaycareMon { struct BoxPokemon mon; - struct DaycareMiscMon misc; + struct DayCareMail mail; u32 steps; }; @@ -628,12 +635,6 @@ struct DayCare u8 stepCounter; }; -struct DayCareMail -{ - /*0x00*/ struct MailStruct message; - /*0x24*/ u8 names[19]; -}; - struct RecordMixingDayCareMail { struct DayCareMail mail[DAYCARE_MON_COUNT]; |