1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Commit graph

1172 commits

Author SHA1 Message Date
Roman971
a9604e267f
Match Skybox_Setup and 2 functions in z_kankyo.c (#980) 2021-09-20 19:33:44 -04:00
Synray
1fcb163451
Match remaining z_room functions (#978)
* Match func_80095D04

* Match func_80096FE8

Most of the work was done by the co-authors, putting in this PR for convenience.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Format

* Remove asm

* Caps

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

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-09-20 15:37:47 -04:00
engineer124
9318ba1804
Match func_800E5000 (#977) 2021-09-20 15:24:24 -04:00
Synray
1c0503cd3b
Match func_80B42F74 in Yabusame Mark (#976) 2021-09-20 14:38:25 -04:00
engineer124
bf53f2c95e
Match EnTorch2_Update (#975)
* score = 965

* score = 305

* Clean-Up

* More clean-up

* Down to `sp30` <--> `sp34` swap, and extra `.data + 0x18` at the top?

* clean-up

* EnTorch2 OK, but does not reloc properly

* final cleanup

* Remove comments about non-matching

* Fix reloc non-matching

* Delete reloc

* Better solution

* PR Suggestions
2021-09-20 14:15:21 -04:00
Synray
ac8dd91626
Match remaining function in Bg_Jya_Cobra (#969)
* Match remaining function in Bg_Jya_Cobra

* Format
2021-09-20 14:12:05 -04:00
Synray
4ecd175bd1
Match KaleidoScope_DrawQuestStatus (#974)
* Match KaleidoScope_DrawQuestStatus

* Add back the parens
2021-09-20 13:49:20 -04:00
petrie911
e51f50f0ff
Decompile z_kankyo (#956)
* working

* start color switch

* progress

* progress

* progress on bgm func

* progress

* game over matched (except the rodata meme)

* start update

* progress

* lightning docs done

* progress

* progress

* progress

* progress

* progress

* can compile at least

* suns state, progress on kankyo_update

* some new names

* progress

* progress

* progress

* new functions

* cleanup

* more matches

* another match

* now functional

* format

* better match

* hugely improved update

* cleanup/review

* remove old changes

* review2

* review3

* missed one

* review4

* change asm filenames

* update doorwarp1

* review5

* Kankyo_ -> Environment_

* format

* merge master and format functions.h

Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-09-20 12:51:35 -04:00
Zelllll
50095d427c
Match z_actor (#973)
* matched first function, currently unclear why the other match doesn't appear to work anymore

* matched other function, issue was bss

* remove asm
2021-09-18 22:45:41 -04:00
louist103
8ac359fda5
Only use the ASM processor where it is needed (#919)
* remove fake match

* Remove asm processor from files that don't need it

* Update Makefile
2021-09-18 13:13:53 -04:00
Anghelo Carvajal
7f19430dc2
Make a XML for ganon_mant (#961)
* Make a XML for ganon_mant

* cleanup

* Apply suggestions from code review

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

* sForceAlignment

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-09-18 12:54:45 -04:00
louist103
b3814ddc1b
Fix ganon organ reloc data and extract its assets (#965)
* fix ganon organ reloc data and extract its assets

* Named all textures

* RangeEnd

* static

* Remove D_ comments from XML

* Rename pad to sForceAlignment

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2021-09-18 11:40:40 -04:00
Anghelo Carvajal
672cc6e90d
Add -I. (#971)
* Add `-I.`

* Remove unused rule
2021-09-18 14:07:51 +02:00
louist103
e3f1ccd902
Fix all headers to comply with C standard (#957)
* Fix all headers to comply with C standard

* fix a file in libultra

* Update include/stdbool.h

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

* Update stdbool.h

* Update z64animation.h

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-09-15 19:24:19 -04:00
EllipticEllipsis
fbc4071cc8
Match last function in EnTp (#968)
* Data imported, 8 easy functions matched

* Init only remaining nonmatching, data in

* some renaming & fiddling with Init, still nonmatching

* fix colours

* Init still not matching

* Decompile object_tp

* renames

* Rename func_80B20DE0

* Horrible new idea

* Known equivalent, docs next

* Another attempt

* Finished naming in object_tp

* Named functions, more enums

* DrawBridge -> Drawbridge

* skulltulla -> Skulltula

* Name almost all struct variables

* Named most of the temps

* delete asm

* spec

* Missed data file, whoops

* Review

* More review changes

* Match EnTp_Init

* spec

* Delete asm
2021-09-15 19:03:47 -04:00
petrie911
b9ad6aac52
Make sSetupDLs a Gfx[][6] (#951)
* setup[][6]

* formatting

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-09-14 09:43:16 -04:00
petrie911
30939ccd28
code_800BB040 matched (#959)
* getting closer

* match!

* functions unnamed

* Update include/functions.h

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

* small changes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-09-13 15:29:11 -04:00
zelda2774
baceca73b8
Update diff.py (#964)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-09-13 13:20:07 -04:00
Tharo
eccfd2efbf
Decompile ovl_Door_Warp1 (#949)
* Initial progress on Door_Warp1

* Fix merge

* More work on Door_Warp1

* Decompile most of Door_Warp1

* 2 more functions OK

* All decompiled, 3 nonmatching

* Tiny improvements, fix several warnings

* Remove commented GLOBAL_ASM lines

* Fix

* Fix merge

* Two more matches

* Some docs

* More docs

* Use generated reloc under NON_MATCHING

* Fix accesses in ru1

* Add break and add limbs and dlists for the skeleton to the object xml

* Comment values for enums

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* boolean returns for flag checking functions

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Named more loop variables i and named DoorWarp1_FloatPlayer

* Last function matched thanks to Roman

* Some further suggestions

* Fix

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2021-09-12 11:10:10 -04:00
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