Clean up conditional compilation a bit (#2943)

13 files changed, 25 insertions, 26 deletions

diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc
index 553144c2e8..337dd8e640 100644
--- a/src/d/actor/d_a_alink_cut.inc
+++ b/src/d/actor/d_a_alink_cut.inc
@@ -155,17 +155,12 @@ bool daAlink_c::checkCutTurnInput() const {
     return 0xF800 < abs(field_0x3180);
 }
 
-// Debug version is correct, but breaks other versions due no longer inlining
 int daAlink_c::getCutTurnDirection() const {
-#if VERSION == VERSION_SHIELD_DEBUG
     if (field_0x3180 < 0) {
         return 1;
     } else {
         return 0;
     }
-#else
-    return field_0x3180 < 0;
-#endif
 }
 
 void daAlink_c::resetCombo(int param_0) {
diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp
index 764085f02a..252d407b7a 100644
--- a/src/d/actor/d_a_e_fb.cpp
+++ b/src/d/actor/d_a_e_fb.cpp
@@ -120,7 +120,7 @@ int daE_FB_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
 static f32 dummy_117095() {
     // For rodata ordering in the debug version, this must be put here:
     return 100.0f;
@@ -818,7 +818,7 @@ void daE_FB_c::dead_eff_set() {
     }
 }
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
 static char* dummy_117771() {
     return "Delete -> E_FB(id=%d)\n";
 }
diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp
index 8e60386094..1b5d7983bf 100644
--- a/src/d/actor/d_a_e_kr.cpp
+++ b/src/d/actor/d_a_e_kr.cpp
@@ -2106,16 +2106,17 @@ static int daE_Kr_Execute(e_kr_class* i_this) {
             unkFloat1 = 5.0f + TREG_F(14);
         }
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if PLATFORM_GCN
+        cLib_addCalc2(&i_this->field_0x920, unkFloat1, 1.0f, 2.0f);
+#endif
+
+#if VERSION >= VERSION_WII_USA_R0
         actor->current.pos.y = actor->current.pos.y - unkFloat1;
         actor->old.pos.y = actor->old.pos.y - unkFloat1;
         i_this->mAcch.CrrPos(dComIfG_Bgsp());
         actor->current.pos.y = actor->current.pos.y + unkFloat1;
         actor->old.pos.y = actor->old.pos.y + unkFloat1;
 #else
-
-        cLib_addCalc2(&i_this->field_0x920, unkFloat1, 1.0f, 2.0f);
-
         actor->current.pos.y = actor->current.pos.y - i_this->field_0x920;
         actor->old.pos.y = actor->old.pos.y - i_this->field_0x920;
         i_this->mAcch.CrrPos(dComIfG_Bgsp());
diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp
index c143c1abd5..6d88146a7f 100644
--- a/src/d/actor/d_a_e_sm2.cpp
+++ b/src/d/actor/d_a_e_sm2.cpp
@@ -812,8 +812,8 @@ static u8 new_col_d[] = {
     TYPE_GREEN,  TYPE_BLUE,   TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
     TYPE_BLUE,   TYPE_RED,    TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
     TYPE_PURPLE, TYPE_PURPLE, TYPE_BLUE,
-    // For some reason, the data differs here between retail and ShieldD?
-    #if VERSION == VERSION_SHIELD_DEBUG
+    // For some reason, the data differs here between GCN and Wii/Shield versions
+    #if VERSION >= VERSION_WII_USA_R0
     TYPE_GREEN,
     #else
     TYPE_PURPLE,
diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp
index 5e450980ce..dc697813ea 100644
--- a/src/d/actor/d_a_mg_rod.cpp
+++ b/src/d/actor/d_a_mg_rod.cpp
@@ -5678,6 +5678,9 @@ static void play_camera_u(dmg_rod_class* i_this) {
 static int dmg_rod_Execute(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
+    //TODO: It seems possible that dComIfGs_getPalLanguage returns a constant value for non-PAL
+    //      versions (causing the first block to be elided), and it's also possible that the value
+    //      being compared against is an enum value with per-version definitions.
     #if VERSION == VERSION_SHIELD_DEBUG
     if (dComIfGs_getPalLanguage() == 1) {
         data_804BBBD4 = 2;
@@ -5686,7 +5689,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
     }
     #elif VERSION == VERSION_SHIELD
     data_804BBBD4 = 0;
-    #elif REGION_PAL
+    #elif REGION_PAL || VERSION >= VERSION_WII_USA_R2
     if (dComIfGs_getPalLanguage() == 0) {
         data_804BBBD4 = 2;
     } else {
@@ -6244,7 +6247,7 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) {
     }
     #elif VERSION == VERSION_SHIELD
     data_804BBBD4 = 0;
-    #elif REGION_PAL
+    #elif REGION_PAL || VERSION >= VERSION_WII_USA_R2
     if (dComIfGs_getPalLanguage() == 0) {
         data_804BBBD4 = 2;
     } else {
diff --git a/src/d/actor/d_a_npc_kn_teach01.inc b/src/d/actor/d_a_npc_kn_teach01.inc
index 47f38c9ea7..ae4a5a3ca2 100644
--- a/src/d/actor/d_a_npc_kn_teach01.inc
+++ b/src/d/actor/d_a_npc_kn_teach01.inc
@@ -433,7 +433,7 @@ int daNpc_Kn_c::ECut_firstEncount(int i_idx) {
             break;
         case 10:
             daPy_getPlayerActorClass()->changeDemoMoveAngle(fopAcM_searchPlayerAngleY(this) + 0x8000);
-#if VERSION == VERSION_SHIELD_DEBUG
+#if VERSION >= VERSION_WII_USA_R0
             field_0xdec = 50;
 #else
             field_0xdec = 52;
diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp
index e11f4eb07f..d8f17fa771 100644
--- a/src/d/actor/d_a_npc_prayer.cpp
+++ b/src/d/actor/d_a_npc_prayer.cpp
@@ -246,7 +246,7 @@ void daNpcPray_c::setParam() {
     attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(daNpcPray_Param_c::m.common.talk_distance, daNpcPray_Param_c::m.common.talk_angle);
     attention_info.flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
     scale.set(daNpcPray_Param_c::m.common.scale, daNpcPray_Param_c::m.common.scale, daNpcPray_Param_c::m.common.scale);
     mAcchCir.SetWallR(daNpcPray_Param_c::m.common.width);
     mAcchCir.SetWallH(daNpcPray_Param_c::m.common.knee_length);
@@ -291,7 +291,7 @@ void daNpcPray_c::setAttnPos() {
     cyl_center.y = current.pos.y;
 
     mCcCyl.SetC(cyl_center);
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
     mCcCyl.SetH(daNpcPray_Param_c::m.common.height);
     mCcCyl.SetR(daNpcPray_Param_c::m.common.width);
 #endif
diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp
index 5abd9994f6..e8d9eeaf6e 100644
--- a/src/d/actor/d_a_npc_toby.cpp
+++ b/src/d/actor/d_a_npc_toby.cpp
@@ -644,7 +644,7 @@ int daNpc_Toby_c::checkChangeEvt() {
                 break;
             }
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if VERSION >= VERSION_WII_USA_R0
             if (chkAttnZra() && !dComIfGs_isSaveSwitch(0x51))
 #else
             // 0x31E - F_0798 - Heard about Zora from Fyer
diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp
index 71dac5ff0d..1f1af993c1 100644
--- a/src/d/actor/d_a_obj_kago.cpp
+++ b/src/d/actor/d_a_obj_kago.cpp
@@ -472,7 +472,7 @@ int daObj_Kago_c::Execute() {
 
 int daObj_Kago_c::Draw() {
     if(field_0xb9f == 0 && health != 3) {
-#if VERSION == VERSION_SHIELD_DEBUG
+#if DEBUG
         mObjAcch.DrawWall(dComIfG_Bgsp());
 #endif
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp
index 67c92ecd58..9ce58995a0 100644
--- a/src/d/actor/d_a_obj_tks.cpp
+++ b/src/d/actor/d_a_obj_tks.cpp
@@ -789,7 +789,7 @@ void daObjTks_c::setParam() {
     calcSpringF(&field_0xdcc, 0.7f, &field_0xdd0);
     scale.setall(field_0xdcc);
 
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #if DEBUG
     mAcchCir.SetWallR(daObjTks_Param_c::m.common.width);
     mAcchCir.SetWallH(daObjTks_Param_c::m.common.height);
     #endif
@@ -858,7 +858,7 @@ void daObjTks_c::setAttnPos() {
 
     if (!fopAcM_checkCarryNow(this)) {
         mCcCyl.SetC(current.pos);
-        #if VERSION == VERSION_SHIELD_DEBUG
+        #if DEBUG
         mCcCyl.SetH(daObjTks_Param_c::m.common.height);
         mCcCyl.SetR(daObjTks_Param_c::m.common.width);
         #endif
diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp
index 5cc6be037f..166fc1e18f 100644
--- a/src/d/actor/d_a_obj_warp_kbrg.cpp
+++ b/src/d/actor/d_a_obj_warp_kbrg.cpp
@@ -202,7 +202,7 @@ int daObjWarpKBrg_c::CreateHeap() {
             return 0;
         }
 
-        #if VERSION == VERSION_SHIELD_DEBUG
+        #if DEBUG
         pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 15);
         JUT_ASSERT(463, pbrk != NULL);
         #endif
@@ -256,7 +256,7 @@ int daObjWarpKBrg_c::create1st() {
 }
 
 int daObjWarpKBrg_c::Execute(Mtx** param_0) {
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #if DEBUG
     calcMidnaWaitPos();
     #endif
 
diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp
index 28ed2b08dd..3e32c628d6 100644
--- a/src/d/actor/d_a_obj_warp_obrg.cpp
+++ b/src/d/actor/d_a_obj_warp_obrg.cpp
@@ -177,7 +177,7 @@ int daObjWarpOBrg_c::create1st() {
 }
 
 int daObjWarpOBrg_c::Execute(Mtx** param_0) {
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #if DEBUG
     calcMidnaWaitPos();
     #endif
 
diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp
index 14971a072c..15473a148a 100644
--- a/src/d/actor/d_a_spinner.cpp
+++ b/src/d/actor/d_a_spinner.cpp
@@ -669,7 +669,7 @@ int daSpinner_c::execute() {
 
         move_angle = (mDoCPd_c::getStickAngle3D(PAD_1) + 0x10000 + dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)))) - 0x8000;
 
-#if VERSION == VERSION_SHIELD_DEBUG
+#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG
         if (dComIfG_getTrigB(PAD_1) && dComIfGp_getSelectItem(3) == fpcNm_ITEM_SPINNER) {
 #else
         if (dComIfG_getTrigA(PAD_1)) {