shad dominion rod check

mods/randomizer/generator/data/flow_patches.yaml

@@ -71,6 +71,13 @@
     parameters: 0x00000032
     next: Kakariko Malo Mart Wooden Shield Sold Out
 
+  # Patch Shad's flow to set the custom flag for receiving his item
+  - index: 0x946
+    type: event
+    event: set event flag
+    parameters: 0x0333
+    next: 0xFFFF
+
 #3: # zel_03.bmg
 4: # zel_04.bmg - Castle Town
   # Patch Charlo to check for 100 rupees instead of 30

mods/randomizer/generator/data/locations.yaml

@@ -1509,6 +1509,18 @@
       - Ilia Memory Reward
     Event Flag: 0x5E04
 
+- Name: Shad Dominion Rod
+  Original Item: Progressive Dominion Rod
+  Categories:
+    - Overworld
+    - Npc
+    - Kakariko Village
+    - ARC
+  Metadata:
+    Name Lookup:
+      - Shad Dominion Rod
+    Event Flag: 0x6308
+    
 - Name: Rutelas Blessing
   Original Item: Zora Armor
   Categories:

mods/randomizer/generator/data/world/overworld/Eldin Province.yaml

@@ -168,6 +168,7 @@
 - Name: Kakariko Renados Sanctuary Basement
   Twilight: Eldin
   Locations:
+    Shad Dominion Rod: Progressive_Sky_Book and Can_Complete_Eldin_Twilight
     Sanctuary Basement Twilit Insect 1: Can_Defeat_Eldin_Twilit_Insect
     Sanctuary Basement Twilit Insect 2: Can_Defeat_Eldin_Twilit_Insect
     Sanctuary Basement Twilit Insect 3: Can_Defeat_Eldin_Twilit_Insect

mods/randomizer/src/hooks.cpp

@@ -135,7 +135,6 @@ DEFINE_HOOK(&daNpc_Bans_c::isDelete, daNpc_Bans_c__isDelete);
 
 DEFINE_HOOK(&daNpc_Fairy_c::AppearDemoCall, daNpc_Fairy_c__AppearDemoCall);
 
-DEFINE_HOOK(&daNpcShad_c::Create, daNpcShad_c__Create);
 DEFINE_HOOK(&daNpcShad_c::wait_type1, daNpcShad_c__wait_type1);
 
 DEFINE_HOOK(&daNpc_Yelia_c::cutTakeWoodStatue, daNpc_Yelia_c__cutTakeWoodStatue);
@@ -3366,7 +3365,6 @@ ModResult uninstall() {
 
     mods::hook::uninstall<daNpc_Fairy_c__AppearDemoCall>(svc_hook);
 
-    mods::hook::uninstall<daNpcShad_c__Create>(svc_hook);
     mods::hook::uninstall<daNpcShad_c__wait_type1>(svc_hook);
 
     mods::hook::uninstall<daNpc_Yelia_c__cutTakeWoodStatue>(svc_hook);

mods/randomizer/src/tools.cpp

@@ -547,6 +547,7 @@ std::string nameLookupOverride(const std::string& locationName) {
         {"Sacred Grove Pedestal Master Sword", ITEM_CHECK_MASTER_SWORD},
         {"Sacred Grove Pedestal Shadow Crystal", ITEM_CHECK_SHADOW_CRYSTAL},
         {"Sera Shop Slingshot", "shop:R_SP01:75"},
+        {"Shad Dominion Rod", ITEM_CHECK_SHAD_DOMINION_ROD},
         {"Skybook From Impaz", ITEM_CHECK_SKYBOOK},
         {"Snowboard Racing Prize", ITEM_CHECK_SNOWBOARD_REWARD},
         {"Snowpeak Ruins Dungeon Reward", ITEM_CHECK_DUNGEON_REWARD_SNOWPEAK},

src/dusk/mods/item_checks.cpp

@@ -120,6 +120,12 @@ constexpr std::array kMessageChecks{
         .vanillaItem = dItemNo_HORSE_FLUTE_e,
         .enqueueAtDisplay = false,
     },
+    MessageCheck{
+        .group = 2,
+        .messageId = 6531,
+        .name = ITEM_CHECK_SHAD_DOMINION_ROD,
+        .vanillaItem = dItemNo_COPY_ROD_2_e,
+    }
 };
 
 std::unordered_map<LoadedMod*, ModItemChecks> s_modChecks;