Commit Graph

249 Commits

Author SHA1 Message Date
Vague Rant
abcf713cc1 Fix Anubis fireballs 2022-06-21 14:44:35 -04:00
louist103
5bf4128add Add all slots 2022-06-21 14:31:28 -04:00
Baoulettes
53fc151453
Update soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
Thanks I overlooked it :)

Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
2022-06-20 22:33:31 +02:00
Baoulettes
14df96eacd
Merge branch 'develop' into 3DProjectiles 2022-06-20 22:32:45 +02:00
Kenix3
a7ed748973
Update soh/src/code/audio_load.c 2022-06-20 16:03:03 -04:00
Ian Drake
39d8b77b02
Added save filename and path to config file (#130)
* Added save filename and path to config file

Closes #110

* Moved FileIO to libultraship

* Moved OOT Specific Code to OTRGlobals and made libultraship for general file IO. Combined config options.

* Moved filesystem include into GlobalCtx2.h
2022-06-20 13:54:44 -04:00
earthcrafterman
36b9b9519d
Added three sliders for multiplying damage (#478)
* Added three sliders for multiplying damage:
1) Generic Slider, includes everything not multiplied by other sliders
2) Fall Damage Slider, includes all fall damage
3) Void Damage Slider, includes all void out damage

* Included tooltips

* Modified func_80837B18 to handle the modified flag the same as Player_InflictDamage does

* hotfix of a dumb oversight

* Fixed an oversight that led to compile failure on Linux and probably more things that weren't noticeable in unit testing

* I keep missing dumb mistakes.
I keep missing dumb mistakes.
Is this the last dumb mistake I've missed?

* Oh crud it's because I declared func_80837B18_modified after func_80837B18 isn't it? I am the ultimate dumbus.
2022-06-20 13:51:59 -04:00
vaguerant
7d0af303ec
Fix grayscale Biggoron's Sword (#485) 2022-06-20 13:50:57 -04:00
PurpleHato
5549ad9388
TWEAK: Kokiri Draw distance V2 (#486)
* ADD: Saria's logic

* TWEAK: Kokiri Draw Distance change doesn't need a reload anymore

* ADD: Mido's logic
2022-06-20 13:50:32 -04:00
vaguerant
b56426a67d
Skip first-time pickup messages for consumable items (#495) 2022-06-20 13:50:06 -04:00
Ada
45cb350b7a
Merge branch 'develop' into ShortBiggoron 2022-06-20 18:45:35 +01:00
Rozelette
b4eebbbcd6
Versioned saves (#423)
* v1

* Cleanup

* Cleanup

* cleanup

* Organization

* Fixes

* Fix typos

* fixup merge

* use gLanguages

* Restore n64dd

* Fix bad merge

* Set ddflag
2022-06-20 13:41:43 -04:00
louist103
73ff7ef3da
Guard vision (#466)
* Vision

* Wrap it in a CVAR

* Cleanup the code and fix a savestate bug
2022-06-20 13:39:06 -04:00
Kevin Alexis Contreras
4e75488567 Removed ifdefs for audio heap sizes 2022-06-20 12:33:38 -05:00
Kevin Alexis Contreras
e945a86d46 Added fixes based on the reviews 2022-06-19 02:03:04 -05:00
Josh Bodner
5a872f85e1
Add checkbox to make holding the D-pad act like holding the joystick on the file and pause screens (#454)
* Add checkbox to make holding the D-pad act like holding the joystick on the file and pause screens.  Also fix unguarded debug camera action.

* Removed new cvar from UI, made it enabled by default and control the D-pad hold behavior with the existing cvar instead, changed cvar for debug check too
2022-06-19 00:09:31 -04:00
PurpleHato
8d4b15325a ADD: Color for the bottom text 2022-06-17 17:16:38 -04:00
PurpleHato
5dc5c85588 Interface Editor rework + File Choose customization
TWEAK: Entire rework of the Interface Editor GUI

ADD: File Choose customization
2022-06-17 17:16:38 -04:00
briaguya
dd42cca2cf Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
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
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
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
960a29e513 Fixed StormLib Forward Slash BackSlash issues 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
2b40e66fa4 Fixed resample and corrupt audio bug. Minor documentation updates. 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
941c19f2c3 Audio decompiled and WIP custom sample support 2022-06-16 20:35:52 -04:00
Nicholas Estelami
510a38a6bc Fixed StormLib Forward Slash BackSlash issues 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
262d067870 Fixed resample and corrupt audio bug. Minor documentation updates. 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
b8c9f7f1ce Audio decompiled and WIP custom sample support 2022-06-15 15:57:52 -04:00
Kevin Alexis Contreras
5b43e4652f Updated zapd_audio_support into zelda64 2022-06-15 09:42:37 -05:00
KiritoDev
d0ce76e5c6
Merge branch 'develop' into zelda64 2022-06-15 09:14:58 -05:00
Kevin Alexis Contreras
19ac30b918 Fixed Ganondorf's lair and Spirit Temple crashes on 64 bits 2022-06-15 09:09:17 -05:00
Nicholas Estelami
b3396446af Fixed StormLib Forward Slash BackSlash issues 2022-06-14 18:56:17 -04:00
Nicholas Estelami
bff206e30b Added names for the soundfonts. 2022-06-14 01:13:18 -04:00
Nicholas Estelami
c5df54ae27 Fixed last remaining audio bugs 2022-06-14 01:13:18 -04:00
Nicholas Estelami
c82df705a6 Updated sample rate to 44100hz 2022-06-14 01:13:18 -04:00
Nicholas Estelami
83aee6d7e1 Fixed resample and corrupt audio bug. Minor documentation updates. 2022-06-14 01:13:18 -04:00
Nicholas Estelami
61760401bc Audio support nearly complete. 2022-06-14 01:13:18 -04:00
Nicholas Estelami
b889880cc7 Audio decompiled and WIP custom sample support 2022-06-14 01:13:18 -04:00
Kevin Alexis Contreras
9cf537eaff Fixed ocarina loop points 2022-06-13 21:53:26 -05:00
Nicholas Estelami
36eb47e631 Fixed last remaining audio bugs 2022-06-13 21:54:25 -04:00
Kevin Alexis Contreras
4ddb2d81b7 Merge branch 'zapd_audio_support' into zelda64 2022-06-13 17:10:34 -05:00
Nicholas Estelami
405e6019d2 Updated sample rate to 44100hz 2022-06-13 18:09:22 -04:00
PurpleHato
04bb9cd48e Tweak from @louist103 made true/flase back instead of 0 1 2022-06-13 16:40:47 -04:00
PurpleHato
c927403fa5 Fixed: Kaleido Link Rotation
I made a fucksie woopsie while refactoring
2022-06-13 16:40:47 -04:00
Kevin Alexis Contreras
8b63cf93d8 Updated zapd_audio_support on zelda64 2022-06-13 11:41:43 -05:00
KiritoDev
8a7aa5fa53
Merge branch 'develop' into zelda64 2022-06-13 10:18:38 -05:00
Kevin Alexis Contreras
394939347c Code cleanup and fixes on 64bits 2022-06-13 10:05:42 -05:00
vaguerant
a46bee9535
Unfix dungeon map icon when bugfix CVar is off (#455)
* Unfix dungeon map icon when bugfix CVar is off

* Big brain optimization by @InfoManiac742
2022-06-11 12:13:09 -04:00
BountyChocolate123456
1cb3cd5509
#243 Add option to disable black bars letterboxes (#376)
* #243 Add option to disable black bars letterboxes

* #243 Add option to disable black bars letterboxes

* Update libultraship/libultraship/SohImGuiImpl.cpp

* Update libultraship/libultraship/SohImGuiImpl.cpp

* Update libultraship/libultraship/SohImGuiImpl.cpp

Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>

* Add new line

Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-06-11 12:07:13 -04:00
Josh Bodner
1feef9d5d6
Added slider to increase vine/ladder climbing speed (#375)
* Added slider to increase vine/ladder climbing speed

* moved to cheats menu and made steps more granular

* Fix granularity math

* back to the enhancements menu!
2022-06-11 12:07:00 -04:00
Ada
f3dda92e78
Adds option to stop the game from freezing the player when picking up gold skulltula's (#365) 2022-06-11 12:06:42 -04:00
Nicholas Estelami
96a18391a8 Fixed resample and corrupt audio bug. Minor documentation updates. 2022-06-10 15:40:19 -04:00
Nicholas Estelami
f1b81b7f82 Audio support nearly complete. 2022-06-10 13:37:50 -04:00
Josh Bodner
257cc41d2b
Stop the dropped item despawn timer on demand (#382)
* Stop the despawn timer on demand

* But do make them disappear once they're collected!
2022-06-09 17:28:58 -04:00
Ada
de86227d01
Update z_en_go2.c 2022-06-09 11:48:26 +01:00
Ada
00025f2318
Update z_en_go.c 2022-06-09 11:48:09 +01:00
Vague Rant
e4fe289f70 Restore Hover Fishing bug from 1.0 2022-06-08 19:10:55 -04:00
Baoulettes
24567eeeb6 better conditions 2022-06-08 19:07:56 -04:00
Baoulettes
b38e0a6b15 better conditions 2022-06-08 19:07:56 -04:00
Baoulettes
6478df046a Debug close update 2022-06-08 19:07:56 -04:00
Baoulettes
ffc22fe8c4 Initial com. 2022-06-08 19:07:56 -04:00
briaguya
5b7dad1de2 fast chests 2022-06-08 18:32:12 -04:00
PurpleHato
ac2127094b
ADDED: Draw Distance toggle under Experimental enhancement + Bugfix (#398)
* ADDED: Draw Distance toggle under Experimental enhancement

* FIXED: Dark Link Apparition + Kokiri NPC spawn

* Added a Toggle for Kokiri NPC since they are mystics

* TWKEA: Desciription got the Kokiri draw distance

* FIXED: Horses behavior

Fixed Epona shout on title screen + Epona call from songFixed Zelda and Ganon horses that could still be seen on camera pan on the castle escape cinematic
2022-06-08 18:00:10 -04:00
vaguerant
3444868b95
Add sound effects to tunic/boot equips (#446)
* Add sound effects to tunic/boot equips

* Use enums for assignable equip swaps
2022-06-06 19:27:03 -04:00
vaguerant
d01d6ff3d1
Add Fireproof Deku Shield cheat (#440) 2022-06-06 19:26:16 -04:00
David Chavez
376860af9d
Render song of storms effect correctly widescreen (#421) 2022-06-06 19:23:48 -04:00
vaguerant
8cbc4d27eb
Add GUI toggle for Ganon blood color, also fix minor unrelated typos in ImGui (#411)
* Add GUI toggle for Ganon blood color

* Move to new Restoration section

* rm accidental line break

* Simplify booleans
2022-06-06 19:21:06 -04:00
vaguerant
596d5b478b
Fix Navi text HUD position (#406)
* Fix Navi text HUD position

* Force cvar to return 0 or 1

As suggested by Gary

* Disable all bug fixes by default

per Kenix
2022-06-06 19:16:47 -04:00
Vague Rant
c08439a562 Implement Cow of Time enhancement 2022-06-06 13:57:27 -04:00
Random06457
b5d5930fed change OSMesg definition and fix memory corruptions 2022-06-04 10:09:50 -05:00
Random06457
72fcd19a9e fix compilation 2022-06-04 10:09:50 -05:00
Kevin Alexis Contreras
e0ff6311ef Increased initial audio pool size and fixed types 2022-06-03 14:22:48 -05:00
Kevin Alexis Contreras
d42c0ca23f Fixed audio font loading 2022-06-02 17:52:58 -05:00
David Chavez
e1affbdf9a Fix function prototypes and types 2022-06-02 12:43:16 -05:00
PurpleHato
902b842bcb FIX: Default Navi's colors have been altered recent merged PRs
This fix restore Navi's original colors which have been altered with recent merged PRs
2022-06-02 19:14:14 +02:00
Kevin Alexis Contreras
0320107fc0 Merge branch 'zapd_audio_support' into zelda64 2022-06-01 15:11:11 -05:00
Nicholas Estelami
6f5ce7d715 Audio decompiled and WIP custom sample support 2022-06-01 13:06:32 -04:00
Kevin Alexis Contreras
0067a69795 Merge develop into zelda64 2022-05-31 17:49:39 -05:00
Kevin Alexis Contreras
ca6f8f8963 Fixed z_player_lib corruption on 64 bit 2022-05-30 21:48:19 -05:00
Kevin Alexis Contreras
e4ce541fcf Uncommented item_24 print on z_message_PAL 2022-05-30 19:49:23 -05:00
Kevin Alexis Contreras
22a305028f Fixed oob crashes on 64 bit 2022-05-31 00:29:14 -05:00
Kevin Alexis Contreras
fca79ae92a Fixed camera and disabled sound 2022-05-30 11:19:08 -05:00
Baoulettes
ea0ea0366b
Merge branch 'develop' into 3DProjectiles 2022-05-29 23:02:19 +02:00
PurpleHato
08c161fd13
Enhancement: More options for Kaleido Link (#394)
* Enhancement: More options for Kaleido Link

ADDED:  14 animations to use
ADDED: 2 random mode
ADDED: Link rotation on the menu with DPAD-Left and Right
ADDED: Reset position with DPAD-Up and Down

* ADDED/ Choice to use C-Button or D-pad
2022-05-29 16:40:50 -04:00
Baoulettes
7913398110
EnhancementColor3 tweak SohImGui Clean (#400)
* HUD Logic fix and cleaning

* array revert it was just fo rme to read it better

* Fix tunic logic seem like my cleaning was not good

* I had declared default in CPP

It resulted to overwrite what user would make oof.
Also a ! was missing.

* There, Default here is better.

* magic bar and used bar what switched
while updating EnhancementColor

* hud mod update

* Update SohImGuiImpl.h

* should fix build
2022-05-29 12:57:09 -04:00
Emill
ccab94c765
Implement AnyFPS + option to queue one rendered frame (#401) 2022-05-29 12:16:23 -04:00
Baoulettes
aaa1fafd51
Init desired languages CVar on InitSram (#385)
* Properly init desired languages

* Fix typos
2022-05-29 11:55:50 -04:00
earthcrafterman
4669235f62
Spammable kaepora (#354)
* Players can now spam their way through Kaepora Gaebora dialogue

* Turned the Owl Text Inversion into a toggle
Instead of replacing the Kokiri Owl Text at boot, a new Text Entry is added for it

* Attempt to make it compile on Linux

* Added multilingual support

* Commented the code to clear up confusion
2022-05-29 11:46:47 -04:00
Baoulettes
78b3c1ae47
Return button translation for GER/FRA (#287) 2022-05-29 11:43:58 -04:00
Baoulettes
72125bbd1e
Add 3D debris to Okuta actor (octorok) 2022-05-29 00:09:03 +02:00