cadmic
306abef46b
Consistently use "OOT_VERSION <" and "OOT_VERSION >=" ( #2199 )
2024-09-17 15:40:50 -04:00
cadmic
3287437069
[PAL N64] Match VI mode setup ( #2198 )
2024-09-16 21:51:53 -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
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
cadmic
2d96f001db
Reorder spec segments for N64 versions ( #2163 )
2024-09-08 10:27:18 -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
cadmic
a30f130eb9
Fix some boot and code data ( #2155 )
2024-09-07 08:10:52 -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
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
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
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
cadmic
a63f0a63b5
Move driverominit and sprintf to src/boot/ ( #2105 )
2024-08-29 16:34:18 -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
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
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
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
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
Tharo
ba5574be6d
[Audio 5/?] Build the Samplebank Table ( #2044 )
2024-08-17 17:42:15 -04: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
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
cadmic
bf3339a16d
Set up build system and disassembly for gc-us ( #1982 )
...
* Build gc-us
* Set up gc-us disassembly
* Don't disasm unchanged overlays
* Fix gc-eu-mq BSS
* romalign link_animetion for NTSC
* Explicitly set CPP defines to 0/1
* Add #ifs to segment_symbols.h
* Add sButtonTextures now
* Fix message _SHIFTL usage
* Don't ifdef LANGUAGE_MAX
2024-07-06 21:38:31 +02:00
cadmic
9def6f4d0d
Set up multiversion assets with ZAPD and match gc-eu ( #1967 )
...
* Add ZAPD hack to deal with extracted/VERSION/ in include paths
* Extract assets to extracted/VERSION
* Add ZAPD flags to override virtual address / start offset / end offset
* Configure offsets for code and overlay assets
* Reorganize ZAPD configs
* Match gc-eu-mq
* Match gc-eu
* Remove old asset dirs during distclean
* Revert "Remove old asset dirs during distclean"
This reverts commit fc8027a75f
.
* make zapd addresses globals int64_t so they can store uint32_t addresses and -1
* slight cleanup extract_assets.py
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0285e11f0"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0285e11f0"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-24 15:22:39 +02:00
mzxrules
8d83727429
Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib ( #1956 )
...
* split sys_math, sys_math3d, z_lib from global.h
* suggestions
* forgot this
* more math stuff
* nit fix
* re-add ichain.h
* resolve tharo's comments
2024-06-19 00:00:23 -04:00
cadmic
eb660765b1
Change linker script so gGameOverTimer can be in z_game_over.c ( #1939 )
...
* Change linker script so gGameOverTimer can be in z_game_over.c
* gGameOverTimer -> sGameOverTimer
* include_data_only_with_rodata -> include_data_only_within_rodata
2024-06-10 10:07:51 -04:00
cadmic
d4d7512cb6
Force string.o to be in boot for gcc builds ( #1948 )
...
In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.
2024-04-25 13:10:31 +02:00
cadmic
9cbd57d329
Fix miscategorized scenes ( #1946 )
...
* Fix miscategorized scenes
* Sort includes
2024-04-18 22:21:34 -04:00
cadmic
d59ca6cea2
Set up gc-eu and match all code ( #1938 )
...
* Set up gc-eu and match all code
* Format
* Mark gc-eu-mq as WIP until it builds OK
* Move original/MQ map mark data to separate files
* Add #includes to .inc.c files to help out VS Code
* Use #if in spec instead of .inc.c files
2024-04-15 13:36:29 -04:00
cadmic
f643499462
Match retail BSS ordering ( #1927 )
...
* Match retail BSS ordering
* Revert moving some global variables to headers
* Adjust block numbers after header changes
* Fix debug build
* Overlay bss ordering
* Fix BSS ordering after header changes
* gc-eu-mq OK
* Implement preprocessor for #pragma increment_block_number
* Transfer usage comment from reencode.sh
* Use temporary directory instead of temporary file
* Move ColChkMassType back
2024-04-14 23:51:32 +02:00
cadmic
731fe6da82
Line up code segment for gc-eu-mq ( #1918 )
2024-03-29 11:11:45 -04:00
cadmic
0407594107
Hacks for building nes_font_static and nes_message_data_static with gc-eu-mq ( #1721 )
...
* Hack nes_font_static and nes_message_data_static
* Make hardcoded config a bit more consistent
* Put debug ROM first
* Reword comment
* Move nes_font_static hack to spec
* Restore extracted/gc-eu-mq
2024-03-02 16:05:15 -05:00
Tharo
c521f1f8ae
Remove gSystemHeap and use _buffersSegmentEnd instead, make buffer alignments explicit for gcc ( #1901 )
...
* Remove gSystemHeap and use _buffersSegmentEnd instead, make buffer alignments explicit for gcc
* ALIGNEDn -> ALIGNED(n), reposition alignment attribute for PreNmiBuff
* Correct positioning of ALIGNED for filter data in audio/lib/data.c
* Add ALIGNED to TypenameMacros
* ALIGNED(4) on same line for PreNmiBuff
* Revert audio load.c change, to be submitted separately
2024-02-27 19:01:47 -05:00
Tharo
7f64ace8f0
RNG doc ( #1892 )
...
* RNG doc
* Add some missing note qualifiers in comments
* code_800FD970 -> rand in Makefile and disasm CSVs
2024-02-26 22:21:25 -05:00
cadmic
0ba8cb38a7
Convert spec indentation to spaces ( #1732 )
2024-02-07 18:43:23 -05:00
Dragorn421
2ee7a2b7ff
Dont link z_moji.o in retail ( #1731 )
2024-02-06 23:37:52 -05:00
cadmic
e7b37c6d60
Reorder boot/code spec includes for retail ( #1667 )
...
* Shuffle spec segments for retail
* Remove z_text.o from retail
* Un-#if DebugCamera_ScreenTextColored
2024-02-06 21:48:02 -05:00
cadmic
d674dad3da
Match compression for gc-eu-mq ( #1704 )
...
* Improve compression
* Format
* Typo
* Use Python assignment expression in tools/dmadata.py
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Review decompress_baserom.py
* Replace DEFINE_DEBUG_SCENE with CPP defines
* Pass is_zlib_compressed instead of version
* Reword NOLOAD comment in write_compress_ranges
* Remove redundant comment
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-02-03 23:59:19 +01:00
Derek Hensley
06379c3109
Gamealloc, Graph, and Graphalloc retail OK ( #1675 )
...
* Gamealloc OK
* Graph + Graphalloc OK
* PR review
* gfxalloc
* new lines
* Remove imposter
2024-01-31 19:07:12 -05:00
Anghelo Carvajal
3d9db8d34d
Setup rom decompression and compression ( #1614 )
...
* decompress baserom
* cleanup
* specific hash check
* rename baserom
* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "5da313260"
upstream:
origin: "git@github.com:z64tools/z64compress.git"
branch: "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
commit: "5da313260"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* setup compression
* Add all compressed segments to the spec
* Update md5 files
* readme instructions
* cleanup
* Setup python dependencies on Jenkinsfile
* Update Makefile
Co-authored-by: cadmic <cadmic24@gmail.com>
* review
* . .venv/bin/activate
* update readme
* whoops
* Yeet other versions from decompress_baserom.py
* my bad
* Move everything to baseroms/VERSION/
* Active venv on each command
* jenkinsfile: use multiline syntax
* Put the correct path on the jenkinsfile
* Forgot to call per_version_fixes
* CC0
* Update readme
* Change where baserom segments are put into
* Update Makefile
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update crunch64
* Label compressed instead of uncompressed
* Update README.md
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fix
* `make rom`
* baserom-uncompressed
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* review
* baserom-decompressed.z64
* ignore baseroms
* rm -rf tools/z64compress
* wip crunch64-based compress.py
* OK compress
* use ipl3checksum sum directly for cic update on compressed rom
* multithreading
* "docs"
* fix MT: move set_sigint_ignored to global level for pickling
* license compress.py
* rm junk
* Fix (or at least sort out) compress_ranges.txt dependencies
* Update tools/overlayhelpers/damage_table.py
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-24 13:00:10 -05:00
cadmic
25ff0a27de
Create separate build directories based on version ( #1591 )
...
* Create separate build directories based on version
* Fix find_unused_asm.sh
* Remove find_unused_asm.sh from Jenkinsfile
* Revert diff.py
* Clarify that gc-eu-mq is not "supported" yet
* Revert xmlcreate.py (to be deleted)
* Remove gc-eu-mq for now
* Add version flags to diff_settings.py and sym_info.py
* --version -> --oot-version
* Fix --oot-version
* Revert adding version flags to tools
* Delete find_unused_asm.sh
* Revert changes to first_diff.py output in tutorial
* Factor out sed usages for spec
2024-01-05 23:27:19 +01:00
Tharo
3475651701
libc cleanup ( #1568 )
...
* libc cleanup
* Suggested changes, small alloca tweak
* Remove printf include
2023-10-27 16:06:44 +02:00
Tharo
9b207c356a
Document Framebuffer Filters, VisCvg and VisZbuf ( #1534 )
...
* Document z_viscvg and z_viszbuf
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Few more notes
* Some more notes
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Review
* Americanisation, FB RGB
* Oops
* Review
* Minor documentation modifications
* Header, base struct and enums
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* functions.h fix
* Suggested changes, further adjustments to file doc comments
* Further suggested changes, standardize capitalization of gfxP
* g
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-09-16 17:16:58 -04:00
engineer124
d307a37233
Reorganize Audio Files & Name Remaining Audio Files ( #1494 )
...
* reorganize audio files
* audio code files
* split audio and libaudio
* audio_init_params to audio_configuration
* simplify file names
* move aisetnextbuf to libaudio
* move src/audio -> src/code/audio
* adjust makefile comment
* reorganize again into internal/external
* adjust comment
* restructure again
2023-07-06 17:55:10 -04:00
Tharo
e77b83cf1b
Import fault bss under NON_MATCHING ( #1484 )
...
* Import fault bss under NON_MATCHING
* Fix comments in data files
* Fix variable name
2023-01-02 05:52:56 -05:00
Tharo
0aff024c01
Rename dequeuethread.c to thread.c, move data from createthread.c to thread.c ( #1464 )
2022-12-12 22:12:28 -05:00
Tharo
6d5287ff12
TwoHeadArena and TwoHeadGfxArena docs ( #1349 )
...
* TwoHeadArena and TwoHeadGfxArena docs, ALIGNOF macro
* AllocStart -> AllocHead , AllocEnd -> AllocTail
* Format
* Suggested changes
* Fix
* Further suggested changes
2022-11-13 18:29:50 -05:00
Tharo
c165ed015c
Improvements to Video Interface related functions and data ( #1332 )
...
* Improvements to VI related functions
* Fix
* Suggested changes
* Comment enum values
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Suggested changes, plus comments in visetspecial.c
* Name gViConfigModeType
* Further suggested changes
* Format
* Fix comment on modeLPN2
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-11-13 18:07:27 -05:00
Dragorn421
451e855dbc
Move object table from z_scene.c
to new file object_table.c
( #1416 )
...
* Move object table from z_scene to new file z_scene_dlftbls ("inspired by z_actor_dlftbls.c")
* -> `object_table.c`
2022-10-29 17:25:28 -04:00