mirror of
https://github.com/zeldaret/tp
synced 2026-05-23 06:54:28 -04:00
Update to objdiff 3.5.0 (#2980)
* Update to objdiff 3.5.0 * Fix symbols being in .data instead of .rodata for Wii/Shield
This commit is contained in:
@@ -541,7 +541,7 @@ loop:
|
||||
}
|
||||
#endif // clang-format on
|
||||
|
||||
extern f32 PSMulUnit01[] = {
|
||||
extern f32 const PSMulUnit01[] = {
|
||||
0.0f,
|
||||
-1.0f,
|
||||
};
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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}},
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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])();
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user