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
2073 commits 1 branch 0 tags 565 MiB
Commit graph

2073 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Dragorn421
c7b55f9a07
 		Fix merge issue between z_message.c match and n64dd renames (#2131) 2024-09-04 16:48:10 -04:00
Dragorn421
376f9852d0
 		[ntsc-1.2] Match z_message.c (#2098) 
* match Message_ResetOcarinaNoteState, Message_DrawTextChar

* match Message_OpenText

* Match Message_SetTables

* Match Message_StartTextbox

* forgor #if

* format

* match Message_DrawMain (ty inspect)

* review
 2024-09-05 04:03:58 +09: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
Dragorn421
e833011ccd
 		Cleanup: Pass all paths to tools rather than tools constructing them (#2017) 
* Pass all paths to tools rather than tools constructing them

* fix: make --baserom-segments required

* sync with mm reviews

* --version everywhere
 2024-09-05 03:49:16 +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
78e6b801bc
 		Jenkinsfile: make -j -> make -j$(nproc) (#2128) 2024-09-05 03:22:37 +09:00
Tharo
f1911cd937
 		[Audio 7/?] Extract sequences to assembly (#2119) 
* [Audio 7/?] Extract sequences to assembly

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* Suggested changes, some extra sequence disassembler cleanup

* Remove unused multiprocessing import and regen assets/xml/audio/sequences

---------

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
 2024-09-05 02:55:04 +09:00
Dragorn421
fab309ae08
 		[ntsc-1.2] Partially match gfxprint.c (#2101) 
* [ntsc-1.2] Partially match gfxprint.c

* yeet bss

* fix

* review
 2024-09-04 19:22:59 +02: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
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
eab37fe54a
 		Run CC_CHECK in CI (#2109) 
* Run CC_CHECK in CI

* Fix n64dd.h (guess this is why we need this change)
 2024-09-04 03:15:52 -04:00
cadmic
7937be87e4
 		Reorganize z_std_dma.c unused strings (#2121) 
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2024-09-04 02:54:22 -04:00
cadmic
27ba989511
 		Match KaleidoScope_DrawEquipment and KaleidoScope_DrawItemSelect (#2125) 2024-09-04 02:12:33 -04:00
cadmic
e7cf2fceac
 		[ntsc-1.2] Match game.c, z_play.c, z_room.c (#2117) 
* Match z_room.c

* Match game.c and z_play.c

* Add undefined syms

* Rewrite condition based on other file matches
 2024-09-04 01:46:41 -04:00
cadmic
87914c6cc6
 		Match fp_math.c (#2116) 2024-09-04 01:12:44 -04:00
cadmic
6e5ea8c7aa
 		[ntsc-1.2] Update spec for boot and code (#2114) 
* Update spec for boot and code

* Fix merge
 2024-09-04 00:30:23 -04: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
cadmic
7a9209c885
 		[ntsc-1.2] Match z_camera.c (#2112) 
* Add CAMERA_CHECK_BTN

* Match Camera_Demo3
 2024-09-03 23:00:37 -04:00
cadmic
808fe81deb
 		[ntsc-1.2] Match padmgr.c, sys_cfb.c, rcp_utils.c (#2111) 
* Match padmgr.c

* Match sys_cfb.c, rcp_utils.c

* Format
 2024-09-03 22:10:00 -04:00
cadmic
d54c573132
 		Match stackcheck.c (#2107) 2024-09-03 21:18:53 -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
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
Derek Hensley
3e200769f1
 		[ntsc-1.2] LoadFragment2 OK (#2118) 
* [ntsc-1.2] LoadFragment2 OK

* Add insight about bssSize
 2024-09-03 19:19:13 -04:00