1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-23 07:45:55 +00:00
Commit graph

1689 commits

Author SHA1 Message Date
Dragorn421
d1c0e51871
Merge branch 'main' into doc_pause_menu (but has bss issues for some versions) 2024-08-21 13:54:12 +02:00
Dragorn421
942df45892
Match n64dd text in code (#2058)
* match n64dd text

* format

* fixups

* add n64dd segment using baserom

* cleanup syms 1

* cleanup symbols 2

* cleanup D_800FF4B0

* fix declaration usage and linking for D_800FF4B0
2024-08-20 19:20:11 -04:00
Dragorn421
ac2224f095
Add versions.h (#2060) 2024-08-20 17:19:16 -04:00
cadmic
3e516f48f3
Match more ntsc-1.2 overlay draw functions (#2061)
* Match more overlay draw functions

* Review
2024-08-20 16:22:05 -04:00
cadmic
ec70295357
Move non-libultra libc functions to src/libc/ (#2055)
* Move non-libultra libc functions to src/libc/

* Add explicit nops in delay slots

* Don't rely on CPP expanding undefined macros to 0

* Delete old Makefile rules

* Fix type of memset()
2024-08-20 01:15:24 -04:00
cadmic
aba1bb88a3
Fix missing DEG_TO_BINANG2 (#2059) 2024-08-19 19:15:14 -04:00
cadmic
d191e8714e
Allow building the Debug ROM without debug features (#2052)
* Allow building the Debug ROM without debug features

* Fix bss

* Add comment

* Reword again

* Fix bss
2024-08-19 23:58:31 +02:00
Dragorn421
6bc6cedaf8
[ntsc-1.2] Match boot_main.c, logutils.c, z_locale.c (text) (#2053)
* Match boot_main.c, logutils.c, z_locale.c (text)

* review

* review 2
2024-08-19 16:17:41 -04: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
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
cadmic
7fb9fbb4a2
Match ntsc-1.2 z_skelanime.c, z_view.c, z_viszbuf.c (#2041) 2024-08-15 03:54:06 -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
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
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
b5f68ac54e
Merge branch 'main' into doc_pause_menu 2024-08-12 01:05:38 +02: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
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
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
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
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
cc7eef6f9c
fix zfishing bss 2024-08-01 22:23:25 +02:00
Dragorn421
c750eca0bd
merge fixup 2 2024-08-01 22:15:30 +02:00
Dragorn421
594e461cb9
merge fixup 2024-08-01 22:13:00 +02:00
Dragorn421
4dd0649478
Merge commit '8ee485d2e7b237a785ac0cf3870117944c923a07' into doc_pause_menu 2024-08-01 21:47:53 +02:00
Dragorn421
9169d886bc
Merge commit '7fcbf3f4b280e26284a8f62dbcb5b72d0e24dcc4' into doc_pause_menu 2024-08-01 21:47:44 +02:00
Dragorn421
74c4839f8a
Merge commit 'ab2ca85227bb4ed245d3a39faedc25f793a39a45' into doc_pause_menu 2024-08-01 21:47:27 +02:00
Dragorn421
b6581fd43e
Merge commit 'bf3339a16d6bf1d48165853540f20aebfdf5367a' into doc_pause_menu 2024-08-01 21:39:02 +02:00
Dragorn421
7e49dfcabd
Merge commit 'baf1e8c1748b6440e5d594a8d0079d4eb2e3acee' into doc_pause_menu 2024-08-01 21:33:10 +02:00
Dragorn421
73ba1f864d
Merge commit '24571203df84c3294c8410260160cd5a3e9cfa68' into doc_pause_menu 2024-08-01 21:29:53 +02:00
Dragorn421
1a5eb5cd92
Merge commit 'd8f2e9abc67163a366fa2e62ac5d2d7467dfdb65' into doc_pause_menu 2024-08-01 21:29:41 +02:00
Dragorn421
dc599911db
Merge commit 'b2d80568b9f1a1e59e9e00f29d3936c7cd7e18c3' into doc_pause_menu 2024-08-01 21:29:29 +02:00
Dragorn421
43931defff
Merge commit '05c87518e7ef5b6f12792c38975aa6a06cbaaf60' into doc_pause_menu 2024-08-01 21:28:06 +02:00
Dragorn421
2b24b8a07a
Merge commit '87a6e752429a7821ae81dcf8bffc6cdf13803084' into doc_pause_menu 2024-08-01 21:23:12 +02:00
Dragorn421
3786fa4062
Merge commit 'f643499462f8cf908ddf1ee77b5625ebaff2cf25' into doc_pause_menu 2024-08-01 20:34:36 +02:00
Dragorn421
0561d05c44
Merge commit '8456e4be8a61c586b84476e7b17a32d971099593' into doc_pause_menu 2024-08-01 20:33:21 +02:00
Dragorn421
eca2c3e10d
Merge commit '39de6ce293d4f2ea31013a746404d730aca3f061' into doc_pause_menu 2024-08-01 20:18:13 +02: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