From 28bf8b929fa13f89ce0a555fbcbb5545e4e4a88a Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Thu, 16 Dec 2021 21:12:43 -0800
Subject: furniture ok

---
 include/entity.h | 2 ++
 include/global.h | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'include')

diff --git a/include/entity.h b/include/entity.h
index 778a3f8e..83c3a6c5 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -130,6 +130,7 @@ typedef struct Entity {
     /*0x62*/ u8 spriteOffsetX;
     /*0x63*/ s8 spriteOffsetY;
     /*0x64*/ u32* myHeap;
+#ifndef NENT_DEPRECATED
     /*0x68*/ union SplitHWord field_0x68;
     /*0x6a*/ union SplitHWord field_0x6a;
     /*0x6c*/ union SplitHWord field_0x6c;
@@ -144,6 +145,7 @@ typedef struct Entity {
     /*0x82*/ union SplitHWord field_0x82;
     /*0x84*/ union SplitHWord cutsceneBeh;
     /*0x86*/ union SplitHWord field_0x86;
+#endif
 } Entity;
 
 typedef struct LinkedList {
diff --git a/include/global.h b/include/global.h
index 669d2557..e7eddd31 100644
--- a/include/global.h
+++ b/include/global.h
@@ -50,6 +50,8 @@
 #define BOOLCAST(x) ((-(x) | (x)) >> 31)
 #define static_assert(cond) extern char assertion[(cond) ? 1 : -1]
 
+#define super (&this->base)
+
 #if NON_MATCHING
 #define ASM_FUNC(path, decl)
 #else
-- 
cgit v1.2.3