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

Match most d_flower funcs for demo

Browse Source
This commit is contained in:
LagoLunatic
2026-07-05 17:23:02 -04:00
parent adbf30e402
commit 87b5061c61
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_flower.h
+1 -1
View File
@@ -82,7 +82,7 @@ public:
/* 0x0014 */ dFlower_data_c mData[200];
/* 0x3534 */ dFlower_anm_c mAnm[72];
/* 0x44F4 */ dFlower_room_c mRoom[64];
/* 0x45F4 */ u8 field_0x45f4;
/* 0x45F4 */ bool field_0x45f4;
/* 0x45F5 */ u8 field_0x45F5;
/* 0x45F6 */ s16 field_0x45F6;
/* 0x45F8 */ s16 field_0x45f8;
include/d/d_tree.h
+1 -1
View File
@@ -94,7 +94,7 @@ public:
dTree_anm_c* getAnm(int idx) { return &mAnm[idx]; }
dTree_data_c* getData() { return mData; }
void setPlayerCutFlg(int i_flg) { mPlayerCutFlg = i_flg; }
void setPlayerCutFlg(BOOL i_flg) { mPlayerCutFlg = i_flg; }
void setPlayerSwordTop(cXyz& i_pos) { mPlayerSwordTop = i_pos; }
void setPlayerSwordMoveAngY(s16 i_ang) { mPlayerSwordMoveAngY = i_ang; }
cXyz& getPlayerSwordTop() { return mPlayerSwordTop; }
src/d/d_flower.cpp
+21 -10
View File
@@ -145,12 +145,12 @@ void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c* param_1, u32 param_2, int para
temp2 = temp.abs2XZ();
s16 angle = cM_atan2s(temp.x, temp.z);
f32 val2 = std::sqrtf(temp2);
temp2 = std::sqrtf(temp2);
dFlower_anm_c* pAnm;
if(field_0x01 < 8) {
cXyz pos;
if(field_0x03 == 0 && !cLib_checkBit<u8>(field_0x00, 0x8) && val2 > 16.0f) {
if(field_0x03 == 0 && !cLib_checkBit<u8>(field_0x00, 0x8) && temp2 > 16.0f) {
pos.set(field_0x04.x, field_0x04.y + 20.0f, field_0x04.z);
u16 particleID;
@@ -193,7 +193,7 @@ void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c* param_1, u32 param_2, int para
}
pAnm->field_0x02 = angle;
pAnm->field_0x04 = cM_atan2s(val2, 40.0f);
pAnm->field_0x04 = cM_atan2s(temp2, 40.0f);
}
/* 800C0018-800C0270 .text WorkAt__14dFlower_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInf */
@@ -277,21 +277,29 @@ void dFlower_room_c::newData(dFlower_data_c* pData) {
/* 800C0440-800C04A4 .text deleteData__14dFlower_room_cFv */
void dFlower_room_c::deleteData() {
#if VERSION == VERSION_DEMO
dFlower_data_c* r6 = field_0x0;
while(field_0x0) {
cLib_setBit<u8>(r6->field_0x00, 0);
field_0x0 = field_0x0->field_0x40;
}
#else
while(field_0x0) {
cLib_setBit<u8>(field_0x0->field_0x00, 0);
mDoAud_seDeleteObject(&field_0x0->field_0x04);
field_0x0 = field_0x0->field_0x40;
}
#endif
}
/* 800C04A4-800C05B8 .text __ct__16dFlower_packet_cFv */
dFlower_packet_c::dFlower_packet_c() {
dFlower_data_c* pData = getData();
dFlower_data_c* pData = mData;
for(int i = 0; i < ARRAY_SIZE(mData); i++, pData++) {
cLib_setBit<u8>(pData->field_0x00, 0);
}
dFlower_anm_c* pAnm = getAnm();
dFlower_anm_c* pAnm = mAnm;
for(int i = 0; i < ARRAY_SIZE(mAnm); i++, pAnm++) {
pAnm->field_0x00 = 0;
}
@@ -319,9 +327,11 @@ dFlower_data_c::dFlower_data_c() {
/* 800C05DC-800C0898 .text draw__16dFlower_packet_cFv */
void dFlower_packet_c::draw() {
#if VERSION > VERSION_JPN
j3dSys.reinitGX();
GXSetNumIndStages(0);
#endif
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
@@ -386,7 +396,9 @@ void dFlower_packet_c::draw() {
}
}
#if VERSION > VERSION_JPN
J3DShape::resetVcdVatCache();
#endif
}
/* 800C0898-800C0A88 .text calc__16dFlower_packet_cFv */
@@ -400,8 +412,7 @@ void dFlower_packet_c::calc() {
dFlower_data_c* pData = mRoom[roomNo].field_0x0;
if(mRoom[roomNo].field_0x0) {
daPy_py_c* pPlayer = (daPy_py_c*)daPy_getPlayerActorClass();
setPlayerCutFlg(pPlayer->getCutAtFlg() != 0);
setPlayerCutFlg(pPlayer->getCutAtFlg());
cXyz top = pPlayer->getSwordTopPos();
cXyz temp = top - pPlayer->current.pos;
setPlayerSwordAngY(cM_atan2s(temp.x, temp.z));
@@ -538,7 +549,7 @@ void dFlower_packet_c::setData(dFlower_data_c* param_1, int param_2, s8 param_3,
/* 800C10D4-800C121C .text newData__16dFlower_packet_cFScR4cXyziSc */
dFlower_data_c* dFlower_packet_c::newData(s8 param_1, cXyz& param_2, int i_roomNo, s8 param_4) {
JUT_ASSERT(0xB76, 0 <= i_roomNo && i_roomNo < 64);
JUT_ASSERT(VERSION_SELECT(2927, 2928, 2934, 2934), 0 <= i_roomNo && i_roomNo < 64);
dFlower_data_c* pData = &mData[field_0x0010];
for(int i = field_0x0010; i < (s32)ARRAY_SIZE(mData); pData++, i++) {
@@ -561,7 +572,7 @@ dFlower_data_c* dFlower_packet_c::newData(s8 param_1, cXyz& param_2, int i_roomN
/* 800C121C-800C1264 .text newAnm__16dFlower_packet_cFv */
int dFlower_packet_c::newAnm() {
dFlower_anm_c* pAnm = getAnm(8);
dFlower_anm_c* pAnm = &mAnm[8];
for(int i = 8; i < ARRAY_SIZE(mAnm); pAnm++, i++) {
if(pAnm->field_0x00 == 0) {
pAnm->field_0x00 = 1;