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 Hensley and GitHub
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 Hensley and GitHub
a6e90d144c
SubS models ( #807 )
...
* Bring model code over
* SubS_UpdateLimb
* SubS_TurnToPoint
* SubS_TurnToPointMultiTarget
* Adjust comment
* Another comment
* Review
* options as structs
* bss
* adj -> step, SubS_TurnToPointMultiTarget -> SubS_TurnToPointStep, various comment cleanups
* Fix SubS_TurnToPointStep header comment
2022-05-25 21:44:09 -04:00
engineer124 and GitHub
c2c7240634
Improve Various Matchings and Cleanup ( #809 )
...
* Improve various matchings and cleanup
* Fix warnings
* Missed 2
* Few hex to dec
* PR Suggestions
* More PR Suggestions
* Document time calculation
* Improved use of macros
* DAY_LENGTH macro
* More cleanup of functions
Co-authored-by: hensldm <https://github.com/hensldm >
* Missing a space
* PR Suggestions
* Use DAY_LENGTH more
2022-05-25 21:36:49 -04:00
e227684d9b
En_Boom ( #813 )
...
* En_Boom
* Match (thanks Anon)
* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
2022-05-25 21:04:10 -04:00
Rozelette and GitHub
e67fb5cf16
code_801323D0 (z_schedule) ( #509 )
...
* OK
* Initial documentation pass
* Pass 2. Add script by Tharo
* Renamed source file
* Documentation cleanup
* Update to latest master
* Feedback
* Bad merge
* Permissions
* Clang format
* Feedback
* format
* Use calculation instead of constant
* Rename as per suggestions
* Fix bss ordering and minor merge conflicts (from Maide)
* Update to current codebase and address feedback
* Fixup names to match new enums
* Format
* Fix duplicate include
* BSS shenanigans
2022-05-21 12:08:19 -04:00
EllipticEllipsis and GitHub
31f0e19b57
Enable full IDO warnings ( #781 )
...
* Fix a lot of IDO warnings (and some Clang ones)
* Format
* Put FULL_DISASM=0 back
* Fix bss
2022-04-22 05:48:41 +01:00
e50c346ab8
SubS Shadows, Cutscenes, Exchange, and Planes ( #773 )
...
* Bring code over
* Rename
* clean up variables.h
* Bring over some more code as well as cleanup
* remove newline in functions.h
* format
* Add plane functions
* Remove from actorfixer
* Add some more docs to plane functions
* Use temp for better format
* change func_8013E8F8 to return an s32
* rename origin back to pos
* format
* Add docs to SubS_ComputePlane
* format
* gfxContextPtr -> globalCtx
* bss
* Better docs of SubS_ComputePlane
* Normal -> unitVec
* Review pt. 1
* Update plane comment
* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther
* Add subs texture defines
* Update include/z64math.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
2022-04-22 05:11:54 +01:00
Derek Hensley and GitHub
bfe22610f7
EffectSsStone1 Ok ( #730 )
...
* EffectSsStone1 OK
* gameplay object stuff
* unk_C -> reg0
* Fix
* Reverse order of stone textures
* undef syms
2022-04-17 19:35:13 +01:00
Derek Hensley and GitHub
f4bb821b56
EffectSsSbn OK ( #751 )
...
* Ok
* Cleanup and document
* File header description
* rename scroll related regs
* undef syms
* Cleanup for PR
* Move comment
* Add todo
2022-04-17 19:07:25 +01:00
Maide and GitHub
bbc6dd77ea
Obj_Nozoki ( #704 )
...
* Obj_Nozoki
* GID
* PR
* Merge
* PR
2022-04-17 11:08:16 -04:00
afd3ae243d
En_Test6 ( #627 )
...
* En_Test6
* ArrCount
* Always forget params
* PR
* Move defs
* PR
* Fix
* PR
* Merge
* Merge
* PR
* Fix
* PR
* PR
* Fix bss
* Match (thanks Anon)
* bss
* PR
* Merge
* bss
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com >
2022-04-09 05:38:54 +01:00
06412c070f
Cleanup 3 ( #778 )
...
* lights
* D_801D88A0 -> gScarecrowSpawnSongPtr
* Misc fixes
* CHECK_FLAG_ALL
* Trailing commas in enums
* matches
* Remove todo from lights bss
* Update src/overlays/actors/ovl_En_In/z_en_in.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
* thisx -> this2
* fix
* Todos
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
2022-04-07 20:39:11 +01:00
Tom Overton and GitHub
50c5ab0fc7
En_Dragon (Deep Python) OK and documented. object_utubo documented ( #771 )
...
* EnDragon_Init OK
* func_80B5EDF0 OK
* func_80B5EAA0 OK
* EnDragon_Destroy OK
* EnDragon_Update OK
* func_80B60138 OK
* func_80B5EE3C OK
* func_80B5EF88 OK
* func_80B5F418 OK
* func_80B5ED90 OK
* func_80B5EB40 OK (commented out because data is not imported yet)
* Import data into C
* Uncomment func_80B5EB40
* func_80B5EFD0 OK
* func_80B5F3A4 OK
* func_80B5F888 OK
* func_80B5FCC0 OK
* Draw functions OK
* func_80B5FD68 OK
* func_80B5F508 OK
* func_80B5F8D8 OK
* Better match on func_80B5FD68
* Use generated reloc
* Remove undefined_syms for this actor
* Some minor cleanup
* Make the data like Anghelo said
* Document object_utubo
* Name a bunch of stuff
* Name some more stuff
* Some documentation around death
* Documentation for actions
* Name a bunch of junk
* Use regs instead of directly accessing gGameInfo
* Name the player position vars
* Update weekEventReg references
* Name and list out states
* Name timer
* Document extend stuff
* Finish documentation
* Respond to Anghelo's review
* Respond to hensldm's review
* The thing Anghelo suggested *actually* matches
2022-04-06 21:03:27 -04:00
EllipticEllipsis and GitHub
15dfaf0862
ABI FPR names ( #767 )
...
* Add o32 to disassembler and update macro.inc
* Add a variable for asm processor to makefile
and improve objdump flags
* Update diff settings
* git subrepo pull --force tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "1236288d1"
upstream:
origin: "https://github.com/simonlindholm/asm-differ "
branch: "main"
commit: "1236288d1"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Remove * import and implement option
* Fix some stuff in the makefile
* Update asm-processor
* Review
* Fix old var name
2022-03-31 18:22:19 +01:00
Maide and GitHub
7280d10404
En_Horse (2 non-matching) ( #413 )
...
* En_Horse
* a
* Warnings
* Warnigns 2
* PR
* Formats
* Fix
* PR
* Merge
* Merge
* Merge
2022-03-29 22:15:26 +01:00
72bae2b6ba
z_kaleido_setup (#768 )
...
* KaleidoSetup_Init
* func_800F4C0C
* func_800F4A10 NON_EQUIVALENT
* fixes
* func_800F4A10
* import data
* Rename Play_InCsMode
* Name KaleidoSetup_Update
* minor cleanup
* Update src/code/z_play.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
* unname D_801BDB00
* format
* a
* actorfixer
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
2022-03-29 22:04:41 +01:00
486e7cbe83
SubS General Pathing Helpers ( #760 )
...
* Brought code over and cleanup
* cleanup functions.h and format
* add comment
* Whitespace
* Format
* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
* Format
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
2022-03-29 21:37:58 +01:00
Maide and GitHub
f5ba6986f9
Obj_Pzlblock ( #755 )
...
* Obj_Pzlblock
* PR
2022-03-29 21:05:33 +01:00
ec9909c65c
Boot_800862E0 OK ( #769 )
...
* boot_800862E0 OK
* Ran format.sh
* attempt at fixing bss reordering
* boot_800862E0 OK (for real this time)
* Run formatter
* Changes u32 pointers to uintptr_t and sizes to size_t
* Run formatter
* Fix bss reordering
* Delete baserom.mm.us.rev1.z64:Zone.Identifier
* Cleanup and some notes
* Try my best to document
* remove comments
* Remove D_80097508 from variables.h
Co-authored-by: kyleburnette <kyle@kyleburnette.com >
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
2022-03-29 20:42:44 +01:00
Maide and GitHub
72265fac92
Obj_Entotu ( #745 )
...
* Obj_Entotu
* Time macro
* PR
* Merge
2022-03-29 18:56:20 +01:00
cbffe83c9b
EnWarpTag OK (Warping pedestals in Goron Trial) ( #747 )
...
* EnWarpTag: OK
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
* WarpTag: move macros
* WarpTag: format
* WarpTag: fix save entrance index
Co-authored-by: Isghj8 <isghj8@gmail.com >
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
2022-03-29 18:21:36 +01:00
78acaef73d
ovl_Boss_03: Gyorg OK (#736 )
...
* Boss03_Init NON_EQUIVALENT
* rand functions
* Boss03_Draw
* match the limb draws
* Match Boss03_Init by Synray and Engineer
* A bit of cleanup
* a bunch of functions
* another bunch of functions
* func_809E299C and GyorgEffect
* import data
* A bit of cleanup
* effects related functions
* func_809E2DA0
* func_809E34B8 NON_EQUIVALENT
* func_809E3968 NON_EQUIVALENT
* func_809E3D98
* func_809E421C NON_EQUIVALENT
* func_809E475C
* func_809E497C
* func_809E4C90
* func_809E6640 NON_MATCHING
* func_809E6A38
* Match func_809E6640 by Tharo
* func_809E7D00
* func_809E8810
* func_809E4E80 NON_EQUIVALENT
* func_809E5B64
* func_809E6CB4
* Boss03_Update NON_EQUIVALENT
* func_809E81E4 attempt
* Boss03_Update improvement thanks to Petrie
* func_809E81E4 NON_MATCHING
* func_809E34B8 is at least equivalent
* cleanups
* format
* import bss
* more cleanup and minor renames
* Match func_809E81E4
* cleanup effect functions
* a few more renames
* func_809E4E80 matched by Maide
* documentation pass
* name workTimer
* macros
* More renames
* Improve func_809E34B8 a bit and match Boss03_ChewPlayer
* defines placeholders for work timer, enum for effects and other minor renames
* actorfixer
* some cleanups
* effects named
* Some more renames and cleanups
* more cleanups
* Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw
* Rename more actionfuncs
* cleanup undefined syms
* collision stuff and run formatter
* more cleanups
* more cleanups i forgot to commit
* and yet more clenaup
* Add notes
* Remove debugging stuff
* format
* Match the last 3 functions by Anon58
* bit of cleaning
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* PR
* format
* Remove some if (1) from Boss03_IntroCutscene
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.h
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* PR
* address pr
* prevent_bss_reordering
* Anon review
* seaweed stuff thanks to elliptic
* format
* whoops
* huh
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* address PR
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Address PR
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* Sectioning
* whoops
* a
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* a
* kinda
* ,
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* remove redundant comment
* actorfixer
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
2022-03-29 17:41:44 +01:00
Maide and GitHub
348e87083b
Bg_Breakwall ( #733 )
...
* Bg_Breakwall
* PR and match (thanks petrie)
* PR
* Merge
2022-03-29 17:11:08 +01:00
Derek HensleyandGitHub
engineer124andGitHub
RozeletteandGitHub
Tom OvertonandGitHub
