Merge branch 'master' of github.com:pret/pokefirered into region_map

include/bike.h

@@ -4,5 +4,6 @@
 void sub_80BD620(u32 unkC, u32 unk10);
 bool8 sub_80BD540(void);
 void StartTransitionToFlipBikeState(u8 flags);
+s16 GetPlayerSpeed(void);
 
 #endif //GUARD_BIKE_H

include/field_effect_helpers.h

@@ -15,5 +15,6 @@
 u8 sub_8154228(void);
 bool8 sub_8155DA0(struct ObjectEvent *);
 void sub_80DC44C(u8, u8);
+void StartAshFieldEffect(s16, s16, u16, s16);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H

include/field_screen_effect.h

@@ -4,11 +4,11 @@
 #include "global.h"
 
 void sub_80AF79C(void);
-void sub_807F028(u8);
+void AnimateFlash(u8);
 void sub_80B0244(void);
 void sub_807E3EC(void);
-void sub_807F114(void);
-void sub_807F204(u8 taskId);
+void DoOutwardBarnDoorWipe(void);
+void Task_BarnDoorWipe(u8 taskId);
 void sub_807DC00(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H

include/overworld.h

@@ -122,7 +122,7 @@ void Overworld_ResetStateAfterTeleport(void);
 
 void Overworld_FadeOutMapMusic(void);
 void CB2_LoadMap(void);
-bool8 sub_8055FC4(void);
+bool8 BGMusicStopped(void);
 bool8 is_light_level_8_or_9(u8 mapType);
 bool32 sub_8055C9C(void);
 void Overworld_ResetStateAfterDigEscRope(void);
@@ -148,4 +148,6 @@ void sub_8055778(int);
 
 void sub_8055738(u8 loc);
 
+void sub_8056078(void *, void *);
+
 #endif //GUARD_OVERWORLD_H