summaryrefslogtreecommitdiff
path: root/soh/src/code/z_parameter.c
AgeCommit message (Collapse)Author
2025-08-13Boss Rush cleanup (#5652)Pepe20129
* Reduce stuff in the `.h`s & use `COND_HOOK` + variants * Move some boss rush stuff from `z_file_choose.c` * clang * Update BossRush.cpp
2025-06-11Convert actor health bars to use ObjectExtension (#5565)Rozelette
2025-05-16Merge pull request #5497 from HarbourMasters/develop-blairMalkierian
blair -> dev
2025-05-01a11y: read out changes in action button (#5421)Philip Dubé
* a11y: read out changes in action button * remove drop & throw & putaway * down when on horse * typos
2025-04-23Fix C-Down Position with Anchor Left (#5423)Eric Hoey
2025-04-15Implements a rand inf for Ruto's letter to apply to logic to track it ↵Malkierian
separate from the underwater item check. (#5405)
2025-04-11Move processing for RAND_INF_WEIRD_EGG to trade item processing so it ↵Malkierian
happens whenever you get the egg. (#5382) Remove RSK check for garden entrance because access is still handled by `CanUse(RG_WEIRD_EGG)`.
2025-04-01Apply clang-format to files (#5273)Archez
2025-03-31Prevent GameplayStats and TimeDisplay from getting reset on ship json drag ↵Christopher Leggett
and drop (#5269)
2025-03-30Replace old methods with ShipUtils (#5151)Archez
* Replace old methods with ShipUtils * remove PAL naming
2025-03-30NTSC Support (N64) (#4198)inspectredc
* copy n64 pal 10 doing this so i can check diffs i make * transfer german->jp icon item * overlays, message data, icon item jpn, audio, code todo: title_static, gameplay keep * add kanji and fix title cards * title static * spell folder correctly * boss title cards, do action, icon item, item name, map name * headers for jpn stuff * gameplay_keep * Scenes, audio, jp text extraction, rom support, overlay fixes, sheik & darunia todo: test & disable darunia fix cvar for ntsc * msgptr init fix * icon item offsets * comment out title cards until zapd can fix itself (we extract these in a different file anyway) * compile and font implemented to get past title screen * file select * message, kaleido and everything else but rando * uintptr_t * rando and custom messages working! * ntsc-j 1.0 support * n64 logo? * copy ntsc 10 to 11 * ntsc 11 extraction * change title version names * copy ntsc 11 to 12 * ntsc 12 extraction * clean up some todos * re checkout submodules post merge * fix US filename * support cross-version filenames * add new versions to non-mq list * use correct message table init * Fix ntsc nes message table overriding pal nes message table * actual fix, allows extraction * fix file name using wrong font of file being hovered over * Fix barinade crash * re-add pal * better jabu fix and revert LUS * fix gerudo title cards * better better owl select * more owl fixes * build * fix some name decode issues * Switch Language Mid Text * Fix PAL displaying for JP filenames * Fix AskToEquip Crash * Disable Credits Timing Fix on NTSC * Fix JP Text positioning * basic language switching (BIG todo: file select, title screen) * Title Screen Hopefully working * add ntsc to linux appimage stuff, TODO: add .v64/.n64 support * Update OTRExporter * Fix pause to decide offset * Fix bomb item name crash * fix fire arrows and PoH * builds * update asset changes and fix menu language changing * fix name decode * Fix crashes and add rando/boss rush select stuff * Revive debug feature by setting language cvar too * Fix ocarina text speed softlock, and update jp text speed changes * Merge remote-tracking branch 'upstream/develop' into NTSC * Fix options menu and let pal use japanese fully * Resolve some suggestions * match up gTextSpeed changes to english (still broken!) * Fix text speed crash * Set default filename language on save init funcs * bump otrexporter * Display same correct info for n64 ntsc-j and ntsc-u * quicktext more closely aligned with decomp * linux appimage v64/n64 checksums * bump zapd * Credits Fix Tooltip Adjusted * update supported hashes json * update shasums to include JP n64
2025-03-26shipinit (r)ba (#5025)briaguya
* RBA and BA * move rba to shipinit * make the vanilla condition actually a vanilla condition * update should docs * move ba to shipinit * don't pass things * try a different readability strategy * remove option/preset entries --------- Co-authored-by: rozlette <Rozelette@users.noreply.github.com>
2025-03-19Menu - Enhancements and cheats re-organisation (#5142)aMannus
* First pass cheats, extra modes, minigames, difficulty, fixes, graphics * More progress. One tab left * Enhancements & cheats done and fix for item tracker font
2025-02-25Trade cleanup (#4971)Pepe20129
* Move adult trade to flags * Move child trade to flags * Fix vanilla * Address review * Rename `trade_shuffle` to `ShuffleTradeItems` * Fix mac build * Update GIVanillaBehavior.h * Update z_kankyo.c * Update z_en_heishi2.c
2025-02-25Use gamemode enum (#5089)Archez
* Use gamemode enum * update console command for file_select
2025-02-19Use VB hook to fix Deku Nut upgrade bug (#5047)Jordan Longstaff
* Use VB hook to fix Deku Nut upgrade bug * Use constexpr, remove unused extern * Separate IS_RANDO out of value macro * Restore mask check in hook * Call VB hook in SkipMiscInteractions hook * Mask of Truth hook not registered in rando
2025-02-12Created and implemented PosType enum (#5046)Miles Acquaviva
* Created and implemented PosType enum * fixed formatting --------- Co-authored-by: link5669 <acqmiles@gmail.com>
2025-01-15Organize ship specific save context additions (#4597)Pepe20129
* Basic restructure * Undo most randomizerInf changes for now * Small fixes * Fix linux & mac builds? * Fix remnants of randomizerInf changes * Post-merge fix * Post-merge fix
2025-01-03Fix Broken Giant's Knife flag not resetting (#4608)Jordan Longstaff
* Fix Broken Giant's Knife flag not resetting * Force setting on in rando * Fix flag when checkbox is toggled
2024-12-03Add Timer Display Window (#4553)Caladius
* Add new timer window and display options * Fix overflow spacing * Icons for Timers * Swap Labels for Icons. * Additional Timers * Navi Timer Icon * Clean up unused Defines. * Code clean up and double check. Ready for Review * Update from Suggestions * Update magic numbers, correct indentations hopefully * One moooooore thing * Undo z_param change * Updates
2024-11-29Cosmetics cleanup (#4587)Malkierian
* Convert defaultColor from ImVec4 to Color_RGBA8. Convert defaultColor's ints to floats when being applied to currentColor in the macro. * Address previous cleanup comments. Surround `Message` tab in an advanced check. * Resolve warnings and cleanup whitespace/formatting. * Make Color_RGBA8 constructing function because... platform differences... * Function name clarification. * Remove default color conversion, reference default colors directly in CosmeticOption initialization.
2024-11-27Fix some situations where trade items spoiled (#4569)Pepe20129
* Fix some situations where trade items reverted * Update z_game_over.c * Hopefully fix mac
2024-11-26Cosmetics Changes (#4275)Pepe20129
* Clean CosmeticsEditor.h * Add CosmeticsEditor_GetDefaultValue * Add message text cosmetics * Format cleanup * Remove dependency on 3drando random functions * Fix rainbow for every cosmetic * Add "Rainbow All" & "Un-Rainbow All" * Add HookshotChain cosmetic * Add Nayru's cosmetics * Add Farore's cosmetics * Add Din's cosmetics * Add Title card cosmetics * Update CosmeticsEditor.cpp * Add Copyright text cosmetic
2024-11-19OTRGlobals cleanup (#4251)Pepe20129
* Remove unused headers * Move all "ResourceMgr_" functions to a new file * Don't transitively include SaveManager * Move cvar prefixes to a new header * Add missing includes * Update OTRGlobals.cpp * Fix build * Address review * Fix some of the errors * Update gameplaystats.h * Update z_en_in.c * Hopefully fix the linux issues * Fix Linux issues for real this time, I checked * Update ResourceManagerHelpers.cpp * Update z_obj_mure2.c * Post-merge fixes * Fix build (hopefully) * Post-merge fixes * Update z_file_nameset_PAL.c * cleanup some unnecessary headers (#7) --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-11-08Update SFX symbols from decomp (#4531)Jordan Longstaff
2024-11-06Adjustments to change age cheat and time travel enhancement (#4512)Garrett Cox
2024-10-29Move & refactor Randomizer_Item_Give (#4492)Pepe20129
2024-10-22Built-in Time Splits [v2.1] (#4455)Caladius
* Adds 2 new Hooks, OnTimeStamp and OnPlayerHealthChange. * Re-add Timesplit code * Committing custom Assets * Commit Asset definitions * Adding Windows * Fix Modal Window and others * Time Splits v2 new Hooks etc. * Fixing Time Displays * Adding Big Poe split * Update Options Tab * List Preview and Removing Split Entries * Allow Split Table to resize * Fix Window Color and Adding Non Items to Split List * Correct Song Image Skew
2024-10-17Disable Lens Effect On Unequip (#4432)Malkierian
* Add logic to turn off lens effect when replacing it on a button with another item, but not swapping. * Swap to real fix for dpad equips bug, c/o Rozelette.
2024-10-17`z_player` documentation 2024-10-11 (#4407)Pepe20129
* Add names to start of typedefs * Idle stuff * 2 functions * Player state flags * Name functions + misc * ActionChange => ActionHandler * Some player unks * More player unks * Header misc * Misc * More misc * Player Actions * Missed comments * Move ship specific stuff * Fix build * CsCmdActorAction to CsCmdActorCue * Fix build
2024-10-13Clean controller menu (#4223)Pepe20129
* Improved Ocarina Controls * Move speed modifiers to modifier section * Move DpadEquips, PauseAnyCursor & NaviOnL * Add DpadHoldChange to menu * Change DpadHoldChange checkbox to match default * Change cvars from CVAR_SETTING to CVAR_ENHANCEMENT * Update z_parameter.c
2024-10-08Convert GameInteractor_Should hook to use variadic arguments (#4383)Archez
* Convert _Should to use variadic args * Convert everything to use va_arg properly * Update shop hooks to va_args * Wrong Function * Update hook_handlers.cpp --------- Co-authored-by: Malkierian <malkierian@gmail.com> Co-authored-by: Malkierian <malkierian@live.com>
2024-10-07VBify (#4255)Pepe20129
* Convert ocarina buttons & skip scarecrow song to VB * Move most of boss rush & rupee/key counters to VB * Move BossRush_HandleCompleteBoss to VB * Convert boss timestamps to VB * Move being able to open doors to VB * Convert Entrance_OverrideWeatherState to VB * Move boss souls to hook_handlers.cpp * Update hook_handlers.cpp * Move infinite upgrades to hook_handlers.cpp * Move skeleton key to hook_handlers.cpp * Move swim and child wallet to hook_handlers.cpp * Move ganons boss key to hook_handlers.cpp * Move triforce hunt to hook_handlers.cpp * Move randomizer sheik spawn to hook_handlers.cpp * Update BossRush.h * Convert spoiling items to VB * Move load game stuff to hook_handlers.cpp * Move warp song handling to hook_handlers.cpp * Convert being able to play bowling to VB * Move shooting gallery man handling to hook_handlers.cpp * Move spirit temple silver block removal to hook_handlers.cpp * Fix build * Move last beehive stuff to hook_handlers.cpp * Fix build * Add VB_CLOSE_PAUSE_MENU * Add VB_BE_ABLE_TO_SAVE * Add VB_RENDER_YES_ON_CONTINUE_PROMPT * Add VB_SPAWN_BLUE_WARP * Add VB_BLUE_WARP_ADULT_WARP_OUT * Add VB_BG_BREAKWALL_BREAK * Convert Saria stuff to VB * Remove now unused check * Add VB_GANON_HEAL_BEFORE_FIGHT * Update hook_handlers.cpp * Fix blue warp offsets * Fixes from review * Improve documentation * Update BossRush.cpp * Fix my stupidity * Fix #4327 * Update hook_handlers.cpp * Fix blue warps * Use ultralib types & clean header * Replace options amount macro with BR_OPTIONS_MAX * Remove unused includes * Remove accidental line doubling * Tweaks to boss rush (#6) * Update GameInteractor_HookTable.h --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-08-17Bombchu logic fixes, Add BetterBombchShopping enhancment and some adjacent ↵Pepper0ni
cleanups (#3733) * Initial Bombchu rework implementation * Finish bombchus in logic overhaul * address reviews * Post resolution fixes * fix git being dumb * Readd Child Wallet To Bombchu Bowling Logic * post merge fixes * fix some oversights in bombchu shopping logic * doesn't work, linker errors * cleanup old reviews * Make it build, likely broken by VB * attempt to fix carpet man second purchse text * commit to change branch * mostly have carpet guy working * badly fix carpet salesman * fix better bombchu shopping * fix bombchu drops * remember you need bombchus in inventory to get drops * Address reviews * post-SCL clean up and redo the bombchu ammo logic to apply better to the spirit edge case * fix oversight which could have allowed for bombchus to logical exist when they shouldn't * Remove special bombchu playthrough checks which are causing bugs and no longer needed * fix Slingshot logic reset * Convert helpers I touched into CanUse and HasItem * last cleanups
2024-07-22Rando: Infinite upgrades (Rando V3) (#3942)Pepe20129
* Infinite Upgrades * Add "Condensed Progressive" * VB & fix build * Update settings.cpp
2024-07-18Fix return of Item_Give for stricter compilers (#4244)Pepper0ni
* fix return of Item_Give for stricter compilers * change to just item
2024-07-17Rando: Skeleton key (#3997)Pepe20129
* Initial Implementation * Add temporary model to the skeleton key
2024-07-17Rando: Shuffle consumable bags (#3959)Pepe20129
* Main implementation * Fix sticks & nuts from shops & checks * Change the models to normal stick & nut Worth noting that before you have the bags, the refills are blue rupees so there will not be model collision * Update hook_handlers.cpp
2024-05-06Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6Malkierian
2024-05-06Merge remote-tracking branch 'origin/develop' into merge-macready-may6Adam Bird
2024-05-05Make it build.Malkierian
2024-05-05Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-5Malkierian
2024-05-05Final Step of CVar macro/sectionalizing (#4107)Malkierian
* p * Missed the prefix renames. * More missed ones. * Mostly finished cleanup. Removed a few CVars and some related functionality. * Bit more (prepping non-existent title card color editing). * Resolve gCrowdControl. * Final cleanup. * Universal constant, not acceleration... * Preset CVars.
2024-04-26Swap all cosmetics CVars to macros. (#4065)Malkierian
Lots of renames. Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-04-26All MenuBar enhancement CVars done. (#4064)Malkierian
2024-04-21CVar Macro Cleanup (#4062)Malkierian
* Standardized CVar macros to have `CVAR_` at the front instead of the end. Removed excluded and replaced sequence macros. * Missed a few developer CVars outside of `SohMenuBar.cpp` * 1 more.
2024-04-20Step 3 of CVar macro/sectionalizing: Dev Tools, Cheats, Audio Editor, Remote ↵Malkierian
(#4030) * Swapped Audio Editor CVars. * Swapped Cheat CVars. * Swapped Developer Tools CVars. Also a couple General CVars. * Added REMOTE_CVAR. Swapped Remote CVars. * Missed an include.
2024-04-20Fix and Clean Up Swap Age Logic (#4061)inspectredc
* Split and clean up swap age logic * reorganise conditions into one statement
2024-04-03pull in docs (#97)briaguya
* rename `func_8002DF54` to `Player_SetCsActionWithHaltedActors` * rename `func_8002F434` to `Actor_OfferGetItem`
2024-02-21Merge branch 'develop-rando' of ↵Garrett Cox
garrettjoecox.github.com:HarbourMasters/Shipwright into develop-rando-changes
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 18:06:41 +0000