mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-01 09:32:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

match actorCreate

Browse Source
This commit is contained in:
lepelog
2025-12-04 14:54:25 +01:00
parent 71b1bfa6d1
commit e995c184e1
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/t/d_t_insect.h
+3 -21
View File
@@ -87,31 +87,13 @@ private:
return isSubtype(10);
}
bool isTrialGateType() const {
if (getSubtype() != SUBTYPE_BUTTERFLY) {
return false;
}
if (getSpawnSubtype() != SPAWN_TRIAL_GATE) {
return false;
}
return true;
return getSubtype() != SUBTYPE_BUTTERFLY ? false : getSpawnSubtype() == SPAWN_TRIAL_GATE;
}
bool isGossipStoneType() const {
if (!isButterfly()) {
return false;
}
if (!isSpawnSubtype(SPAWN_GOSSIP_STONE)) {
return false;
}
return true;
return getSubtype() != SUBTYPE_BUTTERFLY ? false : getSpawnSubtype() == SPAWN_GOSSIP_STONE;
}
bool isGoddessWallType() const {
if (!isButterfly()) {
return false;
}
if (!isSpawnSubtype(SPAWN_GODDESS_WALL)) {
return false;
}
return true;
return getSubtype() != SUBTYPE_BUTTERFLY ? false : getSpawnSubtype() == SPAWN_GODDESS_WALL;
}
f32 getOriginalScaleX() const {
return 100 * mScale.x;
src/REL/d/t/d_t_insect.cpp
-3
View File
@@ -45,7 +45,6 @@ const s32 *useUnused() {
return unused;
}
// non matching
int dTgInsect_c::actorCreate() {
if (getSubtype() == 0) {
return FAILED;
@@ -67,8 +66,6 @@ int dTgInsect_c::actorCreate() {
mScale *= 0.01f;
mRevealed = 0;
mRevealedSpawnPos = mPosition;
// non matching: load of 0 in r0
// that is already 0
if (isTrialGateType() || isGossipStoneType() || isGoddessWallType() || isSpawnSubtype(SPAWN_BUG_MINIGAME)) {
unk24E = 1;
}