* use trial enum instead of magic numbers
* simplify trial count/random trial logic
* set default to set number
Co-authored-by: briaguya <briaguya@alice>
* First round of upstream updates and commenting patternss
* Renames from z64player
* Renames from z64save
* Undo changes to legacy save struct
* Add missing reference from entrance rando
* Fixes from stat tracker
* More tweaks
* fix int sliders to fill the window like float sliders
* add a spacer to make it consistent with float slider
* add a spacer to make it consistent with float slider
* adding pop width further constancy with float slider
* First test of gathering some gameplay stats
* timer changes and other stuff
* Move code to new files + rename
* Name change - gamePlayStats
* Finish rename, remove n64ddFlag checks
* Improve item get times
* Better time tracking, more stats,
* Put button under Enhancements
* Fix merge conflict
* Add pauseCount, fix bug with rando items
* Adjust inits/declarations
* step counter
* Name change: "itemGetTime" to "timestamp"
* Tidying + CI test
* Set up array for stat counts
* Macro
#define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.gameplayStats.playTimer / 2 + gSaveContext.gameplayStats.pauseTimer / 3)
* Add boss defeat timestamps
* Add sword swings, pots broken, bushes cut
* fix int type
* Add counts for enemies defeated
Broken down by enemy, with a total
* Add ammo used
* Hide breakdowns until count > 0
* Forgot Big Octo
* Count chests opened
* Update after LUS submodule
* Enemy count spacing
* Comments
* Count 3 mini Floormasters as 1 Floormaster
+ some cleanup
* Comments
* Colour coding for timestamps on quest items
i.e. medallions/stones/songs
* Move stat into the sohStats struct
+ rearrange the counts enum for easier addition of future counts
* Some documentation + count button presses
* Stop counting button presses when Ganon defeated
* Couple bugfixes
Add count for Gerudo Thief, fix step counter counting in some situations where it shouldn't
* Fix comment
* added rando option enum; added options to load from spoiler file
* whoops
* Moved to `randomizerTypes` header; fixed ammo drop enum
* Actually populated options with new enums
* Added add'l enums for ganon boss key
* Added difficulty settings menu for shooting gallery
* Reverted linux assert fix for PR
* Added difficulty option to not randomize rupee order as adult
* Changed checkbox wording due to text overflow
* Reverted incorrect change from merge
* Update soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Added Checkbox to turn on and off all customizations in shooting gallery behavior
* Added disable-switch for sliders, shooting gallery difficulty options are now disabled when customize behavior is turned off instead of hidden
Co-authored-by: Ralphie Morell <rafael.morell@techfield.us>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Added button to switch age
* Added logic to switch link's age
Reloads link from last entrance he went through once his age is switched.
* Link now respawns where he last was
* Update game.c
* move setting to GameMenuBar.cpp, fix build issues
Co-authored-by: Jake Edvenson <77412657+JakeEdvenson@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
The implicit declaration was causing issues on Linux when building in release mode. The call was getting optimized out which was preventing the "equip now?" message box from functioning as intended. Adding the `Message_ShouldAdvanceSilent` declaration to `functions.h`resolves the issue.
* First pass on SFX Editor
* Fix crash at night in Colossus (and probably other undocumented issues)
The SFX editor was swapping out the bytes corresponding to the sequence
to be played regardless of the audio command being issued. This fix
ensures the swap will only happen on commands which actually treat those
bytes as a sequence identifier.
* enabling a few more songs/fanfares
* Removing a few broken bgms, fixing the preview button returning to the wrong bgm
* Fixes restoration from miniboss music to previous one
* add timed minigame into the sounds pool
* A few small tweaks
* More cleanup and add instruments
* adjust usage of getReverseReplacementSeq
* Changes from feedback and prefix external methods with SfxEditor
Co-authored-by: RaelCappra <rael.cappra@gmail.com>
* Implement hint for dungeon type on Map get item messages
* Color dungeon name in item tracker when MQ and map is found
* No hint when all dungeons are MQ or non MQ
* TWEAK: French hint
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Adds most visuals and interactions for quest select menu.
* "Scrolling" menu, adds remaining sub/title textures, language support
* Tweak: ENG, FRA, GER title to match the original style
* ADD: Randomizer tex
* TWEAK: Randomizer ZAPD extension format
* Adds control stick prompts to the "scrolling" menu.
* Adds third entry for Randomizer.
* Bold text on randomizer subtitle.
* Ensures the game won't allow selecting an unsupported quest.
* Makes save files be created from the quest menu selection.
* Removes the master quest and randomizer checkboxes (no longer needed).
* Removes lock on MQ-only rando.
* Skips quest select if only one quest is playable.
* Adds ability to back out of quest select menu
* Show seed icons while Randomizer is selected on Quest Select Menu.
* Fixes custom hud colors and d-pad navigation.
* Implements backing up from name entry to quest select.
Also implements backwards rotations on the file select screen.
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* fix lacs hint text coloring and new lines
* missed a new line
* fix wrong control code
* TWEAK: French LACS + Vanilla
* more french hint fixes
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Fixes saving `isMasterQuest` and fixes default values for rando sliders.
* Changed slider default values
* Fixes default dropdown values for Ganon Trials and MQ Dungeons.
* Ensure's consistent default values are used for all `CVar_GetS32`'s
* Refactor GetCheckFromActor, WIP currently broken
* Fixes build errors via forward declarations and emplace vs insert.
* Removes some unnecessary code.
* Fixes non-windows build errors.
* Fixes Deku Scrubs outside of grottos.
* Fixes DMC Deku Scrub Grotto Center
* Fixes Ruto Blue Warp
* Fix issue identifying blue warp rando checks
* Move identifyCow to randomizer.cpp
* Various updates to vanilla check objects
* Identify MQ checks in check object table
* Adjustments to how multimap is used and initialized
* Convert u16 in check object table to s16
* Fix a few issues with MQ checks
* Fix issue with TWO_ACTOR_PARAMS macro
* Fixes some scrubs and cows appearing as identical.
* Fixes known gossip stone issues (ToT, DC)
* Fixes Dampe's Gravedigging tour rcObject
* Fix crash on locations tab
* Enable master quest dungeons in rando
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Add command for giving item as if it was given from an actor
* Add modID argument to give item command and add give from skull command
* Adjustment and remove skull option since this isn't pointed at rando-next
* Fix string compare
* Add Cheat for disabling age check on equipment
* Add Cheat for disabling age check on equipment... pt 2
* cleanup some logic with macros
* Keep adult strength as child & prevent equipment greyout
* Timeless Equipment cleanup
* Add toggle option for walk speed modifiers
* Preserve toggle status between scene transitions
* Apply suggestions from code review
renaming from `gSpeedToggle` to `gWalkSpeedToggle`
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Updated starting age restrictions;
patched specific circumstances in 3d rando
* cleanup some testing stuff
* whoops
* become Sherlock Holmes; tooltip cleanup
* Explicit logic for forcing child age
* Apply bria's suggestion
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Implement most of chest size and texture matches contents, just need an item table
* Add GetItemCategory to getItem tables
* Revert changes that tie chest size and texture to randomizer
* Support chest size & texture as an enhancement that works on outside of rando
* Add gChestSizeAndTextureMatchesContents to rando preset
* Prevent gChestSizeAndTextureMatchesContents in chest minigame
* Fix for forest temple boss key chest
* Add options for texture or size only
* Fixes a few bugs I introduced for MQ file select screen.
- MQ Saves could not be loaded while only an mq otr is present, because `requiresOriginal` was true when `gSaveContext.mqDungeonCount` was less than 12. That value only ever gets set for rando saves, so I added a check for the rando flag to that conditional.
- The rando tag was not getting grayed out with the rest of the save file.
- Some necessary meta info wasn't getting loaded when the randomizer CVar was off. Removed that check so that the rando save data always gets loaded during InitMeta. That way the amount of mq dungeons can be checked for validity with the loaded set of OTRs even if randomizer isn't enabled.
* i not 1
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Re-enables OTR patches from mods folder.
* Don't error if an OTR doesn't include a version file
Just info log and continue. If the patch fails to apply then we can error, and SoH can do it's own validation later.
* Fixes small error on my side
* Support for patching DLists outside of OTR, mostly for cosmetics and bug fixes
* Store original dlist instruction for unpatching
* Rename sandstorm patch variable
* Use unordered map for originalGfx;
* Add mirror shield option to the cosmetics menu
* Include GI model for mirror shield
* Changes from feedback
* Changes OTR Extraction to have specific mq and nonmq paths.
Also updates the game to load resources according to whether or not
Master Quest or Vanilla is loaded.
* Removes unneeded code from the last commit.
* Fixes some weird formatting in ZRom.c
* Loads oot-mq.otr and patches oot.otr on top, if both are present.
If only one or the other are present, it becomes the only and main OTR.
* Adds ImGui Logic for whether or an MQ Checkbox.
Checkbox checked only specifies whether new saves should be MQ or not.
Checkbox is disabled or force-enabled according to which OTRs are loaded.
Also as a necessity includes tracking what game versions have been loaded
from the OTRs.
* Adds MQ settings logic for Randomizer's ImGui menu.
* Writes Master Quest dungeons to the spoiler log
* Loads MQ Dungeons from spoiler, persists in save, and loads when appropriate.
* Adds logic to prevent loading or creating incompatible rando saves.
* Fixdes some linux build issues and new rando save issues
* Makes appimage create both vanilla and mq otrs
If either rom is present, it makes the corresponding OTR. If both are present,
it will make both. If one OTR is present but both roms are present, it will
create the missing OTR.
* Makes it so a randomized save file will not be marked as MQ.
* Refactors to load all OTRs from MainPath or a specific list.
Also adds the ability to take a std::unordered_set of hashes to
validate each OTR's version file against.
* Fixes a syntax error
* Makes ExtractAssets output Vanilla and MQ OTRs if both roms are present
* Fixes asset generation bug.
* Partially working fix for dual OTR extract_assets
Currently the cmake ExtractAssets target will return with a 1 if you
only end up exporting one type of OTR isntead of both. Haven't found
a great way to only attempt to copy a file if it exists from within
cmake. It does actually correctly copy the OTR that is generated,
despite the error from copying the other one.
Pushing as is for now but will keep investigating.
* Adds oot-mq.otr to the gitignore.
* Makes ExtractAssets not fail on only one rom/OTR.
* Removes PatchesPath from the constructors requiring OTRFiles vector.
* Renames OOT_UNKNOWN to just UNKNOWN to remove OOT specific reference.
* Removes randomizing MQ Dungeons and re-disables MQ rando.
Doing this so the PR can get merged quicker with just the Dual OTR
support and won't need to wait on rando logic to be updated. That
will happen in another PR directly after the merge.
* Update mac startup script for dual otr
* Update soh/macosx/soh-macos.sh
* Update soh/macosx/soh-macos.sh
* Update soh/macosx/soh-macos.sh
* Implements new BinaryReader to fix Linux build issue.
BinaryReader itself comes from https://github.com/Moneyl/BinaryTools
I added a wrapper to adapt it to the ABI from ZAPD's Binary Reader and
add Endianness checking. I also had to copy a handful of other bits and
pieces from ZAPD to make it all function as expected.
* A few edits to the updatream BinaryReader to compile it on Linux.
* Adds the Endianness to the first byte of the version file.
* Fixes Jenkins
* Addresses some of Kenix's comments
* Renames `ReadNullTerminatedString` to `ReadCString`
* Refactors Archive::LoadFile into a private method with more arguments.
* Removes BitConverter and extends existing endianness.h instead.
* Fixes an endianness issue with the version file.
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Support for patching DLists outside of OTR, mostly for cosmetics and bug fixes
* Store original dlist instruction for unpatching
* Rename sandstorm patch variable
* Use unordered map for originalGfx;
* Add golden gauntlets to Cosmetics Editor
* Removed extra space
* Fixed comment
* Changed comment again (helps if you save the file before committing)
* Add: Randomized Ice Trap Messages
* Add text to freestanding items, other tweaks/fixes
* More messages
* ADD: French Translation + 1 Extra
* %w is not %UwU%
* TWEAK: One msall breakline
* Add German & small text tweak
* Minor code optimization
* Updated French
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Start effects
* Disable input to game when typing in console
* Add gravity support
* noUI placeholder
* Add rest of effects to console
* Remove z_play code
* Add rupee modification
* Add OneHit KO (#27)
* few fix and paper Link
* Better method and now use the reset flag
* Revert "Better method and now use the reset flag"
This reverts commit 2aafcc1df2.
* Revert "few fix and paper Link"
This reverts commit 65e76dcfee.
* Paper Link & few fixes (#28)
* Implement pacifist mode (#30)
* Implement cucco storm (#31)
* Add no UI functionality (#32)
* Enable CrowdControl on windows (#33)
* Use std::format and implement wallmaster
* Implement defense modifier
* Implement no_z and clean up
* Implement reverse controls
* Some fixes while testing CC connection
* Implement speed modifier and fix defese modifier
* Fail magic effects if magic is not acquired
* Fix queue system
* Implement rainstorm
* Some cleanup
* Use IS_ZERO to handle very low near zero values
* Split some effects
* Fix emptying magic
* Don’t run cucco on pre-rendered backgrounds
* Use correct method for updating ruppees
* Fix decreasing speed
* Remove old SDL stuff
* Remove old fixes
* Enable Crowd Control for both debug and release
* Add missing returns
* Cleanup event firing
* Further clean up on event firing
* Fix some bugs
* CC fixes and enemy spawning (#35)
* Fix icetraps
* Fix title screen
* Fix pause screen
* Fix death screen timer & Code cleanup
* Fix timer during textboxes
* Code cleanup
* Add: Multiple enemy spawning
* More enemies + more code cleanup (#36)
* Enums for returning effect states
* Add more enemies
* Update CrowdControl.cpp
* Remove enums from enemies
* Fix up flow for events (#37)
# Conflicts:
# soh/soh/Enhancements/crowd-control/CrowdControl.cpp
* Fix spawn position of likelike
* CC temp enemy fixes (#38)
* Check for pause in pacifist and allow button presses (#39)
* Fix Pacifist mode (#41)
* First attempt pacifier fix
* Real fix for pacifist mode
* Comment
* Remove cutscene and long delay from cucco_storm (#40)
* Some PR Fixes
* Use standard types
* Handle JSON parsing error and free memory
* Add CC configuration file
* Add: Giving deku shield option. Fix: Giant Lonk (#42)
* Small stalfos fix (#43)
* Syntax Improvements (#44)
* Revert bools to uint32_t
* Add comment about bools
* Fix cucco storm, fix empty heart (#45)
* Protect commands vector with mutex
* prefix effects with chaosEffect (#46)
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
This was caused by the trail duration not being init properly until we change the duration manually.
cf this video: https://streamable.com/a9u4fm
- Also changed Lengh to Duration for clarity
* FIX: Set back default comportment of some Views
- Renamed Auto-Center First Person View to Disable Auto-Centering in First Person View and make it necessary to be checked to take effect and not being active by default
- Disable gInvertYAxis being enabled by default (which it not vanilla)
* Tweak: small whoopsie
* WiiU: fix more scaling issues
* Wii U: batch depth reads
* Wii U: remove file buffering
Doesn't seem to to do much anymore
* Remove "missing_gcc_functions.c" to avoid conflicts
* Wii U: Fix random_device usage
random_device will always be seeded with a constant seed and will return the same number sequence every time
* Wii U: Improve software keyboard
* Wii U: Fix console input text width
* Fix X11 being searched for on macOS
* Add ability to switch audio backends
* Fix issues with c arrays of std dynamic size items
* Fix old uses of sizeof()
* Remove current selected option from list
* Don’t show items if we only have one option
* Revert changes to GetItemFromGet
* Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
* Enum + combo box
* Add obtainability checks correctly
* combobox title rename + no number tracking
* Fix repeatable purchases and bottles rendering incorrectly
* Move shopsanity option in GUI
* Struct instead of ImVec + basic comportment for all case
* Attempt to fix odd build issue
* Cast randoGet for ganons boss key
* Remove redundancy in KD room
* Update logic Cvar names
* Fix Ganons Trials coming from old save files. Fixes#1365
* Fixes crash when entering Ganon's Castle lobby on linux.
* Makes `Item_Give` safe to use with a NULL globalCtx.
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
* Converts Song from Impa to use `Item_Give`
* Adds more options for Link's starting item.
* Removes unneeded `GiveLinkItem` functions.
* and make it build
* bring back new rando dropdown
* gSaveContext access in GameMenuBar.cpp
* Implement Skip Scarecrow's Song
* Reimplement progressive Bombchus
* Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes#1390
* Fixes Link starting with BGS
* Persist item tracker notes
* Adjust Hooks include
* Use SohImGui::RequestCvarSaveOnNextTick
* Fix issues from LUS refactor
* Fix for overriding deku scrub messages
* Fix mistake from merge
oops
* Restore checkboxes to enhancements menu
These got lost in the merge
* Update location access logic
Including MQ locations in Spirit and GC now
* Implement rando bombchu drops
* Missing break
* Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
* Update settings.cpp
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Clean up bool
* Update logic Cvar name
* Fixed capacity on ammmo tracking
* Fix for beans obtainability
* Hook into file delete and clear notes
* Incorporate magic arrows in rando settings
* Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
* Update tooltip
* Add line break in tooltip
* Tooltip wording + line break
* tweak on main logic
* All color logic for all types
* Fix: changes to please new LUS
* Ensure itemTrackerNotes vector is not fully empty
* Implement's Tycoon Wallet.
* Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
* small tweaks and rename
* always display XX/YY when in ammo/capacity mode
* Move all merchant messages to be generated on file load
* added hovertext for the number display
* Swap german and french translations for shop messages
* Set key colors to be on by default
* Add another flag to skip mask shop
* Fix Sold Out bug
* Fix gerudo keys, add disabled checkbox
* tooltip line break
* Add trials required and merchant prices to save file instead of loading from active spoiler log
* Remove trialsRequired persisting in save manager
* Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
* Fix issue when merchantPrices is empty
* Fix for a single zeroed merchantPrice entry
* Fix#1417
* Implements items selling out and fixes issues with purchasing some items.
* Fixes order of operations so Rupees will be spent.
* Fixes sold out items not getting overwritten by the randomized info.
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Clarify var names and comments
* Rename randomizerMerchantPrices to merchantPrices
* Handle shop items in SaveManager
* Fix merge mistake
* Base whats in the bazaar shop on entranceIndex instead of age
* Tidy up chain platform cutscene check
* Fix merge error
Didn't mean to have Zhora changes in here yet
* Use 3drando item table for parsing spoiler names
* Use another nested method instead of one at the top level to fetch the table
* Add missing newline
* Remove log
* Respect custom draw functions
* Fix issues with rendering songs
* Fix localized item names for shopsanity
* Implements a larger array of Sprites for the Icon Hash.
* Uses the hash instead of seed for spoilerfile name and icons.
* Removes some unused functions and variables in `spoiler_log.cpp`
* Prevents leading 0s added to hash from being in file name
* Changes filename format to icon indexes separated by dashes
* Hopefully makes Jenkins happy
* Hopefully makes Jenkins happy
* [Rando] Child Gerudo Fortress 37th Heartpiece randomized
Fixes#1071
* Add descriptions to save editor flags editor, and added randomizer flags (#1386)
* Add descriptions to save editor flags editor, and added randomizer flags
* Hide randomizer flags when not on a randomizer save
* Move flag descriptions to header file
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Fix merge error
* crash on pause menu on linux (only in appimage)
Fixes#1437
* Applies fix to Song from Impa as well.
* Allow buying tunics as child when shopsanity is on
* Fix for custom draw methods overriding sold out sign
* Simplify logic around shopsanity and fix some issues
* Fix dungeon reward stone rotation and add particles
* Fix some issues with ice traps
* Fix adult wallet having its own max capacity
* Fix amount of keys given for BotW
* format
* Use EnGirlAShopItem enum instead of raw hex values
* [#1434] Renders non-warp songs more consistently with warp songs
* A few changes around merchant messages
* Various changes from PR feedback
* Rando: Junk Hint missing french translation
* Typo
* Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM
* Replace magic numbers in message handler
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Fix BGS softlock for shopsanity
* Support tycoon wallet on tracker
* Revert "Fix BGS softlock for shopsanity"
This reverts commit 5fdb961ea4.
* [#1053] Resolves an issue with shop items and bombchu bowling where BGS would display two message boxes
* Implements some necessary plumbing and resolves several Ice Trap Softlocks.
Adds a way for an item entry to tell what type of check it came from (NPC vs Chest vs Freestanding, etc.)
Sets this value from chests and item00 actors.
Relocates pendingIceTraps to save context so it can persist through cutscenes and get stored on save init for Link's Pocket and Song from Impa.
Restructures pendingIceTraps into a counter rather than a true or false, so that we can be frozen multiple times in a row if applicable (atm that should only be at the start of a run if Link's Pocket and Song from Impa were both Ice Traps).
Adds a textbox for Ice Traps and a special case of holding up nothing in the get item process. This fixes all the cases where Ice Traps would softlock due to the actor giving the item expecting a closing textbox. After holding the item above his head Link increments the pendingIceTraps counter by one and sets whatever flag he has pending.
None of the above plumbing applies to Ice Traps from chests, those work exactly the same as before, as do freestanding item00 ice traps (thanks to the additional check for ITEM_FROM_FREESTANDING.
OoT and Ruto's Letter count as NPC's, so they get the FOWL text box and set a pending ice trap rather than immediately freezing, since Link weill be in the water. Link will get frozen the next time he touches land, which in the case of OoT is after the fade to white and right before the Song of Time check.
Fixes all the other softlocks I'm aware of, including Fishing, Bombchu Bowling, Skull Kid, and losing the second Gerudo Archery check.
* fix bgs check in player
* move bgs logic for tokensanity into MOD_NONE check
* set bgs flag before `Item_Give`ing
* move bgs flag into `MOD_NONE` check in girla
* use existing check in `z_player`
* Adds comment explaining the decision to default ITEM_FROM_NPC.
* Rename pendingIceTraps to pendingIceTrapCount
* Adds some RANDOTODO comments about cleaning up a couple things.
* Merge branch 'develop-zhora' into ztornn
* manually restore changes to `z_player.c`
* Fix after some ice trap prepwork from earlier
* Actual fix
* Woops
* More rupee names
* Actually fix it
* Add back comment
* Fix Skip Scarecrow Song
* Fix ruto's letter and LH sun stick rendering
* Also fixes it for treasure chest game
* Tweak: Rando French Wallet
* ADD: French Tycoon
* Hide dungeon items/notes by default
* [#1301] Fix issue with UI not restoring after getting an item from biggoron
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Fix random crash that only affected one person for some reason
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Sarge-117 <adam_branston@outlook.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: lil David <1337lilDavid@gmail.com>
Co-authored-by: Sarge-117 <108380086+Sarge-117@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Add cheat for easy pause buffering
* Add pause input buffering
* Fix pause input buffering
* Changes from feedback
* Convert frame to bool
* Handle when pad is nullptr
* Add newline
* Split input buffering into it's own CVAR
* Split SetShouldBlockGameInput up into to methods
* Fix Trails, add more Trail Customization
* 3d Bombs; Bombchu now glow custom trail colors
* 3D Seed/Nut Model, Separate Sword Slash Colors
* Removed 3D Seeds/Nuts; Don't work properly
* restored previous removal of sword blur code
* Remove things not related to Trails
* Remove fix to random color code