From 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 12 Mar 2020 12:46:40 -0700 Subject: Decompile/port event_object_movement --- include/overworld.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index a7031e56d..97fa8d67a 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -37,7 +37,7 @@ struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; - u8 mapObjId; + u8 objEventId; u8 mode; }; @@ -95,7 +95,7 @@ void Overworld_ChangeMusicTo(u16); bool32 IsUpdateLinkStateCBActive(void); -void strange_npc_table_clear(void); +void ClearLinkPlayerObjectEvents(void); const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16); void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *); void sub_8086230(void); @@ -141,6 +141,7 @@ void sub_8055864(u8 mapGroup, u8 mapNum); void CB2_Overworld(void); void CB2_OverworldBasic(void); void CB2_NewGame(void); +bool8 IsMapTypeOutdoors(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); void Overworld_ResetStateAfterTeleport(void); -- cgit v1.2.3