mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-08 10:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lib progress

Browse Source
This commit is contained in:
LagoLunatic
2023-11-21 17:05:36 -05:00
parent 48342a8899
commit 292344124a
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_lib.h
+6 -6
View File
@@ -84,22 +84,22 @@ bool dLib_brkInit(J3DModelData*, mDoExt_brkAnm*, const char*, int);
bool dLib_btkInit(J3DModelData*, mDoExt_btkAnm*, const char*, int);
void dLib_setAnm(const char*, mDoExt_McaMorf*, s8*, s8*, s8*, const dLib_anm_idx_c*, const dLib_anm_prm_c*, bool);
void dLib_bcks_setAnm(const char*, mDoExt_McaMorf*, s8*, s8*, s8*, const int*, const dLib_anm_prm_c*, bool);
void dLib_scaleAnime(f32*, f32*, int, int*, f32, f32, f32);
void dLib_scaleAnime(f32* o_value, f32* p_targets, int targetNum, int* p_targetIdx, f32 scale, f32 maxStep, f32 minStep);
void dLib_getPosFromMtx(f32(*)[4], cXyz*);
bool dLib_pathInfo(dPath**, u8);
void dLib_pathMove(cXyz*, s8*, dPath*, f32, int (*)(cXyz*, cXyz*, cXyz*, void*), void*);
void dLib_setNextStageBySclsNum(u8, s8);
void dLib_setFirstMsg(u16, u32, u32);
void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no);
u32 dLib_setFirstMsg(u16 eventBit, u32 firstMsgID, u32 secondMsgID);
/**
* Checks if Link is with a circular area.
* Checks if Link is within a circular area.
*/
bool dLib_checkPlayerInCircle(cXyz center, f32 radius, f32 halfHeight);
/**
* Checks if an actor is with a circular area.
* Checks if an actor is within a circular area.
*/
bool dLib_checkActorInCircle(cXyz center, fopAc_ac_c* actor, f32 radius, f32 halfHeight);
/**
* Checks if an actor is with a fan-shaped area (sector of a circle).
* Checks if an actor is within a fan-shaped area (sector of a circle).
*/
bool dLib_checkActorInFan(cXyz center, fopAc_ac_c* actor, s16 angleY, s16 fanSpreadAngle, f32 radius, f32 halfHeight);
u32 dLib_getIplDaysFromSaveTime();
src/d/d_lib.cpp
+40 -6
View File
@@ -70,8 +70,19 @@ void dLib_bcks_setAnm(const char*, mDoExt_McaMorf*, s8*, s8*, s8*, const int*, c
}
/* 80057988-80057A14 .text dLib_scaleAnime__FPfPfiPifff */
void dLib_scaleAnime(f32*, f32*, int, int*, f32, f32, f32) {
/* Nonmatching */
void dLib_scaleAnime(f32* o_value, f32* p_targets, int targetNum, int* p_targetIdx, f32 scale, f32 maxStep, f32 minStep) {
if (*p_targetIdx < targetNum) {
f32 temp = cLib_addCalc(o_value, p_targets[*p_targetIdx], scale, maxStep, minStep);
if (temp != 0.0f) {
return;
}
(*p_targetIdx)--;
if (*p_targetIdx < 0) {
*p_targetIdx = 0;
}
} else {
(*p_targetIdx)--;
}
}
/* 80057A14-80057A30 .text dLib_getPosFromMtx__FPA4_fP4cXyz */
@@ -114,13 +125,36 @@ void dLib_pathMove(cXyz* pos, s8* pPntNo, dPath* pPath, f32 speed, int (*pCallBa
}
/* 80057D1C-80057EC0 .text dLib_setNextStageBySclsNum__FUcSc */
void dLib_setNextStageBySclsNum(u8, s8) {
/* Nonmatching */
void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no) {
stage_scls_info_dummy_class* sclsinfo;
if (room_no == -1) {
sclsinfo = dComIfGp_getStageSclsInfo();
} else {
JUT_ASSERT(452, 0 <= room_no && room_no < 64);
sclsinfo = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo();
}
if (sclsinfo == NULL) {
return;
}
stage_scls_info_class* scls_data = sclsinfo->m_entries;
JUT_ASSERT(462, scls_data != 0);
JUT_ASSERT(463, 0 <= i_sclsnum && i_sclsnum < sclsinfo->num);
stage_scls_info_class* scls_entry = &scls_data[i_sclsnum];
s32 wipe = dStage_sclsInfo_getWipe(scls_entry);
wipe = wipe == 0xFF ? 0 : wipe;
dComIfGp_setNextStage(scls_entry->mStage, scls_entry->mStart, scls_entry->mRoom, -1, 0.0f, 0, 1, wipe);
}
/* 80057EC0-80057F30 .text dLib_setFirstMsg__FUsUlUl */
void dLib_setFirstMsg(u16, u32, u32) {
/* Nonmatching */
u32 dLib_setFirstMsg(u16 eventBit, u32 firstMsgID, u32 secondMsgID) {
if (!dComIfGs_isEventBit(eventBit)) {
dComIfGs_onEventBit(eventBit);
return firstMsgID;
} else {
return secondMsgID;
}
}
/* 80057F30-80057F78 .text dLib_checkPlayerInCircle__F4cXyzff */