From de1ef3963b73f1b299f7bfda3e191006b236de68 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Sat, 15 Mar 2025 20:01:35 +0100
Subject: [PATCH] Rename events

---
 .../overworld/thieves_hideout.cpp             |  8 +++----
 soh/soh/Enhancements/randomizer/logic.cpp     | 24 +++++++++----------
 soh/soh/Enhancements/randomizer/logic.h       |  8 +++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
index e7b4324bf..5d4fded76 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
@@ -6,7 +6,7 @@ using namespace Rando;
 void RegionTable_Init_ThievesHideout() {
     areaTable[RR_TH_NORTH_F1_CARPENTER_AREA] = Region("Thieves Hideout North F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->TH_RescuedF1NorthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->TH_CouldRescueF1NorthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_NORTH_F1_CARPENTER,       logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@@ -22,7 +22,7 @@ void RegionTable_Init_ThievesHideout() {
 
     areaTable[RR_TH_SOUTH_F1_CARPENTER_AREA] = Region("Thieves Hideout South F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->TH_RescuedF1SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->TH_CouldRescueF1SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_SOUTH_F1_CARPENTER,            logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@@ -42,7 +42,7 @@ void RegionTable_Init_ThievesHideout() {
 
     areaTable[RR_TH_NORTH_F2_CARPENTER_AREA] = Region("Thieves Hideout North F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->TH_RescuedF2NorhCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->TH_CouldRescueF2NorhCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_NORTH_F2_CARPENTER,       logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@@ -56,7 +56,7 @@ void RegionTable_Init_ThievesHideout() {
 
     areaTable[RR_TH_SOUTH_F2_CARPENTER_AREA] = Region("Thieves Hideout South F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->TH_RescuedF2SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
+        EventAccess(&logic->TH_CouldRescueF2SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_SOUTH_F2_CARPENTER,     logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index ddac4edc7..b591a6bab 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -1220,17 +1220,17 @@ namespace Rando {
         switch (ctx->GetOption(RSK_GERUDO_FORTRESS).Get()) {
             case RO_GF_CARPENTERS_NORMAL:
                 return SmallKeys(RR_GF_GROUND_BOTTOM, 4) &&
-                    TH_RescuedF1NorthCarpenter &&
-                    TH_RescuedF1SouthCarpenter &&
-                    TH_RescuedF2NorthCarpenter &&
-                    TH_RescuedF2SouthCarpenter;
+                    TH_CouldRescueF1NorthCarpenter &&
+                    TH_CouldRescueF1SouthCarpenter &&
+                    TH_CouldRescueF2NorthCarpenter &&
+                    TH_CouldRescueF2SouthCarpenter;
             case RO_GF_CARPENTERS_FAST:
                 return SmallKeys(RR_GF_GROUND_BOTTOM, 1) &&
                     (
-                        TH_RescuedF1NorthCarpenter ||
-                        TH_RescuedF1SouthCarpenter ||
-                        TH_RescuedF2NorthCarpenter ||
-                        TH_RescuedF2SouthCarpenter
+                        TH_CouldRescueF1NorthCarpenter ||
+                        TH_CouldRescueF1SouthCarpenter ||
+                        TH_CouldRescueF2NorthCarpenter ||
+                        TH_CouldRescueF2SouthCarpenter
                     );
             case RO_GF_CARPENTERS_FREE:
                 return true;
@@ -2302,10 +2302,10 @@ namespace Rando {
 
         //Events
         ShowedMidoSwordAndShield   = false;
-        TH_RescuedF1NorthCarpenter = false;
-        TH_RescuedF1SouthCarpenter = false;
-        TH_RescuedF2NorthCarpenter = false;
-        TH_RescuedF2SouthCarpenter = false;
+        TH_CouldRescueF1NorthCarpenter = false;
+        TH_CouldRescueF1SouthCarpenter = false;
+        TH_CouldRescueF2NorthCarpenter = false;
+        TH_CouldRescueF2SouthCarpenter = false;
         GF_GateOpen                = false;
         GtG_GateOpen               = false;
         DampesWindmillAccess       = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index a5cf370dc..71f21aa31 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -112,10 +112,10 @@ class Logic {
 
     // Events
     bool ShowedMidoSwordAndShield = false;
-    bool TH_RescuedF1NorthCarpenter = false;
-    bool TH_RescuedF1SouthCarpenter = false;
-    bool TH_RescuedF2NorthCarpenter = false;
-    bool TH_RescuedF2SouthCarpenter = false;
+    bool TH_CouldRescueF1NorthCarpenter = false;
+    bool TH_CouldRescueF1SouthCarpenter = false;
+    bool TH_CouldRescueF2NorthCarpenter = false;
+    bool TH_CouldRescueF2SouthCarpenter = false;
     bool GF_GateOpen = false;
     bool GtG_GateOpen = false;
     bool DampesWindmillAccess = false;