bump version

Co-authored-by: aMannus <mannusmenting@gmail.com>

CMakeLists.txt

@@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
 
 project(Ship LANGUAGES C CXX
-	VERSION 5.1.2)
-set(PROJECT_BUILD_NAME "BRADLEY CHARLIE" CACHE STRING "")
+	VERSION 5.1.3)
+set(PROJECT_BUILD_NAME "BRADLEY DELTA" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

soh/soh/Enhancements/enemyrandomizer.cpp

@@ -259,6 +259,10 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId,
                 // Only randomize the initial deku scrub actor (single and triple attack), not the flower they spawn.
                 case ACTOR_EN_DEKUNUTS:
                     return (params == -256 || params == 768);
+                // Don't randomize the OoB wallmaster in the silver rupee room because it's only there to
+                // not trigger unlocking the door after killing the other wallmaster in authentic gameplay.
+                case ACTOR_EN_WALLMAS:
+                    return (!(!isMQ && sceneNum == SCENE_MEN && roomNum == 2 && posX == -2345));
                 // Only randomize initial floormaster actor (it can split and does some spawning on init).
                 case ACTOR_EN_FLOORMAS:
                     return (params == 0 || params == -32768);

soh/soh/Enhancements/randomizer/3drando/item_location.cpp

@@ -807,14 +807,14 @@ void LocationTable_Init() {
     locationTable[KF_SHOP_ITEM_7]                                = ItemLocation::Base(RC_KF_SHOP_ITEM_7,                    0x2D, 0x36, "KF Shop Item 7",                                    KF_SHOP_ITEM_7,              BUY_ARROWS_30,             {Category::cKokiriForest, Category::cForest, Category::cShop},                                                    SpoilerCollectionCheck::ShopItem(0x2D, 6),               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[KF_SHOP_ITEM_8]                                = ItemLocation::Base(RC_KF_SHOP_ITEM_8,                    0x2D, 0x37, "KF Shop Item 8",                                    KF_SHOP_ITEM_8,              BUY_HEART,                 {Category::cKokiriForest, Category::cForest, Category::cShop},                                                    SpoilerCollectionCheck::ShopItem(0x2D, 7),               SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
 
-    locationTable[KAK_POTION_SHOP_ITEM_1]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_1,            0x30, 0x30, "Kak Potion Shop Item 1",                            KAK_POTION_SHOP_ITEM_1,      BUY_DEKU_NUT_5,            {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 0),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_2]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_2,            0x30, 0x31, "Kak Potion Shop Item 2",                            KAK_POTION_SHOP_ITEM_2,      BUY_FISH,                  {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 1),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[KAK_POTION_SHOP_ITEM_1]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_1,            0x30, 0x30, "Kak Potion Shop Item 1",                            KAK_POTION_SHOP_ITEM_1,      BUY_GREEN_POTION,          {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 0),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[KAK_POTION_SHOP_ITEM_2]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_2,            0x30, 0x31, "Kak Potion Shop Item 2",                            KAK_POTION_SHOP_ITEM_2,      BUY_BLUE_FIRE,             {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 1),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[KAK_POTION_SHOP_ITEM_3]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_3,            0x30, 0x32, "Kak Potion Shop Item 3",                            KAK_POTION_SHOP_ITEM_3,      BUY_RED_POTION_30,         {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 2),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_4]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_4,            0x30, 0x33, "Kak Potion Shop Item 4",                            KAK_POTION_SHOP_ITEM_4,      BUY_GREEN_POTION,          {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 3),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_5]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_5,            0x30, 0x34, "Kak Potion Shop Item 5",                            KAK_POTION_SHOP_ITEM_5,      BUY_BLUE_FIRE,             {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 4),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[KAK_POTION_SHOP_ITEM_4]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_4,            0x30, 0x33, "Kak Potion Shop Item 4",                            KAK_POTION_SHOP_ITEM_4,      BUY_FAIRYS_SPIRIT,         {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 3),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[KAK_POTION_SHOP_ITEM_5]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_5,            0x30, 0x34, "Kak Potion Shop Item 5",                            KAK_POTION_SHOP_ITEM_5,      BUY_DEKU_NUT_5,            {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 4),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[KAK_POTION_SHOP_ITEM_6]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_6,            0x30, 0x35, "Kak Potion Shop Item 6",                            KAK_POTION_SHOP_ITEM_6,      BUY_BOTTLE_BUG,            {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 5),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
     locationTable[KAK_POTION_SHOP_ITEM_7]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_7,            0x30, 0x36, "Kak Potion Shop Item 7",                            KAK_POTION_SHOP_ITEM_7,      BUY_POE,                   {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 6),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
-    locationTable[KAK_POTION_SHOP_ITEM_8]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8,            0x30, 0x37, "Kak Potion Shop Item 8",                            KAK_POTION_SHOP_ITEM_8,      BUY_FAIRYS_SPIRIT,         {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 7),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
+    locationTable[KAK_POTION_SHOP_ITEM_8]                        = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8,            0x30, 0x37, "Kak Potion Shop Item 8",                            KAK_POTION_SHOP_ITEM_8,      BUY_FISH,                  {Category::cKakarikoVillage, Category::cKakariko, Category::cShop},                                               SpoilerCollectionCheck::ShopItem(0x30, 7),               SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
 
     locationTable[MARKET_BOMBCHU_SHOP_ITEM_1]                    = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1,        0x32, 0x30, "MK Bombchu Shop Item 1",                            MARKET_BOMBCHU_SHOP_ITEM_1,  BUY_BOMBCHU_10,            {Category::cInnerMarket, Category::cMarket, Category::cShop},                                                     SpoilerCollectionCheck::ShopItem(0x32, 0),               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
     locationTable[MARKET_BOMBCHU_SHOP_ITEM_2]                    = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2,        0x32, 0x31, "MK Bombchu Shop Item 2",                            MARKET_BOMBCHU_SHOP_ITEM_2,  BUY_BOMBCHU_10,            {Category::cInnerMarket, Category::cMarket, Category::cShop},                                                     SpoilerCollectionCheck::ShopItem(0x32, 1),               SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);

soh/soh/Enhancements/sfx-editor/SfxEditor.cpp

@@ -181,6 +181,28 @@ std::map<u16, std::tuple<std::string, std::string, SeqType>> sfxEditorSequenceMa
     {NA_SE_EV_CHICKEN_CRY_A,       {"Chicken Cry",                         "NA_SE_EV_CHICKEN_CRY_A",         SEQ_SFX}},
 };
 
+// Grabs the current BGM sequence ID and replays it
+// which will lookup the proper override, or reset back to vanilla
+void ReplayCurrentBGM() {
+    u16 curSeqId = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
+    // TODO: replace with Audio_StartSeq when the macro is shared
+    // The fade time and audio player flags will always be 0 in the case of replaying the BGM, so they are not set here
+    Audio_QueueSeqCmd(0x00000000 | curSeqId);
+}
+
+// Attempt to update the BGM if it matches the current sequence that is being played
+// The seqKey that is passed in should be the vanilla ID, not the override ID
+void UpdateCurrentBGM(u16 seqKey, SeqType seqType) {
+    if (seqType != SEQ_BGM_WORLD) {
+        return;
+    }
+
+    u16 curSeqId = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
+    if (curSeqId == seqKey) {
+        ReplayCurrentBGM();
+    }
+}
+
 void Draw_SfxTab(const std::string& tabId, const std::map<u16, std::tuple<std::string, std::string, SeqType>>& map, SeqType type) {
     const std::string hiddenTabId = "##" + tabId;
     const std::string resetAllButton = "Reset All" + hiddenTabId;
@@ -198,6 +220,9 @@ void Draw_SfxTab(const std::string& tabId, const std::map<u16, std::tuple<std::s
             }
         }
         SohImGui::RequestCvarSaveOnNextTick();
+        if (type == SEQ_BGM_WORLD) {
+            ReplayCurrentBGM();
+        }
     }
     ImGui::SameLine();
     if (ImGui::Button(randomizeAllButton.c_str())) {
@@ -222,6 +247,9 @@ void Draw_SfxTab(const std::string& tabId, const std::map<u16, std::tuple<std::s
             }
         }
         SohImGui::RequestCvarSaveOnNextTick();
+        if (type == SEQ_BGM_WORLD) {
+            ReplayCurrentBGM();
+        }
     }
 
     ImGui::BeginTable(tabId.c_str(), 3, ImGuiTableFlags_SizingFixedFit);
@@ -263,6 +291,7 @@ void Draw_SfxTab(const std::string& tabId, const std::map<u16, std::tuple<std::s
                 if (ImGui::Selectable(std::get<0>(seqData).c_str())) {
                     CVar_SetS32(cvarKey.c_str(), value);
                     SohImGui::RequestCvarSaveOnNextTick();
+                    UpdateCurrentBGM(defaultValue, type);
                 }
             }
 
@@ -299,6 +328,7 @@ void Draw_SfxTab(const std::string& tabId, const std::map<u16, std::tuple<std::s
         if (ImGui::Button(resetButton.c_str())) {
             CVar_SetS32(cvarKey.c_str(), defaultValue);
             SohImGui::RequestCvarSaveOnNextTick();
+            UpdateCurrentBGM(defaultValue, seqType);
         }
         ImGui::SameLine();
         ImGui::PushItemWidth(-FLT_MIN);
@@ -310,6 +340,7 @@ void Draw_SfxTab(const std::string& tabId, const std::map<u16, std::tuple<std::s
                 if (seqType & type) {
                     CVar_SetS32(cvarKey.c_str(), value);
                     SohImGui::RequestCvarSaveOnNextTick();
+                    UpdateCurrentBGM(defaultValue, type);
                     break;
                 }
             }

soh/src/code/z_actor.c

@@ -3326,6 +3326,15 @@ Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, PlayState* play
         return NULL;
     }
 
+    // The following enemies break when the parent actor isn't the same as what would happen in authentic gameplay.
+    // As such, don't assign a parent to them at all when spawned with Enemy Randomizer.
+    // Gohma (z_boss_goma.c), the Stalchildren spawner (z_en_encount1.c) and the falling platform spawning Stalfos in
+    // Forest Temple (z_bg_mori_bigst.c) that normally rely on this behaviour are changed when
+    // Enemy Rando is on so they still work properly even without assigning a parent.
+    if (CVar_GetS32("gRandomizedEnemies", 0) && (spawnedActor->id == ACTOR_EN_FLOORMAS || spawnedActor->id == ACTOR_EN_PEEHAT)) {
+        return spawnedActor;
+    }
+
     parent->child = spawnedActor;
     spawnedActor->parent = parent;
 

soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -113,9 +113,17 @@ void func_8087B938(BgHaka* this, PlayState* play) {
             actor = actor->next;
         }
         player->stateFlags2 &= ~0x10;
+
         if (this->dyna.actor.params == 1) {
             func_80078884(NA_SE_SY_CORRECT_CHIME);
-        } else if (play->sceneNum == SCENE_SPOT02 && allPulled) {
+        } else if (!IS_DAY && play->sceneNum == SCENE_SPOT02) {
+            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x,
+                        this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0,
+                        1, true);
+        }
+
+        // un tss un tss
+        if (play->sceneNum == SCENE_SPOT02 && allPulled) {
             func_80078884(NA_SE_SY_CORRECT_CHIME);
             func_800F5ACC(NA_BGM_STAFF_2);
             Actor* actor2 = play->actorCtx.actorLists[ACTORCAT_BG].head;
@@ -126,11 +134,8 @@ void func_8087B938(BgHaka* this, PlayState* play) {
                 }
                 actor2 = actor2->next;
             }
-        } else if (!IS_DAY && play->sceneNum == SCENE_SPOT02) {
-            Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x,
-                        this->dyna.actor.home.pos.y, this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0,
-                        1, true);
         }
+
         this->actionFunc = func_8087BAAC;
     }
     func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);

soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c

@@ -422,10 +422,10 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
             objectId = getItemEntry.objectId;
         }
 
-        // Weird edge case here, sold out object reports as loaded for Kokiri shop but doesn't render so we force it to load here
-        if (Object_IsLoaded(&play->objectCtx, objectId) && (params != SI_SOLD_OUT && play->sceneNum == SCENE_KOKIRI_SHOP)) {
-            this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId);
-        } else {
+        this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId);
+
+        // If the object isn't normally spawned by the shop scene, then spawn it now
+        if (this->objBankIndex < 0) {
             this->objBankIndex = Object_Spawn(&play->objectCtx, objectId);
         }
     }

soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c

@@ -656,7 +656,9 @@ void func_80A75A38(EnIk* this, PlayState* play) {
             }
             if (this->unk_2F9 == 0) {
                 Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, 0xB0);
-                if (this->switchFlags != 0xFF) {
+                // Don't set flag when Iron Knuckle is spawned by Enemy Rando.
+                // Instead Iron Knuckles rely on the "clear room" flag when Enemy Rando is on.
+                if (this->switchFlags != 0xFF && !CVar_GetS32("gRandomizedEnemies",0)) {
                     Flags_SetSwitch(play, this->switchFlags);
                 }
                 Actor_Kill(&this->actor);

soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c

@@ -663,7 +663,8 @@ void func_80AE3C98(EnRd* this, PlayState* play) {
 
     if (SkelAnime_Update(&this->skelAnime)) {
         if (this->unk_30C == 0) {
-            if (!Flags_GetSwitch(play, this->unk_312 & 0x7F)) {
+            // Don't set this flag in Enemy Rando as it can overlap with other objects using the same flag.
+            if (!Flags_GetSwitch(play, this->unk_312 & 0x7F) && !CVar_GetS32("gRandomizedEnemies", 0)) {
                 Flags_SetSwitch(play, this->unk_312 & 0x7F);
             }
             if (this->unk_314 != 0) {