diff options
| author | notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com> | 2020-08-20 02:24:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 02:24:27 -0700 |
| commit | 6e53face6434018eeccd142f963aebab4f2d5ba7 (patch) | |
| tree | bb987659d3ec5dc843fde965630eee4dd37c0e3a /include | |
| parent | f525b99016d2121595f4f4dfff4b8ac51c1c6f03 (diff) | |
| parent | 4f2f69ceb4d56eafede44637dfc2d504a4bcef42 (diff) | |
Merge pull request #67 from notyouraveragehooman/master
func renaming
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/room.h | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/functions.h b/include/functions.h index 30576777..d85b2822 100644 --- a/include/functions.h +++ b/include/functions.h @@ -155,7 +155,7 @@ extern void sub_080534AC(); extern void sub_0807BA8C(u32, u32); extern void sub_0804D9B0(); extern void sub_0807BB98(u32, u32, u32, u32); -extern void sub_08059D18(void); +extern void TryLoadPrologueHyruleTown(void); extern void sub_0801D000(u32); extern void sub_08018C58(u32); extern void sub_0804E150(void); diff --git a/include/room.h b/include/room.h index 8170da5f..6245d225 100644 --- a/include/room.h +++ b/include/room.h @@ -29,7 +29,8 @@ typedef struct { u16 screenShakeTime; u16 filler2[6]; u8 filler3[4]; - u16 filler4[4]; + union SplitWord bg3OffsetX; + union SplitWord bg3OffsetY; Entity* cameraTarget; } RoomControls; @@ -57,11 +58,13 @@ typedef struct { //Packets used to store which entities to load in a room typedef struct { - u8 entityType; - u8 field_0x1; - u8 entitySubtype; - u8 entityform; - u32 entityparameter; + u8 type : 4; + u8 layer : 4; + u8 flags : 4; + u8 unk : 4; + u8 subtype; + u8 form; + u32 parameter; u16 xPos; u16 yPos; u32 spritePtr; |