From 6c56ef9900f2acbf5d73ff7bf4b001497f969ea2 Mon Sep 17 00:00:00 2001 From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Date: Sat, 15 Mar 2025 21:43:01 +0100 Subject: [PATCH] Rename most of the regions --- soh/soh/Enhancements/randomizer/entrance.cpp | 8 +- .../overworld/gerudo_fortress.cpp | 98 +++++++++---------- .../overworld/thieves_hideout.cpp | 26 ++--- .../Enhancements/randomizer/randomizerTypes.h | 22 ++--- 4 files changed, 77 insertions(+), 77 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp index 9f5e8784f..28f9e3c1e 100644 --- a/soh/soh/Enhancements/randomizer/entrance.cpp +++ b/soh/soh/Enhancements/randomizer/entrance.cpp @@ -877,8 +877,8 @@ int EntranceShuffler::ShuffleAllEntrances() { { EntranceType::Dungeon, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, RR_KAK_WELL, ENTR_KAKARIKO_VILLAGE_OUTSIDE_BOTTOM_OF_THE_WELL } }, { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_ICE_CAVERN_ENTRYWAY, ENTR_ICE_CAVERN_ENTRANCE }, { EntranceType::Dungeon, RR_ICE_CAVERN_ENTRYWAY, RR_ZORAS_FOUNTAIN, ENTR_ZORAS_FOUNTAIN_OUTSIDE_ICE_CAVERN } }, - { { EntranceType::Dungeon, RR_GF_GROUND_SALMON, RR_GERUDO_TRAINING_GROUND_ENTRYWAY, ENTR_GERUDO_TRAINING_GROUND_ENTRANCE }, - { EntranceType::Dungeon, RR_GERUDO_TRAINING_GROUND_ENTRYWAY, RR_GF_GROUND_SALMON, ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND } }, + { { EntranceType::Dungeon, RR_GF_GROUND_OUTSIDE_GTG, RR_GERUDO_TRAINING_GROUND_ENTRYWAY, ENTR_GERUDO_TRAINING_GROUND_ENTRANCE }, + { EntranceType::Dungeon, RR_GERUDO_TRAINING_GROUND_ENTRYWAY, RR_GF_GROUND_OUTSIDE_GTG, ENTR_GERUDOS_FORTRESS_OUTSIDE_GERUDO_TRAINING_GROUND } }, { { EntranceType::GanonDungeon, RR_GANONS_CASTLE_LEDGE, RR_GANONS_CASTLE_ENTRYWAY, ENTR_INSIDE_GANONS_CASTLE_ENTRANCE }, { EntranceType::GanonDungeon, RR_GANONS_CASTLE_ENTRYWAY, RR_CASTLE_GROUNDS_FROM_GANONS_CASTLE, ENTR_CASTLE_GROUNDS_RAINBOW_BRIDGE_EXIT } }, @@ -1030,8 +1030,8 @@ int EntranceShuffler::ShuffleAllEntrances() { { EntranceType::GrottoGrave, RR_KF_STORMS_GROTTO, RR_KOKIRI_FOREST, ENTRANCE_GROTTO_EXIT(GROTTO_KF_STORMS_OFFSET) } }, { { EntranceType::GrottoGrave, RR_ZORAS_DOMAIN_ISLAND, RR_ZD_STORMS_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET) }, { EntranceType::GrottoGrave, RR_ZD_STORMS_GROTTO, RR_ZORAS_DOMAIN_ISLAND, ENTRANCE_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET) } }, - { { EntranceType::GrottoGrave, RR_GF_GROUND_ORANGE, RR_GF_STORMS_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET) }, - { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO, RR_GF_GROUND_ORANGE, ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET) } }, + { { EntranceType::GrottoGrave, RR_GF_GROUND_NEAR_GROTTO, RR_GF_STORMS_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET) }, + { EntranceType::GrottoGrave, RR_GF_STORMS_GROTTO, RR_GF_GROUND_NEAR_GROTTO, ENTRANCE_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET) } }, { { EntranceType::GrottoGrave, RR_GV_FORTRESS_SIDE, RR_GV_STORMS_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET) }, { EntranceType::GrottoGrave, RR_GV_STORMS_GROTTO, RR_GV_FORTRESS_SIDE, ENTRANCE_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET) } }, { { EntranceType::GrottoGrave, RR_GV_GROTTO_LEDGE, RR_GV_OCTOROK_GROTTO, ENTRANCE_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET) }, diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp index e7612c332..5840a6d74 100644 --- a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_fortress.cpp @@ -27,13 +27,13 @@ void RegionTable_Init_GerudoFortress() { areaTable[RR_GF_GROUND_GREY] = Region("GF Ground Grey", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(RR_GF_GROUND_RED, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), - Entrance(RR_GF_GROUND_ORANGE, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), - Entrance(RR_GF_GROUND_SALMON, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), - Entrance(RR_GF_GROUND_BOTTOM, []{return true;}), + Entrance(RR_GF_GROUND_RED, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), + Entrance(RR_GF_GROUND_OUTSIDE_GTG, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), + Entrance(RR_GF_GROUND_BOTTOM, []{return true;}), }); - areaTable[RR_GF_GROUND_ORANGE] = Region("GF Ground Orange", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[RR_GF_GROUND_NEAR_GROTTO] = Region("GF Ground Near Grotto", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(RR_TH_KITCHEN_BOTTOM, []{return true;}), Entrance(RR_TH_NORTH_F1_CARPENTER_AREA, []{return true;}), @@ -42,7 +42,7 @@ void RegionTable_Init_GerudoFortress() { Entrance(RR_GF_GROUND_GREY, []{return true;}), }); - areaTable[RR_GF_GROUND_SALMON] = Region("GF Ground Orange", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { + areaTable[RR_GF_GROUND_OUTSIDE_GTG] = Region("GF Ground Outside GTG", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { //Events EventAccess(&logic->GtG_GateOpen, []{return (logic->IsAdult && logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD) && logic->HasItem(RG_CHILD_WALLET));}), }, {}, { @@ -51,7 +51,7 @@ void RegionTable_Init_GerudoFortress() { Entrance(RR_GF_GROUND_GREY, []{return true;}), Entrance(RR_GF_HBA_RANGE, []{return logic->IsChild || logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}), Entrance(RR_GF_GROUND_BOTTOM, []{return true;}), - Entrance(RR_GF_ROOFTOP_WHITE, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), + Entrance(RR_GF_ROOFTOP_ABOVE_GTG, []{return logic->IsChild || logic->CanPassEnemy(RE_GERUDO_GUARD);}), }); #pragma endregion @@ -71,92 +71,92 @@ void RegionTable_Init_GerudoFortress() { Entrance(RR_GF_GROUND_GREY, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_WHITE] = Region("GF Rooftop White", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[RR_GF_ROOFTOP_ABOVE_GTG] = Region("GF Rooftop Above GTG", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(RR_TH_KITCHEN_BOTTOM, []{return true;}), // need to explicitly convert it into a bool - Entrance(RR_GF_ROOFTOP_LIME, []{return ctx->GetTrickOption(RT_GF_JUMP).Get() != 0;}), - Entrance(RR_TH_SOUTH_F2_CARPENTER_AREA, []{return true;}), - Entrance(RR_GF_GROUND_GREY, []{return true;}), - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), - Entrance(RR_GF_GROUND_SALMON, []{return true;}), + Entrance(RR_GF_ROOFTOP_BOTTOM_OF_LOWER_VINES, []{return ctx->GetTrickOption(RT_GF_JUMP).Get() != 0;}), + Entrance(RR_TH_SOUTH_F2_CARPENTER_AREA, []{return true;}), + Entrance(RR_GF_GROUND_GREY, []{return true;}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), + Entrance(RR_GF_GROUND_OUTSIDE_GTG, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_LIME] = Region("GF Rooftop Lime", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[RR_GF_ROOFTOP_BOTTOM_OF_LOWER_VINES] = Region("GF Rooftop Bottom of Lower Vines", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(RR_TH_SOUTH_F1_CARPENTER_AREA, []{return true;}), - Entrance(RR_GF_ROOFTOP_CYAN, []{return true /* logic->CanClimb() */;}), - Entrance(RR_GF_ROOFTOP_WHITE, []{return true;}), - Entrance(RR_GF_GROUND_GREY, []{return true;}), - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), + Entrance(RR_TH_SOUTH_F1_CARPENTER_AREA, []{return true;}), + Entrance(RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, []{return true /* logic->CanClimb() */;}), + Entrance(RR_GF_ROOFTOP_ABOVE_GTG, []{return true;}), + Entrance(RR_GF_GROUND_GREY, []{return true;}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_CYAN] = Region("GF Rooftop Cyan", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[RR_GF_ROOFTOP_TOP_OF_LOWER_VINES] = Region("GF Rooftop Top of Lower Vines", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(RR_TH_KITCHEN_TOP, []{return true;}), Entrance(RR_TH_SOUTH_F2_CARPENTER_AREA, []{return true;}), // need to explicitly convert it into a bool - Entrance(RR_GF_ROOFTOP_PURPLE, []{return ctx->GetTrickOption(RT_GF_JUMP).Get() != 0;}), - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), + Entrance(RR_GF_ROOFTOP_BOTTOM_OF_UPPER_VINES, []{return ctx->GetTrickOption(RT_GF_JUMP).Get() != 0;}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_PURPLE] = Region("GF Rooftop Purple", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[RR_GF_ROOFTOP_BOTTOM_OF_UPPER_VINES] = Region("GF Rooftop Bottom of Upper Vines", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(RR_GF_ROOFTOP_BLUE, []{return true /* logic->CanClimb() */;}), - Entrance(RR_GF_ROOFTOP_CYAN, []{return true;}), - Entrance(RR_GF_GROUND_SALMON, []{return true;}), + Entrance(RR_GF_ROOFTOP_TOP_OF_UPPER_VINES, []{return true /* logic->CanClimb() */;}), + Entrance(RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, []{return true;}), + Entrance(RR_GF_GROUND_OUTSIDE_GTG, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_MAGENTA] = Region("GF Rooftop Magenta", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { + areaTable[RR_GF_ROOFTOP_BELOW_GS] = Region("GF Rooftop Below GS", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { //Locations LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_LONGSHOT) && logic->CanGetNightTimeGS()), }, { //Exits Entrance(RR_TH_NORTH_F2_CARPENTER_AREA, []{return true;}), - Entrance(RR_GF_ROOFTOP_LIME, []{return true;}), + Entrance(RR_GF_ROOFTOP_BOTTOM_OF_LOWER_VINES, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_GREEN] = Region("GF Rooftop Green", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { + areaTable[RR_GF_ROOFTOP_NEAR_GS] = Region("GF Rooftop Near GS", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { //Locations LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOMB_THROW) && logic->CanGetNightTimeGS()), }, { //Exits Entrance(RR_TH_KITCHEN_TOP, []{return true;}), - Entrance(RR_GF_ROOFTOP_LIME, []{return true;}), - Entrance(RR_GF_ROOFTOP_MAGENTA, []{return true;}), + Entrance(RR_GF_ROOFTOP_BOTTOM_OF_LOWER_VINES, []{return true;}), + Entrance(RR_GF_ROOFTOP_BELOW_GS, []{return true;}), Entrance(RR_GF_ROOFTOP_LIMEGREEN, []{return logic->CanUse(RG_HOVER_BOOTS) /* || bunny hood jump */;}), - Entrance(RR_GF_ROOFTOP_VIOLET, []{return logic->IsAdult;}), + Entrance(RR_GF_ROOFTOP_SLOPED, []{return logic->IsAdult;}), }); - areaTable[RR_GF_ROOFTOP_VIOLET] = Region("GF Rooftop Violet", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[RR_GF_ROOFTOP_SLOPED] = Region("GF Rooftop Sloped", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(RR_GF_ROOFTOP_BLUE, []{return logic->IsAdult;}), - Entrance(RR_GF_ROOFTOP_CYAN, []{return true;}), - Entrance(RR_GF_ROOFTOP_GREEN, []{return true;}), - Entrance(RR_GF_ROOFTOP_LIME, []{return true;}), + Entrance(RR_GF_ROOFTOP_TOP_OF_UPPER_VINES, []{return logic->IsAdult;}), + Entrance(RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, []{return true;}), + Entrance(RR_GF_ROOFTOP_NEAR_GS, []{return true;}), + Entrance(RR_GF_ROOFTOP_BOTTOM_OF_LOWER_VINES, []{return true;}), }); - areaTable[RR_GF_ROOFTOP_BLUE] = Region("GF Rooftop Blue", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { + areaTable[RR_GF_ROOFTOP_TOP_OF_UPPER_VINES] = Region("GF Rooftop Top of Upper Vines", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { //Locations LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_SHORT_JUMPSLASH) /* && logic->CanClimb() (to get back up) */ && logic->CanGetNightTimeGS()), }, { //Exits - Entrance(RR_GF_ROOFTOP_CYAN, []{return true;}), - Entrance(RR_GF_ROOFTOP_PURPLE, []{return true;}), - Entrance(RR_GF_ROOFTOP_GREEN, []{return true;}), - Entrance(RR_GF_ROOFTOP_MAGENTA, []{return true;}), - Entrance(RR_GF_ROOFTOP_VIOLET, []{return true;}), - Entrance(RR_GF_ROOFTOP_TURQUOISE, []{return logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_LONGSHOT);}), + Entrance(RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, []{return true;}), + Entrance(RR_GF_ROOFTOP_BOTTOM_OF_UPPER_VINES, []{return true;}), + Entrance(RR_GF_ROOFTOP_NEAR_GS, []{return true;}), + Entrance(RR_GF_ROOFTOP_BELOW_GS, []{return true;}), + Entrance(RR_GF_ROOFTOP_SLOPED, []{return true;}), + Entrance(RR_GF_ROOFTOP_CHEST, []{return logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanUse(RG_SCARECROW) && logic->CanUse(RG_HOOKSHOT)) || logic->CanUse(RG_LONGSHOT);}), }); - areaTable[RR_GF_ROOFTOP_TURQUOISE] = Region("GF Rooftop Turquoise", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { + areaTable[RR_GF_ROOFTOP_CHEST] = Region("GF Rooftop Chest", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { //Locations LOCATION(RC_GF_CHEST, true), LOCATION(RC_GF_GS_TOP_FLOOR, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_LONG_JUMPSLASH) && logic->CanGetNightTimeGS()), }, { //Exits - Entrance(RR_GF_ROOFTOP_GREEN, []{return true;}), - Entrance(RR_GF_ROOFTOP_MAGENTA, []{return true;}), + Entrance(RR_GF_ROOFTOP_NEAR_GS, []{return true;}), + Entrance(RR_GF_ROOFTOP_BELOW_GS, []{return true;}), Entrance(RR_GF_ROOFTOP_LIMEGREEN, []{return true;}), Entrance(RR_GF_ROOFTOP_YELLOW, []{return true;}), }); @@ -178,7 +178,7 @@ void RegionTable_Init_GerudoFortress() { LOCATION(RC_GF_GS_ARCHERY_RANGE, logic->IsAdult && logic->CanGetEnemyDrop(RE_GOLD_SKULLTULA, ED_BOOMERANG) && logic->CanGetNightTimeGS()), }, { //Exits - Entrance(RR_GF_GROUND_SALMON, []{return logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}), + Entrance(RR_GF_GROUND_OUTSIDE_GTG, []{return logic->HasItem(RG_GERUDO_MEMBERSHIP_CARD);}), }); areaTable[RR_GF_OUTSIDE_GATE] = Region("GF Outside Gate", "Gerudo Fortress", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { @@ -205,6 +205,6 @@ void RegionTable_Init_GerudoFortress() { LOCATION(RC_GF_FAIRY_GROTTO_FAIRY_8, true), }, { //Exits - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), }); } \ No newline at end of file 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 b73b283c1..d7bf7be01 100644 --- a/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp @@ -17,8 +17,8 @@ void RegionTable_Init_ThievesHideout() { LOCATION(RC_TH_GERUDO_MEMBERSHIP_CARD, logic->TH_RescuedAllCarpenters), }, { //Exits - Entrance(RR_GF_GROUND_RED, []{return true;}), - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), + Entrance(RR_GF_GROUND_RED, []{return true;}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), }); areaTable[RR_TH_SOUTH_F1_CARPENTER_AREA] = Region("Thieves Hideout South F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { @@ -38,8 +38,8 @@ void RegionTable_Init_ThievesHideout() { LOCATION(RC_TH_GERUDO_MEMBERSHIP_CARD, logic->TH_RescuedAllCarpenters), }, { //Exits - Entrance(RR_GF_GROUND_RED, []{return true;}), - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), + Entrance(RR_GF_GROUND_RED, []{return true;}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), }); areaTable[RR_TH_NORTH_F2_CARPENTER_AREA] = Region("Thieves Hideout North F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { @@ -54,7 +54,7 @@ void RegionTable_Init_ThievesHideout() { LOCATION(RC_TH_GERUDO_MEMBERSHIP_CARD, logic->TH_RescuedAllCarpenters), }, { //Exits - Entrance(RR_GF_ROOFTOP_MAGENTA, []{return true;}), + Entrance(RR_GF_ROOFTOP_BELOW_GS, []{return true;}), }); areaTable[RR_TH_SOUTH_F2_CARPENTER_AREA] = Region("Thieves Hideout South F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { @@ -67,15 +67,15 @@ void RegionTable_Init_ThievesHideout() { LOCATION(RC_TH_GERUDO_MEMBERSHIP_CARD, logic->TH_RescuedAllCarpenters), }, { //Exits - Entrance(RR_GF_ROOFTOP_WHITE, []{return true;}), - Entrance(RR_GF_ROOFTOP_CYAN, []{return true;}), + Entrance(RR_GF_ROOFTOP_ABOVE_GTG, []{return true;}), + Entrance(RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, []{return true;}), }); areaTable[RR_TH_KITCHEN_BOTTOM] = Region("Thieves Hideout Kitchen Bottom", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(RR_GF_GROUND_ORANGE, []{return true;}), - Entrance(RR_GF_ROOFTOP_WHITE, []{return true;}), - Entrance(RR_TH_KITCHEN_MAIN, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || ctx->GetTrickOption(RT_TH_KITCHEN);}), + Entrance(RR_GF_GROUND_NEAR_GROTTO, []{return true;}), + Entrance(RR_GF_ROOFTOP_ABOVE_GTG, []{return true;}), + Entrance(RR_TH_KITCHEN_MAIN, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || ctx->GetTrickOption(RT_TH_KITCHEN);}), }); areaTable[RR_TH_KITCHEN_MAIN] = Region("Thieves Hideout Kitchen Bottom", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { @@ -91,9 +91,9 @@ void RegionTable_Init_ThievesHideout() { areaTable[RR_TH_KITCHEN_TOP] = Region("Thieves Hideout Kitchen Top", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(RR_TH_KITCHEN_MAIN, []{return true;}), - Entrance(RR_GF_ROOFTOP_GREEN, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_TH_KITCHEN);}), - Entrance(RR_GF_ROOFTOP_CYAN, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_TH_KITCHEN);}), + Entrance(RR_TH_KITCHEN_MAIN, []{return true;}), + Entrance(RR_GF_ROOFTOP_NEAR_GS, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_TH_KITCHEN);}), + Entrance(RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, []{return logic->CanPassEnemy(RE_GERUDO_GUARD) || logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_TH_KITCHEN);}), }); areaTable[RR_TH_BREAK_ROOM] = Region("Thieves Hideout Break Room", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {}, { diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 5d378aff0..f653e1e2c 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -407,19 +407,19 @@ typedef enum { RR_GF_GROUND_BOTTOM, RR_GF_GROUND_RED, RR_GF_GROUND_GREY, - RR_GF_GROUND_SALMON, - RR_GF_GROUND_ORANGE, + RR_GF_GROUND_OUTSIDE_GTG, + RR_GF_GROUND_NEAR_GROTTO, RR_GF_ROOFTOP_YELLOW, RR_GF_ROOFTOP_LIMEGREEN, - RR_GF_ROOFTOP_WHITE, - RR_GF_ROOFTOP_LIME, - RR_GF_ROOFTOP_CYAN, - RR_GF_ROOFTOP_PURPLE, - RR_GF_ROOFTOP_MAGENTA, - RR_GF_ROOFTOP_GREEN, - RR_GF_ROOFTOP_VIOLET, - RR_GF_ROOFTOP_BLUE, - RR_GF_ROOFTOP_TURQUOISE, + RR_GF_ROOFTOP_ABOVE_GTG, + RR_GF_ROOFTOP_BOTTOM_OF_LOWER_VINES, + RR_GF_ROOFTOP_TOP_OF_LOWER_VINES, + RR_GF_ROOFTOP_BOTTOM_OF_UPPER_VINES, + RR_GF_ROOFTOP_BELOW_GS, + RR_GF_ROOFTOP_NEAR_GS, + RR_GF_ROOFTOP_SLOPED, + RR_GF_ROOFTOP_TOP_OF_UPPER_VINES, + RR_GF_ROOFTOP_CHEST, RR_GF_HBA_RANGE, RR_GF_TOP_LEDGE, RR_GF_OUTSIDE_GATE,