From cd32181415c748bd42e010727a02f436e9dfa3ad Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Thu, 12 Jun 2025 22:41:19 -0700
Subject: [PATCH] Fix incorrect merge conflict resolution.

---
 soh/soh/Enhancements/enemyrandomizer.cpp | 7 ++++++-
 soh/soh/Enhancements/enemyrandomizer.h   | 9 ---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp
index 2191563f5..2e15a9ed9 100644
--- a/soh/soh/Enhancements/enemyrandomizer.cpp
+++ b/soh/soh/Enhancements/enemyrandomizer.cpp
@@ -18,9 +18,14 @@ extern "C" {
 #define CVAR_ENEMY_RANDOMIZER_DEFAULT ENEMY_RANDOMIZER_OFF
 #define CVAR_ENEMY_RANDOMIZER_VALUE CVarGetInteger(CVAR_ENEMY_RANDOMIZER_NAME, CVAR_ENEMY_RANDOMIZER_DEFAULT)
 
+typedef struct EnemyEntry {
+    int16_t id;
+    int16_t params;
+} EnemyEntry;
+
 bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, int16_t params, float posX);
 bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy);
-EnemyEntry GetRandomizedEnemyEntry(uint32_t seed);
+EnemyEntry GetRandomizedEnemyEntry(uint32_t seed, PlayState* play);
 
 const char* enemyCVarList[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = {
     CVAR_ENHANCEMENT("RandomizedEnemyList.Anubis"),       CVAR_ENHANCEMENT("RandomizedEnemyList.Armos"),
diff --git a/soh/soh/Enhancements/enemyrandomizer.h b/soh/soh/Enhancements/enemyrandomizer.h
index cf01eec03..9220f2db0 100644
--- a/soh/soh/Enhancements/enemyrandomizer.h
+++ b/soh/soh/Enhancements/enemyrandomizer.h
@@ -3,17 +3,8 @@
 #include <libultraship/libultra/types.h>
 #include "item-tables/ItemTableTypes.h"
 
-typedef struct EnemyEntry {
-    int16_t id;
-    int16_t params;
-} EnemyEntry;
-
 #define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 52
 
-bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId, int16_t params, float posX);
-bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy);
-EnemyEntry GetRandomizedEnemyEntry(uint32_t seed, PlayState* play);
-
 extern const char* enemyCVarList[];
 extern const char* enemyNameList[];
 extern void GetSelectedEnemies();