diff options
author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-12 12:46:40 -0700 |
---|---|---|
committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-12 12:46:40 -0700 |
commit | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (patch) | |
tree | 337fa55cb5d6af5a28dade5f7e3b28d6f7becae9 /include/overworld.h | |
parent | 65690ca7dc880f08a4c63d490797f4b16ce5195e (diff) |
Decompile/port event_object_movement
Diffstat (limited to 'include/overworld.h')
-rw-r--r-- | include/overworld.h | 5 |
1 files changed, 3 insertions, 2 deletions
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); |