mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity
2160 commits 1 branch 0 tags 516 MiB
Commit graph

2160 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cadmic
2152d1df2d
[ntsc-1.2] Import libleo from Decompollaborate/n64dd (#2104) 
* Create stack.h for STACK/STACK_TOP

* Import libleo from Decompollaborate/n64dd

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>

* Use (unsigned) int when in mdebug

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Use && in leocmdex.c

* Use proper names for character tables, revert sNonKanjiIndices

* Fix incorrect OSMesg casts

* Use LEO_ERROR_GOOD even where docs say 0

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Remove "Presumably" comment

* Whitespace

* Remove redundant (debug-only) returns

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2024-09-03 15:30:14 -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
cadmic
ac1287a49a
Use FaultDrawer_ names in cic6105.c (#2108) 2024-08-31 03:37:55 -04:00
Dragorn421
1eeb03e5bb
[ntsc-1.2] Match rand.c (#2097) 
* [ntsc-1.2] Match rand.c

* Comment on N64 Rand_ZeroOne taking the low random bits

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2024-08-30 08:56:00 -04:00
Dragorn421
dc964931c2
[ntsc-1.2] Match z_demo.c, z_eff_blure.c, z_eff_spark.c (#2096) 
* Match z_demo.c

* Match z_eff_blure.c

* Match z_eff_spark.c (fake inc.)

* review

* improve EffectSpark_Draw match

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

* cleanup

* fix merge

* review

* better match EffectBlure_DrawSimpleVertices (ty cadmic)

* review

* rm unneeded include versions.h

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
 2024-08-29 18:23:01 -04:00
cadmic
a63f0a63b5
Move driverominit and sprintf to src/boot/ (#2105) 2024-08-29 16:34:18 -04:00
cadmic
5e9704b464
[ntsc-1.2] Fix some data / disassembly / undefined_syms (#2103) 
* Fix some data splits

* Use real fault functions in cic6105.c

* Fix fault_n64.c data sizes

* Format
 2024-08-29 12:05:50 -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
6e8b820184
[ntsc-1.2] Match z_game_over.c, PAL 1.1 fixes (#2099) 
* Match z_game_over.c (PAL 1.1 change)

* Fix previous matches that are actually PAL 1.1 changes

* Add versions.h to global.h

* Add versions.h to z_game_over.c too

* And the others too

* Fix awkward wording
 2024-08-28 21:00:06 -04:00
Dragorn421
16ec9b1e13
T() macro 7 (#2102) 
* T() macro in most of the rest of code (except z_message, z_actor, ucode_disas, gfxprint, game, fault, db_camera)

* remaining T() macro in boot

* format

* review
 2024-08-28 14:01:41 -04:00
Dragorn421
7592bf1e42
Check disasm metadata for missed renames (#2069) 
* Check disasm metadata (look for symbols in metadata that no longer exist, indicating renames but the metadata was not updated)

* -us.z64

* Update disasm metadata with renamed functions in #2057

* sort IGNORE_NTSC_1_2_SYMS_MISSING
 2024-08-28 13:28:03 +02:00