diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-12-21 23:40:27 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-12-21 23:40:27 +0100 |
| commit | c28018843601b99907ab79ef3fd9e689b078e384 (patch) | |
| tree | 6314f7b3d36863e0fc9da44e1626fcefc3261848 /include | |
| parent | ec0678872fd29522f2b93a73af8a6196dd0fdbe8 (diff) | |
Fix paths
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/room.h | 4 | ||||
| -rw-r--r-- | include/script.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/asm.h b/include/asm.h index c05fa5ad..1fb0ed21 100644 --- a/include/asm.h +++ b/include/asm.h @@ -29,7 +29,7 @@ extern void ResetCollisionLayer(struct Entity_*); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); extern u32 CalculateDirectionTo(u32, u32, u32, u32); -extern u32 sub_080045DA(s32, s32); +extern u32 CalculateDirectionFromOffsets(s32, s32); extern u32 sub_080086B4(u32, u32, const u8*); extern u32 ResolveCollisionLayer(struct Entity_*); extern void sub_0800417E(struct Entity_*, u32); diff --git a/include/functions.h b/include/functions.h index 0e7b79f8..28b03c4a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -81,7 +81,7 @@ extern void UpdateUIElements(void); extern void sub_0801E104(void); extern void sub_08030118(u32); extern void sub_0803C0AC(Entity*); -extern void sub_08049CF4(Entity*); +extern void SetRoomTrackerFlag(Entity*); extern u32 sub_0804A024(Entity*, u32, u32); extern u32 sub_080542AC(u32); extern void DisableRandomDrops(); diff --git a/include/room.h b/include/room.h index 0a1916d9..8158146a 100644 --- a/include/room.h +++ b/include/room.h @@ -91,10 +91,10 @@ typedef struct { u8 area; u8 room; u16 unk_02; - u32 unk_04; + u32 flags; /**< Flags that can be set on the tracked rooms. Used e.g. by the door mimic. (TODO probably to start in the discovered state?)*/ } RoomMemory; -extern RoomMemory* gUnk_020354B0; +extern RoomMemory* gRoomMemoryPtr; extern RoomMemory gRoomMemory[]; // Packets used to store which entities to load in a room diff --git a/include/script.h b/include/script.h index c6e41f17..b708d945 100644 --- a/include/script.h +++ b/include/script.h @@ -54,7 +54,7 @@ void StartPlayerScript(Script* script); void sub_0807DD50(Entity* entity); void sub_0807DD64(Entity* entity); void sub_0807DD80(Entity* entity, Script* script); -void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32); +void LookAt(Entity*, ScriptExecutionContext*, u32, u32); ScriptExecutionContext* StartCutscene(Entity* entity, Script* script); void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*)); |