mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 12:54:40 +00:00
Code Issues Projects Releases Wiki Activity
2192 commits 1 branch 0 tags 560 MiB
Commit graph

279 commits

Author SHA1 Message Date
fig02
e55e909477
Document ACTOR_FLAG_UPDATE_DURING_OCARINA and PLAYER_STATE2_USING_OCARINA (#2277) 
* Document ACTOR_FLAG_UPDATE_DURING_OCARINA

* document PLAYER_STATE2_USING_OCARINA

* format

* comment tweak

* treat var as flag
 2024-10-17 21:44:35 -04:00
mzxrules
2f54db142e
Rename RoomBehaviorType1 to RoomType (#2271) 
* Rename RoomBehaviorType1 to RoomType

* suggestions

* Update include/z64scene.h

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-10-14 15:23:50 -04:00
fig02
53c57599a4
Name talking action related things (#2260) 
* name talking related things

* Player_Action_TalkExchangeItem -> Player_Action_ExchangeItem

* splitting action stuff to new PR

* format
 2024-10-10 22:04:30 -04:00
Dragorn421
ba9c60552b
Player doc: some rotation logic/data (#1443) 
* Docs: some player rotation logic/data

* Improve misleading comment

* rename temps

* unk_6AE_rotFlags

* format

* disasm metadata
 2024-10-09 20:22:52 -04:00
cadmic
bdc11c2894
[ntsc-1.0/1.1] Match "game engine" files (#2244) 
* [ntsc-1.0/1.1] Match "game engine" files

* Use R_START_BTN_X/R_START_BTN_Y

* Comment obvious bugs

* Move Magic_Fill comments

* Move EVENTINF_HORSES_INDEX printf inside #if

* Replace "this function"
 2024-09-30 15:52:38 -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
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
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
fig02
fcd5745d40
PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213) 2024-09-21 18:25:19 -04:00
fig02
cc0b1bb127
PLAYER_STATE1_DEAD (#2204) 
* PLAYER_STATE1_DEAD

* change comment

* format
 2024-09-17 08:21:47 -04:00
fig02
8f0e2fc29c
Name PLAYER_STATE1_CHARGING_SPIN_ATTACK (#2203) 
* name charge state flag

* format
 2024-09-16 17:14:29 -04:00
fig02
c91e62f000
Document zTargetActiveTimer (#2200) 
* document zTargetActiveTimer

* edit comments

* Update src/overlays/actors/ovl_player_actor/z_player.c

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

* capitalization

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
 2024-09-16 12:34:23 -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
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
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
fig02
900c2f0f68
Name PLAYER_STATE1_ACTOR_CARRY (#2173) 
* actor carry flag

* format and add comments

* comment changes
 2024-09-08 17:43: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
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
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
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
cadmic
ed870e051d
[ntsc-1.2] Match more draw functions (#2145) 
* Match z_vr_box.c

* Match TitleCard_Draw

* Match z_player_lib.c?

* Match Lights_Draw
 2024-09-06 22:48:17 -04:00
Dragorn421
02816c410c
T() macro 8 (#2142) 
* T() macro in fault

* T() macro in game.c, gfxprint.c

* T() macro in ucode_disas.c

* T() macro in z_actor.c

* T() macro in z_message.c

* push fault key combo T()

* z_message T: koko -> "here"

* format
 2024-09-06 22:00:12 -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
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
fig02
6051251c92
istargeted -> islockedon (#2132) 2024-09-04 19:26:23 -04:00
fig02
907e440f3a
unk_664 -> focusActor [Target Docs 5/?] (#2126) 
* unk_664 -> focusActor

* capitalization

* missed a temp
 2024-09-05 03:33:30 +09: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
fig02
45158f57d6
Document Target_Update [Target Docs 4/?] (#2123) 
* document Target_Update

* add comments

* try CLAMP (dbg is ok but ci will check retail)
 2024-09-03 20:58:39 -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
fig02
a21a59c4b5
Target Docs [1/?] (#2110) 
* Target Docs Part 1

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

* review

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2024-08-31 15:10:25 -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
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
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
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
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
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
inspectredc
e88084fe65
Fix LensMode Enum Names (#1954) 2024-06-09 14:43:15 -04:00
cadmic
b86e1774cf
Rename yDistToWater -> depthInWater (#1950) 
* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater
 2024-04-28 17:29:06 -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
fig02
7445169e42
targetActor -> talkActor (#1933) 2024-03-24 12:27:45 -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