Clean up conditional compilation a bit (#2943)

include/JSystem/JStudio/JStudio/functionvalue.h

@@ -369,10 +369,8 @@ public:
 
 #if DEBUG
         /* 0x00 */ const TFunctionValue_list_parameter* pOwn_;
-        /* 0x04 */ const f32* pf_;
-#else
-        /* 0x00 */ const f32* pf_;
 #endif
+        /* 0x00 */ const f32* pf_;
     };
     typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list_parameter&, f64);
 

include/JSystem/JUtility/JUTAssert.h

@@ -21,6 +21,10 @@
     JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, TEXT);                    \
     OSPanic(__FILE__, LINE, "Halt");
 
+#define JUT_PANIC_F(LINE, MSG, ...)                                                               \
+    JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, LINE, MSG, __VA_ARGS__);        \
+    OSPanic(__FILE__, LINE, MSG, __VA_ARGS__);
+
 #define JUT_WARN_DEVICE(LINE, DEVICE, ...)                                                                        \
     JUTAssertion::setWarningMessage_f(DEVICE, __FILE__, LINE, __VA_ARGS__);    \
 
@@ -42,8 +46,9 @@
 #define JUT_ASSERT_MSG_F(...) (void)0;
 #define J3D_PANIC(...) (void)0;
 #define JUT_PANIC(...)
-#define JUT_WARN(...)
+#define JUT_PANIC_F(...)
 #define JUT_WARN_DEVICE(...)
+#define JUT_WARN(...)
 #define JUT_LOG(...)
 #define JUT_CONFIRM(...)
 #endif

include/Z2AudioLib/Z2SeMgr.h

@@ -86,12 +86,12 @@ public:
 private:
     /* 0x000 */ JAISoundHandle mSoundHandle[24];
     /* 0x060 */ JAISoundHandles mSoundHandles;
-    #if VERSION == VERSION_SHIELD_DEBUG
-    /* 0x068 */ JAISoundHandle dbg_field_0x68;
-    /* 0x06C */ f32 dbg_field_0x6c;
-    /* 0x070 */ f32 dbg_field_0x70;
-    /* 0x074 */ f32 dbg_field_0x74;
-    /* 0x078 */ f32 dbg_field_0x78;
+    #if VERSION >= VERSION_WII_USA_R0
+    /* 0x068 */ JAISoundHandle wii_field_0x68;
+    /* 0x06C */ f32 wii_field_0x6c;
+    /* 0x070 */ f32 wii_field_0x70;
+    /* 0x074 */ f32 wii_field_0x74;
+    /* 0x078 */ f32 wii_field_0x78;
     #endif
     /* 0x068 */ Z2MultiSeObj mLevelObjSe[10];
     /* 0x1D0 */ u8 mLevelObjectSeCount;

include/Z2AudioLib/Z2SoundObjMgr.h

@@ -100,12 +100,12 @@ public:
     bool isForceBattle() { return forceBattle_; }
     JSUList<Z2CreatureEnemy>* getEnemyList() { return this; }
 
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #if DEBUG
     JSUList<Z2SoundObjBase>* getAllList() { return &allList_; }
     #endif
 
 private:
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #if DEBUG
     /* 0x0C */ JSUList<Z2SoundObjBase> allList_;
     #endif
     /* 0x0C */ Z2EnemyArea enemyArea_;

include/Z2AudioLib/Z2SoundObject.h

@@ -7,7 +7,7 @@
 class Z2SoundStarter;
 
 class Z2SoundObjBase : public Z2SoundHandles
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
 , public JSULink<Z2SoundObjBase>
 #endif
 {

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

include/m_Do/m_Do_graphic.h

@@ -112,7 +112,7 @@ public:
     }
 
     static f32 getWidthF() {
-        #if PLATFORM_WII || PLATFORM_SHIELD
+        #if WIDESCREEN_SUPPORT
         return m_widthF;
         #else
         return FB_WIDTH;
@@ -120,7 +120,7 @@ public:
     }
 
     static f32 getHeightF() {
-        #if PLATFORM_WII || PLATFORM_SHIELD
+        #if WIDESCREEN_SUPPORT
         return m_heightF;
         #else
         return FB_HEIGHT;
@@ -131,7 +131,7 @@ public:
     static f32 getHeight() { return FB_HEIGHT; }
 
     static f32 getMinYF() {
-        #if PLATFORM_WII || PLATFORM_SHIELD
+        #if WIDESCREEN_SUPPORT
         return m_minYF;
         #else
         return 0.0f;
@@ -139,7 +139,7 @@ public:
     }
 
     static f32 getMinXF() {
-        #if PLATFORM_WII || PLATFORM_SHIELD
+        #if WIDESCREEN_SUPPORT
         return m_minXF;
         #else
         return 0.0f;
@@ -147,7 +147,7 @@ public:
     }
 
     static f32 getMaxYF() {
-        #if PLATFORM_WII || PLATFORM_SHIELD
+        #if WIDESCREEN_SUPPORT
         return m_maxYF;
         #else
         return FB_HEIGHT;
@@ -155,7 +155,7 @@ public:
     }
 
     static f32 getMaxXF() {
-        #if PLATFORM_WII || PLATFORM_SHIELD
+        #if WIDESCREEN_SUPPORT
         return m_maxXF;
         #else
         return FB_WIDTH;
@@ -233,7 +233,13 @@ public:
         #endif
     }
 
-    static f32 getScale() { return 1.0f; }
+    static f32 getScale() {
+        #if WIDESCREEN_SUPPORT
+        return m_scale;
+        #else
+        return 1.0f;
+        #endif
+    }
 
     #if WIDESCREEN_SUPPORT
     static void setTvSize();