Skip to content

Develop blair#5517

Merged
Malkierian merged 12 commits intodevelopfrom
develop-blair
May 19, 2025
Merged

Develop blair#5517
Malkierian merged 12 commits intodevelopfrom
develop-blair

Conversation

@Malkierian
Copy link
Contributor

@Malkierian Malkierian commented May 19, 2025

DO NOT SQUASH.

Primarily for getting the osSyncPrintf fix into develop.

Build Artifacts

leggettc18 and others added 12 commits May 16, 2025 23:11
* Prevent BeanPlanted using gSaveContext for seed gen

* address malk's comment about extern

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* vb forest pillar cs skip

* change to one point cutscene skip

* rm whitespace
* Improved the item location price availability.

* Moved the available checks price logic into location_access.cpp.

* Fixed typo and clarified check status identified.
* c

* fix and rename IsKeysanity

* add comment
* fix incorrect token count in messages when tokensanity is off

* Update OTRGlobals.cpp
* fix link voice missing when hanging off ledges

* remove unused bitrate var

* hardcoded but justified

* format
Copy link
Contributor

@briaguya0 briaguya0 left a comment

Choose a reason for hiding this comment

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

NO SQUASH

@Malkierian Malkierian merged commit e1f6297 into develop May 19, 2025
10 checks passed
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.

6 participants