1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 04:14:34 +00:00
Commit graph

2381 commits

Author SHA1 Message Date
Dragorn421
e3a2693b87
fix png/jpg wildcards: look specifically for .u64.png .u32.png .u64.jpg 2025-02-10 12:46:36 +01:00
Dragorn421
3301e7cfd7
implement JFIFResource 2025-02-10 12:45:42 +01:00
Dragorn421
2f970810d4
fix ASSET_FILES_BIN_EXTRACTED/COMMITTED: look for .u8.bin specifically instead of just .bin 2025-02-10 12:02:55 +01:00
Dragorn421
0ae9f1da89
Implement legacy skelanime resources 2025-02-10 12:02:14 +01:00
Dragorn421
e0b8f3087d
check attributes of xml resources elements 2025-02-09 21:42:48 +01:00
Dragorn421
ad6ff6df27
all versions OK 2025-02-09 20:32:18 +01:00
Dragorn421
dae083d039
fixups, gc-eu OK 2025-02-09 14:36:14 +01:00
Dragorn421
b60c71403d
only extract if xmls changed or if -f (force) is used 2025-02-09 14:15:57 +01:00
Dragorn421
e311e2d378
fixups 2025-02-09 13:34:19 +01:00
Dragorn421
485640273d
Merge branch 'main' into meta_new_assets_2025 2025-02-09 13:34:09 +01:00
Dragorn421
2843f50ea4
add tools/extract_assets.sh 2025-02-09 12:21:08 +01:00
Dragorn421
bb7215b25a
introduce RawPointers xml attribute to ignore specific pointers and keep them raw 2025-02-09 12:19:44 +01:00
Dragorn421
6b857c6c71
handle dependencies between xmls 2025-02-09 11:39:24 +01:00
Dragorn421
3dc74cde04
generate and use Limb enums (TODO: check Skin skels and implement for Curve skels) 2025-02-09 01:53:00 +01:00
mzxrules
130ac11458
Reduce overlay dependencies on global.h (4) (#2456)
* remove more global.h references

* .bss
2025-02-08 19:30:24 -05:00
mzxrules
03a2612246
Rename gMtx(F)Clear to gIdentityMtx(F) (#2458) 2025-02-08 19:00:32 -05:00
Dragorn421
589916d767
rm extract_assets.py 2025-02-08 18:11:07 +01:00
Dragorn421
3a428239c9
slightly improve standard output 2025-02-08 18:10:57 +01:00
Dragorn421
8ef1c164a4
xml fixes 2025-02-08 18:10:17 +01:00
Dragorn421
924d8e81b9
Assets fixups (#2454)
* Assets fixups

* gDCRoom0TLUT, also object_mo.xml and ddan.xml

* gMegami3TLUT -> Tex

* yeet gDCRoom0TLUT (crashes ZAPD for an unknown reason)
2025-02-07 12:43:09 -05:00
cadmic
e63d2b73b7
Use CIC 6102 for iQue decompressed ROMs (#2457)
* Use CIC 6102 for iQue decompressed ROMs

* Future-proof is_ique

* Make things more readable
2025-02-06 21:10:30 +01:00
Dragorn421
d5018d37fd
ntsc-1.0 OK 2025-02-06 21:01:49 +01:00
Dragorn421
8aaaca4fe0
dmadata file names no longer hardcoded for gc-eu-mq-dbg 2025-02-06 20:44:16 +01:00
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
3446ede90b
yeet XmlPath from ExternalFile usage 2025-02-06 14:12:50 +01:00
Tharo
9a3878ec7e
git subrepo clone --force git@github.com:Thar0/com-plugin.git tools/com-plugin (#2455)
subrepo:
  subdir:   "tools/com-plugin"
  merged:   "fc5aa5eda"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "fc5aa5eda"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
2025-02-05 22:53:35 -05: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
mzxrules
54939bac3a
Reduce overlay dependencies on global.h (3) (#2449)
* kill more global.h references

* .format.py

* bss

* ique
2025-02-05 21:07:19 +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
Dragorn421
b0c713b2bc
spec_includes/ -> spec/, spec -> spec/spec (#2422) 2025-01-28 11:23:01 -05:00
cadmic
748859595a
[iQue] Match z_fishing (#2445) 2025-01-28 02:36:07 -05:00
cadmic
ac70cf8fb7
[iQue] Fix audio library pad_text (#2446) 2025-01-27 16:12:05 -05:00
mzxrules
d855f2bfd8
Split z64debug_display.h, z64draw.h, z_en_item00.h (#2443)
* z64debug_display.h

* z64draw.h

* z_en_item00.h

* bss
2025-01-27 13:01:54 -05:00
mzxrules
7dd3a83313
Reduce overlay dependencies on global.h (2) (#2442)
* reduce overlay dependencies on global.h

* merge cleanup

* more missed headers
2025-01-27 12:17:50 -05:00
cadmic
bb55be60fe
Error on invalid OOT_REGION (#2444) 2025-01-26 17:08:13 -05:00
cadmic
cd21783a44
[iQue] Match z_en_mag (#2439)
* [iQue] Match z_en_mag

* Add comment for iQue "PRESS"

* Format
2025-01-24 23:41:32 -05:00
cadmic
5bca304cbc
[iQue] Unify file select actionButtonAlpha and confirmButtonAlpha (#2436)
* Fix all confirmButtonAlpha indices

* Unify actionButtonAlpha and confirmButtonAlpha

* Restore ConfirmButtonIndex

* Add comment for actionButtonAlpha
2025-01-24 23:00:46 -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