1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-01 15:26:01 +00:00
Commit graph

2262 commits

Author SHA1 Message Date
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
cadmic
b6d8aae2a5
[ntsc-1.2] Match z_std_dma.c (#2082)
* Match ntsc-1.2 z_std_dma.c

* Add B_80121AE3
2024-08-25 01:04:53 -04:00
Dragorn421
271eff9234
T() macro 4 (#2084)
* T() in z_kankyo.c

* T() in z_demo.c

* T() in z_effect.c

* remaining T() in z_sram.c

* T() in z_en_encount1.c

* T() in z_en_owl.c

* T() in z_en_wonder_item.c

* fix forgot T

* Demonstration -> Demo
2024-08-24 20:58:05 -04:00
Dragorn421
20b93a6488
Fix build ntsc-1.2: define n64dd_SetDiskVersion (#2087) 2024-08-24 19:20:42 -04:00
Dragorn421
3fe7d04157
Pause: doc generating page vtx/quads (part 1) (#2071)
* Pause: doc generating page vtx/quads (part 1)

* format
2024-08-24 13:37:34 -04:00
Dragorn421
b1b8b8c426
T() macro 3 (#2083)
* T() in z_camera.c

* T() in z_parameter.c

* T() in z_room.c

* T() in z_kaleido_scope_call.c

* T() in z_map_exp.c
2024-08-24 17:47:45 +02:00
Dragorn421
ea40688e4a
[ntsc-1.2] Match z_kaleido_debug.c, z_lmap_mark.c (#2077)
* Match z_kaleido_debug.c, z_lmap_mark.c

* consistent style for n64dd callbacks calls
2024-08-24 08:18:48 -04:00
Dragorn421
b40e51d8c8
[ntsc-1.2] Match kaleido_collect.c, kaleido_scope.c (#2070)
* Match kaleido_{collect,scope}

* review
2024-08-24 00:44:16 -04:00
Dragorn421
9b409f5ff4
Match z_select.c (#2076) 2024-08-23 20:38:50 -04:00
Dragorn421
614c411058
match z_title.c (#2075) 2024-08-23 16:26:53 -04:00
Dragorn421
37f0774778
T() macro 2 (#2073)
* T() in idle.c, irqmgr.c, padmgr.c, z_locale.c

* T() in  z_sram.c

* T() in z_bgcheck.c, z_scene.c

* format
2024-08-23 14:53:32 -04:00
mzxrules
1f2e82c39e
Convert z_std_dma.c translations to full string rather than inserted string (#2074)
* full string translation z_std_dma

* Remove FORMAT TEST
2024-08-23 05:28:03 -04:00
cadmic
c38adc1036
Add NO_SQRTF_INTRINSIC for z_rumble.c and audio/general.c (#2067) 2024-08-23 03:11:41 -04:00
Dragorn421
98ba7ad2ab
Add T macro for translated debug strings (#2064)
* Add T macro for translated debug strings

* Hyral -> Hyrule

* put some more care into z_std_dma
2024-08-22 22:33:50 +02:00
Dragorn421
bdfa56e72d
Pause docs: page backgrounds vertices and quads (#2065)
* Pause docs: page backgrounds vertices and quads

* update disasm metadata
2024-08-22 08:46:28 -04:00
cadmic
253fac4670
Grab bag of fix_bss.py fixes (#2066) 2024-08-22 01:06:09 -04:00
Pepe20129
ec19402748
Document z_player AnimSfxType and related functions (#2057)
* Document AnimSfxType and related functions

* Rename ANIMSFX_TYPE_DEFAULT to ANIMSFX_TYPE_NO_OFFSET

* Fix format

* Rename walking types and improve comments

* Apply comment suggestion

* Address review

* Fix format

* Address review
2024-08-21 17:06:45 -04:00
cadmic
5a08f14449
Fix memmove file splits (#2063) 2024-08-20 22:43:33 -04: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
Dragorn421
ebbc820ef6
Add "disasm sym_info.py" script (#2054)
* Add "disasm sym_info.py" script for investigating the expected memory layout

* review

* add friendly error if context.csv is missing

* rom as hexadecimal

* require spimdisasm 1.28.1 (technically not *required* but may as well)

* some fixups on symbol lookup logic
2024-08-19 23:58:41 +02: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
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