mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-08 13:56:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

tmp

Browse Source
This commit is contained in:
lepelog
2025-12-04 16:28:44 +01:00
parent 24d9396bee
commit 44ec1a0003
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/t/d_t_insect.h
+2 -2
View File
@@ -104,8 +104,8 @@ private:
inline s32 getTries() {
return 5;
}
int actorCreate();
int actorPostCreate();
int actorCreate() override;
int actorPostCreate() override;
};
#endif
src/REL/d/t/d_t_insect.cpp
+21 -12
View File
@@ -76,8 +76,6 @@ inline bool checkProfile(u16 prof, u32 target) {
return prof == target;
}
// non matching: the inline vecs from the distance checks
// are in the wrong order on the stack
int dTgInsect_c::actorPostCreate() {
s32 subtype = (mParams >> 4 & 0xF);
// ??? doesn't match without the double comparison
@@ -98,7 +96,6 @@ int dTgInsect_c::actorPostCreate() {
checkProfile(prof, fProfile::OBJ_OCT_GRASS_LEAF) || checkProfile(prof, fProfile::OBJ_FRUIT) ||
checkProfile(prof, fProfile::OBJ_BARREL) || checkProfile(prof, fProfile::OBJ_VSD) ||
checkProfile(prof, fProfile::OBJ_SOIL)
// inline vec 1
) &&
getSquareDistanceTo(obj->mPosition) < 25) {
if (subtype == 7 || subtype == 0xB || subtype == 8 || subtype == 0xC) {
@@ -126,8 +123,7 @@ int dTgInsect_c::actorPostCreate() {
if (!warp->checkThisHasSongItem() || warp->isTrialComplete()) {
return FAILED;
}
// inline vec 2
if ((warp->checkInRadius(mPosition, 1000000))) {
if ((warp->mPosition - mPosition).squareMagXZ() < 1000000.f) {
mWarpRef.link(warp);
} else {
return FAILED;
@@ -308,18 +304,31 @@ void dTgInsect_c::spawnAll() {
// non matching: rodata is weird, using multiple different 100.0f instead of just one
// also the registers are wrong
void dTgInsect_c::spawnInsect(s32 index) {
f32 scaledScaleY = mScale.y * SCALE_Y;
f32 scaledScaleX = SCALE_X * mScale.x * 0.85f;
bool spawnFound;
f32 scaleX;
f32 scaleY;
f32 scaleXExt;
f32 scaleYExt;
f32 scaledScaleY;
f32 scaledScaleX;
f32 mult;
f32 scaledTemp;
scaleY = mScale.y;
scaleYExt = SCALE_Y;
scaledScaleY = scaleY * scaleYExt;
mult = 0.85f;
scaleXExt = SCALE_X;
scaleX = mScale.x;
scaledTemp = scaleXExt * scaleX;
scaledScaleX = mult * scaledTemp;
s16 angle1;
mVec3_c pos;
mVec3_c tmp;
mAng3_c rot(0, 0, 0);
spawnFound = false;
s32 tries;
tries = 5;
bool spawnFound = false;
s32 tries = 5;
do {
f32 scale = cM::rndF(scaledScaleX);
s16 angle1 = cM::rndFX(65536.0f);
angle1 = cM::rndFX(65536.0f);
rot.y = cM::rndFX(65536.0f);
mVec3_c v2 = mVec3_c::Ez * scale;
cLib::offsetPos(pos, mPosition, angle1, v2);