V1 : Add All New Option For Randomizer [He will no longer have an update on the branch]

soh/CMakeLists.txt

@@ -138,8 +138,6 @@ endforeach()
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set_source_files_properties(soh/OTRGlobals.cpp PROPERTIES COMPILE_FLAGS "/utf-8")
     set_source_files_properties(soh/Enhancements/tts/tts.cpp PROPERTIES COMPILE_FLAGS "/utf-8")
-    set_source_files_properties(soh/Enhancements/custom-message/CustomMessageManager.cpp PROPERTIES COMPILE_FLAGS "/utf-8")
-    set_source_files_properties(soh/Enhancements/custom-message/CustomMessageManager.h PROPERTIES COMPILE_FLAGS "/utf-8")
 endif()
 
 # handle Network removals

soh/assets/extractor/filelists/ntsc_12_oot.txt

@@ -1507,4 +1507,4 @@ anime_texture_3_static
 anime_texture_4_static
 anime_texture_5_static
 anime_texture_6_static
-softsprite_matrix_static
+softsprite_matrix_static

soh/assets/extractor/filelists/ntsc_oot.txt

@@ -1507,4 +1507,4 @@ anime_texture_3_static
 anime_texture_4_static
 anime_texture_5_static
 anime_texture_6_static
-softsprite_matrix_static
+softsprite_matrix_static

soh/assets/extractor/symbols/SymbolMap_OotMqDbg.txt

@@ -0,0 +1 @@
+8012DB20 gMtxClear

soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipLostWoodsBridge.cpp

@@ -1,6 +1,7 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
+#include "soh/Enhancements/randomizer/context.h"
 
 extern "C" {
 #include "z64save.h"
@@ -17,9 +18,12 @@ void RegisterSkipLostWoodsBridge() {
     COND_VB_SHOULD(VB_PLAY_TRANSITION_CS, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO), {
         if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_BRIDGE_EAST_EXIT) &&
             !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) {
-            Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
-            if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
-                Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
+            if (!IS_RANDO || !Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_NPC_SOULS).Get() ||
+                Flags_GetRandomizerInf(RAND_INF_SARIA_SOUL)) {
+                Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE);
+                if (GameInteractor_Should(VB_GIVE_ITEM_FAIRY_OCARINA, true)) {
+                    Item_Give(gPlayState, ITEM_OCARINA_FAIRY);
+                }
             }
             *should = false;
         }

soh/soh/Enhancements/custom-message/CustomMessageManager.h

@@ -154,9 +154,9 @@ class CustomMessage {
     void InsertNumber(uint8_t num);
 
     /**
-     * @brief A € sign at the end of an item name signals that it is plural.
+     * @brief A € sign at the end of an item name signals that it is plural.
      * If a hint text has |singular|plural| forms specified, the unused one get's deleted.
-     * If no € sign is present, the singular form is used.
+     * If no € sign is present, the singular form is used.
      */
     void SetSingularPlural();
 

soh/soh/Enhancements/custom-message/CustomMessageTypes.h

@@ -79,8 +79,38 @@ typedef enum {
     TEXT_SARIAS_SONG_CHANNELING_POWER = 0x016D,
     TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x01B3, // 0x1yy for Navi msg range
     TEXT_MASK_SHOP_SIGN = 0x0207,
+    TEXT_WATERFALL = 0x022D,
     TEXT_FROGS_UNDERWATER = 0x022E,
+    TEXT_OUTSIDE_FISHING_POND = 0x023A,
+    TEXT_HF_SIGN = 0x0301,
+    TEXT_HC_GF = 0x0304,
+    TEXT_KAK_SIGN = 0x0305,
+    TEXT_KAK_GY = 0x0306,
+    TEXT_KAK_WELL = 0x0307,
+    TEXT_KAK_DMT = 0x0308,
+    TEXT_DMT_DC = 0x030A,
+    TEXT_GC_SIGN = 0x030B,
+    TEXT_HF_ZR = 0x030C,
+    TEXT_ZD_SIGN = 0x030E,
+    TEXT_ZF_JABU_SIGN = 0x030F,
+    TEXT_KF_LW = 0x0314,
+    TEXT_HF_LON_LON = 0x0315,
+    TEXT_LA_SIGN = 0x0317,
+    TEXT_LA_LAB = 0x0318,
+    TEXT_GV_SIGN = 0x0319,
     TEXT_GF_HBA_SIGN = 0x031A,
+    TEXT_KF_SHOP_SIGN = 0x031E,
+    TEXT_LINKS_HOUSE_SIGN = 0x031F,
+    TEXT_KOKIRI_EXIT_SIGN = 0x0320,
+    TEXT_DMT_DMC = 0x0323,
+    TEXT_ZD_SHOP_SIGN = 0x0333,
+    TEXT_OUTSIDE_KOKIRI_SIGN = 0x0339,
+    TEXT_OUTSIDE_MARKET_SIGN = 0x033A,
+    TEXT_MIDO_HOUSE_SIGN = 0x033C,
+    TEXT_KNOW_IT_ALL_HOUSE = 0x033D,
+    TEXT_TWINS_HOUSE_SIGN = 0x033E,
+    TEXT_SARIAS_HOUSE_SIGN = 0x033F,
+    TEXT_NO_DIVING_SIGN = 0x0342,
     TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x0346, // 0x3yy for cuttable sign range
     TEXT_WARP_MINUET_OF_FOREST = 0x088D,
     TEXT_WARP_BOLERO_OF_FIRE = 0x088E,

soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h

@@ -142,6 +142,16 @@ typedef enum {
     // - None
     VB_BE_ELIGIBLE_FOR_NOCTURNE_OF_SHADOW,
 
+    // #### `result`
+    // ```c
+    // CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD) && CHECK_QUEST_ITEM(QUEST_GORON_RUBY) &&
+    // CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE) && !Flags_GetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE) &&
+    // LINK_IS_CHILD
+    // ```
+    // #### `args`
+    // - None
+    VB_BE_ELIGIBLE_FOR_OCARINA_OF_TIME,
+
     // #### `result`
     // ```c
     // !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_PRELUDE_OF_LIGHT) &&
@@ -236,6 +246,15 @@ typedef enum {
     // - `*Actor` (interactRangeActor)
     VB_BOTTLE_ACTOR,
 
+    // #### `result`
+    // Actor is ACTOR_OBJ_BOMBIWA, or ACTOR_OBJ_HAMISHI
+    // ```c
+    // Flags_GetSwitch(play, this->actor.params & 0x3F)
+    // ```
+    // #### `args`
+    // - `*Actor` (interactRangeActor)
+    VB_BOULDER_BREAK_FLAG,
+
     // #### `result`
     // ```c
     // true
@@ -278,6 +297,14 @@ typedef enum {
     // - `*EnGm`
     VB_CHECK_RANDO_PRICE_OF_MEDIGORON,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - None
+    VB_CLIMB,
+
     // #### `result`
     // ```c
     // CHECK_BTN_ALL(input->press.button, BTN_START)
@@ -310,6 +337,15 @@ typedef enum {
     // - `*ObjKibako2`
     VB_CRATE_SETUP_DRAW,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - None
+
+    VB_CRAWL,
+
     // #### `result`
     // ```c
     // true
@@ -1786,6 +1822,14 @@ typedef enum {
     // - None
     VB_REVERT_SPOILING_ITEMS,
 
+    // #### `result`
+    // ```c
+    // false
+    // ```
+    // #### `args`
+    // - `*EnIshi`
+    VB_ROCK_DROP_ITEM,
+
     // #### `result`
     // ```c
     // !Flags_GetInfTable(INFTABLE_145)
@@ -2155,6 +2199,22 @@ typedef enum {
     // - `*EnWood02`
     VB_TREE_DROP_COLLECTIBLE,
 
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*ObjWood02`
+    VB_TREE_SETUP_DRAW,
+
+    // #### `result`
+    // ```c
+    // true
+    // ```
+    // #### `args`
+    // - `*ObjWood02`
+    VB_TREE_DROP_ITEM,
+
     // ```c
     // true
     // ```

soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp

@@ -131,6 +131,10 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                      /*german*/ "Man erzählt sich, daß eine #Kiste im Deku-Baum# #[[1]]# enthielte.",
                                                      /*french*/ "Selon moi, une #caisse dans l'Arbre Mojo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_DEKU_BOULDER] = HintText(CustomMessage("They say that a #boulder in the Deku Tree# contains #[[1]]#.",
+                                                                       /*german*/ "!!!",
+                                                                       /*french*/ "!!!", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |     DODONGOS CAVERN      |
   ---------------------------*/
@@ -313,6 +317,10 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                      /*german*/ "Man erzählt sich, daß eine #Kiste in Dodongos Höhle# #[[1]]# enthielte.",
                                                      /*french*/ "Selon moi, une #caisse dans la Caverne Dodongo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_DODONGOS_BOULDER] = HintText(CustomMessage("They say that a #boulder in Dodongo's Cavern# contains #[[1]]#.",
+                                                                       /*german*/ "!!!",
+                                                                       /*french*/ "!!!", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |     JABU JABUS BELLY     |
   ---------------------------*/
@@ -480,6 +488,10 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                      /*german*/ "Man erzählt sich, daß eine #Kiste in Jabu-Jabus Bauch# #[[1]]# enthielte.",
                                                      /*french*/ "Selon moi, une #caisse dans le Ventre de Jabu-Jabu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_JABU_BOULDER] = HintText(CustomMessage("They say that a #boulder in Jabu Jabu's Belly# contains #[[1]]#.",
+                                                                       /*german*/ "!!!",
+                                                                       /*french*/ "!!!", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |      FOREST TEMPLE       |
   ---------------------------*/
@@ -1322,6 +1334,10 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                      /*german*/ "Man erzählt sich, daß eine #Kiste im Geistertempel# #[[1]]# enthielte.",
                                                      /*french*/ "Selon moi, une #caisse dans le Temple de l'Esprit# contient #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_SPIRIT_TEMPLE_BOULDER] = HintText(CustomMessage("They say that a #boulder in the Spirit Temple# contains #[[1]]#.",
+                                                                       /*german*/ "!!!",
+                                                                       /*french*/ "!!!", {QM_RED, QM_GREEN}));
+
   /*--------------------------
   |      SHADOW TEMPLE       |
   ---------------------------*/
@@ -1735,6 +1751,9 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
                                                      /*german*/ "Man erzählt sich, daß etwas #Gras auf dem Grund des Brunnens# #[[1]]# verstecke.",
                                                      /*french*/ "Selon moi, de l'#herbe dans le Puits# cache #[[1]]#.", {QM_RED, QM_GREEN}));
 
+    hintTextTable[RHT_BOTW_BOULDER] = HintText(CustomMessage("They say that a #boulder in Bottom of the Well# contains #[[1]]#.",
+                                                                       /*german*/ "!!!",
+                                                                       /*french*/ "!!!", {QM_RED, QM_GREEN}));
 
   /*--------------------------
   |        ICE CAVERN        |