mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-26 19:04:20 +00:00
Code Issues Projects Releases Wiki Activity
2377 commits 1 branch 0 tags 531 MiB
Commit graph

2377 commits

This branch
This branch
All branches
Author SHA1 Message Date
cadmic
2b30c61a26
Always use LF line endings, even on Windows (#2489) 2025-02-25 23:09:54 -05:00
Dragorn421
e6a9ad9620
Fixup includes (#2483) 2025-02-24 21:18:24 -05:00
mzxrules
2e4c42719b
Reduce dependencies on global.h (9) (#2488) 
* split game states

* split all GameState headers

* match fig names

* deduplicate headers from bad merge

* split z64actor.h into z64actor_profile.h, z_actor_dlftbls.h

* fix compile error

* .bss
 2025-02-24 20:55:55 -05:00
Dragorn421
70fde8ac3b
Macroify MML opcodes (#2485) 
* add defines for sequence opcodes

* name aseq_cmd_id defines from the corresponding macro names

* ASEQ_CMD_ID_ -> ASEQ_OPC_

* remove previous opcode defines

* ASEQ_OPC_LAYER_STEP3_ -> ASEQ_OPC_LAYER_

* sync with MM and fixups

* format

* ASEQ_OPC_ -> ASEQ_OP_

* ASEQ_OP_CTRLFLOW_ -> ASEQ_OP_

* tab-align

* ASEQ_OP_SEQUENCE_ -> ASEQ_OP_SEQ_

* ASEQ_OP_CHANNEL_ -> ASEQ_OP_CHAN_

* define MML_VERSION in the Makefile for seqplayer.c
 2025-02-23 06:43:15 -05:00
fig02
5ddb3e68b6
Clean out z64.h (#2484) 
* Clean out z64.h

* fix version include

* overlay.h

* pr suggestion

* try fixing main.c

* add back forward declare

* fix bss

* header guard

* prefix
 2025-02-22 14:01:09 -05:00
fig02
2e4d7a1101
Create headers for Game States (#2482) 
* make headers for gamestates

* fixes

* fixes 2

* bss
 2025-02-20 07:50:13 -05:00
fig02
4cfb5f05a0
Use "entry" terminology in map select (#2479) 
* use entry terminology in map select

* missed one
 2025-02-19 19:59:21 -05:00
mzxrules
981af4b6af
Reduce overlay dependencies on global.h (8) (#2478) 
* move variables into z64environment.h

* z_room.h

* z64sram.h, z64ss_sram.h, z64font.h, kanread.h

* z64lifemeter.h, z64debug.h, debug_arena.h

* buffers.h

* remove z_bgcheck global

* gamealloc.h

* suggestions

* .bdd
 2025-02-19 05:54:39 -05:00
Tharo
3d61fb85ef
Add n64texconv and bin2c tools to convert extracted .png and .bin to C arrays during build (#2477) 
* n64texconv and bin2c

* mv tools/n64texconv tools/assets/

* fix

* more light fixes

* Silence -Wshadow for libimagequant

* Add reference counting gc for palette objects in python bindings

* Fix missing alignment in n64texconv_*_to_c functions

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

* Check palette size in n64texconv_image_from_png

* accept memoryview as well as bytes for binary data

* minimal doc on n64texconv_quantize_shared

* fix a buffer size passed to libimagequant

* assert pal count <= 256 on png write

* Disable palette size check for input pngs, ZAPD fails the check

* No OpenMP for clang

* When reading an indexed png into a CI format, requantize if there are too many colors for the target texel size

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2025-02-17 17:09:42 -05:00
Dragorn421
ec30dcbe4e
assets xmls fixes (#2476) 2025-02-16 18:10:26 -05:00
mzxrules
652478c338
Reduce overlay dependencies on global.h (7) (#2472) 
* z64env_flags, z64quest_hint_commands

* z64cutscene_spline, z64save.h moved from z64.h

* bss

* pr suggestion

* bss

* suggestions
 2025-02-16 15:33:55 -05:00
Dragorn421
137e178790
fix assembly warning in normalize.s (#2473) 2025-02-15 21:21:07 -05:00
cadmic
aba3720d62
Use enums for settings in SRAM header (#2429) 
* Use enums for settings in SRAM header

* Fix bss

* Uglify z_en_mag to match ique
 2025-02-15 19:36:19 -05:00
cadmic
a64fd8dea8
fix_bss.py: Try to handle one-past-the-end pointers (#2471) 
* fix_bss.py: Try to handle one-past-the-end pointers

* Proofread
 2025-02-15 16:24:25 -05:00
Dragorn421
6f8b4d82d5
Cleanup colliders 3 (#2467) 
* standardize s[Name][Collider]JntSphElementsInit[Name]

* standardize ColliderCylinder struct members names on `[name]collider[s][Cylinder]`

* format

* fix

* fix2

* fix3

* collidersCylinder -> colliderCylinders
 2025-02-14 22:41:32 -05:00
fig02
c859678d5f
Document sSceneInitLetterboxTimer (#2469) 
* document scene init letterbox timer

* reword
 2025-02-14 13:55:11 -05:00
cadmic
bbcdf22647
Identify some unaccounted and blob asset data (#1953) 
* Identify some unaccounted and blob asset data

* Add bug comments for flex skeleton weirdness

* Use (SkeletonHeader*) cast instead of .sh

* Fix vtx counts
 2025-02-14 08:06:49 +01:00
mzxrules
4639914583
Reduce overlay dependencies on global.h (6) (#2468) 
* add some headers, split some of z64.h

* MtxClear -> IdentityMtx

* more misc cleanups

* move D_80116280 to header, fix build issue

* remove z64.h

* Revert "MtxClear -> IdentityMtx"

This reverts commit 8fc74c0672.

* split z64path.h and z64skin.h functions

* z64face_reaction.h

* cleanup overlay global references

* trim padding

* bss
 2025-02-13 18:15:14 -05:00
mzxrules
494aecc9fc
Reduce overlay dependencies on global.h (5) (#2466) 
* remove global.h dependency from all actors

* fix compiler error

* fix another build issue

* fix bss
 2025-02-12 21:50:46 +01:00
Dragorn421
1d2c912fbb
Cleanup colliders struct members 2 (#2465) 
* Cleanup colliders 2

* format

* fixes & review
 2025-02-12 13:37:05 -05:00
Dragorn421
e3831947b0
Assets fixups 2 (#2461) 2025-02-12 12:56:04 -05:00
fig02
96e13149ea
Name Actor_DrawAll (#2464) 2025-02-11 17:33:09 -05:00
Dragorn421
ae89a8e47b
Polish up docs on EnDaiku and EnDaikuKakariko (#2463) 2025-02-11 09:02:05 -05:00
Dragorn421
3dd893c210
Cleanup colliders struct members 1 (#2462) 
* Standardize some ColliderJntSphElement buffer members on `colliderElements`

* Standardize some ColliderTrisElement buffer members on `colliderElements`

* format
 2025-02-10 20:02:56 -05:00
cadmic
be1f9e75f0
Read static symbols from .mdebug in sym_info.py (#2460) 
* Patch .mdebug for data_with_rodata objects

* Read static symbols from .mdebug in sym_info.py

* Add ability to print all symbols

* Add license

* Fix bug when missing .mdebug section

* /patch_data_with_rodata_mdebug.py license + nitpicks
 2025-02-09 18:16:18 -05:00
Dragorn421
36b71ca2de
Update csdis.py (#2459) 
* csdis: move filemap import to main() as it is only needed there

* csdis: fix CS_TIME macro

* csdis: make `disassemble_cutscene` return cutscene size in words

* add comment on why total_entries+1
 2025-02-09 16:42:39 -05: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
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
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
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
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
mzxrules
f448a48cd6
Create headers for some libu64 files (#2440) 
* Create headers for some libu64 files

* apply bss patch
 2025-01-24 13:25:05 -05:00
mzxrules
ab37332793
Reduce overlay dependencies on global.h (1) (#2438) 
* Reduce actor dependencies on global.h

* move dependency on z64play.h into the .c files

* add some missing dependencies
 2025-01-23 14:39:23 -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
06904e1ee7
[iQue] Match z_message (#2435) 
* [iQue] z_message: work around EGCS bug

* [iQue] z_message: finish matching

* Yabusame -> Horseback archery

* Add missing PRINTF parameter

* Collapse for loops

* Better-looking macros

* gold stars -> gold skulls
 2025-01-21 21:16:39 -05:00