summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/include/global.h b/include/global.h
index 0f5bcde6d..c9a092f05 100644
--- a/include/global.h
+++ b/include/global.h
@@ -115,11 +115,6 @@ enum
BAG_KEYITEMS
};
-struct TextStruct
-{
- const u8 *text;
-};
-
struct Coords16
{
s16 x;
@@ -474,10 +469,20 @@ struct UnkMauvilleOldManStruct2
u8 fillerF[0x2];
}; /*size = 0x2C*/
+struct MauvilleOldManTrader
+{
+ u8 unk0;
+ u8 unk1[4];
+ u8 unk5[4][11];
+ u8 unk31;
+};
+
typedef union OldMan
{
struct UnkMauvilleOldManStruct oldMan1;
struct UnkMauvilleOldManStruct2 oldMan2;
+ struct MauvilleOldManTrader trader;
+ u8 filler[0x40];
} OldMan;
struct Unk_SB_Access_Struct1
@@ -531,7 +536,9 @@ struct GabbyAndTyData
struct RecordMixing_UnknownStructSub
{
- u8 data[0x38];
+ u32 unk0;
+ u8 data[0x34];
+ //u8 data[0x38];
};
struct RecordMixing_UnknownStruct
@@ -611,7 +618,6 @@ struct SaveBlock1 /* 0x02025734 */
/*0x2D8C*/ u8 unk2D8C[4];
/*0x2D90*/ u8 filler_2D90[0x4];
/*0x2D94*/ OldMan oldMan;
- /*0x2DC0*/ u8 unk_2DC0[0x14];
/*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
/*0x2DFC*/ u8 filler_2DFC[0x8];
/*0x2E04*/ SB_Struct sbStruct;