diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-21 13:46:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-21 10:46:14 -0800 |
| commit | 16a2980f5a2e6a9c00a05077eeab513f74fcff72 (patch) | |
| tree | 1c53405a44b0b63478250da5bf18507a2ec8081a /include/d | |
| parent | 48f1d47690d0a43a77f7ae210b0cf21a6bc835bc (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 'include/d')
| -rw-r--r-- | include/d/actor/d_a_obj_lv4CandleTag.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_sword.h | 2 | ||||
| -rw-r--r-- | include/d/d_a_item_static.h | 2 | ||||
| -rw-r--r-- | include/d/d_particle_copoly.h | 8 |
4 files changed, 9 insertions, 5 deletions
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]; |