Misc fixes (#2830)

* Replace DANPCF_C_HACK with a better fakematch

* d_a_obj_item OK

* Fix ninja diff

* Misc debug/nonmatching fixes

* Fix ninja diff for PAL

* Fix bad PAL split

include/JSystem/JGeometry.h

@@ -488,8 +488,8 @@ template <typename T>
 struct TBox2 : public TBox<TVec2<T> > {
     TBox2() {}
     TBox2(const TVec2<f32>& _i, const TVec2<f32>& _f) { 
-        i.set(_i);
-        f.set(_f);
+        TBox<TVec2<T> >::i.set(_i);
+        TBox<TVec2<T> >::f.set(_f);
     }
     TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); }
 

include/d/actor/d_a_npc.h

@@ -488,10 +488,6 @@ public:
     void setIdx(int i_idx) { mIdx = i_idx; }
 
     const int getIdx() { return mIdx; }
-#if VERSION != VERSION_SHIELD_DEBUG
-    // fakematch inline to fix daNpcT_Path_c::chkPassed1
-    const u16 get_u16_Idx() { return mIdx; }
-#endif
 
     dPath* getPathInfo() { return mPathInfo; }
 
@@ -1149,7 +1145,10 @@ public:
         /* 5 */ LOOK_ATTN,
     };
 
-    daNpcF_c() { initialize(); }
+    daNpcF_c() {
+        FORCE_DONT_INLINE;
+        initialize();
+    }
     /* 80152014 */ BOOL execute();
     /* 801522AC */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
     /* 80152614 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,

include/d/actor/d_a_obj_Turara.h

@@ -41,9 +41,9 @@ public:
     /* 80B9E388 */ int Draw();
     /* 80B9E478 */ int Delete();
 
-    u8 getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
-    u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
-    u8 getSwBit3() { return fopAcM_GetParamBit(this, 16, 8); }
+    int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
+    int getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
+    int getSwBit3() { return fopAcM_GetParamBit(this, 16, 8); }
 
     s32 getEvetID() {
         return fopAcM_GetParamBit(this, 0x18, 8);
@@ -51,6 +51,7 @@ public:
 
     u8 getWaitTime() { return shape_angle.z; }
     int getItemTbleNum() { return shape_angle.x >> 8 & 0xff; }
+    int getState() { return shape_angle.x; }
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -76,7 +77,7 @@ private:
     /* 0x7a8 */ dBgS_ObjAcch mAcch;
     /* 0x980 */ dBgW* field_0x980;
     /* 0x984 */ u8 field_0x984;
-    /* 0x988 */ u32 field_0x988;
+    /* 0x988 */ u32 mEmID;
     /* 0x98c */ u8 field_0x98c;
     /* 0x98d */ u8 field_0x98d[0x994 - 0x98d];
     /* 0x994 */ u8 field_0x994;

include/global.h

@@ -75,4 +75,23 @@ void* __memcpy(void*, const void*, int);
 #define READU32_BE(ptr, offset) \
     (((u32)ptr[offset] << 24) | ((u32)ptr[offset + 1] << 16) | ((u32)ptr[offset + 2] << 8) | (u32)ptr[offset + 3]);
 
+// Hack to trick the compiler into not inlining functions that use this macro.
+#define FORCE_DONT_INLINE \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
+    (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0;
+
 #endif