diff options
| -rw-r--r-- | include/global.h | 12 | ||||
| -rw-r--r-- | include/mail.h | 7 | ||||
| -rw-r--r-- | src/item_use.c | 2 | ||||
| -rw-r--r-- | src/load_save.c | 10 | ||||
| -rw-r--r-- | src/mail.c | 14 |
5 files changed, 21 insertions, 24 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 diff --git a/src/item_use.c b/src/item_use.c index fee70d7d2..21ce9acd3 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -127,7 +127,7 @@ void sub_80C9154(u8 taskId) if(!gPaletteFade.active) { - mailStruct.var20 = gScriptItemId; + mailStruct.itemId = gScriptItemId; sub_80F890C(&mailStruct, sub_80A5D04, 0); DestroyTask(taskId); } diff --git a/src/load_save.c b/src/load_save.c index 0d4f1238d..a35c20023 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -15,7 +15,7 @@ struct LoadedSaveData struct ItemSlot pokeBalls[16]; struct ItemSlot TMsHMs[64]; struct ItemSlot berries[46]; - struct SaveBlock1_2B4C_Struct unknownSaveData[16]; + struct MailStruct mail[16]; }; extern struct LoadedSaveData gLoadedSaveData[]; @@ -129,9 +129,9 @@ void LoadPlayerData(void) for(i = 0; i < 46; i++) gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i]; - // load misc data. + // load mail for(i = 0; i < 16; i++) - gLoadedSaveData->unknownSaveData[i] = gSaveBlock1.unkSave[i]; + gLoadedSaveData->mail[i] = gSaveBlock1.mail[i]; } void SavePlayerData(void) @@ -158,7 +158,7 @@ void SavePlayerData(void) for(i = 0; i < 46; i++) gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i]; - // save misc data. + // save mail for(i = 0; i < 16; i++) - gSaveBlock1.unkSave[i] = gLoadedSaveData->unknownSaveData[i]; + gSaveBlock1.mail[i] = gLoadedSaveData->mail[i]; } diff --git a/src/mail.c b/src/mail.c index c1ec02e4e..f61c2f00e 100644 --- a/src/mail.c +++ b/src/mail.c @@ -104,10 +104,10 @@ void sub_80F890C(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { unk_2000000.var104 = (MainCallback) sub_80EB3FC; unk_2000000.var108 = (MainCallback) ConvertEasyChatWordsToString; - mailDesign = arg0->var20 - ITEM_ORANGE_MAIL; + mailDesign = arg0->itemId - ITEM_ORANGE_MAIL; if (mailDesign <= 11) { - unk_2000000.varFA = arg0->var20 - ITEM_ORANGE_MAIL; + unk_2000000.varFA = arg0->itemId - ITEM_ORANGE_MAIL; } else { unk_2000000.varFA = 0; arg2 = FALSE; @@ -124,7 +124,7 @@ void sub_80F890C(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { break; } - if (((sub_80A2D64(arg0->var1E, buffer) << 16) +0xFFFF0000) <= (410 << 16)) { + if (((sub_80A2D64(arg0->species, buffer) << 16) +0xFFFF0000) <= (410 << 16)) { switch (unk_2000000.varFA) { case 6: unk_2000000.varFB = 1; @@ -394,7 +394,7 @@ static u8 sub_80F8A28(void) { case 16: { u16 local1; - local1 = sub_809D4A8(unk_2000000.varF4->var1E); + local1 = sub_809D4A8(unk_2000000.varF4->species); switch (unk_2000000.varFB) { case 1: @@ -477,7 +477,7 @@ static void sub_80F8DA0(void) { u8 *ptr; u16 length; - ptr = sub_80F8D7C(unk_2000000.varD8, unk_2000000.varF4->var12); + ptr = sub_80F8D7C(unk_2000000.varD8, unk_2000000.varF4->playerName); StringCopy(ptr, gOtherText_From); length = StringLength(unk_2000000.varD8); @@ -487,7 +487,7 @@ static void sub_80F8DA0(void) { u8 *ptr; ptr = StringCopy(unk_2000000.varD8, gOtherText_From); - sub_80F8D7C(ptr, unk_2000000.varF4->var12); + sub_80F8D7C(ptr, unk_2000000.varF4->playerName); unk_2000000.varF9 = unk_2000000.var10C->var2; } @@ -671,7 +671,7 @@ static void sub_80F8FB4(void) { switch (unk_2000000.varFB) { case 2: case 1: - local1 = sub_809D4A8(unk_2000000.varF4->var1E); + local1 = sub_809D4A8(unk_2000000.varF4->species); sub_809D608(local1); sub_809D510(&gSprites[unk_2000000.varFC]); |