Update offset comments in save block 1

2 files changed, 104 insertions, 30 deletions

diff --git a/include/global.h b/include/global.h
index 4014c6dde..9793ddcf2 100644
--- a/include/global.h
+++ b/include/global.h
@@ -534,14 +534,14 @@ struct MailStruct
 
 struct UnkMauvilleOldManStruct
 {
-               u8 unk_2D94;
-               u8 unk_2D95;
-    /*0x2D96*/ u16 mauvilleOldMan_ecArray[6];
-    /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6];
-    /*0x2DAE*/ u8 playerName[8];
-    /*0x2DB6*/ u8 filler_2DB6[0x3];
-    /*0x2DB9*/ u8 playerTrainerId[4];
-               u8 unk_2DBD;
+               u8 unk_2E28;
+               u8 unk_2E29;
+    /*0x2E2A*/ u16 mauvilleOldMan_ecArray[6];
+    /*0x2E36*/ u16 mauvilleOldMan_ecArray2[6];
+    /*0x2E42*/ u8 playerName[8];
+    /*0x2E4A*/ u8 filler_2E4A[0x3];
+    /*0x2E4B*/ u8 playerTrainerId[4];
+               u8 unk_2E4F;
 }; /*size = 0x2C*/
 
 struct UnkMauvilleOldManStruct2
@@ -579,24 +579,24 @@ struct UnknownSaveStruct2ABC
 
 struct GabbyAndTyData
 {
-    /*2b10*/ u16 mon1;
-    /*2b12*/ u16 mon2;
-    /*2b14*/ u16 lastMove;
-    /*2b16*/ u16 quote;
-    /*2b18*/ u8 mapnum;
-    /*2b19*/ u8 battleNum;
-    /*2b1a*/ u8 valA_0:1;
-    /*2b1a*/ u8 valA_1:1;
-    /*2b1a*/ u8 valA_2:1;
-    /*2b1a*/ u8 valA_3:1;
-    /*2b1a*/ u8 valA_4:1;
-    /*2b1a*/ u8 valA_5:3;
-    /*2b1b*/ u8 valB_0:1;
-    /*2b1b*/ u8 valB_1:1;
-    /*2b1b*/ u8 valB_2:1;
-    /*2b1b*/ u8 valB_3:1;
-    /*2b1b*/ u8 valB_4:1;
-    /*2b1b*/ u8 valB_5:3;
+    /*2ba4*/ u16 mon1;
+    /*2ba6*/ u16 mon2;
+    /*2ba8*/ u16 lastMove;
+    /*2baa*/ u16 quote;
+    /*2bac*/ u8 mapnum;
+    /*2bad*/ u8 battleNum;
+    /*2bae*/ u8 valA_0:1;
+    /*2bae*/ u8 valA_1:1;
+    /*2bae*/ u8 valA_2:1;
+    /*2bae*/ u8 valA_3:1;
+    /*2bae*/ u8 valA_4:1;
+    /*2bae*/ u8 valA_5:3;
+    /*2baf*/ u8 valB_0:1;
+    /*2baf*/ u8 valB_1:1;
+    /*2baf*/ u8 valB_2:1;
+    /*2baf*/ u8 valB_3:1;
+    /*2baf*/ u8 valB_4:1;
+    /*2baf*/ u8 valB_5:3;
 };
 
 struct RecordMixing_UnknownStructSub
@@ -787,10 +787,10 @@ struct SaveBlock1
     /*0x????*/ u8 outbreakPokemonProbability;
     /*0x????*/ u16 outbreakUnk5;
     /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData;
-    /*0x????*/ u16 unk2B1C[6];
-    /*0x????*/ u16 unk2B28[6];
-    /*0x????*/ u16 unk2B34[6];
-    /*0x????*/ u16 unk2B3A[3];
+    /*0x2BB0*/ u16 unk2BB0[6];
+    /*0x2BBC*/ u16 unk2BBC[6];
+    /*0x2BC8*/ u16 unk2BC8[6];
+    /*0x2BD4*/ u16 unk2BD4[3];
     /*0x2BE0*/ struct MailStruct mail[16];
     /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system
     /*0x2E25*/ u8 unk2E25[3]; // possibly padding?
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 1ff0ccc33..dd490ddf8 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -8,6 +8,7 @@
 #include "main.h"
 #include "window.h"
 #include "palette.h"
+#include "event_data.h"
 #include "easy_chat.h"
 
 // Static type declarations
@@ -207,3 +208,76 @@ void sub_811A4D0(MainCallback callback)
     FreeAllWindowBuffers();
     SetMainCallback2(callback);
 }
+//
+//void easy_chat_input_maybe(void)
+//{
+//    u16 i;
+//    u16 *words;
+//    OldMan *oldMan;
+//    u8 sizeParam = 3;
+//    switch (gSpecialVar_0x8004)
+//    {
+//        case 0:
+//            words = gSaveBlock1Ptr->unk2BB0;
+//            break;
+//        case 1:
+//            words = gSaveBlock1Ptr->unk2BBC;
+//            break;
+//        case 2:
+//            words = gSaveBlock1Ptr->unk2BC8;
+//            break;
+//        case 3:
+//            words = gSaveBlock1Ptr->unk2BD4;
+//            break;
+//        case 4:
+//            words = gSaveBlock1Ptr->mail[gSpecialVar_0x8005].words;
+//            break;
+//        case 6:
+//            oldMan = &gSaveBlock1Ptr->oldMan;
+//            for (i=0; i<6; i++)
+//            {
+//                oldMan->oldMan1.mauvilleOldMan_ecArray2[i] = oldMan->oldMan1.mauvilleOldMan_ecArray[i];
+//            }
+//            words = oldMan->oldMan1.mauvilleOldMan_ecArray2;
+//            break;
+//        case 5:
+//            words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.var04;
+//            sizeParam = gSpecialVar_0x8006;
+//            break;
+//        case 7:
+//            words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanclubOpinions.var1C[gSpecialVar_0x8006];
+//            sizeParam = 1;
+//            break;
+//        case 8:
+//            words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].recentHappenings.var02;
+//            sizeParam = 0;
+//            break;
+//        case 9:
+//            words = NULL;
+//            break;
+//        case 10:
+//            words = &gSaveBlock1Ptr->gabbyAndTyData.quote;
+//            *words = -1;
+//            sizeParam = 1;
+//            break;
+//        case 11:
+//            words = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].bravoTrainer.var04[gSpecialVar_0x8006];
+//            sizeParam = 0;
+//            break;
+//        case 12:
+//            words = gSaveBlock1Ptr->tvShows[gSpecialVar_0x8005].fanclubOpinions.var18;
+//            sizeParam = 1;
+//            break;
+//        case 13:
+//            words = (u16 *)gStringVar3;
+//            sub_811F88C(words, 2);
+//            break;
+//        case 14:
+//            words =
+//        default:
+//            return;
+//    }
+//    overworld_free_bg_tilemaps();
+//    sub_811A20C(gSpecialVar_0x8004, words, sub_80861B0, sizeParam);
+//}
+