diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-01 20:26:55 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-01 20:28:45 -0800 |
| commit | 4099235b1f26e313aeb94847c1b197d1dc4d4776 (patch) | |
| tree | d46cf3a1e78b66ce9fb0c3a72ac0aefb73c633b3 /include | |
| parent | ca6784e24d168a9114ef27ae0678807221f02a32 (diff) | |
mail data in save block 1
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 12 | ||||
| -rw-r--r-- | include/mail.h | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/include/global.h b/include/global.h index 66b6b6b50..4d736cdef 100644 --- a/include/global.h +++ b/include/global.h @@ -174,9 +174,13 @@ struct EasyChatPair u16 words[2]; }; /*size = 0x8*/ -struct SaveBlock1_2B4C_Struct -{ - u8 filler[0x24]; +struct MailStruct +{ + /*0x00*/ u16 words[9]; + /*0x12*/ u8 playerName[8]; + /*0x1A*/ u8 trainerId[4]; + /*0x1E*/ u16 species; + /*0x20*/ u16 itemId; }; struct SaveBlock1 @@ -241,7 +245,7 @@ struct SaveBlock1 /*0x2B0E*/ u8 filler_2B0E[0xE]; /*0x2B1C*/ u16 unk2B1C[4]; /*0x2B24*/ u8 filler_2B24[0x28]; - /*0x2B4C*/ struct SaveBlock1_2B4C_Struct unkSave[16]; + /*0x2B4C*/ struct MailStruct mail[16]; /*0x2D8C*/ u8 filler_2D8C[0x48]; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2DFC*/ u8 filler_2DFC[0x100]; diff --git a/include/mail.h b/include/mail.h index a579dc458..67a190b9c 100644 --- a/include/mail.h +++ b/include/mail.h @@ -3,13 +3,6 @@ #include "main.h" -struct MailStruct { - /* 0x00 */ u16 words[9]; - /* 0x12 */ u8 var12[12]; - /* 0x1E */ u16 var1E; - /* 0x20 */ u16 var20; -}; - void sub_80F890C(struct MailStruct *arg0, MainCallback arg1, bool8 arg2); #endif // GUARD_MAIL_H |