From f8aab5da646dc0bb32d07e1a83ec38cf988d093f Mon Sep 17 00:00:00 2001 From: Gonzalo Mora <98666920+GonzaloJMora@users.noreply.github.com> Date: Sun, 4 Oct 2026 22:56:53 -0500 Subject: [PATCH 1/2] fix: Make Kotake mushroom sale a shop location for the mm3dr hook --- source/item_location.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/item_location.cpp b/source/item_location.cpp index a8c251c..8e3194a 100644 --- a/source/item_location.cpp +++ b/source/item_location.cpp @@ -187,7 +187,7 @@ void LocationTable_Init() { locationTable[SOUTHERN_SWAMP_MUSIC_STATUE] = ItemLocation::Base (0x45, 0x72, false, "SS Music Statue", SOUTHERN_SWAMP_MUSIC_STATUE, SONG_OF_SOARING, {Category::cSouthernSwamp, Category::cSong,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); locationTable[SOUTHERN_SWAMP_NEAR_SPIDER_HOUSE_GROTTO_CHEST] = ItemLocation::Chest (0x07, 0x1D, true, "SS Near Spider House Grotto", SOUTHERN_SWAMP_NEAR_SPIDER_HOUSE_GROTTO_CHEST, RED_RUPEE, {Category::cSouthernSwamp,Category::cGrotto,Category::cChest,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); locationTable[SOUTHERN_SWAMP_MYSTERY_WOODS_GROTTO_CHEST] = ItemLocation::Chest (0x07, 0x1C, true, "SS Mystery Woods Grotto", SOUTHERN_SWAMP_MYSTERY_WOODS_GROTTO_CHEST, PURPLE_RUPEE, {Category::cSouthernSwamp, Category::cGrotto,Category::cChest ,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); - locationTable[SOUTHERN_SWAMP_KOTAKE_MUSHROOM_SALE] = ItemLocation::Base (0x0A, 0x5D, true, "SS Kotake Mushroom Sale", SOUTHERN_SWAMP_KOTAKE_MUSHROOM_SALE, RED_RUPEE, {Category::cSouthernSwamp,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); + locationTable[SOUTHERN_SWAMP_KOTAKE_MUSHROOM_SALE] = ItemLocation::Shop (0x0A, 0x03, true, "SS Kotake Mushroom Sale", SOUTHERN_SWAMP_KOTAKE_MUSHROOM_SALE, RED_RUPEE, {Category::cSouthernSwamp,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); //locationTable[SOUTHERN_SWAMP_PICTOGRAPH_STANDARD] = ItemLocation::Base (0x0A, 0x00, true, "SS Pictograph Standard", SOUTHERN_SWAMP_PICTOGRAPH_STANDARD, BLUE_RUPEE, {Category::cSouthernSwamp, Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); //locationTable[SOUTHERN_SWAMP_PICTOGRAPH_GOOD] = ItemLocation::Base (0x0A, 0x00, true, "SS Pictograph Good", SOUTHERN_SWAMP_PICTOGRAPH_GOOD, RED_RUPEE, {Category::cSouthernSwamp,Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); locationTable[SOUTHERN_SWAMP_SCRUB_PURCHASE] = ItemLocation::Base (0x45, 0x35, true, "SS Deku Scrub Merchant Purchase", SOUTHERN_SWAMP_SCRUB_PURCHASE, MAGIC_BEAN, {Category::cSouthernSwamp, Category::cDekuScrub,Category::cDayOne, Category::cShop, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP ); From 39b3b055cdb336f8728c4dcf6df30d2492c5f1a0 Mon Sep 17 00:00:00 2001 From: Gonzalo Mora <98666920+GonzaloJMora@users.noreply.github.com> Date: Mon, 5 Oct 2026 16:51:05 -0500 Subject: [PATCH 2/2] nit: Update Z3DR submodule for mushroom sale hook --- Z3DR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Z3DR b/Z3DR index e2bf382..d3659a4 160000 --- a/Z3DR +++ b/Z3DR @@ -1 +1 @@ -Subproject commit e2bf382295ca4bbb1eb7d239aa942a059f2f3cdf +Subproject commit d3659a42cb220132f3d503ade16516e04de32c23