From 0641da1ef7336b742dc4081e9305ec487bb98eda Mon Sep 17 00:00:00 2001
From: Cuyler36 <jeremy96@vt.edu>
Date: Mon, 11 Mar 2024 03:17:40 -0400
Subject: [PATCH] Merge effects in same TU

---
 src/ef_flash.c          | 28 +++++++++++++++++++++
 src/ef_flashC.c         | 29 ---------------------
 src/ef_make_hem.c       | 56 +++++++++++++++++++++++++++++++++++++++++
 src/ef_make_hem_kira.c  | 29 ---------------------
 src/ef_make_hem_light.c | 29 ---------------------
 5 files changed, 84 insertions(+), 87 deletions(-)
 delete mode 100644 src/ef_flashC.c
 delete mode 100644 src/ef_make_hem_kira.c
 delete mode 100644 src/ef_make_hem_light.c

diff --git a/src/ef_flash.c b/src/ef_flash.c
index 8adabd13..a6a3d756 100644
--- a/src/ef_flash.c
+++ b/src/ef_flash.c
@@ -27,3 +27,31 @@ eEC_PROFILE_c iam_ef_flash = {
     eEC_IGNORE_DEATH_DIST,
     // clang-format on
 };
+
+static void eFlashC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
+    // TODO
+}
+
+static void eFlashC_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
+    // TODO
+}
+
+static void eFlashC_mv(eEC_Effect_c* effect, GAME* game) {
+    // TODO
+}
+
+static void eFlashC_dw(eEC_Effect_c* effect, GAME* game) {
+    // TODO
+}
+
+eEC_PROFILE_c iam_ef_flashC = {
+    // clang-format off
+    &eFlashC_init,
+    &eFlashC_ct,
+    &eFlashC_mv,
+    &eFlashC_dw,
+    eEC_IGNORE_DEATH,
+    eEC_NO_CHILD_ID,
+    eEC_IGNORE_DEATH_DIST,
+    // clang-format on
+};
diff --git a/src/ef_flashC.c b/src/ef_flashC.c
deleted file mode 100644
index cfe55fc7..00000000
--- a/src/ef_flashC.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "ef_effect_control.h"
-
-static void eFlashC_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
-    // TODO
-}
-
-static void eFlashC_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
-    // TODO
-}
-
-static void eFlashC_mv(eEC_Effect_c* effect, GAME* game) {
-    // TODO
-}
-
-static void eFlashC_dw(eEC_Effect_c* effect, GAME* game) {
-    // TODO
-}
-
-eEC_PROFILE_c iam_ef_flashC = {
-    // clang-format off
-    &eFlashC_init,
-    &eFlashC_ct,
-    &eFlashC_mv,
-    &eFlashC_dw,
-    eEC_IGNORE_DEATH,
-    eEC_NO_CHILD_ID,
-    eEC_IGNORE_DEATH_DIST,
-    // clang-format on
-};
diff --git a/src/ef_make_hem.c b/src/ef_make_hem.c
index df8dd553..db4a2d27 100644
--- a/src/ef_make_hem.c
+++ b/src/ef_make_hem.c
@@ -27,3 +27,59 @@ eEC_PROFILE_c iam_ef_make_hem = {
     eEC_IGNORE_DEATH_DIST,
     // clang-format on
 };
+
+static void eMHK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
+    // TODO
+}
+
+static void eMHK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
+    // TODO
+}
+
+static void eMHK_mv(eEC_Effect_c* effect, GAME* game) {
+    // TODO
+}
+
+static void eMHK_dw(eEC_Effect_c* effect, GAME* game) {
+    // TODO
+}
+
+eEC_PROFILE_c iam_ef_make_hem_kira = {
+    // clang-format off
+    &eMHK_init,
+    &eMHK_ct,
+    &eMHK_mv,
+    &eMHK_dw,
+    eEC_IGNORE_DEATH,
+    eEC_NO_CHILD_ID,
+    eEC_IGNORE_DEATH_DIST,
+    // clang-format on
+};
+
+static void eMHL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
+    // TODO
+}
+
+static void eMHL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
+    // TODO
+}
+
+static void eMHL_mv(eEC_Effect_c* effect, GAME* game) {
+    // TODO
+}
+
+static void eMHL_dw(eEC_Effect_c* effect, GAME* game) {
+    // TODO
+}
+
+eEC_PROFILE_c iam_ef_make_hem_light = {
+    // clang-format off
+    &eMHL_init,
+    &eMHL_ct,
+    &eMHL_mv,
+    &eMHL_dw,
+    195,
+    eEC_NO_CHILD_ID,
+    eEC_IGNORE_DEATH_DIST,
+    // clang-format on
+};
diff --git a/src/ef_make_hem_kira.c b/src/ef_make_hem_kira.c
deleted file mode 100644
index 153485af..00000000
--- a/src/ef_make_hem_kira.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "ef_effect_control.h"
-
-static void eMHK_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
-    // TODO
-}
-
-static void eMHK_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
-    // TODO
-}
-
-static void eMHK_mv(eEC_Effect_c* effect, GAME* game) {
-    // TODO
-}
-
-static void eMHK_dw(eEC_Effect_c* effect, GAME* game) {
-    // TODO
-}
-
-eEC_PROFILE_c iam_ef_make_hem_kira = {
-    // clang-format off
-    &eMHK_init,
-    &eMHK_ct,
-    &eMHK_mv,
-    &eMHK_dw,
-    eEC_IGNORE_DEATH,
-    eEC_NO_CHILD_ID,
-    eEC_IGNORE_DEATH_DIST,
-    // clang-format on
-};
diff --git a/src/ef_make_hem_light.c b/src/ef_make_hem_light.c
deleted file mode 100644
index 7d8d13b3..00000000
--- a/src/ef_make_hem_light.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "ef_effect_control.h"
-
-static void eMHL_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
-    // TODO
-}
-
-static void eMHL_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
-    // TODO
-}
-
-static void eMHL_mv(eEC_Effect_c* effect, GAME* game) {
-    // TODO
-}
-
-static void eMHL_dw(eEC_Effect_c* effect, GAME* game) {
-    // TODO
-}
-
-eEC_PROFILE_c iam_ef_make_hem_light = {
-    // clang-format off
-    &eMHL_init,
-    &eMHL_ct,
-    &eMHL_mv,
-    &eMHL_dw,
-    195,
-    eEC_NO_CHILD_ID,
-    eEC_IGNORE_DEATH_DIST,
-    // clang-format on
-};