Commit Graph

783 Commits

Author SHA1 Message Date
Kevin Alexis Contreras
bb90be6748 Merge branch 'zapd_audio_support' into zelda64 2022-06-16 23:09:50 -05:00
briaguya
3e6307bf96
No forced navi (Prevent forced Navi conversations) (#453)
* no forced navi

* imgui option for it

* remove double owl from sloppy merge

Co-authored-by: briaguya <briaguya@alice>
2022-06-16 21:43:46 -04:00
briaguya
36d37d97bd fix audioexporter signedness comparison issue 2022-06-16 21:23:10 -04:00
David Chavez
587c46cacf
Enable High DPI mode in SDL (#490) 2022-06-16 21:08:47 -04:00
vaguerant
ac8acaeba4
Cheat: shield with two-handed weapons (#487) 2022-06-16 21:08:32 -04:00
louist103
93e69c924d
Add time. (#462) 2022-06-16 20:57:01 -04:00
sholdee
73ebcf2b1b
Add failsafe in case of hang (#465)
Aborts stage if hung, which extract_assets.py seems to do on rare occasion
2022-06-16 20:55:26 -04:00
PurpleHato
72ebeaad3b
Fix: SohImGui behavior and cleanup (#461)
* Fix: SohImGui behavior and cleanup

- FIX: Once Save Editor / Collision Viewer are closed, set their values back to 0 so they don't automatically open once we click on Developer Tools

- FIX: Same kind of fixes for every cosmetics editor

- FIX: Typo "gCosmticsEditor" to "gCosmeticEditor"

- TWEAK: Cleanup of useless stylizing options on Cosmetics

* TWEAK: Reset a pointer that I edited for some testing

* FIX: Typo from Assignable tunic / boots tooltip

* move cvar.h includes out of extern c block

* remove extra line

Co-authored-by: briaguya <briaguya@alice>
2022-06-16 20:48:42 -04:00
qurious-pixel
f29fb01887
Add Controller Navigation (#429)
* Add Controller Navigation

- Apply Rainbow patch
- Add Controller Navigation
- Controller "Back" button opens F1 Menu
- Controller Rumble/Gyro settings at the bottom of the controller menu

* Restore changes from PR #306

Add back update from https://github.com/HarbourMasters/Shipwright/pull/306

* Add Tooltip of new functionality

Tooltip: 
Allows controller navigation of the menu bar
D-pad to move between items, A to select, and X to grab focus on the menu bar

* set & save check

* Fixes for switch port
2022-06-16 20:43:34 -04:00
getBrainError
3d24f3f595
Improved Collision Viewer (#435)
* Add fishing pole as sword in save editor

Adds fishing pole as a sword to the save editor under current equipment.

* Improve Collision Viewer

Made all the values of the collision viewer persistent.
Switched all color pickers to the EnhancementColor picker.
Added a checkbox to enable/disable collision viewer.

* Update SohImGuiImpl.cpp

Probably fixed linux build error

* Update colViewer.cpp

Hopefully fixed it this time. Lets wait for jenkins.

* Fixed colors

Some color values were wrong

* Update SohImGuiImpl.cpp &  SohImGuiImpl.h
2022-06-16 20:40:27 -04:00
Christopher Leggett
bf0935a5a2
Gravedigging tour fix (#388)
* Fixes the Gravedigging Tour heartpiece bug.

Basically just causes Dampe's Gravedigging Tour Heart Piece to set a Collect flag on the Graveyard Scene when collected instead of a GetItemInf flag when it's spawned. I did this by simply the result of Item_DropCollectible to a variable called reward and running reward->collectibleFlag = 0x19 if the reward was a heartpiece.

There may be a better way to do this. This is unlike most of the other dropped items with collectible flags in the game, which have some binary operations performed on the item to be dropped before passing it into Item_DropCollectible. See z_en_geldb.c and z_bg_haka_tubo.c for examples of this. I tried to find some way to do something more like that here but I was unable to wrap my head around the binary operations being performed. I may revisit this in the future.

* Reimplements vanilla bug, adds cvar and checkbox for the fix.

* Adds some newlines to the Tooltip

* Shortens ImGui tooltip.

* Removes the hardcoded Purple Rupee/Heart Piece reward.

* Sets collectibleFlag whether cvar is on or not to prevent duping.

* Sets Gravedigging Tour Fix to enabled by default

* Simplifies logic for whether or not to spawn heart piece

* Adds TempClear flag set and check for heart piece.

This originally introduced a bug where the player could spawn multiple
heart pieces by simply not collecting the one that spawns and continuing
to dig up spots. This fixes that by checking a temp clear flag before
spawning the heart piece and setting it when the heart piece spawns.

Since this is a temp clear flag it will not stay set if the player
exits the scene, so this still does fix the bug of locking the
player out of the heart piece when spawning it and leaving without
picking it up.

As far as I can tell this temp clear flag isn't used anywhere else
in this scene. The only one used in this scene I could find is that
killing the first Poe in this scene sets flag 0x02 (or maybe it's
0x01, not sure if the flags start at 1 or 0).

* Replaces magic numbers with constants defined in z_en_tk.h

* Updates comment explaining changed code.

* Replaces another magic number I forgot to replace last commit.

* Replaces TempClear flag with local variable

* Removes TempClearFlag const and moves others out of .h to .c (felt like they made more sense there)
2022-06-16 20:36:13 -04:00
Nicholas Estelami
1f1b81ab40 Additional fixes 2022-06-16 20:35:52 -04:00
Nicholas Estelami
b9a8118e33 Ready for round 2? 2022-06-16 20:35:52 -04:00
Nicholas Estelami
f581e3e79f Let's try again 2022-06-16 20:35:52 -04:00
Nicholas Estelami
2a2ef17302 Fixed Linux issues (I think) 2022-06-16 20:35:52 -04:00
Nicholas Estelami
34ef1d2fd0 Updated resource types 2022-06-16 20:35:52 -04:00
Nicholas Estelami
bb6f5abbbf Updated sequence file format and updated resource version to Rachael 2022-06-16 20:35:52 -04:00
Nicholas Estelami
960a29e513 Fixed StormLib Forward Slash BackSlash issues 2022-06-16 20:35:52 -04:00
Nicholas Estelami
aeaaa54e0d GC PAL Audio XML 2022-06-16 20:35:52 -04:00
Nicholas Estelami
3f10195c0e Added XML attributes and fixed odd crash 2022-06-16 20:35:52 -04:00
Nicholas Estelami
c930bd0138 Added names for the soundfonts. 2022-06-16 20:35:52 -04:00
Nicholas Estelami
0a629ea6e9 Fixed last remaining audio bugs 2022-06-16 20:35:52 -04:00
Nicholas Estelami
6c94c8690e Updated sample rate to 44100hz 2022-06-16 20:35:52 -04:00
Nicholas Estelami
510ef9b60c Fixed crackling issues 2022-06-16 20:35:52 -04:00
Nicholas Estelami
2b40e66fa4 Fixed resample and corrupt audio bug. Minor documentation updates. 2022-06-16 20:35:52 -04:00
Nicholas Estelami
28073fbb19 Commented out additional test code 2022-06-16 20:35:52 -04:00
Nicholas Estelami
ef2f4f799c Commented out NTSC test 2022-06-16 20:35:52 -04:00
Nicholas Estelami
c49cee3521 Audio support nearly complete. 2022-06-16 20:35:52 -04:00
Nicholas Estelami
b3e299dbde Replaced StormLib .lib files with source code.
Some modifications to handle backslashes and forward slashes, along with some optimizations to speed up OTR generation.
2022-06-16 20:35:52 -04:00
Nicholas Estelami
941c19f2c3 Audio decompiled and WIP custom sample support 2022-06-16 20:35:52 -04:00
Nicholas Estelami
bd68e29bfb Additional fixes 2022-06-16 20:13:33 -04:00
Nicholas Estelami
4c99fc497c Ready for round 2? 2022-06-16 20:00:38 -04:00
Nicholas Estelami
b8334e5757 Let's try again 2022-06-16 19:46:07 -04:00
Nicholas Estelami
ce36822c80 Fixed Linux issues (I think) 2022-06-16 19:24:18 -04:00
Nicholas Estelami
1ec0161247 Updated resource types 2022-06-16 19:09:07 -04:00
Nicholas Estelami
dcb1b59c1b Updated sequence file format and updated resource version to Rachael 2022-06-15 16:09:22 -04:00
Nicholas Estelami
510a38a6bc Fixed StormLib Forward Slash BackSlash issues 2022-06-15 16:09:22 -04:00
Nicholas Estelami
7bca63a800 GC PAL Audio XML 2022-06-15 16:09:22 -04:00
Nicholas Estelami
aa98408e00 Added XML attributes and fixed odd crash 2022-06-15 16:09:22 -04:00
Nicholas Estelami
416173fa79 Added names for the soundfonts. 2022-06-15 15:57:52 -04:00
Nicholas Estelami
99e3d9a899 Fixed last remaining audio bugs 2022-06-15 15:57:52 -04:00
Nicholas Estelami
5d3b21bd2b Updated sample rate to 44100hz 2022-06-15 15:57:52 -04:00
Nicholas Estelami
a0e9ca9a9c Fixed crackling issues 2022-06-15 15:57:52 -04:00
Nicholas Estelami
262d067870 Fixed resample and corrupt audio bug. Minor documentation updates. 2022-06-15 15:57:52 -04:00
Nicholas Estelami
44874a0763 Commented out additional test code 2022-06-15 15:57:52 -04:00
Nicholas Estelami
9fe268abc7 Commented out NTSC test 2022-06-15 15:57:52 -04:00
Nicholas Estelami
114c6e01d9 Audio support nearly complete. 2022-06-15 15:57:52 -04:00
Nicholas Estelami
746c7a5303 Replaced StormLib .lib files with source code.
Some modifications to handle backslashes and forward slashes, along with some optimizations to speed up OTR generation.
2022-06-15 15:57:52 -04:00
Nicholas Estelami
b8c9f7f1ce Audio decompiled and WIP custom sample support 2022-06-15 15:57:52 -04:00
Kevin Alexis Contreras
3cd5d75f6f Fixed x64 release compilation 2022-06-15 10:38:27 -05:00