Skip to content

Conversation

@stratomaster64
Copy link
Contributor

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:

  • Turbo on L (sets Link's linearVelocity to a high number for fast)
  • Freezing enemies to not bother anyone (just a copy of Actor_FreezeAllEnemies in actor.c)
  • File select command to return there from anywhere gGlobalCtx is defined
  • Void and reload commands to reload the room two different ways (which can be different, especially in dungeons)
  • A quit command lol

@MelonSpeedruns MelonSpeedruns self-requested a review May 25, 2022 18:29
Copy link
Contributor

@MelonSpeedruns MelonSpeedruns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@PurpleHato PurpleHato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MelonSpeedruns MelonSpeedruns requested review from Kenix3 and KiritoDv May 25, 2022 18:40
@stratomaster64
Copy link
Contributor Author

Sorry about the last minute commit! I was working on these when the reviews came in

@stratomaster64 stratomaster64 requested a review from PurpleHato May 25, 2022 18:47
@MelonSpeedruns
Copy link
Contributor

No worries! It still looks good!

if (gSaveContext.buttonStatus[0] != BTN_DISABLED) {
sp28 = 1;
}
if (func_8008F2F8(globalCtx) == 2) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't there be a cvar check here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cvar check is made later on in that block.

@Kenix3 Kenix3 requested review from NEstelami and louist103 June 8, 2022 21:58
@vaguerant vaguerant mentioned this pull request Jun 18, 2022
@Kenix3
Copy link
Collaborator

Kenix3 commented Jun 20, 2022

Merge pending conflict resolution.

@stratomaster64
Copy link
Contributor Author

Merge pending conflict resolution.

@Kenix3 Resolved.

@stratomaster64
Copy link
Contributor Author

@Kenix3 second wave of merge conflicts resolved.

@Kenix3
Copy link
Collaborator

Kenix3 commented Jul 14, 2022

This is finally ready to get in, sorry for the delay.

@dcvz
Copy link
Contributor

dcvz commented Jul 21, 2022

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 develop-zhora? (this is the branch for the next major release)

@dcvz dcvz changed the base branch from develop-rachael to develop-zhora July 21, 2022 21:55
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");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to make this change here? There's a newline character removed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does one use Pierre?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the relation of the changes here to the goals listen in the PR description? Has to do with the age restriction flag?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

@stratomaster64
Copy link
Contributor Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants