Merge branch 'master' into battle

include/overworld.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_ROM4_H
-#define GUARD_ROM4_H
+#ifndef GUARD_OVERWORLD_H
+#define GUARD_OVERWORLD_H
 
 #include "global.h"
 #include "main.h"
@@ -23,6 +23,18 @@ struct UCoords32
     u32 x, y;
 };
 
+struct CreditsOverworldCmd
+{
+    s16 unk_0;
+    u16 unk_2;
+    u16 unk_4;
+};
+
+/* gDisableMapMusicChangeOnMapLoad */
+#define MUSIC_DISABLE_OFF 0
+#define MUSIC_DISABLE_STOP 1
+#define MUSIC_DISABLE_KEEP 2
+
 extern struct UCoords32 gDirectionToVectors[];
 
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
@@ -98,7 +110,7 @@ void sub_8055D40(u16 mapDataId);
 void CleanupOverworldWindowsAndTilemaps(void);
 u32 sub_8054C04(void);
 
-extern u8 gUnknown_2031DD8;
+extern u8 gDisableMapMusicChangeOnMapLoad;
 extern u8 gUnknown_2036E28;
 
 extern void (*gFieldCallback)(void);
@@ -121,4 +133,7 @@ void Overworld_ResetStateAfterDigEscRope(void);
 bool32 sub_8058244(void);
 u8 GetCurrentMapType(void);
 
-#endif //GUARD_ROM4_H
+void Overworld_CreditsMainCB(void);
+bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
+
+#endif //GUARD_OVERWORLD_H