Skip to content

Commit f08e883

Browse files
authored
alink data cleanup (#2397)
1 parent fe2b2ee commit f08e883

31 files changed

+17652
-20644
lines changed

include/d/actor/d_a_alink.h

Lines changed: 200 additions & 104 deletions
Large diffs are not rendered by default.

include/d/actor/d_a_crod.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
*/
1616
class daCrod_c : public fopAc_ac_c {
1717
public:
18-
/* 80141A94 */ void setControllActorData();
18+
/* 80141A94 */ void setControllActorData() {
19+
mControllActorKeep.setActor();
20+
mCameraActorKeep.setActor();
21+
}
22+
1923
/* 804A2E38 */ int createHeap();
2024
/* 804A2F18 */ int create();
2125
/* 804A3304 */ ~daCrod_c();

include/d/actor/d_a_midna.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ class daMidna_c : public fopAc_ac_c {
213213
};
214214

215215
void onForcePanic() { onEndResetStateFlg0(ERFLG0_FORCE_PANIC); }
216-
u32 checkForceNormalColor() const;
217-
u32 checkForceTiredColor() const;
218-
void onNoServiceWait();
216+
u32 checkForceNormalColor() const { return checkStateFlg1(FLG1_FORCE_NORMAL_COL); }
217+
u32 checkForceTiredColor() const { return checkStateFlg1(FLG1_FORCE_TIRED_COL); }
218+
void onNoServiceWait() { onEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT); }
219219

220220
/* 804BC3E0 */ int modelCallBack(int);
221221
/* 804BC5C4 */ int changeUpperBck();

include/d/actor/d_a_player.h

Lines changed: 182 additions & 165 deletions
Large diffs are not rendered by default.

include/d/d_meter2_info.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,7 @@ void dMeter2Info_setCloth(u8 i_clothId, bool param_1);
287287
void dMeter2Info_setShield(u8 i_itemId, bool param_1);
288288
void dMeter2Info_set2DVibration();
289289
void dMeter2Info_set2DVibrationM();
290-
static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible);
291-
static void dMeter2Info_offUseButton(int pButton);
290+
void dMeter2Info_offUseButton(int pButton);
292291
bool dMeter2Info_is2DActiveTouchArea();
293292
u8 dMeter2Info_getRecieveLetterNum();
294293
bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
@@ -813,6 +812,10 @@ inline bool dMeter2Info_isNextStage(const char*, s16, s16, s16) {
813812
return false;
814813
}
815814

815+
inline void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible) {
816+
g_meter2_info.setFloatingMessage(pMessageID, pMessageTimer, pWakuVisible);
817+
}
818+
816819
const char* dMeter2Info_getPlusTextureName();
817820
const char* dMeter2Info_getNumberTextureName(int pIndex);
818821
int dMeter2Info_recieveLetter();

include/m_Do/m_Do_audio.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,21 @@ void mDoAud_resetProcess();
3232
bool mDoAud_resetRecover();
3333
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
3434
s32 mDoAud_load1stDynamicWave();
35-
static void mDoAud_setLinkGroupInfo(u8 param_0);
36-
static void mDoAud_setLinkHp(s32 param_0, s32 param_1);
3735
void mDoAud_setFadeInStart(u8 param_0);
3836
void mDoAud_setFadeOutStart(u8 param_0);
3937

38+
inline void mDoAud_setLinkGroupInfo(u8 param_0) {
39+
if (Z2GetLink() != NULL) {
40+
Z2GetLink()->setLinkGroupInfo(param_0);
41+
}
42+
}
43+
44+
inline void mDoAud_setLinkHp(s32 param_0, s32 param_1) {
45+
if (Z2GetLink() != NULL) {
46+
Z2GetLink()->setLinkHp(param_0, param_1);
47+
}
48+
}
49+
4050
inline void mDoAud_bgmSetSwordUsing(s32 id) {
4151
Z2AudioMgr::getInterface()->bgmSetSwordUsing(id);
4252
}

include/m_Do/m_Do_mtx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, s16
8080
mDoMtx_lookAt(param_0, param_1, param_2, param_3);
8181
}
8282

83-
inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) {
83+
inline void cMtx_multVec(const Mtx mtx, const Vec* src, Vec* dst) {
8484
mDoMtx_multVec(mtx, src, dst);
8585
}
8686

0 commit comments

Comments
 (0)