Add Missing MQ Jabu Small Crates#5452
Merged
leggettc18 merged 2 commits intoHarbourMasters:developfrom Apr 29, 2025
Merged
Conversation
serprex
approved these changes
Apr 26, 2025
Pepper0ni
reviewed
Apr 26, 2025
| locationTable[RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2] = Location::SmallCrate(RC_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2, RCQUEST_VANILLA, RCAREA_SPIRIT_TEMPLE, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-1151, -939), "Before Child Climb Small Crate 2", RHT_CRATE_SPIRIT_TEMPLE, RG_DEKU_NUTS_5, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_BEFORE_CHILD_CLIMB_SMALL_CRATE_2)); | ||
| locationTable[RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1] = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1, RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-512, -4592), "MQ Triple Hallway Small Crate 1", RHT_CRATE_JABU_JABU, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_1)); | ||
| locationTable[RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2] = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2, RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-666, -4671), "MQ Triple Hallway Small Crate 2", RHT_CRATE_JABU_JABU, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_TRIPLE_HALLWAY_SMALL_CRATE_2)); | ||
| locationTable[RC_JABU_JABUS_BELLY_MQ_WIGGLERS_SMALL_CRATE_1] = Location::SmallCrate(RC_JABU_JABUS_BELLY_MQ_WIGGLERS_SMALL_CRATE_1, RCQUEST_MQ, RCAREA_JABU_JABUS_BELLY, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-1381, -2115), "MQ Wigglers Small Crate 1", RHT_CRATE_JABU_JABU, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_MQ_WIGGLERS_SMALL_CRATE_1)); |
Contributor
There was a problem hiding this comment.
A general point I was to bring up is that we do not have an agreed upon name for these things, and so they get called different things at different points. I would like to use this PR review to decide on something so that in future we can be consistent.
I also don't like this name as it is shared with the mario bug enemy.
Names I have personally heard tossed around for these are Cubes, Jelly (cubes), Jigglies, or something more obviously descriptive., but I'm not too bothered so long as it is obvious what it is and doesn't make the enums really long.
(I would also want to consider naming small crates "boxes" for similar length reasons, but that's not for this PR)
Pepper0ni
approved these changes
Apr 28, 2025
52244c9 to
e6bc42c
Compare
leggettc18
approved these changes
Apr 29, 2025
Contributor
|
Rebased to develop because the grass name change, while it was warranted, would have caused spoiler logs to not parse between bugfix versions which I wanted to avoid, and the missing crates weren't causing crashes or logic issues, they were just not being shuffled. |
ReddestDream
pushed a commit
to ReddestDream/Shipwright
that referenced
this pull request
Apr 30, 2025
* also change grass to match * add crates back
ReddestDream
pushed a commit
to ReddestDream/Shipwright
that referenced
this pull request
May 4, 2025
* also change grass to match * add crates back
Schicksal88
pushed a commit
to Schicksal88/Shipwright
that referenced
this pull request
May 6, 2025
* also change grass to match * add crates back
Schicksal88
pushed a commit
to Schicksal88/Shipwright
that referenced
this pull request
May 6, 2025
* also change grass to match * add crates back
krazyjakee
pushed a commit
to krazyjakee/OOT
that referenced
this pull request
Sep 6, 2025
* also change grass to match * add crates back
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds the two small crates in the wiggler room at the top of MQ Jabu to the shuffled locations
Build Artifacts