mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-23 06:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,175 Commits 1 Branch 0 Tags
60f9607569249813d508ec70ef501db6d46682ea
Commit Graph

115 Commits

Author SHA1 Message Date
cadmic 60f9607569 [ntsc-1.0/1.1] Match "system" files (#2254) 2024-10-09 09:48:53 -04:00
cadmic 2048a65dd8 [ntsc-1.0/1.1] Match line numbers in debug strings (#2255) 2024-10-09 13:41:16 +02:00
fig02 7dd8f2b6ad Document Player_ChooseNextIdleAnim (#2262) 
* document most of Player_ChooseNextIdleAnim

* finish documenting Player_ChooseNextIdleAnim

* capital letter

* dummy block numbers for the script

* fix bss

* bug comment

* SpeicalIdle -> Fidget, clean up related things

* fix rng chance comment

* normal -> default

* rework Player_CheckForIdleAnim

* swap idle anim defines

* remove COMMON_FIDGET

* add ARRAY_COUNT_2D

* change macro def
 2024-10-08 00:19:10 -04:00
Dragorn421 ed77e143b6 [headers] Create one_point_cutscene.h, z64olib.h and move stuff to z64{object,player,scene}.h (#2250) 
* [headers] Create `one_point_cutscene.h`, `z64olib.h` and move stuff to `z64{object,player,scene}.h`

* bss

* sSceneCmdHandlers

* bss

* bss
 2024-10-01 13:14:54 -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 c6160e1980 [ntsc-1.0/1.1] Match PAL 1.0 viconfig changes (#2231) 
* [ntsc-1.0/1.1] Match viconfig changes

* SREG(48) -> R_VI_MODE_EDIT_STATE
 2024-09-27 16:44:35 -04:00
Dragorn421 fbf797f1e2 [headers] Create gfxalloc.h, map.h, move protos to gfx.h, z64{player,view}.h (#2233) 
* [headers] Create gfxalloc.h, map.h, move protos to z64{actor,player,view}.h

* oops

* bss

* comment on player_lib protos & format

* format map.h

* Move SCREEN_{WIDTH,HEIGHT} and SET_FULLSCREEN_VIEWPORT to z64view.h

* bss

* revert move screen_width/height

* bss
 2024-09-27 14:51:00 -04:00
Dragorn421 bc8945eb3a [headers] Move libultra protos to ultra64.h (as a temporary measure) (#2234) 
* [headers] Move libultra protos to ultra64.h (as a temporary measure)

* format ultra64.h

* bss

* bss

* bss
 2024-09-26 23:58:43 -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
Dragorn421 7ccb0a641e [headers] Create letterbox.h, move more protos from functions.h (#2225) 
* [headers] Create z64shrink_window.h, move more protos from functions.h

* format

* include

* bss

* letterbox.h
 2024-09-25 13:45:06 -04:00
Dragorn421 a09ea76025 [headers] gfx_setupdl.h and z64skin_matrix.h (#2221) 
* [headers] gfx_setupdl.h and z64skin_matrix.h

* include z64skin_matrix.h

* bss

* bss
 2024-09-24 18:18:01 -04:00
mzxrules dc1501e7a0 create ucode_disas.h (#2222) 
* ucode_disas.h

* create UcodeType

* bss
 2024-09-24 13:45:53 -04:00
mzxrules 56981d5297 Document Player Knockback related functions (#1601) 
* document knockback related functions

* rotation -> yRot

* implement some changes

* Renames and comments

* mq bss

* format

* Intangibility and Invulnerability

* bss

* .bss

* add #pragma increment_block_number to z_en_item00.c

* .bss
 2024-09-23 18:31:00 -04:00
Dragorn421 0f725405d1 [headers] Move z_actor functions to z64actor.h (#2216) 
* move

* format

* bss
 2024-09-23 11:06:43 -04:00
Dragorn421 a1a192b1a2 [headers] z64inventory.h, move savectx/inventory macros to z64save.h (#2209) 
* [headers] z64inventory.h

* move savectx/inventory macros to z64save.h

* commit the file

* bss
 2024-09-18 15:40:59 -04:00
cadmic 3287437069 [PAL N64] Match VI mode setup (#2198) 2024-09-16 21:51:53 -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 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
fig02 27533a1507 rename gBuildTeam to gBuildCreator (#2160) 2024-09-07 16:02:01 -04:00
cadmic a30f130eb9 Fix some boot and code data (#2155) 2024-09-07 08:10:52 -04:00
cadmic 53b2110373 Clean up uses of !PLATFORM_N64 vs PLATFORM_GC (#2134) 
* Clean up uses of !PLATFORM_N64 vs PLATFORM_GC

* Put N64 button colors first
 2024-09-06 11:18:59 +02: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 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 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 d54c573132 Match stackcheck.c (#2107) 2024-09-03 21:18:53 -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 ac1287a49a Use FaultDrawer_ names in cic6105.c (#2108) 2024-08-31 03:37:55 -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
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 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
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 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 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 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
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 ac2224f095 Add versions.h (#2060) 2024-08-20 17:19:16 -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 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 1649bf32d6 padutils.c, line numbers (#2040) 2024-08-14 22:13:23 -04: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.

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 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
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
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
Derek Hensley 2361a33307 Small cleanup of cleararena (bootclear) (#1999) 
* cleararena use boot end

* cleararena -> bootclear
 2024-07-21 15:22:54 -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