From 1af32c2323674ac644d9a6baa12b9f7c6e41af0a Mon Sep 17 00:00:00 2001 From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Date: Sun, 29 Jun 2025 17:12:46 +0100 Subject: [PATCH] re-enable flare dancers for testing --- soh/soh/Enhancements/enemyrandomizer.cpp | 6 +++--- soh/soh/Enhancements/enemyrandomizer.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp index 2e15a9ed9..ec9168e69 100644 --- a/soh/soh/Enhancements/enemyrandomizer.cpp +++ b/soh/soh/Enhancements/enemyrandomizer.cpp @@ -36,7 +36,7 @@ const char* enemyCVarList[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = { CVAR_ENHANCEMENT("RandomizedEnemyList.BlueTektite"), CVAR_ENHANCEMENT("RandomizedEnemyList.Bubble"), CVAR_ENHANCEMENT("RandomizedEnemyList.ClubMoblin"), CVAR_ENHANCEMENT("RandomizedEnemyList.DarkLink"), CVAR_ENHANCEMENT("RandomizedEnemyList.Dinolfos"), CVAR_ENHANCEMENT("RandomizedEnemyList.Dodongo"), - CVAR_ENHANCEMENT("RandomizedEnemyList.FireKeese"), /*CVAR_ENHANCEMENT("RandomizedEnemyList.FlareDancer"),*/ + CVAR_ENHANCEMENT("RandomizedEnemyList.FireKeese"), CVAR_ENHANCEMENT("RandomizedEnemyList.FlareDancer"), CVAR_ENHANCEMENT("RandomizedEnemyList.FloorTile"), CVAR_ENHANCEMENT("RandomizedEnemyList.Floormaster"), CVAR_ENHANCEMENT("RandomizedEnemyList.FlyingPeahat"), CVAR_ENHANCEMENT("RandomizedEnemyList.FlyingPot"), CVAR_ENHANCEMENT("RandomizedEnemyList.Freezard"), CVAR_ENHANCEMENT("RandomizedEnemyList.Gibdo"), @@ -75,7 +75,7 @@ const char* enemyNameList[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = { "Dinolfos", "Dodongo", "Fire Keese", - //"Flare Dancer", + "Flare Dancer", "Floor Tile", "Floormaster", "Flying Peahat", @@ -132,7 +132,7 @@ static EnemyEntry randomizedEnemySpawnTable[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = { ACTOR_EN_ZF, -2 }, // Dinolfos { ACTOR_EN_DODONGO, -1 }, // Dodongo { ACTOR_EN_FIREFLY, 1 }, // Fire Keese - // { ACTOR_EN_FD, 0 }, // Flare Dancer (possible cause of crashes because of spawning flame actors on + { ACTOR_EN_FD, 0 }, // Flare Dancer (possible cause of crashes because of spawning flame actors on // sloped ground) { ACTOR_EN_YUKABYUN, 0 }, // Flying Floor Tile { ACTOR_EN_FLOORMAS, 0 }, // Floormaster diff --git a/soh/soh/Enhancements/enemyrandomizer.h b/soh/soh/Enhancements/enemyrandomizer.h index 9220f2db0..c42b9da60 100644 --- a/soh/soh/Enhancements/enemyrandomizer.h +++ b/soh/soh/Enhancements/enemyrandomizer.h @@ -3,7 +3,7 @@ #include #include "item-tables/ItemTableTypes.h" -#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 52 +#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 53 extern const char* enemyCVarList[]; extern const char* enemyNameList[];