Add missing water trial pot

aMannus · Jan 27, 2024 · 3f92f7d · 3f92f7d
1 parent 5148355
commit 3f92f7d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -807,6 +807,7 @@ const std::vector<FlagTable> flagTables = {
         { RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2" },
         { RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1" },
         { RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2" },
+        { RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3" },
         { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1" },
         { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2" },
         { RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3" },

diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -1071,6 +1071,7 @@ Dungeons::Dungeons() {
                         RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,
                         RC_GANONS_CASTLE_WATER_TRIAL_POT_1,
                         RC_GANONS_CASTLE_WATER_TRIAL_POT_2,
+                        RC_GANONS_CASTLE_WATER_TRIAL_POT_3,
                         RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
                         RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
                         RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1800,6 +1800,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_GANONS_CASTLE_FIRE_TRIAL_POT_1]          	=	Location::Base(RC_GANONS_CASTLE_FIRE_TRIAL_POT_1,           RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(-2051, -3855), 0x6003,     "Fire Trial Pot 1",                 "Ganons Castle Fire 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_WATER_TRIAL_POT_1]         	=	Location::Base(RC_GANONS_CASTLE_WATER_TRIAL_POT_1,          RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(3558, -920),   0x7203,     "Water Trial Pot 1",                "Ganons Castle Water 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_WATER_TRIAL_POT_2]         	=	Location::Base(RC_GANONS_CASTLE_WATER_TRIAL_POT_2,          RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(3558, -761),   0x740F,     "Water Trial Pot 2",                "Ganons Castle Water 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_WATER_TRIAL_POT_3]         	=	Location::Base(RC_GANONS_CASTLE_WATER_TRIAL_POT_3,          RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2822, -507),   0x740F,     "Water Trial Pot 3",                "Ganons Castle Water Trial Pot 3",          RHT_POT_GANONS_CASTLE,	        RG_GREEN_RUPEE,     { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1]        	=	Location::Base(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,         RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1234, -3418),  0x5A09,     "Shadow Trial Pot 1",               "Ganons Castle Shadow Trial Pot 1",         RHT_POT_GANONS_CASTLE,	        RG_ARROWS_10,       { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
     locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2]        	=	Location::Base(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,         RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(1621, -3203),  0x5E0E,     "Shadow Trial Pot 2",               "Ganons Castle Shadow 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_SHADOW_TRIAL_POT_3]        	=	Location::Base(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,         RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE,      ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE,        TWO_ACTOR_PARAMS(2067, -4592),  0x6209,     "Shadow Trial Pot 3",               "Ganons Castle Shadow Trial Pot 3",         RHT_POT_GANONS_CASTLE,	        RG_ARROWS_10,       { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1837,6 +1837,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
     { RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,                                RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2 },
     { RC_GANONS_CASTLE_WATER_TRIAL_POT_1,                               RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1 },
     { RC_GANONS_CASTLE_WATER_TRIAL_POT_2,                               RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2 },
+    { RC_GANONS_CASTLE_WATER_TRIAL_POT_3,                               RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3 },
     { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1 },
     { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2 },
     { RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,                              RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3 },

diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -1890,6 +1890,7 @@ typedef enum {
     RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,
     RC_GANONS_CASTLE_WATER_TRIAL_POT_1,
     RC_GANONS_CASTLE_WATER_TRIAL_POT_2,
+    RC_GANONS_CASTLE_WATER_TRIAL_POT_3,
     RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
     RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
     RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,

diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -497,6 +497,7 @@ typedef enum {
     RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2,
     RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1,
     RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2,
+    RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3,
     RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
     RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
     RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3,