1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-03 00:06:37 +00:00
Commit graph

1255 commits

Author SHA1 Message Date
fig02
cc0b1bb127
PLAYER_STATE1_DEAD (#2204)
* PLAYER_STATE1_DEAD

* change comment

* format
2024-09-17 08:21:47 -04:00
Dragorn421
48780cd2b1
Colliders: elemType -> elemMaterial (#2189)
* elemType -> elemMaterial

* format
2024-09-16 18:11:01 -04:00
fig02
8f0e2fc29c
Name PLAYER_STATE1_CHARGING_SPIN_ATTACK (#2203)
* name charge state flag

* format
2024-09-16 17:14:29 -04:00
cadmic
dc9782b5b3
[PAL N64] Rename file select assets (#2197) 2024-09-16 16:40:20 -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
cadmic
2740bb020e
[PAL N64] Match changes that first appear in NTSC 1.2 (#2201) 2024-09-16 10:51:02 -04:00
fig02
03a1502706
More Player Z Target documentation (#2196)
* document flag

* Player_FriendlyLockOnOrParallel

* quirk

* z target functions

* more comments

* more comment changes

* format

* comment change
2024-09-14 16:42:28 -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
fig02
e6e067428e
change flag name (#2194) 2024-09-13 10:07:16 -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
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
fig02
2e79b83bb8
More target related state flags (#2184)
* name some more flags

* format

* cdi suggestion
2024-09-10 22:00:41 -04:00
fig02
6e0288d155
Boomerang related state flags (#2180)
* boomerang state flags

* finish comment
2024-09-09 21:58:22 -04:00
fig02
2232f67917
[Player ZTarget] Some func_80836BEC docs (#2172)
* some func_80836BEC docs

* review

* fix

* newline

* linbreak

* format

* usingHoldTargeting
2024-09-08 19:19:04 -04: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
Dragorn421
de1a08c061
[headers 11] stackcheck.h, jpeg functions (#2171)
* [headers 11] stackcheck.h, jpeg functions

* bss
2024-09-08 12:02:38 -04:00
fig02
0168b09628
Player Docs - Parallel (#2167)
* name func and flag

* rest of the docs

* format and comment change

* comment
2024-09-08 08:57:28 -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
fig02
27533a1507
rename gBuildTeam to gBuildCreator (#2160) 2024-09-07 16:02:01 -04:00
Dragorn421
fa39da2a57
Pause doc: Trade quest marker (#2158)
* Pause doc: Trade quest location

* trade quest location -> marker

* comment on tradeQuestMarker
2024-09-07 15:31:57 -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
cadmic
96914a25c8
Match more GC button colors (#2156) 2024-09-07 19:26:56 +02: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
8a3ba35070
[ntsc-1.2] Match z_file_choose.c and z_boss_tw.c (#2146)
* Match z_file_choose.c

* Match z_boss_tw.c

* Format

* end: -> close_disps:
2024-09-07 00:12:12 -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
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
3faa1c6acc
Move button macros to include/controller.h (#2138)
* Move button macros to include/controller.h

* Fix z_mag button ordering
2024-09-06 10:24:19 +02: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
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
aa1c7f3155
Pause doc: drawing the world map image (#2129) 2024-09-05 03:53:08 +09: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
Dragorn421
af24970d89
Pause: Name temps in KaleidoScope_SetVertices (#2088)
* Pause doc: Name temps in `KaleidoScope_SetVertices`

* Update src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c

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

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-09-04 10:29:39 +02:00
cadmic
27ba989511
Match KaleidoScope_DrawEquipment and KaleidoScope_DrawItemSelect (#2125) 2024-09-04 02:12:33 -04:00