Misc demo matches (#952)

include/JSystem/J3DGraphAnimator/J3DModel.h

@@ -5,7 +5,6 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "dolphin/mtx/mtx.h"
-#include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 
 enum J3DMdlFlag {

include/d/actor/d_a_himo3.h

@@ -27,13 +27,14 @@ struct h3_ga_s {
     /* 0x2F */ u8 m2F;
 }; // size = 0x30
 
-class himo3_class : public fopAc_ac_c {
+class himo3_class {
 public:
     void getPlayerMoveLength() {}
 
     void setActorHang(cXyz, short);
 
 public:
+    /* 0x0000 */ fopAc_ac_c actor;
     /* 0x0290 */ request_of_phase_process_class mPhase;
     /* 0x0298 */ u8 m0298;
     /* 0x0299 */ u8 m0299;
@@ -51,7 +52,7 @@ public:
     /* 0x02C0 */ himo3_s m02C0[200];
     /* 0x1580 */ mDoExt_3DlineMat1_c mLineMat;
     /* 0x15BC */ u8 m15BC[0x15C0 - 0x15BC];
-    /* 0x15C0 */ s32 m15C0;
+    /* 0x15C0 */ int m15C0;
     /* 0x15C4 */ cXyz m15C4;
     /* 0x15D0 */ f32 m15D0;
     /* 0x15D4 */ f32 m15D4;

include/d/actor/d_a_mbdoor.h

@@ -30,7 +30,7 @@ public:
     BOOL CreateHeap();
     void calcMtx();
     BOOL CreateInit();
-    s32 getDemoAction();
+    int getDemoAction();
     void demoProc();
     BOOL checkArea();
     BOOL checkUnlock();
@@ -53,8 +53,8 @@ public:
     /* 0x2B7 */ u8 field_0x2B7[0x2B8 - 0x2B7];
     /* 0x2B8 */ s16 mAdjustmentTimer;
     /* 0x2BA */ u8 field_0x2BA[0x2BC - 0x2BA];
-    /* 0x2BC */ s32 field_0x2bc;
-    /* 0x2C0 */ s32 mEvtStaffId;
+    /* 0x2BC */ int field_0x2bc;
+    /* 0x2C0 */ int mEvtStaffId;
     /* 0x2C4 */ cXyz field_0x2c4;
     /* 0x2D0 */ cXyz mGoalPos;
     /* 0x2DC */ cXyz mGoal2Pos;

include/d/actor/d_a_obj_search.h

@@ -69,6 +69,9 @@ namespace daObj_Search {
         /* 0x290 */ u8 m290[0x664 - 0x290];
         /* 0x664 */ bool mBkControl;
         /* 0x665 */ u8 m665[0x84C - 0x665];
+#if VERSION == VERSION_DEMO
+        u8 pad84C;
+#endif
         /* 0x84C */ fpc_ProcID mChildId;
     };
 

include/global.h

@@ -4,7 +4,7 @@
 #include "dolphin/types.h"
 
 #define ARRAY_SIZE(o) (sizeof(o) / sizeof(o[0]))
-#define ARRAY_SSIZE(o) ((s32)(sizeof(o) / sizeof(o[0])))
+#define ARRAY_SSIZE(o) ((int)(sizeof(o) / sizeof(o[0])))
 
 // Align X to the previous N bytes (N must be power of two)
 #define ALIGN_PREV(X, N) ((X) & ~((N)-1))