Commit Graph

576 Commits

Author SHA1 Message Date
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
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
Emill
e56af6a7a3
Redesign hooks mechanism (#352)
* Redesign hooks mechanism

* Use reference instead of copy
2022-05-21 13:22:25 -04:00
iheemskerk
0b2c264a60
Add toggle to disable navi call voice audio (#336)
Co-authored-by: genegrey <pulicave@gmail.com>
2022-05-21 13:16:48 -04:00
Baoulettes
0993337721
[Mod]HUD Editor - Color Scheme incl. N64 colors. (#202)
* Update SohImGuiImpl.cpp

* Add int variant of CVar_ Get/Set/Register

* Add variant of CVar_ Get/Set/Register

* Add LoadHUDColors()

* Added temporary menu for custom colors

* vars added

* added section load

* variables save/load

* register boolean for colors radiobox

* Minimap recolor

* Hearts (top left) color, incl. DD variant

* Add A/B/C/Start btn colors and rupee

* A & C button icon and save prompt cursor.

* A & C notes and cursor

* Some notes I forgot tbh was open since hours.

* Shops cursor color with included pulse

* Wrong section was added

* Fixed some logic there and removed an unused if

* Moved a condition to make it better.

* That what happen when you left it open for hours

* Update z_message_PAL.c

* Added color array for A button

* Get/Set/Register Int not needed anymore

* Update Cvar.h

* Update Cvar.cpp

* Removed HUDCOLOR_SECTION moved it to cosmetics

Updated Tunics and navi mod too.

* changed categorie name and updated

* Updated Cosmetics menu and add colors there

* Update GameSettings.cpp

* Update GameSettings.h

* A more generic name

* Update SohImGuiImpl.cpp

* Update bootcommands.c

* update var name

* var name update

* var name update (creative name I know...)

* Updated variables names to match gHudColors

* to lazy to name this one

* gHudColors renaming stuff there too

* guess what, variable renaming.

* Update Tunic/Navi mods with new variable name.

* Updated Links tunic variable names

* Fix condition for Right C button

* Add condition to check if the button is on

* Added system to check if color tunics is turned on.

* Added empty C button colors

* Add ability to move Hearts

* Ability to move minimap (incl. dgn one)

Add Dungeon icon fix requirement. once merged I will fix conflict with this one.

* Compass icon move with the minimap

* Added several button move function

* stone of agony folly the interface too.

* fix minimap alpha

* Fixes notes env color (was showing incorrectly)

* PR repo mass update, cleaning incoming

* Clean_PR stuff

* useless there ...

* Properly load the function.

Imagine creating a pseudo function to load load of colour and you actually forgot to add it, could not be me right , RIGHT ?

* fix conflict and useless edit

* Fix default color for A/B and C btns

* Fix Rupee default color in ImGUI

* Reworked Tunics handling, much better this way

* Fix minimap default color

* C button default color fix

* better behavior and default color fix

* Fixed every default color to match gamecube style

* Fix dungeon entrance icon n.2

it was not using margin and always show icon system

* This need a scene else it show everywhere oof
2022-05-21 13:16:28 -04:00
vaguerant
a3cf852267
Fix vanilla Deku Nut upgrade bug (#333) 2022-05-21 13:15:41 -04:00
Baoulettes
226dd3a828
add gSPInvalidateTexCache(); (#274) 2022-05-21 13:14:53 -04:00
Kenix
7a4da43d7b Audio code converted to uintptr_t 2022-05-16 20:16:56 -04:00
Rozelette
6dbb085a82
Add equipable tunics/boots (#328) 2022-05-15 15:26:54 -04:00
earthcrafterman
3e01b25573
Add a toggle for muting the low HP alarm (#310)
* Removes the code that plays the low health alarm sound effect, by removing that instead of making HealthMeter_IsCritical always return false, Link will still play the tired animation when low on health.

* Made the low health alarm an enhancement toggle
2022-05-15 15:04:04 -04:00
Sirius902
f217b9bb97
Workaround for rumble duration being too long (#284) 2022-05-15 14:56:09 -04:00
Emil Lenngren
92c8ecb726 64-bit early draft - no audio yet 2022-05-15 01:19:02 +02:00
Emill
45e5e5ca72
Experimental interpolation (#309)
* Experimental 60 fps

* Fix compile error

* Fix compile error

* Fix compile error
2022-05-13 18:43:55 -04:00
louist103
635fb71b76
Save states (#300) 2022-05-12 13:28:24 -04:00
GaryOderNichts
b054abbd65
Fix tunic colors (#280) 2022-05-11 15:10:44 -04:00
Random
09432ee7f4
Linux/GCC Support (#28)
* Initial Linux/GCC support commit

* Add instructins for linux in the README

* apply suggestions by @Erotemic and @Emill

* Fix python 3.10 symlink line

* Fix func_80041E80 type mismatch (#3)

Type mismatch functions.h:664

* Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fix CXX_FILES

* Makefile: find C/CXX_FILES automatically

* Makefile: remove ugly conditions in find commands

* cleanup _MSC_VER usage

* fix Windows build

* cleanup extraction scripts

* fix Windows build

* Fix Windows path separator issue

* fix rumble support for linux

* use glew-cmake in dockerfile

* add pulseaudio backend

* fix ZAPDTR linkage

* Check for "soh.elf" in directory (#6)

hide second button if `soh.exe` or `soh.elf` is present

* Fix hardcoded segment addresses (#5)

* fix condition

* hack lus -> soh dep for ZAPDTR

Co-authored-by: sholdee <102821812+sholdee@users.noreply.github.com>
Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
2022-05-11 13:18:24 -04:00
Baoulettes
091983b3e3
Cleaning bool check and now use proper variable. (#261)
Baou is a noob and confirming it everyday.
2022-05-03 21:00:49 -04:00
Baoulettes
47331a904f
Title card offsets fix. (#258)
was missing (uintptr_t) x4
2022-05-02 20:58:52 -04:00
Baoulettes
f1e85d1e72
Bosses title cards fixes (#247)
* Boss title fixes.

* Proper X/Y/H/W

* Proper x,y,w,h

* Proper X,Y,W,H

* Actually had wrong height (was 32, should be 40)

* one of the last x,y,h,w fix

* WIP really need a better way to check it.

* Fix Ganondorf title card.

* better conditional logic

* No more workaround!

* Add two var in the TitleCardContext structures

* Added hasTranslation to Phantom Ganon's Horse

funny how that the horse that hold the title card.

* Add hasTranslation to Dodongo.

* Revert workaround and add hasTranslation=false

* Added hasTranslation to big piggy Ganon

* Add hasTranslation to Gohma

* Add hasTranslation to Morpha

* Add hasTranslation to Twins first part.

* Add hastranslation to that eletro "dude"

* Add hastranslation to bongo bongo

* Added hasTranslation to airwing v2

* add hasTranslation to TitleCard_InitBossName init

* isBossCard to true now that I can confirm it work

imagine in TitleCard_InitBossName setting isBossCard to false...

* no need to use bool there is seem to not like it

* change bool to s16
2022-05-02 18:27:06 -04:00
KiritoDev
c5f120b6f8
Fixed Lens of truth and sandstorm to be widescreen (#254) 2022-05-02 18:26:32 -04:00
Baoulettes
8c18b4b057
Fix dungeon entrance icon + feature (#252)
* Add Cvar stuff and fix dungeon entrance icons

* Added Cvar toggles

* Move fixes to fix sub menu
2022-05-02 18:25:37 -04:00
Ralphie Morell
43294d66b5
Fix Cheat Menuing (#237)
* readded cheats to menu; fixed bug with freezing time

* removed extraneous dev tools section
2022-05-02 18:24:39 -04:00
Baoulettes
18d2bac409
Languages selection menu (#232)
* Adding Languages section

* Added LanguagesSection

* Register the Cvar

* Added switcher method

* Added Language selection menu + function

* function ref.

* Conflict fixes to be sure nothing else is modded

* space removed

* no need to have conditions since ID are the same
2022-05-02 18:24:12 -04:00
rozlette
d0c5e7aa0e Add collision viewer 2022-05-01 01:27:00 -04:00
rozlette
e4dd7027a9 POC 2022-05-01 01:27:00 -04:00
Emil Lenngren
589557be9c Reduce input lag by one frame by reading the controller at the correct place 2022-04-30 10:36:58 -04:00
Ada
86869085cd Fixes shop UI for text speed (actually this time)
Realised my previous PR targetted the wrong line in `z_message_pal`, this might fix other issues people were having, haven't tested yet.
2022-04-30 10:34:23 -04:00
Ada
ffaafb8b4e Fixes visual bug in shops when above 2x text speed 2022-04-30 10:34:23 -04:00
Nicholas Estelami
8828d8a170 Minor cleanup 2022-04-29 19:57:53 -04:00
Nicholas Estelami
bd5a563dae Implemented PAL language support. 2022-04-29 19:57:53 -04:00
Nicholas Estelami
c66c874549 Fixed merge issues 2022-04-29 19:26:57 -04:00
Sirius902
2425ffe27b Put hookshot reticle on TITLE_CARD_DISP
Rename to WORLD_OVERLAY_DISP

Remove no-ops
2022-04-29 16:26:20 -04:00
Sirius902
f5d983d06b Put hookshot reticle on TITLE_CARD_DISP 2022-04-29 16:26:20 -04:00
Sirius902
eea5135d62
Rumble cvar and fixes (#184)
* Rumble indefinitely until turned off

* Add rumble cvar

* Register CVar

* Check if controller can rumble to insert rumble pak

* Reduce verbosity of checks

* Remove extraneous const_cast

* Once again remove extraneous const_cast

* Add per-controller settings

* Add nice spacing

* Only display controller entry if pad connected

* Const some stuff
2022-04-26 19:50:24 -04:00
Ada
1f663dda7b Adds exception for text speed in the case of ocarina playing 2022-04-26 18:51:31 -04:00
Baoulettes
9c2c443a6a
Fix Title card name for FRA and GER (#204) 2022-04-26 18:41:24 -04:00
IShallRiseAgain
b82871e62f
Added custom color support for Tunic and Navi (#98) 2022-04-26 18:33:18 -04:00
Emil Lenngren
4869eea968 Fix random crash in z_construct 2022-04-25 19:21:00 -04:00
KiritoDev
f5f2205d0f Removed stdio and added documentation 2022-04-25 19:14:46 -04:00
KiritoDev
0ea9612b7e Moved vismono effect to the gpu 2022-04-25 19:14:46 -04:00
vaguerant
eecad3dc15 Credits message order fix by rink 2022-04-25 18:04:47 -04:00
Baoulettes
3c471f2fc5 Quick fix for Title cards issues
Funny on linux it show properly but windows require it
2022-04-25 16:29:36 -04:00
KiritoDev
1f3a6b928f
Moved grayscale effect to the gpu and replaced some texture loads (#221) 2022-04-25 22:19:00 +02:00
Ada
ffa4a11148
Fixes visual bug in shops when above 2x text speed (#211) 2022-04-24 11:04:06 -04:00
Baoulettes
7d26b322f5
Fix minimap update in dungeon (#171)
Thanks to Rozelette for this method !
2022-04-24 10:51:54 -04:00
Baoulettes
6860600648
Potential fix for Title being over Kaleido. (#162)
* Potential fix for Title being over Kaleido.

Changing "OVERLAY_DISP" to "POLY_XLU_DISP" seem to fix and do not bring any errors (I did tried scene one by one and walked around in game) 
It may be no correct but it could point to the right direction if that is not correct.

* Update z_actor.c

* Update graph.c

* Update z64.h

* Update macros.h
2022-04-24 10:51:29 -04:00
Baoulettes
b540b7fcfc
Add Enhancement 3D Dropped Items (#144)
* Add Enhancement 3D Dropped Items  

It will change most of dropped item to there 3D models variant, Exclude Rupee from Hyrule Castle (when you are child and in quest to see Zelda.)

* Fix z_kaleido_scope_PAL.c L and R button color issues

This fix an issue in IF and gDPSetPrimColor for button L & R icon. 
making it with an else to place the on hover and normal color properly in both button so they both have exact same colour

* Fix quite a big logic issue for 3D item drops

In short,case logic required to be different with break; old version make it all fucked up with improper values.

* Clean Const that was present nor not.

* Update z_kaleido_scope_PAL.c

* Update z_kaleido_scope_PAL.c
2022-04-24 10:50:41 -04:00
Ralphie Morell
f65486d82d
Cheats Menu expansion (#176)
* Added extra cheats; compacted cheats menu

* fixed flag oversight
2022-04-21 18:39:39 -04:00
Ada
ffeb2afcb7
Changes fast text option to skip text, and makes text speed adjustable via a slider (#173)
* Adds fast text option

Changes previous "fast text" option to "skip text", and adds a new "fast text" option, which makes text appear 5 times faster.

* Fixes magic numbers

* Changes text speed to a slider (unfinished)

Got most of the code working, but only works upon reloading the game, unsure of how to fix this.

* Makes text speed adjustable via a slider

* Cleans up changes to z_message_PAL.c
2022-04-21 18:38:56 -04:00
Thomas Achatz
f66178772d
Dynamic Wallet Rupee Icon Color (#123)
* dynamic rupee rgb

* dynamic_wallet_icon cvar

* update blue rgb

* update blue rgb to match rando

* refactor

* Update z_parameter.c

* update rupeeWalletColors dimensions
2022-04-21 18:33:05 -04:00
Emill
ceef4a9453
Graphics backend enhancements etc. (#163) 2022-04-18 11:37:47 +02:00
Sirius902
fe6dbd2a5b
MM Bunny Hood enhancement (#181)
Allow bunny hood in boss rooms

Use math instead of array

Allow other masks with enhancement because why not
2022-04-17 11:26:49 -04:00
Sparkling.Shampoo
1dcd24e7e2
Fix cylinder-tri intersection for GCC due to FLT_EVAL_METHOD (#157) 2022-04-17 11:19:45 -04:00
Josh Bodner
03a5c7ed29
Added DPad support to ocarina and text prompts (#137)
* Added DPad support to ocarina playing and text choice selection.

* Wrap changes in CVar

* Fix mapping not updating if CVar is changed in-game

* Remove unnecessary const_cast

* Fixed transparent texture making framebuffers also transparent in D3D11. (#84)

This happened with the Mirror Shield in the inventory screen preview.

* Add save editor

* Added DPad support to ocarina playing and text choice selection.

* Fixing rebase conflict

* Fix mapping not updating if CVar is changed in-game

* Remove unnecessary const_cast

* Added DPad support to file selection and pause screens (#124)

* Added DPad support to file selection and pause screens

* Wrap changes behind CVar

* Fix merge conflict for real

* Remove unnecessary const_cast

* Fixed transparent texture making framebuffers also transparent in D3D11. (#84)

This happened with the Mirror Shield in the inventory screen preview.

* Add save editor

* Added DPad support to file selection and pause screens

* Fixing rebase conflict

* Remove unnecessary const_cast

Co-authored-by: MaikelChan <maikelchan88@gmail.com>
Co-authored-by: rozlette <Rozelette@users.noreply.github.com>

* Added DPad support to ocarina playing and text choice selection.

* Fixing rebase conflict again

* Fix mapping not updating if CVar is changed in-game

Co-authored-by: MaikelChan <maikelchan88@gmail.com>
Co-authored-by: rozlette <Rozelette@users.noreply.github.com>
2022-04-11 17:06:55 -04:00
GaryOderNichts
9a7c63c46c Allocate aligned heaps 2022-04-11 15:44:01 -04:00
Sirius902
a59317627f Fix Shadow Temple title card 2022-04-06 18:35:01 -04:00
Emill
529c5f642d
Don't copy skybox textures (#129)
* Don't copy skybox textures

* Remove unnecessary parameter in skybox functions

* Make palette address part of texture cache key

* Support loading TLUT from two different memory locations
2022-04-02 19:57:20 +02:00
Nicholas Estelami
c80f9fbd57
Added support for multiple game versions (#107)
* WIP Multiversion support

* GC PAL Non-MQ support complete

* Updated OtrGui to handle different game versions

* Added version file

* Added new extract mode to ZAPD and optimized OTR gen time

* Fixed bug causing crash

* Further optimized OTRExporter, saving around ~20 seconds.

* ZAPD is now multi-threaded.

* Fixed merge issue

* Fixed memory leak and fog issue on pause screen.

* Additional fog fixes.

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2022-03-31 19:42:44 -04:00
Andrew Piper
572e9fb9d0
Add an enhancement for a minimal ui. (#102)
This removes the button backgrounds, hides the hearts when they are full and the magic when its not in use. It also hides the rupee / key counters. All this is still visible on the pause screen or when the minimap is visible. It also changes the minimap behavior to be hidden by default on a zone change.
2022-03-31 18:32:32 -04:00
MelonSpeedruns
98ddacef01
Fixed PS5 gyro & Added GUI calibration button (#78)
* Fixed PS5 gyro & Added GUI calibration button

* Change PS4/PS5 LED to the tunic color
2022-03-29 22:23:02 -04:00
MaikelChan
f3fe43b912 Fixed Link's sword being cut in preview in pause menu.
Apply the offset only when live Link is enabled.
2022-03-29 10:02:31 -06:00
ProjectRevoTPP
25468cf722 Add cheats menu. 2022-03-29 10:00:41 -06:00
M4xw
39cc86c260 git subrepo clone https://github.com/HarbourMasters/soh.git
subrepo:
  subdir:   "soh"
  merged:   "ba904bbd0"
upstream:
  origin:   "https://github.com/HarbourMasters/soh.git"
  branch:   "master"
  commit:   "ba904bbd0"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"
2022-03-22 02:51:23 +01:00