1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Commit graph

1969 commits

Author SHA1 Message Date
cadmic
f5fd8daffb
Use incremental link for z_message/z_game_over data shenanigans (#2051)
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-08-19 18:16:04 +02:00
cadmic
46a5fa919b
Match ntsc-1.2 z_scene_table.c (#2050)
* Match z_scene_table.c

* Attempt to fix bss ordering

* Forward declare PlayState instead

* Untangle circular includes in z64scene.h
2024-08-19 10:24:02 +02:00
cadmic
006a00448d
Miscellaneous N64 actor changes (#2048)
* Misc N64 actor changes

* Apply naming suggestions
2024-08-19 07:00:04 +02:00
cadmic
74ab917804
Add DEG_TO_BINANG2/RAD_TO_BINANG2 to match ntsc-1.2 z_en_gs.c, z_en_mm.c, z_en_toryo.c (#2047)
* Add DEG_TO_BINANG2/RAD_TO_BINANG2

* Remove redundant cast
2024-08-18 21:55:25 -04:00
cadmic
aed15faaf4
Use BSS section start from map file in fix_bss.py instead of guessing (#2045)
* Use BSS section start from map file

* Expand comment about section start heuristic

* Reword
2024-08-18 22:12:02 +02:00
Tharo
ba5574be6d
[Audio 5/?] Build the Samplebank Table (#2044) 2024-08-17 17:42:15 -04:00
Dragorn421
56ca23663a
Fixup printf args fake matches (#2049) 2024-08-17 22:42:09 +02:00
cadmic
b82f54bb95
Decompile N64 anti-piracy checks in overlays (#2042)
* Decompile N64 anti-piracy checks in overlays

* Fix BSS splits (I think)

* Use physical address and comment on meaning

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

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-08-15 23:44:05 -04:00
Dragorn421
b734a159e3
Update links in readme (#2043) 2024-08-15 16:07:22 -04:00
cadmic
7fb9fbb4a2
Match ntsc-1.2 z_skelanime.c, z_view.c, z_viszbuf.c (#2041) 2024-08-15 03:54:06 -04:00
cadmic
70716be96d
Build all GC retail ROMs in Jenkins (#2027)
* Build all GC retail ROMs in Jenkins

* Delete progress tracking

Doesn't play nicely with deleting extracted/ and build/ after each version,
and it currently serves no purpose

* Update Jenkinsfile

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

* Reorder ROMs

* Symlink ROMs instead of copying

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-14 23:39:34 -04:00
Dragorn421
1649bf32d6
padutils.c, line numbers (#2040) 2024-08-14 22:13:23 -04:00
Dragorn421
fda0e6ad4b
[ntsc-1.2] Match z_construct.c, z_draw.c, z_kaleido_setup.c and partially z_actor.c (#2039)
* func_80033C30

* Interface_Init

* z_draw.c

* KaleidoSetup_Destroy , n64dd.h

* z_kaleido_setup.c

* add n64dd files to spec

according to tools/disasm/ntsc-1.2/files_code.csv , they're between irqmgr.o and fault.o
putting them before or after malloc_debug.o in the spec is an arbitrary choice
2024-08-14 22:05:41 -04:00
Tharo
d3b9ba17da
[Audio 4/?] Build Samplebanks, match Audiotable (#2032)
* [Audio 4/?] Build Samplebanks, match Audiotable

* Fix some makefile formatting

* Add missing scope in MARK chunk handling

* Add comment to generate asm file when buffer bug data is emitted, remove duplicate CC4 definition

* Adjust comment

* SBCFLAGS

* Remove unnecessary comments on notes_lut

* Split build directories creation command into several to avoid it becoming too long

* objcopy -j -> --only-section

* Fix mkdir warning when extracted/VERSION/assets doesn't exist
2024-08-14 20:54:31 -04:00
Dragorn421
c8ec6042e1
checksums for ntsc 1.2 JP and US, accept both as baserom (#2030) 2024-08-14 18:53:39 -04:00
Tharo
eaf955ad22
Generic actor params getters (#1359)
* Initial PARAMS_GET macros

* NOSHIFT macro

* Use number of bits rather than raw mask values

* Add descriptions for each generic macro

* Reformat

* Adjust comment

* format

* edit en_door macro names

* edit redead macro name

* edit bdan switch macro name, and remove unneeded comments in go2

* mizushutter macro names

* remove PARAMS_GET_S, rework ishi switch flag handling

* actually remove PARAMS_GET_S

* remove PARAMS_GET2_S

* PARAMS_GET_U and PARAMS_GET_S

* format

* fix merge

* format

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-14 21:29:43 +02:00
Dragorn421
137e0d2a10
fix preprocess_pragmas and add tests (#2038) 2024-08-14 19:53:55 +02:00
cadmic
ab1701b57a
Fix a few function names in disassembly (#2036)
* Fix z_message.c function names in disassembly

* Fix more functions
2024-08-14 04:42:22 -04:00
Dragorn421
91a534cbc9
Rewrite preprocess.py with bash and C (#2035)
* add C preprocess_pragmas and Bash preprocess

* "line return" -> newline

* align tools sources

* fix: handle files that are not newline-terminated

* use a temp directory with a same-basename file instead of a temp file

* macos compat

* remove debug code
2024-08-14 04:05:36 -04:00
cadmic
f6338bab1f
Fix tools/ido_block_numbers.py (#2037) 2024-08-12 14:17:04 -04:00
cadmic
755604d5ff
Match a bunch of overlay draw functions (#2034)
* Match a bunch of actor draw functions

* Change z_demo_gt.c draw functions to take Actor* thisx
2024-08-12 13:42:53 -04:00
cadmic
e6bc4bd8cb
Add names to all typedef'd structs, unions, and enums (#2028)
* Add names to all typedef'd structs, unions, and enums

* wtf vs code

* Use a better regex
2024-08-12 03:07:48 -04:00
Yanis
672728455d
Match `z_fbdemo.c and z_fbdemo_fade.c` for NTSC-1.2 (#2031)
* matched ntsc-1.2 fbdemo/fbdemo_fade

* remove ifdef for fbdemo

* remove macro for 's match
2024-08-11 21:12:27 -04:00
Dragorn421
dd48d34270
Update c_cpp_properties.json for VSCode (#2033) 2024-08-11 19:34:05 -04:00
krm01
8df87038a0
[Doc] name function func_8002DBD0 to Actor_WorldToActorCoords (#2029)
* name function Actor_WorldToActorCoords

* clean up some misleading usages
2024-08-11 14:30:41 -04:00
Tharo
fc79632df8
[Audio 3/?] Set up building samples (#2024)
* [Audio 3/?] Set up building samples

* AIFF -> SAMPLE
2024-08-11 17:41:33 +02:00
cadmic
8366b8731e
Set up build system and disassembly for ntsc-1.2 (#2021)
* Set up build system for ntsc-1.2

* Set up disassembly for ntsc-1.2

* Add all unnamed functions to functions.txt

* Update docs/retail_versions.md for ntsc-1.2

* Format

* Update docs/retail_versions.md

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

* Remove mention of US

* OOT_N64 -> PLATFORM_N64, OOT_GC -> PLATFORM_GC

* Move mtxutil to libultra/gu

* Fix libultra/io bss splits

* Fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-11 06:20:43 -04:00
krm01
9ff6758458
doc pass for gravestone actor (#2026) 2024-08-10 19:05:48 -04:00
cadmic
9eec8af498
Add "do {} while (0);" to CLOSE_DISPS (#2025) 2024-08-10 18:48:27 -04:00
cadmic
d495436190
Match remaining GC retail versions (#2019)
* Match the remaining GC retail versions

* Fix BSS ordering for existing versions

* Disable clang-format for #pragma increment_block_number

* sramResetCode -> sSramResetCode

* Replace 0xFF3F with or-ing all buttons together

* Revert "Disable clang-format for #pragma increment_block_number"

This reverts commit 406b6d26c9.

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-09 20:58:46 -04:00
Dragorn421
cd2264f018
Handle multiline #pragma increment_block_number (#2023)
* Handle multiline #pragma increment_block_number

* fix: align all continuation characters vertically

* simplify continuation line character alignment

* Update tools/fix_bss.py

Co-authored-by: cadmic <cadmic24@gmail.com>

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-08-09 20:13:59 -04:00
cadmic
b2d57f685d
Add -DF3DEX_GBI_2 to format.py flags (#2022) 2024-08-09 20:02:30 -04:00
Tharo
ef329e633a
[Audio 2/?] Extract audio samples to wav (#2020)
* [Audio 2/?] Extract audio samples to wav

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* How

* Hopefully fix warning I don't get locally

* Pad default sample filenames, comment on the vadpcm frame encoder functions, other suggested changes

* Small tweaks to above

* Remove some obsolete code

---------

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-08-08 22:39:18 -04:00
cadmic
1021c482af
gc-us OK (#2018)
Match BSS order and delete disassembly data
2024-08-08 03:26:48 -04:00
cadmic
feac688313
Match NTSC file select (#1998)
* Match NTSC file select

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

* nes -> eng in macros

* Duplicate more code but use less #ifs

* Format

---------

Co-authored-by: inspectredc <inspectredc@gmail.com>
2024-08-08 00:27:02 -04:00
Tharo
29acf96db2
[Audio 1/?] Extract Samplebanks and Soundfonts to XML (#2008)
* [Audio 1/?] Extract Samplebanks and Soundfonts to XML

* Remove config.py and use the version yamls for addresses, other suggested changes

* Adjust setup-audio

* Remove some commented out dead code (MM review)
2024-08-08 00:11:39 -04:00
cadmic
0186524300
Match NTSC z_kaleido_scope.c (#1988)
* Match NTSC z_kaleido_scope.c

* Use new REGs everywhere

* Add comments for YREG initialization

* Use new REGs everywhere for real

* Fix merge
2024-08-08 02:03:22 +02:00
fig02
6a8c556bdb
Add make_options.mk (#2016)
* make-options.mk

* fix file name

* Make more settings overwritable with .make_options.mk and group them together

* PAL -> EU

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-08-06 13:32:34 -04:00
cadmic
6c4935dc18
Use recomp instead of qemu-irix in Jenkins (#2014) 2024-08-03 21:43:26 -04:00
Dragorn421
ff2abf36a1
Remove tutorial, link to the latest zeldaret/oot:main revision with it (#2013)
* Remove tutorial, link to the latest zeldaret/oot:main revision with it

* proofreading here too

* rename to decompiling_tutorial

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-08-02 21:20:54 -04:00
cadmic
0da402b9de
Automate fixing BSS ordering (#2009)
* Automate fixing BSS ordering

* Typo

* Some cleanups

* Move pragma check after printing BSS info

* Some proofreading

* multiprocessing, require version, some colors

* Tweak output

* Black + mypy

* Move logging and sys.exit out of helper functions

* Use stdout instead of stderr in fix_bss.py

* Add suggestion to conflicting offsets error

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

* Remove var = list[T]()

* Improve error handling

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

* Add error if no pointers to BSS

* Add comment about process_file_worker

* Only print updates if stdout is a tty

* Use new binary-search-esque candidate generation algorithm

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

* Add Wikipedia link

* More comment tweaks

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-02 20:31:15 -04:00
fig02
078e21f6c6
InitVars -> Profile (#2011)
* rename ActorInit

* rename actorInit

* rename initInfo

* EffectSs Profile

* _InitVars -> _Profile

* format, loose ends

* revert tutorial
2024-08-02 17:50:02 -04:00
Dragorn421
a083a15650
Clean up gitignore (#2012)
* Clean up gitignore

* review

* reivew
2024-08-02 01:49:53 -04:00
Dragorn421
9963e7f5d5
Update vs code config and provide c_cpp_properties.json with all supported versions (#2010)
* Update oot-gc-eu-mq-dbg example vscode config and provide c_cpp_properties.json with all supported versions

* remove N64 prefix from config names

* newline at end of file
2024-07-31 23:19:46 -04:00
Tharo
8ee485d2e7
Create build directories for committed assets (#2007) 2024-07-29 17:16:53 -04:00
cadmic
0db9e7275f
Fix Makefile performance regression with OOT_VERSION define (#2006) 2024-07-29 15:57:35 -04:00
cadmic
ec5068c58d
Introduce OOT_VERSION and OOT_REGION defines for build info and ROM header (#2003)
* Use version defines for build info and ROM header

* Use existing REGION_ defines for OOT_REGION instead
2024-07-28 00:46:55 -04:00
cadmic
5515aa1705
Configure incbins in version config instead of using the Debug ROM (#2005)
* Run CPP for data/*.s

* Configure incbins in version config instead of using the Debug ROM
2024-07-28 00:24:13 -04:00
cadmic
067d06bb56
Match NTSC loose ends (#2004)
* Match NTSC loose ends

* Add comment about giObjectSegment size
2024-07-28 00:09:05 -04:00
fig02
7fcbf3f4b2
Document ANIM_FLAG_PLAYER_2 as ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT (#2001)
* name ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT

* reword

* typo
2024-07-27 23:47:58 -04:00