58 Commits

Author SHA1 Message Date
Reonu
9e2c932251 Add Sauraen's improved anim morphing (#190)
* Add Sauraen's improved anim morphing

Co-authored-by: sauraen <sauraen@gmail.com>

* improved formatting a bit and small readme change

* remove unnecessary license

* removed extra newline

it bothered me a bit

* Tharo's suggestion about the documentation at the top of `z_bettermorph.c`

---------

Co-authored-by: sauraen <sauraen@gmail.com>
Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>
2025-11-16 00:38:26 +01:00
Inapusan
f802a0e482 Bugfixes and New MM options (#187)
* bug fixing and MM options

added the Majora's Mask bottles as an option along with the option to uncap the jumping velocity. added an option for the audio delay workaround and fixed errors for the camera debugger

* removed zone.identifier

* cleaned up and changed bottle textures to my own

* deleted the zone identifier again why

* cleanup and new bottle fill texture

* finalized

* whoopsie

* my last commit frfr

* fix

---------

Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>
2025-11-10 18:05:31 +01:00
Yanis
30ce2af7b4 Temporarily disable mm title cards because of known issues
Disable MM Title Cards due to known issues.
2025-11-08 15:25:06 +01:00
Yanis
a843da9d79 Add very basic UNFLoader support (#169)
* basic unfloader support (no gdb yet)

* fix build issues
2025-11-04 20:38:45 +01:00
Yanis
af3dc71a5c New Inventory Editor (#107)
* inventory editor

* fixed a bug where the menu was usable in special pause screens

* fixed most equipment screen issues

* draw page number on upgrade screen and minor improvements

* format

* fix build issues

* format

* fix build issues

* format

* various improvements

* fix build issues with non-debug

* small cleanup

* last improvements and bugfixes + cleanup and format
2025-11-04 17:23:27 +01:00
Yanis
90ca9c6ff9 Title Cards from MM (#165)
* backport mm title cards

* fix build issues

* fix build issues

* cleanup

* accidental left-over from merge

* fixed wrong ifdef

* remove place title cards from the spec when using MM title cards
2025-11-04 13:59:30 +01:00
Yanis
31860a8f2f Fixed issues with the inventory editor and the camera debugger (#181)
* fix include issues

* fixed inventory editor not drawing

* fixed camera debugger crashing scenes and not drawing
2025-08-03 14:17:15 +02:00
Yanis002
7683567983 Merge remote-tracking branch 'upstream/main' into decomp_merge 2025-07-02 15:25:31 +02:00
Yanis
4608e7f97d HackerOoT clean-up (#154)
* makefile changes

* minor 'if's cleanup

* changed version to ntsc-1.2 and removed hackeroot-mq

* fixed some build issues

* format files

* fix boot issues

* remove mod_assets system

* add f3dex2 offsets for ntsc 1.0, 1.1 and 1.2

* update F3DEX3

* format

* make adjustements

* post-merge fixes

* remove settings.json from tracking

* temp delete c_cpp_properties.json

* hopefully fix .vscode oddities

* fixed sym_info

* fix build issues

* fixed profiler issues

Co-authored by: Thar0 <17233964+Thar0@users.noreply.github.com>

* format + don't format example scene sources

* proper f3dex3 patches folders

---------

Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
2025-07-02 14:36:16 +02:00
Yanis002
187acfd969 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-06-18 16:11:47 +02:00
Yanis002
a3c5d66e58 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-02-11 17:05:12 +01:00
Yanis
a449ef23bf Actor Cutscene system from Majora's Mask (#161)
* animated materials

* fix build errors with CI

* tests

* fix issues

* renamed cs halt state flag

* format

* remove test scene from spec

* remove test code from z_play.c

* forgot to reset the boot entrance

* fixed issues

* format

* update safeguards

* cleanup and fixes
2025-01-06 12:40:41 +01:00
Yanis
3f156f32df Animated Materials from Majora's Mask (#160)
* animated materials

* fix build errors with CI

* fix issues in scene when disabled
2025-01-06 00:17:24 +01:00
Trueffel
64bd859db4 Debug Boot (DebugOpeningState) (#136)
* First pass of debug boot port

* mostly done

* general changes, test this comma in commit now

* Makefile update: The "," works now

* quotes also working now inside a string

* get rid of emulator path

* format

* review

* improvements (add skybox and improve print logic)

* cleanup and fix build issues

* format

---------

Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>
2025-01-02 18:14:50 +01:00
Yanis002
aea36525dd post decomp merge build fixes 2024-11-29 21:20:12 +01:00
Yanis002
4e3ed2743a Merge remote-tracking branch 'decomp/main' into decomp_merge 2024-11-29 20:36:21 +01:00
Yanis
3d79c29c4d Create workflow for CI builds (#153)
* create build workflow (no artifacts)

* fix url

* fix lowercase issue

* fix build oddities

* update matrix
2024-10-20 18:35:14 +02:00
Yanis
f98edc4fcf Fixed release mode (#152)
* fixed release mode

* format

* move NDEBUG to the safeguards to allow building without RELEASE

* forgor to revert a test thing

* remove the todo for segment symbols
2024-09-27 18:58:28 +02:00
Yanis
1331ebf409 Option to have MM's get item camera (#149)
* mm get item camera

Co-authored-by: Zeldaboy14 <55566323+Zeldaboy14@users.noreply.github.com>

* updated contributors

---------

Co-authored-by: Zeldaboy14 <55566323+Zeldaboy14@users.noreply.github.com>
2024-08-28 12:33:40 +02:00
Yanis42
b4e82bc236 format 2024-07-18 02:32:31 +02:00
Sauraen
cda38b1013 Occlusion plane system (#132)
* Initial working version

* Initial move of files

* Added occluding skybox

* Revert GBI changes

* Initial cleanup

* Cleanup

* Improvements

* Moved occlusion planes from per-scene to per-room

* Fixes

* Improvements

* Fixes

* Formatted

* Fixed building without EX3

* Reverted sky change

* Removed commented out stuff
2024-06-16 18:39:25 -07:00
Sauraen
c2892d8507 Clean up F3DEX3 support (#118)
* Basic cleanup

* Added specular light sizes

* Added camera world changes

* Forgot specular size in the unused function
2024-05-28 14:33:44 +02:00
Sauraen
ae2010e9b5 New profiler with RSP and CPU tracing, replacing vanilla SPEEDMETER (#116)
* Working on it

* Loading ucode from ROM working

* Menu implemented

* Fixed ifdefs in debug

* Fixed crashing

* Cleanup

* Suppressed make auto generated messages

* Reorganized RSP wrapper assembly files

* Fixed merge bug

* Removing speed_meter

* Porting profiler

* Basics working

* Port basically complete

* Basic tracing working

* CPU tracing working

* Added colors to CPU trace

* Fixed some issues

* Profiler basically done

* Update F3DEX3 to resolve issues

* Cleanup

* Cleaned up things for profiler or F3DEX3 disabled

* Fixed a couple counter names
2024-05-27 18:38:44 +02:00
krm01
a44fc4394b fix falling from vine edges (#114)
* fix falling from vine edges

* Update src/overlays/actors/ovl_player_actor/z_player.c

Co-authored-by: Yanis <35189056+Yanis42@users.noreply.github.com>

* fix bad merge

---------

Co-authored-by: Yanis <35189056+Yanis42@users.noreply.github.com>
2024-05-18 16:27:38 +02:00
Sauraen
cd5eb31dc8 Multiple F3DEX3 versions (#112)
* Working on it

* Loading ucode from ROM working

* Menu implemented

* Fixed ifdefs in debug

* Fixed crashing

* Cleanup

* Suppressed make auto generated messages

* Reorganized RSP wrapper assembly files

* Fixed merge bug
2024-05-17 15:35:01 +02:00