mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-02 09:34:27 +00:00
Code Issues Projects Releases Wiki Activity

Rename Matrix_Pull to Matrix_Pop (#703)

Browse source
This commit is contained in:
Roman971 2021-02-24 20:28:04 +01:00 • committed by GitHub
parent 3eec91504c
commit d30ef91417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
89 changed files with 158 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/code/z_actor/func_8002FBAC.s
View file

@ -539,7 +539,7 @@ glabel func_8002FBAC
/* AA7494 800302F4 ACAF02D0 */ sw $t7, 0x2d0($a1)
/* AA7498 800302F8 AC440004 */ sw $a0, 4($v0)
/* AA749C 800302FC AC580000 */ sw $t8, ($v0)
/* AA74A0 80030300 0C034221 */ jal Matrix_Pull
/* AA74A0 80030300 0C034221 */ jal Matrix_Pop
/* AA74A4 80030304 AFA40030 */ sw $a0, 0x30($sp)
/* AA74A8 80030308 8FAE0034 */ lw $t6, 0x34($sp)
/* AA74AC 8003030C 3C014F80 */ li $at, 0x4F800000 # 0.000000

6
asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s
View file

@ -309,7 +309,7 @@ glabel func_808BA2CC
/* 007F8 808BA6F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008
/* 007FC 808BA6FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0
/* 00800 808BA700 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004
/* 00804 808BA704 0C034221 */ jal Matrix_Pull
/* 00804 808BA704 0C034221 */ jal Matrix_Pop
/* 00808 808BA708 AC590000 */ sw $t9, 0x0000($v0) ## 00000000
/* 0080C 808BA70C 0C034213 */ jal Matrix_Push
/* 00810 808BA710 00000000 */ nop
@ -479,7 +479,7 @@ glabel func_808BA2CC
/* 00A7C 808BA97C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 00A80 808BA980 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0
/* 00A84 808BA984 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004
/* 00A88 808BA988 0C034221 */ jal Matrix_Pull
/* 00A88 808BA988 0C034221 */ jal Matrix_Pop
/* 00A8C 808BA98C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 00A90 808BA990 0C034213 */ jal Matrix_Push
/* 00A94 808BA994 00000000 */ nop
@ -652,7 +652,7 @@ glabel func_808BA2CC
/* 00D0C 808BAC0C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008
/* 00D10 808BAC10 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0
/* 00D14 808BAC14 AC590004 */ sw $t9, 0x0004($v0) ## 00000004
/* 00D18 808BAC18 0C034221 */ jal Matrix_Pull
/* 00D18 808BAC18 0C034221 */ jal Matrix_Pop
/* 00D1C 808BAC1C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000
/* 00D20 808BAC20 8FAB00AC */ lw $t3, 0x00AC($sp)
/* 00D24 808BAC24 3C06808C */ lui $a2, %hi(D_808BAD40) ## $a2 = 808C0000

2
asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s
View file

@ -167,7 +167,7 @@ glabel func_808C4940
/* 039BC 808C4B4C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000
/* 039C0 808C4B50 8FAD0058 */ lw $t5, 0x0058($sp)
/* 039C4 808C4B54 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000
/* 039C8 808C4B58 0C034221 */ jal Matrix_Pull
/* 039C8 808C4B58 0C034221 */ jal Matrix_Pop
/* 039CC 808C4B5C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004
/* 039D0 808C4B60 8FAF0050 */ lw $t7, 0x0050($sp)
/* 039D4 808C4B64 3C06808D */ lui $a2, %hi(D_808CA5C8) ## $a2 = 808D0000

16
asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s
View file

@ -254,7 +254,7 @@ glabel func_808D08F8
/* 05DF4 808D0BB4 0C028572 */ jal SkelAnime_DrawOpa
/* 05DF8 808D0BB8 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000
/* 05DFC 808D0BBC 0C034221 */ jal Matrix_Pull
/* 05DFC 808D0BBC 0C034221 */ jal Matrix_Pop
/* 05E00 808D0BC0 00000000 */ nop
/* 05E04 808D0BC4 3C04808D */ lui $a0, %hi(D_808D1DF0) ## $a0 = 808D0000
/* 05E08 808D0BC8 0C00084C */ jal osSyncPrintf
@ -312,7 +312,7 @@ glabel func_808D08F8
/* 05ED4 808D0C94 0C028572 */ jal SkelAnime_DrawOpa
/* 05ED8 808D0C98 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000
/* 05EDC 808D0C9C 0C034221 */ jal Matrix_Pull
/* 05EDC 808D0C9C 0C034221 */ jal Matrix_Pop
/* 05EE0 808D0CA0 00000000 */ nop
/* 05EE4 808D0CA4 3C04808D */ lui $a0, %hi(D_808D1DF4) ## $a0 = 808D0000
/* 05EE8 808D0CA8 0C00084C */ jal osSyncPrintf
@ -581,7 +581,7 @@ glabel func_808D08F8
/* 062E0 808D10A0 2A210012 */ slti $at, $s1, 0x0012
/* 062E4 808D10A4 1420FF10 */ bne $at, $zero, .L808D0CE8
/* 062E8 808D10A8 26B50040 */ addiu $s5, $s5, 0x0040 ## $s5 = 00000040
/* 062EC 808D10AC 0C034221 */ jal Matrix_Pull
/* 062EC 808D10AC 0C034221 */ jal Matrix_Pop
/* 062F0 808D10B0 00000000 */ nop
/* 062F4 808D10B4 3C04808D */ lui $a0, %hi(D_808D1E18) ## $a0 = 808D0000
/* 062F8 808D10B8 0C00084C */ jal osSyncPrintf
@ -682,7 +682,7 @@ glabel func_808D08F8
/* 06464 808D1224 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000
/* 06468 808D1228 0C018A29 */ jal Collider_UpdateSpheres
/* 0646C 808D122C 8FA5007C */ lw $a1, 0x007C($sp)
/* 06470 808D1230 0C034221 */ jal Matrix_Pull
/* 06470 808D1230 0C034221 */ jal Matrix_Pop
/* 06474 808D1234 00000000 */ nop
/* 06478 808D1238 3C04808D */ lui $a0, %hi(D_808D1E24) ## $a0 = 808D0000
/* 0647C 808D123C 0C00084C */ jal osSyncPrintf
@ -801,7 +801,7 @@ glabel func_808D08F8
/* 06628 808D13E8 26660E04 */ addiu $a2, $s3, 0x0E04 ## $a2 = 00000E04
/* 0662C 808D13EC 0C2340B7 */ jal func_808D02DC
/* 06630 808D13F0 AFA00014 */ sw $zero, 0x0014($sp)
/* 06634 808D13F4 0C034221 */ jal Matrix_Pull
/* 06634 808D13F4 0C034221 */ jal Matrix_Pop
/* 06638 808D13F8 00000000 */ nop
/* 0663C 808D13FC 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0
/* 06640 808D1400 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000
@ -861,7 +861,7 @@ glabel func_808D08F8
/* 0670C 808D14CC 26660FF0 */ addiu $a2, $s3, 0x0FF0 ## $a2 = 00000FF0
/* 06710 808D14D0 0C2340B7 */ jal func_808D02DC
/* 06714 808D14D4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000C9C
/* 06718 808D14D8 0C034221 */ jal Matrix_Pull
/* 06718 808D14D8 0C034221 */ jal Matrix_Pop
/* 0671C 808D14DC 00000000 */ nop
/* 06720 808D14E0 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0
/* 06724 808D14E4 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000
@ -927,9 +927,9 @@ glabel func_808D08F8
/* 06808 808D15C8 266611DC */ addiu $a2, $s3, 0x11DC ## $a2 = 000011DC
/* 0680C 808D15CC 0C2340B7 */ jal func_808D02DC
/* 06810 808D15D0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000C9C
/* 06814 808D15D4 0C034221 */ jal Matrix_Pull
/* 06814 808D15D4 0C034221 */ jal Matrix_Pop
/* 06818 808D15D8 00000000 */ nop
/* 0681C 808D15DC 0C034221 */ jal Matrix_Pull
/* 0681C 808D15DC 0C034221 */ jal Matrix_Pop
/* 06820 808D15E0 00000000 */ nop
/* 06824 808D15E4 3C04808D */ lui $a0, %hi(D_808D1E30) ## $a0 = 808D0000
/* 06828 808D15E8 0C00084C */ jal osSyncPrintf

2
asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s
View file

@ -407,7 +407,7 @@ glabel func_808D52CC
/* 031F8 808D5868 AC580000 */ sw $t8, 0x0000($v0) ## 00000000
/* 031FC 808D586C 1420FFC1 */ bne $at, $zero, .L808D5774
/* 03200 808D5870 AC520004 */ sw $s2, 0x0004($v0) ## 00000004
/* 03204 808D5874 0C034221 */ jal Matrix_Pull
/* 03204 808D5874 0C034221 */ jal Matrix_Pop
/* 03208 808D5878 00000000 */ nop
/* 0320C 808D587C 8FAD0164 */ lw $t5, 0x0164($sp)
/* 03210 808D5880 3C06808D */ lui $a2, %hi(D_808D6414) ## $a2 = 808D0000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s
View file

@ -454,7 +454,7 @@ glabel func_808DF4F0
/* 092FC 808DFB6C AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0
/* 09300 808DFB70 AC680000 */ sw $t0, 0x0000($v1) ## 00000000
/* 09304 808DFB74 8FA90054 */ lw $t1, 0x0054($sp)
/* 09308 808DFB78 0C034221 */ jal Matrix_Pull
/* 09308 808DFB78 0C034221 */ jal Matrix_Pop
/* 0930C 808DFB7C AC690004 */ sw $t1, 0x0004($v1) ## 00000004
/* 09310 808DFB80 864A01AC */ lh $t2, 0x01AC($s2) ## 000001AC
/* 09314 808DFB84 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s
View file

@ -280,7 +280,7 @@ glabel func_808DFBD0
/* 09714 808DFF84 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 09718 808DFF88 01F8C821 */ addu $t9, $t7, $t8
/* 0971C 808DFF8C 03214021 */ addu $t0, $t9, $at
/* 09720 808DFF90 0C034221 */ jal Matrix_Pull
/* 09720 808DFF90 0C034221 */ jal Matrix_Pop
/* 09724 808DFF94 AC480004 */ sw $t0, 0x0004($v0) ## 00000004
/* 09728 808DFF98 8FAE005C */ lw $t6, 0x005C($sp)
/* 0972C 808DFF9C 3C06808F */ lui $a2, %hi(D_808F7BCC) ## $a2 = 808F0000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s
View file

@ -174,7 +174,7 @@ glabel func_808DFFC8
/* 099A0 808E0210 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 099A4 808E0214 01AE7821 */ addu $t7, $t5, $t6
/* 099A8 808E0218 01E1C021 */ addu $t8, $t7, $at
/* 099AC 808E021C 0C034221 */ jal Matrix_Pull
/* 099AC 808E021C 0C034221 */ jal Matrix_Pop
/* 099B0 808E0220 AC580004 */ sw $t8, 0x0004($v0) ## 00000004
/* 099B4 808E0224 8FB9007C */ lw $t9, 0x007C($sp)
/* 099B8 808E0228 3C06808F */ lui $a2, %hi(D_808F7C08) ## $a2 = 808F0000

4
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s
View file

@ -117,7 +117,7 @@ glabel func_808E1B54
/* 0B41C 808E1C8C AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0
/* 0B420 808E1C90 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000
/* 0B424 808E1C94 AC780000 */ sw $t8, 0x0000($v1) ## 00000000
/* 0B428 808E1C98 0C034221 */ jal Matrix_Pull
/* 0B428 808E1C98 0C034221 */ jal Matrix_Pop
/* 0B42C 808E1C9C AC790004 */ sw $t9, 0x0004($v1) ## 00000004
/* 0B430 808E1CA0 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0
/* 0B434 808E1CA4 3C0A808E */ lui $t2, %hi(D_808E7DE8) ## $t2 = 808E0000
@ -192,7 +192,7 @@ glabel func_808E1B54
/* 0B544 808E1DB4 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0
/* 0B548 808E1DB8 AC790000 */ sw $t9, 0x0000($v1) ## 00000000
/* 0B54C 808E1DBC 8FA80034 */ lw $t0, 0x0034($sp)
/* 0B550 808E1DC0 0C034221 */ jal Matrix_Pull
/* 0B550 808E1DC0 0C034221 */ jal Matrix_Pop
/* 0B554 808E1DC4 AC680004 */ sw $t0, 0x0004($v1) ## 00000004
/* 0B558 808E1DC8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001
/* 0B55C 808E1DCC 00118C00 */ sll $s1, $s1, 16

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s
View file

@ -149,7 +149,7 @@ glabel func_80904108
/* 073BC 809042FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 073C0 80904300 018D7021 */ addu $t6, $t4, $t5
/* 073C4 80904304 01C17821 */ addu $t7, $t6, $at
/* 073C8 80904308 0C034221 */ jal Matrix_Pull
/* 073C8 80904308 0C034221 */ jal Matrix_Pop
/* 073CC 8090430C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004
/* 073D0 80904310 8FB8007C */ lw $t8, 0x007C($sp)
/* 073D4 80904314 3C068091 */ lui $a2, %hi(D_8090D778) ## $a2 = 80910000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s
View file

@ -211,7 +211,7 @@ glabel func_80904340
/* 076A4 809045E4 1420FFB4 */ bne $at, $zero, .L809044B8
/* 076A8 809045E8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004
.L809045EC:
/* 076AC 809045EC 0C034221 */ jal Matrix_Pull
/* 076AC 809045EC 0C034221 */ jal Matrix_Pop
/* 076B0 809045F0 00000000 */ nop
/* 076B4 809045F4 3C068091 */ lui $a2, %hi(D_8090D7B4) ## $a2 = 80910000
/* 076B8 809045F8 24C6D7B4 */ addiu $a2, $a2, %lo(D_8090D7B4) ## $a2 = 8090D7B4

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s
View file

@ -120,7 +120,7 @@ glabel func_8090464C
/* 07894 809047D4 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 07898 809047D8 03284821 */ addu $t1, $t9, $t0
/* 0789C 809047DC 01215021 */ addu $t2, $t1, $at
/* 078A0 809047E0 0C034221 */ jal Matrix_Pull
/* 078A0 809047E0 0C034221 */ jal Matrix_Pop
/* 078A4 809047E4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004
/* 078A8 809047E8 8FAB0054 */ lw $t3, 0x0054($sp)
/* 078AC 809047EC 3C068091 */ lui $a2, %hi(D_8090D7F0) ## $a2 = 80910000

4
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s
View file

@ -171,7 +171,7 @@ glabel func_809049A0
/* 07C80 80904BC0 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000
/* 07C84 80904BC4 8FAE0068 */ lw $t6, 0x0068($sp)
/* 07C88 80904BC8 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000
/* 07C8C 80904BCC 0C034221 */ jal Matrix_Pull
/* 07C8C 80904BCC 0C034221 */ jal Matrix_Pop
/* 07C90 80904BD0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004
/* 07C94 80904BD4 10000029 */ beq $zero, $zero, .L80904C7C
/* 07C98 80904BD8 8FA20024 */ lw $v0, 0x0024($sp)
@ -214,7 +214,7 @@ glabel func_809049A0
/* 07D24 80904C64 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000
/* 07D28 80904C68 8FAE0068 */ lw $t6, 0x0068($sp)
/* 07D2C 80904C6C 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000
/* 07D30 80904C70 0C034221 */ jal Matrix_Pull
/* 07D30 80904C70 0C034221 */ jal Matrix_Pop
/* 07D34 80904C74 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004
/* 07D38 80904C78 8FA20024 */ lw $v0, 0x0024($sp)
.L80904C7C:

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s
View file

@ -166,7 +166,7 @@ glabel func_80905674
/* 0896C 809058AC 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 08970 809058B0 01AE7821 */ addu $t7, $t5, $t6
/* 08974 809058B4 01E1C021 */ addu $t8, $t7, $at
/* 08978 809058B8 0C034221 */ jal Matrix_Pull
/* 08978 809058B8 0C034221 */ jal Matrix_Pop
/* 0897C 809058BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004
/* 08980 809058C0 8FB9007C */ lw $t9, 0x007C($sp)
/* 08984 809058C4 3C068091 */ lui $a2, %hi(D_8090D9A8) ## $a2 = 80910000

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s
View file

@ -419,7 +419,7 @@ glabel func_80912594
/* 024F4 80912B34 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFAC
/* 024F8 80912B38 0C0346BD */ jal Matrix_MultVec3f
/* 024FC 80912B3C 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFA0
/* 02500 80912B40 0C034221 */ jal Matrix_Pull
/* 02500 80912B40 0C034221 */ jal Matrix_Pop
/* 02504 80912B44 00000000 */ nop
/* 02508 80912B48 C6240200 */ lwc1 $f4, 0x0200($s1) ## 00000200
/* 0250C 80912B4C C7A60080 */ lwc1 $f6, 0x0080($sp)

4
asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s
View file

@ -293,7 +293,7 @@ glabel L8091A7CC
/* 04EC4 8091A8D4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000
/* 04EC8 8091A8D8 8FAA0070 */ lw $t2, 0x0070($sp)
/* 04ECC 8091A8DC 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000
/* 04ED0 8091A8E0 0C034221 */ jal Matrix_Pull
/* 04ED0 8091A8E0 0C034221 */ jal Matrix_Pop
/* 04ED4 8091A8E4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 04ED8 8091A8E8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001
.L8091A8EC:
@ -345,7 +345,7 @@ glabel L8091A8F4
/* 04F8C 8091A99C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000
/* 04F90 8091A9A0 8FAD0070 */ lw $t5, 0x0070($sp)
/* 04F94 8091A9A4 8DB80000 */ lw $t8, 0x0000($t5) ## 00000000
/* 04F98 8091A9A8 0C034221 */ jal Matrix_Pull
/* 04F98 8091A9A8 0C034221 */ jal Matrix_Pop
/* 04F9C 8091A9AC AC580004 */ sw $t8, 0x0004($v0) ## 00000004
/* 04FA0 8091A9B0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001
.L8091A9B4:

8
asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s
View file

@ -319,7 +319,7 @@ glabel func_80923870
/* 08180 80923C80 8D8C6438 */ lw $t4, %lo(D_80926438)($t4)
/* 08184 80923C84 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
.L80923C88:
/* 08188 80923C88 0C034221 */ jal Matrix_Pull
/* 08188 80923C88 0C034221 */ jal Matrix_Pop
/* 0818C 80923C8C 00000000 */ nop
/* 08190 80923C90 2A210002 */ slti $at, $s1, 0x0002
/* 08194 80923C94 14200073 */ bne $at, $zero, .L80923E64
@ -439,7 +439,7 @@ glabel func_80923870
/* 08350 80923E50 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 08354 80923E54 AE6A02C0 */ sw $t2, 0x02C0($s3) ## 000002C0
/* 08358 80923E58 AC540004 */ sw $s4, 0x0004($v0) ## 00000004
/* 0835C 80923E5C 0C034221 */ jal Matrix_Pull
/* 0835C 80923E5C 0C034221 */ jal Matrix_Pop
/* 08360 80923E60 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000
.L80923E64:
/* 08364 80923E64 3C048092 */ lui $a0, %hi(D_809264E8) ## $a0 = 80920000
@ -493,7 +493,7 @@ glabel func_80923870
/* 0841C 80923F1C 87B90086 */ lh $t9, 0x0086($sp)
/* 08420 80923F20 A61901F2 */ sh $t9, 0x01F2($s0) ## 000001F2
/* 08424 80923F24 87A80088 */ lh $t0, 0x0088($sp)
/* 08428 80923F28 0C034221 */ jal Matrix_Pull
/* 08428 80923F28 0C034221 */ jal Matrix_Pop
/* 0842C 80923F2C A60801F4 */ sh $t0, 0x01F4($s0) ## 000001F4
.L80923F30:
/* 08430 80923F30 2A210026 */ slti $at, $s1, 0x0026
@ -517,7 +517,7 @@ glabel func_80923870
/* 08470 80923F70 2A210029 */ slti $at, $s1, 0x0029
/* 08474 80923F74 1420FE9F */ bne $at, $zero, .L809239F4
/* 08478 80923F78 26F70040 */ addiu $s7, $s7, 0x0040 ## $s7 = 00000040
/* 0847C 80923F7C 0C034221 */ jal Matrix_Pull
/* 0847C 80923F7C 0C034221 */ jal Matrix_Pop
/* 08480 80923F80 00000000 */ nop
/* 08484 80923F84 3C068092 */ lui $a2, %hi(D_80926A40) ## $a2 = 80920000
/* 08488 80923F88 24C66A40 */ addiu $a2, $a2, %lo(D_80926A40) ## $a2 = 80926A40

2
asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s
View file

@ -146,7 +146,7 @@ glabel func_80923FDC
/* 086E4 809241E4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 086E8 809241E8 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0
/* 086EC 809241EC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 086F0 809241F0 0C034221 */ jal Matrix_Pull
/* 086F0 809241F0 0C034221 */ jal Matrix_Pop
/* 086F4 809241F4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 086F8 809241F8 8FAD007C */ lw $t5, 0x007C($sp)
/* 086FC 809241FC 3C068092 */ lui $a2, %hi(D_80926A70) ## $a2 = 80920000

2
asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s
View file

@ -509,7 +509,7 @@ glabel func_80925480
/* 0A0B4 80925BB4 2AA1012C */ slti $at, $s5, 0x012C
/* 0A0B8 80925BB8 1420FFBE */ bne $at, $zero, .L80925AB4
/* 0A0BC 80925BBC 26310040 */ addiu $s1, $s1, 0x0040 ## $s1 = 00000140
/* 0A0C0 80925BC0 0C034221 */ jal Matrix_Pull
/* 0A0C0 80925BC0 0C034221 */ jal Matrix_Pop
/* 0A0C4 80925BC4 00000000 */ nop
/* 0A0C8 80925BC8 3C068092 */ lui $a2, %hi(D_80926B50) ## $a2 = 80920000
/* 0A0CC 80925BCC 24C66B50 */ addiu $a2, $a2, %lo(D_80926B50) ## $a2 = 80926B50

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s
View file

@ -354,7 +354,7 @@ glabel BossTw_Draw
/* 0AAB8 80943788 AFB00018 */ sw $s0, 0x0018($sp)
/* 0AABC 8094378C 0C0286B2 */ jal SkelAnime_DrawFlexOpa
/* 0AAC0 80943790 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 0AAC4 80943794 0C034221 */ jal Matrix_Pull
/* 0AAC4 80943794 0C034221 */ jal Matrix_Pop
/* 0AAC8 80943798 00000000 */ nop
/* 0AACC 8094379C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000
/* 0AAD0 809437A0 0C02F228 */ jal func_800BC8A0

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AED8.s
View file

@ -174,7 +174,7 @@ glabel func_8093AED8
/* 02468 8093B138 8FA40038 */ lw $a0, 0x0038($sp)
/* 0246C 8093B13C 0C0346BD */ jal Matrix_MultVec3f
/* 02470 8093B140 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4
/* 02474 8093B144 0C034221 */ jal Matrix_Pull
/* 02474 8093B144 0C034221 */ jal Matrix_Pop
/* 02478 8093B148 00000000 */ nop
/* 0247C 8093B14C C7A0002C */ lwc1 $f0, 0x002C($sp)
/* 02480 8093B150 3C014466 */ lui $at, 0x4466 ## $at = 44660000

4
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s
View file

@ -272,7 +272,7 @@ glabel func_80941BC0
/* 092B8 80941F88 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 092BC 80941F8C 03195821 */ addu $t3, $t8, $t9
/* 092C0 80941F90 01616021 */ addu $t4, $t3, $at
/* 092C4 80941F94 0C034221 */ jal Matrix_Pull
/* 092C4 80941F94 0C034221 */ jal Matrix_Pop
/* 092C8 80941F98 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 092CC 80941F9C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 092D0 80941FA0 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000
@ -381,7 +381,7 @@ glabel func_80941BC0
/* 0946C 8094213C 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 09470 80942140 03195821 */ addu $t3, $t8, $t9
/* 09474 80942144 01616021 */ addu $t4, $t3, $at
/* 09478 80942148 0C034221 */ jal Matrix_Pull
/* 09478 80942148 0C034221 */ jal Matrix_Pop
/* 0947C 8094214C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 09480 80942150 8FAD00A4 */ lw $t5, 0x00A4($sp)
/* 09484 80942154 3C068095 */ lui $a2, %hi(D_8094AB08) ## $a2 = 80950000

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s
View file

@ -359,7 +359,7 @@ glabel func_80942180
/* 099DC 809426AC 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 099E0 809426B0 03295021 */ addu $t2, $t9, $t1
/* 099E4 809426B4 01415821 */ addu $t3, $t2, $at
/* 099E8 809426B8 0C034221 */ jal Matrix_Pull
/* 099E8 809426B8 0C034221 */ jal Matrix_Pop
/* 099EC 809426BC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004
/* 099F0 809426C0 8FAC00AC */ lw $t4, 0x00AC($sp)
/* 099F4 809426C4 3C068095 */ lui $a2, %hi(D_8094AB58) ## $a2 = 80950000

4
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s
View file

@ -176,7 +176,7 @@ glabel func_809426F0
/* 09C70 80942940 0301C821 */ addu $t9, $t8, $at
/* 09C74 80942944 AC590004 */ sw $t9, 0x0004($v0) ## 00000004
.L80942948:
/* 09C78 80942948 0C034221 */ jal Matrix_Pull
/* 09C78 80942948 0C034221 */ jal Matrix_Pop
/* 09C7C 8094294C 00000000 */ nop
/* 09C80 80942950 8668001C */ lh $t0, 0x001C($s3) ## 0000001C
/* 09C84 80942954 55000022 */ bnel $t0, $zero, .L809429E0
@ -357,7 +357,7 @@ glabel func_809426F0
/* 09F34 80942C04 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000
/* 09F38 80942C08 014B6021 */ addu $t4, $t2, $t3
/* 09F3C 80942C0C 01816821 */ addu $t5, $t4, $at
/* 09F40 80942C10 0C034221 */ jal Matrix_Pull
/* 09F40 80942C10 0C034221 */ jal Matrix_Pop
/* 09F44 80942C14 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004
/* 09F48 80942C18 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001
/* 09F4C 80942C1C 00118C00 */ sll $s1, $s1, 16

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s
View file

@ -256,7 +256,7 @@ glabel func_80942C70
/* 0A318 80942FE8 01415821 */ addu $t3, $t2, $at
/* 0A31C 80942FEC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004
.L80942FF0:
/* 0A320 80942FF0 0C034221 */ jal Matrix_Pull
/* 0A320 80942FF0 0C034221 */ jal Matrix_Pop
/* 0A324 80942FF4 00000000 */ nop
/* 0A328 80942FF8 8FAC007C */ lw $t4, 0x007C($sp)
.L80942FFC:

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s
View file

@ -150,7 +150,7 @@ glabel func_80943028
/* 0A560 80943230 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 0A564 80943234 018D7021 */ addu $t6, $t4, $t5
/* 0A568 80943238 01C17821 */ addu $t7, $t6, $at
/* 0A56C 8094323C 0C034221 */ jal Matrix_Pull
/* 0A56C 8094323C 0C034221 */ jal Matrix_Pop
/* 0A570 80943240 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004
/* 0A574 80943244 8FB8005C */ lw $t8, 0x005C($sp)
/* 0A578 80943248 3C068095 */ lui $a2, %hi(D_8094AC18) ## $a2 = 80950000

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s
View file

@ -120,7 +120,7 @@ glabel L80943E54
/* 0B1D4 80943EA4 0C0346A2 */ jal Matrix_NewMtx
/* 0B1D8 80943EA8 AFA20024 */ sw $v0, 0x0024($sp)
/* 0B1DC 80943EAC 8FA30024 */ lw $v1, 0x0024($sp)
/* 0B1E0 80943EB0 0C034221 */ jal Matrix_Pull
/* 0B1E0 80943EB0 0C034221 */ jal Matrix_Pop
/* 0B1E4 80943EB4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 0B1E8 80943EB8 8FAB0038 */ lw $t3, 0x0038($sp)
/* 0B1EC 80943EBC 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s
View file

@ -595,7 +595,7 @@ glabel func_80943F08
/* 0BAAC 8094477C 0301C821 */ addu $t9, $t8, $at
/* 0BAB0 80944780 AC590004 */ sw $t9, 0x0004($v0) ## 00000004
.L80944784:
/* 0BAB4 80944784 0C034221 */ jal Matrix_Pull
/* 0BAB4 80944784 0C034221 */ jal Matrix_Pop
/* 0BAB8 80944788 00000000 */ nop
/* 0BABC 8094478C 8FAA00BC */ lw $t2, 0x00BC($sp)
/* 0BAC0 80944790 3C068095 */ lui $a2, %hi(D_8094ACC8) ## $a2 = 80950000

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s
View file

@ -311,7 +311,7 @@ glabel func_809447BC
/* 0BF3C 80944C0C 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 0BF40 80944C10 01AE7821 */ addu $t7, $t5, $t6
/* 0BF44 80944C14 01E1C021 */ addu $t8, $t7, $at
/* 0BF48 80944C18 0C034221 */ jal Matrix_Pull
/* 0BF48 80944C18 0C034221 */ jal Matrix_Pop
/* 0BF4C 80944C1C AC580004 */ sw $t8, 0x0004($v0) ## 00000004
/* 0BF50 80944C20 8FB9009C */ lw $t9, 0x009C($sp)
/* 0BF54 80944C24 3C068095 */ lui $a2, %hi(D_8094AD28) ## $a2 = 80950000

4
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s
View file

@ -97,7 +97,7 @@ glabel func_80944C50
/* 0C084 80944D54 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 0C088 80944D58 01F8C821 */ addu $t9, $t7, $t8
/* 0C08C 80944D5C 03214821 */ addu $t1, $t9, $at
/* 0C090 80944D60 0C034221 */ jal Matrix_Pull
/* 0C090 80944D60 0C034221 */ jal Matrix_Pop
/* 0C094 80944D64 AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 0C098 80944D68 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 0C09C 80944D6C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000
@ -286,7 +286,7 @@ glabel func_80944C50
/* 0C370 80945040 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 0C374 80945044 01CFC021 */ addu $t8, $t6, $t7
/* 0C378 80945048 0301C821 */ addu $t9, $t8, $at
/* 0C37C 8094504C 0C034221 */ jal Matrix_Pull
/* 0C37C 8094504C 0C034221 */ jal Matrix_Pop
/* 0C380 80945050 AC590004 */ sw $t9, 0x0004($v0) ## 00000004
/* 0C384 80945054 8FA9008C */ lw $t1, 0x008C($sp)
/* 0C388 80945058 3C068095 */ lui $a2, %hi(D_8094AD78) ## $a2 = 80950000

2
asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s
View file

@ -186,7 +186,7 @@ glabel func_80945084
/* 0C640 80945310 AFB00018 */ sw $s0, 0x0018($sp)
/* 0C644 80945314 0C0286B2 */ jal SkelAnime_DrawFlexOpa
/* 0C648 80945318 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0C64C 8094531C 0C034221 */ jal Matrix_Pull
/* 0C64C 8094531C 0C034221 */ jal Matrix_Pop
/* 0C650 80945320 00000000 */ nop
/* 0C654 80945324 3C048095 */ lui $a0, %hi(D_8094A9EC) ## $a0 = 80950000
/* 0C658 80945328 2484A9EC */ addiu $a0, $a0, %lo(D_8094A9EC) ## $a0 = 8094A9EC

2
asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s
View file

@ -377,7 +377,7 @@ glabel L80959578
/* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp)
/* 0A428 809596E8 0C0189CD */ jal Collider_SetQuadVertices
/* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp)
/* 0A430 809596F0 0C034221 */ jal Matrix_Pull
/* 0A430 809596F0 0C034221 */ jal Matrix_Pop
/* 0A434 809596F4 00000000 */ nop
/* 0A438 809596F8 8E180024 */ lw $t8, 0x0024($s0) ## 00000024
/* 0A43C 809596FC 27AF00BC */ addiu $t7, $sp, 0x00BC ## $t7 = FFFFFFEC

2
asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s
View file

@ -283,7 +283,7 @@ glabel func_80958B0C
/* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp)
/* 09C88 80958F48 0C0189CD */ jal Collider_SetQuadVertices
/* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp)
/* 09C90 80958F50 0C034221 */ jal Matrix_Pull
/* 09C90 80958F50 0C034221 */ jal Matrix_Pop
/* 09C94 80958F54 00000000 */ nop
/* 09C98 80958F58 8FBF0024 */ lw $ra, 0x0024($sp)
.L80958F5C:

2
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s
View file

@ -129,7 +129,7 @@ glabel func_8096865C
/* 01E9C 809687EC AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0
/* 01EA0 809687F0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000
/* 01EA4 809687F4 8FAA0054 */ lw $t2, 0x0054($sp)
/* 01EA8 809687F8 0C034221 */ jal Matrix_Pull
/* 01EA8 809687F8 0C034221 */ jal Matrix_Pop
/* 01EAC 809687FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004
/* 01EB0 80968800 8FAB0060 */ lw $t3, 0x0060($sp)
/* 01EB4 80968804 3C018097 */ lui $at, %hi(D_8096964C) ## $at = 80970000

2
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s
View file

@ -156,7 +156,7 @@ glabel func_809688C4
/* 0218C 80968ADC AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0
/* 02190 80968AE0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 02194 80968AE4 8FA90058 */ lw $t1, 0x0058($sp)
/* 02198 80968AE8 0C034221 */ jal Matrix_Pull
/* 02198 80968AE8 0C034221 */ jal Matrix_Pop
/* 0219C 80968AEC AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 021A0 80968AF0 26730004 */ addiu $s3, $s3, 0x0004 ## $s3 = 00000004
/* 021A4 80968AF4 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040

2
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s
View file

@ -48,7 +48,7 @@ glabel func_8097911C
/* 00868 80979198 8FA40048 */ lw $a0, 0x0048($sp)
/* 0086C 8097919C 0C034695 */ jal Matrix_ToMtx
/* 00870 809791A0 240604A9 */ addiu $a2, $zero, 0x04A9 ## $a2 = 000004A9
/* 00874 809791A4 0C034221 */ jal Matrix_Pull
/* 00874 809791A4 0C034221 */ jal Matrix_Pop
/* 00878 809791A8 00000000 */ nop
/* 0087C 809791AC 0C024F46 */ jal func_80093D18
/* 00880 809791B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s
View file

@ -595,7 +595,7 @@ glabel func_8099B5EC
/* 036D0 8099BE50 AC440004 */ sw $a0, 0x0004($v0) ## 00000004
/* 036D4 8099BE54 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000
/* 036D8 8099BE58 AFA40040 */ sw $a0, 0x0040($sp)
/* 036DC 8099BE5C 0C034221 */ jal Matrix_Pull
/* 036DC 8099BE5C 0C034221 */ jal Matrix_Pop
/* 036E0 8099BE60 AFA800D8 */ sw $t0, 0x00D8($sp)
/* 036E4 8099BE64 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00
/* 036E8 8099BE68 C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0

2
asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s
View file

@ -177,7 +177,7 @@ glabel EfcErupc_Draw
/* 00558 8099D208 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 0055C 8099D20C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
.L8099D210:
/* 00560 8099D210 0C034221 */ jal Matrix_Pull
/* 00560 8099D210 0C034221 */ jal Matrix_Pop
/* 00564 8099D214 00000000 */ nop
/* 00568 8099D218 3C01809A */ lui $at, %hi(D_8099D824) ## $at = 809A0000
/* 0056C 8099D21C C42CD824 */ lwc1 $f12, %lo(D_8099D824)($at)

2
asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/EnGanonMant_Draw.s
View file

@ -190,7 +190,7 @@ glabel EnGanonMant_Draw
/* 00F18 80A24C78 252A0158 */ addiu $t2, $t1, 0x0158 ## $t2 = 00000158
/* 00F1C 80A24C7C 0C288FF8 */ jal func_80A23FE0
/* 00F20 80A24C80 AFAA0010 */ sw $t2, 0x0010($sp)
/* 00F24 80A24C84 0C034221 */ jal Matrix_Pull
/* 00F24 80A24C84 0C034221 */ jal Matrix_Pop
/* 00F28 80A24C88 00000000 */ nop
/* 00F2C 80A24C8C 00118400 */ sll $s0, $s1, 16
/* 00F30 80A24C90 00108403 */ sra $s0, $s0, 16

2
asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s
View file

@ -295,7 +295,7 @@ glabel EnGoma_Draw
/* 023B4 80A4B274 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0
/* 023B8 80A4B278 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000
/* 023BC 80A4B27C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000
/* 023C0 80A4B280 0C034221 */ jal Matrix_Pull
/* 023C0 80A4B280 0C034221 */ jal Matrix_Pop
/* 023C4 80A4B284 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004
/* 023C8 80A4B288 1000003D */ beq $zero, $zero, .L80A4B380
/* 023CC 80A4B28C 8FAB007C */ lw $t3, 0x007C($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s
View file

@ -54,7 +54,7 @@ glabel func_80B01360
/* 03180 80B01430 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008
/* 03184 80B01434 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0
/* 03188 80B01438 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004
/* 0318C 80B0143C 0C034221 */ jal Matrix_Pull
/* 0318C 80B0143C 0C034221 */ jal Matrix_Pop
/* 03190 80B01440 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000
/* 03194 80B01444 8FAF0040 */ lw $t7, 0x0040($sp)
.L80B01448:

2
asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s
View file

@ -89,7 +89,7 @@ glabel func_80B402C4
/* 041EC 80B403CC 8FA40064 */ lw $a0, 0x0064($sp)
/* 041F0 80B403D0 0C034695 */ jal Matrix_ToMtx
/* 041F4 80B403D4 2406025A */ addiu $a2, $zero, 0x025A ## $a2 = 0000025A
/* 041F8 80B403D8 0C034221 */ jal Matrix_Pull
/* 041F8 80B403D8 0C034221 */ jal Matrix_Pop
/* 041FC 80B403DC 00000000 */ nop
/* 04200 80B403E0 0C024F61 */ jal func_80093D84
/* 04204 80B403E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s
View file

@ -755,7 +755,7 @@ glabel func_80B6B674
/* 02738 80B6C0D8 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004
/* 0273C 80B6C0DC AC550000 */ sw $s5, 0x0000($v0) ## 00000000
.L80B6C0E0:
/* 02740 80B6C0E0 0C034221 */ jal Matrix_Pull
/* 02740 80B6C0E0 0C034221 */ jal Matrix_Pop
/* 02744 80B6C0E4 00000000 */ nop
/* 02748 80B6C0E8 3C0680B8 */ lui $a2, %hi(D_80B7B090) ## $a2 = 80B80000
/* 0274C 80B6C0EC 24C6B090 */ addiu $a2, $a2, %lo(D_80B7B090) ## $a2 = 80B7B090

4
asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s
View file

@ -341,7 +341,7 @@ glabel func_80B6CAF8
/* 035E4 80B6CF84 8C4B0008 */ lw $t3, 0x0008($v0) ## 80B7A8A4
/* 035E8 80B6CF88 ACEB0020 */ sw $t3, 0x0020($a3) ## 00000020
.L80B6CF8C:
/* 035EC 80B6CF8C 0C034221 */ jal Matrix_Pull
/* 035EC 80B6CF8C 0C034221 */ jal Matrix_Pop
/* 035F0 80B6CF90 00000000 */ nop
/* 035F4 80B6CF94 3C0180B8 */ lui $at, %hi(D_80B7B404) ## $at = 80B80000
/* 035F8 80B6CF98 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00
@ -379,7 +379,7 @@ glabel func_80B6CAF8
/* 03678 80B6D018 AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 0367C 80B6D01C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000
.L80B6D020:
/* 03680 80B6D020 0C034221 */ jal Matrix_Pull
/* 03680 80B6D020 0C034221 */ jal Matrix_Pop
/* 03684 80B6D024 00000000 */ nop
/* 03688 80B6D028 8FAB00C8 */ lw $t3, 0x00C8($sp)
/* 0368C 80B6D02C 3C0680B8 */ lui $a2, %hi(D_80B7B110) ## $a2 = 80B80000

2
asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s
View file

@ -613,7 +613,7 @@ glabel func_80B6D688
/* 04544 80B6DEE4 1420FF66 */ bne $at, $zero, .L80B6DC80
/* 04548 80B6DEE8 AC680004 */ sw $t0, 0x0004($v1) ## 00000004
.L80B6DEEC:
/* 0454C 80B6DEEC 0C034221 */ jal Matrix_Pull
/* 0454C 80B6DEEC 0C034221 */ jal Matrix_Pop
/* 04550 80B6DEF0 00000000 */ nop
/* 04554 80B6DEF4 8FA900E8 */ lw $t1, 0x00E8($sp)
/* 04558 80B6DEF8 0C024F61 */ jal func_80093D84

2
asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s
View file

@ -768,7 +768,7 @@ glabel func_80B6DF30
/* 04FB4 80B6E954 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0
/* 04FB8 80B6E958 AC580000 */ sw $t8, 0x0000($v0) ## 00000000
/* 04FBC 80B6E95C 8FB90028 */ lw $t9, 0x0028($sp)
/* 04FC0 80B6E960 0C034221 */ jal Matrix_Pull
/* 04FC0 80B6E960 0C034221 */ jal Matrix_Pop
/* 04FC4 80B6E964 AC590004 */ sw $t9, 0x0004($v0) ## 00000004
/* 04FC8 80B6E968 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00
/* 04FCC 80B6E96C 3C0643FA */ lui $a2, 0x43FA ## $a2 = 43FA0000

2
asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s
View file

@ -315,7 +315,7 @@ glabel func_80B76474
/* 0CF00 80B768A0 2A61008C */ slti $at, $s3, 0x008C
/* 0CF04 80B768A4 1420FFCC */ bne $at, $zero, .L80B767D8
/* 0CF08 80B768A8 2610003C */ addiu $s0, $s0, 0x003C ## $s0 = 80B7FF34
/* 0CF0C 80B768AC 0C034221 */ jal Matrix_Pull
/* 0CF0C 80B768AC 0C034221 */ jal Matrix_Pop
/* 0CF10 80B768B0 00000000 */ nop
/* 0CF14 80B768B4 3C0680B8 */ lui $a2, %hi(D_80B7B250) ## $a2 = 80B80000
/* 0CF18 80B768B8 24C6B250 */ addiu $a2, $a2, %lo(D_80B7B250) ## $a2 = 80B7B250

4
asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s
View file

@ -420,7 +420,7 @@ glabel L80829C28
/* 16700 80829F20 24060110 */ addiu $a2, $zero, 0x0110 ## $a2 = 00000110
/* 16704 80829F24 0C0346A2 */ jal Matrix_NewMtx
/* 16708 80829F28 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000
/* 1670C 80829F2C 0C034221 */ jal Matrix_Pull
/* 1670C 80829F2C 0C034221 */ jal Matrix_Pop
/* 16710 80829F30 AE020004 */ sw $v0, 0x0004($s0) ## 00000004
/* 16714 80829F34 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0
/* 16718 80829F38 3C010100 */ lui $at, 0x0100 ## $at = 01000000
@ -453,7 +453,7 @@ glabel L80829C28
/* 16780 80829FA0 5420FF0D */ bnel $at, $zero, .L80829BD8
/* 16784 80829FA4 866B0000 */ lh $t3, 0x0000($s3) ## 00000000
.L80829FA8:
/* 16788 80829FA8 0C034221 */ jal Matrix_Pull
/* 16788 80829FA8 0C034221 */ jal Matrix_Pop
/* 1678C 80829FAC 267300A4 */ addiu $s3, $s3, 0x00A4 ## $s3 = 000000A4
/* 16790 80829FB0 1000FEA5 */ beq $zero, $zero, .L80829A48
/* 16794 80829FB4 86620000 */ lh $v0, 0x0000($s3) ## 000000A4

6
asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s
View file

@ -1349,7 +1349,7 @@ glabel func_808099C8
/* 07070 8080ADB0 24190602 */ addiu $t9, $zero, 0x0602 ## $t9 = 00000602
/* 07074 8080ADB4 AC790004 */ sw $t9, 0x0004($v1) ## 00000004
/* 07078 8080ADB8 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000
/* 0707C 8080ADBC 0C034221 */ jal Matrix_Pull
/* 0707C 8080ADBC 0C034221 */ jal Matrix_Pop
/* 07080 8080ADC0 AFA801A4 */ sw $t0, 0x01A4($sp)
/* 07084 8080ADC4 0C034213 */ jal Matrix_Push
/* 07088 8080ADC8 00000000 */ nop
@ -1389,7 +1389,7 @@ glabel func_808099C8
/* 07110 8080AE50 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0
/* 07114 8080AE54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004
/* 07118 8080AE58 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000
/* 0711C 8080AE5C 0C034221 */ jal Matrix_Pull
/* 0711C 8080AE5C 0C034221 */ jal Matrix_Pop
/* 07120 8080AE60 AFA801A4 */ sw $t0, 0x01A4($sp)
/* 07124 8080AE64 0C034213 */ jal Matrix_Push
/* 07128 8080AE68 00000000 */ nop
@ -1428,7 +1428,7 @@ glabel func_808099C8
/* 071AC 8080AEEC 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008
/* 071B0 8080AEF0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0
/* 071B4 8080AEF4 AC790004 */ sw $t9, 0x0004($v1) ## 00000004
/* 071B8 8080AEF8 0C034221 */ jal Matrix_Pull
/* 071B8 8080AEF8 0C034221 */ jal Matrix_Pop
/* 071BC 8080AEFC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000
/* 071C0 8080AF00 3C068081 */ lui $a2, %hi(D_80812CC8) ## $a2 = 80810000
/* 071C4 8080AF04 24C62CC8 */ addiu $a2, $a2, %lo(D_80812CC8) ## $a2 = 80812CC8

2
include/functions.h
View file

@ -1827,7 +1827,7 @@ s16 Math_Atan2S(f32 x, f32 y);
f32 Math_Atan2F(f32 x, f32 y);
void Matrix_Init(GameState* gameState);
void Matrix_Push(void);
void Matrix_Pull(void);
void Matrix_Pop(void);
void Matrix_Get(MtxF* dest);
void Matrix_Put(MtxF* src);
void Matrix_Mult(MtxF* mf, u8 mode);

2
src/code/sys_matrix.c
View file

@ -29,7 +29,7 @@ void Matrix_Push(void) {
sCurrentMatrix++;
}
void Matrix_Pull(void) {
void Matrix_Pop(void) {
sCurrentMatrix--;
if (sCurrentMatrix < sMatrixStack) {
__assert("Matrix_now >= Matrix_stack", "../sys_matrix.c", 176);

4
src/code/z_actor.c
View file

@ -387,7 +387,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(OVERLAY_DISP++, gZTargetLockOnTriangleDL);
Matrix_Pull();
Matrix_Pop();
}
}
@ -1921,7 +1921,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
Matrix_Pull();
Matrix_Pop();
phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF);
Matrix_RotateZ((phi_f6 * M_PI) / 32768.0f, MTXMODE_APPLY);

6
src/code/z_draw.c
View file

@ -425,7 +425,7 @@ void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 621);
}
@ -454,7 +454,7 @@ void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 663);
}
@ -482,7 +482,7 @@ void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 704);
}

2
src/code/z_fcurve_data_skelanime.c
View file

@ -165,7 +165,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve*
SkelCurve_DrawLimb(globalCtx, limb->firstChildIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data);
}
Matrix_Pull();
Matrix_Pop();
if (limb->nextLimbIdx != LIMB_DONE) {
SkelCurve_DrawLimb(globalCtx, limb->nextLimbIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data);

4
src/code/z_player_lib.c
View file

@ -738,7 +738,7 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime,
Matrix_Translate(D_80126050[(void)0, gSaveContext.linkAge], 0.0f, 0.0f, MTXMODE_APPLY);
Matrix_MultVec3f(&D_8012602C, &sp98);
Matrix_MultVec3f(&D_80126070, &footprintPos);
Matrix_Pull();
Matrix_Pop();
footprintPos.y += 15.0f;
@ -1281,7 +1281,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, stringData->dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2809);
} else if ((this->actor.scale.y >= 0.0f) && (this->rightHandType == 10)) {

24
src/code/z_skelanime.c
View file

@ -56,7 +56,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele
SkelAnime_DrawLimbLod(globalCtx, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod);
@ -113,7 +113,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
lod);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 894);
}
@ -168,7 +168,7 @@ void SkelAnime_DrawFlexLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** s
lod, mtx);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawFlexLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
@ -234,7 +234,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
lod, &mtx);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1053);
}
@ -278,7 +278,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele
SkelAnime_DrawLimbOpa(globalCtx, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
@ -333,7 +333,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
SkelAnime_DrawLimbOpa(globalCtx, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1190);
}
@ -386,7 +386,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s
limbMatricies);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawFlexLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
@ -456,7 +456,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
&mtx);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1347);
}
@ -543,7 +543,7 @@ Gfx* SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, void** skeleton
SkelAnime_DrawLimb(globalCtx, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
gfx = SkelAnime_DrawLimb(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
@ -601,7 +601,7 @@ Gfx* SkelAnime_Draw(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable
gfx);
}
Matrix_Pull();
Matrix_Pop();
return gfx;
}
@ -649,7 +649,7 @@ Gfx* SkelAnime_DrawFlexLimb(GlobalContext* globalCtx, s32 limbIndex, void** skel
mtx, gfx);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
gfx = SkelAnime_DrawFlexLimb(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw,
@ -714,7 +714,7 @@ Gfx* SkelAnime_DrawFlex(GlobalContext* globalCtx, void** skeleton, Vec3s* jointT
arg, &mtx, gfx);
}
Matrix_Pull();
Matrix_Pop();
return gfx;
}

2
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View file

@ -980,7 +980,7 @@ void BgDyYoseizo_ParticleUpdate(BgDyYoseizo* this, GlobalContext* globalCtx) {
sp94.x = sp94.y = sp94.z = 3.0f;
Matrix_MultVec3f(&sp94, &sp88);
Matrix_Pull();
Matrix_Pop();
particle->pos.x += sp88.x;
particle->pos.y += sp88.y;
particle->pos.z += sp88.z;

4
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -347,7 +347,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 785),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sPlatformSideDList);
Matrix_Pull();
Matrix_Pop();
}
}
}
@ -383,7 +383,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sFlashDList);
Matrix_Pull();
Matrix_Pop();
}
}
}

12
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -1764,7 +1764,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2661),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000980);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
@ -1772,7 +1772,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2672),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000980);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
@ -1780,7 +1780,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2683),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000980);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2688);
}
@ -1845,7 +1845,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, D_06000330);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
Matrix_Pull();
Matrix_Pop();
this->godLgt.rotation++;
if (this->godLgt.rotation > 120) {
@ -1895,7 +1895,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
if (disp) {};
gSPDisplayList(POLY_XLU_DISP++, disp);
Matrix_Pull();
Matrix_Pop();
Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY);
Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2874),
@ -1998,7 +1998,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 180, 255, 255, this->triforceSpot.lightColumnOpacity);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 150, 255);
gSPDisplayList(POLY_XLU_DISP++, D_06000840);
Matrix_Pull();
Matrix_Pop();
}
if (this->triforceSpot.triforceSpotOpacity != 0) {

2
src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
View file

@ -201,7 +201,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateRPY((s16)(kREG(16) + 0x4000), this->rotationPitch, kREG(18), MTXMODE_APPLY);
Matrix_Translate(kREG(22), kREG(23), kREG(24), MTXMODE_APPLY);
Matrix_ToMtx(mtx, "../z_demo_ext.c", 476);
Matrix_Pull();
Matrix_Pop();
func_80093D84(gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, kREG(33) + 128, kREG(25) + 140, kREG(26) + 80, kREG(27) + 140, this->primAlpha);

12
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View file

@ -679,7 +679,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) {
unk188 = this->unk_188;
unk178 = this->unk_178;
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
@ -1302,7 +1302,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx) {
func_80980F8C(this, globalCtx2);
}
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp60, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
@ -1421,7 +1421,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) {
func_80981458(this, globalCtx);
}
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp60, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -1513,7 +1513,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) {
Matrix_Translate(sp4C.x, sp4C.y, sp4C.z, MTXMODE_APPLY);
Matrix_ToMtx(sp64, "../z_demo_gt_part4_3.c", 291);
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp64, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -1605,7 +1605,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) {
Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY);
Matrix_ToMtx(sp5C, "../z_demo_gt_part5.c", 152);
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -1696,7 +1696,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) {
Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY);
Matrix_ToMtx(sp5C, "../z_demo_gt_part6.c", 153);
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

2
src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
View file

@ -298,7 +298,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5,
frames * -10, 0x20, 0x20));
gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierOrbDL);
Matrix_Pull();
Matrix_Pop();
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 656),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_XLU_DISP++);

4
src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
View file

@ -87,7 +87,7 @@ void func_809B26EC(EnAnubiceFire* this, GlobalContext* globalCtx) {
Matrix_RotateX(BINANG_TO_RAD(this->actor.world.rot.x), MTXMODE_APPLY);
velocity.z = 15.0f;
Matrix_MultVec3f(&velocity, &this->actor.velocity);
Matrix_Pull();
Matrix_Pop();
this->actionFunc = func_809B27D8;
this->actor.world.rot.x = this->actor.world.rot.y = this->actor.world.rot.z = 0;
@ -252,7 +252,7 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
break;
}
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 556);
}

2
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -487,7 +487,7 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1374),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffSparklesDL);
Matrix_Pull();
Matrix_Pop();
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 32768), MTXMODE_APPLY);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1381);

2
src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -504,7 +504,7 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_ToMtx(mtx, "../z_en_ba.c", 970);
}
Matrix_Pull();
Matrix_Pop();
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 973),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000890);

2
src/overlays/actors/ovl_En_Bw/z_en_bw.c
View file

@ -828,7 +828,7 @@ s32 EnBw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1388),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, *dList);
Matrix_Pull();
Matrix_Pop();
return 1;
}
}

2
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -548,7 +548,7 @@ void EnDh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
Matrix_Push();
Matrix_Translate(headOffset.x, headOffset.y, headOffset.z, MTXMODE_APPLY);
Collider_UpdateSpheres(1, &this->collider2);
Matrix_Pull();
Matrix_Pop();
}
}

2
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -437,7 +437,7 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push();
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState]));
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, this);
Matrix_Pull();
Matrix_Pop();
Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1040),

2
src/overlays/actors/ovl_En_Fd/z_en_fd.c
View file

@ -769,7 +769,7 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push();
EnFd_DrawDots(this, globalCtx);
EnFd_DrawFlames(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if (this->actionFunc != EnFd_Reappear && !(this->fadeAlpha < 0.9f)) {
if (1) {}
func_80093D84(globalCtx->state.gfxCtx);

2
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View file

@ -1110,7 +1110,7 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_floormas.c", 2299), G_MTX_LOAD);
gSPDisplayList((*gfx)++, D_06008688);
Matrix_Pull();
Matrix_Pop();
}
}

2
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -1053,7 +1053,7 @@ void EnFr_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fr.c", 1738),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fr.c", 1741);
}
}

2
src/overlays/actors/ovl_En_Fw/z_en_fw.c
View file

@ -399,7 +399,7 @@ void EnFw_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnFw_UpdateDust(this);
Matrix_Push();
EnFw_DrawDust(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnFw_OverrideLimbDraw, EnFw_PostLimbDraw, this);

2
src/overlays/actors/ovl_En_Gb/z_en_gb.c
View file

@ -545,7 +545,7 @@ void EnGb_DrawCagedSouls(EnGb* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0600C0B0);
Matrix_Pull();
Matrix_Pop();
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_gb.c", 962);

4
src/overlays/actors/ovl_En_Gm/z_en_gm.c
View file

@ -304,13 +304,13 @@ void func_80A3E090(EnGm* this) {
this->collider.dim.pos.x = vec2.x;
this->collider.dim.pos.y = vec2.y;
this->collider.dim.pos.z = vec2.z;
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(0.0f, 0.0f, 4300.0f, MTXMODE_APPLY);
Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
vec1.x = vec1.y = vec1.z = 0.0f;
Matrix_MultVec3f(&vec1, &this->talkPos);
Matrix_Pull();
Matrix_Pop();
Matrix_Translate(0.0f, 0.0f, 3800.0f, MTXMODE_APPLY);
Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
vec1.x = vec1.y = vec1.z = 0.0f;

6
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -1066,7 +1066,7 @@ void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, D_0600BD80);
Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2341);
}
@ -1084,7 +1084,7 @@ void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0600C140);
Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2383);
}
@ -1139,7 +1139,7 @@ void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGo_UpdateDust(this);
Matrix_Push();
EnGo_DrawDust(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if (this->actionFunc == EnGo_CurledUp) {
EnGo_DrawCurledUp(this, globalCtx);

2
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -2050,7 +2050,7 @@ void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGo2_UpdateDust(this);
Matrix_Push();
EnGo2_DrawDust(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if ((this->actionFunc == EnGo2_CurledUp) && (this->skelAnime.playSpeed == 0.0f) &&
(this->skelAnime.curFrame == 0.0f)) {

2
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -601,7 +601,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, D_060009D0);
gSPDisplayList(POLY_OPA_DISP++, D_06000A60);
Matrix_Pull();
Matrix_Pop();
if (this->unk_19E & 2) {
func_80093D84(globalCtx->state.gfxCtx);
func_800D1FD4(&globalCtx->mf_11DA0);

2
src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
View file

@ -437,7 +437,7 @@ void EnHeishi1_Update(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(((this->actor.shape.rot.y + this->headAngle) / 32768.0f) * M_PI, 0);
searchBallMult.z = 30.0f;
Matrix_MultVec3f(&searchBallMult, &searchBallVel);
Matrix_Pull();
Matrix_Pop();
EffectSsSolderSrchBall_Spawn(globalCtx, &searchBallPos, &searchBallVel, &searchBallAccel, 2,
&this->linkDetected);

4
src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
View file

@ -1028,7 +1028,7 @@ s32 EnPeehat_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1959),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1963);
return true;
}
@ -1062,7 +1062,7 @@ void EnPeehat_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1990),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1994);
}
}

4
src/overlays/actors/ovl_En_Rr/z_en_rr.c
View file

@ -862,7 +862,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) {
(1.0f + this->bodySegs[RR_BASE].scaleMod.z) * this->bodySegs[RR_BASE].scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_rr.c", 1501),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
Matrix_Pull();
Matrix_Pop();
zeroVec.x = 0.0f;
zeroVec.y = 0.0f;
zeroVec.z = 0.0f;
@ -875,7 +875,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) {
(1.0f + this->bodySegs[i].scaleMod.y) * this->bodySegs[i].scale.y,
(1.0f + this->bodySegs[i].scaleMod.z) * this->bodySegs[i].scale.z, MTXMODE_APPLY);
Matrix_ToMtx(segMtx, "../z_en_rr.c", 1527);
Matrix_Pull();
Matrix_Pop();
segMtx++;
Matrix_MultVec3f(&zeroVec, &this->effectPos[i]);
}

6
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
View file

@ -205,7 +205,7 @@ void EnSsh_AddBlureVertex(EnSsh* this) {
Matrix_Push();
Matrix_MultVec3f(&p1base, &p1);
Matrix_MultVec3f(&p2base, &p2);
Matrix_Pull();
Matrix_Pop();
EffectBlure_AddVertex(Effect_GetByIndex(this->blureIdx), &p1, &p2);
}
@ -446,7 +446,7 @@ void EnSsh_Sway(EnSsh* this) {
Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW);
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_MultVec3f(&swayVecBase, &swayVec);
Matrix_Pull();
Matrix_Pop();
this->actor.shape.rot.z = -(swayAngle * 2);
this->actor.world.pos.x = swayVec.x;
this->actor.world.pos.z = swayVec.z;
@ -599,7 +599,7 @@ s32 EnSsh_SetCylinderOC(EnSsh* this, GlobalContext* globalCtx) {
Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW);
Matrix_RotateY((this->initialYaw / (f32)0x8000) * M_PI, MTXMODE_APPLY);
Matrix_MultVec3f(&cyloffsets[i], &cylPos);
Matrix_Pull();
Matrix_Pop();
this->colCylinder[i + 3].dim.pos.x = cylPos.x;
this->colCylinder[i + 3].dim.pos.y = cylPos.y;
this->colCylinder[i + 3].dim.pos.z = cylPos.z;

6
src/overlays/actors/ovl_En_St/z_en_st.c
View file

@ -250,7 +250,7 @@ void EnSt_AddBlurVertex(EnSt* this) {
Matrix_Push();
Matrix_MultVec3f(&v1, &v1Pos);
Matrix_MultVec3f(&v2, &v2Pos);
Matrix_Pull();
Matrix_Pop();
EffectBlure_AddVertex(Effect_GetByIndex(this->blureIdx), &v1Pos, &v2Pos);
}
@ -362,7 +362,7 @@ s32 EnSt_SetCylinderOC(EnSt* this, GlobalContext* globalCtx) {
Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW);
Matrix_RotateY((this->initalYaw / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_MultVec3f(&cyloffsets[i], &cylPos);
Matrix_Pull();
Matrix_Pop();
this->colCylinder[i + 3].dim.pos.x = cylPos.x;
this->colCylinder[i + 3].dim.pos.y = cylPos.y;
this->colCylinder[i + 3].dim.pos.z = cylPos.z;
@ -781,7 +781,7 @@ void EnSt_Sway(EnSt* this) {
Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW);
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 32768.0f), MTXMODE_APPLY);
Matrix_MultVec3f(&amtToTranslate, &translatedPos);
Matrix_Pull();
Matrix_Pop();
this->actor.shape.rot.z = -(rotAngle * 2);
this->actor.world.pos.x = translatedPos.x;
this->actor.world.pos.z = translatedPos.z;

2
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -734,7 +734,7 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push();
EnTkEff_Draw(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);

2
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -646,7 +646,7 @@ void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, D_06008688);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495);
}

10
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -512,7 +512,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_1DC[6] + kREG(37), unk_1DC[7] + kREG(38), unk_1DC[8] + kREG(39), MTXMODE_APPLY);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[2], "../z_en_zl2.c", 1120);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY);
Matrix_Get(&sp34);
@ -535,7 +535,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_1DC[12] + kREG(43), unk_1DC[13] + kREG(44), unk_1DC[14] + kREG(45), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[4], "../z_en_zl2.c", 1164);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY);
Matrix_Get(&sp34);
@ -558,8 +558,8 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_1DC[18] + kREG(49), unk_1DC[19] + kREG(50), unk_1DC[20] + kREG(51), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[6], "../z_en_zl2.c", 1208);
Matrix_Pull();
Matrix_Pull();
Matrix_Pop();
Matrix_Pop();
this->unk_24C = 1;
}
return false;
@ -586,7 +586,7 @@ void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, &D_0600BAE8);
}
Matrix_Pull();
Matrix_Pop();
}
}
}

16
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -681,7 +681,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_28C[6] + kREG(37), unk_28C[7] + kREG(38), unk_28C[8] + kREG(39), MTXMODE_APPLY);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp78[2], "../z_en_zl3.c", 1554);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY);
Matrix_Get(&sp38);
@ -704,7 +704,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_28C[12] + kREG(43), unk_28C[13] + kREG(44), unk_28C[14] + kREG(45), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp78[4], "../z_en_zl3.c", 1598);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY);
Matrix_Get(&sp38);
@ -727,8 +727,8 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_28C[18] + kREG(49), unk_28C[19] + kREG(50), unk_28C[20] + kREG(51), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp78[6], "../z_en_zl3.c", 1642);
Matrix_Pull();
Matrix_Pull();
Matrix_Pop();
Matrix_Pop();
this->unk_2FC = 1;
} else if (limbIndex == 7) {
rot->x += unk_3F8_unk_0E->y;
@ -2503,20 +2503,20 @@ s32 func_80B5944C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_ToMtx(&mtx[1], "../z_en_zl3_inEscape.c", 2474);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[2], "../z_en_zl3_inEscape.c", 2477);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(40.0f, 264.0f, 386.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[3], "../z_en_zl3_inEscape.c", 2483);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[4], "../z_en_zl3_inEscape.c", 2486);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(40.0f, 264.0f, -386.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[5], "../z_en_zl3_inEscape.c", 2492);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[6], "../z_en_zl3_inEscape.c", 2495);
Matrix_Pull();
Matrix_Pull();
Matrix_Pop();
Matrix_Pop();
}
return false;
}

2
src/overlays/actors/ovl_En_Zo/z_en_zo.c
View file

@ -792,7 +792,7 @@ void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnZo_DrawRipples(this, globalCtx);
EnZo_DrawBubbles(this, globalCtx);
EnZo_DrawSplashes(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if ((s32)this->alpha != 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo.c", 1008);

2
src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
View file

@ -271,7 +271,7 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
Matrix_RotateZ(sp6C * (M_PI / 32), MTXMODE_APPLY);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
Matrix_Pull();
Matrix_Pop();
Matrix_RotateZ(-sp6C * (M_PI / 32), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 639),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

2
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -10381,7 +10381,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(-sp78, MTXMODE_APPLY);
func_8084A0E8(globalCtx, this, lod, gCullFrontDList, overrideLimbDraw);
this->actor.scale.y = -this->actor.scale.y;
Matrix_Pull();
Matrix_Pop();
}
gSPClearGeometryMode(POLY_OPA_DISP++, G_CULL_BOTH);