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

Object Property Enum

Browse Source
This commit is contained in:
elijah-thomas774
2025-09-16 21:55:32 -04:00
parent d591961dbd
commit 0a2b38da2b
16 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp
+3 -3
View File
@@ -94,7 +94,7 @@ int dAcOF400GateSeal_c::actorExecute() {
f32 frame = mAnmClr.getFrameStart(0);
mAnmClr.setFrame(frame, 0);
} else {
if (checkObjectProperty(2)) {
if (checkObjectProperty(OBJ_PROP_0x2)) {
f32 frame = mAnmClr.getFrameMax(0);
mAnmClr.setFrame(frame, 0);
} else {
@@ -102,9 +102,9 @@ int dAcOF400GateSeal_c::actorExecute() {
}
}
if (mAnmClr.isStop(0)) {
setObjectProperty(0x200);
setObjectProperty(OBJ_PROP_0x200);
} else {
unsetObjectProperty(0x200);
unsetObjectProperty(OBJ_PROP_0x200);
}
return SUCCEEDED;
}
src/REL/d/a/obj/d_a_obj_amber.cpp
+2 -2
View File
@@ -70,10 +70,10 @@ int dAcOAmber_c::draw() {
void dAcOAmber_c::registerInEvent() {
const char *eventName = EventManager::sInstance->getCurrentEventName();
if (strequals(eventName, "TimeDoorIn") || strequals(eventName, "TimeDoorOut")) {
mObjectActorFlags |= 0x200;
setObjectProperty(OBJ_PROP_0x200);
}
}
void dAcOAmber_c::unkVirtFunc_0x6C() {
mObjectActorFlags &= ~0x200;
unsetObjectProperty(OBJ_PROP_0x200);
}
src/REL/d/a/obj/d_a_obj_chair.cpp
+5 -5
View File
@@ -134,7 +134,7 @@ int dAcOChair_c::actorExecute() {
mStateMgr.executeState();
// Calculate the HealCooldown (Heal link if needed)
if (!checkObjectProperty(0x8000)) {
if (!checkObjectProperty(OBJ_PROP_0x8000)) {
if (!isBench()) {
mCyl.SetC(getPosition());
dCcS::GetInstance()->Set(&mCyl);
@@ -148,7 +148,7 @@ int dAcOChair_c::actorExecute() {
}
// Set the flag that link is sitting
if (checkObjectProperty(0x8000) && isPlayerSitting()) {
if (checkObjectProperty(OBJ_PROP_0x8000) && isPlayerSitting()) {
if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
SceneflagManager::sInstance->setFlag(mRoomID, mSceneflag);
}
@@ -159,7 +159,7 @@ int dAcOChair_c::actorExecute() {
}
if (!isBench()) {
if (isChairTypeIdk0() && !checkObjectProperty(0x8000)) {
if (isChairTypeIdk0() && !checkObjectProperty(OBJ_PROP_0x8000)) {
if (sLib::absDiff(getRotation().y, getXZAngleToPlayer()) > 910) {
getRotation().y = getXZAngleToPlayer();
}
@@ -173,7 +173,7 @@ int dAcOChair_c::actorExecute() {
mMdl.setLocalMtx(mWorldMtx);
mMdl.calc(false);
} else {
if (isChairTypeIdk0() && !checkObjectProperty(0x8000)) {
if (isChairTypeIdk0() && !checkObjectProperty(OBJ_PROP_0x8000)) {
if (sLib::absDiff(getRotation().y, getXZAngleToPlayer()) > 910) {
getRotation().y = getXZAngleToPlayer();
}
@@ -251,7 +251,7 @@ void dAcOChair_c::updateChairPos() {
mPositionCopy3 = mPositionCopy2;
} else {
field_0xB1A = true;
if (!checkObjectProperty(0x8000)) {
if (!checkObjectProperty(OBJ_PROP_0x8000)) {
mVec3_c work = mVec3_c::Ez * getDistToPlayer();
work.rotY(getRelativeYRotationToPlayer());
work.z = 0.f;
src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp
+5 -5
View File
@@ -89,10 +89,10 @@ int dAcOFlyingClawshotTarget_c::actorExecute() {
f32 dist_to = markPoint.squareDistance(player->mPosition);
if (checkObjectProperty(0x4)) {
if (checkObjectProperty(OBJ_PROP_0x4)) {
player->vt_0x0DC(this, mMarkPoint);
}
if (checkObjectProperty(0x4) && dist_to < 2500.f &&
if (checkObjectProperty(OBJ_PROP_0x4) && dist_to < 2500.f &&
(player->checkActionFlagsCont(0x10000000) || player->checkActionFlagsCont(0x20000000))) {
static mVec3_c vec = -mVec3_c::Ey;
mVec3_c v2;
@@ -125,7 +125,7 @@ int dAcOFlyingClawshotTarget_c::actorExecute() {
switch (mState) {
case 0: {
if (checkObjectProperty(0x4)) {
if (checkObjectProperty(OBJ_PROP_0x4)) {
if (player->checkActionFlagsCont(0x10000000) || player->checkActionFlagsCont(0x20000000)) {
mState = 2;
} else {
@@ -134,7 +134,7 @@ int dAcOFlyingClawshotTarget_c::actorExecute() {
}
} break;
case 1: {
if (checkObjectProperty(0x4)) {
if (checkObjectProperty(OBJ_PROP_0x4)) {
if (player->checkActionFlagsCont(0x10000000) || player->checkActionFlagsCont(0x20000000)) {
mState = 2;
}
@@ -143,7 +143,7 @@ int dAcOFlyingClawshotTarget_c::actorExecute() {
}
} break;
case 2: {
if (!checkObjectProperty(0x4)) {
if (!checkObjectProperty(OBJ_PROP_0x4)) {
mState = 0;
}
} break;
src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
+2 -2
View File
@@ -808,7 +808,7 @@ void dAcOivyRope_c::fn_256_D1B0() {
}
void dAcOivyRope_c::fn_256_D2B0() {
if (checkObjectProperty(0x1)) {
if (checkObjectProperty(OBJ_PROP_0x1)) {
return;
}
@@ -1124,7 +1124,7 @@ void dAcOivyRope_c::fn_256_E3E0() {
mField_0x1039 = fn_256_DF30();
} break;
case 5: {
if (checkObjectProperty(0x1)) {
if (checkObjectProperty(OBJ_PROP_0x1)) {
mField_0x1039 = 2;
} else {
for (int i = 0; i < 0x23; i++) {
src/REL/d/a/obj/d_a_obj_rope_base.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ int dAcOropeBase_c::doDelete() {
}
int dAcOropeBase_c::actorExecute() {
if (checkObjectProperty(2)) {
if (checkObjectProperty(OBJ_PROP_0x2)) {
field_0x35C = true;
} else {
field_0x35C = false;
src/REL/d/a/obj/d_a_obj_stream_lava.cpp
+2 -2
View File
@@ -109,10 +109,10 @@ int dAcOstreamLava_c::actorExecute() {
dRoom_c *currentRoom = dStage_c::GetInstance()->getRoom(mRoomID);
if (currentRoom->checkFlag(2)) {
setObjectProperty(0x200);
setObjectProperty(OBJ_PROP_0x200);
return SUCCEEDED;
} else {
unsetObjectProperty(0x200);
unsetObjectProperty(OBJ_PROP_0x200);
return SUCCEEDED;
}
}
src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ int dAcOTarzanPole_c::actorExecute() {
const dAcPy_c *player = dAcPy_c::GetLink();
bool bVar = false;
if (mCollider.ChkTgHit() && mCollider.ChkTgAtHitType(AT_TYPE_WHIP)) {
setObjectProperty(0x1000);
setObjectProperty(OBJ_PROP_0x1000);
}
mVec = mVec3_c::Ex * sXOffset + mVec3_c::Ey * sYOffset;
src/REL/d/a/obj/d_a_obj_tubo.cpp
+3 -3
View File
@@ -404,7 +404,7 @@ void dAcOtubo_c::initializeState_Rebirth() {
mSph.ClrCoSet();
mSph.ClrTgSet();
setObjectProperty(0x200);
setObjectProperty(OBJ_PROP_0x200);
getLinkage().fn_80050EA0(this);
int item_drop_table = getParams2UpperByte();
@@ -426,7 +426,7 @@ void dAcOtubo_c::executeState_Rebirth() {
case 0: count = dAcItem_c::getTotalArrowCount(); break;
case 1: count = dAcItem_c::getTotalSeedCount(); break;
}
if (checkObjectProperty(0x2) && count <= 3) {
if (checkObjectProperty(OBJ_PROP_0x2) && count <= 3) {
if (sLib::calcTimer(&mTimer_0x9E8) == 0) {
mStateMgr.changeState(StateID_Wait);
}
@@ -438,7 +438,7 @@ void dAcOtubo_c::finalizeState_Rebirth() {
mSph.OnCoSet();
mSph.OnTgSet();
mpPosition = &mPosition;
unsetObjectProperty(0x200);
unsetObjectProperty(OBJ_PROP_0x200);
setActorProperty(AC_PROP_0x1);
}
src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+1 -2
View File
@@ -129,8 +129,7 @@ int dAcOTumbleWeed_c::actorExecute() {
}
adjustTimeScale();
// TODO(mObjectActorFlags)
if (checkObjectProperty(0x2)) {
if (checkObjectProperty(OBJ_PROP_0x2)) {
// Weak function not being placed right
if (sLib::calcTimer(&mTumbleTimer) == 0) {
killNoItemDrop();