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

Minor fixes

Browse Source
This commit is contained in:
aMannus 2024-01-24 10:25:24 +01:00
parent 65011c53be
commit bc7efa5257
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_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_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_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_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_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); 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);

2
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -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. // Automatically skip the pickup messages for very frequent items coming from pots with "Shuffle Pots" on.
uint8_t isPotItemToSkip = interactedActor->id == ACTOR_EN_ITEM00 && 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_RUPEE_GREEN && giEntry.itemId <= ITEM_RUPEE_RED) ||
giEntry.itemId == ITEM_HEART || giEntry.itemId == ITEM_HEART ||
(giEntry.itemId >= ITEM_NUTS_5 && giEntry.itemId <= ITEM_SEEDS_30) || (giEntry.itemId >= ITEM_NUTS_5 && giEntry.itemId <= ITEM_SEEDS_30) ||