mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 05:22:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add enums for items and disappears

Browse Source
This commit is contained in:
LagoLunatic
2025-01-11 19:15:36 -05:00
parent 24fab1a52a
commit d330c1e68a
8 changed files with 159 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_disappear.cpp
+13 -13
View File
@@ -21,22 +21,22 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
i_this->mTimer--;
if (i_this->mTimer == 0) {
s8 health = i_this->health; // TODO: add enum for disappear types (stored in health)
s8 dropType = i_this->health;
if (health != 1 && health != 3) {
if (health == 2) {
fopAcM_createItemForBoss(&i_this->current.pos, 0, i_this->current.roomNo, &i_this->current.angle);
if (dropType != daDisItem_NONE1_e && dropType != daDisItem_NONE3_e) {
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 (health >= 0x0A && health <= 0x0D) {
else if (dropType >= daDisItem_HEART_e && dropType <= daDisItem_UNK13_e) {
// Special type for Keese (ki) spawned in the Puppet Ganon fight.
if (health < 0x0D) {
static u32 ki_item_d[] = {
dItem_HEART_e,
L_MAGIC,
ARROW_10,
};
fopAcM_createItem(&i_this->current.pos, ki_item_d[health - 0xA], -1, -1, 0, NULL, 4);
// This also seems to be used by several other enemies, such as Molgera's spawn.
static u32 ki_item_d[] = {
dItem_HEART_e,
L_MAGIC,
ARROW_10,
};
if (dropType < daDisItem_HEART_e + (int)ARRAY_SIZE(ki_item_d)) {
fopAcM_createItem(&i_this->current.pos, ki_item_d[dropType - daDisItem_HEART_e], -1, -1, daItemType_0_e, NULL, daItemAct_4_e);
}
}
else {