diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-17 23:25:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 23:25:11 -0500 |
| commit | 2f1285e4393deef290790e04cbb8d50b9fd007f5 (patch) | |
| tree | fa9008354f56ecb3ff48c266dc0474a1c621f6c9 /include/overworld.h | |
| parent | ebd3a1371757839c260256e2d8101fc6448b2915 (diff) | |
| parent | da93247ea805fa5ade9fe2316dee827553d09e43 (diff) | |
Merge pull request #174 from garakmon/object_event
Dissassemble Event Object Data
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/overworld.h b/include/overworld.h index ab20d9ff0..08f9be912 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -10,7 +10,7 @@ struct UnkPlayerStruct u8 player_field_1; }; -struct LinkPlayerMapObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; @@ -32,7 +32,7 @@ struct CreditsOverworldCmd extern struct UCoords32 gDirectionToVectors[]; -extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern MainCallback gFieldCallback; extern struct WarpData gUnknown_2031DB4; @@ -73,7 +73,7 @@ bool32 IsUpdateLinkStateCBActive(void); void strange_npc_table_clear(void); const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16); -void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); +void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *); void sub_8086230(void); void CB2_ReturnToField(void); bool32 sub_8087598(void); @@ -99,11 +99,11 @@ void Overworld_PlaySpecialMapMusic(void); u8 GetCurrentRegionMapSectionId(void); -void SetCurrentMapLayout(u16 mapDataId); +void SetCurrentMapLayout(u16 mapLayoutId); void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); void ResetInitialPlayerAvatarState(void); -void sub_8055D40(u16 mapDataId); +void sub_8055D40(u16 mapLayoutId); void CleanupOverworldWindowsAndTilemaps(void); u32 ComputeWhiteOutMoneyLoss(void); |