6 files changed, 35 insertions, 26 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 76cf9e837..290e753f3 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -151,11 +151,6 @@ void overworld_poison_timer_set(void);
 void prev_quest_postbuffer_cursor_backup_reset(void);
 u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *);
 u8 *GetFieldObjectScriptPointerForComparison();
-void sub_8069030(void);
-void sub_806906C(void);
-bool32 IsNationalPokedex(void);
-bool32 IsMysteryGiftAvailable(void);
-int sub_80691DC(void);
 
 // asm/rom_806936C.o
 void SetUpFieldTasks();
diff --git a/include/event_data.h b/include/event_data.h
new file mode 100644
index 000000000..5cac27cc8
--- /dev/null
+++ b/include/event_data.h
@@ -0,0 +1,28 @@
+#ifndef GUARD_EVENT_DATA_H
+#define GUARD_EVENT_DATA_H
+
+#include "flags.h"
+#include "vars.h"
+
+void InitEventData(void);
+void ClearTempFieldEventData(void);
+void ClearUpperFlags(void);
+void DisableNationalPokedex(void);
+void EnableNationalPokedex(void);
+bool32 IsNationalPokedexEnabled(void);
+void DisableMysteryGift(void);
+void EnableMysteryGift(void);
+bool32 IsMysteryGiftEnabled(void);
+void DisableResetRTC(void);
+void EnableResetRTC(void);
+bool32 CanResetRTC(void);
+u16 *GetVarPointer(u16 id);
+u16 VarGet(u16 id);
+bool8 VarSet(u16 id, u16 value);
+u8 VarGetFieldObjectGraphicsId(u8 id);
+u8 *GetFlagPointer(u16 id);
+u8 FlagSet(u16 id);
+u8 FlagReset(u16 id);
+bool8 FlagGet(u16 id);
+
+#endif // GUARD_EVENT_DATA_H
diff --git a/include/flag.h b/include/flag.h
deleted file mode 100644
index 8f4c01b02..000000000
--- a/include/flag.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GUARD_FLAG_H
-#define GUARD_FLAG_H
-
-#include "flags.h"
-
-u8 *GetFlagPointer(u16 id);
-u8 FlagSet(u16 id);
-u8 FlagReset(u16 id);
-bool8 FlagGet(u16 id);
-
-#endif // GUARD_FLAG_H
diff --git a/include/flags.h b/include/flags.h
index 8d3885fe1..0c0cebc5f 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -51,7 +51,9 @@
 #define SYS_BRAILLE_WAIT     0x851
 #define SYS_BRAILLE_FLY      0x852
 
-#define SYS_B_DASH        0x860 // got Running Shoes
+#define SYS_B_DASH           0x860 // got Running Shoes
+#define SYS_CTRL_OBJ_DELETE  0x861
+#define SYS_RESET_RTC_ENABLE 0x862
 
 // SPECIAL FLAGS (unknown purpose)
 
diff --git a/include/var.h b/include/var.h
deleted file mode 100644
index ada8caf24..000000000
--- a/include/var.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_VAR_H
-#define GUARD_VAR_H
-
-u16 *GetVarPointer(u16 id);
-u16 VarGet(u16 id);
-bool8 VarSet(u16 id, u16 value);
-u8 VarGetFieldObjectGraphicsId(u8 id);
-
-#endif // GUARD_VAR_H
diff --git a/include/vars.h b/include/vars.h
index db6f097b7..69939804a 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -3,4 +3,8 @@
 
 #define VAR_REPEL_STEP_COUNT    0x4021
 
+#define VAR_RESET_RTC_ENABLE    0x402C
+
+#define VAR_NATIONAL_DEX        0x4046
+
 #endif // GUARD_VARS_H