mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-12 03:53:47 +00:00
Code Issues Projects Releases Wiki Activity
2356 commits 1 branch 0 tags 473 MiB
Commit graph

367 commits

Author SHA1 Message Date
Dragorn421
e8e15eca9f
fix csdis CS_TIME extra arg 2025-02-06 14:13:55 +01:00
Dragorn421
e6cf32d829
Implement PlayerAnimationDataResource (link_animetion data) 2025-02-06 14:13:35 +01:00
Dragorn421
439124fc55
implement more of RoomShapeImage types 2025-02-06 00:49:31 +01:00
Dragorn421
8ec6769124
fix extracted data to no longer produce compilation warnings 2025-02-05 23:30:27 +01:00
Dragorn421
66db26a999
implement more skeleton-related types, cleanups, fixups 2025-02-05 23:17:05 +01:00
Dragorn421
f70a07f8cf
Merge branch 'main' into meta_new_assets_2025 2025-02-05 19:21:41 +01:00
Dragorn421
e16e52e3de
gc-eu-mq-dbg OK from clean with make setup && make 2025-02-05 19:20:38 +01:00
Dragorn421
11e8d23027
Write source with static for overlays using HACK_IS_STATIC_ON hack 2025-02-05 19:04:30 +01:00
Dragorn421
956b3b4a96
use variables from config.yml for gMtxClear and sShadowTex addresses 2025-02-05 18:26:25 +01:00
Dragorn421
8411c34b38
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
 2025-02-05 16:31:29 +01:00
cadmic
8b82eb1ff7
Delete disassembly data for ique-cn (#2453) 2025-02-04 13:17:57 +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
6c06168e72
fix_bss.py: Gracefully handle EGCS-compiled files (#2452) 2025-02-03 01:42:31 -05:00
cadmic
ef53bfd693
[iQue] Match z_file_copy_erase (#2447) 
* [iQue] Match z_file_copy_erase

* Reword comment
 2025-01-29 14:17:13 -05:00
Sirius902
dfe232533f
Fix /bin/bash -> /usr/bin/env bash (#2448) 
* Fix /bin/bash -> /usr/bin/env bash

* Add curl to docker container
 2025-01-28 18:45:56 -05:00
cadmic
f8d050bf7f
git subrepo pull --force tools/ZAPD (#2441) 
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "35ea376da"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "35ea376da"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"
 2025-01-24 14:02:44 -05:00
cadmic
b97a21c253
git subrepo pull tools/fado (#2437) 
subrepo:
  subdir:   "tools/fado"
  merged:   "a45f99b46"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "a45f99b46"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"
 2025-01-22 13:42:19 -05:00
cadmic
c76d2a8a4d
[iQue] Match z_kanfont (#2428) 2025-01-19 19:41:14 -05:00
cadmic
260d92dfb6
Preserve NULL/true/false macros in permuter/decomp.me import (#2430) 2025-01-17 15:37:40 -05:00
cadmic
d066586872
[iQue] Match z_sram (#2426) 
* [iQue] z_sram: Use iQue-specific read/write macros

* [iQue] z_sram: Make checksum a struct

* [iQue] z_sram: Finish matching

* Call the trigraph usage a bug

* Fix bss

* Sram_iQueReadWrite -> Sram_ReadWriteIQue

* Use SRAM_HEADER_MAGIC for loop bound

* Rename sZeldaMagic -> sSramDefaultHeader and use less char literals
 2025-01-17 06:56:22 -05:00
cadmic
e2ed5568e5
[iQue] Match ovl_kaleido_scope (#2421) 
* [iQue] Match ovl_kaleido_scope

* Add bug comment for OOB reads

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Preemptively fix merge conflicts

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2025-01-14 08:32:00 -05:00
cadmic
1549f34e8e
[iQue] Update permuter/decompme import (#2415) 
* [iQue] Update permuter/decompme import

* Fix GCC build
 2025-01-10 18:05:10 -05:00
cadmic
e4ad4e5eee
[iQue] Match remaining src/boot files (#2417) 
* [iQue] Match remaining src/boot files

* Fix debug ROM

* Use -funsigned-char

* Sort ique before gc in LNx macros
 2025-01-10 18:47:55 +01:00
cadmic
26f91bd3bb
[iQue] Match gzip/zlib decompression (#2416) 
* [iQue] Match gzip/zlib decompression

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update missed renames in disassembly

* Fix some formatting

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2025-01-10 14:31:20 +01:00
Tharo
94971a61b4
[iQue] Match handwritten asm files in libultra/os, match C replacements of osGetCount and __osSetCompare (#2413) 
* [iQue] Match handwritten asm files in libultra/os, match C replacements of osGetCount and __osSetCompare

* Format

* Adjust some label names in dcache functions
 2025-01-10 06:16:19 -05:00
cadmic
3aafbf3971
Match remaining IDO files for iQue (#2394) 2025-01-06 01:45:12 -05:00
cadmic
9dafc2f2e4
[iQue] Build some C files with EGCS (#2396) 2025-01-02 03:35:22 -05:00
cadmic
ffc9f2d4f1
Download EGCS binutils and gcc for iQue (#2391) 
* Download EGCS binutils and gcc for iQue

* Use curl -s for cleaner output
 2024-12-30 09:30:37 -05:00
cadmic
a590995c1a
Add missing vimode splits in iQue disassembly (#2393) 2024-12-28 15:55:00 -05:00
cadmic
ccfb3594ac
Match iQue compression (#2389) 
* Match iQue compression

* Use a dict

* Use Makefile variables for compression settings

* Put COMPRESS_ARGS last

* Pad iQue ROMs to 16 KiB

* Replace --pad-rom with --pad-to and --fill-padding-bytes

* Clarify --fill-padding-bytes
 2024-12-27 10:34:45 -05: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
e10ecb2fa3
Set up iQue disassembly (#2384) 
* Set up iQue disassembly

* Label libultra vimodes

* Format

* skapi.c -> skapi.s

* Fix AudioDebug functions

* Group D_80134488 with fp.s in disassembly

* Label boot bss

* Add bss split for siacs
 2024-12-26 08:54:26 -05:00
Tharo
fbeb477e68
iQue text extraction (#2383) 
* iQue text extraction

* More consistent terminology

* Fixes for jpn, split each encoding into a separate charmap file, merge enc.nes.h and enc.chn.h

* Merge nes and chn in DEFINE_MESSAGE macros

* Remove redundant defines in nes_message_data_static
 2024-12-25 12:07:08 -05:00
cadmic
471fe51c82
Set up build system for ique-cn (#2382) 
* Set up build system for ique-cn

* Fix size of fbdemo_circle assets

* Treat iQue as NTSC and Use "NES" for Chinese text

* Revert z_kanfont
 2024-12-21 14:13:56 -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
cadmic
8056312c39
Remove ‾ character from source files (#2371) 2024-12-15 12:22:45 -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
Yanis
4b20d8269b
Naming cutscenes from Lon-Lon Ranch (#2359) 
* name cs from ranch

* fixed llr credits cs dest part 5 and 6 being inverted

* format
 2024-12-13 18:28:48 -05:00
Jordan Longstaff
c780c4e147
Rename EVENTCHKINF_69 (#2330) 
* Rename EVENTCHKINF_69

* Rename CS flag
 2024-12-11 05:51:51 -05:00
Jordan Longstaff
07751d3d44
Rename symbols related to Kakariko Well being drained (#2332) 2024-12-10 00:18:40 -05:00
Jordan Longstaff
e9b165b6e5
Add names for Medallion cutscene data (#2319) 
* Add names for Medallion cutscene data

* Rename to Cs at end
 2024-12-08 20:45:02 -05:00
cadmic
b2d3c0523d
Name asset extraction tools more consistently (#2316) 2024-12-04 19:44:16 -05:00
Jordan Longstaff
3a07abbfac
Rename and document Adult Ruto functions (#2288) 
* Rename and document Adult Ruto functions

* Rename struct fields also

* Add enums for Ruto actions and draw configs

* Proper name for Water Medallion cutscene data

* Suggested changes

* More suggested changes

* Bring back naming consistency

* Better documentation for EnRu2_CheckWaterMedallionCutscene

Co-authored-by: fig02 <fig02srl@gmail.com>

* Renaming suggestions

* Rename EnRu2_AccelerateUp

* Revert macros

* Actually, fix macros

* Remove extra blank line

* Rename macros with GET

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-12-04 18:20:19 -05:00
mracsys
bdc774058d
More descriptive names for CS_BEGIN_CUTSCENE and CS_END (#2311) 
* rename CS_BEGIN_CUTSCENE and CS_END

* matching

* naming consistency for END command, improved comments

* remove CS_CMD_NONE

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

* remove comma from end of enum

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c04562d30"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c04562d30"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "cce3d93"

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-12-02 16:50:58 -05:00
cadmic
c55a1dab57
fix_bss.py: Fix infinite loop after linker errors (#2297) 2024-11-14 12:35:35 -05:00
Tharo
2d454933f3
[Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction (#2291) 
* [Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction

* Rework multiversion samplebanks to reduce duplicates
 2024-11-12 08:47:34 -05:00
Charles Averill
6ea3982695
Remove hardcoded bash location in tools/preprocess.sh (#2280) 
* Remove hardcoded bash location in tools/preprocess.sh

* Add more tolerant shebang to tools/preprocess.sh
 2024-10-24 12:20:14 +02:00
cadmic
d3bf8ae78b
[ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1 (#2253) 
* [ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1

* Fix merge with pal-1.0/1.1
 2024-10-09 14:22:57 +02:00
cadmic
801fe22153
Fix build on certain Linux distributions (#2257) 2024-10-02 13:40:38 -04:00
cadmic
f7f38ff874
[PAL N64] Completely match pal-1.0 and pal-1.1 and add to CI (#2246) 
* [PAL N64] Match pal-1.0 and pal-1.1 and add to CI

* bss fixes from Jenkins
 2024-09-28 20:52:45 -04:00