From 8a9d164384858410d7704032a8b0b37d1bd32bce Mon Sep 17 00:00:00 2001
From: elijah-thomas774 <elijahthomas774@gmail.com>
Date: Sat, 22 Nov 2025 15:09:13 -0500
Subject: [PATCH] fixup rebase

---
 include/d/a/obj/d_a_obj_barrel.h   | 4 ++--
 include/m/m_angle.h                | 3 ---
 src/REL/d/a/obj/d_a_obj_barrel.cpp | 4 ++--
 src/d/lyt/d_lyt_map_markers.cpp    | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/d/a/obj/d_a_obj_barrel.h b/include/d/a/obj/d_a_obj_barrel.h
index 32df4f14..969014e8 100644
--- a/include/d/a/obj/d_a_obj_barrel.h
+++ b/include/d/a/obj/d_a_obj_barrel.h
@@ -161,8 +161,8 @@ private:
     /* 0xC7C */ TimeAreaStruct mTimeArea;
     /* 0xC88 */ dAcRef_c<dAcNpcCeLady_c> mCeLady;
     /* 0xC94 */ dAcRef_c<dAcNpcCeFriend_c> mCeFriend;
-    /* 0xCA0 */ EffectsStruct mEmitter0;
-    /* 0xCD4 */ EffectsStruct mEmitter1;
+    /* 0xCA0 */ dEmitter_c mEmitter0;
+    /* 0xCD4 */ dEmitter_c mEmitter1;
     /* 0xD08 */ dWaterEffect_c mWaterEffect;
     /* 0xD50 */ mQuat_c quat_0xD50;
     /* 0xD60 */ mQuat_c quat_0xD60;
diff --git a/include/m/m_angle.h b/include/m/m_angle.h
index a6d8fe0f..3fb0ca39 100644
--- a/include/m/m_angle.h
+++ b/include/m/m_angle.h
@@ -36,9 +36,6 @@ struct mAng {
     void set(s16 val) {
         mVal = val;
     }
-    void setF(const f32 &val) {
-        mVal = val;
-    }
 
     s16 *ref() {
         return &mVal;
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 716853af..415c17aa 100644
--- a/src/REL/d/a/obj/d_a_obj_barrel.cpp
+++ b/src/REL/d/a/obj/d_a_obj_barrel.cpp
@@ -1433,8 +1433,8 @@ void dAcOBarrel_c::fn_293_5910() {
         return;
     }
 
-    mEmitter0.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_515_, mPosition, nullptr, &scale, nullptr, nullptr);
-    mEmitter1.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_516_, mPosition, nullptr, &scale, nullptr, nullptr);
+    mEmitter0.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_515_, mPosition, nullptr, &scale, nullptr, nullptr);
+    mEmitter1.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_516_, mPosition, nullptr, &scale, nullptr, nullptr);
 }
 
 struct T {
diff --git a/src/d/lyt/d_lyt_map_markers.cpp b/src/d/lyt/d_lyt_map_markers.cpp
index 07b48e47..ab0ab0b0 100644
--- a/src/d/lyt/d_lyt_map_markers.cpp
+++ b/src/d/lyt/d_lyt_map_markers.cpp
@@ -897,9 +897,9 @@ void dLytMapIcon01_c::draw() {
                             mVec3_c rotate(0.0f, 0.0f, 0.0f);
                             if (dLytMapGlobal_c::GetInstance()->getField_0x55() != 0) {
                                 dAcPy_c *link = getLinkPtr();
-                                rotate.z = (link->vt_0x19C() + link->mRotation.y + (-mapRot)).degree2();
+                                rotate.z = mAng(link->mRotation.y + link->vt_0x19C() + -mapRot).degree2();
                             } else {
-                                rotate.z = (field_0x0D3A + (-mapRot)).degree2();
+                                rotate.z = mAng(field_0x0D3A + -mapRot).degree2();
                             }
                             pane->SetRotate(rotate);
                             pane = pane->GetParent();
@@ -907,7 +907,7 @@ void dLytMapIcon01_c::draw() {
                         }
                         case MAP_ICON_01_PANE_DOOR_000:
                         case MAP_ICON_01_PANE_START_000: {
-                            mVec3_c rotate(0.0f, 0.0f, ((-mapRot) + commandRot).degree2());
+                            mVec3_c rotate(0.0f, 0.0f, mAng(-mapRot + commandRot).degree2());
                             pane->SetRotate(rotate);
                             pane = mpPanes[paneIdx]->GetParent();
                             break;