diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-30 22:08:56 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-30 22:09:30 +0100 |
| commit | a818f1b7041898d7eee28b5c1c455ba3225e063f (patch) | |
| tree | 8a249012181db16dc1161efb36cf0abe7c0e9ff1 /include/object | |
| parent | 5676cb7890facded77c5cf32c6017fbf12a4d386 (diff) | |
Use new entity struct for player
Diffstat (limited to 'include/object')
| -rw-r--r-- | include/object/deathFx.h | 3 | ||||
| -rw-r--r-- | include/object/linkAnimation.h | 3 | ||||
| -rw-r--r-- | include/object/pushableFurniture.h | 25 |
3 files changed, 25 insertions, 6 deletions
diff --git a/include/object/deathFx.h b/include/object/deathFx.h index f8317f8c..4f14ea86 100644 --- a/include/object/deathFx.h +++ b/include/object/deathFx.h @@ -1,9 +1,6 @@ #ifndef DEATHFX_H #define DEATHFX_H -#ifdef ENT_DEPRECATED -#error "deathFx.h requires new entities" -#endif #include "entity.h" typedef struct { diff --git a/include/object/linkAnimation.h b/include/object/linkAnimation.h index 00e0ba94..781df520 100644 --- a/include/object/linkAnimation.h +++ b/include/object/linkAnimation.h @@ -1,9 +1,6 @@ #ifndef LINKANIMATION_H #define LINKANIMATION_H -#ifdef ENT_DEPRECATED -#error "linkAnimtion.h requires new entities" -#endif #include "entity.h" typedef struct { diff --git a/include/object/pushableFurniture.h b/include/object/pushableFurniture.h new file mode 100644 index 00000000..db693183 --- /dev/null +++ b/include/object/pushableFurniture.h @@ -0,0 +1,25 @@ +#ifndef PUSHABLEFURNITURE_H +#define PUSHABLEFURNITURE_H + +#include "object.h" + +typedef struct { + /*0x00*/ Entity base; + /*0x68*/ u8 unk_68[0x8]; + /*0x70*/ u16 unk_70; + /*0x72*/ u16 unk_72; + /*0x74*/ u16 unk_74; + /*0x76*/ u16 unk_76; + /*0x78*/ u8 unk_78[0x2]; + /*0x7a*/ u16 unk_7a; + /*0x7c*/ u16 unk_7c; + /*0x7e*/ u16 unk_7e; + /*0x80*/ u8 unk_80; + /*0x81*/ u8 unk_81; + /*0x82*/ u8 unk_82; + /*0x83*/ u8 unk_83; + /*0x84*/ u8 unk_84[0x2]; + /*0x86*/ u16 unk_86; +} PushableFurnitureEntity; + +#endif // PUSHABLEFURNITURE_H |