Merge pull request #315 from PikalaxALT/overworld

Overworld

1 files changed, 28 insertions, 36 deletions

diff --git a/include/overworld.h b/include/overworld.h
index 730df3667..5f3728dec 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -38,14 +38,14 @@ struct LinkPlayerObjectEvent
     u8 active;
     u8 linkPlayerId;
     u8 objEventId;
-    u8 mode;
+    u8 movementMode;
 };
 
 struct CreditsOverworldCmd
 {
     s16 unk_0;
-    u16 unk_2;
-    u16 unk_4;
+    s16 unk_2;
+    s16 unk_4;
 };
 
 /* gDisableMapMusicChangeOnMapLoad */
@@ -53,13 +53,12 @@ struct CreditsOverworldCmd
 #define MUSIC_DISABLE_STOP 1
 #define MUSIC_DISABLE_KEEP 2
 
-extern struct UCoords32 gDirectionToVectors[];
+extern const struct UCoords32 gDirectionToVectors[];
 
 extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4];
 extern MainCallback gFieldCallback;
 
-extern struct WarpData gUnknown_2031DB4;
-extern struct WarpData gUnknown_2031DBC;
+extern struct WarpData gLastUsedWarp;
 
 extern u8 gUnknown_2031DE0;
 extern u8 gFieldLinkPlayerCount;
@@ -68,7 +67,7 @@ extern u8 gLocalLinkPlayerId;
 void IncrementGameStat(u8 index);
 
 void Overworld_SetMapObjTemplateCoords(u8, s16, s16);
-void Overworld_SetMapObjTemplateMovementType(u8, u8);
+void Overworld_SetObjEventTemplateMovementType(u8, u8);
 
 void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 
@@ -78,12 +77,8 @@ void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void Overworld_SetHealLocationWarp(u8);
-void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-void sub_8084E2C(s8, s8, s8, s8, s8);
-void sub_8084E80(s8, s8, s8, s8, s8);
-void sub_8084EBC(s16, s16);
-void sub_80555E0(void);
-void copy_saved_warp3_bank_and_enter_x_to_warp1(void);
+void SetWarpDestinationToEscapeWarp(void);
+void SetWarpDestinationToLastHealLocation(void);
 u8 IsMapTypeOutdoors(u8 mapType);
 void Overworld_ClearSavedMusic(void);
 bool32 sub_8056124(u16 song);
@@ -100,23 +95,19 @@ void Overworld_ChangeMusicTo(u16);
 bool32 IsUpdateLinkStateCBActive(void);
 
 void ClearLinkPlayerObjectEvents(void);
-const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16);
+const struct MapHeader *const Overworld_GetMapHeaderByGroupAndId(u16, u16);
 void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *);
-void sub_8086230(void);
 void CB2_ReturnToField(void);
-bool32 sub_8087598(void);
 void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
 void WarpIntoMap(void);
-u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
-void sub_8086194(void);
-void sub_8084CCC(u8 spawn);
+u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum);
 void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpNum);
 void c2_load_new_map(void);
 void SetWarpDestinationToDynamicWarp(u8 unused);
 void mapldr_default(void);
 
 u32 GetGameStat(u8 statId);
-u32 SetGameStat(u8 statId, u32 value);
+void SetGameStat(u8 statId, u32 value);
 
 void CB2_ContinueSavedGame(void);
 void sub_8055D5C(struct WarpData *);
@@ -141,8 +132,8 @@ extern u8 gUnknown_2036E28;
 extern bool8 (* gFieldCallback2)(void);
 
 void SetLastHealLocationWarp(u8 healLocaionId);
-void sub_8055864(u8 mapGroup, u8 mapNum);
-void CB2_Overworld(void);
+void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum);
+void sub_80568FC(void);
 void CB2_OverworldBasic(void);
 void CB2_NewGame(void);
 bool8 IsMapTypeOutdoors(u8 mapType);
@@ -153,13 +144,13 @@ void Overworld_FadeOutMapMusic(void);
 void CB2_LoadMap(void);
 bool8 BGMusicStopped(void);
 bool8 IsMapTypeIndoors(u8 mapType);
-bool32 sub_8055C9C(void);
+bool32 Overworld_IsBikingAllowed(void);
 void Overworld_ResetStateAfterDigEscRope(void);
 bool32 sub_8058244(void);
 u8 GetCurrentMapType(void);
 
 u8 GetLastUsedWarpMapType(void);
-const struct MapHeader *warp1_get_mapheader(void);
+const struct MapHeader *const GetDestinationWarpMapHeader(void);
 void TryFadeOutOldMapMusic(void);
 void CB2_ReturnToFieldCableClub(void);
 void ResetGameStats(void);
@@ -171,28 +162,29 @@ bool32 sub_8058318(void);
 
 void CB2_ReturnToFieldWithOpenMenu(void);
 void CB2_WhiteOut(void);
-void c2_8056854(void);
-void sub_8054F38(u32 newKey);
-void sub_8055778(int);
+void CB2_ReturnToFieldFromMultiplayer(void);
+void ApplyNewEncryptionKeyToGameStats(u32 newKey);
+void SetContinueGameWarpToDynamicWarp(int);
 
-void sub_8055738(u8 loc);
+void SetContinueGameWarpToHealLocation(u8 loc);
 
-void sub_8056078(void *, void *);
-void sub_805546C(u8 a0);
+void UpdateAmbientCry(s16 *state, u16 *delayCounter);
+void SetWarpDestinationToHealLocation(u8 a0);
 bool32 sub_80582E0(void);
 bool32 sub_8058274(void);
+void OverworldWhiteOutGetMoneyLoss(void);
 u8 GetCurrentMapBattleScene(void);
 void Overworld_ResetStateAfterFly(void);
 bool8 sub_8055B38(u16 metatileBehavior);
-void sub_8055DB8(void);
-void sub_8057F5C(void);
-void sub_8057F34(void);
+void Overworld_ResetMapMusic(void);
+u16 QueueExitLinkRoomKey(void);
+u16 sub_8057F34(void);
 u32 sub_8057EC0(void);
-void sub_8057F70(void);
-void sub_8057F48(void);
+u16 sub_8057F70(void);
+u16 sub_8057F48(void);
 void SetMainCallback1(MainCallback cb);
 void CB1_Overworld(void);
-void sub_80568C4(void);
+void CB2_ReturnToFieldContinueScript(void);
 u8 GetLastUsedWarpMapSectionId(void);
 void StoreInitialPlayerAvatarState(void);
 void UpdateEscapeWarp(s16 x, s16 y);