From 071260c63f83a224f19420daa630032e96ea4d46 Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Sat, 19 Jul 2025 22:21:44 +0000 Subject: [PATCH] CanBuyAnother --- soh/compile_logic.py | 2 +- soh/soh/Enhancements/randomizer/location_access/generated.cpp | 2 +- soh/soh/Enhancements/randomizer/logic.s | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/soh/compile_logic.py b/soh/compile_logic.py index 884be4629..b445b3f6a 100755 --- a/soh/compile_logic.py +++ b/soh/compile_logic.py @@ -156,7 +156,7 @@ FUNC = { "ChildCanAccess", "AdultCanAccess", "HasAccessTo", - "CanBuyCheck", + "CanBuyAnother", } logicFUNC = { diff --git a/soh/soh/Enhancements/randomizer/location_access/generated.cpp b/soh/soh/Enhancements/randomizer/location_access/generated.cpp index 66af3299d..d2e5c61b7 100644 --- a/soh/soh/Enhancements/randomizer/location_access/generated.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/generated.cpp @@ -1086,7 +1086,7 @@ areaTable[RR_WASTELAND_NEAR_FORTRESS] = Region("Wasteland Near Fortress", SCENE_ areaTable[RR_HAUNTED_WASTELAND] = Region("Haunted Wasteland", SCENE_HAUNTED_WASTELAND, false, {RA_HAUNTED_WASTELAND}, { EventAccess(&logic->FairyPot, []{return true;}), EventAccess(&logic->NutPot, []{return true;}), - EventAccess(&logic->CarpetMerchant, []{return (logic->HasItem(RG_ADULT_WALLET) && (CanBuyCheck(RC_WASTELAND_BOMBCHU_SALESMAN) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))));}), + EventAccess(&logic->CarpetMerchant, []{return (logic->HasItem(RG_ADULT_WALLET) && (CanBuyAnother(RC_WASTELAND_BOMBCHU_SALESMAN) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))));}), }, { LOCATION(RC_WASTELAND_CHEST, logic->HasFireSource()), LOCATION(RC_WASTELAND_BOMBCHU_SALESMAN, (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))), diff --git a/soh/soh/Enhancements/randomizer/logic.s b/soh/soh/Enhancements/randomizer/logic.s index fce55477a..be8fb9f1a 100644 --- a/soh/soh/Enhancements/randomizer/logic.s +++ b/soh/soh/Enhancements/randomizer/logic.s @@ -1118,7 +1118,7 @@ def RR_HAUNTED_WASTELAND SCENE_HAUNTED_WASTELAND false RA_HAUNTED_WASTELAND Haunted Wasteland FairyPot true NutPot true -CarpetMerchant (and (HasItem RG_ADULT_WALLET) (and (CanBuyCheck RC_WASTELAND_BOMBCHU_SALESMAN) (or CanJumpslash (CanUse RG_HOVER_BOOTS)))) +CarpetMerchant (and (HasItem RG_ADULT_WALLET) (and (CanBuyAnother RC_WASTELAND_BOMBCHU_SALESMAN) (or CanJumpslash (CanUse RG_HOVER_BOOTS)))) RC_WASTELAND_CHEST HasFireSource RC_WASTELAND_BOMBCHU_SALESMAN (or CanJumpslash (CanUse RG_HOVER_BOOTS)) RC_WASTELAND_GS HookshotOrBoomerang