mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-11 22:50:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

address review, name more things, uppercase hex

Browse Source
This commit is contained in:
swekka
2025-09-14 23:00:04 +02:00
parent 4c1169d867
commit 0ac75a04a6
3 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_obj_block_undergroundNP/symbols.txt
+5 -5
View File
@@ -23,12 +23,12 @@ setSubtype__20dAcOBlockUndergroundFUl = .text:0x000008F0; // type:function size:
getSubtype__20dAcOBlockUndergroundFv = .text:0x00000900; // type:function size:0xC
getFirstSceneFlag__20dAcOBlockUndergroundFv = .text:0x00000910; // type:function size:0xC
getSecondSceneFlag__20dAcOBlockUndergroundFv = .text:0x00000920; // type:function size:0xC
fn_459_930__20dAcOBlockUndergroundFv = .text:0x00000930; // type:function size:0x1C
getSubtypeIdx__20dAcOBlockUndergroundFv = .text:0x00000950; // type:function size:0x1C
fn_459_970__20dAcOBlockUndergroundFv = .text:0x00000970; // type:function size:0x28
fn_459_9A0__20dAcOBlockUndergroundFv = .text:0x000009A0; // type:function size:0x2C
getSubtypeCylVariant__20dAcOBlockUndergroundFv = .text:0x00000930; // type:function size:0x1C
getMdlDzbPlcIdx__20dAcOBlockUndergroundFv = .text:0x00000950; // type:function size:0x1C
noCyl__20dAcOBlockUndergroundFv = .text:0x00000970; // type:function size:0x28
shouldSetCylTgType__20dAcOBlockUndergroundFv = .text:0x000009A0; // type:function size:0x2C
getMdlName__20dAcOBlockUndergroundFv = .text:0x000009D0; // type:function size:0x30
fn_459_A00__20dAcOBlockUndergroundFv = .text:0x00000A00; // type:function size:0x28
hasCyl__20dAcOBlockUndergroundFv = .text:0x00000A00; // type:function size:0x28
spawnEffect__20dAcOBlockUndergroundCFUs = .text:0x00000A30; // type:function size:0x68
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
include/d/a/obj/d_a_obj_block_underground.h
+12 -6
View File
@@ -37,12 +37,12 @@ private:
u8 getSubtype();
u8 getFirstSceneFlag();
u8 getSecondSceneFlag();
u32 fn_459_930();
u32 getSubtypeIdx();
bool fn_459_970();
bool fn_459_9A0();
u32 getSubtypeCylVariant();
u32 getMdlDzbPlcIdx();
bool noCyl();
bool shouldSetCylTgType();
const char *getMdlName();
bool fn_459_A00();
bool hasCyl();
void spawnEffect(u16) const;
/* 0x330 */ m3d::smdl_c mMdl;
@@ -54,7 +54,13 @@ private:
/* 0x57C */ u16 mField_0x57C;
/* 0x57E */ u16 mField_0x57E;
static const s32 sSubtypeIdx[12];
struct SubtypeData {
s32 mSubtype;
s32 mCylVariant;
s32 mMdlDzbPlcIdx;
};
static const SubtypeData sSubtypeData[4];
static const char *const sOarcName;
static const char *const sMdlNames[4];
static const char *const sDzbPlcNames[4];
src/REL/d/a/obj/d_a_obj_block_underground.cpp
+40 -39
View File
@@ -18,7 +18,12 @@
SPECIAL_ACTOR_PROFILE(OBJ_BLOCK_UNDERGROUND, dAcOBlockUnderground, fProfile::OBJ_BLOCK_UNDERGROUND, 0x13F, 0, 3);
const s32 dAcOBlockUnderground::sSubtypeIdx[12] = {0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 1, 1};
const dAcOBlockUnderground::SubtypeData dAcOBlockUnderground::sSubtypeData[4] = {
{0, 0, 0},
{1, 1, 1},
{2, 2, 2},
{3, 1, 1},
};
const char *const dAcOBlockUnderground::sOarcName = "MoleBlock";
@@ -46,7 +51,7 @@ const dCcD_SrcCyl dAcOBlockUnderground::sCylSrc = {
};
u32 dAcOBlockUnderground::getCylTgType() {
return 0x20020;
return AT_TYPE_0x20000 | AT_TYPE_BOMB;
}
const char *dAcOBlockUnderground::getOarcName() {
@@ -86,12 +91,12 @@ bool dAcOBlockUnderground::createHeap() {
return false;
}
void *dzb = getOarcDZB(getOarcName(), sDzbPlcNames[getSubtypeIdx()]);
void *dzb = getOarcDZB(getOarcName(), sDzbPlcNames[getMdlDzbPlcIdx()]);
if (dzb == nullptr) {
return false;
}
void *plc = getOarcPLC(getOarcName(), sDzbPlcNames[getSubtypeIdx()]);
void *plc = getOarcPLC(getOarcName(), sDzbPlcNames[getMdlDzbPlcIdx()]);
if (plc == nullptr) {
return false;
}
@@ -101,9 +106,8 @@ bool dAcOBlockUnderground::createHeap() {
return false;
}
if (fn_459_A00()) {
dCcD_Cyl *cyl = new dCcD_Cyl();
mCyl = cyl;
if (hasCyl()) {
mCyl = new dCcD_Cyl();
if (mCyl == nullptr) {
return false;
}
@@ -113,17 +117,14 @@ bool dAcOBlockUnderground::createHeap() {
int dAcOBlockUnderground::actorCreate() {
u8 sceneFlag = getSecondSceneFlag();
if (sceneFlag < 0xff) {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, sceneFlag);
if (flag) {
return FAILED;
}
if (sceneFlag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, sceneFlag)) {
return FAILED;
}
bool success = false;
s32 newSubtype = 0;
u8 currentSubtype = getSubtype();
const s32 *subtype = &sSubtypeIdx[0];
const s32 *subtype = &sSubtypeData[0].mSubtype;
while ((!success && newSubtype <= 3)) {
if (currentSubtype == *subtype) {
success = true;
@@ -141,12 +142,12 @@ int dAcOBlockUnderground::actorCreate() {
updateMatrix();
CREATE_ALLOCATOR(dAcOBlockUnderground);
mMdl.setLocalMtx(mWorldMtx);
mMdl.setPriorityDraw(0x82, 0x7f);
if (fn_459_A00()) {
mMdl.setPriorityDraw(0x82, 0x7F);
if (hasCyl()) {
mStts.SetRank(0xD);
mCyl->Set(sCylSrc);
mCyl->SetStts(mStts);
if (fn_459_9A0()) {
if (shouldSetCylTgType()) {
mCyl->mTg.mSrc.mType = getCylTgType();
}
mCyl->SetC(position);
@@ -168,7 +169,7 @@ int dAcOBlockUnderground::actorPostCreate() {
}
int dAcOBlockUnderground::actorExecute() {
if (fn_459_A00()) {
if (hasCyl()) {
if (mCyl->ChkTgHit()) {
if (mUndergroundRef.p_owner != nullptr) {
mUndergroundRef.get()->fn_458_9D0(mField_0x57C, mField_0x57E);
@@ -176,10 +177,10 @@ int dAcOBlockUnderground::actorExecute() {
if (getSubtype() == 1) {
spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_461_);
dSndSmallEffectMgr_c::GetInstance()->playSoundAtPosition(0xaa6, position);
dSndSmallEffectMgr_c::GetInstance()->playSoundAtPosition(SE_BlockUg_BROKEN_BOMB, position);
} else {
spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_462_);
dSndSmallEffectMgr_c::GetInstance()->playSoundAtPosition(0xaa7, position);
dSndSmallEffectMgr_c::GetInstance()->playSoundAtPosition(SE_BlockUg_BROKEN_CLAW, position);
}
u8 firstSceneFlag = getFirstSceneFlag();
@@ -193,7 +194,7 @@ int dAcOBlockUnderground::actorExecute() {
}
deleteRequest();
} else if (dAcPy_c::GetLink()->checkActionFlagsCont(dAcPy_c::FLG0_SWING_ROPE)) {
} else if (dAcPy_c::GetLink()->checkActionFlagsCont(0x400000)) {
dCcS::GetInstance()->Set(mCyl);
}
}
@@ -201,7 +202,7 @@ int dAcOBlockUnderground::actorExecute() {
}
int dAcOBlockUnderground::draw() {
if (dAcPy_c::GetLink()->checkActionFlagsCont(dAcPy_c::FLG0_SWING_ROPE)) {
if (dAcPy_c::GetLink()->checkActionFlagsCont(0x400000)) {
drawModelType1(&mMdl);
}
return SUCCEEDED;
@@ -219,15 +220,15 @@ void dAcOBlockUnderground::setBlockUndergroundPosition(mVec3_c *pos) {
setPostion(*pos);
updateMatrix();
mMdl.setLocalMtx(mWorldMtx);
if (fn_459_A00()) {
if (hasCyl()) {
mCyl->SetC(*pos);
}
mBgW.Move();
}
void dAcOBlockUnderground::fn_459_840(u16 field_0x57c, u16 field_0x57e) {
mField_0x57C = field_0x57c;
mField_0x57E = field_0x57e;
void dAcOBlockUnderground::fn_459_840(u16 field_0x57C, u16 field_0x57E) {
mField_0x57C = field_0x57C;
mField_0x57E = field_0x57E;
}
u16 dAcOBlockUnderground::getField_0x57C() {
@@ -251,39 +252,39 @@ void dAcOBlockUnderground::setSubtype(u32 subtype) {
}
u8 dAcOBlockUnderground::getSubtype() {
return getFromParams(0, 0xff);
return getFromParams(0, 0xFF);
}
u8 dAcOBlockUnderground::getFirstSceneFlag() {
return getFromParams(8, 0xff);
return getFromParams(8, 0xFF);
}
u8 dAcOBlockUnderground::getSecondSceneFlag() {
return getFromParams(16, 0xff);
return getFromParams(16, 0xFF);
}
u32 dAcOBlockUnderground::fn_459_930() {
return sSubtypeIdx[mSubtype * 3 + 1];
u32 dAcOBlockUnderground::getSubtypeCylVariant() {
return sSubtypeData[mSubtype].mCylVariant;
}
u32 dAcOBlockUnderground::getSubtypeIdx() {
return sSubtypeIdx[mSubtype * 3 + 2];
u32 dAcOBlockUnderground::getMdlDzbPlcIdx() {
return sSubtypeData[mSubtype].mMdlDzbPlcIdx;
}
bool dAcOBlockUnderground::fn_459_970() {
return fn_459_930() == 0;
bool dAcOBlockUnderground::noCyl() {
return getSubtypeCylVariant() == 0;
}
bool dAcOBlockUnderground::fn_459_9A0() {
return fn_459_930() == 2;
bool dAcOBlockUnderground::shouldSetCylTgType() {
return getSubtypeCylVariant() == 2;
}
const char *dAcOBlockUnderground::getMdlName() {
return sMdlNames[getSubtypeIdx()];
return sMdlNames[getMdlDzbPlcIdx()];
}
bool dAcOBlockUnderground::fn_459_A00() {
return !fn_459_970();
bool dAcOBlockUnderground::hasCyl() {
return !noCyl();
}
void dAcOBlockUnderground::spawnEffect(u16 effectResourceId) const {