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

320 commits

Author SHA1 Message Date
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
cadmic
2f3c8084c9
[PAL N64] Set up build system and extract assets for pal-1.0 and pal-1.1 (#2205)
* [PAL N64] Set up build system and extract assets

* TOOD -> TODO

* Apparently this is what the formatter wants
2024-09-26 15:19:23 -04:00
cadmic
bccb219ea3
Fix typos found by codespell (#2229) 2024-09-26 00:21:00 -04:00
Dragorn421
48780cd2b1
Colliders: elemType -> elemMaterial (#2189)
* elemType -> elemMaterial

* format
2024-09-16 18:11:01 -04:00
Tharo
dbbeb656f8
[Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays (#2137)
* [Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays

* Fix whitespace in aseq.h

* Fix sequence 0 sfx id generator

* Suggested changes, adjust some MML syntax and add more instruction descriptions

* Correct some formatting in aseq.h

* Add the dir of the input .seq file to the list of includes to sequence assembling so that assembler-level includes like .include or .incbin work intuitively

* aseq.h tweaks

* MM review suggestions, aseq.h adjustments
2024-09-15 18:26:27 -04:00
cadmic
77df04ab1c
Delete disassembly data for ntsc-1.2 (#2178) 2024-09-12 15:00:43 -04:00
cadmic
f089adf20c
[ntsc-1.2] Match ntsc-1.2 BSS and add to CI (#2187)
* Match ntsc-1.2

* Add ntsc-1.2 to CI

* Apply fixes from Jenkins

* Promote ntsc-1.2 to "supported" in Makefile

* Declare D_80858AD8 as a u64 array

* Tweak wording

* Hopefully make ntsc-1.2 bss more stable

* Restore segmented_address.h include
2024-09-12 14:10:43 -04:00
Dragorn421
f193311013
Colliders: colType -> colMaterial (#2186)
* colType -> colMaterial

* fixups
2024-09-11 21:18:46 -04:00
Derek Hensley
d9af701b88
Make needed extracted directories in extract scripts (#2185) 2024-09-11 09:51:53 -04:00
Dragorn421
5441559b30
Cleanup gSPMatrix, rename Matrix_New -> Matrix_Finalize, add MATRIX_FINALIZE_AND_LOAD (#1983)
* clean up gSPMatrix usage

* add weird hybrid macro gSPMATRIX_SET_NEW

* Matrix_NewMtx, MATRIX_NEW -> Matrix_Finalize, MATRIX_FINALIZE

* gSPMATRIX_SET_NEW -> MATRIX_FINALIZE_AND_LOAD

* format
2024-09-11 16:59:23 +09:00
cadmic
6fcaa51832
fix_bss.py: Restore z_locale special case (#2179) 2024-09-08 21:37:55 -04:00
cadmic
37efc27162
Run fix_bss.py in Jenkins and generate a patch (#2168)
* fix_bss.py: Disable colors if stdout is not a tty

* Run fix_bss.py in CI and output a patch

* Wording tweaks
2024-09-08 18:27:36 -04:00
Dragorn421
c7ec814d78
[headers 9] Add src/libc64/ and new "z64" rand.h (#2164)
* rand.h -> libc64/qrand.h

* Add rand.h with z64 rand wrappers

* yeet comment

* code/rand.c -> libc64/qrand.c

* fixup

* move libc64 source to src/libc64/

* fix

* bss

* update file splits disasm metadata
2024-09-08 17:11:41 -04:00
Dragorn421
a903f8b8bc
Document ACTOR_FLAG_SFX_ flags and functions (#2162)
* Document `ACTOR_FLAG_SFX_` flags and functions

* format
2024-09-08 16:26:01 -04:00
cadmic
c39323a336
fix_bss.py: Subtract addend for relocations against global symbols (#2169) 2024-09-08 11:13:24 -04:00
fig02
0168b09628
Player Docs - Parallel (#2167)
* name func and flag

* rest of the docs

* format and comment change

* comment
2024-09-08 08:57:28 -04:00
Dragorn421
1332356e5c
Pause doc: Cursor drawing (#2159)
* Pause doc: Cursor drawing

* bss
2024-09-07 22:28:46 -04:00
fig02
27533a1507
rename gBuildTeam to gBuildCreator (#2160) 2024-09-07 16:02:01 -04:00
cadmic
e52d135e15
[ntsc-1.2] Import n64dd code from Decompollaborate/n64dd (#2136)
* Import n64dd code from Decompollaborate/n64dd

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>

* Don't stub out missing textures

* Remove @brief

* Add low-effort file comments

* Match OoT if style

* Fix n64dd matching due to int vs long

* Fix English n64dd error textures

* Compress n64dd segment

* Align n64dd to 0x40

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2024-09-08 03:37:15 +09:00
fig02
88c4475967
Target -> Attention (System Rename) (#2149)
* TargetContext -> Attention

* targetCtx -> attention

* Target_ -> Attention_

* FindTargetableActor -> FindActor

* targetableActorP -> attentionActorP

* data vars (and 1 function I missed)

* targetMode -> attentionRangeType

* attention range enum comments

* ATTENTION_RANGE_

* attention range data

* TargetColor -> AttentionColor

* missed one

* fixup color variables

* targetArrowOffset -> lockOnArrowOffset

* focus pos comment

* targetPriority -> attentionPriority

* assets

* loose-ends

* Attention System Description

* format

* skj range type

* enemy bgm
2024-09-07 09:23:04 -04:00
cadmic
e19ec02917
Freeze SFX IDs in msgdis.py (#2154)
* Freeze SFX IDs in msgdis.py

* Remove remove_comments
2024-09-07 13:10:57 +02:00
cadmic
8a3ba35070
[ntsc-1.2] Match z_file_choose.c and z_boss_tw.c (#2146)
* Match z_file_choose.c

* Match z_boss_tw.c

* Format

* end: -> close_disps:
2024-09-07 00:12:12 -04:00
fig02
bb6177e936
Document Target_ShouldReleaseLockOn [Target Docs 8/8] (#2135)
* target range and leash docs

* format
2024-09-05 12:44:06 -04:00
Ozero4
0b011033fc
Naming a function (#2124)
* Naming a function

* Naming function

* Update functions.txt

* Update function name

* Update function name

* Update function name

* Update function name
2024-09-05 21:57:30 +09:00
mzxrules
acb5c7f20c
Update Room Documentation (#2015)
* Update Room Documentation

* Write more complete documentation, implement suggestions.

* Function name changes; minor comment tweaks

* nit

* Resolve Dragorn fixes

* Resolve Fig suggestions, fix comment wording

* fix bss, fig suggestion

* bss
2024-09-05 21:08:21 +09:00
fig02
6051251c92
istargeted -> islockedon (#2132) 2024-09-04 19:26:23 -04:00
cadmic
8153c952f6
[ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses (#2127)
* Reorganize n64dd declarations

* Fix bss

* Really fix bss
2024-09-05 03:56:24 +09:00
Dragorn421
e833011ccd
Cleanup: Pass all paths to tools rather than tools constructing them (#2017)
* Pass all paths to tools rather than tools constructing them

* fix: make --baserom-segments required

* sync with mm reviews

* --version everywhere
2024-09-05 03:49:16 +09:00
Tharo
f1911cd937
[Audio 7/?] Extract sequences to assembly (#2119)
* [Audio 7/?] Extract sequences to assembly

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

* Suggested changes, some extra sequence disassembler cleanup

* Remove unused multiprocessing import and regen assets/xml/audio/sequences

---------

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-09-05 02:55:04 +09:00
cadmic
c6d7cc7697
[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)
* Match __osMalloc

* Match src/code/code_800FC620.c (new/delete)

* Wrap versions-specific files in ifdefs to fix compilation

* Fix bss

* Remove {FAULT,RAND,OSMALLOC}_VERSION in favor of PLATFORM_N64

* Fix __osMalloc data splits, add unused strings

* __osMalloc.h -> osMalloc.h

* Fix merge
2024-09-04 11:10:14 +02:00
cadmic
e7cf2fceac
[ntsc-1.2] Match game.c, z_play.c, z_room.c (#2117)
* Match z_room.c

* Match game.c and z_play.c

* Add undefined syms

* Rewrite condition based on other file matches
2024-09-04 01:46:41 -04:00
cadmic
87914c6cc6
Match fp_math.c (#2116) 2024-09-04 01:12:44 -04:00
cadmic
6e5ea8c7aa
[ntsc-1.2] Update spec for boot and code (#2114)
* Update spec for boot and code

* Fix merge
2024-09-04 00:30:23 -04:00
fig02
45158f57d6
Document Target_Update [Target Docs 4/?] (#2123)
* document Target_Update

* add comments

* try CLAMP (dbg is ok but ci will check retail)
2024-09-03 20:58:39 -04:00
cadmic
e44c7c656c
[ntsc-1.2] Match audio (#2122)
* general.c mostly ok

* match remaining audio funcs

* comments

* Finish matching audio

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-09-03 20:32:38 -04:00
Derek Hensley
3e200769f1
[ntsc-1.2] LoadFragment2 OK (#2118)
* [ntsc-1.2] LoadFragment2 OK

* Add insight about bssSize
2024-09-03 19:19:13 -04:00
fig02
6f396e7cc8
Target System Docs: Actor Searching [3/?] (#2120)
* document target actor searching

* missed something

* review

* mzx review
2024-09-03 00:02:24 -04:00
fig02
2b25c31588
Document Target_Draw [Target Docs 2/?] (#2115)
* document Target_Draw

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* fix missed renames

* retail fix

* another fix

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-09-01 16:02:13 -04:00
fig02
a21a59c4b5
Target Docs [1/?] (#2110)
* Target Docs Part 1

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-08-31 15:10:25 -04:00
cadmic
a63f0a63b5
Move driverominit and sprintf to src/boot/ (#2105) 2024-08-29 16:34:18 -04:00
cadmic
5e9704b464
[ntsc-1.2] Fix some data / disassembly / undefined_syms (#2103)
* Fix some data splits

* Use real fault functions in cic6105.c

* Fix fault_n64.c data sizes

* Format
2024-08-29 12:05:50 -04:00
cadmic
7079005c83
[ntsc-1.2] Match N64 libultra (#2081)
* Match N64 libultra

* INITIALIZE_FUNC -> OSINITIALIZE_FUNC

* Document osGetIntMask

* Refer readers of osGetIntMask to osSetIntMask comment

* Whitelist new static functions in disasm unksyms check
2024-08-28 21:30:36 -04:00
Dragorn421
7592bf1e42
Check disasm metadata for missed renames (#2069)
* Check disasm metadata (look for symbols in metadata that no longer exist, indicating renames but the metadata was not updated)

* -us.z64

* Update disasm metadata with renamed functions in #2057

* sort IGNORE_NTSC_1_2_SYMS_MISSING
2024-08-28 13:28:03 +02:00
Dragorn421
68818044db
[ntsc-1.2] Decompile fault.c (#2046)
* wip decomp ntsc-1.2 fault.c

* more ntsc-1.2 fault.c

* decompiled fault_v1.c

* name fault_v1 functions, wip

* try to clean up build system (two versions of the fault system coexisting)

* cleanup

* cleanup2

* fix build gc-eu-mq-dbg

* match 2 more, ty anon

* matched

* review

* more review

* fixup spec

* `(uintptr_t)ptr op int` instead of `ptr op (type*)int`

* move fault.h out of global headers, properly include fault.h and versions.h

* compile all fault_*.c files regardless of version by overriding FAULT_VERSION

* n64 FaultMgr.framebuffer s32 -> u16*

* FaultMgr.framebuffer -> FaultMgr.fb

* make gc FaultMgr.fb u16* (yes, thats everything)

* bss

* fix Fault_Printf return type

* noop FaultDrawer_SetFontColor, FaultDrawer_SetCharPad in fault_n64

* fault_color_ stuff is only for fault_gc

* rm empty line in makefile

* I guess `D_80105A90_unknown` is `[sg]TotalAllocFailures`

* bss

* `Fault_WaitInput` -> `Fault_WaitForInput`

* use named fault funcs in pointers array

* FAULT_OOT{N64,GC} -> FAULT_{N64,GC}

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* review, sync fault_{gc,n64}

* Apply `FPCSR_CE` suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2024-08-28 09:38:42 +02:00
Tharo
aa97586659
[Audio 6/?] Build Soundfonts and the Soundfont Table (#2056)
* [Audio 6/?] Build Soundfonts and the Soundfont Table

* Improve lots of error messages

* First suggested changes

* Make audio build debugging more friendly

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

* Some fixes from MM review

* Make soundfont_table.h generation depend on the samplebank xmls since they are read, report from which soundfont the invalid pointer indirect warning originates from

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-27 21:09:59 -04:00
cadmic
7c2e0383f3
In fix_bss.py, really always use BSS section start from map file (#2085) 2024-08-25 16:43:07 +02:00
Dragorn421
7056423e5b
[ntsc-1.2] Decompile cic6105.c, main.c (#2068)
* decompile-OK Main, cic6105.c

* names cleanup / minimal doc

* match versions

* fix bad disasm metadata format

* bss

* bss

* review 1

* review 2

* review 3

* review 4

* cleanup

* bss

* add some sizes to disasm metadata symbols
2024-08-25 16:00:10 +02:00
cadmic
22a00b46fb
Have fix_bss.py deal with symbols referenced in .data or .rodata (#2072) 2024-08-25 10:26:18 +02:00