Update to objdiff 3.5.0 (#2980)

* Update to objdiff 3.5.0

* Fix symbols being in .data instead of .rodata for Wii/Shield

15 files changed, 24 insertions, 20 deletions

diff --git a/configure.py b/configure.py
index 5904a18b88..90480d1fed 100755
--- a/configure.py
+++ b/configure.py
@@ -190,7 +190,7 @@ if not config.non_matching:
 config.binutils_tag = "2.42-1"
 config.compilers_tag = "20251118"
 config.dtk_tag = "v1.7.1"
-config.objdiff_tag = "v3.4.4"
+config.objdiff_tag = "v3.5.0"
 config.sjiswrap_tag = "v1.2.2"
 config.wibo_tag = "1.0.0-beta.5"
 
diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index 9b4fad8ce3..5dccb2bc9b 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -47,7 +47,7 @@ struct J3DTransformInfo {
 extern J3DTransformInfo const j3dDefaultTransformInfo;
 extern Vec const j3dDefaultScale;
 extern Mtx const j3dDefaultMtx;
-extern f32 PSMulUnit01[];
+extern f32 const PSMulUnit01[];
 
 void J3DGQRSetup7(u32 param_0, u32 param_1, u32 param_2, u32 param_3);
 void J3DCalcBBoardMtx(f32 (*)[4]);
diff --git a/include/d/actor/d_a_obj_lv4CandleTag.h b/include/d/actor/d_a_obj_lv4CandleTag.h
index cc56acdb1c..c17705392e 100644
--- a/include/d/actor/d_a_obj_lv4CandleTag.h
+++ b/include/d/actor/d_a_obj_lv4CandleTag.h
@@ -15,6 +15,8 @@
  */
 class dalv4CandleTag_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
+    typedef void (dalv4CandleTag_c::*modeFunc)();
+
     enum Mode {
         MODE_WATCH,
         MODE_NG,
diff --git a/include/d/actor/d_a_obj_sword.h b/include/d/actor/d_a_obj_sword.h
index 851c6fe3f7..5043db2233 100644
--- a/include/d/actor/d_a_obj_sword.h
+++ b/include/d/actor/d_a_obj_sword.h
@@ -13,6 +13,8 @@
  */
 class daObjSword_c : public daItemBase_c {
 public:
+    typedef int (daObjSword_c::*actionFunc)();
+
     void initBaseMtx();
     void setBaseMtx();
     int Create();
diff --git a/include/d/d_a_item_static.h b/include/d/d_a_item_static.h
index 5e206e8d8a..10869c5733 100644
--- a/include/d/d_a_item_static.h
+++ b/include/d/d_a_item_static.h
@@ -115,7 +115,7 @@ public:
     bool checkBoomWindTgTimer() { return mBoomWindTgTimer == 0; }
 
     static procFunc mFuncPtr[];
-    static dCcD_SrcCyl m_cyl_src;
+    static const dCcD_SrcCyl m_cyl_src;
     static s32 m_timer_max;
 
     /* 0x92C */ s16 field_0x92c;
diff --git a/include/d/d_particle_copoly.h b/include/d/d_particle_copoly.h
index 86e0c3286f..c50b71387e 100644
--- a/include/d/d_particle_copoly.h
+++ b/include/d/d_particle_copoly.h
@@ -78,8 +78,8 @@ public:
         return (this->*m_emitterTwoData[param_0])(param_1, param_2);
     }
 
-    static effTypeFunc m_typeTwoData[];
-    static emitterFunc m_emitterTwoData[];
+    static const effTypeFunc m_typeTwoData[];
+    static const emitterFunc m_emitterTwoData[];
 
     /* 0x38 */ u32 mLeftEmitter[2][4];
     /* 0x58 */ u32 mRightEmitter[2][4];
@@ -117,8 +117,8 @@ public:
         return (this->*m_emitterFourData[param_0])(param_1, param_2);
     }
 
-    static effTypeFunc m_typeFourData[];
-    static emitterFunc m_emitterFourData[];
+    static const effTypeFunc m_typeFourData[];
+    static const emitterFunc m_emitterFourData[];
 
     /* 0x80 */ u32 mBackLeftEmitter[2][4];
     /* 0xA0 */ u32 mBackRightEmitter[2][4];
diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp
index 890d40dee5..b13262e852 100644
--- a/src/JSystem/J3DGraphBase/J3DTransform.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp
@@ -541,7 +541,7 @@ loop:
 }
 #endif // clang-format on
 
-extern f32 PSMulUnit01[] = {
+extern f32 const PSMulUnit01[] = {
     0.0f,
     -1.0f,
 };
diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp
index a7e179193b..332de76033 100644
--- a/src/d/actor/d_a_obj_barDesk.cpp
+++ b/src/d/actor/d_a_obj_barDesk.cpp
@@ -76,7 +76,7 @@ int daBarDesk_c::Execute(Mtx** i_mtxP) {
 
 void daBarDesk_c::windowProc() {
     typedef void (daBarDesk_c::*daBarDesk_modeFunc)();
-    static daBarDesk_modeFunc mode_proc[2] = {
+    static const daBarDesk_modeFunc mode_proc[2] = {
         &daBarDesk_c::modeWait,
         &daBarDesk_c::modeBreak,
     };
diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp
index d8d579dd61..089c9838e8 100644
--- a/src/d/actor/d_a_obj_cdoor.cpp
+++ b/src/d/actor/d_a_obj_cdoor.cpp
@@ -170,7 +170,7 @@ void daObjCdoor_c::execCdoor() {
 
 void daObjCdoor_c::execWgate() {
     typedef void (daObjCdoor_c::*daObjCdoor_modeFunc)();
-    static daObjCdoor_modeFunc mode_proc[3] = {
+    static const daObjCdoor_modeFunc mode_proc[3] = {
         &daObjCdoor_c::modeWait,
         &daObjCdoor_c::modeOpen,
         &daObjCdoor_c::modeClose,
diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp
index 2f690791e4..ffa1a3b5f6 100644
--- a/src/d/actor/d_a_obj_item.cpp
+++ b/src/d/actor/d_a_obj_item.cpp
@@ -648,7 +648,7 @@ void daItem_c::procMainBoomHitWait() {
 }
 
 void daItem_c::move_proc_call() {
-    static procFunc mode_proc[] = {&daItem_c::mode_wait, &daItem_c::mode_water};
+    static const procFunc mode_proc[] = {&daItem_c::mode_wait, &daItem_c::mode_water};
 
     if (checkFlag(FLAG_NO_MOVE_e)) {
         RotateYBase();
@@ -1159,7 +1159,7 @@ procFunc daItem_c::mFuncPtr[] = {
     &daItem_c::procMainForceGet,      NULL,
 };
 
-dCcD_SrcCyl daItem_c::m_cyl_src = {
+const dCcD_SrcCyl daItem_c::m_cyl_src = {
     {
         {0, {{0, 0, 0}, {0xFFFFFFFF, 17}, 0x59}},
         {dCcD_SE_NONE, 0, 0, 0, {0}},
diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
index f575131af7..d10ba0d3be 100644
--- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
+++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
@@ -62,7 +62,7 @@ int dalv4CandleDemoTag_c::Execute() {
 static dalv4CandleDemoTag_HIO_c l_HIO;
 
 void dalv4CandleDemoTag_c::procMain() {
-    static dalv4CandleDemoTag_c::procFunc mode_proc[4] = {
+    static const dalv4CandleDemoTag_c::procFunc mode_proc[4] = {
         &dalv4CandleDemoTag_c::modeWatch,
         &dalv4CandleDemoTag_c::modeEnemyCreate,
         &dalv4CandleDemoTag_c::modeNG,
diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp
index 341038d975..c3fa9e5483 100644
--- a/src/d/actor/d_a_obj_lv4CandleTag.cpp
+++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp
@@ -49,7 +49,7 @@ int dalv4CandleTag_c::Execute() {
 static dalv4CandleTag_HIO_c l_HIO;
 
 void dalv4CandleTag_c::procMain() {
-    static void (dalv4CandleTag_c::*mode_proc[])() = {
+    static const modeFunc mode_proc[] = {
         &dalv4CandleTag_c::modeWatch,
         &dalv4CandleTag_c::modeNG,
         &dalv4CandleTag_c::modeNGWait,
diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp
index 343c00ebcc..5762fccd9d 100644
--- a/src/d/actor/d_a_obj_sword.cpp
+++ b/src/d/actor/d_a_obj_sword.cpp
@@ -101,7 +101,7 @@ int daObjSword_c::actionGetDemo() {
 }
 
 int daObjSword_c::execute() {
-    static int (daObjSword_c::* l_demoFunc[])() = {
+    static const actionFunc l_demoFunc[] = {
         &daObjSword_c::actionWait, &daObjSword_c::actionOrderGetDemo, &daObjSword_c::actionGetDemo};
     field_0x92c++;
     (this->*l_demoFunc[mStatus])();
diff --git a/src/d/d_kankyo_debug.cpp b/src/d/d_kankyo_debug.cpp
index 4d0a26893b..756276f438 100644
--- a/src/d/d_kankyo_debug.cpp
+++ b/src/d/d_kankyo_debug.cpp
@@ -650,7 +650,7 @@ void dKydb_timedisp() {
         dDbVw_Report(0x1E, 0x54, "S_TM %02d:%02d:%02d", (int)hour, (int)min, (int)sec);
     }
 
-    static const char* weekString[] = {
+    static const char* const weekString[] = {
         "Sun",
         "Mon",
         "Tue",
diff --git a/src/d/d_particle_copoly.cpp b/src/d/d_particle_copoly.cpp
index 2076e2e5c4..82127db43e 100644
--- a/src/d/d_particle_copoly.cpp
+++ b/src/d/d_particle_copoly.cpp
@@ -217,24 +217,24 @@ void dPaPoF_c::clearFourAllID() {
     clearTwoAllID();
 }
 
-dPaPoT_c::effTypeFunc dPaPoT_c::m_typeTwoData[] = {
+const dPaPoT_c::effTypeFunc dPaPoT_c::m_typeTwoData[] = {
     &dPaPoT_c::getCenterEffType,
     &dPaPoT_c::getLeftEffType,
     &dPaPoT_c::getRightEffType,
 };
 
-dPaPoT_c::emitterFunc dPaPoT_c::m_emitterTwoData[] = {
+const dPaPoT_c::emitterFunc dPaPoT_c::m_emitterTwoData[] = {
     &dPaPoT_c::getCenterEmitter,
     &dPaPoT_c::getLeftEmitter,
     &dPaPoT_c::getRightEmitter,
 };
 
-dPaPoF_c::effTypeFunc dPaPoF_c::m_typeFourData[] = {
+const dPaPoF_c::effTypeFunc dPaPoF_c::m_typeFourData[] = {
     &dPaPoF_c::getCenterEffType,   &dPaPoF_c::getLeftEffType,      &dPaPoF_c::getRightEffType,
     &dPaPoF_c::getBackLeftEffType, &dPaPoF_c::getBackRightEffType,
 };
 
-dPaPoF_c::emitterFunc dPaPoF_c::m_emitterFourData[] = {
+const  dPaPoF_c::emitterFunc dPaPoF_c::m_emitterFourData[] = {
     &dPaPoF_c::getCenterEmitter,   &dPaPoF_c::getLeftEmitter,      &dPaPoF_c::getRightEmitter,
     &dPaPoF_c::getBackLeftEmitter, &dPaPoF_c::getBackRightEmitter,
 };