falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some variable names for hookshot and moved some values (#2900) 

* Some variable names for hookshot and moved some values

* Revert using data.inc file
This commit is contained in:
Sven Elmendorp 2025-12-02 01:36:09 +01:00 committed by GitHub
parent 6a5397e847
commit 737db261e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/d/actor/d_a_alink.h
View File

@ -13,6 +13,7 @@
#include "d/d_save.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera_mng.h"
#include "res/Object/AlAnm.h"
class J2DAnmColorKey;
class J2DAnmTransformKey;
@ -35,7 +36,7 @@ public:
void initFrame() {
field_0x4 = 0;
field_0x2c = 4.0f;
mLockCursorAngle = 4.0f;
field_0x30 = 0.0f;
}
@ -56,7 +57,7 @@ private:
/* 0x20 */ J2DAnmTevRegKey* field_0x20;
/* 0x24 */ J2DAnmColorKey* field_0x24;
/* 0x28 */ J2DAnmTransformKey* field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x2C */ f32 mLockCursorAngle;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 mPosX;
/* 0x38 */ f32 mPosY;
@ -6708,8 +6709,8 @@ public:
bool checkHorseTurnLAnime() const { return checkUpperAnime(0x24C); }
bool checkHorseTurnRAnime() const { return checkUpperAnime(0x24D); }
bool checkHorseTurnAnime() const { return checkHorseTurnLAnime() || checkHorseTurnRAnime(); }
bool checkHookshotShootAnime() const { return checkUpperAnime(0x18C); }
bool checkHookshotReadyAnime() const { return checkUpperAnime(0x18D); }
bool checkHookshotShootAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HSSHOOT_e); }
bool checkHookshotReadyAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_HSWAIT_e); }
BOOL checkHookshotAnime() const {
return checkHookshotReadyAnime() || checkHookshotShootAnime();
}

24
src/d/actor/d_a_alink_effect.inc
View File

@ -1977,7 +1977,7 @@ void daAlink_blur_c::draw() {
BOOL daAlink_lockCursor_c::create() {
JKRArchive* arc = dComIfG_getObjectResInfo(l_arcName)->getArchive();
field_0x2c = 0.0f;
mLockCursorAngle = 0.0f;
field_0x4 = false;
field_0x30 = 0.0f;
@ -2060,14 +2060,14 @@ extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor() {
}
void daAlink_lockCursor_c::update() {
if (field_0x2c < 21.0f) {
field_0x2c = 21.0f;
if (mLockCursorAngle < 21.0f) {
mLockCursorAngle = 21.0f;
}
field_0x2c += 0.9f;
mLockCursorAngle += 0.9f;
if (field_0x2c >= 50.0f) {
field_0x2c += -29.0f;
if (mLockCursorAngle >= 50.0f) {
mLockCursorAngle += -29.0f;
}
field_0x30 += 0.9f;
@ -2081,13 +2081,13 @@ void daAlink_lockCursor_c::update() {
void daAlink_lockCursor_c::draw() {
if (field_0x4 != 0) {
field_0x28->setFrame(field_0x2c);
field_0x28->setFrame(mLockCursorAngle);
f32 var_f30;
if (field_0x2c > 21.0f) {
if (mLockCursorAngle > 21.0f) {
var_f30 = 21.0f;
} else {
var_f30 = field_0x2c;
var_f30 = mLockCursorAngle;
}
field_0x24->setFrame(var_f30);
@ -2097,10 +2097,10 @@ void daAlink_lockCursor_c::draw() {
field_0xc->scale(0.6f, 0.6f);
field_0xc->translate(mPosX, mPosY);
if (!(field_0x2c < 15.0f)) {
if (!(mLockCursorAngle < 15.0f)) {
f32 var_f31;
if (field_0x2c < 21.0f) {
var_f31 = ((field_0x2c - 15.0f) * 40.0f) * 0.16666667f;
if (mLockCursorAngle < 21.0f) {
var_f31 = ((mLockCursorAngle - 15.0f) * 40.0f) * 0.16666667f;
} else {
var_f31 = ((field_0x4 * 0.00390625f) + 0.5f) * 40.0f;
}

36
src/d/actor/d_a_alink_hook.inc
View File

@ -123,26 +123,26 @@ void daAlink_c::hsChainShape_c::draw() {
}
}
} else {
const cXyz& sp3C = temp_r3->getHsChainRootPos();
const cXyz& sp38 = temp_r3->getHsChainTopPos();
cXyz spA4 = sp3C - sp38;
const cXyz& chainRootPos = temp_r3->getHsChainRootPos();
const cXyz& chainTopPos = temp_r3->getHsChainTopPos();
cXyz maxDistance = chainRootPos - chainTopPos;
f32 temp_f31 = spA4.abs();
f32 maxDistanceF = maxDistance.abs();
f32 var_f30;
cXyz sp98;
csXyz sp6C;
if (temp_f31 > 1.0f) {
spA4 *= (1.0f / temp_f31);
if (maxDistanceF > 1.0f) {
maxDistance *= (1.0f / maxDistanceF);
var_f30 = 0.0f;
sp98 = sp38;
sp6C.set(spA4.atan2sY_XZ(), spA4.atan2sX_Z(), 0);
sp98 = sp38;
sp98 = chainTopPos;
sp6C.set(maxDistance.atan2sY_XZ(), maxDistance.atan2sX_Z(), 0);
sp98 = chainTopPos;
csXyz sp64(sp6C);
f32 sp34 = M_PI / temp_f31;
f32 sp34 = M_PI / maxDistanceF;
f32 temp_f27;
f32 var_f26 = 0.0f;
@ -153,7 +153,7 @@ void daAlink_c::hsChainShape_c::draw() {
var_f28 *= -1.0f;
}
while (temp_f31 > var_f30) {
while (maxDistanceF > var_f30) {
temp_f27 = var_f28 * cM_fsin(sp34 * var_f30);
s16 spC = cM_atan2s(temp_f27 - var_f26, 5.0f);
sp64.x = sp6C.x + spC;
@ -180,15 +180,15 @@ void daAlink_c::hsChainShape_c::draw() {
const cXyz& sp30 = temp_r3->getHsSubChainRootPos();
const cXyz& sp2C = temp_r3->getHsSubChainTopPos();
spA4 = sp30 - sp2C;
maxDistance = sp30 - sp2C;
f32 temp_f1 = spA4.abs();
f32 temp_f1 = maxDistance.abs();
if (temp_f1 > 1.0f) {
spA4 *= (1.0f / temp_f1);
maxDistance *= (1.0f / temp_f1);
var_f30 = 0.0f;
sp98 = sp2C;
sp6C.set(spA4.atan2sY_XZ(), spA4.atan2sX_Z(), 0);
sp6C.set(maxDistance.atan2sY_XZ(), maxDistance.atan2sX_Z(), 0);
while (temp_f1 > var_f30) {
mDoMtx_stack_c::copy(j3dSys.getViewMtx());
@ -200,7 +200,7 @@ void daAlink_c::hsChainShape_c::draw() {
sp5C->getShape()->simpleDrawCache();
sp98 += spA4 * 5.0f;
sp98 += maxDistance * 5.0f;
sp6C.z += 0x3000;
var_f30 += 5.0f;
}
@ -395,7 +395,7 @@ void daAlink_c::setHookshotModel() {
mpHookshotLinChk->OffFullGrp();
mpHookshotLinChk->OnWaterGrp();
J3DAnmTransform* bck2 = (J3DAnmTransform*)loadAram(0x17F, 0x800);
J3DAnmTransform* bck2 = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_HS_TIP_OPEN_e, 0x800);
mHookTipBck.init(bck2, 0, 2, 1.0f, 0, -1, false);
mDoExt_setCurrentHeap(heap);
@ -548,7 +548,7 @@ void daAlink_c::setHookshotReadyAnime() {
speed = daAlinkHIO_hookshot_c0::m.mWaitAnmSpeed;
}
setUpperAnimeBaseSpeed(0x18D, speed, 3.0f);
setUpperAnimeBaseSpeed(dRes_INDEX_ALANM_BCK_HSWAIT_e, speed, 3.0f);
field_0x3020 = 0;
initHookshotReady();
}