diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-06 21:42:53 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-06 21:42:53 -0700 |
| commit | e6eeeefc50d5e7e4578443ea1f976de694fdb852 (patch) | |
| tree | 0d6c4bc01a628fa11bb3330327b48604321af35b /include | |
| parent | 3592e47cd6167082e866b1a391781995df253c3b (diff) | |
merge entity.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/manager.h | 2 | ||||
| -rw-r--r-- | include/structures.h | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/include/functions.h b/include/functions.h index cc9b7d45..6b11200c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -105,7 +105,7 @@ extern void sub_0807AA80(Entity*); extern s32 sub_0807887C(Entity*, u32, u32); extern s32 sub_08078904(); extern void sub_0805E5A8(void); -extern void sub_0805E5C0(void); +extern void UpdateEntities(void); extern void sub_080AD9B0(void); extern void sub_080AD918(void); extern void sub_0801E104(void); diff --git a/include/manager.h b/include/manager.h index fd094dfe..d3b34bba 100644 --- a/include/manager.h +++ b/include/manager.h @@ -12,7 +12,7 @@ union SplitSHWord { } PACKED; typedef struct Manager { - /*0x00*/ struct Manager* previous; + /*0x00*/ struct Manager* prev; /*0x00*/ struct Manager* next; /*0x08*/ u8 type; /*0x09*/ u8 subtype; diff --git a/include/structures.h b/include/structures.h index a875d89a..9f3f1276 100644 --- a/include/structures.h +++ b/include/structures.h @@ -171,10 +171,7 @@ typedef struct { u8 unk1; u8 unk2; u8 unk3; - u8 freezeTime; - u8 unk9; - u8 unk_0xa; - u8 unk_0xb; + Entity* unk4; u16 unk_0xc; } EntityHandler; |