Clean up conditional compilation a bit (#2943)

include/d/d_camera.h

@@ -1115,7 +1115,7 @@ public:
     static engine_fn engine_tbl[];
 
     /* 0x000 */ camera_class* field_0x0;
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
     cXyz dbg_field_0x04[16];
     u8 dbg_field_c4[0xDC - 0xC4];
 #endif

include/d/d_s_play.h

@@ -19,7 +19,7 @@ class dScnPly_reg_HIO_c : public JORReflexible {
 public:
     virtual ~dScnPly_reg_HIO_c() {}
 
-#if DEBUG
+#if 0 && VERSION == VERSION_WII_USA_R0 || DEBUG
     void genMessage(JORMContext*);
 
     /* 0x4 */ s8 id;
@@ -83,7 +83,7 @@ public:
 extern dScnPly_env_HIO_c g_envHIO;
 extern dScnPly_reg_HIO_c g_regHIO;
 
-#if DEBUG
+#if 0 && VERSION == VERSION_WII_USA_R0 || DEBUG
 extern dScnPly_preset_HIO_c g_presetHIO;
 #endif
 
@@ -95,7 +95,7 @@ extern dScnPly_preset_HIO_c g_presetHIO;
  * Float Reg(25-29) ... -1.0 - +1.0
  */
 
-#if DEBUG
+#if 0 && VERSION == VERSION_WII_USA_R0 || DEBUG
 // Morita
 #define TREG_F(i) g_regHIO.mChildReg[0].mFloatReg[i]
 #define TREG_S(i) g_regHIO.mChildReg[0].mShortReg[i]

include/d/d_save.h

@@ -994,7 +994,7 @@ public:
 
     static const int ZONE_MAX = 0x20;
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
     /* 0x000 */ u8 unk_0x0;
     /* 0x001 */ u8 unk_0x1;
     /* 0x000 */ u8 unk_0x2[0x48 - 0x2];
@@ -1013,7 +1013,7 @@ public:
     /* 0xF1B */ u8 field_0xf1b[13];
     /* 0xF28 */ s64 mStartTime;
     /* 0xF30 */ s64 mSaveTotalTime;
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
     /* 0xF80 */ flagFile_c mFlagFile;
 #endif
 };  // Size: 0xF38