From 0f3aad940eef81428a4db56c5eb4bd69178572f5 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sat, 22 Nov 2025 00:19:03 -0500 Subject: [PATCH] couple cleanup --- include/d/a/obj/d_a_obj_barrel.h | 4 ++-- src/REL/d/a/obj/d_a_obj_barrel.cpp | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/d/a/obj/d_a_obj_barrel.h b/include/d/a/obj/d_a_obj_barrel.h index 8fee2ca2..32df4f14 100644 --- a/include/d/a/obj/d_a_obj_barrel.h +++ b/include/d/a/obj/d_a_obj_barrel.h @@ -164,8 +164,8 @@ private: /* 0xCA0 */ EffectsStruct mEmitter0; /* 0xCD4 */ EffectsStruct mEmitter1; /* 0xD08 */ dWaterEffect_c mWaterEffect; - /* 0xD70 */ mQuat_c quat_0xD50; - /* 0xD70 */ mQuat_c quat_0xD60; + /* 0xD50 */ mQuat_c quat_0xD50; + /* 0xD60 */ mQuat_c quat_0xD60; /* 0xD70 */ mQuat_c quat_0xD70; /* 0xD80 */ mQuat_c quat_0xD80; /* 0xD90 */ mQuat_c quat_0xD90; diff --git a/src/REL/d/a/obj/d_a_obj_barrel.cpp b/src/REL/d/a/obj/d_a_obj_barrel.cpp index c93eb553..716853af 100644 --- a/src/REL/d/a/obj/d_a_obj_barrel.cpp +++ b/src/REL/d/a/obj/d_a_obj_barrel.cpp @@ -154,6 +154,17 @@ int dAcOBarrel_c::actorCreate() { field_0xE05 = (int)getFromParams(6, 0x3) == 1 && mType == Normal; field_0xE07 = getFromParams(10, 0x3) == 0; + + /** + D300: r06: l0: id:FC 0F params1: 0xFFFA57F0 -> 0x01 (Seed Drops) + D300_1: r08: l0: id:FC 33 params1: 0xFCEFF7F0 -> 0x01 (Bomb Drops) + D300_1: r08: l0: id:FC 37 params1: 0xFCFFF7F0 -> 0x01 (Bomb Drops) + D300_1: r08: l0: id:FC 38 params1: 0xFD0FF7F0 -> 0x01 (Bomb Drops) + D301: r00: l0: id:00 12 params1: 0xFFFFF7F0 -> 0x01 (Arrow Drops) + D301: r00: l0: id:00 13 params1: 0xFFFFF7F0 -> 0x01 (Arrow Drops) + D301: r00: l0: id:00 14 params1: 0xFFFFF7F0 -> 0x01 (Arrow Drops) + D301: r00: l0: id:00 15 params1: 0xFFFFF7F0 -> 0x01 (Arrow Drops) + */ field_0xE0B = getFromParams(10, 0x3) == 1; field_0xE08 = getFromParams(8, 0x3) == 0; @@ -1107,7 +1118,7 @@ void dAcOBarrel_c::fn_293_4200() { dJEffManager_c::spawnEffect( PARTICLE_RESOURCE_ID_MAPPING_474_, emitPosition, nullptr, &mScale, nullptr, nullptr, 0, 0 ) - ->bindShpEmitter(0x15, true); + ->bindShpEmitter(dJEffManager_c::BarrelBomb, true); if (fn_293_4C60()) { dJEffManager_c::spawnEffect( @@ -1125,7 +1136,7 @@ void dAcOBarrel_c::fn_293_4200() { dJEffManager_c::spawnEffect( PARTICLE_RESOURCE_ID_MAPPING_475_, emitPosition, nullptr, &mScale, nullptr, nullptr, 0, 0 ) - ->bindShpEmitter(0x14, true); + ->bindShpEmitter(dJEffManager_c::Barrel, true); if (field_0xE07) { itemDroppingAndGivingRelated(nullptr, 0);