summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/event_data.h2
-rw-r--r--include/palette.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/include/event_data.h b/include/event_data.h
index e09b32d44..3b8e2701f 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -6,7 +6,7 @@
void InitEventData(void);
void ClearTempFieldEventData(void);
-void ClearUpperFlags(void);
+void ClearDailyFlags(void);
void DisableNationalPokedex(void);
void EnableNationalPokedex(void);
bool32 IsNationalPokedexEnabled(void);
diff --git a/include/palette.h b/include/palette.h
index e24da3e00..8d16270aa 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -9,6 +9,11 @@
#define PLTT_BUFFER_SIZE 0x200
#define PLTT_DECOMP_BUFFER_SIZE (PLTT_BUFFER_SIZE * 2)
+#define PALETTE_FADE_STATUS_DELAY 2
+#define PALETTE_FADE_STATUS_ACTIVE 1
+#define PALETTE_FADE_STATUS_DONE 0
+#define PALETTE_FADE_STATUS_LOADING 0xFF
+
enum
{
FAST_FADE_IN_FROM_WHITE,