From bc7efa5257f9dbf205b2d545958de38b2170b5d9 Mon Sep 17 00:00:00 2001 From: aMannus Date: Wed, 24 Jan 2024 10:25:24 +0100 Subject: [PATCH] Minor fixes --- soh/soh/Enhancements/randomizer/location_list.cpp | 2 +- soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp index d4e88c3ef..7ebb530ac 100644 --- a/soh/soh/Enhancements/randomizer/location_list.cpp +++ b/soh/soh/Enhancements/randomizer/location_list.cpp @@ -1680,7 +1680,7 @@ void Rando::StaticData::InitLocationTable() { locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1] = Location::Base(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(3704, -483), 0x7401, "Single Eye Pot 1", "Dodongos Cavern Single Eye Pot 1", RHT_POT_DODONGOS_CAVERN, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); locationTable[RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2] = Location::Base(RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(3195, -155), 0x7203, "Single Eye Pot 2", "Dodongos Cavern Single Eye Pot 2", RHT_POT_DODONGOS_CAVERN, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); locationTable[RC_DODONGOS_CAVERN_BLADE_POT_1] = Location::Base(RC_DODONGOS_CAVERN_BLADE_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(1656, -531), 0x6e03, "Blade Pot 1", "Dodongos Cavern Blade Pot 1", RHT_POT_DODONGOS_CAVERN, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); - locationTable[RC_DODONGOS_CAVERN_BLADE_POT_2] = Location::Base(RC_DODONGOS_CAVERN_BLADE_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(1931, -593), 0x7003, "Blade Pot 2", "Dodongos Cavern Blade Pot 2", RHT_POT_DODONGOS_CAVERN, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); + locationTable[RC_DODONGOS_CAVERN_BLADE_POT_2] = Location::Base(RC_DODONGOS_CAVERN_BLADE_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(1831, -593), 0x7003, "Blade Pot 2", "Dodongos Cavern Blade Pot 2", RHT_POT_DODONGOS_CAVERN, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); locationTable[RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1] = Location::Base(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(3329, -753), 0x7801, "Double Eye Pot 1", "Dodongos Cavern Double Eye Pot 1", RHT_POT_DODONGOS_CAVERN, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); locationTable[RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2] = Location::Base(RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(2705, -1086), 0x7603, "Double Eye Pot 2", "Dodongos Cavern Double Eye Pot 2", RHT_POT_DODONGOS_CAVERN, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); locationTable[RC_DODONGOS_CAVERN_BACK_ROOM_POT_1] = Location::Base(RC_DODONGOS_CAVERN_BACK_ROOM_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_DODONGOS_CAVERN, ACTOR_OBJ_TSUBO, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(1027, -3704), 0x4212, "Back Room Pot 1", "Dodongos Cavern Back Room Pot 1", RHT_POT_DODONGOS_CAVERN, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x01, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_DODONGOS_CAVERN); diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index b1e39dbad..5006d2dde 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6669,7 +6669,7 @@ s32 func_8083E5A8(Player* this, PlayState* play) { // Automatically skip the pickup messages for very frequent items coming from pots with "Shuffle Pots" on. uint8_t isPotItemToSkip = interactedActor->id == ACTOR_EN_ITEM00 && - interactedActor->params == ITEM00_SMALL_KEY && + interactedActor->params == ITEM00_SMALL_KEY && giEntry.modIndex == MOD_NONE && ((giEntry.itemId >= ITEM_RUPEE_GREEN && giEntry.itemId <= ITEM_RUPEE_RED) || giEntry.itemId == ITEM_HEART || (giEntry.itemId >= ITEM_NUTS_5 && giEntry.itemId <= ITEM_SEEDS_30) ||