diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp index fa5ef910e..b9923a2c9 100644 --- a/soh/soh/Enhancements/enemyrandomizer.cpp +++ b/soh/soh/Enhancements/enemyrandomizer.cpp @@ -31,7 +31,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"), @@ -70,7 +70,7 @@ const char* enemyNameList[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = { "Dinolfos", "Dodongo", "Fire Keese", - "Flare Dancer", + //"Flare Dancer", "Floor Tile", "Floormaster", "Flying Peahat", @@ -127,8 +127,8 @@ 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 (jumps out of bounds a lot, and possible cause of crashes because of spawning a - // ton of flame actors) + // { 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 { ACTOR_EN_PEEHAT, -1 }, // Flying Peahat (big grounded, doesn't spawn larva) @@ -151,11 +151,11 @@ static EnemyEntry randomizedEnemySpawnTable[RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE] = // { ACTOR_EN_OKUTA, 0 }, // Octorok { ACTOR_EN_PEEHAT, 1 }, // Flying Peahat Larva // Doesn't work (Seems to rely on other objects?) - //{ ACTOR_EN_POH, 0 }, // Poe + // { ACTOR_EN_POH, 0 }, // Poe // Doesn't work (Seems to rely on other objects?) - //{ ACTOR_EN_POH, 2 }, // Poe (composer Sharp) + // { ACTOR_EN_POH, 2 }, // Poe (composer Sharp) // Doesn't work (Seems to rely on other objects?) - //{ ACTOR_EN_POH, 3 }, // Poe (composer Flat) + // { ACTOR_EN_POH, 3 }, // Poe (composer Flat) { ACTOR_EN_RD, 1 }, // Redead (standing) { ACTOR_EN_TITE, -1 }, // Tektite (red) { ACTOR_EN_BUBBLE, 0 }, // Shabom (bubble) diff --git a/soh/soh/Enhancements/enemyrandomizer.h b/soh/soh/Enhancements/enemyrandomizer.h index 37ce8990c..d73930831 100644 --- a/soh/soh/Enhancements/enemyrandomizer.h +++ b/soh/soh/Enhancements/enemyrandomizer.h @@ -2,7 +2,7 @@ #include -#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 53 +#define RANDOMIZED_ENEMY_SPAWN_TABLE_SIZE 52 extern const char* enemyCVarList[]; extern const char* enemyNameList[]; diff --git a/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 50ac7e11b..26804d718 100644 --- a/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -6,6 +6,7 @@ #include "z_en_mb.h" #include "objects/object_mb/object_mb.h" +#include "soh/Enhancements/enhancementTypes.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ResourceManagerHelpers.h" @@ -279,6 +280,11 @@ void EnMb_Init(Actor* thisx, PlayState* play) { case ENMB_TYPE_SPEAR_GUARD: SkelAnime_InitFlex(play, &this->skelAnime, &gEnMbSpearSkel, &gEnMbSpearStandStillAnim, this->jointTable, this->morphTable, 28); + + if (CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), ENEMY_RANDOMIZER_OFF) != ENEMY_RANDOMIZER_OFF) { + Actor_SetScale(&this->actor, 0.014f); + } + this->actor.colChkInfo.health = 2; this->actor.colChkInfo.mass = MASS_HEAVY; this->maxHomeDist = 1000.0f;