diff --git a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s index 7bbe931745..b81cf95b9e 100644 --- a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s +++ b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s @@ -120,7 +120,7 @@ glabel func_8006CBAC /* AE3EB4 8006CD14 448A3000 */ mtc1 $t2, $f6 /* AE3EB8 8006CD18 00000000 */ nop /* AE3EBC 8006CD1C 46803220 */ cvt.s.w $f8, $f6 -/* AE3EC0 8006CD20 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* AE3EC0 8006CD20 0C0344D0 */ jal Matrix_JointPosition /* AE3EC4 8006CD24 E7A80068 */ swc1 $f8, 0x68($sp) /* AE3EC8 8006CD28 C7AC0074 */ lwc1 $f12, 0x74($sp) /* AE3ECC 8006CD2C C7AE0078 */ lwc1 $f14, 0x78($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_8008F87C.s b/asm/non_matchings/code/z_player_lib/func_8008F87C.s index d231070cc4..5e5370290f 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008F87C.s +++ b/asm/non_matchings/code/z_player_lib/func_8008F87C.s @@ -51,7 +51,7 @@ glabel func_8008F87C /* B06AB4 8008F914 0C034213 */ jal Matrix_Push /* B06AB8 8008F918 46062501 */ sub.s $f20, $f4, $f6 /* B06ABC 8008F91C 8FA400BC */ lw $a0, 0xbc($sp) -/* B06AC0 8008F920 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* B06AC0 8008F920 0C0344D0 */ jal Matrix_JointPosition /* B06AC4 8008F924 8FA500C0 */ lw $a1, 0xc0($sp) /* B06AC8 8008F928 3C048012 */ lui $a0, %hi(D_8012602C) # $a0, 0x8012 /* B06ACC 8008F92C 2484602C */ addiu $a0, %lo(D_8012602C) # addiu $a0, $a0, 0x602c @@ -73,7 +73,7 @@ glabel func_8008F87C /* B06B0C 8008F96C 00021040 */ sll $v0, $v0, 1 /* B06B10 8008F970 AFA20038 */ sw $v0, 0x38($sp) /* B06B14 8008F974 01F82021 */ addu $a0, $t7, $t8 -/* B06B18 8008F978 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* B06B18 8008F978 0C0344D0 */ jal Matrix_JointPosition /* B06B1C 8008F97C 03222821 */ addu $a1, $t9, $v0 /* B06B20 8008F980 3C038016 */ lui $v1, %hi(gSaveContext+4) /* B06B24 8008F984 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) diff --git a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s index 2c51ccd7c6..440490ca71 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s +++ b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s @@ -110,7 +110,7 @@ glabel func_8008FCC8 /* B06F9C 8008FDFC 24070001 */ li $a3, 1 /* B06FA0 8008FE00 84440000 */ lh $a0, ($v0) /* B06FA4 8008FE04 84450002 */ lh $a1, 2($v0) -/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateZYX +/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateRPY /* B06FAC 8008FE0C 84460004 */ lh $a2, 4($v0) /* B06FB0 8008FE10 8FA20040 */ lw $v0, 0x40($sp) /* B06FB4 8008FE14 44800000 */ mtc1 $zero, $f0 diff --git a/asm/non_matchings/code/z_player_lib/func_800907E4.s b/asm/non_matchings/code/z_player_lib/func_800907E4.s index f8631dc8be..833bfb284d 100644 --- a/asm/non_matchings/code/z_player_lib/func_800907E4.s +++ b/asm/non_matchings/code/z_player_lib/func_800907E4.s @@ -108,7 +108,7 @@ glabel func_800907E4 /* B07AE0 80090940 00A12821 */ addu $a1, $a1, $at /* B07AE4 80090944 000528C0 */ sll $a1, $a1, 3 /* B07AE8 80090948 00052C00 */ sll $a1, $a1, 0x10 -/* B07AEC 8009094C 0C034421 */ jal Matrix_RotateZYX +/* B07AEC 8009094C 0C034421 */ jal Matrix_RotateRPY /* B07AF0 80090950 00052C03 */ sra $a1, $a1, 0x10 /* B07AF4 80090954 3C018014 */ lui $at, %hi(D_8013E930) /* B07AF8 80090958 C42CE930 */ lwc1 $f12, %lo(D_8013E930)($at) diff --git a/asm/non_matchings/code/z_player_lib/func_80090D20.s b/asm/non_matchings/code/z_player_lib/func_80090D20.s index 0ea03acd51..47ddd9aa35 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090D20.s +++ b/asm/non_matchings/code/z_player_lib/func_80090D20.s @@ -136,7 +136,7 @@ glabel func_80090D20 /* B07FD0 80090E30 24048000 */ li $a0, -32768 /* B07FD4 80090E34 00002825 */ move $a1, $zero /* B07FD8 80090E38 24064000 */ li $a2, 16384 -/* B07FDC 80090E3C 0C034421 */ jal Matrix_RotateZYX +/* B07FDC 80090E3C 0C034421 */ jal Matrix_RotateRPY /* B07FE0 80090E40 24070001 */ li $a3, 1 /* B07FE4 80090E44 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B07FE8 80090E48 44816000 */ mtc1 $at, $f12 @@ -323,7 +323,7 @@ glabel func_80090D20 /* B082A4 80091104 240469E8 */ li $a0, 27112 /* B082A8 80091108 2405A8F8 */ li $a1, -22280 /* B082AC 8009110C 2406458E */ li $a2, 17806 -/* B082B0 80091110 0C034421 */ jal Matrix_RotateZYX +/* B082B0 80091110 0C034421 */ jal Matrix_RotateRPY /* B082B4 80091114 24070001 */ li $a3, 1 /* B082B8 80091118 0C034236 */ jal Matrix_Get /* B082BC 8009111C 27A4014C */ addiu $a0, $sp, 0x14c @@ -577,7 +577,7 @@ glabel func_80090D20 /* B08660 800914C0 00002025 */ move $a0, $zero /* B08664 800914C4 2405C000 */ li $a1, -16384 /* B08668 800914C8 2406C000 */ li $a2, -16384 -/* B0866C 800914CC 0C034421 */ jal Matrix_RotateZYX +/* B0866C 800914CC 0C034421 */ jal Matrix_RotateRPY /* B08670 800914D0 24070001 */ li $a3, 1 /* B08674 800914D4 0C034236 */ jal Matrix_Get /* B08678 800914D8 27A40044 */ addiu $a0, $sp, 0x44 @@ -707,7 +707,7 @@ glabel func_80090D20 /* B08844 800916A4 3C048012 */ lui $a0, %hi(D_801261CC) # $a0, 0x8012 /* B08848 800916A8 3C058012 */ lui $a1, %hi(D_801261D8) # $a1, 0x8012 /* B0884C 800916AC 24A561D8 */ addiu $a1, %lo(D_801261D8) # addiu $a1, $a1, 0x61d8 -/* B08850 800916B0 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* B08850 800916B0 0C0344D0 */ jal Matrix_JointPosition /* B08854 800916B4 248461CC */ addiu $a0, %lo(D_801261CC) # addiu $a0, $a0, 0x61cc /* B08858 800916B8 0C034236 */ jal Matrix_Get /* B0885C 800916BC 26040A20 */ addiu $a0, $s0, 0xa20 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s index bc388211a2..9053640095 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s @@ -159,7 +159,7 @@ glabel func_8086FDC0 /* 003FC 8086FFDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00400 8086FFE0 84440030 */ lh $a0, 0x0030($v0) ## 00000030 /* 00404 8086FFE4 84450032 */ lh $a1, 0x0032($v0) ## 00000032 -/* 00408 8086FFE8 0C034421 */ jal Matrix_RotateZYX +/* 00408 8086FFE8 0C034421 */ jal Matrix_RotateRPY /* 0040C 8086FFEC 84460034 */ lh $a2, 0x0034($v0) ## 00000034 /* 00410 8086FFF0 8FA20200 */ lw $v0, 0x0200($sp) /* 00414 8086FFF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index 592f666213..c0423c44bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -83,7 +83,7 @@ glabel func_8088BC40 /* 00CC4 8088BD44 00052C03 */ sra $a1, $a1, 16 /* 00CC8 8088BD48 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00CCC 8088BD4C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CD0 8088BD50 0C034421 */ jal Matrix_RotateZYX +/* 00CD0 8088BD50 0C034421 */ jal Matrix_RotateRPY /* 00CD4 8088BD54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CD8 8088BD58 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 00CDC 8088BD5C 3C01C128 */ lui $at, 0xC128 ## $at = C1280000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s index 68fe5fc629..419f25c33e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s @@ -74,7 +74,7 @@ glabel BgMenkuriEye_Draw /* 00348 8089BFB8 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0034C 8089BFBC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00350 8089BFC0 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00354 8089BFC4 0C034421 */ jal Matrix_RotateZYX +/* 00354 8089BFC4 0C034421 */ jal Matrix_RotateRPY /* 00358 8089BFC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0035C 8089BFCC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 /* 00360 8089BFD0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s index 029d63d3a8..c1c2e8daf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s @@ -149,7 +149,7 @@ glabel func_808A3F58 /* 00910 808A40E0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00914 808A40E4 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 00918 808A40E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0091C 808A40EC 0C034421 */ jal Matrix_RotateZYX +/* 0091C 808A40EC 0C034421 */ jal Matrix_RotateRPY /* 00920 808A40F0 872600B8 */ lh $a2, 0x00B8($t9) ## 000000B8 /* 00924 808A40F4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00928 808A40F8 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s index 7b6ab8e569..d87f7acca9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s @@ -146,7 +146,7 @@ glabel BgYdanSp_Draw /* 01368 808C0778 00052C03 */ sra $a1, $a1, 16 /* 0136C 808C077C 2404FA60 */ addiu $a0, $zero, 0xFA60 ## $a0 = FFFFFA60 /* 01370 808C0780 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01374 808C0784 0C034421 */ jal Matrix_RotateZYX +/* 01374 808C0784 0C034421 */ jal Matrix_RotateRPY /* 01378 808C0788 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0137C 808C078C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 01380 808C0790 44817000 */ mtc1 $at, $f14 ## $f14 = 700.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s index 5cdf590f79..3123045819 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s @@ -38,7 +38,7 @@ glabel func_808C4940 /* 037C8 808C4958 AFA60058 */ sw $a2, 0x0058($sp) .L808C495C: /* 037CC 808C495C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 037D0 808C4960 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 037D0 808C4960 0C0344D0 */ jal Matrix_JointPosition /* 037D4 808C4964 8FA50060 */ lw $a1, 0x0060($sp) /* 037D8 808C4968 8FAF0058 */ lw $t7, 0x0058($sp) /* 037DC 808C496C 3C06808D */ lui $a2, %hi(D_808CA5A0) ## $a2 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s index eaca485d8d..85ac952564 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s @@ -253,7 +253,7 @@ glabel L8091A7CC .L8091A838: /* 04E28 8091A838 8FA50078 */ lw $a1, 0x0078($sp) /* 04E2C 8091A83C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04E30 8091A840 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 04E30 8091A840 0C0344D0 */ jal Matrix_JointPosition /* 04E34 8091A844 AFA9005C */ sw $t1, 0x005C($sp) /* 04E38 8091A848 8FAC0070 */ lw $t4, 0x0070($sp) /* 04E3C 8091A84C 8FA9005C */ lw $t1, 0x005C($sp) @@ -302,7 +302,7 @@ glabel L8091A7CC glabel L8091A8F4 /* 04EE4 8091A8F4 8FA50078 */ lw $a1, 0x0078($sp) /* 04EE8 8091A8F8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04EEC 8091A8FC 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 04EEC 8091A8FC 0C0344D0 */ jal Matrix_JointPosition /* 04EF0 8091A900 AFA9005C */ sw $t1, 0x005C($sp) /* 04EF4 8091A904 8FAF0070 */ lw $t7, 0x0070($sp) /* 04EF8 8091A908 8FA9005C */ lw $t1, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s index 894ba17951..a1d9dff305 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s @@ -158,7 +158,7 @@ glabel func_8093639C .L80936578: /* 09FA8 80936578 8605001A */ lh $a1, 0x001A($s0) ## 0000071A /* 09FAC 8093657C 8606001C */ lh $a2, 0x001C($s0) ## 0000071C -/* 09FB0 80936580 0C034421 */ jal Matrix_RotateZYX +/* 09FB0 80936580 0C034421 */ jal Matrix_RotateRPY /* 09FB4 80936584 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 09FB8 80936588 9619001E */ lhu $t9, 0x001E($s0) ## 0000071E /* 09FBC 8093658C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index c4f42c1f14..d6f06c0604 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -334,7 +334,7 @@ glabel L80959578 /* 0A378 80959638 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0A37C 8095963C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 0A380 80959640 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0A384 80959644 0C034421 */ jal Matrix_RotateZYX +/* 0A384 80959644 0C034421 */ jal Matrix_RotateRPY /* 0A388 80959648 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0A38C 8095964C C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 /* 0A390 80959650 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s index 969ee46bd7..3f2692155b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s @@ -23,7 +23,7 @@ glabel func_8094F2C8 /* 00034 8094F2F4 862400B4 */ lh $a0, 0x00B4($s1) ## 000000B4 /* 00038 8094F2F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0003C 8094F2FC 862600B8 */ lh $a2, 0x00B8($s1) ## 000000B8 -/* 00040 8094F300 0C034421 */ jal Matrix_RotateZYX +/* 00040 8094F300 0C034421 */ jal Matrix_RotateRPY /* 00044 8094F304 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00048 8094F308 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 0004C 8094F30C 3C188096 */ lui $t8, %hi(D_8095C044) ## $t8 = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s index 2a01eb0d0c..323fd3cc0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s @@ -156,7 +156,7 @@ glabel func_80958B0C /* 09AA4 80958D64 87A4003E */ lh $a0, 0x003E($sp) /* 09AA8 80958D68 87A5003C */ lh $a1, 0x003C($sp) /* 09AAC 80958D6C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09AB0 80958D70 0C034421 */ jal Matrix_RotateZYX +/* 09AB0 80958D70 0C034421 */ jal Matrix_RotateRPY /* 09AB4 80958D74 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 09AB8 80958D78 3C0D8096 */ lui $t5, %hi(D_809668D1) ## $t5 = 80960000 /* 09ABC 80958D7C 91AD68D1 */ lbu $t5, %lo(D_809668D1)($t5) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index 3769d7b053..eeb9079905 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -646,7 +646,7 @@ glabel func_8095A188 /* 0B758 8095AA18 8604002A */ lh $a0, 0x002A($s0) ## 0000018A /* 0B75C 8095AA1C 8605002C */ lh $a1, 0x002C($s0) ## 0000018C /* 0B760 8095AA20 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B764 8095AA24 0C034421 */ jal Matrix_RotateZYX +/* 0B764 8095AA24 0C034421 */ jal Matrix_RotateRPY /* 0B768 8095AA28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0B76C 8095AA2C C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000001A0 /* 0B770 8095AA30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 @@ -786,7 +786,7 @@ glabel func_8095A188 /* 0B97C 8095AC3C 8604002A */ lh $a0, 0x002A($s0) ## 000001E2 /* 0B980 8095AC40 8605002C */ lh $a1, 0x002C($s0) ## 000001E4 /* 0B984 8095AC44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B988 8095AC48 0C034421 */ jal Matrix_RotateZYX +/* 0B988 8095AC48 0C034421 */ jal Matrix_RotateRPY /* 0B98C 8095AC4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0B990 8095AC50 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000001F8 /* 0B994 8095AC54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 45ab9c6d3c..7c0fd36e91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -47,7 +47,7 @@ glabel func_80977950 /* 00638 809779C8 85C50168 */ lh $a1, 0x0168($t6) ## 00000168 /* 0063C 809779CC 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 00640 809779D0 00042400 */ sll $a0, $a0, 16 -/* 00644 809779D4 0C034421 */ jal Matrix_RotateZYX +/* 00644 809779D4 0C034421 */ jal Matrix_RotateRPY /* 00648 809779D8 00042403 */ sra $a0, $a0, 16 /* 0064C 809779DC 3C028016 */ lui $v0, %hi(gGameInfo) /* 00650 809779E0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s index 82cb8dd4fa..79f69a2222 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s @@ -41,7 +41,7 @@ glabel func_8097911C /* 0084C 8097917C 87A40056 */ lh $a0, 0x0056($sp) /* 00850 80979180 87A50054 */ lh $a1, 0x0054($sp) /* 00854 80979184 87A60052 */ lh $a2, 0x0052($sp) -/* 00858 80979188 0C034421 */ jal Matrix_RotateZYX +/* 00858 80979188 0C034421 */ jal Matrix_RotateRPY /* 0085C 8097918C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00860 80979190 3C058098 */ lui $a1, %hi(D_8097C030) ## $a1 = 80980000 /* 00864 80979194 24A5C030 */ addiu $a1, $a1, %lo(D_8097C030) ## $a1 = 8097C030 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index 68830f957e..66a1378edd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -152,7 +152,7 @@ glabel EnBa_Draw /* 01AD0 809B7E20 024B1021 */ addu $v0, $s2, $t3 /* 01AD4 809B7E24 844402A8 */ lh $a0, 0x02A8($v0) ## 000002A8 /* 01AD8 809B7E28 844502AA */ lh $a1, 0x02AA($v0) ## 000002AA -/* 01ADC 809B7E2C 0C034421 */ jal Matrix_RotateZYX +/* 01ADC 809B7E2C 0C034421 */ jal Matrix_RotateRPY /* 01AE0 809B7E30 844602AC */ lh $a2, 0x02AC($v0) ## 000002AC /* 01AE4 809B7E34 C60C0200 */ lwc1 $f12, 0x0200($s0) ## 00000200 /* 01AE8 809B7E38 C60E0204 */ lwc1 $f14, 0x0204($s0) ## 00000204 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s index a3e1f70297..4f384f7972 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s @@ -139,7 +139,7 @@ glabel func_809B65A8 /* 00458 809B67A8 87A4005C */ lh $a0, 0x005C($sp) /* 0045C 809B67AC 87A5005E */ lh $a1, 0x005E($sp) /* 00460 809B67B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 809B67B4 0C034421 */ jal Matrix_RotateZYX +/* 00464 809B67B4 0C034421 */ jal Matrix_RotateRPY /* 00468 809B67B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0046C 809B67BC 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 /* 00470 809B67C0 0C0346BD */ jal Matrix_MultVec3f @@ -183,7 +183,7 @@ glabel func_809B65A8 /* 00500 809B6850 00042400 */ sll $a0, $a0, 16 /* 00504 809B6854 00042403 */ sra $a0, $a0, 16 /* 00508 809B6858 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0050C 809B685C 0C034421 */ jal Matrix_RotateZYX +/* 0050C 809B685C 0C034421 */ jal Matrix_RotateRPY /* 00510 809B6860 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00514 809B6864 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 /* 00518 809B6868 0C0346BD */ jal Matrix_MultVec3f @@ -229,7 +229,7 @@ glabel func_809B65A8 /* 005AC 809B68FC 00042400 */ sll $a0, $a0, 16 /* 005B0 809B6900 00042403 */ sra $a0, $a0, 16 /* 005B4 809B6904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005B8 809B6908 0C034421 */ jal Matrix_RotateZYX +/* 005B8 809B6908 0C034421 */ jal Matrix_RotateRPY /* 005BC 809B690C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 005C0 809B6910 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 /* 005C4 809B6914 0C0346BD */ jal Matrix_MultVec3f diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s index f51d73de22..f15e90f69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s @@ -126,7 +126,7 @@ glabel func_809B6B58 /* 009D0 809B6D20 00042400 */ sll $a0, $a0, 16 /* 009D4 809B6D24 00042403 */ sra $a0, $a0, 16 /* 009D8 809B6D28 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009DC 809B6D2C 0C034421 */ jal Matrix_RotateZYX +/* 009DC 809B6D2C 0C034421 */ jal Matrix_RotateRPY /* 009E0 809B6D30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 009E4 809B6D34 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 009E8 809B6D38 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 @@ -175,7 +175,7 @@ glabel func_809B6B58 /* 00A88 809B6DD8 00042400 */ sll $a0, $a0, 16 /* 00A8C 809B6DDC 00042403 */ sra $a0, $a0, 16 /* 00A90 809B6DE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A94 809B6DE4 0C034421 */ jal Matrix_RotateZYX +/* 00A94 809B6DE4 0C034421 */ jal Matrix_RotateRPY /* 00A98 809B6DE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A9C 809B6DEC 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 /* 00AA0 809B6DF0 0C0346BD */ jal Matrix_MultVec3f @@ -250,7 +250,7 @@ glabel func_809B6B58 /* 00B98 809B6EE8 00042400 */ sll $a0, $a0, 16 /* 00B9C 809B6EEC 00042403 */ sra $a0, $a0, 16 /* 00BA0 809B6EF0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA4 809B6EF4 0C034421 */ jal Matrix_RotateZYX +/* 00BA4 809B6EF4 0C034421 */ jal Matrix_RotateRPY /* 00BA8 809B6EF8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00BAC 809B6EFC 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 00BB0 809B6F00 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 @@ -317,7 +317,7 @@ glabel func_809B6B58 /* 00C94 809B6FE4 00042400 */ sll $a0, $a0, 16 /* 00C98 809B6FE8 00042403 */ sra $a0, $a0, 16 /* 00C9C 809B6FEC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CA0 809B6FF0 0C034421 */ jal Matrix_RotateZYX +/* 00CA0 809B6FF0 0C034421 */ jal Matrix_RotateRPY /* 00CA4 809B6FF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CA8 809B6FF8 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 /* 00CAC 809B6FFC 0C0346BD */ jal Matrix_MultVec3f diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s index 8e95a027c1..e771f51243 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s @@ -106,7 +106,7 @@ glabel func_809B71F0 /* 0102C 809B737C 87A4006C */ lh $a0, 0x006C($sp) /* 01030 809B7380 87A5006E */ lh $a1, 0x006E($sp) /* 01034 809B7384 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01038 809B7388 0C034421 */ jal Matrix_RotateZYX +/* 01038 809B7388 0C034421 */ jal Matrix_RotateRPY /* 0103C 809B738C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01040 809B7390 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 01044 809B7394 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 @@ -155,7 +155,7 @@ glabel func_809B71F0 /* 010E8 809B7438 00042400 */ sll $a0, $a0, 16 /* 010EC 809B743C 00042403 */ sra $a0, $a0, 16 /* 010F0 809B7440 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 809B7444 0C034421 */ jal Matrix_RotateZYX +/* 010F4 809B7444 0C034421 */ jal Matrix_RotateRPY /* 010F8 809B7448 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 010FC 809B744C 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 01100 809B7450 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 @@ -206,7 +206,7 @@ glabel func_809B71F0 /* 011A8 809B74F8 00042400 */ sll $a0, $a0, 16 /* 011AC 809B74FC 00042403 */ sra $a0, $a0, 16 /* 011B0 809B7500 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 011B4 809B7504 0C034421 */ jal Matrix_RotateZYX +/* 011B4 809B7504 0C034421 */ jal Matrix_RotateRPY /* 011B8 809B7508 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 011BC 809B750C 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 011C0 809B7510 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s index f72e220a55..14d7956bef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s @@ -92,7 +92,7 @@ glabel func_809B75A0 /* 013A4 809B76F4 00042400 */ sll $a0, $a0, 16 /* 013A8 809B76F8 00042403 */ sra $a0, $a0, 16 /* 013AC 809B76FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013B0 809B7700 0C034421 */ jal Matrix_RotateZYX +/* 013B0 809B7700 0C034421 */ jal Matrix_RotateRPY /* 013B4 809B7704 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013B8 809B7708 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 013BC 809B770C 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 @@ -136,7 +136,7 @@ glabel func_809B75A0 /* 01448 809B7798 00042400 */ sll $a0, $a0, 16 /* 0144C 809B779C 00042403 */ sra $a0, $a0, 16 /* 01450 809B77A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01454 809B77A4 0C034421 */ jal Matrix_RotateZYX +/* 01454 809B77A4 0C034421 */ jal Matrix_RotateRPY /* 01458 809B77A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0145C 809B77AC 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFEC /* 01460 809B77B0 0C0346BD */ jal Matrix_MultVec3f diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s index ea4c7a9b90..b59c8c4a9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s @@ -69,7 +69,7 @@ glabel func_809B781C /* 015CC 809B791C 00042400 */ sll $a0, $a0, 16 /* 015D0 809B7920 00042403 */ sra $a0, $a0, 16 /* 015D4 809B7924 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015D8 809B7928 0C034421 */ jal Matrix_RotateZYX +/* 015D8 809B7928 0C034421 */ jal Matrix_RotateRPY /* 015DC 809B792C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 015E0 809B7930 3C1E809C */ lui $s8, %hi(D_809B8080) ## $s8 = 809C0000 /* 015E4 809B7934 27DE8080 */ addiu $s8, $s8, %lo(D_809B8080) ## $s8 = 809B8080 @@ -132,7 +132,7 @@ glabel func_809B781C /* 016B8 809B7A08 00042400 */ sll $a0, $a0, 16 /* 016BC 809B7A0C 00042403 */ sra $a0, $a0, 16 /* 016C0 809B7A10 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 016C4 809B7A14 0C034421 */ jal Matrix_RotateZYX +/* 016C4 809B7A14 0C034421 */ jal Matrix_RotateRPY /* 016C8 809B7A18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 016CC 809B7A1C 03C02025 */ or $a0, $s8, $zero ## $a0 = 809B8080 /* 016D0 809B7A20 0C0346BD */ jal Matrix_MultVec3f @@ -180,7 +180,7 @@ glabel func_809B781C /* 0176C 809B7ABC 00042400 */ sll $a0, $a0, 16 /* 01770 809B7AC0 00042403 */ sra $a0, $a0, 16 /* 01774 809B7AC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01778 809B7AC8 0C034421 */ jal Matrix_RotateZYX +/* 01778 809B7AC8 0C034421 */ jal Matrix_RotateRPY /* 0177C 809B7ACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01780 809B7AD0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFF4 /* 01784 809B7AD4 0C0346BD */ jal Matrix_MultVec3f diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index 3ce7a6b8e3..739c874a98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -45,7 +45,7 @@ glabel func_809BA458 /* 0221C 809BA4FC 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 02220 809BA500 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 02224 809BA504 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02228 809BA508 0C034421 */ jal Matrix_RotateZYX +/* 02228 809BA508 0C034421 */ jal Matrix_RotateRPY /* 0222C 809BA50C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02230 809BA510 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 02234 809BA514 0C0343B5 */ jal Matrix_RotateZ diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s index 38fa70ba8b..82e842348e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s @@ -292,7 +292,7 @@ glabel func_809BA628 /* 02708 809BA9E8 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0270C 809BA9EC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 02710 809BA9F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02714 809BA9F4 0C034421 */ jal Matrix_RotateZYX +/* 02714 809BA9F4 0C034421 */ jal Matrix_RotateRPY /* 02718 809BA9F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0271C 809BA9FC C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 02720 809BAA00 0C0343B5 */ jal Matrix_RotateZ diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s index 7eb26142ad..390ddf02a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s @@ -71,7 +71,7 @@ glabel EnBom_Draw /* 00C14 809C32E4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00C18 809C32E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00C1C 809C32EC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00C20 809C32F0 0C034421 */ jal Matrix_RotateZYX +/* 00C20 809C32F0 0C034421 */ jal Matrix_RotateRPY /* 00C24 809C32F4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00C28 809C32F8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00C2C 809C32FC 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index 105cb9114d..45e3e0d0bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -204,7 +204,7 @@ glabel EnBx_Draw /* 008CC 809D23AC 02491021 */ addu $v0, $s2, $t1 /* 008D0 809D23B0 844401B4 */ lh $a0, 0x01B4($v0) ## 000001B4 /* 008D4 809D23B4 844501B6 */ lh $a1, 0x01B6($v0) ## 000001B6 -/* 008D8 809D23B8 0C034421 */ jal Matrix_RotateZYX +/* 008D8 809D23B8 0C034421 */ jal Matrix_RotateRPY /* 008DC 809D23BC 844601B8 */ lh $a2, 0x01B8($v0) ## 000001B8 /* 008E0 809D23C0 C60C0184 */ lwc1 $f12, 0x0184($s0) ## 00000184 /* 008E4 809D23C4 C60E0188 */ lwc1 $f14, 0x0188($s0) ## 00000188 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s index e498317708..1db686618a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s @@ -47,7 +47,7 @@ glabel func_809E858C /* 02E28 809E85F8 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 02E2C 809E85FC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 02E30 809E8600 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02E34 809E8604 0C034421 */ jal Matrix_RotateZYX +/* 02E34 809E8604 0C034421 */ jal Matrix_RotateRPY /* 02E38 809E8608 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02E3C 809E860C C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 02E40 809E8610 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s index 497a552c0d..25d3e28500 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s @@ -133,7 +133,7 @@ glabel func_809E86B8 /* 0308C 809E885C 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA /* 03090 809E8860 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 03094 809E8864 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03098 809E8868 0C034421 */ jal Matrix_RotateZYX +/* 03098 809E8868 0C034421 */ jal Matrix_RotateRPY /* 0309C 809E886C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 030A0 809E8870 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 030A4 809E8874 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s index 621ca18b01..e5081d1ca7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s @@ -29,7 +29,7 @@ glabel func_809E89E4 /* 03248 809E8A18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0324C 809E8A1C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 03250 809E8A20 844401CE */ lh $a0, 0x01CE($v0) ## 000001CE -/* 03254 809E8A24 0C034421 */ jal Matrix_RotateZYX +/* 03254 809E8A24 0C034421 */ jal Matrix_RotateRPY /* 03258 809E8A28 844500B6 */ lh $a1, 0x00B6($v0) ## 000000B6 /* 0325C 809E8A2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03260 809E8A30 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s index 0ce3effd2b..b663896c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s @@ -262,7 +262,7 @@ glabel func_809ECA50 /* 00570 809ECDF0 87A40044 */ lh $a0, 0x0044($sp) /* 00574 809ECDF4 87A50046 */ lh $a1, 0x0046($sp) /* 00578 809ECDF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0057C 809ECDFC 0C034421 */ jal Matrix_RotateZYX +/* 0057C 809ECDFC 0C034421 */ jal Matrix_RotateRPY /* 00580 809ECE00 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00584 809ECE04 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 00588 809ECE08 0C0346BD */ jal Matrix_MultVec3f @@ -280,7 +280,7 @@ glabel func_809ECA50 /* 005B8 809ECE38 87A40044 */ lh $a0, 0x0044($sp) /* 005BC 809ECE3C 87A50046 */ lh $a1, 0x0046($sp) /* 005C0 809ECE40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005C4 809ECE44 0C034421 */ jal Matrix_RotateZYX +/* 005C4 809ECE44 0C034421 */ jal Matrix_RotateRPY /* 005C8 809ECE48 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 005CC 809ECE4C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 /* 005D0 809ECE50 0C0346BD */ jal Matrix_MultVec3f diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s index a3a4dee0d6..75ca549b41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s @@ -17,7 +17,7 @@ glabel func_80A1B9D8 /* 01074 80A1BA14 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 01078 80A1BA18 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 0107C 80A1BA1C 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateZYX +/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateRPY /* 01084 80A1BA24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01088 80A1BA28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0108C 80A1BA2C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -72,7 +72,7 @@ glabel func_80A1B9D8 /* 01140 80A1BAE0 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 01144 80A1BAE4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 01148 80A1BAE8 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateZYX +/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateRPY /* 01150 80A1BAF0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01154 80A1BAF4 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 /* 01158 80A1BAF8 44819000 */ mtc1 $at, $f18 ## $f18 = -15.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index 6be928d390..0be6e4659f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -173,7 +173,7 @@ glabel func_80A1CD24 /* 025EC 80A1CF8C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 025F0 80A1CF90 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 025F4 80A1CF94 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateZYX +/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateRPY /* 025FC 80A1CF9C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02600 80A1CFA0 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 /* 02604 80A1CFA4 8E0602D0 */ lw $a2, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s index 9375bdf9ef..b1817beb93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s @@ -21,7 +21,7 @@ glabel func_80A1FF8C /* 00218 80A1FFD8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 0021C 80A1FFDC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 00220 80A1FFE0 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateZYX +/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateRPY /* 00228 80A1FFE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0022C 80A1FFEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00230 80A1FFF0 3C01435C */ lui $at, 0x435C ## $at = 435C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 6cc0565db6..4d4cb3f10b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -239,7 +239,7 @@ glabel EnGb_Init /* 0039C 80A2F51C 86440030 */ lh $a0, 0x0030($s2) ## 00000030 /* 003A0 80A2F520 86450032 */ lh $a1, 0x0032($s2) ## 00000032 /* 003A4 80A2F524 86460034 */ lh $a2, 0x0034($s2) ## 00000034 -/* 003A8 80A2F528 0C034421 */ jal Matrix_RotateZYX +/* 003A8 80A2F528 0C034421 */ jal Matrix_RotateRPY /* 003AC 80A2F52C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 003B0 80A2F530 3C014230 */ lui $at, 0x4230 ## $at = 42300000 /* 003B4 80A2F534 44812000 */ mtc1 $at, $f4 ## $f4 = 44.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s index 1d6469003f..b3a789bb58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s @@ -15,7 +15,7 @@ glabel func_80A2F608 /* 004BC 80A2F63C 86240030 */ lh $a0, 0x0030($s1) ## 00000030 /* 004C0 80A2F640 86250032 */ lh $a1, 0x0032($s1) ## 00000032 /* 004C4 80A2F644 86260034 */ lh $a2, 0x0034($s1) ## 00000034 -/* 004C8 80A2F648 0C034421 */ jal Matrix_RotateZYX +/* 004C8 80A2F648 0C034421 */ jal Matrix_RotateRPY /* 004CC 80A2F64C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 004D0 80A2F650 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004D4 80A2F654 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -56,7 +56,7 @@ glabel func_80A2F608 /* 0055C 80A2F6DC 86240030 */ lh $a0, 0x0030($s1) ## 00000030 /* 00560 80A2F6E0 86250032 */ lh $a1, 0x0032($s1) ## 00000032 /* 00564 80A2F6E4 86260034 */ lh $a2, 0x0034($s1) ## 00000034 -/* 00568 80A2F6E8 0C034421 */ jal Matrix_RotateZYX +/* 00568 80A2F6E8 0C034421 */ jal Matrix_RotateRPY /* 0056C 80A2F6EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00570 80A2F6F0 02402025 */ or $a0, $s2, $zero ## $a0 = 80A30778 /* 00574 80A2F6F4 0C0346BD */ jal Matrix_MultVec3f diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index 655fc83f80..e3855ebe8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -136,7 +136,7 @@ glabel func_80A30350 /* 013E4 80A30564 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 013E8 80A30568 11C00003 */ beq $t6, $zero, .L80A30578 /* 013EC 80A3056C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013F0 80A30570 0C034421 */ jal Matrix_RotateZYX +/* 013F0 80A30570 0C034421 */ jal Matrix_RotateRPY /* 013F4 80A30574 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80A30578: /* 013F8 80A30578 4406B000 */ mfc1 $a2, $f22 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s index cc8e12bc45..7e68bfeb47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s @@ -15,7 +15,7 @@ glabel func_80A3E090 /* 009E4 80A3E0C4 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 009E8 80A3E0C8 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 009EC 80A3E0CC 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 009F0 80A3E0D0 0C034421 */ jal Matrix_RotateZYX +/* 009F0 80A3E0D0 0C034421 */ jal Matrix_RotateRPY /* 009F4 80A3E0D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 009F8 80A3E0D8 E7B4003C */ swc1 $f20, 0x003C($sp) /* 009FC 80A3E0DC E7B40038 */ swc1 $f20, 0x0038($sp) @@ -49,7 +49,7 @@ glabel func_80A3E090 /* 00A6C 80A3E14C 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 00A70 80A3E150 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00A74 80A3E154 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00A78 80A3E158 0C034421 */ jal Matrix_RotateZYX +/* 00A78 80A3E158 0C034421 */ jal Matrix_RotateRPY /* 00A7C 80A3E15C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A80 80A3E160 E7B4003C */ swc1 $f20, 0x003C($sp) /* 00A84 80A3E164 E7B40038 */ swc1 $f20, 0x0038($sp) @@ -68,7 +68,7 @@ glabel func_80A3E090 /* 00AB8 80A3E198 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 00ABC 80A3E19C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00AC0 80A3E1A0 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00AC4 80A3E1A4 0C034421 */ jal Matrix_RotateZYX +/* 00AC4 80A3E1A4 0C034421 */ jal Matrix_RotateRPY /* 00AC8 80A3E1A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00ACC 80A3E1AC E7B4003C */ swc1 $f20, 0x003C($sp) /* 00AD0 80A3E1B0 E7B40038 */ swc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s index cdf563e1b4..f7c43d7463 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s @@ -46,7 +46,7 @@ glabel func_80A41068 /* 02BA8 80A41118 010D0019 */ multu $t0, $t5 /* 02BAC 80A4111C 00002012 */ mflo $a0 /* 02BB0 80A41120 00042400 */ sll $a0, $a0, 16 -/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateZYX +/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateRPY /* 02BB8 80A41128 00042403 */ sra $a0, $a0, 16 /* 02BBC 80A4112C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02BC0 80A41130 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s index 8dab238baf..93c9205db9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s @@ -53,7 +53,7 @@ glabel func_80A47AB0 /* 04E44 80A47B74 014F0019 */ multu $t2, $t7 /* 04E48 80A47B78 00002012 */ mflo $a0 /* 04E4C 80A47B7C 00042400 */ sll $a0, $a0, 16 -/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateZYX +/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateRPY /* 04E54 80A47B84 00042403 */ sra $a0, $a0, 16 /* 04E58 80A47B88 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 04E5C 80A47B8C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s index 8554b39364..823b60dd10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s @@ -147,7 +147,7 @@ glabel EnKarebaba_Draw /* 013BC 80A9670C 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 013C0 80A96710 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 /* 013C4 80A96714 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013C8 80A96718 0C034421 */ jal Matrix_RotateZYX +/* 013C8 80A96718 0C034421 */ jal Matrix_RotateRPY /* 013CC 80A9671C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013D0 80A96720 8E6F0190 */ lw $t7, 0x0190($s3) ## 00000190 /* 013D4 80A96724 3C0380A9 */ lui $v1, %hi(func_80A95D90) ## $v1 = 80A90000 @@ -283,7 +283,7 @@ glabel EnKarebaba_Draw /* 015BC 80A9690C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 015C0 80A96910 016C2823 */ subu $a1, $t3, $t4 /* 015C4 80A96914 00052C00 */ sll $a1, $a1, 16 -/* 015C8 80A96918 0C034421 */ jal Matrix_RotateZYX +/* 015C8 80A96918 0C034421 */ jal Matrix_RotateRPY /* 015CC 80A9691C 00052C03 */ sra $a1, $a1, 16 /* 015D0 80A96920 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 015D4 80A96924 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index b4f1bd58fa..c498e674fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -400,7 +400,7 @@ glabel EnPoSisters_Draw /* 04600 80ADD590 00052C03 */ sra $a1, $a1, 16 /* 04604 80ADD594 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 04608 80ADD598 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateZYX +/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateRPY /* 04610 80ADD5A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 04614 80ADD5A4 8FAC007C */ lw $t4, 0x007C($sp) /* 04618 80ADD5A8 8E980190 */ lw $t8, 0x0190($s4) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index 63663fa62a..85f6f8e346 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -139,7 +139,7 @@ glabel EnRr_Draw /* 01F68 80AEA3A8 8604025C */ lh $a0, 0x025C($s0) ## 0000029C /* 01F6C 80AEA3AC 8605025E */ lh $a1, 0x025E($s0) ## 0000029E /* 01F70 80AEA3B0 86060260 */ lh $a2, 0x0260($s0) ## 000002A0 -/* 01F74 80AEA3B4 0C034421 */ jal Matrix_RotateZYX +/* 01F74 80AEA3B4 0C034421 */ jal Matrix_RotateRPY /* 01F78 80AEA3B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01F7C 80AEA3BC 0C034213 */ jal Matrix_Push /* 01F80 80AEA3C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s index 4b7c1d1b6c..4695695483 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s @@ -30,7 +30,7 @@ glabel func_80B01360 /* 03120 80B013D0 2404C000 */ addiu $a0, $zero, 0xC000 ## $a0 = FFFFC000 /* 03124 80B013D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03128 80B013D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0312C 80B013DC 0C034421 */ jal Matrix_RotateZYX +/* 0312C 80B013DC 0C034421 */ jal Matrix_RotateRPY /* 03130 80B013E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 03134 80B013E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03138 80B013E8 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s index bedf5a6455..6d6e4dd44a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s @@ -236,7 +236,7 @@ glabel EnVm_Draw /* 014D0 80B2E930 86240254 */ lh $a0, 0x0254($s1) ## 00000254 /* 014D4 80B2E934 86250256 */ lh $a1, 0x0256($s1) ## 00000256 /* 014D8 80B2E938 86260258 */ lh $a2, 0x0258($s1) ## 00000258 -/* 014DC 80B2E93C 0C034421 */ jal Matrix_RotateZYX +/* 014DC 80B2E93C 0C034421 */ jal Matrix_RotateRPY /* 014E0 80B2E940 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 014E4 80B2E944 3C0180B3 */ lui $at, %hi(D_80B2EC38) ## $at = 80B30000 /* 014E8 80B2E948 C42AEC38 */ lwc1 $f10, %lo(D_80B2EC38)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index b419dbb624..f0b6d26d4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -76,7 +76,7 @@ glabel func_80B402C4 /* 041B8 80B40398 862602A4 */ lh $a2, 0x02A4($s1) ## 000002A4 /* 041BC 80B4039C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 041C0 80B403A0 84441480 */ lh $a0, 0x1480($v0) ## 80161480 -/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateZYX +/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateRPY /* 041C8 80B403A8 84451482 */ lh $a1, 0x1482($v0) ## 80161482 /* 041CC 80B403AC 26220298 */ addiu $v0, $s1, 0x0298 ## $v0 = 00000298 /* 041D0 80B403B0 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000298 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s index 01590b3c84..d50d896f04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s @@ -76,7 +76,7 @@ glabel func_80B4F45C /* 00B38 80B4F4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00B3C 80B4F4CC 84440000 */ lh $a0, 0x0000($v0) ## 00000000 /* 00B40 80B4F4D0 84450002 */ lh $a1, 0x0002($v0) ## 00000002 -/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateZYX +/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateRPY /* 00B48 80B4F4D8 84460004 */ lh $a2, 0x0004($v0) ## 00000004 /* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push /* 00B50 80B4F4E0 00000000 */ nop @@ -130,7 +130,7 @@ glabel func_80B4F45C /* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) /* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 /* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 -/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateZYX +/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateRPY /* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 /* 00C20 80B4F5B0 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 /* 00C24 80B4F5B4 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 @@ -181,7 +181,7 @@ glabel func_80B4F45C /* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 /* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 /* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 -/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateZYX +/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateRPY /* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 /* 00CE8 80B4F678 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 00CEC 80B4F67C 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 @@ -233,7 +233,7 @@ glabel func_80B4F45C /* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 /* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 /* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 -/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateZYX +/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateRPY /* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 /* 00DB4 80B4F744 3C0180B5 */ lui $at, %hi(D_80B52BB4) ## $at = 80B50000 /* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) @@ -301,7 +301,7 @@ glabel func_80B4F45C /* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 /* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 /* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 -/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateZYX +/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateRPY /* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 /* 00EC0 80B4F850 3C0180B5 */ lui $at, %hi(D_80B52BC0) ## $at = 80B50000 /* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) @@ -357,7 +357,7 @@ glabel func_80B4F45C /* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 /* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 /* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 -/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateZYX +/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateRPY /* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 /* 00F9C 80B4F92C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 00FA0 80B4F930 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 @@ -425,7 +425,7 @@ glabel func_80B4F45C /* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 /* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 /* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 -/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateZYX +/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateRPY /* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 /* 010A8 80B4FA38 3C0180B5 */ lui $at, %hi(D_80B52BCC) ## $at = 80B50000 /* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) @@ -480,7 +480,7 @@ glabel func_80B4F45C /* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 /* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 /* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 -/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateZYX +/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateRPY /* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 /* 01180 80B4FB10 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 01184 80B4FB14 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s index 2cf6ebbd80..b5dedaabe1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s @@ -60,7 +60,7 @@ glabel func_80B4FB74 /* 01298 80B4FC28 2404A219 */ addiu $a0, $zero, 0xA219 ## $a0 = FFFFA219 /* 0129C 80B4FC2C 2405AC17 */ addiu $a1, $zero, 0xAC17 ## $a1 = FFFFAC17 /* 012A0 80B4FC30 24063333 */ addiu $a2, $zero, 0x3333 ## $a2 = 00003333 -/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateZYX +/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateRPY /* 012A8 80B4FC38 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 012AC 80B4FC3C 3C0180B5 */ lui $at, %hi(D_80B52BD4) ## $at = 80B50000 /* 012B0 80B4FC40 C42C2BD4 */ lwc1 $f12, %lo(D_80B52BD4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s index ba4db9aea6..b6536225a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s @@ -87,7 +87,7 @@ glabel func_80B5458C /* 01274 80B54624 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01278 80B54628 85040000 */ lh $a0, 0x0000($t0) ## 00000000 /* 0127C 80B5462C 85050002 */ lh $a1, 0x0002($t0) ## 00000002 -/* 01280 80B54630 0C034421 */ jal Matrix_RotateZYX +/* 01280 80B54630 0C034421 */ jal Matrix_RotateRPY /* 01284 80B54634 85060004 */ lh $a2, 0x0004($t0) ## 00000004 /* 01288 80B54638 0C034213 */ jal Matrix_Push /* 0128C 80B5463C 00000000 */ nop @@ -141,7 +141,7 @@ glabel func_80B5458C /* 01348 80B546F8 AFA30020 */ sw $v1, 0x0020($sp) /* 0134C 80B546FC 00063403 */ sra $a2, $a2, 16 /* 01350 80B54700 00052C03 */ sra $a1, $a1, 16 -/* 01354 80B54704 0C034421 */ jal Matrix_RotateZYX +/* 01354 80B54704 0C034421 */ jal Matrix_RotateRPY /* 01358 80B54708 00042403 */ sra $a0, $a0, 16 /* 0135C 80B5470C 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 /* 01360 80B54710 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 @@ -188,7 +188,7 @@ glabel func_80B5458C /* 01400 80B547B0 00042400 */ sll $a0, $a0, 16 /* 01404 80B547B4 00042403 */ sra $a0, $a0, 16 /* 01408 80B547B8 00052C03 */ sra $a1, $a1, 16 -/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateZYX +/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateRPY /* 01410 80B547C0 00063403 */ sra $a2, $a2, 16 /* 01414 80B547C4 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 01418 80B547C8 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 @@ -236,7 +236,7 @@ glabel func_80B5458C /* 014BC 80B5486C 00042400 */ sll $a0, $a0, 16 /* 014C0 80B54870 00042403 */ sra $a0, $a0, 16 /* 014C4 80B54874 00052C03 */ sra $a1, $a1, 16 -/* 014C8 80B54878 0C034421 */ jal Matrix_RotateZYX +/* 014C8 80B54878 0C034421 */ jal Matrix_RotateRPY /* 014CC 80B5487C 00063403 */ sra $a2, $a2, 16 /* 014D0 80B54880 3C0180B6 */ lui $at, %hi(D_80B5AAEC) ## $at = 80B60000 /* 014D4 80B54884 C42CAAEC */ lwc1 $f12, %lo(D_80B5AAEC)($at) @@ -304,7 +304,7 @@ glabel func_80B5458C /* 015C8 80B54978 00042400 */ sll $a0, $a0, 16 /* 015CC 80B5497C 00042403 */ sra $a0, $a0, 16 /* 015D0 80B54980 00052C03 */ sra $a1, $a1, 16 -/* 015D4 80B54984 0C034421 */ jal Matrix_RotateZYX +/* 015D4 80B54984 0C034421 */ jal Matrix_RotateRPY /* 015D8 80B54988 00063403 */ sra $a2, $a2, 16 /* 015DC 80B5498C 3C0180B6 */ lui $at, %hi(D_80B5AAF8) ## $at = 80B60000 /* 015E0 80B54990 C42CAAF8 */ lwc1 $f12, %lo(D_80B5AAF8)($at) @@ -360,7 +360,7 @@ glabel func_80B5458C /* 016A4 80B54A54 00042400 */ sll $a0, $a0, 16 /* 016A8 80B54A58 00042403 */ sra $a0, $a0, 16 /* 016AC 80B54A5C 00052C03 */ sra $a1, $a1, 16 -/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateZYX +/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateRPY /* 016B4 80B54A64 00063403 */ sra $a2, $a2, 16 /* 016B8 80B54A68 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 016BC 80B54A6C 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 @@ -428,7 +428,7 @@ glabel func_80B5458C /* 017B0 80B54B60 00042400 */ sll $a0, $a0, 16 /* 017B4 80B54B64 00042403 */ sra $a0, $a0, 16 /* 017B8 80B54B68 00052C03 */ sra $a1, $a1, 16 -/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateZYX +/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateRPY /* 017C0 80B54B70 00063403 */ sra $a2, $a2, 16 /* 017C4 80B54B74 3C0180B6 */ lui $at, %hi(D_80B5AB04) ## $at = 80B60000 /* 017C8 80B54B78 C42CAB04 */ lwc1 $f12, %lo(D_80B5AB04)($at) @@ -483,7 +483,7 @@ glabel func_80B5458C /* 01888 80B54C38 00042400 */ sll $a0, $a0, 16 /* 0188C 80B54C3C 00042403 */ sra $a0, $a0, 16 /* 01890 80B54C40 00052C03 */ sra $a1, $a1, 16 -/* 01894 80B54C44 0C034421 */ jal Matrix_RotateZYX +/* 01894 80B54C44 0C034421 */ jal Matrix_RotateRPY /* 01898 80B54C48 00063403 */ sra $a2, $a2, 16 /* 0189C 80B54C4C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 018A0 80B54C50 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s index f2fc0efba3..376b1d0cec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s @@ -78,7 +78,7 @@ glabel func_80B5944C /* 06138 80B594E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0613C 80B594EC 84640000 */ lh $a0, 0x0000($v1) ## 00000000 /* 06140 80B594F0 84650002 */ lh $a1, 0x0002($v1) ## 00000002 -/* 06144 80B594F4 0C034421 */ jal Matrix_RotateZYX +/* 06144 80B594F4 0C034421 */ jal Matrix_RotateRPY /* 06148 80B594F8 84660004 */ lh $a2, 0x0004($v1) ## 00000004 /* 0614C 80B594FC 0C034213 */ jal Matrix_Push /* 06150 80B59500 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s index af8a813abd..80940b18a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s @@ -35,7 +35,7 @@ glabel ObjIcePoly_Draw /* 00768 80B949C8 24040500 */ addiu $a0, $zero, 0x0500 ## $a0 = 00000500 /* 0076C 80B949CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00770 80B949D0 2406FB00 */ addiu $a2, $zero, 0xFB00 ## $a2 = FFFFFB00 -/* 00774 80B949D4 0C034421 */ jal Matrix_RotateZYX +/* 00774 80B949D4 0C034421 */ jal Matrix_RotateRPY /* 00778 80B949D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0077C 80B949DC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00780 80B949E0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s index cf3d3b5ba1..9230447706 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s @@ -146,7 +146,7 @@ glabel func_809A16F4 /* 00314 809A1924 86040044 */ lh $a0, 0x0044($s0) ## 00000044 /* 00318 809A1928 86050046 */ lh $a1, 0x0046($s0) ## 00000046 /* 0031C 809A192C 86060048 */ lh $a2, 0x0048($s0) ## 00000048 -/* 00320 809A1930 0C034421 */ jal Matrix_RotateZYX +/* 00320 809A1930 0C034421 */ jal Matrix_RotateRPY /* 00324 809A1934 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00328 809A1938 3C01809A */ lui $at, %hi(D_809A1ACC) ## $at = 809A0000 /* 0032C 809A193C C42C1ACC */ lwc1 $f12, %lo(D_809A1ACC)($at) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index ab93f68b46..97b1e3794e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -33,7 +33,7 @@ glabel func_809AC42C /* 001D8 809AC4A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 001DC 809AC4AC 86250042 */ lh $a1, 0x0042($s1) ## 00000042 /* 001E0 809AC4B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateZYX +/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateRPY /* 001E8 809AC4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 001EC 809AC4BC 10000017 */ beq $zero, $zero, .L809AC51C /* 001F0 809AC4C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -57,7 +57,7 @@ glabel func_809AC42C /* 00234 809AC504 00C13021 */ addu $a2, $a2, $at /* 00238 809AC508 00063100 */ sll $a2, $a2, 4 /* 0023C 809AC50C 00063400 */ sll $a2, $a2, 16 -/* 00240 809AC510 0C034421 */ jal Matrix_RotateZYX +/* 00240 809AC510 0C034421 */ jal Matrix_RotateRPY /* 00244 809AC514 00063403 */ sra $a2, $a2, 16 /* 00248 809AC518 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809AC51C: diff --git a/include/functions.h b/include/functions.h index 668ffdf196..79b8fb0e3b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -700,14 +700,16 @@ s32 Collider_DestroyJntSph(GlobalContext* globalCtx, ColliderJntSph* collider); s32 Collider_SetJntSph_Set(GlobalContext* globalCtx, ColliderJntSph* dest, ColliderJntSphInit_Actor* src); s32 Collider_SetJntSph_Set3(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit_Set3* src); s32 Collider_SetJntSph_Set5(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src); -s32 Collider_SetJntSph(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src, ColliderJntSphItem* list); +s32 Collider_SetJntSph(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src, + ColliderJntSphItem* list); s32 Collider_InitCylinderDim(GlobalContext* globalCtx, Cylinder16* dim); s32 Collider_DestroyCylinderDim(GlobalContext* globalCtx, Cylinder16* dim); s32 Collider_SetCylinderDim(GlobalContext* globalCtx, Cylinder16* dest, Cylinder16* src); s32 Collider_InitCylinder(GlobalContext* globalCtx, ColliderCylinder* collider); s32 Collider_DestroyCylinder(GlobalContext* globalCtx, ColliderCylinder* collider); s32 Collider_SetCylinder_Actor(GlobalContext* globalCtx, ColliderCylinder* collider, ColliderCylinderInit_Actor* arg2); -s32 Collider_SetCylinder_Set3(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, ColliderCylinderInit_Set3* src); +s32 Collider_SetCylinder_Set3(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, + ColliderCylinderInit_Set3* src); s32 Collider_SetCylinder(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, ColliderCylinderInit* src); s32 Collider_CylinderSetAT(GlobalContext* globalCtx, Collider* collider); s32 Collider_CylinderSetAC(GlobalContext* globalCtx, Collider* collider); @@ -727,7 +729,7 @@ s32 Collider_DestroyTris(GlobalContext* globalCtx, ColliderTris* tris); s32 Collider_SetTris_Set3(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit_Set3* src); s32 Collider_SetTris_Set5(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit* src); s32 Collider_SetTris(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit* src, - ColliderTrisItem* list); + ColliderTrisItem* list); s32 Collider_TrisSetAT(GlobalContext* globalCtx, Collider* collider); s32 Collider_TrisSetAC(GlobalContext* globalCtx, Collider* collider); s32 Collider_TrisSetOC(GlobalContext* globalCtx, Collider* collider); @@ -785,7 +787,8 @@ void func_80061ED4(CollisionCheckInfo* info, DamageTable* damageTable, Collision void func_80061EFC(CollisionCheckInfo* info, DamageTable* damageTable, CollisionCheckInfoInit2* init); // ? func_80061F64(?); // ? func_800622E4(?); -s32 CollisionCheck_GeneralLineOcCheck(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Vec3f* camera_3C, Vec3f* arg3, Actor** arg4, s32 arg5); +s32 CollisionCheck_GeneralLineOcCheck(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Vec3f* camera_3C, + Vec3f* arg3, Actor** arg4, s32 arg5); // ? func_800626B0(?); void Collider_CylinderUpdate(Actor* actor, ColliderCylinder* collider); // ? func_80062734(?); @@ -1691,8 +1694,8 @@ void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode); void Matrix_RotateX(f32 x, u8 mode); void Matrix_RotateY(f32 y, u8 mode); void Matrix_RotateZ(f32 z, u8 mode); -void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode); -void Matrix_TranslateThenRotateZYX(Vec3f* arg0, Vec3s* arg1); +void Matrix_RotateRPY(s16 x, s16 y, s16 z, u8 mode); +void Matrix_JointPosition(Vec3f* position, Vec3s* rotation); void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec); Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest); Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line); @@ -1713,7 +1716,7 @@ u32 SysUcode_GetUCodeBoot(); u32 SysUcode_GetUCodeBootSize(); u32 SysUcode_GetUCode(); u32 SysUcode_GetUCodeData(); -void func_800D2E30(UnkRumbleStruct *arg0); +void func_800D2E30(UnkRumbleStruct* arg0); void func_800D3140(UnkRumbleStruct* arg0); void func_800D3178(UnkRumbleStruct* arg0); // ? func_800D31F0(?); @@ -2376,7 +2379,9 @@ void guLookAtReflect(Mtx*, f32, f32, f32, f32, f32, f32, f32, f32, f32); // ? osContStartQuery(?); void osContGetQuery(OSContStatus* data); // ? guLookAtHiliteF(?); -void guLookAtHilite(Mtx* m, LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, f32 xl2, f32 yl2, f32 zl2, s32 hiliteWidth, s32 hiliteHeight); +void guLookAtHilite(Mtx* m, LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, + f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, f32 xl2, f32 yl2, f32 zl2, s32 hiliteWidth, + s32 hiliteHeight); // ? __osSpDeviceBusy(?); // ? func_80103B60(?); // ? guPositionF(?); diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 0baf115b57..e009acb41a 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -134,10 +134,10 @@ void Audio_NoteSetResamplingRate(NoteSubEu* noteSubEu, f32 resamplingRateInput) void Audio_NoteInit(Note* note) { if (note->playbackState.parentLayer->adsr.releaseRate == 0) { Audio_AdsrInit(¬e->playbackState.adsr, note->playbackState.parentLayer->seqChannel->adsr.envelope, - ¬e->playbackState.adsrVolScale); + ¬e->playbackState.adsrVolScale); } else { Audio_AdsrInit(¬e->playbackState.adsr, note->playbackState.parentLayer->adsr.envelope, - ¬e->playbackState.adsrVolScale); + ¬e->playbackState.adsrVolScale); } note->playbackState.unk_04 = 0; @@ -576,8 +576,7 @@ Note* Audio_PopNodeWithValueLessEqual(AudioListItem* list, s32 limit) { } for (best = cur; cur != list; cur = cur->next) { - if (((Note*)best->u.value)->playbackState.priority >= - ((Note*)cur->u.value)->playbackState.priority) { + if (((Note*)best->u.value)->playbackState.priority >= ((Note*)cur->u.value)->playbackState.priority) { best = cur; } } diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 814b8fa2cf..62e5b7487a 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -301,7 +301,7 @@ void Matrix_RotateZ(f32 z, u8 mode) { * by `x` degrees. (roll-pitch-yaw) * Original Name: Matrix_RotateXYZ, changed to reflect rotation order. */ -void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) { +void Matrix_RotateRPY(s16 x, s16 y, s16 z, u8 mode) { MtxF* cmf = sCurrentMatrix; f32 temp1; f32 temp2; @@ -387,10 +387,9 @@ void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) { } /* - * Translates the top of the matrix stack by `translation` units, - * then rotates that matrix by `rotation` in Z-Y-X order (roll-pitch-yaw) + * Roll-pitch-yaw rotation and position */ -void Matrix_TranslateThenRotateZYX(Vec3f* translation, Vec3s* rotation) { +void Matrix_JointPosition(Vec3f* position, Vec3s* rotation) { MtxF* cmf = sCurrentMatrix; f32 sin; f32 cos; @@ -402,25 +401,25 @@ void Matrix_TranslateThenRotateZYX(Vec3f* translation, Vec3s* rotation) { temp1 = cmf->xx; temp2 = cmf->yx; - cmf->wx += temp1 * translation->x + temp2 * translation->y + cmf->zx * translation->z; + cmf->wx += temp1 * position->x + temp2 * position->y + cmf->zx * position->z; cmf->xx = temp1 * cos + temp2 * sin; cmf->yx = temp2 * cos - temp1 * sin; temp1 = cmf->xy; temp2 = cmf->yy; - cmf->wy += temp1 * translation->x + temp2 * translation->y + cmf->zy * translation->z; + cmf->wy += temp1 * position->x + temp2 * position->y + cmf->zy * position->z; cmf->xy = temp1 * cos + temp2 * sin; cmf->yy = temp2 * cos - temp1 * sin; temp1 = cmf->xz; temp2 = cmf->yz; - cmf->wz += temp1 * translation->x + temp2 * translation->y + cmf->zz * translation->z; + cmf->wz += temp1 * position->x + temp2 * position->y + cmf->zz * position->z; cmf->xz = temp1 * cos + temp2 * sin; cmf->yz = temp2 * cos - temp1 * sin; temp1 = cmf->xw; temp2 = cmf->yw; - cmf->ww += temp1 * translation->x + temp2 * translation->y + cmf->zw * translation->z; + cmf->ww += temp1 * position->x + temp2 * position->y + cmf->zw * position->z; cmf->xw = temp1 * cos + temp2 * sin; cmf->yw = temp2 * cos - temp1 * sin; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index f0532b86b5..318dd4838a 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -299,13 +299,13 @@ void func_8003E954(u32 uParm1, u8* puParm2) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041648.s") typedef struct { - /* 0x00 */ char unk_00[0x10]; + /* 0x00 */ char unk_00[0x10]; /* 0x10 */ void* unk_10; - /* 0x14 */ char unk_[0x04]; + /* 0x14 */ char unk_[0x04]; /* 0x18 */ void* unk_18; /* 0x1C */ void* unk_1C; /* 0x20 */ void* unk_20; - /* 0x24 */ char unk_24[4]; + /* 0x24 */ char unk_24[4]; /* 0x28 */ void* unk_28; } Struct800417A0; // size = 0x32 diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 29630f441f..399e96d408 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -83,7 +83,7 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalCont Matrix_Translate(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, MTXMODE_NEW); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); - Matrix_RotateZYX(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); + Matrix_RotateRPY(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); gDPLoadTextureBlock(gfxCtx->polyXlu.p++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index afb142a8c7..b3b948e96c 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -50,7 +50,7 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk dList = limbEntry->displayLists[dListIndex]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList != NULL) { do { if (1) { @@ -114,7 +114,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb dList = limbEntry->displayLists[dListIndex]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList != NULL) { gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), G_MTX_LOAD); @@ -163,7 +163,7 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* dList[1] = dList[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList[1], &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); gfxCtx = globalCtx->state.gfxCtx; @@ -233,7 +233,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* li dList[1] = dList[0]; if ((overrideLimbDraw == 0) || (overrideLimbDraw(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 1033); gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); @@ -284,7 +284,7 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele dList = limbEntry->displayLists[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList != NULL) { do { if (1) { @@ -346,7 +346,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDra dList = rootLimb->displayLists[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList != NULL) { gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1176), G_MTX_LOAD); @@ -394,7 +394,7 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske dList[1] = dList[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList[1], &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1242); gSPMatrix(gfxCtx->polyOpa.p++, *limbMatricies, G_MTX_LOAD); @@ -465,7 +465,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbD dList[1] = dList[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList[1] != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 1327); gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); @@ -563,7 +563,7 @@ Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skel dList = limbEntry->displayLists[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, actor, &gfx) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList != NULL) { gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1489), G_MTX_LOAD); gSPDisplayList(gfx++, dList); @@ -621,7 +621,7 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDr dList = limbEntry->displayLists[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, actor, &gfx) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList != NULL) { gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1558), G_MTX_LOAD); gSPDisplayList(gfx++, dList); @@ -664,7 +664,7 @@ Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk dList1 = dList2 = limbEntry->displayLists[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, limbIndex, &dList1, &pos, &rot, actor, &gfx) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList1 != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 1623); gSPMatrix(gfx++, *mtx, G_MTX_LOAD); @@ -731,7 +731,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb dList1 = dList2 = limbEntry->displayLists[0]; if ((overrideLimbDraw == NULL) || (overrideLimbDraw(globalCtx, 1, &dList1, &pos, &rot, actor, &gfx) == 0)) { - Matrix_TranslateThenRotateZYX(&pos, &rot); + Matrix_JointPosition(&pos, &rot); if (dList1 != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 1710); gSPMatrix(gfx++, mtx, G_MTX_LOAD); diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index cbfc03dafd..17d77ba182 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -224,7 +224,7 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xC8, 0x00, this->alpha); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0x80); - Matrix_RotateZYX(0x4000, 0x0, 0x0, MTXMODE_APPLY); + Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); } else { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index e33348beac..294fcdb655 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -224,7 +224,7 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xAA, 0xFF, 0xFF, this->alpha); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0x80); - Matrix_RotateZYX(0x4000, 0x0, 0x0, MTXMODE_APPLY); + Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); } else { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 9e31dde574..c2d5cac011 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -224,7 +224,7 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xAA, this->alpha); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0x00, 0x80); - Matrix_RotateZYX(0x4000, 0x0, 0x0, MTXMODE_APPLY); + Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY); if (this->timer != 0) { Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); } else { diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index a80fb91393..511f8ec4df 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -95,7 +95,7 @@ void Title_Draw(TitleContext* this) { func_80093D18(this->state.gfxCtx); Matrix_Translate(-53.0, -5.0, 0, MTXMODE_NEW); Matrix_Scale(1.0, 1.0, 1.0, MTXMODE_APPLY); - Matrix_RotateZYX(0, sTitleRotY, 0, MTXMODE_APPLY); + Matrix_RotateRPY(0, sTitleRotY, 0, MTXMODE_APPLY); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_01002720);