mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-20 05:16:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on dvdlow, OSTime fix and various nonmatching

Browse Source
This commit is contained in:
Tal Hayon
2023-02-01 16:22:08 +02:00
parent 1a6aa986c4
commit 5020e501ee
68 changed files with 447 additions and 2679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_insect.cpp
+36 -105
View File
@@ -15,38 +15,21 @@
// Forward References:
//
extern "C" void __ct__9dInsect_cFv();
extern "C" void Insect_GetDemoMain__9dInsect_cFv();
extern "C" void CalcZBuffer__9dInsect_cFf();
extern "C" extern char const* const d_d_insect__stringBase0;
//
// External References:
//
extern "C" void mDoLib_project__FP3VecP3Vec();
extern "C" void mDoLib_pos2camera__FP3VecP3Vec();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs();
extern "C" void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz();
extern "C" void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi();
extern "C" void fopAcM_cancelCarryNow__FP10fopAc_ac_c();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void reset__14dEvt_control_cFv();
extern "C" void setPtI_Id__14dEvt_control_cFUi();
extern "C" void endCheckOld__16dEvent_manager_cFPCc();
extern "C" void newData__13dDlst_peekZ_cFssPUl();
extern "C" void Insect_Release__9dInsect_cFv();
extern "C" void isCatchNotGiveInsect__14dMenu_Insect_cFUc();
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
//
// Declarations:
//
inline int dComIfGs_isEventBit(u16 event) {
return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(event);
}
/* ############################################################################################## */
/* 803BA078-803BA088 017198 000C+04 1/1 0/0 0/0 .data __vt__9dInsect_c */
SECTION_DATA extern void* __vt__9dInsect_c[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
@@ -67,17 +50,12 @@ dInsect_c::dInsect_c() {
}
/* ############################################################################################## */
/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80393D98 = "DEFAULT_GETITEM";
#pragma pop
/* 8015E078-8015E26C 1589B8 01F4+00 0/0 0/0 24/24 .text Insect_GetDemoMain__9dInsect_cFv
*/
#ifdef NONMATCHING
void dInsect_c::Insect_GetDemoMain() {
if (field_0x58C != 1) {
switch (field_0x58C) {
case 0:
if (fopAcM_checkCarryNow(this)) {
cLib_offBit(mAttentionInfo.mFlags,0x10);
fopAcM_cancelCarryNow(this);
@@ -93,7 +71,8 @@ void dInsect_c::Insect_GetDemoMain() {
} else {
cLib_onBit(mAttentionInfo.mFlags,0x10);
}
} else {
break;
case 1:
if (mEvtInfo.checkCommandItem()) {
if (field_0x588 != -1) {
dComIfGp_event_setItemPartnerId(field_0x588);
@@ -105,87 +84,49 @@ void dInsect_c::Insect_GetDemoMain() {
fopAcM_orderItemEvent(this,0,0);
mEvtInfo.i_onCondition(8);
}
}
if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
i_dComIfGp_event_reset();
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x582]) || field_0x585 != 0) {
field_0x56D = 1;
field_0x58C = 0;
if (field_0x584 == 0) {
fopAcM_createItem(&current.pos,0,-1,-1,0,0,0);
field_0x584 = 1;
break;
case 2:
if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
i_dComIfGp_event_reset();
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x582]) || field_0x585 != 0) {
field_0x56D = 1;
field_0x58C = 0;
if (field_0x584 == 0) {
fopAcM_createItem(&current.pos,0,-1,-1,0,0,0);
field_0x584 = 1;
}
} else {
fopAcM_delete(this);
}
} else {
fopAcM_delete(this);
}
break;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dInsect_c::Insect_GetDemoMain() {
nofralloc
#include "asm/d/d_insect/Insect_GetDemoMain__9dInsect_cFv.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 804535E0-804535E4 001BE0 0004+00 1/1 0/0 0/0 .sdata2 @3871 */
SECTION_SDATA2 static f32 lit_3871 = 20.0f;
/* 804535E4-804535E8 001BE4 0004+00 1/1 0/0 0/0 .sdata2 @3872 */
SECTION_SDATA2 static u8 lit_3872[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 804535E8-804535EC 001BE8 0004+00 1/1 0/0 0/0 .sdata2 @3873 */
SECTION_SDATA2 static f32 lit_3873 = 608.0f;
/* 804535EC-804535F0 001BEC 0004+00 1/1 0/0 0/0 .sdata2 @3874 */
SECTION_SDATA2 static f32 lit_3874 = 448.0f;
/* 804535F0-804535F4 001BF0 0004+00 1/1 0/0 0/0 .sdata2 @3875 */
SECTION_SDATA2 static f32 lit_3875 = -10.0f;
/* 804535F4-804535F8 001BF4 0004+00 1/1 0/0 0/0 .sdata2 @3876 */
SECTION_SDATA2 static f32 lit_3876 = 16777215.0f;
/* 804535F8-80453600 001BF8 0004+04 1/1 0/0 0/0 .sdata2 @3877 */
SECTION_SDATA2 static f32 lit_3877[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
/* 8015E26C-8015E3F8 158BAC 018C+00 0/0 0/0 3/3 .text CalcZBuffer__9dInsect_cFf */
#ifdef NONMATCHING
void dInsect_c::CalcZBuffer(f32 param_0) {
f32 camera_trim_height;
cXyz pos;
cXyz pos_projected;
cXyz pos;
pos = current.pos;
pos.y += FLOAT_LABEL(lit_3871);
pos.y += 20.0f;
mDoLib_project(&pos_projected,&pos);
mDoLib_project(&pos, &pos_projected);
if (dComIfGp_getCamera(0)) {
camera_trim_height = dComIfGp_getCamera(0)->mCamera.field_0x93c;
camera_trim_height = *(f32*)&dComIfGp_getCamera(0)->mCamera.mCamSetup.mTypeTable;
} else {
camera_trim_height = FLOAT_LABEL(lit_3872);
camera_trim_height = 0.0f;
}
if (pos_projected.x < FLOAT_LABEL(lit_3872) ||
pos_projected.x > FLOAT_LABEL(lit_3873) ||
pos_projected.y < camera_trim_height ||
pos_projected.y < FLOAT_LABEL(lit_3874) - camera_trim_height) {
if (pos_projected.x > 0.0f &&
pos_projected.x < 608.0f &&
pos_projected.y > camera_trim_height &&
pos_projected.y < 448.0f - camera_trim_height) {
dComIfGd_peekZ(pos_projected.x,pos_projected.y,&field_0x578);
} else {
field_0x578 = 0;
@@ -194,23 +135,13 @@ void dInsect_c::CalcZBuffer(f32 param_0) {
f32 view_near = dComIfGd_getView()->mNear;
f32 view_far = dComIfGd_getView()->mFar;
mDoLib_pos2camera(&pos_projected,&pos);
mDoLib_pos2camera(&pos, &pos_projected);
pos_projected.z += param_0;
if (pos_projected.z == FLOAT_LABEL(lit_3872)) {
pos_projected.z = FLOAT_LABEL(lit_3875);
if (!pos_projected.z) {
pos_projected.z = -10.0f;
}
field_0x57C = view_near + ((view_far * view_near) / pos_projected.z) / (view_far - view_near);
field_0x57C = (((view_near + ((view_far * view_near) / pos_projected.z)) / (view_far - view_near)) + 1.0f) * 16777215.0f;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dInsect_c::CalcZBuffer(f32 param_0) {
nofralloc
#include "asm/d/d_insect/CalcZBuffer__9dInsect_cFf.s"
}
#pragma pop
#endif
/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_ky_thunder.cpp
+2 -14
View File
@@ -218,13 +218,11 @@ static asm void dThunder_Delete(dThunder_c* param_0) {
/* 801AE3FC-801AE458 1A8D3C 005C+00 1/0 0/0 0/0 .text dThunder_Create__FP12kankyo_class
*/
#ifdef NONMATCHING
// regalloc
static int dThunder_Create(kankyo_class* param_0) {
dThunder_c* thunder_ptr = (dThunder_c*)param_0;
int ret = thunder_ptr->createHeap();
int ret;
if (ret == 0) {
if (thunder_ptr->createHeap() == 0) {
return 5;
} else {
ret = thunder_ptr->create();
@@ -233,16 +231,6 @@ static int dThunder_Create(kankyo_class* param_0) {
return ret;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void dThunder_Create(kankyo_class* param_0) {
nofralloc
#include "asm/d/d_ky_thunder/dThunder_Create__FP12kankyo_class.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/kankyo/d_kankyo_wether.cpp
+7 -7
View File
@@ -122,7 +122,7 @@ extern "C" static void dKyw_pntwind_get_info__FP4cXyzP4cXyzPf();
extern "C" void dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf();
extern "C" void dKyw_pntwind_get_vecpow__FP4cXyz();
extern "C" void dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyz();
extern "C" void dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz();
extern "C" void dKyw_custom_windpower__Ff();
extern "C" void dKyw_evt_wind_set__Fss();
extern "C" void dKyw_evt_wind_set_go__Fv();
@@ -1753,17 +1753,17 @@ asm void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* param_1, f32* param_2) {
}
#pragma pop
/* 8005B530-8005B60C 055E70 00DC+00 0/0 0/0 5/5 .text dKyw_get_AllWind_vecpow__FP4cXyz */
// missing mr instruction
/* 8005B530-8005B60C 055E70 00DC+00 0/0 0/0 5/5 .text dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz */
// matches with literals
#ifdef NONMATCHING
void dKyw_get_AllWind_vecpow(cXyz* param_0) {
void dKyw_get_AllWind_vecpow(cXyz* param_0, cXyz* param_1) {
f32 sp8;
cXyz spC;
cXyz sp18;
cXyz sp24;
cXyz sp30;
dKyw_pntwind_get_info(param_0, &sp30, &sp8);
dKyw_pntwind_get_info(param_1, &sp30, &sp8);
sp18 = g_env_light.mWind.vec * (g_env_light.mWind.pow * (1.0f - sp8));
sp24 = sp30 * (5.0f * sp8);
spC = sp18 + sp24;
@@ -1774,9 +1774,9 @@ void dKyw_get_AllWind_vecpow(cXyz* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dKyw_get_AllWind_vecpow(cXyz* param_0) {
asm void dKyw_get_AllWind_vecpow(cXyz* param_0, cXyz* param_1) {
nofralloc
#include "asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyz.s"
#include "asm/d/kankyo/d_kankyo_wether/dKyw_get_AllWind_vecpow__FP4cXyzP4cXyz.s"
}
#pragma pop
#endif
src/d/meter/d_meter2_info.cpp
+3 -4
View File
@@ -360,7 +360,7 @@ void dMeter2Info_c::decMsgKeyWaitTimer() {
/* 8021C250-8021C370 216B90 0120+00 0/0 16/16 0/0 .text
* getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c */
// missing branch + some regalloc
// missing branch
#ifdef NONMATCHING
void dMeter2Info_c::getString(u32 stringID, char* outStr, JMSMesgEntry_c* p_msgEntry) {
strcpy(outStr, "");
@@ -378,10 +378,9 @@ void dMeter2Info_c::getString(u32 stringID, char* outStr, JMSMesgEntry_c* p_msgE
u32 stringOffset = (*(u32*)(msgRes + 0x24));
u8* strPtr = inf + stringOffset + 8;
u16 i = 0;
u16 entryCount = *(u16*)(inf + 8);
u16 i;
for (; i < entryCount; i++) {
for (i = 0; i < *(u16*)(inf + 8); i++) {
u8* entry = (inf + (i * 0x14));
if (stringID == *(u16*)(entry + 0x14)) {
src/d/msg/d_msg_flow.cpp
+7 -15
View File
@@ -962,21 +962,11 @@ asm int dMsgFlow_c::query007(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1
/* 8024B45C-8024B4A4 245D9C 0048+00 1/0 0/0 0/0 .text
* query008__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
#ifdef NONMATCHING
int dMsgFlow_c::query008(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) {
u16 prm0 = flow_node->params[0];
return (u8)daNpcKakashi_getSwdTutorialStep() != (u16)(prm0 - 1);
u32 prm0 = flow_node->params[0];
u16 prm1 = prm0;
return (u8)daNpcKakashi_getSwdTutorialStep() - 1 != (u16)prm1;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int dMsgFlow_c::query008(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) {
nofralloc
#include "asm/d/msg/d_msg_flow/query008__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s"
}
#pragma pop
#endif
/* 8024B4A4-8024B4D0 245DE4 002C+00 1/0 0/0 0/0 .text
* query009__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
@@ -1353,7 +1343,7 @@ int dMsgFlow_c::query043(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) {
u8 bomb_num = dComIfGs_getBombNum(dComIfGs_getTmpReg(0xFBFF) - 1);
u8 bomb_max = dComIfGs_getBombMax(POKE_BOMB);
return bomb_num + (u8)prm0 >= bomb_max;
return bomb_max >= bomb_num + prm0;
}
#else
#pragma push
@@ -1569,11 +1559,13 @@ asm int dMsgFlow_c::event004(mesg_flow_node_event* param_0, fopAc_ac_c* param_1)
/* 8024C5F0-8024C654 246F30 0064+00 1/0 0/0 0/0 .text
* event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */
// matches with literals
#ifdef NONMATCHING
int dMsgFlow_c::event005(mesg_flow_node_event* flow_node, fopAc_ac_c*) {
f32 prm0 = getParam(flow_node->params);
i_dComIfGp_setItemLifeCount(-prm0, 0);
f32 prm1 = -prm0;
i_dComIfGp_setItemLifeCount(prm1, 0);
return 1;
}
#else
src/d/shop/d_shop_system.cpp
+14 -26
View File
@@ -222,37 +222,35 @@ static u8 data_80451060;
/* 80197098-80197270 1919D8 01D8+00 1/1 0/0 0/0 .text dShopSystem_searchItemActor__FPvPv
*/
#ifdef NONMATCHING
static int dShopSystem_searchItemActor(void* param_0, void* param_1) {
if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_TAG_SHOPITM) {
u32 param = fopAcM_GetParam(param_0);
if ((param & 0xF0000000) == (fopAcM_GetParam(param_1) & 0xF0000000) &&
if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(param_0) & 0xF0000000) &&
dShopSystem_item_count < data_80451058) {
u32 param2 = (param >> 0x18) & 0xF;
u8 param2 = (fopAcM_GetParam(param_0) >> 0x18) & 0xF;
if (dShopSystem_itemActor[0] != param_0 && dShopSystem_itemActor[1] != param_0 &&
dShopSystem_itemActor[2] != param_0 && dShopSystem_itemActor[3] != param_0 &&
dShopSystem_itemActor[4] != param_0 && dShopSystem_itemActor[5] != param_0 &&
dShopSystem_itemActor[6] != param_0) {
u8 sw = static_cast<fopAc_ac_c*>(param_0)->orig.angle.z;
u8 sw2 = static_cast<fopAc_ac_c*>(param_0)->orig.angle.z >> 8;
u8 item_no = param;
u8 sw2 = ((u16)static_cast<fopAc_ac_c*>(param_0)->orig.angle.z) >> 8;
u8 item_no = fopAcM_GetParam(param_0) & 0xff;
if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) &&
(sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) {
if (sw != 0xFF && item_no == HYLIA_SHIELD && checkItemGet(item_no, true)) {
dComIfGs_onSaveSwitch(sw);
} else {
if (param2 == 0) {
data_80451060 = 1;
dShopSystem_itemActor[dShopSystem_item_count] = (fopAc_ac_c*) param_0;
dShopSystem_itemNo[dShopSystem_item_count] = item_no;
} else if (dShopSystem_itemActor[param2 - 1] == NULL) {
dShopSystem_itemActor[param2 - 1] = (fopAc_ac_c*) param_0;
dShopSystem_itemNo[param2 - 1] = item_no;
}
dShopSystem_item_count++;
}
if (param2 == 0) {
data_80451060 = 1;
dShopSystem_itemActor[dShopSystem_item_count] = param_0;
dShopSystem_itemNo[dShopSystem_item_count] = item_no;
} else if (dShopSystem_itemActor[param2 - 1] == NULL) {
dShopSystem_itemActor[param2 - 1] = param_0;
dShopSystem_itemNo[param2 - 1] = item_no;
}
dShopSystem_item_count++;
}
}
}
@@ -260,16 +258,6 @@ static int dShopSystem_searchItemActor(void* param_0, void* param_1) {
return 0;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void dShopSystem_searchItemActor(void* param_0, void* param_1) {
nofralloc
#include "asm/d/shop/d_shop_system/dShopSystem_searchItemActor__FPvPv.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 804506F0-804506F8 000170 0008+00 6/6 0/0 0/0 .sdata dShopSystem_cameraActor */