diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-16 07:51:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 07:51:08 -0400 |
| commit | f44f89a463d7280a95094e8f37a56873a90da843 (patch) | |
| tree | 194662b15b39fb223bd20b17ea696ff525ebab0d /include/overworld.h | |
| parent | 4a7c1d888a9f90b9102f469aab12beeab89ffff6 (diff) | |
| parent | e1f7efb8e67fb5587a8baf20f421c20e134e8b24 (diff) | |
Merge pull request #300 from ultima-soul/event_object_movement
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 fecacf6de..37274dfb4 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; }; @@ -99,7 +99,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); @@ -145,6 +145,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); |