1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Commit graph

511 commits

Author SHA1 Message Date
fig02
17edb82c0d
Decouple Debug Features From gc-eu-mq-dbg (#2296)
* rename OOT_DEBUG to DEBUG_FEATURES

* makefile changes

* add DEBUG_ASSETS

* fix DEBUG_FEATURES usages

* format

* fix errors

* review

* fix problem and review2

* review

* add DEBUG_FEATURES to DEBUG_ASSETS check

* review

* whoops

* format
2024-11-17 17:02:07 -05: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
Dragorn421
47c6c36dc3
[headers] Create zelda_arena.h, move protos to z64effect.h, and misc fixups (#2248)
* [headers] Create z64malloc.h, move protos to z64effect.h, and misc fixups

* zelda_arena.h

* bss

* bss2

* bss3

* bss
2024-10-01 08:46:56 +02: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
f70e363392
[headers] z64bgcheck.h functions (#2239)
* [headers] z64bgcheck.h functions

* format

* bss
2024-09-27 11:29:19 +02: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
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
5ed5f196d9
[headers] audio functions to z64audio.h and z64ocarina.h (#2223)
* [headers] audio functions to z64audio.h and z64ocarina.h

* bss
2024-09-25 10:25:49 +02: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
fig02
3cea46a6c1
Z-Targeting Loose Ends (#2217)
* Z-Targeting loose ends

* format

* add stateflag comment

* typo

* unname PLAYER_STATE1_19 for now

* tweak parallel comment

* one more tweak
2024-09-24 05:00:38 -04:00
Dragorn421
0f725405d1
[headers] Move z_actor functions to z64actor.h (#2216)
* move

* format

* bss
2024-09-23 11:06:43 -04:00
fig02
05b908d0eb
Document autoLockOnActor (#2212)
* document autoLockOnActor

* format.py

* backtick

* grammar

* comment adjustments

* word

* letter
2024-09-21 14:49:45 -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
fig02
e658bed27e
Hostile Lock-On (#2193)
* document flag and functions

* format

* adjust comment

* make the comment more public-facing-friendly
2024-09-13 14:49:55 -04: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
a903f8b8bc
Document ACTOR_FLAG_SFX_ flags and functions (#2162)
* Document `ACTOR_FLAG_SFX_` flags and functions

* format
2024-09-08 16:26:01 -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
40372d72b7
Move some function declarations to z64{interface,light,message}.h (#2166) 2024-09-07 21:00:05 -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
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
87c304afcb
[headers 6] collision_check functions and structs (#2148)
* [headers 6] collision_check functions and structs

* bss
2024-09-07 02:29:50 -04: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
fig02
bb6177e936
Document Target_ShouldReleaseLockOn [Target Docs 8/8] (#2135)
* target range and leash docs

* format
2024-09-05 12:44:06 -04: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
6051251c92
istargeted -> islockedon (#2132) 2024-09-04 19:26:23 -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
d54c573132
Match stackcheck.c (#2107) 2024-09-03 21:18:53 -04:00
cadmic
e44c7c656c
[ntsc-1.2] Match audio (#2122)
* general.c mostly ok

* match remaining audio funcs

* comments

* Finish matching audio

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-09-03 20:32:38 -04:00
fig02
6f396e7cc8
Target System Docs: Actor Searching [3/?] (#2120)
* document target actor searching

* missed something

* review

* mzx review
2024-09-03 00:02:24 -04:00
fig02
2b25c31588
Document Target_Draw [Target Docs 2/?] (#2115)
* document Target_Draw

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* fix missed renames

* retail fix

* another fix

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-09-01 16:02:13 -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
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
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
krm01
8df87038a0
[Doc] name function func_8002DBD0 to Actor_WorldToActorCoords (#2029)
* name function Actor_WorldToActorCoords

* clean up some misleading usages
2024-08-11 14:30:41 -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
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
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
bd0941405d
Document Player's Face and z_actor FaceChange functions (#1928)
* create some enums

* gonna try struct instead of array

* struct works. add docs too

* inline function comments

* fix function comment

* name faces, move enums

* rename textures

* outnames

* remove comments

* change comment slightly

* fixup face comments

* review

* offset comments

* add and use PLAYER_FACE_MAX

* typo

* more comment on blinkDuration

* another change to the comment
2024-03-23 12:21:45 -04:00
Tharo
dcf61174e9
Filename & line number args cleanup (#1891)
* Filename & line number args cleanup

* Use int for line number args over s32/u32

* Add missing const qualifiers from filename args

* Fix gcc warning in game.c

* Add comment to weird assignments in GameState_Init
2024-02-27 02:37:33 -05:00
cadmic
be4f3142e0
Match retail z_sram.c (#1722) 2024-02-07 10:41:12 -05:00
cadmic
178e95ae50
Give debug_malloc.c the same treatment as system_malloc.c and z_malloc.c (#1700) 2024-02-03 10:59:25 -05:00
cadmic
d9a1148d13
Match retail __osMalloc.c (#1684)
* Match retail __osMalloc.c

* Add TODO about N64 ArenaNode debug info

* FLAG prefix -> FLAG suffix
2024-02-02 17:37:32 -05:00