through ChooseAmbientCrySpecies

6 files changed, 18 insertions, 5 deletions

diff --git a/include/constants/flags.h b/include/constants/flags.h
index c259c2e12..212718bc9 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1438,7 +1438,7 @@
 #define SPECIAL_FLAGS_START 0x4000
 #define SPECIAL_FLAGS_COUNT 16
 #define FLAG_SPECIAL_FLAG_0x4000    0x4000
-#define FLAG_SPECIAL_FLAG_0x4001    0x4001
+#define FLAG_DONT_TRANSITION_MUSIC    0x4001
 #define FLAG_SPECIAL_FLAG_0x4002    0x4002
 #define FLAG_SPECIAL_FLAG_0x4003    0x4003
 #define FLAG_SPECIAL_FLAG_0x4004    0x4004
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index aee7dc5a7..a15d99120 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -11,4 +11,6 @@ void DoOutwardBarnDoorWipe(void);
 void Task_BarnDoorWipe(u8 taskId);
 void sub_807F5F0(void);
 
+extern const s32 gMaxFlashLevel;
+
 #endif // GUARD_FIELD_SCREEN_EFFECT_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 9c9daa4cb..0d45a6d68 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -195,12 +195,21 @@ struct MapHeader
     /* 0x15 */ u8 cave;
     /* 0x16 */ u8 weather;
     /* 0x17 */ u8 mapType;
-    /* 0x18 */ u8 filler_18;
+    /* 0x18 */ u8 bikingAllowed;
     /* 0x19 */ u8 escapeRope;
     /* 0x1A */ s8 flags;
     /* 0x1B */ u8 battleType;
 };
 
+// Flags for gMapHeader.flags, as defined in the map_header_flags macro
+#define MAP_ALLOW_BIKE         (1 << 0)
+#define MAP_ALLOW_ESCAPE_ROPE  (1 << 1)
+#define MAP_ALLOW_RUN          (1 << 2)
+#define MAP_SHOW_MAP_NAME      (1 << 3)
+#define UNUSED_MAP_FLAGS       (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7)
+
+#define SHOW_MAP_NAME_ENABLED  ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME)
+
 struct ObjectEvent
 {
     /*0x00*/ /* 0*/ u32 active:1;
diff --git a/include/m4a.h b/include/m4a.h
index ee23d917a..b67dd0492 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -25,4 +25,6 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
 
+extern const struct SongHeader mus_win_gym;
+
 #endif //GUARD_M4A_H
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index a5f5a81b7..899586e0f 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -24,7 +24,7 @@ bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior);
 bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior);
 bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
 bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_2(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior);
 bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior);
 bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior);
 bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior);
diff --git a/include/overworld.h b/include/overworld.h
index db214f237..3da3667b1 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -177,14 +177,14 @@ void SetContinueGameWarpToDynamicWarp(int);
 
 void SetContinueGameWarpToHealLocation(u8 loc);
 
-void sub_8056078(void *, void *);
+void UpdateAmbientCry(s16 *state, u16 *delayCounter);
 void SetWarpDestinationToHealLocation(u8 a0);
 bool32 sub_80582E0(void);
 bool32 sub_8058274(void);
 u8 GetCurrentMapBattleScene(void);
 void Overworld_ResetStateAfterFly(void);
 bool8 sub_8055B38(u16 metatileBehavior);
-void sub_8055DB8(void);
+void Overworld_ResetMapMusic(void);
 void sub_8057F5C(void);
 void sub_8057F34(void);
 u32 sub_8057EC0(void);