mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-21 16:16:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

couple cleanup

Browse Source
This commit is contained in:
elijah-thomas774
2025-11-22 00:19:03 -05:00
parent 758f116575
commit 0f3aad940e
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/obj/d_a_obj_barrel.h
+2 -2
View File
@@ -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;
src/REL/d/a/obj/d_a_obj_barrel.cpp
+13 -2
View File
@@ -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);