summaryrefslogtreecommitdiff
path: root/soh/src/code
AgeCommit message (Collapse)Author
2023-04-27spockalicious (#2751)briaguya
* Rough mockup of LUS XML loading * Updated code for merge * Loading from FS support and custom DList WIP implementation * Added current directory support to F3D and impl most of the dlist cmds * WIP Skeleton support * Almost done * Rebase fixes * Submodule updates * HD Texture Support * Fixes * bump lus * fix exporter build, header update * soh builds * setMesh image path cleanup * Update soh/src/overlays/actors/ovl_player_actor/z_player.c * Update soh/src/overlays/actors/ovl_player_actor/z_player.c * Update OTRExporter/OTRExporter/Main.cpp * Update ZAPDTR/ZAPD/ZResource.h * Update soh/src/code/z_skelanime.c * Update OTRExporter/OTRExporter/Main.cpp * Fixed jpeg backgrounds and decreased icon buffer size * Bump lus * Increased even more the buffer because it crashes on long texts * Removed print because sometimes the if is not triggered when the image is already byteswapped * fix non-windows build * fix build Co-authored-by: Kenix <kenixwhisperwind@gmail.com> * add hd checkbox * Various fixes for custom model support (#23) * Some fixes * Updated LUS Version * Fixed issue with Link Skirt on pause menu * Added CVar for custom link model changes * Fixed headers * Additional header fixes * Tweaks * Unload HD game assets on scene transition. (#16) * Unload game assets on scene transition. * Bump LUS * Unloads all HD assets on scene transition. * Only unload hd assets if hd assets are turned on. * Fixes issues on toggling between HD and non HD assets. --------- Co-authored-by: briaguya <briaguya@alice> * fix: actually load hd debug font (#27) * fix: actually load hd debug font * toggle debug text correctly --------- Co-authored-by: briaguya <briaguya> * Yes. (#28) * Merge branch 'develop' into dev-to-ghost * HD Skeleton Swapping and Language Fixes (#32) * Yes. * HD Skeleton Swapping and Language Fixes * Test * Fixed issues with ganon cape (#34) * Fixed Bongo Bongo Crash (#35) * Added HD Assets Toggle (#37) * Ivan the Fairy - Coop Mode (#36) * wip * hookshotable ivan * added hookshot item * new items & changes & fixes & restored navi * farore, din and nayru's spells are done * fixed slingshot & bow * added more items supported * done with all main items * bug fixes & ready * added imgui button * wip * hookshotable ivan * added hookshot item * new items & changes & fixes & restored navi * farore, din and nayru's spells are done * fixed slingshot & bow * added more items supported * fix own dungeon items on shuffled boss rooms (#2683) * bump lus (#2692) * fix: lowercase package names for vcpkg (#2693) vcpkg was throwing an error `error: invalid character in package name (must be lowercase, digits, '-')` this updates our calls to `vcpkg_install_packages` to use lowercase package names instead of uppercase * fix death mountain cloud in rando (#2691) * Fix: Switch Age No Longer Reloads Start Room (#2679) * [Reduced Clutter] Disable Hot/Underwater Warning Text (#2684) * Disable Warning Text * Moved to Reduced Clutter * done with all main items * bug fixes & ready * fix: process roms in consistent order (#2696) * chore: move rando savefile setup and document flags (#2697) * remove rando save init from sram * move rando savefile init logic and set more flags * document flags for rando save creation * Fix: Use correct fps value for frame interpolation with match refresh rate (#2694) * Fix: Kak GS placement on construction site (#2695) * added imgui button * addressed kenix's comments * fixed useless null * added rupee dash mode in extra modes * changed menu position --------- Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> * LUS Scancodes (#42) * Added HD Assets Toggle * Switched out SDL for LUS scancodes * Ivan tweaks (#45) * Magic consumption slowed down; Bosses now affected by Ivan's Din spell * Adjust magic timer * clean up imgui * model fixes/improvements (#50) * replace `gUseCustomLinkModel` with custom resource check * handle adult/child * bump lus * fix model switching with tab * use lus main * fix carpet man (#52) Co-authored-by: Rozelette <Rozelette@users.noreply.github.com> * get ship model and lus texture into soh.otr, use `gAuthenticLogo` to toggle between ship and authentic (#55) * Use libultra features for CPU-modified textures (#40) * Use libultra features for CPU-modified textures * Comment * bump lus on ghost (#58) * fix: properly use `Interface_LoadActionLabel` to display start button text (#61) * Changes hd -> alt for texture replacement. (#65) * Changes hd -> alt for texture replacement. * Renames variables in gfxprint for hd -> alt change. * Update soh/soh/resource/type/Skeleton.cpp --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Fixes kaleido dungeon maps (#67) * skeleton stuff (#69) * comment out wii u build (#70) * bump lus (#71) * Rework readme (#72) * Update README.md * docs * put custom music docs somewhere * Update README.md * Update README.md * Update README.md * Update README.md * dark/light title image * lus * Update README.md * Fixed vanilla minimap (#73) * Fixed vanilla minimap * Workaround for pulsing SD maps with non-broken HD maps. --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> * Skeleton fix fixed (#75) * WIP skelton patcher fix * Fixes skeleton reference change. * Adds const back to name in ResourceMgr_LoadSkeletonByName --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: Kenix <kenixwhisperwind@gmail.com> * Fixes z_message_otr memory leak. * Update soh/soh/z_message_OTR.cpp * Update soh/src/code/game.c * docs: add how to find otr files to switch instructions (#78) * bump lus (#79) * comment out RegisterBlendedTexture in king d (#80) --------- Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: David Chavez <david@dcvz.io> Co-authored-by: briaguya <briaguya@alice> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> Co-authored-by: KiritoDv <kiritodev01@gmail.com> Co-authored-by: briaguya <briaguya> Co-authored-by: Ralphie Morell <stratomaster64@gmail.com> Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com> Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> Co-authored-by: Rozelette <Rozelette@users.noreply.github.com> Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: Lywx <36680385+KiritoDv@users.noreply.github.com>
2023-04-25Implement built in Extractor for Windows (#2730)louist103
* wip * const * split zapd into two targets * Workingish. * fix working dir and copy xmls on build (#2) * dont change current working dir with dialog prompts * copy asset xmls to target dir * make zpadlib public * Messagebox. * Check for WIN32 * threading * Cleanups to the exporter and main. * Multi extraction. * Fix byteswap header includes. * Fix another byteswap include. * fix again. * stddef size_t * Add other targets for ZAPDLib * Non windows. * IDYES IDNO * Linux fixes * hopefully remove switch and wiiu from building extractor * Please? * validate roms and add another valid rom * ifdef out extract.h for switch and wiiu * Maybe update lux * Remove ZAPDlib from switch and WiiU * more rules * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/ExecutableMain.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/CMakeLists.txt Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/GameConfig.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/Globals.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update ZAPDTR/ZAPD/Main.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/CMakeLists.txt Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * Update soh/soh/Extractor/Extract.cpp Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * the last fix * Add context to a comment --------- Co-authored-by: Adam Bird <archez39@me.com> Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-04-22Enhancement: Aiming reticle for the bow/slingshot (#2715)RaelCappra
* Bow reticle enhancement * Menu bar checkbox * fix * simplify bow/slingshot reticle logic * Comment on RETICLE_MAX * Tooltip clarity update --------- Co-authored-by: briaguya <briaguya@alice>
2023-04-21Tweak: Unique GetItemEntry for Progressive Bombchus with particle effects ↵Adam Bird
(#2732) * give progressive bombchus its own getitementry to allow custom draw effects * fix timestamp item check
2023-04-21ImGui Cleanup - Move Experimental entries, clean up presets (#2725)aMannus
* ImGui cleanup * Fix Wii U * Fix Wii U build 2: Electric Boogaloo * Review comments * Review Comments 2: Electric Boogaloo
2023-04-20Fix: SoT Time Travel B-Button Behaviour (#2720)inspectredc
* time travel allows fishing rod + fixes vanilla ToT age change behaviour * oops removed too much
2023-04-18Fix: Update GetItem value for freestanding items and shopsanity plentiful ↵Adam Bird
(#2718) * fix freestanding items not changing getItem value on the fly * fix getItem models in shops for plentiful items
2023-04-11chore: move rando savefile setup and document flags (#2697)Adam Bird
* remove rando save init from sram * move rando savefile init logic and set more flags * document flags for rando save creation
2023-04-11[Reduced Clutter] Disable Hot/Underwater Warning Text (#2684)Patrick12115
* Disable Warning Text * Moved to Reduced Clutter
2023-04-07Switch age fix (#2676)inspectredc
* specific scenarios for switch age button, non rando * Working fix for vanilla swordless change age * Fix now works for randomiser * Fixed room load on change age transition * Removed potentially unnecessary function call Need to investigate this more, maybe wait for more room documentation. * Suggested Edits Moves setting cvar back into mods.cpp and makes clear the condition expected for the no sword flag
2023-04-07Link voice pitch v0 (#2430)RaelCappra
* Link voice pitch v0 * Using a new variable instead * Move voice pitch slider to Options tab * fallback to original behavior if freqMultiplier is set to 1 * Move reset button to Options tab with its slider * Fix voice pitch slider width in Options tab * [Review] Always use freqMultiplier
2023-04-04fix: properly display static background scenes (#2669)briaguya
2023-04-03Enhancement: Room/Scene Timers (#2478)Ralphie Morell
* Groundwork on scene/room timers; naming changes * added to save manager; reworked storing timestamps * actually saved stuff to savemanager; accounted for null playstate * finally fixed the fucking timers * Added scene mapping * Added CVar for room/scene level; fixed some displays * reworked logic * increase name spec for scene timestamps * Actually save item timestamps when loading v3 save * Cleanup * fix merge artifact * apply suggestions
2023-04-02[Time Saver Enhancement] Nighttime GS Always Spawn (#2611)Patrick12115
* Nighttime GS Always Spawn * add hook onSceneSpawnActors * implement onSceneSpawnActors hook to spawn GS in various day scenes * handle the kak tree skull during the day * Update mods.cpp * Add the & * Fixes * Update soh/soh/Enhancements/mods.cpp Co-authored-by: Adam Bird <Archez@users.noreply.github.com> --------- Co-authored-by: Adam Bird <archez39@me.com> Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
2023-04-02ADD: Time Saver --> Time Travel with the Song of Time (#2575)PurpleHato
* ADD: Time Saver --> Time Travel with the Song of Time Co-Authored-By: aMannus <4244591+aMannus@users.noreply.github.com> Co-Authored-By: David Chavez <david@dcvz.io> * TWEAK: one liner for the gPlayState check * ADD: Time Saver --> Time Travel with the Song of Time Co-Authored-By: aMannus <4244591+aMannus@users.noreply.github.com> Co-Authored-By: David Chavez <david@dcvz.io> * TWEAK: one liner for the gPlayState check * Timetravel stuff * tweazk oopsies * Fixes timeline * tweak frog dist * ADD: Time Saver --> Time Travel with the Song of Time Co-Authored-By: aMannus <4244591+aMannus@users.noreply.github.com> Co-Authored-By: David Chavez <david@dcvz.io> * TWEAK: one liner for the gPlayState check * Timetravel stuff * tweazk oopsies * Fixes timeline * tweak frog dist * oppsie² * del dupe * del dupe * tweak tooltip --------- Co-authored-by: aMannus <4244591+aMannus@users.noreply.github.com> Co-authored-by: David Chavez <david@dcvz.io>
2023-04-02Adds `OnTransitionEnd` hook to `GameInteractor`, called at the end of a ↵Malkierian
transition after all mid-transition setup is called. (#2635) Transitions final autosave location to `OnTransitionEnd`. Adds functionality to autosave to set a delayed save flag if AutoSave is set to Major or All Items and one is obtained in a grotto, to avoid grotto autosaving but still provide for the autosave when location-based saving is off. Fixes small bug with item lookup where sometimes an item's `modIndex` would sometimes be reported one way, but the way Randomizer does things it would be in a the other `modIndex`, and the lookup would fail. Minor variable name clarification in ItemTableManager. Modifies AutoSave to account for item ID overlap from `MOD_RANDOMIZER` table (all items in the randomizer table is considered major for AutoSave purposes except ice traps).
2023-04-02Hyper Bosses (act and move twice as fast) (#2555)aMannus
* Hyper bosses * Actor* to void* + cast to fix build * Cleaner implementation * Fix enemies taking double damage * Fix smaller dodongo's being sped up * Additional fix and code cleanup * Proper fix for double damage * Extern variable -> GI state
2023-04-01Merge branch 'develop-khan' into khan-to-devbriaguya
2023-03-31Fix Missing Custom Sequences (#2649)Malkierian
* Modifies custom sequence loading to bypass other sounds being loaded in AudioCollection to fix missing custom sequences on load. * Modified `audio_load`'s sequenceMap allocation to utilize `AudioCollection`'s sequenceMap size to account for all audio assets already loaded into that sequenceMap. This gives a non-arbitrary number in addition to the vanilla sequence count to allocate with for `audio_load`'s sequenceMap. Added `HasSequenceNum` to `AudioCollection` as well to streamline the check against `AudioCollection`'s sequenceMap to skip the non-sequence assets in there. Added clarification comment for seqNum and MAX_AUTHENTIC_SEQID section. * Clarified comment about AudioCollection seqNum and MAX_AUTHENTIC_SEQID. * A bit more on comment from the last commit.
2023-03-22Randomzier: Fix starting rupee item collection (#2645)Malkierian
* When rupees are given as starting items, they still modify `gSaveContext.rupeeAccumulator`, which means that if you make a new file, start it, and reload without saving, or exit SoH before starting the new file, those rupees were lost. This adds a check for `gPlayState` being NULL, and if it is, adds those initial rupees to the rupee count directly. * Update soh/src/code/z_parameter.c Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-03-15Another Item_Give bug fixed... (#2636)Malkierian
2023-03-14Fixes bug introduced by 73052617eda789f957040f98d9368d9cf453a123 where keys, ↵Malkierian
among others, would corrupt inventory slots. (#2626)
2023-03-14Merge remote-tracking branch 'hm/develop-khan' into khan-to-devbriaguya
2023-03-13CrowdControl V2: Effect Overhaul (#2433)aMannus
2023-03-12Makes sequenceMap and seqLoadStatus a dynamic size (#2610)Christopher Leggett
Refactors to allow the above two arrays to be a dynamic size when the game launches, size is set during the AudioLoad_Init function.
2023-03-12[GI] Item_Give and OnReceiveItem updates (#2580)Malkierian
* Changed OnReceiveItem hook to pass GetItemEntry, which required the following changes: Reworked the references to it in `z_parameter` to call a single function with the item return and hook call in it for ease of editing. Modified the pendingSale functionality to set and pass a modIndex value as well, as mod items (like randomizer) in shops still use the vanilla sale path. * Missed some files for the pendingSale changes. Also added Randomizer_Item_Give to the OnReceiveItem system. * Ice traps now trigger OnReceiveItem. * All ice traps truly do work now. As a side effect, item autosave doesn't work for shop/scrub/merchant transactions, requires new OnSaleEnded hook that can also call the autosave. * Removed unnecessary calls to ItemTable_RetrieveEntry where GetItemEntry properties were being used to call it. General code cleanup. * Added OnSaleEnd hook for when rupees are finished deducting after a sale. Migrated AutoSave to its own function, registered AutoSave function to OnReceiveItem and OnSaleEnd hooks to help with autsaving after buying items. Some futureproofing for AutoSave function with parameters for skipping autosave, for when transition end is migrated to AutoSave function (whether through direct call or through a hook). * Renamed hook paramaters, and registered hook function parameters, to a more descriptive alternative. * Missed a couple, fixed a typo. * One more missed paramater name refactor. Refactored all references to OnReceiveItem to OnItemReceive to mirror upcoming full hook refactor for name ordering conventions. Up-to-date with develop.
2023-03-08fix rando quest selection falling back to vanilla saves (#2599)Adam Bird
2023-03-06khan -> devbriaguya
2023-03-06Modify cutsceneIndex in scene transition autosave to include use-cases ↵Malkierian
outside of normal vanilla play. (#2588)
2023-03-02[Accessibility] Text to Speech (#2487)David Chavez
2023-03-01[Resources] Properly encode soh textures and remove raw load (#2548)David Chavez
2023-02-28[Accessibility] Add ability to disable camera re-centering on idle (#2503)David Chavez
* Add ability to disable camera recentering on idle * Remove platform check * Update else camera comment
2023-02-28Rando version warning on different builds (#2420)Adam Bird
* save build version to savefile * adjust rando hash icons to use fade in/out * add dialog message support on the file select screen and display rando version warning * remove duplicated message functions and use stubbed play state instead for rando warning * add major/minor/patch version saving to file and compare against * use strncpy and memset for build version * don't show rando warning one copy/erase screens * review feedback * Add german and french translations for rando warning Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com> --------- Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2023-02-28[GameInteractor] Introduce GameFrameUpdate Hook and Migrate Cheats (#2554)David Chavez
2023-02-28Change autosave to use dropdown (#2550)Josh Bodner
2023-02-26[Game Interactor] Add LoadGame and ExitGame hooks (#2542)Adam Bird
* add loadgame/exitgame GI hooks * implement loadgame/exitgame hooks in game code * move entrance tracker data lifecycle to hooks * update cosmetic editor to update onloadgame hook
2023-02-26add greg to gameplay stats (#2544)briaguya
Co-authored-by: briaguya <briaguya>
2023-02-23Fix Lakeside Laboratory title card (#2501)Amaro Martínez
2023-02-17gibbs -> devbriaguya
2023-02-16you found greg! (#2458)briaguya
adds greg to the item tracker --------- Co-authored-by: briaguya <briaguya@alice>
2023-02-16don't show duped sequence names, don't repeat track intros on barinade (#2482)briaguya
* better fix for repeated sequence names, add delay to fix repeated bgm on barinade --------- Co-authored-by: briaguya <briaguya@alice>
2023-02-16exclude audio from shuffle (#2411)briaguya
* Rename "SFX Editor" to "Audio Editor" * Move some functionality out into a new class `AudioCollection` * Add a tab to exclude sfx/sequences from shuffle pool --------- Co-authored-by: briaguya <briaguya@alice> Co-authored-by: briaguya <briaguya> Co-authored-by: David Chavez <david@dcvz.io>
2023-02-15Separate X/Y axis sensitivity sliders (#2472)Bigs
* Update z_camera.c * Update GameControlEditor.cpp * Update GameControlEditor.cpp * Update GameControlEditor.cpp Adding Sliders for first person X and Y axis * Update z_player.c Modified variables to allowed separate sensitivity settings for x and y axis
2023-02-15[GameInteractor] Game Hooks (#2481)David Chavez
2023-02-14Option for link's models reflect the projectile weapon he's holding ↵Cardboy777
(Bow/Slingshot) (#2454) * Link's models reflect the projectile weapon he's holding extracted logic from months-old PR * apply bow/slingshot model changes only if 'gBowSlingShotAmmoFix' is enabled * Apply suggestions from code review Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com> * whitespace --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-02-13Fix: Rando settings not being initialized in time (#2461)Adam Bird
* fix entrance init and entrance tracker not working properly when no spoiler log is loaded * fix rando adult trade spoilable items reverting when no spoiler log loaded
2023-01-30Rumble and check tracker fixes (#2419)Sirius902
* Fix rumble * Fix check tracker crash
2023-01-26Debug camera (#2400)Kenix3
* Moves SoH mixer to SoH from LUS. * Debug camera now works in SoH, but mempak saving does not (yet). * Debug camera is now enabled/disabled based on the gDebugEnabled cvar. * Updates OTRGlobals comments * Updates OTRGlobals comments
2023-01-25Implement GameInteractor & move CrowdControl and console commands to it (#2358)aMannus
* Begin GameInteractor * Basic skeleton of PoC * WIP * First 2 CC effects transitioned to GameInteractor * Prepare GameInteractor classes for CrowdControl * More effects & replace chaosEffects with GameInteractor * CC connection fixes & all CC effects (enemy spawns still borked) * First couple of build error fixes * Fix build * Proper enemy spawning * Clean up old CC code * Extract link size/invisibility into GameInteractor * Small fix/cleanup * Suggestions for PR * Address PR comment * Addressed more comments & small adjustments * Fix crash when spawning enemies * Remove Remove() * Move checks into Apply() and move CC and some console commands to it * Use inheritance to abstract check on application * Rename prefix Actions with RawAction * Make Remove return a Result * Fix issue with compilation * debugconsole -> GameInteractionEffects progress * Add State in GI * Unify some Effects * Port more debug console items * Remove state modifyiers from raw actions * Port over last raw action / state in console * Adjust some types * Consolidate link size modifier effect * Adjust more types * Define category strings in CC * Clean up remaining non defined strings * Fix bug in timed effects * Rename old pack * CC fixes * Translate GI enum function * Console cleanup/fixes/consistency Co-authored-by: David Chavez <david@dcvz.io>
2023-01-25Add faster farores enhancement (#2394)Garrett Cox
* Add faster farores enhancement * Add preset entry
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 12:28:31 +0000