Merge branch 'master' into dodrio_berry_picking

9 files changed, 173 insertions, 22 deletions

diff --git a/include/berry_powder.h b/include/berry_powder.h
new file mode 100755
index 000000000..8deea7ec0
--- /dev/null
+++ b/include/berry_powder.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_BERRY_POWDER_H
+#define GUARD_BERRY_POWDER_H
+
+void SetBerryPowder(u32 *powder, u32 amount);
+void ApplyNewEncryptionKeyToBerryPowder(u32 encryptionKey);
+bool8 GiveBerryPowder(u32 amountToAdd);
+u32 GetBerryPowder(void);
+
+#endif // GUARD_BERRY_POWDER_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 230fbabaf..f28af3278 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -336,24 +336,23 @@
 #define FLAG_RECEIVED_AURORA_TICKET          0x13A // RECEIVED Aurora Ticket in Mystery Gift
 #define FLAG_RECEIVED_MYSTIC_TICKET          0x13B // RECEIVED Mystic Ticket in Mystery Gift
 #define FLAG_RECEIVED_OLD_SEA_MAP            0x13C // RECEIVED Old Sea Map in Mystery Gift
-
-#define FLAG_UNUSED_0x13D                    0x13D // Unused Flag
-#define FLAG_UNUSED_0x13E                    0x13E // Unused Flag
-#define FLAG_UNUSED_0x13F                    0x13F // Unused Flag
-#define FLAG_UNUSED_0x140                    0x140 // Unused Flag
-#define FLAG_UNUSED_0x141                    0x141 // Unused Flag
-#define FLAG_UNUSED_0x142                    0x142 // Unused Flag
-#define FLAG_UNUSED_0x143                    0x143 // Unused Flag
-#define FLAG_UNUSED_0x144                    0x144 // Unused Flag
-#define FLAG_UNUSED_0x145                    0x145 // Unused Flag
-#define FLAG_UNUSED_0x146                    0x146 // Unused Flag
-#define FLAG_UNUSED_0x147                    0x147 // Unused Flag
-#define FLAG_UNUSED_0x148                    0x148 // Unused Flag
-#define FLAG_UNUSED_0x149                    0x149 // Unused Flag
-#define FLAG_UNUSED_0x14A                    0x14A // Unused Flag
-#define FLAG_UNUSED_0x14B                    0x14B // Unused Flag
-#define FLAG_UNUSED_0x14C                    0x14C // Unused Flag
-#define FLAG_UNUSED_0x14D                    0x14D // Unused Flag
+#define FLAG_UNUSED_MYSTERY_GIFT_0x13D       0x13D
+#define FLAG_UNUSED_MYSTERY_GIFT_0x13E       0x13E
+#define FLAG_UNUSED_MYSTERY_GIFT_0x13F       0x13F
+#define FLAG_UNUSED_MYSTERY_GIFT_0x140       0x140
+#define FLAG_UNUSED_MYSTERY_GIFT_0x141       0x141
+#define FLAG_UNUSED_MYSTERY_GIFT_0x142       0x142
+#define FLAG_UNUSED_MYSTERY_GIFT_0x143       0x143
+#define FLAG_UNUSED_MYSTERY_GIFT_0x144       0x144
+#define FLAG_UNUSED_MYSTERY_GIFT_0x145       0x145
+#define FLAG_UNUSED_MYSTERY_GIFT_0x146       0x146
+#define FLAG_UNUSED_MYSTERY_GIFT_0x147       0x147
+#define FLAG_UNUSED_MYSTERY_GIFT_0x148       0x148
+#define FLAG_UNUSED_MYSTERY_GIFT_0x149       0x149
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14A       0x14A
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14B       0x14B
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14C       0x14C
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14D       0x14D
 
 #define FLAG_MIRAGE_TOWER_VISIBLE            0x14E
 #define FLAG_CHOSE_CLAW_FOSSIL               0x14F // Player chose Claw Fossil
diff --git a/include/global.h b/include/global.h
index 1f9ac5185..d738deb3c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -808,6 +808,76 @@ struct SaveTrainerHill
     /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0
 };
 
+struct MysteryEventStruct
+{
+    u8 unk_0_0:2;
+    u8 unk_0_2:3;
+    u8 unk_0_5:3;
+    u8 unk_1;
+};
+
+ struct MEventBuffer_3120_Sub
+{
+    u16 unk_00;
+    u8 unk_02;
+    u8 unk_03;
+    u8 unk_04[40];
+    u8 unk_2C[10][40];
+};
+
+ struct MEventBuffer_3120
+{
+    u32 crc;
+    struct MEventBuffer_3120_Sub data;
+};
+
+ struct MEventBuffer_32E0_Sub
+{
+    u16 unk_00;
+    u16 unk_02;
+    u32 unk_04;
+    u8 unk_08_0:2;
+    u8 unk_08_2:4;
+    u8 unk_08_6:2;
+    u8 unk_09;
+    u8 unk_0A[40];
+    u8 unk_32[40];
+    u8 unk_5A[4][40];
+    u8 unk_FA[40];
+    u8 unk_122[40];
+};
+
+ struct MEventBuffer_32E0
+{
+    u32 crc;
+    struct MEventBuffer_32E0_Sub data;
+};
+
+ struct MEventBuffer_3430_Sub
+{
+    u16 unk_00;
+    u16 unk_02;
+    u16 unk_04;
+    u16 unk_06;
+    u16 unk_08[2][7];
+};
+
+ struct MEventBuffer_3430
+{
+    u32 crc;
+    struct MEventBuffer_3430_Sub data;
+};
+
+ struct MEventBuffers
+{
+    /*0x000 0x322C*/ struct MEventBuffer_3120 buffer_000;
+    /*0x1c0 0x33EC*/ struct MEventBuffer_32E0 buffer_1c0;
+    /*0x310 0x353C*/ struct MEventBuffer_3430 buffer_310;
+    /*0x338 0x3564*/ u16 unk_338[4];
+    /*0x340 0x356C*/ struct MysteryEventStruct unk_340;
+    /*0x344 0x3570*/ u32 unk_344[2][5];
+}; // 0x36C 0x3598
+
 struct SaveBlock1
 {
     /*0x00*/ struct Coords16 pos;
@@ -884,14 +954,15 @@ struct SaveBlock1
     /*0x31A8*/ u8 giftRibbons[52];
     /*0x31DC*/ struct Roamer roamer;
     /*0x31F8*/ struct EnigmaBerry enigmaBerry;
-    /*0x322C*/ u8 field_322C[1260];
+    /*0x322C*/ struct MEventBuffers unk_322C;
+    /*0x3598*/ u8 field_3598[0x180];
     /*0x3718*/ u32 trainerHillTimes[4];
     /*0x3728*/ struct RamScript ramScript;
     /*0x3B14*/ struct RecordMixingGift recordMixingGift;
     /*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
     /*0x3B58*/ LilycoveLady lilycoveLady;
     /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20];
-    /*0x3C88*/ u8 filler_3C88[0xDC];
+    /*0x3C88*/ u8 unk3C88[11][20];
     /*0x3D64*/ struct SaveTrainerHill trainerHill;
     /*0x3D70*/ struct WaldaPhrase waldaPhrase;
     // sizeof: 0x3D88
diff --git a/include/link.h b/include/link.h
index 1e865e72b..714b6bf15 100644
--- a/include/link.h
+++ b/include/link.h
@@ -306,7 +306,6 @@ void sub_8009FAC(void);
 bool8 sub_800A4D8(u8 a0);
 u8 sub_800A9D8(void);
 u8 sub_800A0C8(s32, s32);
-u16 *GetSaveBlock1Field3564(void);
 u8 sub_800A9A8(void);
 void sub_800AD10(void);
 void sub_800AB18(void);
diff --git a/include/main.h b/include/main.h
index 4f9a9e61a..6c67fbe9f 100644
--- a/include/main.h
+++ b/include/main.h
@@ -42,6 +42,8 @@ struct Main
 
 extern const u8 gGameVersion;
 extern const u8 gGameLanguage;
+extern const u8 RomHeaderGameCode[4];
+extern const u8 RomHeaderSoftwareVersion;
 
 extern u16 gKeyRepeatStartDelay;
 extern bool8 gLinkTransferringData;
diff --git a/include/mevent.h b/include/mevent.h
new file mode 100755
index 000000000..7f12f3501
--- /dev/null
+++ b/include/mevent.h
@@ -0,0 +1,63 @@
+#ifndef GUARD_MEVENT_H
+#define GUARD_MEVENT_H
+
+struct MEvent_Str_1
+{
+    u16 unk_000;
+    size_t unk_004;
+    const void * unk_008;
+};
+
+struct MEvent_Str_2
+{
+    u8 fill_00[0x40];
+};
+
+struct MEventStruct_Unk1442CC
+{
+    u32 unk_00;
+    u16 unk_04;
+    u32 unk_08;
+    u16 unk_0C;
+    u32 unk_10;
+    u16 unk_14;
+    u16 unk_16[4];
+    struct MEventBuffer_3430_Sub unk_20;
+    u8 unk_44;
+    u8 unk_45[7];
+    u8 unk_4C[4];
+    u16 unk_50[6];
+    u8 unk_5C[4];
+    u8 unk_60;
+};
+
+void sub_801AFD8(void);
+struct MEventBuffer_3120_Sub *sub_801B00C(void);
+struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void);
+struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void);
+struct MysteryEventStruct *sub_801B044(void);
+u16 *sub_801B058(void);
+void sub_801B06C(void);
+bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src);
+bool32 sub_801B0CC(void);
+bool32 sub_801B128(void);
+bool32 sub_801B1A4(const u8 *src);
+void sub_801B1E8(void);
+bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data);
+bool32 sub_801B27C(void);
+bool32 sub_801B308(void);
+u16 sub_801B39C(void);
+void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer);
+bool32 sub_801B3F8(void);
+bool32 sub_801B508(const u16 *data);
+void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1);
+bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1);
+u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused);
+u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused);
+bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1);
+u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command);
+u16 mevent_081445C0(u32 command);
+void sub_801B940(void);
+bool32 sub_801B94C(u16 a0);
+
+#endif //GUARD_MEVENT_H
diff --git a/include/mevent_news.h b/include/mevent_news.h
new file mode 100755
index 000000000..698d7148c
--- /dev/null
+++ b/include/mevent_news.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MEVENT_NEWS_H
+#define GUARD_MEVENT_NEWS_H
+
+void sub_801DBC0(void);
+
+#endif //GUARD_MEVENT_NEWS_H
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index 0f13718e5..8376d1bc6 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -13,7 +13,6 @@ extern u8 gUnknown_02022C3E;
 // Exported ROM declarations
 
 void sub_8018438(void);
-u16 mevent_081445C0(u8);
 void sub_801B990(u32, u32);
 u8 sub_8013F78(void);
 bool32 sub_802C908(u16);
diff --git a/include/strings.h b/include/strings.h
index ded997b04..400e48036 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2589,4 +2589,7 @@ extern const u8 gUnknown_085EE14B[];
 extern const u8 gUnknown_085EE14F[];
 extern const u8 gUnknown_085EE154[];
 
+// Berry Powder Menu
+extern const u8 gText_Powder[];
+
 #endif // GUARD_STRINGS_H