Skip to content

Commit

Permalink
Fix ganon's tower, barinade, water temple pots
Browse files Browse the repository at this point in the history
  • Loading branch information
@aMannus
aMannus committed Aug 31, 2024
1 parent ced2297 commit 467f6b1
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 184 deletions.
30 changes: 4 additions & 26 deletions soh/soh/Enhancements/debugger/debugSaveEditor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,12 +745,14 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_2" },
{ RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_3" },
{ RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4, "RAND_INF_WATER_TEMPLE_BEHIND_GATE_POT_4" },
{ RAND_INF_WATER_TEMPLE_BASEMENT_POT_1, "RAND_INF_WATER_TEMPLE_BASEMENT_POT_1" },
{ RAND_INF_WATER_TEMPLE_BASEMENT_POT_2, "RAND_INF_WATER_TEMPLE_BASEMENT_POT_2" },
{ RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1, "RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1" },
{ RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2, "RAND_INF_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2" },
{ RAND_INF_WATER_TEMPLE_RIVER_POT_1, "RAND_INF_WATER_TEMPLE_RIVER_POT_1" },
{ RAND_INF_WATER_TEMPLE_RIVER_POT_2, "RAND_INF_WATER_TEMPLE_RIVER_POT_2" },
{ RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1, "RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_1" },
{ RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2, "RAND_INF_WATER_TEMPLE_LIKE_LIKE_POT_2" },
{ RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1, "RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_1" },
{ RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2, "RAND_INF_WATER_TEMPLE_BOSS_KEY_POT_2" },
{ RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1, "RAND_INF_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1" },
{ RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1" },
{ RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2, "RAND_INF_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2" },
Expand Down Expand Up @@ -859,12 +861,6 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2, "RAND_INF_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_1, "RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_1" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_2, "RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_2" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_3, "RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_3" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_4, "RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_4" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_5, "RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_5" },
{ RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_6, "RAND_INF_JABU_JABUS_BELLY_MQ_BARINADE_POT_6" },
{ RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_1" },
{ RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_2" },
{ RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3, "RAND_INF_FOREST_TEMPLE_MQ_LOBBY_POT_3" },
Expand Down Expand Up @@ -916,24 +912,6 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2" },
{ RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1, "RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_1" },
{ RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2, "RAND_INF_DODONGOS_CAVERN_MQ_BACKROOM_POT_2" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_1, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_1" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_2, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_2" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_3, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_3" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_4, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_4" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_5, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_5" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_6, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_6" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_7, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_7" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_8, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_8" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_9, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_9" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_10, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_10" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_11, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_11" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_12, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_12" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_13, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_13" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_14, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_14" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_15, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_15" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_16, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_16" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_17, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_17" },
{ RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_18, "RAND_INF_GANONS_CASTLE_MQ_GANONS_TOWER_POT_18" },
{ RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1" },
{ RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2" },
{ RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1" },
Expand Down
82 changes: 32 additions & 50 deletions soh/soh/Enhancements/randomizer/dungeon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,6 @@ Dungeons::Dungeons() {
RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1,
RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2,
RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3,
RC_JABU_JABUS_BELLY_BARINADE_POT_1,
RC_JABU_JABUS_BELLY_BARINADE_POT_2,
RC_JABU_JABUS_BELLY_BARINADE_POT_3,
RC_JABU_JABUS_BELLY_BARINADE_POT_4,
RC_JABU_JABUS_BELLY_BARINADE_POT_5,
RC_JABU_JABUS_BELLY_BARINADE_POT_6,
RC_JABU_JABUS_BELLY_BASEMENT_POT_1,
RC_JABU_JABUS_BELLY_BASEMENT_POT_2,
RC_JABU_JABUS_BELLY_BASEMENT_POT_3,
Expand Down Expand Up @@ -364,18 +358,20 @@ Dungeons::Dungeons() {
RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1,
RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2,
RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_1,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_2,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_3,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_4,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_5,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_6,
},
{},
{
// Boss Room Locations
RC_JABU_JABUS_BELLY_BARINADE_HEART,
RC_BARINADE,

// Boss Room Pots
RC_JABU_JABUS_BELLY_BARINADE_POT_1,
RC_JABU_JABUS_BELLY_BARINADE_POT_2,
RC_JABU_JABUS_BELLY_BARINADE_POT_3,
RC_JABU_JABUS_BELLY_BARINADE_POT_4,
RC_JABU_JABUS_BELLY_BARINADE_POT_5,
RC_JABU_JABUS_BELLY_BARINADE_POT_6,
});
dungeonList[FOREST_TEMPLE] =
DungeonInfo("Forest Temple", RHT_FOREST_TEMPLE, RG_FOREST_TEMPLE_MAP, RG_FOREST_TEMPLE_COMPASS,
Expand Down Expand Up @@ -606,12 +602,14 @@ Dungeons::Dungeons() {
RC_WATER_TEMPLE_BEHIND_GATE_POT_2,
RC_WATER_TEMPLE_BEHIND_GATE_POT_3,
RC_WATER_TEMPLE_BEHIND_GATE_POT_4,
RC_WATER_TEMPLE_BASEMENT_POT_1,
RC_WATER_TEMPLE_BASEMENT_POT_2,
RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_1,
RC_WATER_TEMPLE_BASEMENT_BLOCK_PUZZLE_POT_2,
RC_WATER_TEMPLE_RIVER_POT_1,
RC_WATER_TEMPLE_RIVER_POT_2,
RC_WATER_TEMPLE_LIKE_LIKE_POT_1,
RC_WATER_TEMPLE_LIKE_LIKE_POT_2,
RC_WATER_TEMPLE_BOSS_KEY_POT_1,
RC_WATER_TEMPLE_BOSS_KEY_POT_2,
},
{
// MQ Locations
Expand Down Expand Up @@ -1091,24 +1089,6 @@ Dungeons::Dungeons() {
RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1,
RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1,
RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2,
RC_GANONS_CASTLE_GANONS_TOWER_POT_1,
RC_GANONS_CASTLE_GANONS_TOWER_POT_2,
RC_GANONS_CASTLE_GANONS_TOWER_POT_3,
RC_GANONS_CASTLE_GANONS_TOWER_POT_4,
RC_GANONS_CASTLE_GANONS_TOWER_POT_5,
RC_GANONS_CASTLE_GANONS_TOWER_POT_6,
RC_GANONS_CASTLE_GANONS_TOWER_POT_7,
RC_GANONS_CASTLE_GANONS_TOWER_POT_8,
RC_GANONS_CASTLE_GANONS_TOWER_POT_9,
RC_GANONS_CASTLE_GANONS_TOWER_POT_10,
RC_GANONS_CASTLE_GANONS_TOWER_POT_11,
RC_GANONS_CASTLE_GANONS_TOWER_POT_12,
RC_GANONS_CASTLE_GANONS_TOWER_POT_13,
RC_GANONS_CASTLE_GANONS_TOWER_POT_14,
RC_GANONS_CASTLE_GANONS_TOWER_POT_15,
RC_GANONS_CASTLE_GANONS_TOWER_POT_16,
RC_GANONS_CASTLE_GANONS_TOWER_POT_17,
RC_GANONS_CASTLE_GANONS_TOWER_POT_18,
},
{
// MQ Locations
Expand All @@ -1132,24 +1112,6 @@ Dungeons::Dungeons() {
RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,

// MQ Pots
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_1,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_2,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_3,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_4,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_5,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_6,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_7,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_8,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_9,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_10,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_11,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_12,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_13,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_14,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_15,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_16,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_17,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_18,
RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2,
RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1,
Expand All @@ -1167,6 +1129,26 @@ Dungeons::Dungeons() {
// Shared Locations
RC_GANONS_TOWER_BOSS_KEY_CHEST,
RC_GANON,

// Shared Pots
RC_GANONS_CASTLE_GANONS_TOWER_POT_1,
RC_GANONS_CASTLE_GANONS_TOWER_POT_2,
RC_GANONS_CASTLE_GANONS_TOWER_POT_3,
RC_GANONS_CASTLE_GANONS_TOWER_POT_4,
RC_GANONS_CASTLE_GANONS_TOWER_POT_5,
RC_GANONS_CASTLE_GANONS_TOWER_POT_6,
RC_GANONS_CASTLE_GANONS_TOWER_POT_7,
RC_GANONS_CASTLE_GANONS_TOWER_POT_8,
RC_GANONS_CASTLE_GANONS_TOWER_POT_9,
RC_GANONS_CASTLE_GANONS_TOWER_POT_10,
RC_GANONS_CASTLE_GANONS_TOWER_POT_11,
RC_GANONS_CASTLE_GANONS_TOWER_POT_12,
RC_GANONS_CASTLE_GANONS_TOWER_POT_13,
RC_GANONS_CASTLE_GANONS_TOWER_POT_14,
RC_GANONS_CASTLE_GANONS_TOWER_POT_15,
RC_GANONS_CASTLE_GANONS_TOWER_POT_16,
RC_GANONS_CASTLE_GANONS_TOWER_POT_17,
RC_GANONS_CASTLE_GANONS_TOWER_POT_18,
},
{});
}
Expand Down
Loading

0 comments on commit 467f6b1

Please sign in to comment.