d_model / d_simple_model / d_stage + cleanup (#181)

* d_model / d_simple_model / cleanup

* d_stage work

* set up saveHIO / remove asm

* d_a_itembase

1 files changed, 1 insertions, 38 deletions

diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp
index 27327c3133..2a29c0b36c 100644
--- a/src/d/com/d_com_static.cpp
+++ b/src/d/com/d_com_static.cpp
@@ -11,19 +11,12 @@
 // Types:
 //
 
-struct fopAc_ac_c {};
-
 struct daYkgr_c {
     static u8 m_aim_rate[4];
     static u8 m_path[4];
     static u8 m_emitter[4];
 };
 
-struct cXyz {
-    /* 80009184 */ ~cXyz();
-    /* 800125DC */ cXyz();
-};
-
 struct daTagStream_c {
     /* 800318B4 */ void checkArea(cXyz const*);
 
@@ -45,34 +38,6 @@ struct daTagMagne_c {
     static u8 mTagMagne[4];
 };
 
-struct daSus_c {
-    struct data_c {
-        /* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8);
-        /* 80030FBC */ void reset();
-        /* 80030FCC */ void isSwitch();
-        /* 800310C8 */ void check(fopAc_ac_c*);
-        /* 80031038 */ void check(cXyz const&);
-        /* 80031150 */ void execute();
-        /* 80031F28 */ ~data_c();
-        /* 80031F64 */ data_c();
-    };
-
-    struct room_c {
-        /* 80031190 */ void add(daSus_c::data_c*);
-        /* 800311FC */ void reset();
-        /* 80031EE4 */ room_c();
-    };
-
-    /* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
-    /* 800313BC */ void reset();
-    /* 800314D4 */ void check(fopAc_ac_c*);
-    /* 80031434 */ void check(s8, cXyz const&);
-    /* 800315A4 */ void execute();
-
-    static u8 mData[1152];
-    static u8 mRoom[256];
-};
-
 struct daSetBgObj_c {
     /* 80031870 */ void getArcName(fopAc_ac_c*);
 };
@@ -100,8 +65,6 @@ struct daObjCarry_c {
     static u8 mRoomNo[5 + 3 /* padding */];
 };
 
-struct J3DModel {};
-
 struct daMirror_c {
     /* 8003194C */ void entry(J3DModel*);
     /* 80031990 */ void remove();
@@ -418,7 +381,7 @@ asm void daSus_c::reset() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daSus_c::check(s8 param_0, cXyz const& param_1) {
+asm bool daSus_c::check(s8 param_0, cXyz const& param_1) {
     nofralloc
 #include "asm/d/com/d_com_static/check__7daSus_cFScRC4cXyz.s"
 }