Commit Graph

92 Commits

Author SHA1 Message Date
Yanis
96c49a28ba rom name fixes (#174) 2025-07-02 15:23:45 +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
68e705f7f5 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-05-18 16:51:05 +02:00
Dragorn421
1e556e3a3d New assets system (#2481)
* wip: New assets system tm

Builds gc-eu-mq-dbg OK from clean after
1) make setup
2) python3 -m tools.assets.extract -j
3) replace 0x80A8E610 with sShadowTex in extracted/gc-eu-mq-dbg/assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c
4) make various symbols in extracted data like sTex static

* use variables from config.yml for gMtxClear and sShadowTex addresses

* Write source with static for overlays using `HACK_IS_STATIC_ON` hack

* gc-eu-mq-dbg OK from clean with `make setup && make`

* implement more skeleton-related types, cleanups, fixups

* fix extracted data to no longer produce compilation warnings

* implement more of RoomShapeImage types

* yeet XmlPath from ExternalFile usage

* Implement PlayerAnimationDataResource (link_animetion data)

* fix csdis CS_TIME extra arg

* dmadata file names no longer hardcoded for gc-eu-mq-dbg

* ntsc-1.0 OK

* xml fixes

* slightly improve standard output

* rm extract_assets.py

* generate and use Limb enums (TODO: check Skin skels and implement for Curve skels)

* handle dependencies between xmls

* introduce RawPointers xml attribute to ignore specific pointers and keep them raw

* add tools/extract_assets.sh

* fixups

* only extract if xmls changed or if -f (force) is used

* fixups, gc-eu OK

* all versions OK

* check attributes of xml resources elements

* Implement legacy skelanime resources

* fix ASSET_FILES_BIN_EXTRACTED/COMMITTED: look for .u8.bin specifically instead of just .bin

* implement JFIFResource

* fix png/jpg wildcards: look specifically for .u64.png .u32.png .u64.jpg

* Makefile: Add rules to build .png, .bin and .jpg in assets/ too

* start writing actual docs

* extract sTransCircleDL and sTransWipeDL

* misc cleanup/fixes, pygfxd 1.0.3

* refactor CDataExt.set_write callback args to use a dataclass

* Move {} to in-source

* misc

* more progress on spec

* fix missing braces in n64dd_error_textures.c

* finish xml spec doc

* assets xmls fixes

* some cleanup, use `gNameTex_WIDTH/HEIGHT` macros in dlists

* handle hackmode_syotes_room, fix compile

* C build_from_png

* rm tools/assets/bin2c

* rm ZAPD

* format

* remove rule to generate dmadata_table.py

* CC0 license (and some import cleanup)

* dont try to build zapd (rmd)

* simplify palettes with single user (ci images with a non-shared palette)

* add docs on how images are handled

* bss

* allow -j N

* fix n64texconv python bindings memory management

* move -j at the end of calling extraction script

* with -j, update last_extracts.json as each job completes rather than only if all complete

* make interrupting less jank by making child processes ignore sigint

* use enum names in `SCENE_CMD_SKYBOX_SETTINGS`

* `multiprocessing.get_context("fork")`

* import rich, except ImportError s

* fix optional rich usage

* .bss

* .bss

* .bss

* assets extraction: -j -> -j$(N_THREADS)

* .bss

* change LIMB_NONE/MAX defaults to be FILE_OFFSET instead of SKELNAME

* 0XHEX -> 0xHEX

* fix bss

* Proper includes for assets

mostly proper, some includes like dlists resources always causing a sys_matrix.h include (when not every dlist references gIdentityMtx) could be done better

* rm z64.h

* rm z64.h take two

* bss

* Make .u64 suffix for pngs optional

* fixup: rm .u64 suffix from n64dd image paths

* Remove elemtype suffixes from .bin and .jpg files

* Update images.md

* some build_from_png cleanup, more error handling, comments

* Handle skybox textures

Introduce "sub-format" suffix for pngs, with sub-formats split_lo and split_hi being used for skybox textures

* fixup for older python

* improve collision output some

* fully use SURFACETYPE[01] macros in writing extracted surface types

* use WATERBOX_PROPERTIES in extracted waterboxes

* some SceneCommandsResource cleanup

* format EnvLightSettingsList output
2025-05-18 01:29:09 +02:00
Yanis002
3049950b4d Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-04-25 13:07:40 +02:00
cadmic
d4528a0541 Add macOS instructions for installing mips-linux-gnu-gcc (#2508)
* Add macOS instructions for installing mips-linux-gnu-gcc

* Add --with-system-zlib to fix binutils build on macOS 15.3.1
2025-04-24 19:35:01 -04:00
Yanis002
a3c5d66e58 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-02-11 17:05:12 +01:00
Tharo
c028db03b4 Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "e8543312d"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "e8543312d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* ique-cn OK

* Review suggestions

* Most suggestions

* git subrepo pull tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "81595ed1c"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "81595ed1c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Fix other versions
2025-02-04 06:55:04 -05:00
cadmic
11b7bf2914 Write about IDO and EGCS in compilers.md (#2432)
* Write about IDO and EGCS in compilers.md

* Fix typo

* Fix another typo

* Apply suggestions from code review

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

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2025-01-20 16:15:13 -05:00
Yanis002
ced7d36d06 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-01-06 02:32:45 +01:00
cadmic
aaf3183233 Download ido-recomp compiler binaries instead of committing them (#2388)
* Download ido-recomp compiler binaries instead of committing them

* Skip downloading compilers if ido_recomp/ exists

* Use make instead of bash script
2024-12-26 12:41:03 -05:00
cadmic
970639b38b Fix editing PATH in macOS build instructions (#2379)
* Fix editing PATH in macOS build instructions

* Need quotes for paths with spaces
2024-12-21 16:48:48 -05:00
ptweezy
15ed658547 Docker Build Change Proposal (#2373)
* removing due to deprecation

* addressing docker build console issues, updating to latest LTS ubuntu, addressing Ubuntu + Python .venv requirements, standardizing environment

* Update Dockerfile

* proposed docker build changes

* improving parallel build

* removing

* keep image open after build

* updating based on feedback

* update

* fixed typo

* revert

---------

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: Parker <parker@runforyour.money>
2024-12-15 19:12:09 -05:00
cadmic
81f89b52c9 Add libiconv to text too (#2375) 2024-12-15 18:59:29 -05:00
cadmic
bdb3656af9 Use iconv from Homebrew on macOS (#2374)
* Use iconv from Homebrew on macOS

* Use `brew --prefix`
2024-12-15 17:53:07 -05:00
Tharo
df5d4cb467 [Audio 10/10] Loose ends (#2337)
* Introduce afile_sizes, generate headers of sizes for soundfonts and sequences

* Initial tools/audio README

* Versioning for samplebank extraction

* Clean up the disassemble_sequence.py runnable interface

* Add static assertions for maximum bank sizes

* Boost optimization for audio tools

* Samplebank XML doc

* Soundfont XML doc

* More docs in sampleconv for vadpcm

* Various tools fixes/cleanup

* VADPCM doc

* Try to fix md formatting

* VADPCM doc can come later

* Fix merge with PR 9

* Fix blobs from MM

* Try to fix bss

* Try fix bss round 2

* Fix sampleconv memset bug

* Suggested documentation tweaks
2024-12-13 19:26:36 -05:00
cadmic
06ceb8e661 Use MM names for some unnamed code files (#2312) 2024-12-08 16:52:48 -05:00
Yanis002
4e3ed2743a Merge remote-tracking branch 'decomp/main' into decomp_merge 2024-11-29 20:36:21 +01:00
fig02
17edb82c0d Decouple Debug Features From gc-eu-mq-dbg (#2296)
* rename OOT_DEBUG to DEBUG_FEATURES

* makefile changes

* add DEBUG_ASSETS

* fix DEBUG_FEATURES usages

* format

* fix errors

* review

* fix problem and review2

* review

* add DEBUG_FEATURES to DEBUG_ASSETS check

* review

* whoops

* format
2024-11-17 17:02:07 -05:00
Dragorn421
5b27899b9f libu64 (#2267)
* libu64

* logutils.o -> debug.o in spec

* stackcheck.c is part of libu64

* review

* add paragraph about Overlay_Load calling an external function

* audio code*
2024-11-01 18:47:12 -04:00
Yanis42
d55a756a59 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-09-16 14:57:30 +02:00
cadmic
09c1816e2d Add OOT_PAL_N64 and move other shorthands to versions.h (#2188)
* Move definitions of OOT_NTSC/OOT_PAL/OOT_MQ to versions.h

* Add PAL_N64 shorthand
2024-09-12 05:24:31 -04:00
Yanis42
30fa2a60c3 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-28 13:09:20 +02:00
cadmic
3795574878 Add all N64 version defines (#2095)
* Add all N64 ROMs to versions.h

* Remove OOT_ prefix from version defines

* Make it pretty
2024-08-26 11:43:59 -04:00
Yanis42
650046a6e2 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-19 13:06:37 +02:00