Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine

6 files changed, 11 insertions, 6 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/intro.h b/include/intro.h
index b1bfe20a4..198ae2669 100644
--- a/include/intro.h
+++ b/include/intro.h
@@ -9,6 +9,6 @@
 void CB2_InitCopyrightScreenAfterBootup(void);
 void CB2_InitCopyrightScreenAfterBootup(void);
 void CB2_InitCopyrightScreenAfterTitleScreen(void);
-void sub_816F2A8(u16, u16, u16, u16);
+void PanFadeAndZoomScreen(u16, u16, u16, u16);
 
 #endif // GUARD_INTRO_H
diff --git a/include/intro_credits_graphics.h b/include/intro_credits_graphics.h
index 354d62e05..2c7ceaf57 100644
--- a/include/intro_credits_graphics.h
+++ b/include/intro_credits_graphics.h
@@ -9,7 +9,7 @@ extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[];
 extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet[];
 extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[];
 extern const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[];
-extern const struct SpritePalette gUnknown_085F530C[];
+extern const struct SpritePalette gIntroBikeAndFlygonPalette[];
 extern const struct CompressedSpriteSheet gUnknown_085F5334[];
 extern const struct CompressedSpriteSheet gUnknown_085F5344[];
 extern const struct CompressedSpriteSheet gUnknown_085F5354[];
@@ -21,7 +21,7 @@ void load_intro_part2_graphics(u8 a);
 void sub_817B150(u8 a);
 void sub_817B1C8(u8);
 void sub_817B3A8(u8);
-u8 sub_817B3DC(u8 a, u16 b, u16 c, u16 d);
+u8 CreateBicycleAnimationTask(u8 a, u16 b, u16 c, u16 d);
 void sub_817B540(u8);
 u8 intro_create_brendan_sprite(s16 a, s16 b);
 u8 intro_create_may_sprite(s16 a, s16 b);
diff --git a/include/new_game.h b/include/new_game.h
index f4d69cbce..8fab05483 100644
--- a/include/new_game.h
+++ b/include/new_game.h
@@ -8,7 +8,7 @@ void SetTrainerId(u32 trainerId, u8 *dst);
 u32 GetTrainerId(u8 *trainerId);
 void CopyTrainerId(u8 *dst, u8 *src);
 void NewGameInitData(void);
-void sub_808447C(void);
+void ResetMenuAndMonGlobals(void);
 void Sav2_ClearSetDefault(void);
 
 #endif // GUARD_NEW_GAME_H
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,
diff --git a/include/title_screen.h b/include/title_screen.h
index b660792fc..ad0809ed2 100644
--- a/include/title_screen.h
+++ b/include/title_screen.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TITLE_SCREEN_H
 #define GUARD_TITLE_SCREEN_H
 
-extern const u16 gUnknown_0853FF70[];
+extern const u16 gIntroWaterDropData[];
 
 void CB2_InitTitleScreen(void);