merge and nonmatching PokemonUseItemEffects2

5 files changed, 43 insertions, 3 deletions

diff --git a/include/event_data.h b/include/event_data.h
index f829d3b87..f28ed4f75 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -29,6 +29,8 @@ u8 *GetFlagPointer(u16 id);
 u8 FlagSet(u16 id);
 u8 FlagClear(u16 id);
 bool8 FlagGet(u16 id);
+u16 * sub_806E454(u16 id);
+bool32 sub_806E2BC(void);
 
 extern u16 gSpecialVar_0x8000;
 extern u16 gSpecialVar_0x8001;
@@ -49,4 +51,6 @@ extern u16 gSpecialVar_MonBoxId;
 extern u16 gSpecialVar_MonBoxPos;
 extern u16 gSpecialVar_0x8014;
 
+extern u16 gUnknown_20370D0;
+
 #endif // GUARD_EVENT_DATA_H
diff --git a/include/gba/defines.h b/include/gba/defines.h
index fe81770e3..a0ef506dd 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -69,5 +69,6 @@
 #define WIN_RANGE(a, b) (((a) << 8) | (b))
 
 #define NAKED __attribute__((naked))
+#define UNUSED __attribute__((unused))
 
 #endif // GUARD_GBA_DEFINES
diff --git a/include/global.h b/include/global.h
index 7de1232ad..fac7e1354 100644
--- a/include/global.h
+++ b/include/global.h
@@ -473,6 +473,14 @@ struct RecordMixingDayCareMail
     bool16 holdsItem[DAYCARE_MON_COUNT];
 };
 
+struct MysteryEventStruct
+{
+    u8 unk_0_0:2;
+    u8 unk_0_2:3;
+    u8 unk_0_5:3;
+    u8 unk_1;
+};
+
 #define MAP_OBJECTS_COUNT  16
 #define BERRY_TREES_COUNT  128
 #define FLAGS_COUNT        300
@@ -483,9 +491,21 @@ struct SaveBlock1
 {
     /*0x0000*/ u8 filler[0x4];
     /*0x0004*/ struct WarpData location;
-    /*0x000C*/ u8 fillerC[0x30DE];
-    /*0x30EA*/ struct EnigmaBerry enigmaBerry;
-    /*0x3120*/ u8 filler3120[0x4FC];
+    /*0x0C*/ struct WarpData warp1;
+    /*0x14*/ struct WarpData warp2;
+    /*0x1C*/ struct WarpData lastHealLocation;
+    /*0x24*/ struct WarpData warp4;
+    /*0x002C*/ u8 filler2C[0x60C];
+    /*0x638*/ u8 trainerRematchStepCounter;
+              u8 filler_639;
+    /*0x63a*/ u8 trainerRematches[100];
+    /*0x06A0*/  struct MapObject mapObjects[MAP_OBJECTS_COUNT];
+    /*0x08E0*/  struct MapObjectTemplate mapObjectTemplates[64];
+    /*0x0EE0*/ u8 fillerEE0[0x220A];
+	/*0x30EA*/ struct EnigmaBerry enigmaBerry;
+	/*0x3120*/ u8 filler3120[0x340];
+    /*0x3460*/ struct MysteryEventStruct unk_3460;
+    /*0x3464*/ u8 filler_3464[0x1b8];
     /*0x361C*/ struct RamScript ramScript;
     /*0x3A08*/ u8 filler3A08[0x44];
     /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
diff --git a/include/menews_jisan.h b/include/menews_jisan.h
new file mode 100644
index 000000000..8dc1d0a99
--- /dev/null
+++ b/include/menews_jisan.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_MENEWS_JISAN_H
+#define GUARD_MENEWS_JISAN_H
+
+void sub_8146C30(u32 a0);
+void sub_8146C88(void);
+void sub_8146CA4(void);
+
+#endif //GUARD_MENEWS_JISAN_H
diff --git a/include/mevent.h b/include/mevent.h
new file mode 100644
index 000000000..a611a98a8
--- /dev/null
+++ b/include/mevent.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_MEVENT_H
+#define GUARD_MEVENT_H
+
+struct MysteryEventStruct * sub_8143D94(void);
+bool32 sub_8143E1C(void);
+
+#endif //GUARD_MEVENT_H