mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity
1153 commits 1 branch 0 tags 486 MiB
Commit graph

1153 commits

This branch
This branch
All branches
Author SHA1 Message Date
louist103
e31e35658d
Fix return UB (#958) 
* Ydan_SP

* func_8002D7EC

* Gameplay_ChangeCameraStatus

* Graph_InitTHGA

* CollisioCheck_LineOC

* Fix more in camera and jpeg

* revert comment in player
 2021-09-12 13:02:45 +02:00
louist103
90c841c435
Mark a bug in En_Tana (#954) 
* bug

* Re word the bug to be clearer

* Small edits

* Use Another wording
 2021-09-08 14:26:30 -04:00
engineer124
e6edb4b312
Improve non-matchings in DbCamera (#953) 
* DbCamera_Update equivalent

* Very small progress

* cleanup

* More cleanup

* format

* even more cleanup

* typo
 2021-09-08 20:18:50 +02:00
Dragorn421
b12dd3d980
Improve actorfixer.py (2nd round) and rename to namefixer.py (#942) 
* Merge animfixer and mathfixer into actorfixer

* Allow "custom behavior" for `wordReplace` entries

* Rename `actorfixer.py` to `namefixer.py`
 2021-09-07 15:29:40 -04:00
zelda2774
9c7d3688ac
audio_load OK (#948) 
* Match func_800DDB64

* Match func_800DC910

* remove stack comments

* Move nop padding to ucode_disas

* Partially label audio_synthesis

To some extent copied from sm64.

* cleanup

* Reverb and ReverbBits have nothing to do with reverbs

* review

* naming

* Revert "reduce diff"

This reverts commit cd4ac24d8809f3f8e5b0f91788bffd72b47d15af.

* Match func_800E283C

* Audio_DmaSampleData

* Warning fixes

* func_800E4198

* func_800E4918

* Fix compiler warnings in z_camera/db_camera

* cleanup

* terminology

* tiny bit of doc

* undo permuter_settings change

* Revert "Fix compiler warnings in z_camera/db_camera"

This reverts commit dfdfac47f2.

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-09-07 14:14:09 -04:00
zelda2774
d63ed0c17a
code_800F9280 OK (#945) 
* Match func_800F9280

* Match func_800FA3DC

* Audio_ProcessSeqCmd

* macro cleanup

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-09-07 13:50:50 -04:00
EllipticEllipsis
b1cd46c37c
Add va_end and returns to variadic functions (#950) 2021-09-07 18:17:19 +02:00
zelda2774
c577ed1e84
Fix compiler warnings in z_camera/db_camera (#947) 
* Fix compiler warnings in z_camera/db_camera

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-09-07 18:13:52 +02:00
Roman971
3d57eaf019
Add do whiles to all remaining gbi macros (#946) 
* Add do whiles to all remaining gbi macros

* Cleanup and remove unnecessary do whiles
 2021-09-05 14:41:02 -04:00
Revo
d874cd08fc
Fix UB in func_80B537E8. (#943) 2021-09-05 14:34:37 -04:00
Roman971
2862aa6d03
Various minor cleanups (#940) 
* Fix includes using braces instead of quotes

* Remove some unused printf arguments

* Fix a condition in Door_Shutter

* Run the formatter

* Cleanup incorrect uses of DynaPolyMoveFlag as function arguments

* Cleanup combined Math_StepToF checks
 2021-09-05 21:00:24 +09:00
fig02
3de7c21196
Document new "Epona Push" bug (#941) 
* add comment

* missed one

* remove dupes and change wording
 2021-09-04 15:45:47 +02:00
Dragorn421
81830a6e8b
Cleanup translation comments (#924) 
* `// Translates to:` -> `//`

* `// Translation: ([^"].*)` -> `// "$1"`

* Manual cleanup

* Manual cleanup in `src/code/`

* Use more lowercase for some all caps translations

* Move translations to end of lines where it fits under 100 bytes

* Move one translation to end of line manually

* Run formatter

* Cleanup in EnHeishi1 as suggested by Roman

* Update src/code/z_play.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-09-04 15:33:19 +02:00
zelda2774
9b840ad842
code_800EC960 OK + data migrated (#937) 
* Match AudioDebug_ProcessInput_SEFlagSwap

* Data migration

* Migrate in-function statics for func_800EE824

* More data migration

* Migrate in-function static for func_800F510C

* Last bit of migration

* formatting

* naming fix

* Prune variables.h

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-09-01 18:33:37 -04:00
Roman971
15c3a5eb91
Remove InitVars declarations from actor headers (#939) 
* Remove InitVars declarations from actor headers

* Remove unused files in ovl_En_Ms
 2021-09-01 15:03:52 -04:00
Dragorn421
89634377c6
Cleanup symbols from undefined_syms.txt (2nd round) (#934) 2021-08-31 19:00:55 -04:00
zelda2774
4444c5ea35
audio_synthesis OK + partially documented (#920) 
* Match func_800DDB64

* Match func_800DC910

* remove stack comments

* Move nop padding to ucode_disas

* Partially label audio_synthesis

To some extent copied from sm64.

* cleanup

* Reverb and ReverbBits have nothing to do with reverbs

* review

* naming

* Undo changes to permuter_settings.toml

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-08-31 18:53:35 -04:00
Dragorn421
430a172183
Rename MtxF members to use the common convention (#923) 
* Rename MtxF members like xy -> now_21

* Revert comments I didn't mean to commit

* Rename c*/r* temps in `SkinMatrix_MtxFMtxFMult`

* Rename MtxF members like now_21 -> yx
 2021-08-31 14:19:41 -04:00
Revo
7728f75d2a
fix rodata order inconsistency bug in mkldscript (required for GCC support) (#932) 
* fix rodata order inconsistency bug in mkldscript (required for GCC support)

* Update tools/mkldscript.c

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

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-08-31 09:30:02 -04:00
zelda2774
6ef1f3ea3e
Match Audio_ProcessSoundRequest (#935) 
Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-08-31 09:22:56 -04:00
engineer124
1117783731
Macros: PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) (#921) 
* PLAYER -> GET_PLAYER(globalCtx)

* ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)

* PR Suggestions

* formatter

* Add brackets

* remove from actorfixer.py

* Bring back actorfixer.py change
 2021-08-31 12:22:03 +02:00
Revo
f8498478c4
fix UB in DemoSa_FrameUpdateMatrix. (#933) 2021-08-30 12:29:12 -04:00
Roman971
f3c930917b
Implement define tables for objects, actors and effect soft sprites (#906) 
* Implement a single Object Table for the enum and the segments

* Implement a single Actor Table for the enum and the overlays

* Implement a single Effect SS Table for the enum and the overlays

* Remove initvars.h and move its content to relevant files

* Update object 0 to use OBJECT_NONE and document it in the table

* Rename OBJECT_NONE to OBJECT_INVALID to avoid confusion
 2021-08-29 21:24:32 -04:00
Roman971
ead672acc8
Match the remaining function in Boss_Tw (#930) 2021-08-29 21:03:20 -04:00
zelda2774
37871e555f
Match func_800E4590 (#922) 
Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-08-29 20:51:57 -04:00
Tharo
3c2b198130
Decompile ovl_En_Ganon_Mant (#912) 
* Initial progress

* Improve the last NON_EQUIVALENT to NON_MATCHING

* 2 functions down to stack, migrate data

* 2 more matches, some other improvements

* Use Vtx over Vtx_tn

* Begin documenting

* Some names

* More docs

* Finish docs

* Remove VTX_TN

* Review suggestions

* Single line comments

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* en_ganon_mant fully matched thanks to Roman

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-08-29 20:29:11 -04:00
Anghelo Carvajal
e9f98f44c4
Handle multiprocessing exceptions in extract_assets.py (#925) 
* Handle multiprocessing exceptions in extract_assets.py

* Update extract_assets.py

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

* Add TypeError

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-08-29 20:19:52 -04:00
zelda2774
a75c70358c
Match func_800EEA50 + some surrounding doc (#916) 
* Match func_800EEA50

* Document some audio debug stuff

* more doc

* more doc

* formatting

* Fix enums, and some more bits of doc

* review

* LIM -> MAX

* missed review suggestion...

* more review

* ganon comments

* more review

* 🐍☠️

* more review

* Update functions.h

* quotes

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-08-29 20:08:41 -04:00
zelda2774
28e72bb486
Add decompme.compilers to permuter_settings.toml (#931) 
Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-08-29 19:42:14 -04:00
louist103
e53081df9a
actually add the comment (#885) 2021-08-22 18:47:38 +02:00
Anghelo Carvajal
75b2804f72
Move to the spec the cutscenes of Bg_Treemough and En_Zl1 (#915) 
* link cutscenes of Bg_Treemough and En_Zl1

* move unused data

Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-08-22 12:18:49 -04:00
Dragorn421
5e071a014d
Symbol cleanup (#897) 
* symbol cleanup

* run formatter

* run formatter

* remove duplicate z_demo_ik symbols

* run formatter
 2021-08-22 11:52:02 -04:00
Dragorn421
743f42f651
Document EnGoroiwa and BgJyaGoroiwa (#860) 
* Document EnGoroiwa and BgJyaGoroiwa

* Run format.sh

* Add renamed functions to actorfixer script

* no more calling out "the devs" for bad code

* `EnGoroiwa#flags` -> `stateFlags`

* `Matrix_MtxFToRotS` -> `Matrix_MtxFToYXZRotS` (and not ZXY oops), `func_800D2264` -> `Matrix_MtxFToZYXRotS`
 2021-08-22 11:25:17 -04:00
Synray
18c84b0be7
Match audio_seqplayer.c (#914) 
* Match Audio_SequencePlayerProcessSequence

Round two: fight!

* Match Audio_SequenceChannelProcessScript

* Remove asm

* Whitespace

* Review changes

* Update src/code/audio_seqplayer.c

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

* Whoops

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-08-21 19:37:41 -04:00
louist103
556cdad7eb
Big cleanup (#775) 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-08-22 01:12:57 +02:00
louist103
17c79a8f60
Remove and change some fake matches (#910) 
* remove fake match

* remove another fake match

* move globalCtx temp

* remove more fake matches

* remove commented lines

* this is it I promise
 2021-08-20 00:14:23 +02:00
louist103
0042acb539
cleanup warnings (#907) 
* cleanup warnings

* remove camera header from some places

* Remove extra new line
 2021-08-19 18:10:51 -04:00
EllipticEllipsis
8e19b91e80
Fix ovl_Boss_Ganon2 xml (#911) 2021-08-18 20:27:13 -04:00
louist103
bb39f7a9f6
remove fake match (#909) 2021-08-17 22:44:36 -04:00
Revo
d1772c3340
Fix non equivalence in Audio_SequenceChannelProcessScript. (#904) 2021-08-16 13:03:59 -04:00
Zelllll
7551dc2b71
Global Context And General Cleanup (#863) 
* door context

* renames

* done

* fix unintended change

* all nb gone

* more nb gone

* merge fishing

* fix size commentX

* door changes suggested by dragorn

* fix accidental semicolon

* another

* change all texture pointers to void*

* error fix and format

* Update src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* fix ostime

* correct mistake in SkyboxContext

* probably fix nonmatching

* Update include/z64.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* roman's suggestions, fix incorrect type definition in z64scene.h

* typo in struct

* make typedef use u8 array

* forgot one

* pull in master and format.sh

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-08-15 19:15:58 -04:00
Tharo
1890e751b9
Update asm-processor and diff.py (#903) 
* Update asm-processor

* Update diff.py
 2021-08-15 18:52:10 -04:00
Revo
463283a1ac
Fix SKYBOX_HOUSE_LINK enum value. (#902) 2021-08-14 11:32:34 +02:00
EllipticEllipsis
7fee09776b
Clarify nature of the project in the readme (#894) 
* Clarify nature of the project

* Dragorn's review

* Remove ignored formatting

* Mollified the wording somewhat

* Move sentence down

* Discord suggestions

* rebreak text in diff
 2021-08-13 13:10:01 -04:00
zelda2774
a0d2cceeca
Match some audio functions (#896) 
* cleanups

* Improve Audio_SequencePlayerProcessSequence

* cleanup

* labeling

* progress on func_800E5000

* func_800F6268

* func_800ECDF8

* Improve func_800F2464

* reorder variables

* labelling

* non-equivalent func_800EEA50

* minor doc

* func_800E6590

* minor doc

* Reformat abi.h

* Very slight improvements

* func_800DC384

* func_800E1618

* formatting

Co-authored-by: zelda2774 <zelda2774@invalid>
 2021-08-12 15:37:37 -04:00
Dragorn421
1b1487a504
Decompile object_gol (gohma actor) (#871) 
* Decompile object_gol

* Update src/overlays/actors/ovl_En_Goma/z_en_goma.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-08-11 19:29:57 +02:00
Dragorn421
d95639b993
Fully document object_goma (#872) 2021-08-11 19:17:00 +02:00
Stardust Sauce
70ec8c42fc
ObJ_Lift OK (#883) 
* ObJ_Lift decompiled and matching.

* Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Implemented suggestions

* Decorrected mask in z_obj_lift per suggestion

* Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c

* review

* unused asm

* review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
 2021-08-11 10:35:17 -04:00
Roman971
d17f9f14c5
Match the remaining function in En_Holl (#895) 2021-08-11 10:25:16 -04:00
Roman971
36d086877c
Fix progress.py to not include files in asm/ (#893) 2021-08-08 20:08:59 -04:00