mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-18 22:57:01 +00:00
Code Issues Projects Releases Wiki Activity
2130 commits 1 branch 0 tags 491 MiB
Commit graph

130 commits

Author SHA1 Message Date
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
Dragorn421
48780cd2b1
Colliders: elemType -> elemMaterial (#2189) 
* elemType -> elemMaterial

* format
 2024-09-16 18:11:01 -04:00
fig02
e6e067428e
change flag name (#2194) 2024-09-13 10:07:16 -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
Dragorn421
f193311013
Colliders: colType -> colMaterial (#2186) 
* colType -> colMaterial

* fixups
 2024-09-11 21:18:46 -04:00
Dragorn421
64570e871f
Pause doc: Prompt page and save prompt state (#2170) 
* Pause doc: Prompt page and save prompt state

* bss

* `QUAD_PROMPT_` -> `PROMPT_QUAD_`

* `QUAD_MAP_WORLD_`, `QUAD_MAP_` -> `WORLD_MAP_QUAD_`

* `PAUSE_QUAD_CURSOR_` -> `PAUSE_CURSOR_QUAD_`

* `PAUSE_SAVE_PROMPT_STATE_RETURN_TO_MENU_ALT` -> `_2`

* bss

* bss

* add comments to help clarify save prompt vs prompt
 2024-09-11 18:58:33 +02:00
Dragorn421
76d97ac18a
[headers 14] libc64 headers (#2177) 
* [headers 14] libc64 headers

* bss

* bss
 2024-09-11 18:02:42 +09:00
Dragorn421
cbf9eacf42
[headers 12] Add kaleido_manager.h, move various protos to headers (#2174) 
* [headers 12] add kaleido_manager.h, move various protos to headers

* BSS

* bss
 2024-09-11 10:17:47 +02:00
Dragorn421
5441559b30
Cleanup gSPMatrix, rename Matrix_New -> Matrix_Finalize, add MATRIX_FINALIZE_AND_LOAD (#1983) 
* clean up gSPMatrix usage

* add weird hybrid macro gSPMATRIX_SET_NEW

* Matrix_NewMtx, MATRIX_NEW -> Matrix_Finalize, MATRIX_FINALIZE

* gSPMATRIX_SET_NEW -> MATRIX_FINALIZE_AND_LOAD

* format
 2024-09-11 16:59:23 +09: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
de1a08c061
[headers 11] stackcheck.h, jpeg functions (#2171) 
* [headers 11] stackcheck.h, jpeg functions

* bss
 2024-09-08 12:02:38 -04:00
Dragorn421
1332356e5c
Pause doc: Cursor drawing (#2159) 
* Pause doc: Cursor drawing

* bss
 2024-09-07 22:28:46 -04:00
fig02
2056ae5f1a
Document Attention/Lock-on Related Actor Flags (#2161) 
* document actor flags 0, 2, 3, and 27

* format

* fly -> hover

* wodring
 2024-09-07 17:53:48 -04:00
Dragorn421
a039aeffb7
[headers 5] Misc small headers untangling (#2147) 
* Misc small headers untangling

* mv gSaveContext to where it is in MM in the header

* newline police

* move rand functions back to functions.h
 2024-09-07 17:23:25 -04:00
Dragorn421
277ce1c0d3
[headers 8] Add main.h, segmented_address.h, and changes for main.c symbols (#2151) 
* [headers 8] Add main.h and changes for main.c symbols

* fix gSystemHeapSize is size_t only in MM

* segmented_address.h

* rm now useless include

* actually commit segmented_address.h, oops

* rm gGraphThread (faulty copypaste from MM)

* bss
 2024-09-07 16:55:06 -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
fig02
88c4475967
Target -> Attention (System Rename) (#2149) 
* TargetContext -> Attention

* targetCtx -> attention

* Target_ -> Attention_

* FindTargetableActor -> FindActor

* targetableActorP -> attentionActorP

* data vars (and 1 function I missed)

* targetMode -> attentionRangeType

* attention range enum comments

* ATTENTION_RANGE_

* attention range data

* TargetColor -> AttentionColor

* missed one

* fixup color variables

* targetArrowOffset -> lockOnArrowOffset

* focus pos comment

* targetPriority -> attentionPriority

* assets

* loose-ends

* Attention System Description

* format

* skj range type

* enemy bgm
 2024-09-07 09:23:04 -04:00
Dragorn421
62b30e2ebe
Move Graph_Alloc and open/close Disps to gfx.h (#1976) 
* move graph_alloc and open/close Disps to gfx.h

* zcolchk bss reeeeeee

* fix matching gc-eu-mq (bss)

* remove __gfxCtx extern

* revert makefile -Werror=implicit-function-declaration

* bss
 2024-09-07 19:30:55 +09:00
Dragorn421
3a9ebfbbad
Pause doc: World map points (#2141) 
* Pause doc: World map points

* bss

* `WORLD_MAP_POINT_HYLIA_LAKESIDE` -> `_LAKE_HYLIA`
 2024-09-07 17:14:08 +09:00
Dragorn421
e7b0daa2ec
[headers 7] Add sys_matrix.h (#2150) 
* add sys_matrix.h, based on MM's

* move matrix debug macros to sys_matrix.h

* bss
 2024-09-07 00:26:47 -04:00
cadmic
2ce648a7c6
Miscellaneous libultra header fixes (#2139) 
* Miscellaneous libultra header fixes

* Fix bss?

* Reword RCP timeout
 2024-09-06 14:46:44 +02:00
mzxrules
acb5c7f20c
Update Room Documentation (#2015) 
* Update Room Documentation

* Write more complete documentation, implement suggestions.

* Function name changes; minor comment tweaks

* nit

* Resolve Dragorn fixes

* Resolve Fig suggestions, fix comment wording

* fix bss, fig suggestion

* bss
 2024-09-05 21:08:21 +09:00
fig02
dbb059c6a7
Target Mode Enum [Target Docs 7/?] (#2133) 
* TargetMode Enum

* format

* add default comment

* bss

* bss 2

* fix bss 3
 2024-09-04 23:46:03 -04:00
Dragorn421
dc469461a9
Pause docs: WorldMapArea enum and related data (#2130) 
* Pause docs: WorldMapArea enum and related data

* `WORLD_MAP_AREA_20` -> `_QUESTION_MARK`

* bss
 2024-09-04 17:51:08 -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
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
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
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
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
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
cadmic
e6bc4bd8cb
Add names to all typedef'd structs, unions, and enums (#2028) 
* Add names to all typedef'd structs, unions, and enums

* wtf vs code

* Use a better regex
 2024-08-12 03:07:48 -04:00
cadmic
9eec8af498
Add "do {} while (0);" to CLOSE_DISPS (#2025) 2024-08-10 18:48:27 -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
fig02
078e21f6c6
InitVars -> Profile (#2011) 
* rename ActorInit

* rename actorInit

* rename initInfo

* EffectSs Profile

* _InitVars -> _Profile

* format, loose ends

* revert tutorial
 2024-08-02 17:50:02 -04:00
cadmic
067d06bb56
Match NTSC loose ends (#2004) 
* Match NTSC loose ends

* Add comment about giObjectSegment size
 2024-07-28 00:09:05 -04:00
cadmic
47fd023238
Match NTSC z_kanfont.c and z_message.c (#1997) 
* Match NTSC z_kanfont.c and z_message.c

Co-authored-by: inspectredc <inspectredc@gmail.com>

* Apply suggestions from code review

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

* Remove now-unnecessary padding

* Remove msgBufDecoded comment

* Use == NULL for fake match

* Rename Message_DrawText{JPN,NES} -> Message_DrawText[Wide]

* Font_LoadKanji -> Font_LoadCharWide

* Restore FONT_MESSAGE_OFFSET/FONT_MESSAGE_LENGTH

---------

Co-authored-by: inspectredc <inspectredc@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2024-07-21 21:50:20 -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
24571203df
Remove global.h from z_fishing (#1977) 2024-06-25 18:48:24 -04:00
Anghelo Carvajal
d8f2e9abc6
Move PlayState to a new z64play.h (#1966) 
* ActorContext

* frameadvance

* SfxSource

* GameOverContext

* RoomContext

* TransitionActorContext

* fix bss

* Move PlayState

* Move play functions to new header

* SAC_ENABLE

* no longer needed

* SAC_ENABLE again

* z_demo being silly

* comment

* format headers

* fix retail bss

* actually fix bss

* Cutscene_ProcessScript comment

* bss again

* Update src/code/z_demo.c

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

* rename to frame_advance and remove it from z64.h

* move macros too

* review

* Rename SequenceContext to SceneSequences

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
 2024-06-25 15:13:31 -04:00
Dragorn421
2ce4742bf6
Fix misc 22 (#1971) 
* remove trailing whitespace

* fix/docbug about dright for next page of fault menu

* // size = ...; -> // size = ...

* access `ColliderJntSph.elements` as an array

* fixup doc in PreRender.c

* empty line after decl

* gdSPDefLights1 xyz arguments for direction are signed 8bit values

* doc bug of bad use of free in EffDust actor

* decimal for Actor.colorFilterTimer

* shopItemEntries -> sShopItemEntries

* HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE

* format
 2024-06-24 18:39:08 -04:00
Tharo
38921684a5
Add point lighting gbi features (#1962) 
* Add point lighting gbi features

* Maybe fix bss ordering
 2024-06-20 22:39:43 -04: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
fig02
7e8b9144c2
Player Docs: Control stick buffers (#1945) 
* name vars and add enum

* name some spin attack stuff

* fix right and left

* forward/backward

* format

* fix retail bss

* sControlStickWorldYaw
 2024-04-22 17:35:22 -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