Conversation
|
Sorry about the last minute commit! I was working on these when the reviews came in |
|
No worries! It still looks good! |
soh/src/code/z_parameter.c
Outdated
| if (gSaveContext.buttonStatus[0] != BTN_DISABLED) { | ||
| sp28 = 1; | ||
| } | ||
| if (func_8008F2F8(globalCtx) == 2) { |
There was a problem hiding this comment.
Shouldn't there be a cvar check here?
There was a problem hiding this comment.
The cvar check is made later on in that block.
|
Merge pending conflict resolution. |
@Kenix3 Resolved. |
|
@Kenix3 second wave of merge conflicts resolved. |
|
This is finally ready to get in, sorry for the delay. |
|
Hi @stratomaster64 sorry for the long process here, we were busy preparing a release. Would you mind rebasing this one more time and pointing your branch to |
| EnhancementCheckbox("Disable Black Bar Letterboxes", "gDisableBlackBars"); | ||
| Tooltip("Disables Black Bar Letterboxes during cutscenes and Z-targeting\nNote: there may be minor visual glitches that\nwere covered up by the black bars\nPlease disable this setting before reporting a bug"); | ||
| Tooltip("Disables Black Bar Letterboxes during cutscenes and Z-targeting\nNote: there may be minor visual glitches that were covered up by the black bars\nPlease disable this setting before reporting a bug"); | ||
| EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops"); |
There was a problem hiding this comment.
This is already there a few lines above.. looks like a rebase issue
| Tooltip("Change most 2D items and projectiles on the overworld to their 3D versions"); | ||
| EnhancementCheckbox("Disable Black Bar Letterboxes", "gDisableBlackBars"); | ||
| Tooltip("Disables Black Bar Letterboxes during cutscenes and Z-targeting\nNote: there may be minor visual glitches that\nwere covered up by the black bars\nPlease disable this setting before reporting a bug"); | ||
| Tooltip("Disables Black Bar Letterboxes during cutscenes and Z-targeting\nNote: there may be minor visual glitches that were covered up by the black bars\nPlease disable this setting before reporting a bug"); |
There was a problem hiding this comment.
Did you mean to make this change here? There's a newline character removed
There was a problem hiding this comment.
My PR to automatically break long lines makes it unnecessary
| EnhancementCheckbox("Freeze Time", "gFreezeTime"); | ||
| Tooltip("Freezes the time of day"); | ||
| EnhancementCheckbox("Free Scarecrow's Song", "gFreeScarecrow"); | ||
| Tooltip("Allows you to use Pierre without setting the Scarecrow's song"); |
There was a problem hiding this comment.
Pierre is the name of the scarecrow that is summoned when playing Scarecrow's song, while Bonooru is the scarecrow who you play in front of in order to set the scarecrow song flag and allow usage of scarecrow's as adult.
| else { | ||
| *itemPtr = ITEM_SLINGSHOT; | ||
| *typePtr = ARROW_SEED; | ||
| if (this->heldItemActionParam >= PLAYER_AP_BOW_FIRE && this->heldItemActionParam <= PLAYER_AP_BOW_0E) { |
There was a problem hiding this comment.
What is the relation of the changes here to the goals listen in the PR description? Has to do with the age restriction flag?
There was a problem hiding this comment.
Yes, as part of no age restrictions this would allow child to use bow and magic arrows (where normally, using bow as child would act as slingshot).
|
Since this PR has been necro'd to death, I'll just make separate PRs for the QoL stuff (especially since free scarecrow was a moderately requested feature from randomizer players) in accordance with policy. |
Some of the modders in the modding-discussion channel were interested in a few QoL features for testing their stuff, so I made a few quick things. Contents include:
linearVelocityto a high number for fast)Actor_FreezeAllEnemiesinactor.c)gGlobalCtxis defined