mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 14:22:17 -05:00
Code Issues Projects Releases Wiki Activity

Fix Ganondorf's Lair pots

Browse Source
This commit is contained in:
aMannus 2024-01-21 12:45:41 +01:00
parent cee52fba10
commit c2ffbe7201
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
soh/soh/Enhancements/randomizer/location_list.cpp
View File

@ -1690,12 +1690,12 @@ void Rando::StaticData::InitLocationTable() {
locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1] = Location::Base(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-1295, -3612), 0x540c, "Above Big Octo Pot 1", "Jabu Jabus Belly Above Big Octo Pot 1", RHT_POT_JABU_JABUS_BELLY, RG_DEKU_NUTS_5, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2] = Location::Base(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-1355, -3612), 0x5012, "Above Big Octo Pot 2", "Jabu Jabus Belly Above Big Octo Pot 2", RHT_POT_JABU_JABUS_BELLY, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3] = Location::Base(RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-1422, -3612), 0x520c, "Above Big Octo Pot 3", "Jabu Jabus Belly Above Big Octo Pot 3", RHT_POT_JABU_JABUS_BELLY, RG_DEKU_NUTS_5, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_1] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-551, -33), 0x4a03, "Barinade Pot 1", "Jabu Jabus Belly Barinade Pot 1", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_2] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(551, 36), 0x4803, "Barinade Pot 2", "Jabu Jabus Belly Barinade Pot 2", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_3] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(554, -493), 0x4603, "Barinade Pot 3", "Jabu Jabus Belly Barinade Pot 3", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_4] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_4, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-543, -496), 0x4403, "Barinade Pot 4", "Jabu Jabus Belly Barinade Pot 4", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_5] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_5, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-268, -786), 0x4203, "Barinade Pot 5", "Jabu Jabus Belly Barinade Pot 5", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_6] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_6, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(279, -761), 0x4003, "Barinade Pot 6", "Jabu Jabus Belly Barinade Pot 6", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_1] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_1, RCQUEST_BOTH, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU_BOSS, TWO_ACTOR_PARAMS(-551, -33), 0x4a03, "Barinade Pot 1", "Jabu Jabus Belly Barinade Pot 1", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_2] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_2, RCQUEST_BOTH, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU_BOSS, TWO_ACTOR_PARAMS(551, 36), 0x4803, "Barinade Pot 2", "Jabu Jabus Belly Barinade Pot 2", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_3] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_3, RCQUEST_BOTH, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU_BOSS, TWO_ACTOR_PARAMS(554, -493), 0x4603, "Barinade Pot 3", "Jabu Jabus Belly Barinade Pot 3", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_4] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_4, RCQUEST_BOTH, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU_BOSS, TWO_ACTOR_PARAMS(-543, -496), 0x4403, "Barinade Pot 4", "Jabu Jabus Belly Barinade Pot 4", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_5] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_5, RCQUEST_BOTH, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU_BOSS, TWO_ACTOR_PARAMS(-268, -786), 0x4203, "Barinade Pot 5", "Jabu Jabus Belly Barinade Pot 5", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BARINADE_POT_6] = Location::Base(RC_JABU_JABUS_BELLY_BARINADE_POT_6, RCQUEST_BOTH, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU_BOSS, TWO_ACTOR_PARAMS(279, -761), 0x4003, "Barinade Pot 6", "Jabu Jabus Belly Barinade Pot 6", RHT_POT_JABU_JABUS_BELLY, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_1] = Location::Base(RC_JABU_JABUS_BELLY_BASEMENT_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(703, -2371), 0x4c12, "Basement Pot 1", "Jabu Jabus Belly Basement Pot 1", RHT_POT_JABU_JABUS_BELLY, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_2] = Location::Base(RC_JABU_JABUS_BELLY_BASEMENT_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(645, -2408), 0x4a10, "Basement Pot 2", "Jabu Jabus Belly Basement Pot 2", RHT_POT_JABU_JABUS_BELLY, RG_DEKU_SEEDS_30, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
locationTable[RC_JABU_JABUS_BELLY_BASEMENT_POT_3] = Location::Base(RC_JABU_JABUS_BELLY_BASEMENT_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_JABU_JABUS_BELLY, ACTOR_OBJ_TSUBO, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(650, -2344), 0x4dac, "Basement Pot 3", "Jabu Jabus Belly Basement Pot 3", RHT_POT_JABU_JABUS_BELLY, RG_DEKU_NUTS_5, { Category::cPot }, SpoilerCollectionCheck::Pot(0x02, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
@ -1811,24 +1811,24 @@ void Rando::StaticData::InitLocationTable() {
locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1] = Location::Base(RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2581, -839), 0x4A2A, "Light Trial Boulder Pot 1", "Ganons Castle Light Trial Boulder Pot 1", RHT_POT_GANONS_CASTLE, RG_ARROWS_30, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1] = Location::Base(RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-3840, -923), 0x7603, "Light Trial Pot 1", "Ganons Castle Light Trial Pot 1", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2] = Location::Base(RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-3840, -755), 0x780E, "Light Trial Pot 2", "Ganons Castle Light Trial Pot 2", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_1] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-422, -258), 0x400E, "Ganons Tower Pot 1", "Ganons Castle Ganons Tower Pot 1", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_2] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-382, -300), 0x4203, "Ganons Tower Pot 2", "Ganons Castle Ganons Tower Pot 2", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_3] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-342, -341), 0x440F, "Ganons Tower Pot 3", "Ganons Castle Ganons Tower Pot 3", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_4] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_4, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-298, -383), 0x460F, "Ganons Tower Pot 4", "Ganons Castle Ganons Tower Pot 4", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_5] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_5, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-257, -424), 0x4803, "Ganons Tower Pot 5", "Ganons Castle Ganons Tower Pot 5", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_6] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_6, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-382, -259), 0x4A09, "Ganons Tower Pot 6", "Ganons Castle Ganons Tower Pot 6", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_7] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_7, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-342, -300), 0x4C09, "Ganons Tower Pot 7", "Ganons Castle Ganons Tower Pot 7", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_8] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_8, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-301, -341), 0x4E03, "Ganons Tower Pot 8", "Ganons Castle Ganons Tower Pot 8", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_9] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_9, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-258, -383), 0x503F, "Ganons Tower Pot 9", "Ganons Castle Ganons Tower Pot 9", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_10] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_10, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(418, -261), 0x523F, "Ganons Tower Pot 10", "Ganons Castle Ganons Tower Pot 10", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_11] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_11, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(377, -301), 0x5409, "Ganons Tower Pot 11", "Ganons Castle Ganons Tower Pot 11", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_12] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_12, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(338, -340), 0x5609, "Ganons Tower Pot 12", "Ganons Castle Ganons Tower Pot 12", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_13] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_13, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(300, -380), 0x5803, "Ganons Tower Pot 13", "Ganons Castle Ganons Tower Pot 13", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_14] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_14, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(260, -420), 0x5A03, "Ganons Tower Pot 14", "Ganons Castle Ganons Tower Pot 14", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_15] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_15, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(378, -261), 0x5C03, "Ganons Tower Pot 15", "Ganons Castle Ganons Tower Pot 15", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_16] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_16, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(337, -300), 0x5E3F, "Ganons Tower Pot 16", "Ganons Castle Ganons Tower Pot 16", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_17] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_17, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(299, -340), 0x603F, "Ganons Tower Pot 17", "Ganons Castle Ganons Tower Pot 17", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_18] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_18, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(260, -380), 0x6209, "Ganons Tower Pot 18", "Ganons Castle Ganons Tower Pot 18", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_1] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_1, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-422, -258), 0x400E, "Ganons Tower Pot 1", "Ganons Castle Ganons Tower Pot 1", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_2] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_2, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-382, -300), 0x4203, "Ganons Tower Pot 2", "Ganons Castle Ganons Tower Pot 2", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_3] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_3, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-342, -341), 0x440F, "Ganons Tower Pot 3", "Ganons Castle Ganons Tower Pot 3", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_4] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_4, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-298, -383), 0x460F, "Ganons Tower Pot 4", "Ganons Castle Ganons Tower Pot 4", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_5] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_5, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-257, -424), 0x4803, "Ganons Tower Pot 5", "Ganons Castle Ganons Tower Pot 5", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_6] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_6, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-382, -259), 0x4A09, "Ganons Tower Pot 6", "Ganons Castle Ganons Tower Pot 6", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_7] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_7, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-342, -300), 0x4C09, "Ganons Tower Pot 7", "Ganons Castle Ganons Tower Pot 7", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_8] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_8, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-301, -341), 0x4E03, "Ganons Tower Pot 8", "Ganons Castle Ganons Tower Pot 8", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_9] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_9, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(-258, -383), 0x503F, "Ganons Tower Pot 9", "Ganons Castle Ganons Tower Pot 9", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_10] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_10, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(418, -261), 0x523F, "Ganons Tower Pot 10", "Ganons Castle Ganons Tower Pot 10", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_11] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_11, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(377, -301), 0x5409, "Ganons Tower Pot 11", "Ganons Castle Ganons Tower Pot 11", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_12] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_12, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(338, -340), 0x5609, "Ganons Tower Pot 12", "Ganons Castle Ganons Tower Pot 12", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_13] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_13, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(300, -380), 0x5803, "Ganons Tower Pot 13", "Ganons Castle Ganons Tower Pot 13", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_14] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_14, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(260, -420), 0x5A03, "Ganons Tower Pot 14", "Ganons Castle Ganons Tower Pot 14", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_15] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_15, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(378, -261), 0x5C03, "Ganons Tower Pot 15", "Ganons Castle Ganons Tower Pot 15", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_16] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_16, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(337, -300), 0x5E3F, "Ganons Tower Pot 16", "Ganons Castle Ganons Tower Pot 16", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_17] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_17, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(299, -340), 0x603F, "Ganons Tower Pot 17", "Ganons Castle Ganons Tower Pot 17", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_GANONS_TOWER_POT_18] = Location::Base(RC_GANONS_CASTLE_GANONS_TOWER_POT_18, RCQUEST_BOTH, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_GANONS_TOWER, TWO_ACTOR_PARAMS(260, -380), 0x6209, "Ganons Tower Pot 18", "Ganons Castle Ganons Tower Pot 18", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0A, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1] = Location::Base(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_OBJ_TSUBO, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(-95, -673), 0x4E03, "Basement Pot 1", "Bottom Of The Well Basement Pot 1", RHT_POT_BOTTOM_OF_THE_WELL, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x08, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2] = Location::Base(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_OBJ_TSUBO, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(75, -598), 0x500E, "Basement Pot 2", "Bottom Of The Well Basement Pot 2", RHT_POT_BOTTOM_OF_THE_WELL, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x08, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);
locationTable[RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3] = Location::Base(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_BOTTOM_OF_THE_WELL, ACTOR_OBJ_TSUBO, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(270, -1151), 0x5203, "Basement Pot 3", "Bottom Of The Well Basement Pot 3", RHT_POT_BOTTOM_OF_THE_WELL, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x08, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_BOTTOM_OF_THE_WELL);

9
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -2432,13 +2432,20 @@ CowIdentity Randomizer::IdentifyCow(s32 sceneNum, s32 posX, s32 posZ) {
PotIdentity Randomizer::IdentifyPot(s32 sceneNum, s32 posX, s32 posZ) {
struct PotIdentity potIdentity;
uint32_t potSceneNum;
if (sceneNum == SCENE_GANONDORF_BOSS) {
potSceneNum = SCENE_GANONS_TOWER;
} else {
potSceneNum = sceneNum;
}
potIdentity.randomizerInf = RAND_INF_MAX;
potIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
s32 actorParams = TWO_ACTOR_PARAMS(posX, posZ);
Rando::Location* location = GetCheckObjectFromActor(ACTOR_OBJ_TSUBO, sceneNum, actorParams);
Rando::Location* location = GetCheckObjectFromActor(ACTOR_OBJ_TSUBO, potSceneNum, actorParams);
if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
potIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];