More cleanups

include/d/a/d_a_item.h

@@ -17,7 +17,7 @@
 #include "s/s_State.hpp"
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/dowsing_target.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcItem_0xB34 {
 public:

include/d/a/obj/d_a_obj_arrow.h

@@ -9,7 +9,7 @@
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
 #include "s/s_StateID.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcArrow_c : public dAcObjBase_c {
 public:

include/d/a/obj/d_a_obj_bomb.h

@@ -13,7 +13,7 @@
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
 #include "s/s_StateID.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 // This may need its own file and could be independent of a bomb
 class UnkBombColInfo : public cBgS_PolyInfo {

include/d/a/obj/d_a_obj_dungeon_ship.h

@@ -13,7 +13,7 @@
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/actor_on_rail.h"
 #include "toBeSorted/dowsing_target.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 #include "toBeSorted/time_proc.h"
 
 class dAcODungeonShip_c : public dAcObjBase_c {

include/d/a/obj/d_a_obj_seat_sword.h

@@ -17,7 +17,7 @@
 #include "s/s_StateMgr.hpp"
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/attention.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcOSeatSword_c : public dAcObjBase_c {
 public:

include/d/a/obj/d_a_obj_tower_gearD101.h

@@ -9,7 +9,7 @@
 #include "m/m_vec.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 /**
  * A callback implementation that controls the button node in the switch model.

include/d/a/obj/d_a_obj_tower_hand_D101.h

@@ -13,7 +13,7 @@
 #include "s/s_State.hpp"
 #include "s/s_StateMgr.hpp"
 #include "toBeSorted/actor_event.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 
 class dAcOTowerHandD101_c : public dAcObjBase_c {

include/d/a/obj/d_a_obj_triforce.h

@@ -8,7 +8,7 @@
 #include "m/m3d/m_smdl.h"
 #include "m/m_angle.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcOtriforce_c : public dAcObjBase_c {
 public:

include/d/a/obj/d_a_obj_tubo.h

@@ -15,7 +15,7 @@
 #include "m/m_vec.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcOtubo_c : public dAcObjBase_c {
 public:

include/d/d_cs_game.h

@@ -9,7 +9,7 @@
 #include "s/s_FStateID.hpp"
 #include "s/s_State.hpp"
 #include "s/s_StateID.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 struct CsGameConfigMaybe {
     CsGameConfigMaybe();

include/d/lyt/meter/d_lyt_meter_item_select.h

@@ -8,7 +8,7 @@
 #include "d/lyt/d_window.h"
 #include "nw4r/lyt/lyt_pane.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dLytMeterItemSelectIcon_c {
 public:

include/d/lyt/meter/d_lyt_meter_minus_btn.h

@@ -7,7 +7,7 @@
 #include "d/lyt/d_window.h"
 #include "nw4r/lyt/lyt_pane.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 // At 0x8, [8], size 0x48
 class dLytMeterMinusBtnMenuIcon_c {