Skip to content

alink data cleanup #2397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 1 commit into from
Apr 16, 2025
Merged

alink data cleanup #2397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
304 changes: 200 additions & 104 deletions include/d/actor/d_a_alink.h
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion include/d/actor/d_a_crod.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
*/
class daCrod_c : public fopAc_ac_c {
public:
/* 80141A94 */ void setControllActorData();
/* 80141A94 */ void setControllActorData() {
mControllActorKeep.setActor();
mCameraActorKeep.setActor();
}

/* 804A2E38 */ int createHeap();
/* 804A2F18 */ int create();
/* 804A3304 */ ~daCrod_c();
Expand Down
6 changes: 3 additions & 3 deletions include/d/actor/d_a_midna.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ class daMidna_c : public fopAc_ac_c {
};

void onForcePanic() { onEndResetStateFlg0(ERFLG0_FORCE_PANIC); }
u32 checkForceNormalColor() const;
u32 checkForceTiredColor() const;
void onNoServiceWait();
u32 checkForceNormalColor() const { return checkStateFlg1(FLG1_FORCE_NORMAL_COL); }
u32 checkForceTiredColor() const { return checkStateFlg1(FLG1_FORCE_TIRED_COL); }
void onNoServiceWait() { onEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT); }

/* 804BC3E0 */ int modelCallBack(int);
/* 804BC5C4 */ int changeUpperBck();
Expand Down
347 changes: 182 additions & 165 deletions include/d/actor/d_a_player.h
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions include/d/d_meter2_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ void dMeter2Info_setCloth(u8 i_clothId, bool param_1);
void dMeter2Info_setShield(u8 i_itemId, bool param_1);
void dMeter2Info_set2DVibration();
void dMeter2Info_set2DVibrationM();
static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible);
static void dMeter2Info_offUseButton(int pButton);
void dMeter2Info_offUseButton(int pButton);
bool dMeter2Info_is2DActiveTouchArea();
u8 dMeter2Info_getRecieveLetterNum();
bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
Expand Down Expand Up @@ -813,6 +812,10 @@ inline bool dMeter2Info_isNextStage(const char*, s16, s16, s16) {
return false;
}

inline void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible) {
g_meter2_info.setFloatingMessage(pMessageID, pMessageTimer, pWakuVisible);
}

const char* dMeter2Info_getPlusTextureName();
const char* dMeter2Info_getNumberTextureName(int pIndex);
int dMeter2Info_recieveLetter();
Expand Down
14 changes: 12 additions & 2 deletions include/m_Do/m_Do_audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,21 @@ void mDoAud_resetProcess();
bool mDoAud_resetRecover();
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
s32 mDoAud_load1stDynamicWave();
static void mDoAud_setLinkGroupInfo(u8 param_0);
static void mDoAud_setLinkHp(s32 param_0, s32 param_1);
void mDoAud_setFadeInStart(u8 param_0);
void mDoAud_setFadeOutStart(u8 param_0);

inline void mDoAud_setLinkGroupInfo(u8 param_0) {
if (Z2GetLink() != NULL) {
Z2GetLink()->setLinkGroupInfo(param_0);
}
}

inline void mDoAud_setLinkHp(s32 param_0, s32 param_1) {
if (Z2GetLink() != NULL) {
Z2GetLink()->setLinkHp(param_0, param_1);
}
}

inline void mDoAud_bgmSetSwordUsing(s32 id) {
Z2AudioMgr::getInterface()->bgmSetSwordUsing(id);
}
Expand Down
2 changes: 1 addition & 1 deletion include/m_Do/m_Do_mtx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, s16
mDoMtx_lookAt(param_0, param_1, param_2, param_3);
}

inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) {
inline void cMtx_multVec(const Mtx mtx, const Vec* src, Vec* dst) {
mDoMtx_multVec(mtx, src, dst);
}

Expand Down
Loading