Skip to content

[Rando] Shuffle Tree Drops #1346

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
Caladius wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

[Rando] Shuffle Tree Drops #1346

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
68834cf
WIP Tree Shuffle
Caladius Nov 15, 2025
3616a34
Implements Remaining Trees and adds Peek Option.
Caladius Nov 16, 2025
efc0518
Twin Islands Scene uniformity.
Caladius Nov 16, 2025
9dcb440
Fix mac Build
Caladius Nov 17, 2025
8f00174
Update logic and save buffer size
Caladius Nov 24, 2025
93945a2
Update to latest Dev
Caladius Nov 24, 2025
223d847
Adds Man in the Tree Rupees. closes https://github.com/HarbourMasters…
Caladius Nov 24, 2025
7cf37fe
Minor updates
Caladius Nov 25, 2025
43ca8b6
Update mm/2s2h/Rando/Logic/Regions/MilkRoad.cpp
Caladius Dec 3, 2025
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
2 changes: 2 additions & 0 deletions mm/2s2h/GameInteractor/GameInteractor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,10 @@ typedef enum {
VB_SET_CAMERA_FOV,
VB_USE_ITEM_CONSIDER_ITEM_ACTION,
VB_ENEMY_DROP_COLLECTIBLE,
VB_TREE_DROP_COLLECTIBLE,
VB_DRAW_SLIME_RANDO_ITEM,
VB_ENABLE_OBJECT_DEPENDENCY,
VB_APPLY_BONK_TO_ACTOR,
} GIVanillaBehavior;

typedef enum {
Expand Down
1 change: 1 addition & 0 deletions mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ void Rando::ActorBehavior::OnFileLoad() {
Rando::ActorBehavior::InitObjMoonStoneBehavior();
Rando::ActorBehavior::InitObjSnowballBehavior();
Rando::ActorBehavior::InitObjTaruBehavior();
Rando::ActorBehavior::InitObjTreeBehavior();
Rando::ActorBehavior::InitObjTsuboBehavior();
Rando::ActorBehavior::InitObjWarpstoneBehavior();
Rando::ActorBehavior::InitPlayerBehavior();
Expand Down
1 change: 1 addition & 0 deletions mm/2s2h/Rando/ActorBehavior/ActorBehavior.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ void InitObjGrassBehavior();
void InitObjMoonStoneBehavior();
void InitObjSnowballBehavior();
void InitObjTaruBehavior();
void InitObjTreeBehavior();
void InitObjTsuboBehavior();
void InitObjWarpstoneBehavior();
void InitPlayerBehavior();
Expand Down
204 changes: 204 additions & 0 deletions mm/2s2h/Rando/ActorBehavior/ObjTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
#include "ActorBehavior.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include "2s2h/CustomItem/CustomItem.h"
#include "assets/2s2h_assets.h"
#include "2s2h/ObjectExtension/ActorListIndex.h"
#include "2s2h/ShipUtils.h"

extern "C" {
#include "variables.h"
}

std::map<std::tuple<s16, s16, s16>, RandoCheckId> treeActorIdMap = {
// Beneath the Well
{ { SCENE_REDEAD, 9, 3 }, RC_BENEATH_THE_WELL_TREE },

// Cucco Shack
{ { SCENE_F01C, 0, 12 }, RC_CUCCO_SHACK_TREE },

// Gorman Track
{ { SCENE_KOEPONARACE, 0, 11 }, RC_GORMAN_TRACK_TREE_01 },
{ { SCENE_KOEPONARACE, 0, 12 }, RC_GORMAN_TRACK_TREE_02 },
{ { SCENE_KOEPONARACE, 0, 13 }, RC_GORMAN_TRACK_TREE_03 },
{ { SCENE_KOEPONARACE, 0, 14 }, RC_GORMAN_TRACK_TREE_04 },
{ { SCENE_KOEPONARACE, 0, 15 }, RC_GORMAN_TRACK_TREE_05 },
{ { SCENE_KOEPONARACE, 0, 16 }, RC_GORMAN_TRACK_TREE_06 },
{ { SCENE_KOEPONARACE, 0, 17 }, RC_GORMAN_TRACK_TREE_07 },
{ { SCENE_KOEPONARACE, 0, 18 }, RC_GORMAN_TRACK_TREE_08 },
{ { SCENE_KOEPONARACE, 0, 19 }, RC_GORMAN_TRACK_TREE_09 },
{ { SCENE_KOEPONARACE, 0, 20 }, RC_GORMAN_TRACK_TREE_10 },
{ { SCENE_KOEPONARACE, 0, 21 }, RC_GORMAN_TRACK_TREE_11 },
{ { SCENE_KOEPONARACE, 0, 22 }, RC_GORMAN_TRACK_TREE_12 },
{ { SCENE_KOEPONARACE, 0, 23 }, RC_GORMAN_TRACK_TREE_13 },
{ { SCENE_KOEPONARACE, 0, 24 }, RC_GORMAN_TRACK_TREE_14 },
{ { SCENE_KOEPONARACE, 0, 25 }, RC_GORMAN_TRACK_TREE_15 },
{ { SCENE_KOEPONARACE, 0, 26 }, RC_GORMAN_TRACK_TREE_16 },
{ { SCENE_KOEPONARACE, 0, 27 }, RC_GORMAN_TRACK_TREE_17 },
{ { SCENE_KOEPONARACE, 0, 28 }, RC_GORMAN_TRACK_TREE_18 },
{ { SCENE_KOEPONARACE, 0, 29 }, RC_GORMAN_TRACK_TREE_19 },
{ { SCENE_KOEPONARACE, 0, 30 }, RC_GORMAN_TRACK_TREE_20 },
{ { SCENE_KOEPONARACE, 0, 31 }, RC_GORMAN_TRACK_TREE_21 },
{ { SCENE_KOEPONARACE, 0, 32 }, RC_GORMAN_TRACK_TREE_22 },
{ { SCENE_KOEPONARACE, 0, 33 }, RC_GORMAN_TRACK_TREE_23 },
{ { SCENE_KOEPONARACE, 0, 34 }, RC_GORMAN_TRACK_TREE_24 },
{ { SCENE_KOEPONARACE, 0, 35 }, RC_GORMAN_TRACK_TREE_25 },

// Great Bay Coast
{ { SCENE_30GYOSON, 0, 10 }, RC_GREAT_BAY_COAST_TREE_01 },
{ { SCENE_30GYOSON, 0, 11 }, RC_GREAT_BAY_COAST_TREE_02 },
{ { SCENE_30GYOSON, 0, 12 }, RC_GREAT_BAY_COAST_TREE_03 },
{ { SCENE_30GYOSON, 0, 13 }, RC_GREAT_BAY_COAST_TREE_04 },

// Path to Mountain Village
{ { SCENE_13HUBUKINOMITI, 0, 14 }, RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_01 },
{ { SCENE_13HUBUKINOMITI, 0, 15 }, RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_02 },
{ { SCENE_13HUBUKINOMITI, 0, 16 }, RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_03 },
{ { SCENE_13HUBUKINOMITI, 0, 17 }, RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_04 },

// Path to Snowhead
{ { SCENE_14YUKIDAMANOMITI, 0, 22 }, RC_PATH_TO_SNOWHEAD_TREE_01 },
{ { SCENE_14YUKIDAMANOMITI, 0, 23 }, RC_PATH_TO_SNOWHEAD_TREE_02 },
{ { SCENE_14YUKIDAMANOMITI, 0, 24 }, RC_PATH_TO_SNOWHEAD_TREE_03 },
{ { SCENE_14YUKIDAMANOMITI, 0, 25 }, RC_PATH_TO_SNOWHEAD_TREE_04 },

// Road to Southern Swamp
{ { SCENE_24KEMONOMITI, 0, 26 }, RC_ROAD_TO_SOUTHERN_SWAMP_TREE_01 },
{ { SCENE_24KEMONOMITI, 0, 27 }, RC_ROAD_TO_SOUTHERN_SWAMP_TREE_02 },
{ { SCENE_24KEMONOMITI, 0, 28 }, RC_ROAD_TO_SOUTHERN_SWAMP_TREE_03 },
{ { SCENE_24KEMONOMITI, 0, 29 }, RC_ROAD_TO_SOUTHERN_SWAMP_TREE_04 },
{ { SCENE_24KEMONOMITI, 0, 30 }, RC_ROAD_TO_SOUTHERN_SWAMP_TREE_05 },
{ { SCENE_24KEMONOMITI, 0, 31 }, RC_ROAD_TO_SOUTHERN_SWAMP_TREE_06 },

// Romani Ranch
{ { SCENE_F01, 0, 20 }, RC_ROMANI_RANCH_TREE_01 },
{ { SCENE_F01, 0, 21 }, RC_ROMANI_RANCH_TREE_02 },
{ { SCENE_F01, 0, 22 }, RC_ROMANI_RANCH_TREE_03 },
{ { SCENE_F01, 0, 23 }, RC_ROMANI_RANCH_TREE_04 },
{ { SCENE_F01, 0, 24 }, RC_ROMANI_RANCH_TREE_05 },
{ { SCENE_F01, 0, 25 }, RC_ROMANI_RANCH_TREE_06 },
{ { SCENE_F01, 0, 26 }, RC_ROMANI_RANCH_TREE_07 },

// Termina Field
{ { SCENE_00KEIKOKU, 0, 168 }, RC_TERMINA_FIELD_TREE_01 },
{ { SCENE_00KEIKOKU, 0, 169 }, RC_TERMINA_FIELD_TREE_02 },

// Path to Goron Village
{ { SCENE_17SETUGEN2, 0, 7 }, RC_TWIN_ISLANDS_SPRING_TREE_01 },
{ { SCENE_17SETUGEN2, 0, 8 }, RC_TWIN_ISLANDS_SPRING_TREE_02 },
{ { SCENE_17SETUGEN2, 0, 9 }, RC_TWIN_ISLANDS_SPRING_TREE_03 },
{ { SCENE_17SETUGEN, 0, 7 }, RC_TWIN_ISLANDS_TREE_01 },
{ { SCENE_17SETUGEN, 0, 8 }, RC_TWIN_ISLANDS_TREE_02 },
{ { SCENE_17SETUGEN, 0, 9 }, RC_TWIN_ISLANDS_TREE_03 },

// Zora Cape
{ { SCENE_31MISAKI, 0, 24 }, RC_ZORA_CAPE_TREE_01 },
{ { SCENE_31MISAKI, 0, 25 }, RC_ZORA_CAPE_TREE_02 },
{ { SCENE_31MISAKI, 0, 26 }, RC_ZORA_CAPE_TREE_03 },
{ { SCENE_31MISAKI, 0, 27 }, RC_ZORA_CAPE_TREE_04 },
{ { SCENE_31MISAKI, 0, 28 }, RC_ZORA_CAPE_TREE_05 },
};

std::map<RandoCheckId, EnItem00*> currentlySpawnedItems;

void ApplyGravityToSpawnedItem(RandoCheckId randoCheckId) {
auto findItem = currentlySpawnedItems.find(randoCheckId);
if (findItem != currentlySpawnedItems.end()) {
findItem->second->actor.gravity = -1.4f;
}
}

void SpawnTreeDrop(Vec3f pos, RandoCheckId randoCheckId) {
int customItemFlags = CustomItem::KILL_ON_TOUCH | CustomItem::ABLE_TO_ZORA_RANG;

if (RANDO_SAVE_OPTIONS[RO_PEEK_TREE_DROPS] == RO_GENERIC_OFF) {
customItemFlags |= CustomItem::TOSS_ON_SPAWN;
}

EnItem00* spawnedItem = CustomItem::Spawn(
pos.x - 20.0f, pos.y + 200.0f, pos.z + 25.0f, 0, customItemFlags, randoCheckId,
[](Actor* actor, PlayState* play) {
RandoSaveCheck& randoSaveCheck = RANDO_SAVE_CHECKS[CUSTOM_ITEM_PARAM];
randoSaveCheck.eligible = true;
},
[](Actor* actor, PlayState* play) {
auto& randoSaveCheck = RANDO_SAVE_CHECKS[CUSTOM_ITEM_PARAM];
Matrix_Scale(30.0f, 30.0f, 30.0f, MTXMODE_APPLY);
Rando::DrawItem(Rando::ConvertItem(randoSaveCheck.randoItemId, (RandoCheckId)CUSTOM_ITEM_PARAM), actor);
});

auto findItem = currentlySpawnedItems.find(randoCheckId);
if (findItem == currentlySpawnedItems.end()) {
currentlySpawnedItems.insert({ randoCheckId, spawnedItem });
}
}

void IdentifyTree(Actor* actor, bool* should) {
s16 actorListIndex = GetActorListIndex(actor);
RandoCheckId randoCheckId = RC_UNKNOWN;

auto it = treeActorIdMap.find({ gPlayState->sceneId, gPlayState->roomCtx.curRoom.num, actorListIndex });
if (it != treeActorIdMap.end()) {
randoCheckId = it->second;
}

if (!RANDO_SAVE_CHECKS[randoCheckId].shuffled || RANDO_SAVE_CHECKS[randoCheckId].cycleObtained) {
return;
}

if (!RANDO_SAVE_CHECKS[randoCheckId].obtained && RANDO_SAVE_OPTIONS[RO_PEEK_TREE_DROPS] == RO_GENERIC_ON) {
SpawnTreeDrop(actor->world.pos, randoCheckId);
}

Rando::ActorBehavior::SetActorRandoCheckId(actor, randoCheckId);
}

void Rando::ActorBehavior::InitObjTreeBehavior() {
COND_ID_HOOK(ShouldActorInit, ACTOR_EN_WOOD02, IS_RANDO, IdentifyTree);
COND_ID_HOOK(ShouldActorInit, ACTOR_OBJ_TREE, IS_RANDO, IdentifyTree);
COND_ID_HOOK(ShouldActorInit, ACTOR_OBJ_YASI, IS_RANDO, IdentifyTree);
COND_ID_HOOK(ShouldActorInit, ACTOR_EN_SNOWWD, IS_RANDO, IdentifyTree);

COND_VB_SHOULD(VB_APPLY_BONK_TO_ACTOR, IS_RANDO, {
Actor* tree = va_arg(args, Actor*);
if (tree == nullptr) {
return;
}

if (tree->id != ACTOR_EN_WOOD02 && tree->id != ACTOR_OBJ_TREE && tree->id != ACTOR_OBJ_YASI &&
tree->id != ACTOR_EN_SNOWWD) {
return;
}
RandoCheckId randoCheckId = GetActorRandoCheckId(tree);
if (randoCheckId == RC_UNKNOWN) {
return;
}

if (!RANDO_SAVE_CHECKS[randoCheckId].obtained) {
if (RANDO_SAVE_OPTIONS[RO_PEEK_TREE_DROPS] == RO_GENERIC_ON) {
ApplyGravityToSpawnedItem(randoCheckId);
} else {
SpawnTreeDrop(tree->world.pos, randoCheckId);
}
}
});

COND_VB_SHOULD(VB_TREE_DROP_COLLECTIBLE, IS_RANDO, {
Actor* tree = va_arg(args, Actor*);

if (RANDO_SAVE_OPTIONS[RO_SHUFFLE_TREE_DROPS] != RO_GENERIC_OFF) {
if (tree != NULL) {
RandoCheckId randoCheckId = GetActorRandoCheckId(tree);
if (randoCheckId == RC_UNKNOWN) {
return;
}

if (!RANDO_SAVE_CHECKS[randoCheckId].obtained) {
ApplyGravityToSpawnedItem(randoCheckId);
*should = false;
}
}
}
});

COND_HOOK(OnSceneInit, IS_RANDO, [](s16 sceneId, s8 spawnNum) { currentlySpawnedItems.clear(); });
}
1 change: 1 addition & 0 deletions mm/2s2h/Rando/CheckTracker/CheckTracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ std::vector<const char*> checkTypeIconList = {
/*RCTYPE_SONG*/ gItemIconSongNoteTex,
/*RCTYPE_STRAY_FAIRY*/ gStrayFairyGreatBayIconTex,
/*RCTYPE_TINGLE_SHOP*/ gItemIconAdultsWalletTex,
/*RCTYPE_TREE*/ gItemIconDekuStickTex,
};

static constexpr ImVec4 tintColor = {};
Expand Down
3 changes: 2 additions & 1 deletion mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_BENEATH_THE_WELL_COW_ROOM] = RandoRegion{ .name = "Cow Room", .sceneId = SCENE_REDEAD,
.checks = {
CHECK(RC_BENEATH_THE_WELL_COW, CAN_PLAY_SONG(EPONA))
CHECK(RC_BENEATH_THE_WELL_COW, CAN_PLAY_SONG(EPONA)),
CHECK(RC_BENEATH_THE_WELL_TREE, true),
},
.connections = {
CONNECTION(RR_BENEATH_THE_WELL_RIGHT_FIRE_KEESE, true),
Expand Down
33 changes: 33 additions & 0 deletions mm/2s2h/Rando/Logic/Regions/MilkRoad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_CUCCO_SHACK_LARGE_CRATE_01, true),
CHECK(RC_CUCCO_SHACK_LARGE_CRATE_02, true),
CHECK(RC_CUCCO_SHACK_LARGE_CRATE_03, true),
CHECK(RC_CUCCO_SHACK_TREE, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(ROMANI_RANCH, 4), ENTRANCE(CUCCO_SHACK, 0), true),
Expand Down Expand Up @@ -76,6 +77,31 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_GORMAN_TRACK_GRASS_22, true),
CHECK(RC_GORMAN_TRACK_GRASS_23, true),
CHECK(RC_GORMAN_TRACK_GRASS_24, true),
CHECK(RC_GORMAN_TRACK_TREE_01, true),
CHECK(RC_GORMAN_TRACK_TREE_02, true),
CHECK(RC_GORMAN_TRACK_TREE_03, true),
CHECK(RC_GORMAN_TRACK_TREE_04, true),
CHECK(RC_GORMAN_TRACK_TREE_05, true),
CHECK(RC_GORMAN_TRACK_TREE_06, true),
CHECK(RC_GORMAN_TRACK_TREE_07, true),
CHECK(RC_GORMAN_TRACK_TREE_08, true),
CHECK(RC_GORMAN_TRACK_TREE_09, true),
CHECK(RC_GORMAN_TRACK_TREE_10, true),
CHECK(RC_GORMAN_TRACK_TREE_11, true),
CHECK(RC_GORMAN_TRACK_TREE_12, true),
CHECK(RC_GORMAN_TRACK_TREE_13, true),
CHECK(RC_GORMAN_TRACK_TREE_14, true),
CHECK(RC_GORMAN_TRACK_TREE_15, true),
CHECK(RC_GORMAN_TRACK_TREE_16, true),
CHECK(RC_GORMAN_TRACK_TREE_17, true),
CHECK(RC_GORMAN_TRACK_TREE_18, true),
CHECK(RC_GORMAN_TRACK_TREE_19, true),
CHECK(RC_GORMAN_TRACK_TREE_20, true),
CHECK(RC_GORMAN_TRACK_TREE_21, true),
CHECK(RC_GORMAN_TRACK_TREE_22, true),
CHECK(RC_GORMAN_TRACK_TREE_23, true),
CHECK(RC_GORMAN_TRACK_TREE_24, true),
CHECK(RC_GORMAN_TRACK_TREE_25, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(MILK_ROAD, 2), ENTRANCE(GORMAN_TRACK, 3), RANDO_EVENTS[RE_COWS_FROM_ALIENS]),
Expand Down Expand Up @@ -185,6 +211,13 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_ROMANI_RANCH_GRASS_55, true),
CHECK(RC_ROMANI_RANCH_GRASS_56, true),
CHECK(RC_ROMANI_RANCH_GRASS_57, true),
CHECK(RC_ROMANI_RANCH_TREE_01, true),
CHECK(RC_ROMANI_RANCH_TREE_02, true),
CHECK(RC_ROMANI_RANCH_TREE_03, true),
CHECK(RC_ROMANI_RANCH_TREE_04, true),
CHECK(RC_ROMANI_RANCH_TREE_05, true),
CHECK(RC_ROMANI_RANCH_TREE_06, true),
CHECK(RC_ROMANI_RANCH_TREE_07, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(MILK_ROAD, 1), ENTRANCE(ROMANI_RANCH, 0), true),
Expand Down
16 changes: 16 additions & 0 deletions mm/2s2h/Rando/Logic/Regions/North.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,12 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_TWIN_ISLANDS_SMALL_SNOWBALL_04, CAN_BE_GORON || HAS_ITEM(ITEM_HOOKSHOT)),
CHECK(RC_TWIN_ISLANDS_SMALL_SNOWBALL_05, CAN_BE_GORON || HAS_ITEM(ITEM_HOOKSHOT)),
CHECK(RC_TWIN_ISLANDS_SMALL_SNOWBALL_06, CAN_BE_GORON || HAS_ITEM(ITEM_HOOKSHOT)),
CHECK(RC_TWIN_ISLANDS_SPRING_TREE_01, RANDO_EVENTS[RE_CLEARED_SNOWHEAD_TEMPLE]),
CHECK(RC_TWIN_ISLANDS_SPRING_TREE_02, RANDO_EVENTS[RE_CLEARED_SNOWHEAD_TEMPLE]),
CHECK(RC_TWIN_ISLANDS_SPRING_TREE_03, RANDO_EVENTS[RE_CLEARED_SNOWHEAD_TEMPLE] && (CAN_BE_GORON || HAS_ITEM(ITEM_HOOKSHOT))),
CHECK(RC_TWIN_ISLANDS_TREE_01, true),
CHECK(RC_TWIN_ISLANDS_TREE_02, true),
CHECK(RC_TWIN_ISLANDS_TREE_03, CAN_BE_GORON || HAS_ITEM(ITEM_HOOKSHOT)),
},
.exits = { // TO FROM
EXIT(ENTRANCE(GROTTOS, 5), ENTRANCE(PATH_TO_GORON_VILLAGE_WINTER, 0), RANDO_EVENTS[RE_CLEARED_SNOWHEAD_TEMPLE] || CAN_USE_MAGIC_ARROW(FIRE)), // TODO: Grotto mapping Hot spring
Expand All @@ -380,6 +386,8 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_SMALL_SNOWBALL_01, true),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_SMALL_SNOWBALL_02, true),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_SMALL_SNOWBALL_03, true),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_01, true),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_02, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(TERMINA_FIELD, 3), ENTRANCE(PATH_TO_MOUNTAIN_VILLAGE, 0), true),
Expand All @@ -398,6 +406,8 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_LARGE_SNOWBALL_10, CanKillEnemy(ACTOR_OBJ_SNOWBALL)),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_LARGE_SNOWBALL_11, CanKillEnemy(ACTOR_OBJ_SNOWBALL)),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_SMALL_SNOWBALL_04, true),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_03, true),
CHECK(RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_04, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(MOUNTAIN_VILLAGE_WINTER, 6), ENTRANCE(PATH_TO_MOUNTAIN_VILLAGE, 1), true),
Expand Down Expand Up @@ -429,6 +439,9 @@ static RegisterShipInitFunc initFunc([]() {
},
};
Regions[RR_PATH_TO_SNOWHEAD_LOWER] = RandoRegion{ .sceneId = SCENE_14YUKIDAMANOMITI,
.checks = {
CHECK(RC_PATH_TO_SNOWHEAD_TREE_04, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(MOUNTAIN_VILLAGE_WINTER, 4), ENTRANCE(PATH_TO_SNOWHEAD, 0), true),
},
Expand All @@ -454,6 +467,9 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_PATH_TO_SNOWHEAD_SMALL_SNOWBALL_01, true),
CHECK(RC_PATH_TO_SNOWHEAD_SMALL_SNOWBALL_02, true),
CHECK(RC_PATH_TO_SNOWHEAD_SMALL_SNOWBALL_03, true),
CHECK(RC_PATH_TO_SNOWHEAD_TREE_01, true),
CHECK(RC_PATH_TO_SNOWHEAD_TREE_02, true),
CHECK(RC_PATH_TO_SNOWHEAD_TREE_03, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(SNOWHEAD, 0), ENTRANCE(PATH_TO_SNOWHEAD, 1), true),
Expand Down
6 changes: 6 additions & 0 deletions mm/2s2h/Rando/Logic/Regions/South.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,12 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_GRASS_18, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_GRASS_19, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_GRASS_20, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_TREE_01, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_TREE_02, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_TREE_03, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_TREE_04, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_TREE_05, true),
CHECK(RC_ROAD_TO_SOUTHERN_SWAMP_TREE_06, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(TERMINA_FIELD, 1), ENTRANCE(ROAD_TO_SOUTHERN_SWAMP, 0), true),
Expand Down
2 changes: 2 additions & 0 deletions mm/2s2h/Rando/Logic/Regions/TerminaField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_TERMINA_FIELD_GRASS_214, true),
CHECK(RC_TERMINA_FIELD_GRASS_215, true),
CHECK(RC_TERMINA_FIELD_GRASS_216, true),
CHECK(RC_TERMINA_FIELD_TREE_01, true),
CHECK(RC_TERMINA_FIELD_TREE_02, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(GROTTOS, 0), ENTRANCE(TERMINA_FIELD, 0), CAN_USE_EXPLOSIVE || CAN_BE_GORON), // TODO: Grotto mapping Gossip Stone #3
Expand Down
Loading
Loading