summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_disappear.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-05-09 16:34:02 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2025-05-09 16:34:02 -0400
commit36fec0f7fddea841b5955cd4b5915015e416d8d8 (patch)
tree7e38466d3cb9a64a580ebc1f2e5b5d970dabe617 /src/d/actor/d_a_disappear.cpp
parent95f230eb155fe5aa35ef107bc418281b1071052b (diff)
Disappear drop type cleanup
Diffstat (limited to 'src/d/actor/d_a_disappear.cpp')
-rw-r--r--src/d/actor/d_a_disappear.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index 14948284..9fdb963f 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -27,7 +27,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
if (dropType == daDisItem_HEART_CONTAINER_e) {
fopAcM_createItemForBoss(&i_this->current.pos, 0, i_this->current.roomNo, &i_this->current.angle, NULL, 0);
}
- else if (dropType >= daDisItem_HEART_e && dropType <= daDisItem_UNK13_e) {
+ else if (dropType >= daDisItem_HEART_e && dropType <= daDisItem_NONE13_e) {
// Special type for Keese (ki) spawned in the Puppet Ganon fight.
// This also seems to be used by several other enemies, such as Molgera's spawn.
static u32 ki_item_d[] = {
@@ -101,7 +101,7 @@ static cPhs_State daDisappear_Create(fopAc_ac_c* i_this) {
fopAcM_SetupActor(dis, disappear_class);
- dis->health = fopAcM_GetParam(dis) & 0xFF;
+ dis->health = fopAcM_GetParam(dis) & 0xFF; // Drop type param is stored in health
f32 scaleMag = ((fopAcM_GetParam(dis) >> 8) & 0xFF) * 0.1f;
dis->mItemBitNo = (fopAcM_GetParam(dis) >> 0x10) & 0xFF;