Commit Graph

25 Commits

Author SHA1 Message Date
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
479549e460 Update F3DEX3 to beta (#180)
* update F3DEX3

* format

* update F3DEX3

* format

* fix GC patches
2025-11-04 21:21:16 +01: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
5677dc32f9 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-05-21 02:42:02 +02:00
Dragorn421
6f2fe268e3 Format assets/ (#2530) 2025-05-20 18:01:40 -04:00
Yanis002
a3c5d66e58 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-02-11 17:05:12 +01:00
Yanis
cb57226b1a Fix crashes related to actor cutscenes (#166) 2025-02-11 15:36:53 +01:00
cadmic
5346c978a9 format.py: Allow empty files (#2434) 2025-01-20 17:30:54 -05:00
Yanis002
ced7d36d06 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-01-06 02:32:45 +01:00
Tharo
9170902f8d Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines (#2353)
* Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines

* MAJOR+MINOR versions -> VERSION+PATCH, stringify build defines in makefile, let the libultra version determine the OPTFLAGS for libultra files

* Clang format moment

* Remove LIBULTRA_VERSION_ID, tweak OS_VERSION and libultra version definitions

* Better fix for formatting problems
2024-12-13 20:28:28 -05:00
Yanis42
05401196ca Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-14 15:55:05 +02:00
cadmic
b2d57f685d Add -DF3DEX_GBI_2 to format.py flags (#2022) 2024-08-09 20:02:30 -04:00
Yanis42
9e7351baf4 Merge remote-tracking branch 'decomp/main' into decomp_update_3 2024-07-18 02:29:41 +02:00
Dragorn421
a1c7937dba make format.py clean up extra whitespace, also in .h files (#1991)
* make format.py clean up extra whitespace, also in .h files

* fixup

* cleanup whitespace msg

* Update check_format.py to also check non-src files touched by format.py

* format
2024-07-17 19:32:55 -04:00
Yanis42
7adaf0ff41 hacker-mq -> hackeroot-mq 2024-02-04 12:30:03 +01:00
Yanis42
2899ab9d70 Merge remote-tracking branch 'decomp/main' into v2 2024-02-01 16:57:48 +01:00
Dragorn421
d65fb6ed28 Check format: only check modified files, v2 (#1680)
* Check format: only check modified files, v2

* cheeky z_play edit

* format

* rename z_play.c -> z_play_.c

* Revert "rename z_play.c -> z_play_.c"

This reverts commit 9da9e76309d3893c44b8fa06dd23b94b2dedebf0.

* rm z_moji.c

* Revert "rm z_moji.c"

This reverts commit bd2d5acb5a88a36a9ac4feeba73b2c3e70a9e8b3.
2024-01-31 18:05:33 -05:00
Yanis42
eef0f9b2f3 fix issues 2024-01-31 17:51:38 +01:00
Dragorn421
44408ce219 Only check formatting on modified files (#1673)
* only check formatting on modified files (attempt 1)

* foreshadow maximum command string length being an issue and pass files list using a file

* rm temp file list otherwise it shows in git status and counts as a "formatting diff"...

* cheeky z_play modif

* format
2024-01-30 22:25:24 -05:00
adaliaramon
6eb3bf401c Removed unused imports and other minor improvements (#1602)
* Removed unused imports and other minor improvements

* revert tools/ZAPD/ZAPD/genbuildinfo.py

* revert diff.py

* Update sym_info.py

* revert asm_processor/

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-11 11:04:53 -05:00
cadmic
25ff0a27de Create separate build directories based on version (#1591)
* Create separate build directories based on version

* Fix find_unused_asm.sh

* Remove find_unused_asm.sh from Jenkinsfile

* Revert diff.py

* Clarify that gc-eu-mq is not "supported" yet

* Revert xmlcreate.py (to be deleted)

* Remove gc-eu-mq for now

* Add version flags to diff_settings.py and sym_info.py

* --version -> --oot-version

* Fix --oot-version

* Revert adding version flags to tools

* Delete find_unused_asm.sh

* Revert changes to first_diff.py output in tutorial

* Factor out sed usages for spec
2024-01-05 23:27:19 +01:00
Dragorn421
5fa018106b Prefer clang-format-14 (#1517)
* Change preferred clang version to 14 (for formatting)

* Add `--show-paths` arg to format.py for printing paths to clang-* binaries used

* Run formatter (clang-format-14)

* run formatter
2023-07-27 19:48:42 -04:00
Roman971
82bcf03ba5 Fix format.py segfaults and other issues when applying fixes (#1387)
Removed the --style-config option when running clang-apply-replacements because it can cause segfaults and it's not actually needed in our use case.
Also fixed clang-tidy options to not include --fix when running with multiprocessing.
2022-10-02 15:46:07 -04:00
Tharo
d7ea63c75d Fix format.py for python 3.6 (#1337) 2022-07-30 22:53:31 +02:00
Roman971
0ce2e75560 Rewrite format script in python to improve speed with multiprocessing (#1331)
* Rewrite format script in python to improve speed with multiprocessing

* Make format.py executable
2022-07-30 09:24:52 -04:00