mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 14:55:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

work on d_a_npc, d_a_npc_ash, d_a_tag_evtarea (#345)

Browse Source 
All credit goes to randomsalience
This commit is contained in:
hatal175
2023-06-06 20:32:17 +03:00
committed by GitHub
parent 565453690e
commit 98582af6d2
60 changed files with 2654 additions and 2908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink_demo.inc
+3 -3
View File
@@ -128,11 +128,11 @@ asm void daAlink_c::endDemoMode() {
#ifdef NONMATCHING
fopAc_ac_c* daAlink_c::getDemoLookActor() {
if (mDemo.getParam0() == 1) {
return (fopAc_ac_c*)dComIfGp_event_getPt1();
return dComIfGp_event_getPt1();
} else if (mDemo.getParam0() == 2) {
return (fopAc_ac_c*)dComIfGp_event_getPt2();
return dComIfGp_event_getPt2();
} else if (mDemo.getParam0() == 3) {
return (fopAc_ac_c*)fopAcM_getTalkEventPartner(this);
return fopAcM_getTalkEventPartner(this);
} else if (mDemo.getParam0() == 4) {
return getMidnaActor();
}
src/d/a/d_a_npc.cpp
+666 -170
View File
File diff suppressed because it is too large Load Diff
src/d/com/d_com_inf_game.cpp
+6 -2
View File
@@ -2388,10 +2388,14 @@ bool dComIfGs_shake_kandelaar_check() {
/* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text dComIfGs_wolfeye_effect_check__Fv
*/
bool dComIfGs_wolfeye_effect_check() {
BOOL dComIfGs_wolfeye_effect_check() {
dScnKy_env_light_c* env_light = i_dKy_getEnvlight();
BOOL ret = false;
return env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6;
if (env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6) {
ret = true;
}
return ret;
}
void dComIfGs_Grass_hide_Set(s8 param_0) {
src/d/d_resorce.cpp
+20 -10
View File
@@ -380,7 +380,8 @@ asm J3DModelData* dRes_info_c::loaderBasicBmd(u32 param_0, void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevKColorAnm::~J3DTevKColorAnm() {
// asm J3DTevKColorAnm::~J3DTevKColorAnm() {
extern "C" asm void __dt__15J3DTevKColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__15J3DTevKColorAnmFv.s"
}
@@ -390,7 +391,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevKColorAnm::J3DTevKColorAnm() {
// asm J3DTevKColorAnm::J3DTevKColorAnm() {
extern "C" asm void __ct__15J3DTevKColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__15J3DTevKColorAnmFv.s"
}
@@ -400,7 +402,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevColorAnm::~J3DTevColorAnm() {
// asm J3DTevColorAnm::~J3DTevColorAnm() {
extern "C" asm void __dt__14J3DTevColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__14J3DTevColorAnmFv.s"
}
@@ -410,7 +413,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevColorAnm::J3DTevColorAnm() {
// asm J3DTevColorAnm::J3DTevColorAnm() {
extern "C" asm void __ct__14J3DTevColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__14J3DTevColorAnmFv.s"
}
@@ -474,7 +478,8 @@ extern "C" asm void __dt__11J3DTexNoAnmFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexNoAnm::J3DTexNoAnm() {
// asm J3DTexNoAnm::J3DTexNoAnm() {
extern "C" asm void __ct__11J3DTexNoAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__11J3DTexNoAnmFv.s"
}
@@ -484,7 +489,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexMtxAnm::~J3DTexMtxAnm() {
// asm J3DTexMtxAnm::~J3DTexMtxAnm() {
extern "C" asm void __dt__12J3DTexMtxAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__12J3DTexMtxAnmFv.s"
}
@@ -494,7 +500,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexMtxAnm::J3DTexMtxAnm() {
// asm J3DTexMtxAnm::J3DTexMtxAnm() {
extern "C" asm void __ct__12J3DTexMtxAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__12J3DTexMtxAnmFv.s"
}
@@ -504,7 +511,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DMatColorAnm::~J3DMatColorAnm() {
// asm J3DMatColorAnm::~J3DMatColorAnm() {
extern "C" asm void __dt__14J3DMatColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__14J3DMatColorAnmFv.s"
}
@@ -514,7 +522,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DMatColorAnm::J3DMatColorAnm() {
// asm J3DMatColorAnm::J3DMatColorAnm() {
extern "C" asm void __ct__14J3DMatColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__14J3DMatColorAnmFv.s"
}
@@ -1114,7 +1123,8 @@ asm void J3DAnmTransformKey::getTransform(u16 param_0, J3DTransformInfo* param_1
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTexNoAnm::calc(u16* param_0) const {
// asm void J3DTexNoAnm::calc(u16* param_0) const {
extern "C" asm void calc__11J3DTexNoAnmCFPUs() {
nofralloc
#include "asm/d/d_resorce/calc__11J3DTexNoAnmCFPUs.s"
}
src/d/event/d_event.cpp
+11 -11
View File
@@ -489,12 +489,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
/* 80041D34-80041DDC 03C674 00A8+00 1/1 0/0 0/0 .text talkEnd__14dEvt_control_cFv */
int dEvt_control_c::talkEnd() {
fopAc_ac_c* actor = (fopAc_ac_c*)getPt1();
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
actor = (fopAc_ac_c*)getPt2();
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
@@ -560,12 +560,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
/* 80041F18-80041FA0 03C858 0088+00 1/1 0/0 0/0 .text demoEnd__14dEvt_control_cFv */
int dEvt_control_c::demoEnd() {
fopAc_ac_c* actor = (fopAc_ac_c*)getPt1();
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
actor = (fopAc_ac_c*)getPt2();
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
@@ -597,7 +597,7 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) {
if (commonCheck(p_order, 4, 3)) {
mMode = EVT_MODE_DEMO;
fopAc_ac_c* actor2 = (fopAc_ac_c*)getPt2();
fopAc_ac_c* actor2 = getPt2();
if (actor2 != NULL) {
i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName());
}
@@ -754,9 +754,9 @@ int dEvt_control_c::entry() {
/* 80042468-80042518 03CDA8 00B0+00 1/1 8/8 388/388 .text reset__14dEvt_control_cFv */
void dEvt_control_c::reset() {
if (field_0xec != 0xFF) {
void* pt1 = getPt1();
fopAc_ac_c* pt1 = getPt1();
s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1);
void* pt2 = getPt2();
fopAc_ac_c* pt2 = getPt2();
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec);
mChangeOK = pt1;
@@ -769,7 +769,7 @@ void dEvt_control_c::reset() {
void dEvt_control_c::reset(void* param_0) {
if (field_0xec != 0xFF) {
s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx((fopAc_ac_c*)param_0, field_0xec);
void* pt2 = getPt2();
fopAc_ac_c* pt2 = getPt2();
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, param_0, pt2, eventIdx, field_0xec);
}
@@ -970,7 +970,7 @@ bool dEvt_control_c::skipper() {
if (startSkip) {
dMsgObject_onKillMessageFlag();
void* ptr = convPId(field_0x104);
fopAc_ac_c* ptr = convPId(field_0x104);
if (ptr == NULL) {
ptr = dComIfGp_getPlayer(0);
}
@@ -1240,8 +1240,8 @@ u32 dEvt_control_c::getPId(void* actor) {
}
/* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text convPId__14dEvt_control_cFUi */
void* dEvt_control_c::convPId(unsigned int id) {
return fopAcIt_Judge(fpcSch_JudgeByID, &id);
fopAc_ac_c* dEvt_control_c::convPId(unsigned int id) {
return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeByID, &id);
}
/* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text getStbDemoData__14dEvt_control_cFPc
src/d/event/d_event_manager.cpp
+1 -1
View File
@@ -464,7 +464,7 @@ void dEvent_manager_c::Sequencer() {
evtControl.onSkipFade();
}
void* actor = evtControl.getPt1();
fopAc_ac_c* actor = evtControl.getPt1();
if (actor == NULL) {
actor = evtControl.getPt2();
}
src/f_op/f_op_actor_mng.cpp
+3 -3
View File
@@ -1435,18 +1435,18 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priori
/* 8001BB14-8001BB44 016454 0030+00 0/0 11/11 10/10 .text
* fopAcM_getTalkEventPartner__FPC10fopAc_ac_c */
void* fopAcM_getTalkEventPartner(fopAc_ac_c const*) {
fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c const*) {
return dComIfGp_event_getTalkPartner();
}
/* 8001BB44-8001BB74 016484 0030+00 0/0 5/5 0/0 .text fopAcM_getItemEventPartner__FPC10fopAc_ac_c
*/
void* fopAcM_getItemEventPartner(fopAc_ac_c const*) {
fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const*) {
return dComIfGp_event_getItemPartner();
}
/* 8001BB74-8001BBE8 0164B4 0074+00 0/0 1/1 0/0 .text fopAcM_getEventPartner__FPC10fopAc_ac_c */
void* fopAcM_getEventPartner(fopAc_ac_c const* actor) {
fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* actor) {
if (dComIfGp_event_getPt1() != actor) {
return dComIfGp_event_getPt1();
}
src/m_Do/m_Do_ext.cpp
+2 -2
View File
@@ -2828,8 +2828,8 @@ asm void mDoExt_McaMorfSO::calc() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* param_0, int param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5) {
asm void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
f32 i_start, f32 i_end) {
nofralloc
#include "asm/m_Do/m_Do_ext/setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff.s"
}