1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-15 06:06:04 +00:00
Commit graph

2044 commits

Author SHA1 Message Date
Dragorn421
aa1c7f3155
Pause doc: drawing the world map image (#2129) 2024-09-05 03:53:08 +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
fig02
907e440f3a
unk_664 -> focusActor [Target Docs 5/?] (#2126)
* unk_664 -> focusActor

* capitalization

* missed a temp
2024-09-05 03:33:30 +09:00
Dragorn421
78e6b801bc
Jenkinsfile: make -j -> make -j$(nproc) (#2128) 2024-09-05 03:22:37 +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
Dragorn421
fab309ae08
[ntsc-1.2] Partially match gfxprint.c (#2101)
* [ntsc-1.2] Partially match gfxprint.c

* yeet bss

* fix

* review
2024-09-04 19:22:59 +02: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
Dragorn421
af24970d89
Pause: Name temps in KaleidoScope_SetVertices (#2088)
* Pause doc: Name temps in `KaleidoScope_SetVertices`

* Update src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c

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

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-09-04 10:29:39 +02:00
cadmic
eab37fe54a
Run CC_CHECK in CI (#2109)
* Run CC_CHECK in CI

* Fix n64dd.h (guess this is why we need this change)
2024-09-04 03:15:52 -04:00
cadmic
7937be87e4
Reorganize z_std_dma.c unused strings (#2121)
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-09-04 02:54:22 -04:00
cadmic
27ba989511
Match KaleidoScope_DrawEquipment and KaleidoScope_DrawItemSelect (#2125) 2024-09-04 02:12:33 -04: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
cadmic
c8cafdc93e
Rename FaultDrawer_ functions to Fault_ (#2113)
* Rename FaultDrawer_ functions to Fault_

* Rename FaultDrawer_Init to Fault_InitDrawer
2024-09-03 23:43:06 -04:00
cadmic
7a9209c885
[ntsc-1.2] Match z_camera.c (#2112)
* Add CAMERA_CHECK_BTN

* Match Camera_Demo3
2024-09-03 23:00:37 -04:00
cadmic
808fe81deb
[ntsc-1.2] Match padmgr.c, sys_cfb.c, rcp_utils.c (#2111)
* Match padmgr.c

* Match sys_cfb.c, rcp_utils.c

* Format
2024-09-03 22:10:00 -04:00
cadmic
d54c573132
Match stackcheck.c (#2107) 2024-09-03 21:18:53 -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
cadmic
2152d1df2d
[ntsc-1.2] Import libleo from Decompollaborate/n64dd (#2104)
* Create stack.h for STACK/STACK_TOP

* Import libleo from Decompollaborate/n64dd

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

* Use (unsigned) int when in mdebug

* Apply suggestions from code review

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

* Use && in leocmdex.c

* Use proper names for character tables, revert sNonKanjiIndices

* Fix incorrect OSMesg casts

* Use LEO_ERROR_GOOD even where docs say 0

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

* Remove "Presumably" comment

* Whitespace

* Remove redundant (debug-only) returns

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-09-03 15:30:14 -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
ac1287a49a
Use FaultDrawer_ names in cic6105.c (#2108) 2024-08-31 03:37:55 -04:00
Dragorn421
1eeb03e5bb
[ntsc-1.2] Match rand.c (#2097)
* [ntsc-1.2] Match rand.c

* Comment on N64 Rand_ZeroOne taking the low random bits

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

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-08-30 08:56:00 -04:00
Dragorn421
dc964931c2
[ntsc-1.2] Match z_demo.c, z_eff_blure.c, z_eff_spark.c (#2096)
* Match z_demo.c

* Match z_eff_blure.c

* Match z_eff_spark.c (fake inc.)

* review

* improve EffectSpark_Draw match

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

* cleanup

* fix merge

* review

* better match EffectBlure_DrawSimpleVertices (ty cadmic)

* review

* rm unneeded include versions.h

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-08-29 18:23:01 -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
cadmic
6e8b820184
[ntsc-1.2] Match z_game_over.c, PAL 1.1 fixes (#2099)
* Match z_game_over.c (PAL 1.1 change)

* Fix previous matches that are actually PAL 1.1 changes

* Add versions.h to global.h

* Add versions.h to z_game_over.c too

* And the others too

* Fix awkward wording
2024-08-28 21:00:06 -04:00
Dragorn421
16ec9b1e13
T() macro 7 (#2102)
* T() macro in most of the rest of code (except z_message, z_actor, ucode_disas, gfxprint, game, fault, db_camera)

* remaining T() macro in boot

* format

* review
2024-08-28 14:01:41 -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
17debe8620
Match functions using gDPSetTileCustom (#2100) 2024-08-27 17:08:41 -04:00
Dragorn421
6b58a15fc0
T() macro 6 (#2090)
* T() in z_skelanime.c

* T() in z_eff_blure.c

* T() in z_play.c

* T() in z_jpeg.c

* T() in z_horse.c

* T() in z_eff_spark.c

* T() in z_malloc.c

* T() in z_effect_soft_sprite.c

* add todo on translating "確保" (litterally ~"secure", but may be better as "allocate"-ish)

* review

* format
2024-08-27 17:10:07 +02:00
Dragorn421
fd14ddcbf1
T() macro 5 (#2089)
* T() in __osMalloc.c

* T() in code_80097A00.c

* T() in debug_malloc.c

* T() in code/load.c

* T() in sys_math3d.c

* T() in z_collision_btltbls.c, z_fbdemo_fade.c, z_fcurve_data_skelanime.c, z_view.c

* T() in z_collision_check.c

* remaining T() in __osMalloc.c

* __osMalloc consistency

* format
2024-08-27 14:32:33 +02:00
cadmic
d2aca2239f
[ntsc-1.2] Match a bunch of small stuff (#2094)
* Match z_fbdemo_wipe1.c

* Fix gDPSetTileCustom

* Match z_eff_ss_dead.c

* Match src/code/audio_thread_manager.c

* Match z_parameter.c

* Match KaleidoScope_DrawWorldMap

* Format

* 1 -> AUDIOMGR_DEBUG_LEVEL_NO_RSP

* Actually match KaleidoScope_DrawWorldMap

* Add comment on duplicate code

* Revert "Fix gDPSetTileCustom"

This reverts commit de09338d92.
2024-08-27 09:33:20 +02:00
Dragorn421
c00991da29
match PreRender_CopyImageRegionImpl (#2093) 2024-08-27 02:47:08 -04:00
cadmic
160d8f4192
[ntsc-1.2] Match system_malloc.c (#2080)
* Match ntsc-1.2 system_malloc.c

* CLEAR_INTERRUPTS -> DISABLE_INTERRUPTS
2024-08-26 21:49:33 -04:00
Dragorn421
af7bbf9dad
[ntsc-1.2] Match z_vismono.c (#2091)
* [ntsc-1.2] Match z_vismono.c

* change match to use height

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

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-08-26 20:14:50 +02:00
cadmic
3795574878
Add all N64 version defines (#2095)
* Add all N64 ROMs to versions.h

* Remove OOT_ prefix from version defines

* Make it pretty
2024-08-26 11:43:59 -04:00
Dragorn421
c6d29691d0
[ntsc-1.2] Match z_en_ge3 (#2078)
* Match z_en_ge3

* change
2024-08-26 15:20:29 +02:00
Dragorn421
1d275fa9a5
[ntsc-1.2] Partially match z_en_mag (#2079)
* Partially match z_en_mag

* review

* Match func_80AEEA48_unknown (thanks cadmic)
2024-08-25 17:57:49 +02: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
Dragorn421
11926f2487
gitignore clangd files (#2086) 2024-08-25 02:31:53 -04:00