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
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
5178011b64
[PAL N64] Match handwritten audio sequences ( #2210 )
...
* [PAL N64] Match handwritten audio sequences
* Remove offset comments from PAL-only audio code
* Reorder includes
2024-09-21 07:30:52 -04:00
cadmic
306abef46b
Consistently use "OOT_VERSION <" and "OOT_VERSION >=" ( #2199 )
2024-09-17 15:40:50 -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
cb7fe4943a
Fix find command error ( #2192 )
2024-09-12 16:37:13 -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
cadmic
09c1816e2d
Add OOT_PAL_N64 and move other shorthands to versions.h ( #2188 )
...
* Move definitions of OOT_NTSC/OOT_PAL/OOT_MQ to versions.h
* Add PAL_N64 shorthand
2024-09-12 05:24:31 -04:00
Derek Hensley
d9af701b88
Make needed extracted directories in extract scripts ( #2185 )
2024-09-11 09:51:53 -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
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
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
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
cadmic
c38adc1036
Add NO_SQRTF_INTRINSIC for z_rumble.c and audio/general.c ( #2067 )
2024-08-23 03:11:41 -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
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
Tharo
ba5574be6d
[Audio 5/?] Build the Samplebank Table ( #2044 )
2024-08-17 17:42:15 -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
Dragorn421
c8ec6042e1
checksums for ntsc 1.2 JP and US, accept both as baserom ( #2030 )
2024-08-14 18:53:39 -04:00
Dragorn421
91a534cbc9
Rewrite preprocess.py with bash and C ( #2035 )
...
* add C preprocess_pragmas and Bash preprocess
* "line return" -> newline
* align tools sources
* fix: handle files that are not newline-terminated
* use a temp directory with a same-basename file instead of a temp file
* macos compat
* remove debug code
2024-08-14 04:05:36 -04:00
Tharo
fc79632df8
[Audio 3/?] Set up building samples ( #2024 )
...
* [Audio 3/?] Set up building samples
* AIFF -> SAMPLE
2024-08-11 17:41:33 +02: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
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
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
Tharo
29acf96db2
[Audio 1/?] Extract Samplebanks and Soundfonts to XML ( #2008 )
...
* [Audio 1/?] Extract Samplebanks and Soundfonts to XML
* Remove config.py and use the version yamls for addresses, other suggested changes
* Adjust setup-audio
* Remove some commented out dead code (MM review)
2024-08-08 00:11:39 -04:00
fig02
6a8c556bdb
Add make_options.mk ( #2016 )
...
* make-options.mk
* fix file name
* Make more settings overwritable with .make_options.mk and group them together
* PAL -> EU
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-08-06 13:32:34 -04: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
Tharo
8ee485d2e7
Create build directories for committed assets ( #2007 )
2024-07-29 17:16:53 -04:00
cadmic
0db9e7275f
Fix Makefile performance regression with OOT_VERSION define ( #2006 )
2024-07-29 15:57:35 -04: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
Tharo
7244cd62a5
Restore makefile rules for building asset files out of the assets directory ( #2002 )
...
* Re-add makefile rules for building asset files out of the assets directory
* Fix ASSET_FILES_OUT
2024-07-23 18:47:00 -04:00
Tharo
c1341224f9
Promote the warnings implicit-int, int-conversion, incompatible-pointer-types to errors ( #1995 )
2024-07-18 12:58:59 -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
Tharo
baf1e8c174
Reworked text extraction + add JP text extraction ( #1980 )
...
* Reworked text extraction + add JP text extraction
* Format
* Suggested changes
* Correct address for gc-us sJpnMessageEntryTable
Co-authored-by: cadmic <cadmic24@gmail.com>
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-07-02 22:42:52 -04:00
Dragorn421
264581ff3f
CCCHECK: Add -Werror=implicit-function-declaration ( #1979 )
2024-06-27 06:39:28 -04:00
cadmic
1b0e35c89a
Extract NTSC assets for gc-us ( #1973 )
...
* Extract NTSC assets for gc-us
* Extract kanji
https://github.com/zeldaret/mm/pull/1536
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-06-26 06:22:26 -04: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 fc8027a75fhttps://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
Tharo
52e7483392
Sync gbi.h with MM, move ucode defines to makefile ( #1968 )
...
* Sync gbi.h with MM, move ucode defines to makefile, use GBI_DEBUG instead of OOT_DEBUG
* UCODE_DEFS -> GBI_DEFINES, add GBI_DOWHILE toggle
2024-06-22 08:49:07 -04:00
cadmic
0ddd64fd6c
Introduce version-specific YAML config ( #1957 )
2024-06-20 22:26:32 -04:00
cadmic
8b6a6e6778
Run CC_CHECK with the correct CPP defines ( #1963 )
...
* Run CC_CHECK with the correct CPP defines
* Add "CPP_DEFINES ?="
2024-06-20 18:26:01 -04:00
