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

d_a_mg_fish matching (#2450)

Browse Source
This commit is contained in:
Max Roncace
2025-05-22 09:22:16 -04:00
committed by GitHub
parent 15463d89bf
commit 3c2a99e701
9 changed files with 4101 additions and 2490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_canoe.inc
+1 -1
View File
@@ -1249,7 +1249,7 @@ int daAlink_c::procCanoeFishingReel() {
setFishGetFace();
if (checkEndResetFlg0(ERFLG0_UNK_40000)) {
if (checkEndResetFlg0(ERFLG0_FISHING_ROD_GET_FISH)) {
procCanoeFishingGetInit();
} else if (checkEndResetFlg0(ERFLG0_UNK_20000)) {
resetUpperAnime(UPPER_2, -1.0f);
src/d/actor/d_a_mg_fish.cpp
+3912 -2420
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_ne.cpp
+11 -11
View File
@@ -802,8 +802,8 @@ static cXyz ground_search(npc_ne_class* i_this) {
static void* s_fish_sub(void* i_proc, void* i_this) {
npc_ne_class* _this = static_cast<npc_ne_class*>(i_this);
if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_MG_FISH) {
mg_fish_class* fish = static_cast<mg_fish_class*>(i_proc);
if (fish->field_0x5b6 == 0x35 && fish->field_0x5b8 >= 10) {
mg_fish_class* fish = (mg_fish_class*)i_proc;
if (fish->mCurAction == 0x35 && fish->mActionPhase >= 10) {
_this->mFishID = fopAcM_GetID(fish);
return i_proc;
}
@@ -2852,7 +2852,7 @@ static void demo_camera(npc_ne_class* i_this) {
}
if (i_this->mDemoCounter <= 38) {
mg_fish_class* fish = static_cast<mg_fish_class*>(fopAcM_SearchByID(i_this->mFishID));
mg_fish_class* fish = (mg_fish_class*)fopAcM_SearchByID(i_this->mFishID);
if (i_this->mDemoCounter == 0) {
vec.x = 0.0f;
vec.y = 0.0f;
@@ -2860,10 +2860,10 @@ static void demo_camera(npc_ne_class* i_this) {
MtxPosition(&vec, &i_this->mDemoFishPos);
i_this->mDemoFishPos += i_this->current.pos;
}
fish->current.pos.x = i_this->mDemoFishPos.x;
fish->current.pos.z = i_this->mDemoFishPos.z;
fish->actor.current.pos.x = i_this->mDemoFishPos.x;
fish->actor.current.pos.z = i_this->mDemoFishPos.z;
if (i_this->mDemoCounter >= 25) {
cLib_addCalc2(&fish->current.pos.y, i_this->mAcch.GetGroundH() + 10.0f,
cLib_addCalc2(&fish->actor.current.pos.y, i_this->mAcch.GetGroundH() + 10.0f,
0.2f, 30.0f);
}
if (i_this->mDemoCounter == 38) {
@@ -3128,15 +3128,15 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) {
}
if (i_this->mFishID != -1 && i_this->field_0xcc0) {
mg_fish_class* fish = static_cast<mg_fish_class*>(fopAcM_SearchByID(i_this->mFishID));
mg_fish_class* fish = (mg_fish_class*)fopAcM_SearchByID(i_this->mFishID);
PSMTXCopy(model->getAnmMtx(4), mDoMtx_stack_c::get());
mDoMtx_stack_c::ZrotM(-19000);
mDoMtx_stack_c::scaleM(0.5f, 0.5f, 0.5f);
mDoMtx_stack_c::transM(5.0f, 35.0f, 15.0f);
fish->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
int ivar3 = cM_ssin(g_Counter.mTimer * 15000) * 1500.0f;
for (int i = 0; i <= fish->field_0x72c; i++) {
fish->field_0x718[i] = ivar3;
for (int i = 0; i <= fish->mNumJoints; i++) {
fish->jointYaws1[i] = ivar3;
}
for (u16 i = 1; i < fish->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
fish->mpMorf->getModel()->getModelData()
@@ -3144,8 +3144,8 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) {
}
fish->mpMorf->play(NULL, 0, 0);
fish->mpMorf->modelCalc();
fish->current.pos = i_this->eyePos;
fish->eyePos = i_this->eyePos;
fish->actor.current.pos = i_this->eyePos;
fish->actor.eyePos = i_this->eyePos;
}
if (i_this->current.pos.y - i_this->home.pos.y < -5000.0f && fopAcM_CheckCondition(i_this, 4)) {