Skip to content

Entrance Graph #6801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pepe20129 wants to merge 12 commits into
base: develop
Choose a base branch
from
+976 −8
Open

Entrance Graph #6801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e74a01
Add Graph
Pepe20129 Jun 20, 2026
0ba9041
Add a graph window
Pepe20129 Jun 20, 2026
4c0e35e
Fix some things that have been noticed due to the graph
Pepe20129 Jun 20, 2026
8840056
Specifiers & attributes
Pepe20129 Jun 22, 2026
7237c74
Optimization
Pepe20129 Jun 22, 2026
c239ffa
Update randomizer_entrance_tracker_graph.cpp
Pepe20129 Jun 22, 2026
74f6f66
Merge branch 'develop' into entrance_graph
Pepe20129 Jun 22, 2026
70ad8c0
Update Graph.cpp
Pepe20129 Jun 22, 2026
7005a43
Touchups
Pepe20129 Jun 22, 2026
7b5928d
clang
Pepe20129 Jun 22, 2026
7b29ee5
Tighten the assert and check before calling Graph::Draw
Pepe20129 Jun 26, 2026
7db2199
Merge branch 'develop' into entrance_graph
Pepe20129 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions soh/soh/Enhancements/randomizer/location_access/dungeons/ganons_castle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,16 +853,16 @@ void RegionTable_Init_GanonsCastle() {
LOCATION(RC_GANONS_CASTLE_GANONS_TOWER_POT_18, logic->CanBreakPots()),
}, {
//Exits
ENTRANCE(RR_GANONS_TOWER_STAIRS_4, true;),
ENTRANCE(RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR, true;),
ENTRANCE(RR_GANONS_TOWER_STAIRS_4, true),
ENTRANCE(RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR, true),
});

areaTable[RR_GANONS_TOWER_BEFORE_GANONDORF_LAIR] = Region("Ganon's Tower Before Ganondorf's Lair", SCENE_GANONS_TOWER, {}, {
//Locations
LOCATION(RC_GANONS_BOSS_KEY_HINT, true),
}, {
//Exits
ENTRANCE(RR_GANONS_TOWER_POT_ROOM, false;),
ENTRANCE(RR_GANONS_TOWER_POT_ROOM, false),
ENTRANCE(RR_GANONS_TOWER_GANONDORF_LAIR, AnyAgeTime([]{return logic->HasItem(RG_GANONS_CASTLE_BOSS_KEY);})),
});

Expand Down
5 changes: 0 additions & 5 deletions soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerRegion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ RANDO_ENUM_ITEM(RR_LW_NEAR_SHORTCUTS_GROTTO)
RANDO_ENUM_ITEM(RR_DEKU_THEATER)
RANDO_ENUM_ITEM(RR_LW_SCRUBS_GROTTO)
RANDO_ENUM_ITEM(RR_SFM_ENTRYWAY)
RANDO_ENUM_ITEM(RR_SFM_MAZE)
RANDO_ENUM_ITEM(RR_SFM_ABOVE_MAZE)
RANDO_ENUM_ITEM(RR_SFM_OUTSIDE_FAIRY_GROTTO)
RANDO_ENUM_ITEM(RR_SACRED_FOREST_MEADOW)
Expand Down Expand Up @@ -683,7 +682,6 @@ RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_STORAGE_ROOM)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_LIZALFOS_LOOP_A)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_LIZALFOS_LOOP_LM)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_LIZALFOS_CAGE)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_3F_EAST_LEDGE)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_OUTSIDE_WATERFALL)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_WATERFALL)
RANDO_ENUM_ITEM(RR_WATER_TEMPLE_MQ_WATERFALL_TOP)
Expand Down Expand Up @@ -861,7 +859,6 @@ RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_WOODEN_SPIKES)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_PRE_BOSS_ROOM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_BOSS_DOOR)

RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_ENTRYWAY)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_BEGINNING)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_SPINNER_ROOM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_START)
Expand Down Expand Up @@ -1017,7 +1014,6 @@ RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FIRE_TRIAL_FROM_BARRED)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FIRE_TRIAL_BARRED_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FIRE_TRIAL_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_WATER_TRIAL_BLUE_FIRE_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_WATER_TRIAL_BLUE_FIRE_ROOM_END)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_WATER_TRIAL_BLOCK_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_WATER_TRIAL_BLOCK_ROOM_SWITCH)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_WATER_TRIAL_BLOCK_ROOM_END)
Expand Down Expand Up @@ -1049,7 +1045,6 @@ RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_OPEN_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FROM_OPEN)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FROM_BARRED)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_BARRED_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_TARGET_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM)
Expand Down
Loading
Loading