diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-28 14:03:51 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-28 14:03:51 -0400 |
| commit | f0fe4904d0fa8b4e964b64b896c10d4599eb15d3 (patch) | |
| tree | 740143a91293bc1f480f0fdf934ffe0cbbd71f13 /include/overworld.h | |
| parent | 9bcc82856db7e6417bb56265bbcc04dae290cbf3 (diff) | |
through sub_8056918
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/overworld.h b/include/overworld.h index b0311c51c..d8f72de27 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -78,10 +78,6 @@ 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 SetWarpDestinationToEscapeWarp(void); void SetWarpDestinationToLastHealLocation(void); u8 IsMapTypeOutdoors(u8 mapType); @@ -102,14 +98,10 @@ bool32 IsUpdateLinkStateCBActive(void); void ClearLinkPlayerObjectEvents(void); 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 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); -void sub_8086194(void); -void sub_8084CCC(u8 spawn); void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpNum); void c2_load_new_map(void); void SetWarpDestinationToDynamicWarp(u8 unused); @@ -142,7 +134,7 @@ extern bool8 (* gFieldCallback2)(void); void SetLastHealLocationWarp(u8 healLocaionId); void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum); -void CB2_Overworld(void); +void sub_80568FC(void); void CB2_OverworldBasic(void); void CB2_NewGame(void); bool8 IsMapTypeOutdoors(u8 mapType); @@ -171,7 +163,7 @@ bool32 sub_8058318(void); void CB2_ReturnToFieldWithOpenMenu(void); void CB2_WhiteOut(void); -void c2_8056854(void); +void CB2_ReturnToFieldFromMultiplayer(void); void ApplyNewEncryptionKeyToGameStats(u32 newKey); void SetContinueGameWarpToDynamicWarp(int); @@ -192,7 +184,7 @@ void sub_8057F70(void); void 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); |