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

d_lib start

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-11-18 15:02:48 -08:00
parent 9fa3971d85
commit 088ae782a2
5 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+4
View File
@@ -724,6 +724,10 @@ inline u8 dComIfGs_getItemReserve(int param_0) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItem().getReserve(param_0);
}
inline OSTime dComIfGs_getDateIpl() {
return g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusB().getDateIpl();
}
/**
* Returns which item is in a specific inventory slot.
* @param i_invIdx The index of the inventory slot.
include/d/d_lib.h
+14 -4
View File
@@ -61,6 +61,16 @@ public:
/* 0x0C */ u32 loopMode;
};
class dLib_circle_path_c {
public:
/* 0x00 */ cXyz mTranslation;
/* 0x0C */ cXyz mPos;
/* 0x18 */ f32 mRadius;
/* 0x1C */ f32 mWobbleAmplitude;
/* 0x20 */ s16 mAngle;
/* 0x22 */ s16 mAngleSpeed;
};
class dLib_circle_path_c;
class dLib_wave_c;
class dLib_anm_idx_c;
@@ -70,20 +80,20 @@ void dLib_getWaterY(cXyz&, dBgS_ObjAcch&);
void dLib_waveRot(Vec*, f32, dLib_wave_c*);
void dLib_debugDrawAxis(Mtx&, f32);
void dLib_debugDrawFan(cXyz&, s16, s16, f32, const GXColor&);
void dLib_brkInit(J3DModelData*, mDoExt_brkAnm*, const char*, int);
void dLib_btkInit(J3DModelData*, mDoExt_btkAnm*, const char*, int);
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_getPosFromMtx(f32(*)[4], cXyz*);
void dLib_pathInfo(dPath**, u8);
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);
bool dLib_checkPlayerInCircle(cXyz, f32, f32);
bool dLib_checkActorInCircle(cXyz, fopAc_ac_c*, f32, f32);
bool dLib_checkActorInFan(cXyz, fopAc_ac_c*, s16, s16, f32, f32);
void dLib_getIplDaysFromSaveTime();
u32 dLib_getIplDaysFromSaveTime();
void dLib_get_QuatFromTriangle(cXyz*, cXyz*, cXyz*);
void dLib_calc_QuatFromTriangle(Quaternion*, f32, cXyz*, cXyz*, cXyz*);
src/d/d_com_inf_game.cpp
+1 -1
View File
@@ -461,7 +461,7 @@ void dComIfG_play_c::drawWood() {
/* 80053178-800531A8 .text ct__13dComIfG_inf_cFv */
void dComIfG_inf_c::ct() {
field_0x1d1c1 = 0xFF;
mBrightness = 0xFF;
play.ct();
}
src/d/d_lib.cpp
+60 -11
View File
@@ -4,10 +4,21 @@
//
#include "d/d_lib.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_mtx.h"
#include "SSystem/SComponent/c_math.h"
/* 80057000-800570CC .text dLib_setCirclePath__FP18dLib_circle_path_c */
void dLib_setCirclePath(dLib_circle_path_c*) {
void dLib_setCirclePath(dLib_circle_path_c* path) {
/* Nonmatching */
path->mAngle += path->mAngleSpeed;
f32 rad = path->mRadius + path->mWobbleAmplitude * cM_ssin(path->mAngle);
mDoMtx_stack_c::transS(path->mTranslation);
mDoMtx_stack_c::YrotM(path->mAngle);
mDoMtx_stack_c::transM(rad, 0.0f, 0.0f);
path->mPos.x = mDoMtx_stack_c::get()[0][3];
path->mPos.y = mDoMtx_stack_c::get()[1][3];
path->mPos.z = mDoMtx_stack_c::get()[2][3];
}
/* 800570CC-8005716C .text dLib_getWaterY__FR4cXyzR12dBgS_ObjAcch */
@@ -31,13 +42,21 @@ void dLib_debugDrawFan(cXyz&, s16, s16, f32, const GXColor&) {
}
/* 80057510-800575E0 .text dLib_brkInit__FP12J3DModelDataP13mDoExt_brkAnmPCci */
void dLib_brkInit(J3DModelData*, mDoExt_brkAnm*, const char*, int) {
/* Nonmatching */
bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcName, int fileno) {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcName, fileno);
JUT_ASSERT(0xae, brk != NULL);
if (anm->init(modelData, brk, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0)
return false;
return true;
}
/* 800575E0-800576B0 .text dLib_btkInit__FP12J3DModelDataP13mDoExt_btkAnmPCci */
void dLib_btkInit(J3DModelData*, mDoExt_btkAnm*, const char*, int) {
/* Nonmatching */
bool dLib_btkInit(J3DModelData* modelData, mDoExt_btkAnm* anm, const char* arcName, int fileno) {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcName, fileno);
JUT_ASSERT(0xbb, btk != NULL);
if (anm->init(modelData, btk, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0)
return false;
return true;
}
/* 800576B0-80057844 .text dLib_setAnm__FPCcP14mDoExt_McaMorfPScPScPScPC14dLib_anm_idx_cPC14dLib_anm_prm_cb */
@@ -56,18 +75,42 @@ void dLib_scaleAnime(f32*, f32*, int, int*, f32, f32, f32) {
}
/* 80057A14-80057A30 .text dLib_getPosFromMtx__FPA4_fP4cXyz */
void dLib_getPosFromMtx(MtxP, cXyz*) {
/* Nonmatching */
void dLib_getPosFromMtx(MtxP mtx, cXyz* pos) {
pos->set(mtx[0][3], mtx[1][3], mtx[2][3]);
}
/* 80057A30-80057AA4 .text dLib_pathInfo__FPP5dPathUc */
void dLib_pathInfo(dPath**, u8) {
/* Nonmatching */
bool dLib_pathInfo(dPath** dst, u8 no) {
dStage_dPath_c * path = dComIfGp_getStage().getPathInf();
if (path != NULL) {
*dst = path->m_path + no;
return true;
} else {
return false;
}
}
/* 80057AA4-80057D1C .text dLib_pathMove__FP4cXyzPScP5dPathfPFP4cXyzP4cXyzP4cXyzPv_iPv */
void dLib_pathMove(cXyz*, s8*, dPath*, f32, int (*)(cXyz*, cXyz*, cXyz*, void*), void*) {
void dLib_pathMove(cXyz* pos, s8* pPntNo, dPath* pPath, f32 speed, int (*pCallBack)(cXyz*, cXyz*, cXyz*, void*), void* pCallBackData) {
/* Nonmatching */
s8 pnt_no = *pPntNo;
s8 pnt_next_no = pnt_no > (pPath->m_num - 1) ? 0 : pnt_no + 1;
cXyz pnt_pos = pPath->mpPnt[pnt_no].mPos;
cXyz pnt_next_pos = pPath->mpPnt[pnt_next_no].mPos;
cXyz move = (pnt_next_pos - pnt_pos).normZP();
if (pCallBack == NULL) {
*pos = *pos + move * speed;
f32 dist = pnt_pos.abs(*pos);
f32 pnt_dist = pnt_pos.abs(pnt_next_pos);
if (dist > pnt_dist) {
*pPntNo = pnt_next_no;
*pos = pnt_next_pos;
}
} else {
if (pCallBack(pos, &pnt_pos, &pnt_next_pos, pCallBackData))
*pPntNo = pnt_next_no;
}
}
/* 80057D1C-80057EC0 .text dLib_setNextStageBySclsNum__FUcSc */
@@ -166,8 +209,14 @@ bool STControl::checkDownTrigger() {
}
/* 80058780-80058834 .text dLib_getIplDaysFromSaveTime__Fv */
void dLib_getIplDaysFromSaveTime() {
u32 dLib_getIplDaysFromSaveTime() {
/* Nonmatching */
OSTime dateIpl = dComIfGs_getDateIpl();
if (dateIpl == 0)
return 0;
OSTime curTime = OSGetTime();
return (curTime - dateIpl);
}
/* 80058834-80058910 .text dLib_get_QuatFromTriangle__FP4cXyzP4cXyzP4cXyz */
src/m_Do/m_Do_ext.cpp
+4 -2
View File
@@ -1431,14 +1431,16 @@ void mDoExt_McaMorf2::stopZelAnime() {
/* Nonmatching */
}
extern void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8);
/* 8001427C-800142B8 .text draw__24mDoExt_offCupOnAupPacketFv */
void mDoExt_offCupOnAupPacket::draw() {
/* Nonmatching */
GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 0, 1, 1);
}
/* 800142B8-800142F4 .text draw__24mDoExt_onCupOffAupPacketFv */
void mDoExt_onCupOffAupPacket::draw() {
/* Nonmatching */
GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 1, 0, 1);
}
/* 800142F4-800143B8 .text draw__19mDoExt_invJntPacketFv */