summaryrefslogtreecommitdiff
path: root/include/event_data.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/event_data.h')
-rw-r--r--include/event_data.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/event_data.h b/include/event_data.h
index 98e4a6da3..5656ab8dc 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -1,12 +1,12 @@
#ifndef GUARD_EVENT_DATA_H
#define GUARD_EVENT_DATA_H
-#include "flags.h"
-#include "vars.h"
+#include "constants/flags.h"
+#include "constants/vars.h"
void InitEventData(void);
void ClearTempFieldEventData(void);
-void ClearUpperFlags(void);
+void ClearDailyFlags(void);
void DisableNationalPokedex(void);
void EnableNationalPokedex(void);
bool32 IsNationalPokedexEnabled(void);
@@ -22,7 +22,7 @@ bool8 VarSet(u16 id, u16 value);
u8 VarGetFieldObjectGraphicsId(u8 id);
u8 *GetFlagPointer(u16 id);
u8 FlagSet(u16 id);
-u8 FlagReset(u16 id);
+u8 FlagClear(u16 id);
bool8 FlagGet(u16 id);
extern u16 gSpecialVar_0x8000;
@@ -37,8 +37,8 @@ extern u16 gSpecialVar_0x8008;
extern u16 gSpecialVar_0x8009;
extern u16 gSpecialVar_0x800A;
extern u16 gSpecialVar_0x800B;
-extern u16 gScriptResult;
-extern u16 gScriptLastTalked;
-extern u16 gScriptFacing;
+extern u16 gSpecialVar_Result;
+extern u16 gSpecialVar_LastTalked;
+extern u16 gSpecialVar_Facing;
#endif // GUARD_EVENT_DATA_H