mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-12 21:44:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

start with d_t_insect

Browse Source
This commit is contained in:
lepelog
2025-12-02 17:44:48 +01:00
parent 4e39bcca32
commit 08844fb5da
5 changed files with 218 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+1 -1
View File
@@ -1142,7 +1142,7 @@ create__12dAcObjBase_cFP12dAcObjBase_cQ28fProfile14PROFILE_NAME_eUlPC7mVec3_cPC7
fn_8002EF70 = .text:0x8002EF70; // type:function size:0x28
fn_8002EFA0 = .text:0x8002EFA0; // type:function size:0x50
fn_8002eff0__12dAcObjBase_cFRCfRCsP8cCcD_ObjRCfRCf = .text:0x8002EFF0; // type:function size:0x194
fn_8002F190 = .text:0x8002F190; // type:function size:0x24
createInsectActor__12dAcObjBase_cFP9dAcBase_cQ28fProfile14PROFILE_NAME_eUlP7mVec3_cP7mAng3_cP7mVec3_cUll = .text:0x8002F190; // type:function size:0x24
createActorUnkGroup3__12dAcObjBase_cFQ28fProfile14PROFILE_NAME_eUlUlP7mVec3_cP7mAng3_cP7mVec3_cUl = .text:0x8002F1C0; // type:function size:0x98
createActorUnkGroup3__12dAcObjBase_cFPCcUlUlPC7mVec3_cPC7mAng3_cPC7mVec3_cUlUsSc = .text:0x8002F260; // type:function size:0xA0
__ct__11dAcEnBase_cFv = .text:0x8002F300; // type:function size:0x74
include/c/c_lib.h
+1
View File
@@ -8,6 +8,7 @@ namespace cLib {
s16 targetAngleY(const mVec3_c &target, const mVec3_c &source);
s16 targetAngleX(const mVec3_c &target, const mVec3_c &source);
s16 offsetPos(mVec3_c &target, const mVec3_c &v1, s16 angle, const mVec3_c &v2);
void addCalcPos2(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep);
f32 addCalcPosXZ(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep, f32 minStep);
f32 addCalcPos(mVec3_c *src, const mVec3_c &target, f32 scale, f32 maxStep, f32 minStep);
include/d/a/obj/d_a_obj_base.h
+7
View File
@@ -220,7 +220,14 @@ public:
fProfile::PROFILE_NAME_e actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2,
u32 roomId
);
// These may not belong here
// fn_8002F190
// TODO: return type is probably a superclass for all insects
static dAcBase_c* createInsectActor(
dAcBase_c* parent,
fProfile::PROFILE_NAME_e actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, s32 roomId
);
static dAcBase_c *createActorUnkGroup3(
fProfile::PROFILE_NAME_e actorId, u32 roomId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale,
u32 params2
include/d/t/d_t_insect.h
+26 -2
View File
@@ -2,12 +2,13 @@
#define D_T_INSECT_H
#include "d/a/d_a_base.h"
#include "m/m_vec.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dTgInsect_c : public dAcBase_c {
public:
dTgInsect_c() : mStateMgr(*this, sStateID::null) {}
dTgInsect_c() : mStateMgr(*this, sStateID::null), unk26C(0), unk270(0), unk274(0) {}
virtual ~dTgInsect_c() {}
STATE_FUNC_DECLARE(dTgInsect_c, Wait);
@@ -16,7 +17,30 @@ public:
STATE_FUNC_DECLARE(dTgInsect_c, End);
private:
/* 0x??? */ STATE_MGR_DECLARE(dTgInsect_c);
/* 0x0FC */ STATE_MGR_DECLARE(dTgInsect_c);
/* 0x138 */ dAcRef_c<dAcBase_c> mLinks[16];
/* 0x1F8 */ u8 unk1F8[0x208-0x1F8];
/* 0x208 */ s32 unk208[16];
/* 0x248 */ s32 mInsectCount;
/* 0x24C */ u8 unk24C;
/* 0x24D */ u8 unk24D;
/* 0x24E */ u8 unk24E;
/* 0x24F */ u8 unk24F;
/* 0x250 */ u8 unk250[16];
/* 0x260 */ u8 unk260[0x26C-0x260];
/* 0x26C */ s32 unk26C;
/* 0x270 */ s32 unk270;
/* 0x274 */ s32 unk274;
s32 getSpawnSubtype() const {
return (mParams >> 8 & 0xF);
}
s32 getSubtype() const {
return (mParams >> 4 & 0xF);
}
void spawnInsect(s32 index);
bool shouldSpawn();
bool someGroundCheck(const mVec3_c &pos,s32 param_3);
};
#endif
src/REL/d/t/d_t_insect.cpp
+183 -1
View File
@@ -1,4 +1,17 @@
#include "d/t/d_t_insect.h"
#include "c/c_lib.h"
#include "c/c_math.h"
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/d_a_item.h"
#include "d/a/d_a_itembase.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_s_gnd_chk.h"
#include "d/flag/itemflag_manager.h"
#include "d/flag/sceneflag_manager.h"
#include "f/f_profile.h"
#include "f/f_profile_name.h"
#include "m/m_vec.h"
SPECIAL_ACTOR_PROFILE(TAG_INSECT, dTgInsect_c, fProfile::TAG_INSECT, 0x167, 0, 0);
@@ -10,7 +23,14 @@ STATE_DEFINE(dTgInsect_c, End);
void dTgInsect_c::initializeState_Wait() {}
void dTgInsect_c::executeState_Wait() {}
void dTgInsect_c::finalizeState_Wait() {}
void dTgInsect_c::initializeState_WaitCreate() {}
void dTgInsect_c::initializeState_WaitCreate() {
if (getSpawnSubtype() != 2) {
unk24F = 1;
for (s32 i = 0; i < mInsectCount; i++) {
unk250[i] = shouldSpawn();
}
}
}
void dTgInsect_c::executeState_WaitCreate() {}
void dTgInsect_c::finalizeState_WaitCreate() {}
void dTgInsect_c::initializeState_WaitForceEscape() {}
@@ -19,3 +39,165 @@ void dTgInsect_c::finalizeState_WaitForceEscape() {}
void dTgInsect_c::initializeState_End() {}
void dTgInsect_c::executeState_End() {}
void dTgInsect_c::finalizeState_End() {}
inline bool isButterfly3(int subtype, int spawnSubtype) {
if (subtype != 10) return false;
if (spawnSubtype != 3) return false;
return true;
}
inline bool isButterfly4(int subtype, int spawnSubtype) {
if (subtype != 10) return false;
if (spawnSubtype != 4) return false;
return true;
}
inline bool isButterfly5(int subtype, int spawnSubtype) {
if (subtype != 10) return false;
if (spawnSubtype != 5) return false;
return true;
}
static const f32 FLOAT_ARRAY[] = {
0.1f,
-0.4f,
0.3f,
0.7f,
-0.7f,
};
static const f32 WHATEVER[] = {
100,
150,
0.5f
};
static const f32 different100[] = { 100 };
// regalloc (probably)
void dTgInsect_c::spawnInsect(s32 index) {
f32 scaledScale = 100 * mScale.y;
f32 scaled2 = mScale.x * WHATEVER[0] * 0.85f;
mAng3_c rot(0,0,0);
mVec3_c pos;
bool spawnFound = false;
s32 tries = 5;
do {
f32 scale = cM::rndF(scaled2);
s16 angle1 = cM::rndFX(65536.0f);
s16 angle2 = cM::rndFX(65536.0f);
rot.y = angle2;
mVec3_c v2 = mVec3_c::Ez * scale;
cLib::offsetPos(pos, mPosition, angle1, v2);
s32 subtype = mParams >> 4 & 0xF;
switch (subtype) {
case 3:
case 5:
case 6:
case 9:
pos = mPosition;
if (subtype == 6) {
mVec3_c tmp = mVec3_c::Ez;
tmp.rotY(mAng(mRotation.y + 0x4000));
f32 arrayResult = FLOAT_ARRAY[index % 5];
f32 scaledX = WHATEVER[0] * mScale.x;
tmp.multScalar(arrayResult * scaledX);
pos = mPosition + tmp;
f32 scaledScale = mScale.y * 100;
pos.y = mPosition.y + scaledScale * 0.3f;
pos.y += cM::rndF(scaledScale * 0.5f);
if (!someGroundCheck(pos, 0)) {
return;
}
} else {
pos.y += cM::rndF(scaledScale);
}
spawnFound = true;
break;
case 7:
case 8:
case 0xB:
case 0xC:
pos.y = different100[0] + mPosition.y;
if (dBgS_ObjGndChk::CheckPos(pos)) {
spawnFound = true;
}
break;
case 4:
case 0xA:
case 0xD:
spawnFound = true;
break;
}
} while (!spawnFound && --tries);
s32 subtype = mParams >> 4 & 0xF;
dAcBase_c* ref = nullptr;
if (subtype == 3) {
}
switch (subtype) {
case 3:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_LADYBUG, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 4:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_DRAGONFLY, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 5:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_BEETLE, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 6:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_GRASSHOPPER, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 7:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_CICADA, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 8:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_ANT, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 9:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_BEETLE, 0x10000000, &pos, &rot, NULL, 0, 0x3f);
break;
case 0xA:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_BUTTERFLY, mViewClipIdx, &pos, &rot, NULL, 0, 0x3f);
break;
case 0xB:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_GRASSHOPPER, 0x10000000, &pos, &rot, NULL, 0, 0x3f);
break;
case 0xC:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_SCARAB, 0, &pos, &rot, NULL, 0, 0x3f);
break;
case 0xD:
ref = dAcObjBase_c::createInsectActor(this, fProfile::INSECT_FIREFLY, 0, &pos, &rot, NULL, 0, 0x3f);
break;
}
if (ref != nullptr) {
mLinks[index].link(ref);
unk208[index] = -1;
}
return;
}
bool dTgInsect_c::shouldSpawn() {
int spawnSubtype = mParams >> 8 & 0xF;
if (spawnSubtype == 2) {
return true;
} else if (spawnSubtype == 1) {
bool tmp = SceneflagManager::sInstance->checkFlag(mRoomID, 0x3a);
return !tmp;
} else {
int subtype = mParams >> 4 & 0xF;
if (isButterfly3(subtype, spawnSubtype)) {
return true;
} else if (isButterfly4(subtype, spawnSubtype) || isButterfly5(subtype, spawnSubtype)) {
return true;
} else if((subtype == 0xD) && !dAcItem_c::checkFlag(ITEM_STARRY_FIREFLY)) {
return true;
} else {
if (cM::rndF(1.0f) >= 0.5f) {
return false;
} else {
return true;
}
}
}
}