summaryrefslogtreecommitdiff
path: root/src/d/actor
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-12-21 13:46:14 -0500
committerGitHub <noreply@github.com>2025-12-21 10:46:14 -0800
commit16a2980f5a2e6a9c00a05077eeab513f74fcff72 (patch)
tree1c53405a44b0b63478250da5bf18507a2ec8081a /src/d/actor
parent48f1d47690d0a43a77f7ae210b0cf21a6bc835bc (diff)
Update to objdiff 3.5.0 (#2980)
* Update to objdiff 3.5.0 * Fix symbols being in .data instead of .rodata for Wii/Shield
Diffstat (limited to 'src/d/actor')
-rw-r--r--src/d/actor/d_a_obj_barDesk.cpp2
-rw-r--r--src/d/actor/d_a_obj_cdoor.cpp2
-rw-r--r--src/d/actor/d_a_obj_item.cpp4
-rw-r--r--src/d/actor/d_a_obj_lv4CandleDemoTag.cpp2
-rw-r--r--src/d/actor/d_a_obj_lv4CandleTag.cpp2
-rw-r--r--src/d/actor/d_a_obj_sword.cpp2
6 files changed, 7 insertions, 7 deletions
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])();