From cc66dc22eeee0dec7e6b67ba62eb1a892d479a62 Mon Sep 17 00:00:00 2001 From: Tacoman369 <90735287+Tacoman369@users.noreply.github.com> Date: Sat, 19 Sep 2026 15:44:31 -0500 Subject: [PATCH 1/3] Update location_access.cpp - Fix shops potentially requiring one more wallet than needed --- source/location_access.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/location_access.cpp b/source/location_access.cpp index 4f360f1..8e9b51e 100644 --- a/source/location_access.cpp +++ b/source/location_access.cpp @@ -36,13 +36,13 @@ bool LocationAccess::CanBuy() const { //Check if current walet is large enough bool SufficientWallet = true; if (Location(location)->GetPrice() > 500) { - SufficientWallet = Logic::ProgressiveWallet >= 2; + SufficientWallet = Logic::ProgressiveWallet >= 3; } else if (Location(location)->GetPrice() > 200) { - SufficientWallet = Logic::ProgressiveWallet >= 1; + SufficientWallet = Logic::ProgressiveWallet >= 2; } else if (Location(location)->GetPrice() > 99) { - SufficientWallet = Logic::ProgressiveWallet >= 0; + SufficientWallet = Logic::ProgressiveWallet >= 1; } bool OtherCondition = true; From bb520725fb7691eff1909a76924003f5482a5331 Mon Sep 17 00:00:00 2001 From: pizza1398 <259104093+pizza1398@users.noreply.github.com> Date: Sun, 20 Sep 2026 18:34:30 +0200 Subject: [PATCH 2/3] Update Setting Descriptions --- source/setting_descriptions.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/source/setting_descriptions.cpp b/source/setting_descriptions.cpp index 801dd2f..6cc47d2 100644 --- a/source/setting_descriptions.cpp +++ b/source/setting_descriptions.cpp @@ -210,10 +210,12 @@ string_view shuffleRewardsAnywhere = "Boss Remains can appear anywhere.\n"; /*------------------------------ // | SHUFFLE MAGIC BEANS | // ------------------------------*/ // -string_view magicBeansDesc = "**OPTION CURRENTLY WIP**\n" // - "Enabling this adds a pack of 20 beans to the item\n" - "pool and changes the Magic Bean Salesman to sell a\n" - "random item at a price of 60 rupees."; // +string_view magicBeansDesc = //"**OPTION CURRENTLY WIP**\n" // + "Bean Seller's free sample bean will be randomized.\n\n" + "He will still sell refills, but only after\n" // + "a randomized bean has been found.\n\n" // + "Please note: every bean is worth 20 beans\n" // + "regardless of this being enabled."; // /*------------------------------ // | SHUFFLE KOKIRI SWORD | // ------------------------------*/ // @@ -558,12 +560,18 @@ string_view shuffleOcaMusicDesc = "**OPTION CURRENTLY WIP**\n" /*------------------------------ // | RESTORATION OPTIONS | // ------------------------------*/ // -string_view fastZoraSwimDesc = "Enables Fast Zora Swimming without magic."; // +string_view fastZoraSwimDesc = "Enables Fast Zora Swimming without magic.\n\n" // + "Slow swimming can still by accessed by\n" // + "pressing dpad up, dpad down, ZL, or holding ZR."; // string_view ocarinaDiveDesc = "Enables Ocarina Diving. This also patches\n" // "walking with ocarina from gossip stones."; // string_view dpadMaskDesc = "Enables using the 3 D-Pad buttons to use\n" // "transformation masks. This option will also\n" // - "patch using Down A with Mask Storage."; // + "patch using Down A with Mask Storage.\n\n" // + "Down (south) = Deku\n" // + "Left (west) = Zora\n" // + "Up (north) = Goron\n" // + "ZR + Up (in boss room) = Fierce Deity"; // string_view dpadOcarinaDesc = "Enables using D-Pad right to activate your\n" // "ocarina."; // string_view dpadArrowDesc = "Enables using D-Pad up to change your current\n" // From 3a346f79676d75141d8dcf8ceb10b439d1232790 Mon Sep 17 00:00:00 2001 From: pizza1398 <259104093+pizza1398@users.noreply.github.com> Date: Sun, 20 Sep 2026 20:04:41 +0200 Subject: [PATCH 3/3] Fix oversight in Barten translations --- source/hints.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/hints.cpp b/source/hints.cpp index ed1a5a9..c7cbc46 100644 --- a/source/hints.cpp +++ b/source/hints.cpp @@ -665,7 +665,7 @@ void CreateShopMessages() { u16 MilkBarMilkPrice = 20;// Location(E_CLOCK_TOWN_MILK_BAR_MILK)->GetPrice(); u16 MilkBarChateauPrice = 200;// Location(E_CLOCK_TOWN_MILK_BAR_CHATEAU)->GetPrice(); // {"English", "French", "Spanish", "German", }; // "Italian" - Text MilkBarIntro = {"What'll it be?&", "Qu'est-ce que ce s'ra?", "¿Qué quiere tomar?", "Was darf's sein?", // "Cosa prendi?", + Text MilkBarIntro = {"What'll it be?", "Qu'est-ce que ce s'ra?", "¿Qué quiere tomar?", "Was darf's sein?", // "Cosa prendi?", "", "", "¿Qué va a ser?", }; Text MilkSplit = {": ##", " : ##", ": ##", ": ##", }; // " ##", Text MilkNext = {" Rupees#&#", " Rubis#&#", " rupias#&#", " Rubine#&#", }; // " rupie#&#", @@ -673,7 +673,7 @@ void CreateShopMessages() { Text{"Nothing#", "Rien#", "Nada#", "Nichts#", }; // "Niente#", CustomMessages::CreateMessageFromTextObject(0x2b0b, 0xFFFF, (0x3FF00000 | MilkBarMilkPrice | (MilkBarChateauPrice << 10)), 0xff1001, - MilkBarIntro+">3#"+MilkBarMilkItem+MilkSplit+std::to_string(MilkBarMilkPrice)+MilkNext+MilkBarChateauItem+MilkSplit+std::to_string(MilkBarChateauPrice)+MilkLeave, + MilkBarIntro+"&>3#"+MilkBarMilkItem+MilkSplit+std::to_string(MilkBarMilkPrice)+MilkNext+MilkBarChateauItem+MilkSplit+std::to_string(MilkBarChateauPrice)+MilkLeave, {QM_GREEN, QM_MAGENTA, QM_GREEN, QM_MAGENTA, QM_GREEN}, {}, {}, 0x0, false, false, MESSAGE_END_NULL); // CustomMessages::CreateMessage(0x614A, 0xFFFF, (0x3FFFFFFF), 0xff0000, // {"With all due respect, sir, I think you've had enough of that."},