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>

tools/disasm/functions.txt

@@ -251,7 +251,7 @@
     0x800880B0:("osGetIntMask",),
     0x80088110:("osVoiceSetWord",),
     0x800882A0:("guScale",),
-    0x80088350:("__sinf",),
+    0x80088350:("sinf",),
     0x80088510:("sins",),
     0x80088580:("_VirtualToPhysicalTask",),
     0x8008868C:("osSpTaskLoad",),
@@ -410,7 +410,7 @@
     0x80091AF0:("__osViInit",),
     0x80091C10:("__osViSwapContext",),
     0x80091F10:("osPiGetCmdQueue",),
-    0x80091F40:("__cosf",),
+    0x80091F40:("cosf",),
     0x800920B0:("osEPiReadIo",),
     0x80092100:("osViSetSpecialFeatures",),
     0x80092260:("coss",),
@@ -3354,45 +3354,45 @@
     0x801800CC:("Math_Atan2F",),
     0x80180100:("Math_FAtan2F",),
     0x8018012C:("Math_Acot2F",),
-    0x80180160:("Matrix_StateAlloc",),
-    0x8018019C:("Matrix_StatePush",),
-    0x801801CC:("Matrix_StatePop",),
-    0x801801E8:("Matrix_CopyCurrentState",),
-    0x8018020C:("Matrix_SetCurrentState",),
-    0x80180234:("Matrix_GetCurrentState",),
-    0x80180244:("Matrix_InsertMatrix",),
-    0x8018029C:("Matrix_InsertTranslation",),
+    0x80180160:("Matrix_Init",),
+    0x8018019C:("Matrix_Push",),
+    0x801801CC:("Matrix_Pop",),
+    0x801801E8:("Matrix_Get",),
+    0x8018020C:("Matrix_Put",),
+    0x80180234:("Matrix_GetCurrent",),
+    0x80180244:("Matrix_Mult",),
+    0x8018029C:("Matrix_Translate",),
     0x8018039C:("Matrix_Scale",),
-    0x80180478:("Matrix_InsertXRotation_s",),
-    0x80180610:("Matrix_InsertXRotation_f",),
-    0x801807B8:("Matrix_RotateStateAroundXAxis",),
-    0x80180900:("Matrix_SetStateXRotation",),
-    0x801809AC:("Matrix_RotateY",),
-    0x80180B48:("Matrix_InsertYRotation_f",),
-    0x80180CF8:("Matrix_InsertZRotation_s",),
-    0x80180E90:("Matrix_InsertZRotation_f",),
-    0x8018103C:("Matrix_InsertRotation",),
-    0x801812FC:("Matrix_JointPosition",),
-    0x80181650:("Matrix_SetStateRotationAndTranslation",),
-    0x801817FC:("Matrix_ToRSPMatrix",),
+    0x80180478:("Matrix_RotateXS",),
+    0x80180610:("Matrix_RotateXF",),
+    0x801807B8:("Matrix_RotateXFApply",),
+    0x80180900:("Matrix_RotateXFNew",),
+    0x801809AC:("Matrix_RotateYS",),
+    0x80180B48:("Matrix_RotateYF",),
+    0x80180CF8:("Matrix_RotateZS",),
+    0x80180E90:("Matrix_RotateZF",),
+    0x8018103C:("Matrix_RotateZYX",),
+    0x801812FC:("Matrix_TranslateRotateZYX",),
+    0x80181650:("Matrix_SetTranslateRotateYXZ",),
+    0x801817FC:("Matrix_MtxFToMtx",),
     0x80181A18:("Matrix_ToMtx",),
     0x80181A40:("Matrix_NewMtx",),
-    0x80181A6C:("Matrix_AppendToPolyOpaDisp",),
-    0x80181A98:("Matrix_MultiplyVector3fByState",),
-    0x80181B50:("Matrix_GetStateTranslation",),
-    0x80181B78:("Matrix_GetStateTranslationAndScaledX",),
-    0x80181BC4:("Matrix_GetStateTranslationAndScaledY",),
-    0x80181C10:("Matrix_GetStateTranslationAndScaledZ",),
-    0x80181C5C:("Matrix_MultiplyVector3fXZByCurrentState",),
+    0x80181A6C:("Matrix_MtxFToNewMtx",),
+    0x80181A98:("Matrix_MultVec3f",),
+    0x80181B50:("Matrix_MultZero",),
+    0x80181B78:("Matrix_MultVecX",),
+    0x80181BC4:("Matrix_MultVecY",),
+    0x80181C10:("Matrix_MultVecZ",),
+    0x80181C5C:("Matrix_MultVec3fXZ",),
     0x80181CDC:("Matrix_MtxFCopy",),
-    0x80181D64:("Matrix_FromRSPMatrix",),
-    0x80181FB8:("Matrix_MultiplyVector3fByMatrix",),
-    0x80182068:("Matrix_TransposeXYZ",),
-    0x801820A0:("Matrix_NormalizeXYZ",),
-    0x8018219C:("func_8018219C",),
-    0x801822C4:("func_801822C4",),
-    0x801823EC:("Matrix_InsertRotationAroundUnitVector_f",),
-    0x8018284C:("Matrix_InsertRotationAroundUnitVector_s",),
+    0x80181D64:("Matrix_MtxToMtxF",),
+    0x80181FB8:("Matrix_MultVec3fExt",),
+    0x80182068:("Matrix_Transpose",),
+    0x801820A0:("Matrix_ReplaceRotation",),
+    0x8018219C:("Matrix_MtxFToYXZRot",),
+    0x801822C4:("Matrix_MtxFToZYXRot",),
+    0x801823EC:("Matrix_RotateAxisF",),
+    0x8018284C:("Matrix_RotateAxisS",),
     0x80182C90:("SysUcode_GetUCodeBoot",),
     0x80182CA0:("SysUcode_GetUCodeBootSize",),
     0x80182CBC:("SysUcode_GetUCode",),

tools/namefixer.py

@@ -22,42 +22,80 @@ wordReplace = {
     "Actor_GetSwitchFlag": "Flags_GetSwitch",
     "atan_flip": "Math_Acot2F",
     "atans": "Math_Atan2S",
-    "SysMatrix_StateAlloc": "Matrix_StateAlloc",
-    "SysMatrix_StatePush": "Matrix_StatePush",
-    "SysMatrix_CopyCurrentState": "Matrix_CopyCurrentState",
-    "SysMatrix_SetCurrentState": "Matrix_SetCurrentState",
-    "SysMatrix_InsertTranslation": "Matrix_InsertTranslation",
-    "SysMatrix_InsertMatrix": "Matrix_InsertMatrix",
-    "SysMatrix_Scale": "Matrix_Scale",
-    "SysMatrix_InsertXRotation_s": "Matrix_InsertXRotation_s",
-    "SysMatrix_InsertXRotation_f": "Matrix_InsertXRotation_f",
-    "SysMatrix_RotateStateAroundXAxis": "Matrix_RotateStateAroundXAxis",
-    "SysMatrix_SetStateXRotation": "Matrix_SetStateXRotation",
-    "SysMatrix_RotateY": "Matrix_RotateY",
-    "SysMatrix_InsertYRotation_f": "Matrix_InsertYRotation_f",
-    "SysMatrix_InsertZRotation_s": "Matrix_InsertZRotation_s",
-    "SysMatrix_InsertZRotation_f": "Matrix_InsertZRotation_f",
-    "SysMatrix_InsertRotation": "Matrix_InsertRotation",
-    "SysMatrix_JointPosition": "Matrix_JointPosition",
-    "SysMatrix_SetStateRotationAndTranslation": "Matrix_SetStateRotationAndTranslation",
-    "SysMatrix_ToRSPMatrix": "Matrix_ToRSPMatrix",
-    "SysMatrix_ToMtx": "Matrix_ToMtx",
-    "SysMatrix_NewMtx": "Matrix_NewMtx",
-    "SysMatrix_AppendToPolyOpaDisp": "Matrix_AppendToPolyOpaDisp",
-    "SysMatrix_MultiplyVector3fByState": "Matrix_MultiplyVector3fByState",
-    "SysMatrix_GetStateTranslation": "Matrix_GetStateTranslation",
-    "SysMatrix_GetStateTranslationAndScaledX": "Matrix_GetStateTranslationAndScaledX",
-    "SysMatrix_GetStateTranslationAndScaledY": "Matrix_GetStateTranslationAndScaledY",
-    "SysMatrix_GetStateTranslationAndScaledZ": "Matrix_GetStateTranslationAndScaledZ",
-    "SysMatrix_MultiplyVector3fXZByCurrentState": "Matrix_MultiplyVector3fXZByCurrentState",
-    "SysMatrix_MtxFCopy": "Matrix_MtxFCopy",
-    "SysMatrix_FromRSPMatrix": "Matrix_FromRSPMatrix",
-    "SysMatrix_MultiplyVector3fByMatrix": "Matrix_MultiplyVector3fByMatrix",
-    "SysMatrix_TransposeXYZ": "Matrix_TransposeXYZ",
-    "SysMatrix_NormalizeXYZ": "Matrix_NormalizeXYZ",
-    "SysMatrix_InsertRotationAroundUnitVector_f": "Matrix_InsertRotationAroundUnitVector_f",
-    "SysMatrix_InsertRotationAroundUnitVector_s": "Matrix_InsertRotationAroundUnitVector_s",
-    "SysMatrix_GetStateAsRSPMatrix": "Matrix_GetStateAsRSPMatrix",
+    
+    # "SysMatrix_StateAlloc":                         "Matrix_StateAlloc",
+    # "SysMatrix_StatePush":                          "Matrix_StatePush",
+    # "SysMatrix_StatePop":                           "Matrix_StatePop",
+    # "SysMatrix_GetCurrentState":                    "Matrix_GetCurrentState",
+    # "SysMatrix_CopyCurrentState":                   "Matrix_CopyCurrentState",
+    # "SysMatrix_SetCurrentState":                    "Matrix_SetCurrentState",
+    # "SysMatrix_InsertTranslation":                  "Matrix_InsertTranslation",
+    # "SysMatrix_InsertMatrix":                       "Matrix_InsertMatrix",
+    # "SysMatrix_Scale":                              "Matrix_Scale",
+    # "SysMatrix_InsertXRotation_s":                  "Matrix_InsertXRotation_s",
+    # "SysMatrix_InsertXRotation_f":                  "Matrix_InsertXRotation_f",
+    # "SysMatrix_RotateStateAroundXAxis":             "Matrix_RotateStateAroundXAxis",
+    # "SysMatrix_SetStateXRotation":                  "Matrix_SetStateXRotation",
+    # "SysMatrix_RotateY":                            "Matrix_RotateY",
+    # "SysMatrix_InsertYRotation_f":                  "Matrix_InsertYRotation_f",
+    # "SysMatrix_InsertZRotation_s":                  "Matrix_InsertZRotation_s",
+    # "SysMatrix_InsertZRotation_f":                  "Matrix_InsertZRotation_f",
+    # "SysMatrix_InsertRotation":                     "Matrix_InsertRotation",
+    # "SysMatrix_JointPosition":                      "Matrix_JointPosition",
+    # "SysMatrix_SetStateRotationAndTranslation":     "Matrix_SetStateRotationAndTranslation",
+    # "SysMatrix_ToRSPMatrix":                        "Matrix_ToRSPMatrix",
+    # "SysMatrix_ToMtx":                              "Matrix_ToMtx",
+    # "SysMatrix_NewMtx":                             "Matrix_NewMtx",
+    # "SysMatrix_AppendToPolyOpaDisp":                "Matrix_AppendToPolyOpaDisp",
+    # "SysMatrix_MultiplyVector3fByState":            "Matrix_MultiplyVector3fByState",
+    # "SysMatrix_GetStateTranslation":                "Matrix_GetStateTranslation",
+    # "SysMatrix_GetStateTranslationAndScaledX":      "Matrix_GetStateTranslationAndScaledX",
+    # "SysMatrix_GetStateTranslationAndScaledY":      "Matrix_GetStateTranslationAndScaledY",
+    # "SysMatrix_GetStateTranslationAndScaledZ":      "Matrix_GetStateTranslationAndScaledZ",
+    # "SysMatrix_MultiplyVector3fXZByCurrentState":   "Matrix_MultiplyVector3fXZByCurrentState",
+    # "SysMatrix_MtxFCopy":                           "Matrix_MtxFCopy",
+    # "SysMatrix_FromRSPMatrix":                      "Matrix_FromRSPMatrix",
+    # "SysMatrix_MultiplyVector3fByMatrix":           "Matrix_MultiplyVector3fByMatrix",
+    # "SysMatrix_TransposeXYZ":                       "Matrix_TransposeXYZ",
+    # "SysMatrix_NormalizeXYZ":                       "Matrix_NormalizeXYZ",
+    # "SysMatrix_InsertRotationAroundUnitVector_f":   "Matrix_InsertRotationAroundUnitVector_f",
+    # "SysMatrix_InsertRotationAroundUnitVector_s":   "Matrix_InsertRotationAroundUnitVector_s",
+    # "SysMatrix_GetStateAsRSPMatrix":                "Matrix_GetStateAsRSPMatrix",
+
+    "Matrix_StateAlloc":                       "Matrix_Init",
+    "Matrix_StatePush":                        "Matrix_Push",
+    "Matrix_StatePop":                         "Matrix_Pop",
+    "Matrix_CopyCurrentState":                 "Matrix_Get",
+    "Matrix_SetCurrentState":                  "Matrix_Put",
+    "Matrix_GetCurrentState":                  "Matrix_GetCurrent",
+    "Matrix_InsertMatrix":                     "Matrix_Mult",
+    "Matrix_InsertTranslation":                "Matrix_Translate",
+    "Matrix_InsertXRotation_s":                "Matrix_RotateXS",
+    "Matrix_InsertXRotation_f":                "Matrix_RotateXF",
+    "Matrix_RotateStateAroundXAxis":           "Matrix_RotateXFApply",
+    "Matrix_SetStateXRotation":                "Matrix_RotateXFNew",
+    # "Matrix_RotateY":                          "Matrix_RotateYS",
+    "Matrix_InsertYRotation_f":                "Matrix_RotateYF",
+    "Matrix_InsertZRotation_s":                "Matrix_RotateZS",
+    "Matrix_InsertZRotation_f":                "Matrix_RotateZF",
+    "Matrix_InsertRotation":                   "Matrix_RotateZYX",
+    "Matrix_JointPosition":                    "Matrix_TranslateRotateZYX",
+    "Matrix_SetStateRotationAndTranslation":   "Matrix_SetTranslateRotateYXZ",
+    "Matrix_ToRSPMatrix":                      "Matrix_MtxFToMtx",
+    "Matrix_MultiplyVector3fByState":          "Matrix_MultVec3f",
+    "Matrix_GetStateTranslation":              "Matrix_MultZero",
+    "Matrix_GetStateTranslationAndScaledX":    "Matrix_MultVecX",
+    "Matrix_GetStateTranslationAndScaledY":    "Matrix_MultVecY",
+    "Matrix_GetStateTranslationAndScaledZ":    "Matrix_MultVecZ",
+    "Matrix_MultiplyVector3fXZByCurrentState": "Matrix_MultVec3fXZ",
+    "Matrix_FromRSPMatrix":                    "Matrix_MtxToMtxF",
+    "Matrix_TransposeXYZ":                     "Matrix_Transpose",
+    "Matrix_NormalizeXYZ":                     "Matrix_ReplaceRotation",
+    "func_8018219C":                           "Matrix_MtxFToYXZRot",
+    "func_801822C4":                           "Matrix_MtxFToZYXRot",
+    "Matrix_InsertRotationAroundUnitVector_f": "Matrix_RotateAxisF",
+    "Matrix_InsertRotationAroundUnitVector_s": "Matrix_RotateAxisS",
+
     "func_800B78B8": "Actor_UpdateBgCheckInfo",
     "func_8012403C": "Player_GetMask",
     "func_8012404c": "Player_RemoveMask",
@@ -184,8 +222,6 @@ wordReplace = {
     "func_80137748": "SkelAnime_UpdateTranslation",
     "func_801378B8": "Animation_OnFrame",
     "SkelAnime_CopyVec3s": "SkelAnime_CopyFrameTable",
-    "SysMatrix_StatePop": "Matrix_StatePop",
-    "SysMatrix_GetCurrentState": "Matrix_GetCurrentState",
     "Actor_SetObjectSegment": "Actor_SetObjectDependency",
     "func_800B3FC0": "ActorShadow_DrawCircle",
     "func_800B4024": "ActorShadow_DrawSquare",

tools/sizes/boot_functions.csv

@@ -248,7 +248,7 @@ asm/non_matchings/boot/setintmask/osSetIntMask.s,osSetIntMask,0x80088010,0x28
 asm/non_matchings/boot/getintmask/osGetIntMask.s,osGetIntMask,0x800880B0,0x18
 asm/non_matchings/boot/voicesetword/osVoiceSetWord.s,osVoiceSetWord,0x80088110,0x64
 asm/non_matchings/boot/guScale/guScale.s,guScale,0x800882A0,0x2C
-asm/non_matchings/boot/sinf/__sinf.s,__sinf,0x80088350,0x70
+asm/non_matchings/boot/sinf/sinf.s,sinf,0x80088350,0x70
 asm/non_matchings/boot/sins/sins.s,sins,0x80088510,0x1C
 asm/non_matchings/boot/sptask/_VirtualToPhysicalTask.s,_VirtualToPhysicalTask,0x80088580,0x43
 asm/non_matchings/boot/sptask/osSpTaskLoad.s,osSpTaskLoad,0x8008868C,0x5A
@@ -407,7 +407,7 @@ asm/non_matchings/boot/interrupt/__osRestoreInt.s,__osRestoreInt,0x80091AD0,0x8
 asm/non_matchings/boot/vi/__osViInit.s,__osViInit,0x80091AF0,0x48
 asm/non_matchings/boot/viswapcontext/__osViSwapContext.s,__osViSwapContext,0x80091C10,0xC0
 asm/non_matchings/boot/pigetcmdq/osPiGetCmdQueue.s,osPiGetCmdQueue,0x80091F10,0xC
-asm/non_matchings/boot/cosf/__cosf.s,__cosf,0x80091F40,0x5C
+asm/non_matchings/boot/cosf/cosf.s,cosf,0x80091F40,0x5C
 asm/non_matchings/boot/epiread/osEPiReadIo.s,osEPiReadIo,0x800920B0,0x14
 asm/non_matchings/boot/visetspecial/osViSetSpecialFeatures.s,osViSetSpecialFeatures,0x80092100,0x58
 asm/non_matchings/boot/coss/coss.s,coss,0x80092260,0xC

tools/sizes/code_functions.csv

@@ -2868,45 +2868,45 @@ asm/non_matchings/code/sys_math_atan/Math_Atan2S.s,Math_Atan2S,0x8017FEE4,0x7A
 asm/non_matchings/code/sys_math_atan/Math_Atan2F.s,Math_Atan2F,0x801800CC,0xD
 asm/non_matchings/code/sys_math_atan/Math_FAtan2F.s,Math_FAtan2F,0x80180100,0xB
 asm/non_matchings/code/sys_math_atan/Math_Acot2F.s,Math_Acot2F,0x8018012C,0xD
-asm/non_matchings/code/sys_matrix/Matrix_StateAlloc.s,Matrix_StateAlloc,0x80180160,0xF
-asm/non_matchings/code/sys_matrix/Matrix_StatePush.s,Matrix_StatePush,0x8018019C,0xC
-asm/non_matchings/code/sys_matrix/Matrix_StatePop.s,Matrix_StatePop,0x801801CC,0x7
-asm/non_matchings/code/sys_matrix/Matrix_CopyCurrentState.s,Matrix_CopyCurrentState,0x801801E8,0x9
-asm/non_matchings/code/sys_matrix/Matrix_SetCurrentState.s,Matrix_SetCurrentState,0x8018020C,0xA
-asm/non_matchings/code/sys_matrix/Matrix_GetCurrentState.s,Matrix_GetCurrentState,0x80180234,0x4
-asm/non_matchings/code/sys_matrix/Matrix_InsertMatrix.s,Matrix_InsertMatrix,0x80180244,0x16
-asm/non_matchings/code/sys_matrix/Matrix_InsertTranslation.s,Matrix_InsertTranslation,0x8018029C,0x40
+asm/non_matchings/code/sys_matrix/Matrix_Init.s,Matrix_Init,0x80180160,0xF
+asm/non_matchings/code/sys_matrix/Matrix_Push.s,Matrix_Push,0x8018019C,0xC
+asm/non_matchings/code/sys_matrix/Matrix_Pop.s,Matrix_Pop,0x801801CC,0x7
+asm/non_matchings/code/sys_matrix/Matrix_Get.s,Matrix_Get,0x801801E8,0x9
+asm/non_matchings/code/sys_matrix/Matrix_Put.s,Matrix_Put,0x8018020C,0xA
+asm/non_matchings/code/sys_matrix/Matrix_GetCurrent.s,Matrix_GetCurrent,0x80180234,0x4
+asm/non_matchings/code/sys_matrix/Matrix_Mult.s,Matrix_Mult,0x80180244,0x16
+asm/non_matchings/code/sys_matrix/Matrix_Translate.s,Matrix_Translate,0x8018029C,0x40
 asm/non_matchings/code/sys_matrix/Matrix_Scale.s,Matrix_Scale,0x8018039C,0x37
-asm/non_matchings/code/sys_matrix/Matrix_InsertXRotation_s.s,Matrix_InsertXRotation_s,0x80180478,0x66
-asm/non_matchings/code/sys_matrix/Matrix_InsertXRotation_f.s,Matrix_InsertXRotation_f,0x80180610,0x6A
-asm/non_matchings/code/sys_matrix/Matrix_RotateStateAroundXAxis.s,Matrix_RotateStateAroundXAxis,0x801807B8,0x52
-asm/non_matchings/code/sys_matrix/Matrix_SetStateXRotation.s,Matrix_SetStateXRotation,0x80180900,0x2B
-asm/non_matchings/code/sys_matrix/Matrix_RotateY.s,Matrix_RotateY,0x801809AC,0x67
-asm/non_matchings/code/sys_matrix/Matrix_InsertYRotation_f.s,Matrix_InsertYRotation_f,0x80180B48,0x6C
-asm/non_matchings/code/sys_matrix/Matrix_InsertZRotation_s.s,Matrix_InsertZRotation_s,0x80180CF8,0x66
-asm/non_matchings/code/sys_matrix/Matrix_InsertZRotation_f.s,Matrix_InsertZRotation_f,0x80180E90,0x6B
-asm/non_matchings/code/sys_matrix/Matrix_InsertRotation.s,Matrix_InsertRotation,0x8018103C,0xB0
+asm/non_matchings/code/sys_matrix/Matrix_RotateXS.s,Matrix_RotateXS,0x80180478,0x66
+asm/non_matchings/code/sys_matrix/Matrix_RotateXF.s,Matrix_RotateXF,0x80180610,0x6A
+asm/non_matchings/code/sys_matrix/Matrix_RotateXFApply.s,Matrix_RotateXFApply,0x801807B8,0x52
+asm/non_matchings/code/sys_matrix/Matrix_RotateXFNew.s,Matrix_RotateXFNew,0x80180900,0x2B
+asm/non_matchings/code/sys_matrix/Matrix_RotateYS.s,Matrix_RotateYS,0x801809AC,0x67
+asm/non_matchings/code/sys_matrix/Matrix_RotateYF.s,Matrix_RotateYF,0x80180B48,0x6C
+asm/non_matchings/code/sys_matrix/Matrix_RotateZS.s,Matrix_RotateZS,0x80180CF8,0x66
+asm/non_matchings/code/sys_matrix/Matrix_RotateZF.s,Matrix_RotateZF,0x80180E90,0x6B
+asm/non_matchings/code/sys_matrix/Matrix_RotateZYX.s,Matrix_RotateZYX,0x8018103C,0xB0
 asm/non_matchings/code/sys_matrix/Matrix_RotateAndTranslateState.s,Matrix_RotateAndTranslateState,0x801812FC,0xD5
-asm/non_matchings/code/sys_matrix/Matrix_SetStateRotationAndTranslation.s,Matrix_SetStateRotationAndTranslation,0x80181650,0x6B
-asm/non_matchings/code/sys_matrix/Matrix_ToRSPMatrix.s,Matrix_ToRSPMatrix,0x801817FC,0x87
-asm/non_matchings/code/sys_matrix/Matrix_GetStateAsRSPMatrix.s,Matrix_GetStateAsRSPMatrix,0x80181A18,0xA
+asm/non_matchings/code/sys_matrix/Matrix_SetTranslateRotateYXZ.s,Matrix_SetTranslateRotateYXZ,0x80181650,0x6B
+asm/non_matchings/code/sys_matrix/Matrix_MtxFToMtx.s,Matrix_MtxFToMtx,0x801817FC,0x87
+asm/non_matchings/code/sys_matrix/Matrix_ToMtx.s,Matrix_ToMtx,0x80181A18,0xA
 asm/non_matchings/code/sys_matrix/Matrix_NewMtx.s,Matrix_NewMtx,0x80181A40,0xB
-asm/non_matchings/code/sys_matrix/Matrix_AppendToPolyOpaDisp.s,Matrix_AppendToPolyOpaDisp,0x80181A6C,0xB
-asm/non_matchings/code/sys_matrix/Matrix_MultiplyVector3fByState.s,Matrix_MultiplyVector3fByState,0x80181A98,0x2E
-asm/non_matchings/code/sys_matrix/Matrix_GetStateTranslation.s,Matrix_GetStateTranslation,0x80181B50,0xA
-asm/non_matchings/code/sys_matrix/Matrix_GetStateTranslationAndScaledX.s,Matrix_GetStateTranslationAndScaledX,0x80181B78,0x13
-asm/non_matchings/code/sys_matrix/Matrix_GetStateTranslationAndScaledY.s,Matrix_GetStateTranslationAndScaledY,0x80181BC4,0x13
-asm/non_matchings/code/sys_matrix/Matrix_GetStateTranslationAndScaledZ.s,Matrix_GetStateTranslationAndScaledZ,0x80181C10,0x13
-asm/non_matchings/code/sys_matrix/Matrix_MultiplyVector3fXZByCurrentState.s,Matrix_MultiplyVector3fXZByCurrentState,0x80181C5C,0x20
+asm/non_matchings/code/sys_matrix/Matrix_MtxFToNewMtx.s,Matrix_MtxFToNewMtx,0x80181A6C,0xB
+asm/non_matchings/code/sys_matrix/Matrix_MultVec3f.s,Matrix_MultVec3f,0x80181A98,0x2E
+asm/non_matchings/code/sys_matrix/Matrix_MultZero.s,Matrix_MultZero,0x80181B50,0xA
+asm/non_matchings/code/sys_matrix/Matrix_MultVecX.s,Matrix_MultVecX,0x80181B78,0x13
+asm/non_matchings/code/sys_matrix/Matrix_MultVecY.s,Matrix_MultVecY,0x80181BC4,0x13
+asm/non_matchings/code/sys_matrix/Matrix_MultVecZ.s,Matrix_MultVecZ,0x80181C10,0x13
+asm/non_matchings/code/sys_matrix/Matrix_MultVec3fXZ.s,Matrix_MultVec3fXZ,0x80181C5C,0x20
 asm/non_matchings/code/sys_matrix/Matrix_MtxFCopy.s,Matrix_MtxFCopy,0x80181CDC,0x22
-asm/non_matchings/code/sys_matrix/Matrix_FromRSPMatrix.s,Matrix_FromRSPMatrix,0x80181D64,0x95
-asm/non_matchings/code/sys_matrix/Matrix_MultiplyVector3fByMatrix.s,Matrix_MultiplyVector3fByMatrix,0x80181FB8,0x2C
-asm/non_matchings/code/sys_matrix/Matrix_TransposeXYZ.s,Matrix_TransposeXYZ,0x80182068,0xE
-asm/non_matchings/code/sys_matrix/Matrix_NormalizeXYZ.s,Matrix_NormalizeXYZ,0x801820A0,0x3F
-asm/non_matchings/code/sys_matrix/func_8018219C.s,func_8018219C,0x8018219C,0x4A
-asm/non_matchings/code/sys_matrix/func_801822C4.s,func_801822C4,0x801822C4,0x4A
-asm/non_matchings/code/sys_matrix/Matrix_InsertRotationAroundUnitVector_f.s,Matrix_InsertRotationAroundUnitVector_f,0x801823EC,0x118
-asm/non_matchings/code/sys_matrix/Matrix_InsertRotationAroundUnitVector_s.s,Matrix_InsertRotationAroundUnitVector_s,0x8018284C,0x111
+asm/non_matchings/code/sys_matrix/Matrix_MtxToMtxF.s,Matrix_MtxToMtxF,0x80181D64,0x95
+asm/non_matchings/code/sys_matrix/Matrix_MultVec3fExt.s,Matrix_MultVec3fExt,0x80181FB8,0x2C
+asm/non_matchings/code/sys_matrix/Matrix_Transpose.s,Matrix_Transpose,0x80182068,0xE
+asm/non_matchings/code/sys_matrix/Matrix_ReplaceRotation.s,Matrix_ReplaceRotation,0x801820A0,0x3F
+asm/non_matchings/code/sys_matrix/Matrix_MtxFToYXZRot.s,Matrix_MtxFToYXZRot,0x8018219C,0x4A
+asm/non_matchings/code/sys_matrix/Matrix_MtxFToZYXRot.s,Matrix_MtxFToZYXRot,0x801822C4,0x4A
+asm/non_matchings/code/sys_matrix/Matrix_RotateAxisF.s,Matrix_RotateAxisF,0x801823EC,0x118
+asm/non_matchings/code/sys_matrix/Matrix_RotateAxisS.s,Matrix_RotateAxisS,0x8018284C,0x111
 asm/non_matchings/code/sys_ucode/SysUcode_GetUCodeBoot.s,SysUcode_GetUCodeBoot,0x80182C90,0x4
 asm/non_matchings/code/sys_ucode/SysUcode_GetUCodeBootSize.s,SysUcode_GetUCodeBootSize,0x80182CA0,0x7
 asm/non_matchings/code/sys_ucode/SysUcode_GetUCode.s,SysUcode_GetUCode,0x80182CBC,0x4