mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-30 18:55:54 +00:00
Code Issues Projects Releases Wiki Activity
2101 commits 1 branch 0 tags 565 MiB
Commit graph

2101 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Derek Hensley
d9af701b88
 		Make needed extracted directories in extract scripts (#2185) 2024-09-11 09:51:53 -04:00
cadmic
5419a18d79
 		[ntsc-1.2] Match N64 audio tables (#2183) 
* Match N64 audio tables

* ifdef PERMANENT_POOL_SIZE rather than EXTRA_SIZE
 2024-09-11 19:31:54 +09:00
cadmic
fd7b92dac8
 		[ntsc-1.2] Match remaining functions (#2182) 
* Match remaining ntsc-1.2 functions

* "fake" -> "Fake match?"
 2024-09-11 12:07:25 +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
AJ Otto
58d8abfe03
 		Added eye texture offsets for extraction for object_oE5.xml (#2181) 
* Blob object_oE5_Blob_003A40 corrected to extract eye half open and eye closed textures for object_oE5

* Fixed spacing in object_oE5 xml file for commit
 2024-09-10 13:53:49 -04:00
fig02
6e0288d155
 		Boomerang related state flags (#2180) 
* boomerang state flags

* finish comment
 2024-09-09 21:58:22 -04:00
cadmic
6fcaa51832
 		fix_bss.py: Restore z_locale special case (#2179) 2024-09-08 21:37:55 -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
cadmic
37efc27162
 		Run fix_bss.py in Jenkins and generate a patch (#2168) 
* fix_bss.py: Disable colors if stdout is not a tty

* Run fix_bss.py in CI and output a patch

* Wording tweaks
 2024-09-08 18:27:36 -04:00
Dragorn421
fb37d7c6cd
 		[headers 13] osMalloc.h -> include/libc64/os_malloc.h (#2175) 
* [headers 13] osMalloc.h -> include/libc64/os_malloc.h

* also update the #includes :)
 2024-09-08 17:47:25 -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
cadmic
c39323a336
 		fix_bss.py: Subtract addend for relocations against global symbols (#2169) 2024-09-08 11:13:24 -04:00
cadmic
2d96f001db
 		Reorder spec segments for N64 versions (#2163) 2024-09-08 10:27:18 -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
Dragorn421
40372d72b7
 		Move some function declarations to z64{interface,light,message}.h (#2166) 2024-09-07 21:00:05 -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
c27b83ac29
 		N64 ROM header (#2157) 2024-09-08 02:49:21 +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
cadmic
a30f130eb9
 		Fix some boot and code data (#2155) 2024-09-07 08:10:52 -04:00
cadmic
e19ec02917
 		Freeze SFX IDs in msgdis.py (#2154) 
* Freeze SFX IDs in msgdis.py

* Remove remove_comments
 2024-09-07 13:10:57 +02: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
c54c1f2274
 		Move audio/general.c debug bss with the rest of bss (#2152) 
* Move audio/general.c debug bss to own file and include with the rest of bss

* just inline the bss instead of include
 2024-09-07 18:29:25 +09:00
cadmic
35cfc07590
 		[ntsc-1.2] Match z_map_exp.c, z_map_mark.c (#2140) 
* Match z_map_exp.c, z_map_mark.c

* Format

* DMA_REQUEST_SYNC -> DmaMgr_RequestSync

* Remove Gfx forward declaration
 2024-09-07 17:43:23 +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
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
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
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
cadmic
a8151899cf
 		[ntsc-1.2] Match z_actor_dlftbls.c (#2144) 
* Match z_actor_dlftbls.c

* Update src/code/z_actor_dlftbls.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-09-07 03:02:08 +09:00
cadmic
d374e71cb8
 		Fix size of leoDiskStack (#2143) 2024-09-06 19:32:29 +02: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
Ozero4
0b011033fc
 		Naming a function (#2124) 
* Naming a function

* Naming function

* Update functions.txt

* Update function name

* Update function name

* Update function name

* Update function name
 2024-09-05 21:57:30 +09:00