summaryrefslogtreecommitdiff
path: root/soh/src
diff options
context:
space:
mode:
authorPepper0ni <93387759+Pepper0ni@users.noreply.github.com>2024-02-02 01:15:13 +0000
committerGitHub <noreply@github.com>2024-02-01 19:15:13 -0600
commitcb82e77e407ca80dc23c61cfce78fa8ea174a221 (patch)
tree4012b865add38ec84f2ee6a1ab7a57ad97f9a1dc /soh/src
parent63cf3610e5f2483b9da25be3858ac05f671174dc (diff)
fix bombchu logic bugs (#3720)
Diffstat (limited to 'soh/src')
-rw-r--r--soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index 037b4b594..6aa1b7d41 100644
--- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -1027,8 +1027,8 @@ void EnGirlA_BuyEvent_ObtainBombchuPack(PlayState* play, EnGirlA* this) {
Rupees_ChangeBy(-this->basePrice);
// Normally, buying a bombchu pack sets a flag indicating the pack is now sold out
- // If they're in logic for rando, skip setting that flag so they can be purchased repeatedly
- if (IS_RANDO && Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC)) {
+ // If we're in rando, skip setting that flag so they can be purchased repeatedly
+ if (IS_RANDO) {
return;
}
@@ -1255,8 +1255,7 @@ void EnGirlA_InitializeItemAction(EnGirlA* this, PlayState* play) {
this->itemGiveFunc = itemEntry->itemGiveFunc;
this->buyEventFunc = itemEntry->buyEventFunc;
// If chus are in logic, make the 10 pack affordable without a wallet upgrade
- if (IS_RANDO && Randomizer_GetSettingValue(RSK_BOMBCHUS_IN_LOGIC) &&
- this->getItemId == GI_BOMBCHUS_10) {
+ if (IS_RANDO && this->getItemId == GI_BOMBCHUS_10) {
this->basePrice = 99;
} else {
this->basePrice = itemEntry->price;