3145 Commits
Author SHA1 Message Date
56c517dc07 Obj_Toge (#815)
* Obj_Toge

* Wat

* One more thing

* PR

* PR

* a

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 03:45:09 +01:00
af0123de1e z_fcurve_data OK, match last function in z_fcurve_data_skelanime, document SkelCurve system (#776)
* Match SkelCurve_Update

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>

* Match and document z_fcurve_data

* Begin documenting SkelCurve

* More documentation

* Deformat header

* Pluralise knotCount

* Sort out jointTable

* Rename frameCount

* Format

* More documentation

* Cleanup on DemoEffect

* Remove space on typedef

* Format, couple of fixes in the header

* Review

* Oops

* Fix EnBox, DemoTreLgt, use macros in EnTorch

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
2022-06-19 03:38:10 +01:00
Derek HensleyandGitHub 5ae4ef87cd Sob1 Objects Documented (#814)
* Start zora

* Finish zora

* BombShopkeeper with some cleanup

* Goron and don gero mask

* Small thing

* format

* PR comments

* bombshopkeeper -> bomb_shopkeeper

* gEffShockwaveDL
2022-06-19 03:33:53 +01:00
Derek HensleyandGitHub 9bf84176d4 Load OK (#792)
* Progress

* cleanup

* Fix comment

* progress

* OK

* Review pt1

* Update comments

* update comments some more

* Renamings

* Add headers and some parens cleanup

* Remove zelda64

* PR review

* bss

* Explain each relocation type a bit in the header comment

* Relocate_Addr macro

* Split off into z64load.h

* Adjust comment slightly based on OOT review

* OverlayRelocationType -> MIPSRelocationType

* Last bit of cleanup from OoT

* format

* Split off functions
2022-06-19 03:28:55 +01:00
MaideandGitHub 98ba755751 En_Horse_Link_Child (#806)
* EnHorseLinkChild

* PR

* PR
2022-06-19 03:23:25 +01:00
MaideandGitHub dd8221c798 En_Time_Tag (#810)
* En_Time_Tag

* BSS

* PR

* PR
2022-06-19 03:19:33 +01:00
e3c0c5c3fa Obj_Tokei_Turret OK (#820)
* actor fully matched

* named collision parameters]

* fixed spec reloc.o

* Addressing Review Comments!

* Addressing Additional Review Comments

* fixing enum names

Co-authored-by: MrPolymorph <{ID}+{username}@users.noreply.github.com>
2022-06-19 03:08:42 +01:00
b3104f898b Effect_Ss_Extra (points that appear above targets in Swamp Archery Minigame) and object_yabusame_point (#822)
* EffectExtra: start

* EffectExtra: matched

* EffectExtra: docs

* EffectExtra: warnings

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update assets/xml/objects/object_yabusame_point.xml

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* EffectExtra: fixes

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

God damn it lenovo

* Extra delete

* EffectExtra: namefixer

* EffectExtra: updated brief description

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-06-19 03:00:48 +01:00
Derek HensleyandGitHub 271b7c7827 Gfxprint OK (#826)
* Match last two functions as well as some cleanup

* One more small cleanup

* Reviews

* format

* Move internal GFXP_FLAG defines to c file

* Format
2022-06-19 02:56:10 +01:00
Tom OvertonandGitHub 03ba917853 Dm_Stk (Skull Kid) documented, object_stk and object_stk3 fully documented, object_stk2 mostly documented (#827)
* Most of object_stk done

* Document the original name for every animation

* First pass names on every single animation

* Enum for animations

* Enum for limbs

* Very low hanging fruit in dm_stk

* Document a lot more in dm_stk

* Name most remaining struct vars

* Name a bunch of functions

* First pass names to all sound functions

* Name most functions

* Name all other object symbols used by dm_stk

* Name all remaining functions and struct vars

* Much better animation names and documentation

* Lots more function documentation

* Document some stuff

* Name the title cutscene thing

* Last little bit of cleanup

* Format

* Rename SFX functions

* Fix typo in header comment

* Respond to Elliptic's review

* Respond to Elliptic's clarification about Version1/2

* hitCount -> deflectCount

* Take into account some of the feedback that was given for DmZl4
2022-06-19 02:51:58 +01:00
Tom OvertonandGitHub d1b75e4c4b VisMono OK and documented (#829)
* VisMono OK and documented

* Add some more parentheses

* Fix functions.h

* Respond to hansldm's review
2022-06-19 02:46:41 +01:00
engineer124andGitHub b6362cacbe ClearTag cleanup (#830) 2022-06-19 02:37:31 +01:00
e729f10442 Yasi descriptive names (#831)
* Cleaned up yasi by giving symbols descriptive names

* renamed variables to palm tree

* Adding descriptive comment to root of xml asset file

Co-authored-by: MrPolymorph <{ID}+{username}@users.noreply.github.com>
2022-06-19 02:29:44 +01:00
mzxrulesandGitHub ec43a32c26 z_en_box.c, z_demo_tre_lgt.c OK, some object_box documentation (#703)
* All functions attempted, 2 NON_MATCHINGs

* z_en_box OK, more documentation

* format

* en_box cleanups, fix GI item table

* z_demo_tre_lgt OK

* format.sh

* pr suggestions 1

* object_box improvements

* Merge remote-tracking branch 'origin/master' into z_en_box

* Revert "Merge remote-tracking branch 'origin/master' into z_en_box"

This reverts commit 5aacdf26e49c91fadc6f50dc2b9e19935a8f3ec4.

* more suggested changes

* fix comment
2022-06-18 10:33:59 -04:00
petrie911 b55c107d72 linked assets 2022-06-16 09:32:57 -05:00
petrie911 16488d8419 more adjustments 2022-06-16 06:03:21 -05:00
petrie911 e6eb3fc4b2 merge catchup 2022-06-15 10:42:20 -05:00
mzxrules 58c39701d5 match first couple of funcs 2022-06-12 20:43:13 -04:00
engineer124 8df8271d6c More magic 2022-05-26 14:45:48 +10:00
engineer124 611fb1afd1 Change Magic_Reset 2022-05-26 14:30:12 +10:00
engineer124 1245328efe Merge branch 'master' into parameter 2022-05-26 13:49:19 +10:00
8049dec339 sys_matrix OK, documented, rename some other mathematics functions (#787)
* Import data and bss, add some name options

* Decomp rest of stack functions,
remove RSPMatrix,
split header

* sys_matrix OK (thanks Tharo)

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

* pragma weaks in sinf and cosf, change documentation
change mcros to use 0x8000

* Rename sinf and cosf

* Correct initialisation of sMtxFClear

* More minor cleanup

* Rename stack functions

* Matrix_InsertMatrix -> Matrix_Mult

* The big transpose rename

* Fix MirRay_DrawReflectedBeam

* Matrix_InsertTranslation -> Matrix_Translate

* Matrix_Insert.Rotation_s -> Matrix_Rotate$1S
+ RotateY -> RotateYS

* Matrix_Insert(.)Rotation_f -> Matrix_Rotate$1F

* Matrix_RotateStateAroundXAxis -> Matrix_RotateXFApply
Matrix_SetStateXRotation -> Matrix_RotateXFNew

* Matrix_MultiplyVector3fByState -> Matrix_MultVec3f

* Matrix_MultiplyVector3fXZByCurrentState -> Matrix_MultVec3fXZ

* Matrix_GetStateTranslation -> Matrix_MultZero

* Matrix_GetStateTranslationAndScaled(.) -> Matrix_MultVec$1

* Matrix_FromRSPMatrix -> Matrix_MtxToMtxF

* Matrix_MultiplyVector3fByMatrix -> Matrix_MultVec3fExt

* Matrix_TransposeXYZ -> Matrix_Transpose

* Matrix_ToRSPMatrix -> Matrix_MtxFToMtx

* Matrix_AppendToPolyOpaDisp -> Matrix_MtxFToNewMtx
and document the conversion functions

* Matrix_NormalizeXYZ -> Matrix_ReplaceRotation

* Matrix_InsertRotationAroundUnitVector_f -> Matrix_RotateAxisF and S

* Matrix_InsertRotation -> Matrix_RotateZYX

* Document the last functions

* Small cleanup

* Matrix_JointPosition -> Matrix_TranslateRotateZYX

* Matrix_SetStateRotationAndTranslation -> Matrix_SetTranslateRotateYXZ

* func_8018219C -> Matrix_MtxFToYXZRot

* func_801822C4 -> Matrix_MtxFToZYXRot

* Fix files

* Format

* Review 1

* Renames

* Fix warning in EnDragon

* Format

* Convert `mode` to an actual enum

* Add enums, typedefs, externs to sys_matrix header

* Review

* One more

* More review

* Fix function names

* Format

* Fix names

* Format

* Review

* engineer's review

* Fix build

* Format

* Fix again

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2022-05-25 23:24:39 -04:00
Derek HensleyandGitHub e1477702ca EffectSsKirakira OK (#801)
* OK

* cleanup

* KiraKira -> Kirakira
2022-05-25 22:23:27 -04:00
12b995093f EnNwc OK and three objects documented (object_niw and object_nwc and object_hs) and some Actor docs( EnNiw and EnAttackNiw and EnHg) (#715)
* EnNwc: OK and some Niw Docs

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* EnNwc: Overwrite->Override

* EnAttackNiw: fix merges

* AttackNiw and Niw: some docs

* formater pass

* EnNwc: fixed savecontext change

* Niw and Attackniw: more docs

* Apply suggestions from code review

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

* Nwc,Niw: requested doc changes

* Nwc: extracted and marked broken texture

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* EnNwc: more requested changes

* Nwc: more requested changes

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* EnHs: object_hs documented, some ovl_En_Hs docs

* EnHs: animation names

* EnHs: some text docs

* EnHs: fear anim changed to shivering now that we know it was used in OOT

* EnHs: more docs and format pass

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* EnHs: more docs and updates to var name changes

* Niw,Nwc,Hs: added description to object files

* Hs: changed from playerOffset to offset

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 22:19:38 -04:00
Derek HensleyandGitHub f1d1d83206 Makefile Changes (#727)
* Change makefile so rom doesn't need to match by default for compression, also change JenkinsFile to split off compression step from building

* Swap uncompressed and compressed in all target

* Forgot to change check warnings stage name

* Intentionally produce non_matching

* Fix

* Add assets target

* Jenkins assets

* Update update_current_warnings

* .make_options config file

* Change comment at top

* Add toggle options for CC_CHECK and OBJDUMP

* Small cleanup

* Whitespace

* More

* bin dumping

* Whitespace

* Review

* Fix comment
2022-05-25 22:15:28 -04:00