Identify most of SaveBlock1

This commit is contained in:
PikalaxALT
2018-11-28 18:55:55 -05:00
parent c79a939d3d
commit c6778caf1e
+13 -16
View File
@@ -489,8 +489,8 @@ struct DaycareMon
struct DayCare
{
struct DaycareMon mons[DAYCARE_MON_COUNT];
u32 offspringPersonality;
u8 stepCounter;
u16 unk_118;
u8 unk_11A;
};
struct DayCareMail
@@ -588,6 +588,9 @@ struct FameCheckerSaveData
#define VARS_COUNT 256
#define MAIL_COUNT 16
#define NUM_EASY_CHAT_EXTRA_PHRASES 33
#define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0))
struct SaveBlock1
{
/*0x0000*/ struct Coords16 pos;
@@ -613,10 +616,10 @@ struct SaveBlock1
/*0x0464*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT];
/*0x054c*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT];
/*0x05F8*/ u8 seen1[DEX_FLAGS_NO];
/*0x062C*/ u8 filler_062c[12];
/*0x062C*/ u16 berryBlenderRecords[3]; // unused
/*0x0632*/ u8 field_632[6]; // unused?
/*0x0638*/ u8 trainerRematchStepCounter;
u8 filler_639;
/*0x063A*/ u8 trainerRematches[100];
/*0x063A*/ u8 ALIGNED(2) trainerRematches[100];
/*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
/*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
/*0x0EE0*/ u8 flags[FLAGS_COUNT];
@@ -628,17 +631,11 @@ struct SaveBlock1
/*0x2CB8*/ u16 unk2CB8[6];
/*0x2CC4*/ u16 unk2CC4[6];
/*0x2CD0*/ struct MailStruct mail[MAIL_COUNT];
/*0x2F10*/ u8 filler2F10[0x184];
struct {
/*0x3094*/ u8 unknown1[8];
/*0x309C*/ u8 giftRibbons[11];
/*0x30A7*/ u8 unknown2[8];
/*0x30AF*/ u32 currentPokeCoupons;
/*0x30B3*/ u32 totalEarnedPokeCoupons;
/*0x30B7*/ u8 unknown3[6];
/*0x30BD*/ u8 receivedWishmakerJirachi;
/*0x30BE*/ u8 unknown4[18];
} __attribute__((packed)) externalReservedData;
/*0x2F10*/ u8 additionalPhrases[EASY_CHAT_EXTRA_PHRASES_SIZE];
/*0x2F18*/ OldMan oldMan; // unused
/*0x2F54*/ struct EasyChatPair easyChatPairs[5]; // unused
/*0x2F80*/ struct DayCare daycare;
/*0x309C*/ u8 giftRibbons[52];
/*0x30D0*/ struct Roamer roamer;
/*0x30EC*/ struct EnigmaBerry enigmaBerry;
/*0x3120*/ u8 filler3120[0x340];