1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-08-05 05:26:49 -05:00 committed by GitHub
parent ee44798310
commit bb4babbe15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 319 deletions

View file

@ -1,293 +0,0 @@
glabel EffectBlure_Update
/* A97620 80020480 27BDFFF8 */ addiu $sp, $sp, -8
/* A97624 80020484 14800003 */ bnez $a0, .L80020494
/* A97628 80020488 AFB00004 */ sw $s0, 4($sp)
/* A9762C 8002048C 10000111 */ b .L800208D4
/* A97630 80020490 00001025 */ move $v0, $zero
.L80020494:
/* A97634 80020494 9083019E */ lbu $v1, 0x19e($a0)
/* A97638 80020498 24100002 */ li $s0, 2
/* A9763C 8002049C 240D000F */ li $t5, 15
/* A97640 800204A0 14600003 */ bnez $v1, .L800204B0
/* A97644 800204A4 00000000 */ nop
/* A97648 800204A8 1000010A */ b .L800208D4
/* A9764C 800204AC 00001025 */ move $v0, $zero
.L800204B0:
/* A97650 800204B0 8C820000 */ lw $v0, ($a0)
/* A97654 800204B4 248A0018 */ addiu $t2, $a0, 0x18
/* A97658 800204B8 14400075 */ bnez $v0, .L80020690
/* A9765C 800204BC 00000000 */ nop
/* A97660 800204C0 8D4F0000 */ lw $t7, ($t2)
/* A97664 800204C4 248B0030 */ addiu $t3, $a0, 0x30
/* A97668 800204C8 248C0048 */ addiu $t4, $a0, 0x48
/* A9766C 800204CC AC8F0000 */ sw $t7, ($a0)
/* A97670 800204D0 8D4E0004 */ lw $t6, 4($t2)
/* A97674 800204D4 24830048 */ addiu $v1, $a0, 0x48
/* A97678 800204D8 24650018 */ addiu $a1, $v1, 0x18
/* A9767C 800204DC AC8E0004 */ sw $t6, 4($a0)
/* A97680 800204E0 8D4F0008 */ lw $t7, 8($t2)
/* A97684 800204E4 24660030 */ addiu $a2, $v1, 0x30
/* A97688 800204E8 24670048 */ addiu $a3, $v1, 0x48
/* A9768C 800204EC AC8F0008 */ sw $t7, 8($a0)
/* A97690 800204F0 8D4E000C */ lw $t6, 0xc($t2)
/* A97694 800204F4 24680060 */ addiu $t0, $v1, 0x60
/* A97698 800204F8 24020003 */ li $v0, 3
/* A9769C 800204FC AC8E000C */ sw $t6, 0xc($a0)
/* A976A0 80020500 8D4F0010 */ lw $t7, 0x10($t2)
/* A976A4 80020504 AC8F0010 */ sw $t7, 0x10($a0)
/* A976A8 80020508 8D4E0014 */ lw $t6, 0x14($t2)
/* A976AC 8002050C AC8E0014 */ sw $t6, 0x14($a0)
/* A976B0 80020510 8D790000 */ lw $t9, ($t3)
/* A976B4 80020514 AD590000 */ sw $t9, ($t2)
/* A976B8 80020518 8D780004 */ lw $t8, 4($t3)
/* A976BC 8002051C AD580004 */ sw $t8, 4($t2)
/* A976C0 80020520 8D790008 */ lw $t9, 8($t3)
/* A976C4 80020524 AD590008 */ sw $t9, 8($t2)
/* A976C8 80020528 8D78000C */ lw $t8, 0xc($t3)
/* A976CC 8002052C AD58000C */ sw $t8, 0xc($t2)
/* A976D0 80020530 8D790010 */ lw $t9, 0x10($t3)
/* A976D4 80020534 AD590010 */ sw $t9, 0x10($t2)
/* A976D8 80020538 8D780014 */ lw $t8, 0x14($t3)
/* A976DC 8002053C AD580014 */ sw $t8, 0x14($t2)
/* A976E0 80020540 8D8F0000 */ lw $t7, ($t4)
/* A976E4 80020544 AD6F0000 */ sw $t7, ($t3)
/* A976E8 80020548 8D8E0004 */ lw $t6, 4($t4)
/* A976EC 8002054C AD6E0004 */ sw $t6, 4($t3)
/* A976F0 80020550 8D8F0008 */ lw $t7, 8($t4)
/* A976F4 80020554 AD6F0008 */ sw $t7, 8($t3)
/* A976F8 80020558 8D8E000C */ lw $t6, 0xc($t4)
/* A976FC 8002055C AD6E000C */ sw $t6, 0xc($t3)
/* A97700 80020560 8D8F0010 */ lw $t7, 0x10($t4)
/* A97704 80020564 AD6F0010 */ sw $t7, 0x10($t3)
/* A97708 80020568 8D8E0014 */ lw $t6, 0x14($t4)
/* A9770C 8002056C AD6E0014 */ sw $t6, 0x14($t3)
.L80020570:
/* A97710 80020570 8CB90000 */ lw $t9, ($a1)
/* A97714 80020574 24420004 */ addiu $v0, $v0, 4
/* A97718 80020578 24630060 */ addiu $v1, $v1, 0x60
/* A9771C 8002057C AC79FFA0 */ sw $t9, -0x60($v1)
/* A97720 80020580 8CB80004 */ lw $t8, 4($a1)
/* A97724 80020584 24A50060 */ addiu $a1, $a1, 0x60
/* A97728 80020588 24C60060 */ addiu $a2, $a2, 0x60
/* A9772C 8002058C AC78FFA4 */ sw $t8, -0x5c($v1)
/* A97730 80020590 8CB9FFA8 */ lw $t9, -0x58($a1)
/* A97734 80020594 24E70060 */ addiu $a3, $a3, 0x60
/* A97738 80020598 25080060 */ addiu $t0, $t0, 0x60
/* A9773C 8002059C AC79FFA8 */ sw $t9, -0x58($v1)
/* A97740 800205A0 8CB8FFAC */ lw $t8, -0x54($a1)
/* A97744 800205A4 AC78FFAC */ sw $t8, -0x54($v1)
/* A97748 800205A8 8CB9FFB0 */ lw $t9, -0x50($a1)
/* A9774C 800205AC AC79FFB0 */ sw $t9, -0x50($v1)
/* A97750 800205B0 8CB8FFB4 */ lw $t8, -0x4c($a1)
/* A97754 800205B4 AC78FFB4 */ sw $t8, -0x4c($v1)
/* A97758 800205B8 8CCFFFA0 */ lw $t7, -0x60($a2)
/* A9775C 800205BC ACAFFFA0 */ sw $t7, -0x60($a1)
/* A97760 800205C0 8CCEFFA4 */ lw $t6, -0x5c($a2)
/* A97764 800205C4 ACAEFFA4 */ sw $t6, -0x5c($a1)
/* A97768 800205C8 8CCFFFA8 */ lw $t7, -0x58($a2)
/* A9776C 800205CC ACAFFFA8 */ sw $t7, -0x58($a1)
/* A97770 800205D0 8CCEFFAC */ lw $t6, -0x54($a2)
/* A97774 800205D4 ACAEFFAC */ sw $t6, -0x54($a1)
/* A97778 800205D8 8CCFFFB0 */ lw $t7, -0x50($a2)
/* A9777C 800205DC ACAFFFB0 */ sw $t7, -0x50($a1)
/* A97780 800205E0 8CCEFFB4 */ lw $t6, -0x4c($a2)
/* A97784 800205E4 ACAEFFB4 */ sw $t6, -0x4c($a1)
/* A97788 800205E8 8CF9FFA0 */ lw $t9, -0x60($a3)
/* A9778C 800205EC ACD9FFA0 */ sw $t9, -0x60($a2)
/* A97790 800205F0 8CF8FFA4 */ lw $t8, -0x5c($a3)
/* A97794 800205F4 ACD8FFA4 */ sw $t8, -0x5c($a2)
/* A97798 800205F8 8CF9FFA8 */ lw $t9, -0x58($a3)
/* A9779C 800205FC ACD9FFA8 */ sw $t9, -0x58($a2)
/* A977A0 80020600 8CF8FFAC */ lw $t8, -0x54($a3)
/* A977A4 80020604 ACD8FFAC */ sw $t8, -0x54($a2)
/* A977A8 80020608 8CF9FFB0 */ lw $t9, -0x50($a3)
/* A977AC 8002060C ACD9FFB0 */ sw $t9, -0x50($a2)
/* A977B0 80020610 8CF8FFB4 */ lw $t8, -0x4c($a3)
/* A977B4 80020614 ACD8FFB4 */ sw $t8, -0x4c($a2)
/* A977B8 80020618 8D0FFFA0 */ lw $t7, -0x60($t0)
/* A977BC 8002061C ACEFFFA0 */ sw $t7, -0x60($a3)
/* A977C0 80020620 8D0EFFA4 */ lw $t6, -0x5c($t0)
/* A977C4 80020624 ACEEFFA4 */ sw $t6, -0x5c($a3)
/* A977C8 80020628 8D0FFFA8 */ lw $t7, -0x58($t0)
/* A977CC 8002062C ACEFFFA8 */ sw $t7, -0x58($a3)
/* A977D0 80020630 8D0EFFAC */ lw $t6, -0x54($t0)
/* A977D4 80020634 ACEEFFAC */ sw $t6, -0x54($a3)
/* A977D8 80020638 8D0FFFB0 */ lw $t7, -0x50($t0)
/* A977DC 8002063C ACEFFFB0 */ sw $t7, -0x50($a3)
/* A977E0 80020640 8D0EFFB4 */ lw $t6, -0x4c($t0)
/* A977E4 80020644 144DFFCA */ bne $v0, $t5, .L80020570
/* A977E8 80020648 ACEEFFB4 */ sw $t6, -0x4c($a3)
/* A977EC 8002064C AC700000 */ sw $s0, ($v1)
/* A977F0 80020650 A4600008 */ sh $zero, 8($v1)
/* A977F4 80020654 A460000A */ sh $zero, 0xa($v1)
/* A977F8 80020658 A460000C */ sh $zero, 0xc($v1)
/* A977FC 8002065C A460000E */ sh $zero, 0xe($v1)
/* A97800 80020660 A4600010 */ sh $zero, 0x10($v1)
/* A97804 80020664 A4600012 */ sh $zero, 0x12($v1)
/* A97808 80020668 A4600014 */ sh $zero, 0x14($v1)
/* A9780C 8002066C AC600004 */ sw $zero, 4($v1)
/* A97810 80020670 9098019E */ lbu $t8, 0x19e($a0)
/* A97814 80020674 2719FFFF */ addiu $t9, $t8, -1
/* A97818 80020678 332300FF */ andi $v1, $t9, 0xff
/* A9781C 8002067C 1C60FF8C */ bgtz $v1, .L800204B0
/* A97820 80020680 A099019E */ sb $t9, 0x19e($a0)
/* A97824 80020684 A080019E */ sb $zero, 0x19e($a0)
/* A97828 80020688 10000092 */ b .L800208D4
/* A9782C 8002068C 00001025 */ move $v0, $zero
.L80020690:
/* A97830 80020690 16020003 */ bne $s0, $v0, .L800206A0
/* A97834 80020694 00000000 */ nop
/* A97838 80020698 1000008E */ b .L800208D4
/* A9783C 8002069C 00001025 */ move $v0, $zero
.L800206A0:
/* A97840 800206A0 1860000B */ blez $v1, .L800206D0
/* A97844 800206A4 00001025 */ move $v0, $zero
/* A97848 800206A8 00801825 */ move $v1, $a0
/* A9784C 800206AC 8C6E0004 */ lw $t6, 4($v1)
.L800206B0:
/* A97850 800206B0 24420001 */ addiu $v0, $v0, 1
/* A97854 800206B4 24630018 */ addiu $v1, $v1, 0x18
/* A97858 800206B8 25CF0001 */ addiu $t7, $t6, 1
/* A9785C 800206BC AC6FFFEC */ sw $t7, -0x14($v1)
/* A97860 800206C0 9098019E */ lbu $t8, 0x19e($a0)
/* A97864 800206C4 0058082A */ slt $at, $v0, $t8
/* A97868 800206C8 5420FFF9 */ bnezl $at, .L800206B0
/* A9786C 800206CC 8C6E0004 */ lw $t6, 4($v1)
.L800206D0:
/* A97870 800206D0 9099019F */ lbu $t9, 0x19f($a0)
/* A97874 800206D4 8C8E0004 */ lw $t6, 4($a0)
/* A97878 800206D8 248A0018 */ addiu $t2, $a0, 0x18
/* A9787C 800206DC 032E082A */ slt $at, $t9, $t6
/* A97880 800206E0 50200078 */ beql $at, $zero, .L800208C4
/* A97884 800206E4 8498018C */ lh $t8, 0x18c($a0)
/* A97888 800206E8 8D580000 */ lw $t8, ($t2)
/* A9788C 800206EC 248B0030 */ addiu $t3, $a0, 0x30
/* A97890 800206F0 248C0048 */ addiu $t4, $a0, 0x48
/* A97894 800206F4 AC980000 */ sw $t8, ($a0)
/* A97898 800206F8 8D4F0004 */ lw $t7, 4($t2)
/* A9789C 800206FC 24830048 */ addiu $v1, $a0, 0x48
/* A978A0 80020700 24650018 */ addiu $a1, $v1, 0x18
/* A978A4 80020704 AC8F0004 */ sw $t7, 4($a0)
/* A978A8 80020708 8D580008 */ lw $t8, 8($t2)
/* A978AC 8002070C 24660030 */ addiu $a2, $v1, 0x30
/* A978B0 80020710 24670048 */ addiu $a3, $v1, 0x48
/* A978B4 80020714 AC980008 */ sw $t8, 8($a0)
/* A978B8 80020718 8D4F000C */ lw $t7, 0xc($t2)
/* A978BC 8002071C 24680060 */ addiu $t0, $v1, 0x60
/* A978C0 80020720 24020003 */ li $v0, 3
/* A978C4 80020724 AC8F000C */ sw $t7, 0xc($a0)
/* A978C8 80020728 8D580010 */ lw $t8, 0x10($t2)
/* A978CC 8002072C AC980010 */ sw $t8, 0x10($a0)
/* A978D0 80020730 8D4F0014 */ lw $t7, 0x14($t2)
/* A978D4 80020734 AC8F0014 */ sw $t7, 0x14($a0)
/* A978D8 80020738 8D6E0000 */ lw $t6, ($t3)
/* A978DC 8002073C AD4E0000 */ sw $t6, ($t2)
/* A978E0 80020740 8D790004 */ lw $t9, 4($t3)
/* A978E4 80020744 AD590004 */ sw $t9, 4($t2)
/* A978E8 80020748 8D6E0008 */ lw $t6, 8($t3)
/* A978EC 8002074C AD4E0008 */ sw $t6, 8($t2)
/* A978F0 80020750 8D79000C */ lw $t9, 0xc($t3)
/* A978F4 80020754 AD59000C */ sw $t9, 0xc($t2)
/* A978F8 80020758 8D6E0010 */ lw $t6, 0x10($t3)
/* A978FC 8002075C AD4E0010 */ sw $t6, 0x10($t2)
/* A97900 80020760 8D790014 */ lw $t9, 0x14($t3)
/* A97904 80020764 AD590014 */ sw $t9, 0x14($t2)
/* A97908 80020768 8D980000 */ lw $t8, ($t4)
/* A9790C 8002076C AD780000 */ sw $t8, ($t3)
/* A97910 80020770 8D8F0004 */ lw $t7, 4($t4)
/* A97914 80020774 AD6F0004 */ sw $t7, 4($t3)
/* A97918 80020778 8D980008 */ lw $t8, 8($t4)
/* A9791C 8002077C AD780008 */ sw $t8, 8($t3)
/* A97920 80020780 8D8F000C */ lw $t7, 0xc($t4)
/* A97924 80020784 AD6F000C */ sw $t7, 0xc($t3)
/* A97928 80020788 8D980010 */ lw $t8, 0x10($t4)
/* A9792C 8002078C AD780010 */ sw $t8, 0x10($t3)
/* A97930 80020790 8D8F0014 */ lw $t7, 0x14($t4)
/* A97934 80020794 AD6F0014 */ sw $t7, 0x14($t3)
.L80020798:
/* A97938 80020798 8CAE0000 */ lw $t6, ($a1)
/* A9793C 8002079C 24420004 */ addiu $v0, $v0, 4
/* A97940 800207A0 24630060 */ addiu $v1, $v1, 0x60
/* A97944 800207A4 AC6EFFA0 */ sw $t6, -0x60($v1)
/* A97948 800207A8 8CB90004 */ lw $t9, 4($a1)
/* A9794C 800207AC 24A50060 */ addiu $a1, $a1, 0x60
/* A97950 800207B0 24C60060 */ addiu $a2, $a2, 0x60
/* A97954 800207B4 AC79FFA4 */ sw $t9, -0x5c($v1)
/* A97958 800207B8 8CAEFFA8 */ lw $t6, -0x58($a1)
/* A9795C 800207BC 24E70060 */ addiu $a3, $a3, 0x60
/* A97960 800207C0 25080060 */ addiu $t0, $t0, 0x60
/* A97964 800207C4 AC6EFFA8 */ sw $t6, -0x58($v1)
/* A97968 800207C8 8CB9FFAC */ lw $t9, -0x54($a1)
/* A9796C 800207CC AC79FFAC */ sw $t9, -0x54($v1)
/* A97970 800207D0 8CAEFFB0 */ lw $t6, -0x50($a1)
/* A97974 800207D4 AC6EFFB0 */ sw $t6, -0x50($v1)
/* A97978 800207D8 8CB9FFB4 */ lw $t9, -0x4c($a1)
/* A9797C 800207DC AC79FFB4 */ sw $t9, -0x4c($v1)
/* A97980 800207E0 8CD8FFA0 */ lw $t8, -0x60($a2)
/* A97984 800207E4 ACB8FFA0 */ sw $t8, -0x60($a1)
/* A97988 800207E8 8CCFFFA4 */ lw $t7, -0x5c($a2)
/* A9798C 800207EC ACAFFFA4 */ sw $t7, -0x5c($a1)
/* A97990 800207F0 8CD8FFA8 */ lw $t8, -0x58($a2)
/* A97994 800207F4 ACB8FFA8 */ sw $t8, -0x58($a1)
/* A97998 800207F8 8CCFFFAC */ lw $t7, -0x54($a2)
/* A9799C 800207FC ACAFFFAC */ sw $t7, -0x54($a1)
/* A979A0 80020800 8CD8FFB0 */ lw $t8, -0x50($a2)
/* A979A4 80020804 ACB8FFB0 */ sw $t8, -0x50($a1)
/* A979A8 80020808 8CCFFFB4 */ lw $t7, -0x4c($a2)
/* A979AC 8002080C ACAFFFB4 */ sw $t7, -0x4c($a1)
/* A979B0 80020810 8CEEFFA0 */ lw $t6, -0x60($a3)
/* A979B4 80020814 ACCEFFA0 */ sw $t6, -0x60($a2)
/* A979B8 80020818 8CF9FFA4 */ lw $t9, -0x5c($a3)
/* A979BC 8002081C ACD9FFA4 */ sw $t9, -0x5c($a2)
/* A979C0 80020820 8CEEFFA8 */ lw $t6, -0x58($a3)
/* A979C4 80020824 ACCEFFA8 */ sw $t6, -0x58($a2)
/* A979C8 80020828 8CF9FFAC */ lw $t9, -0x54($a3)
/* A979CC 8002082C ACD9FFAC */ sw $t9, -0x54($a2)
/* A979D0 80020830 8CEEFFB0 */ lw $t6, -0x50($a3)
/* A979D4 80020834 ACCEFFB0 */ sw $t6, -0x50($a2)
/* A979D8 80020838 8CF9FFB4 */ lw $t9, -0x4c($a3)
/* A979DC 8002083C ACD9FFB4 */ sw $t9, -0x4c($a2)
/* A979E0 80020840 8D18FFA0 */ lw $t8, -0x60($t0)
/* A979E4 80020844 ACF8FFA0 */ sw $t8, -0x60($a3)
/* A979E8 80020848 8D0FFFA4 */ lw $t7, -0x5c($t0)
/* A979EC 8002084C ACEFFFA4 */ sw $t7, -0x5c($a3)
/* A979F0 80020850 8D18FFA8 */ lw $t8, -0x58($t0)
/* A979F4 80020854 ACF8FFA8 */ sw $t8, -0x58($a3)
/* A979F8 80020858 8D0FFFAC */ lw $t7, -0x54($t0)
/* A979FC 8002085C ACEFFFAC */ sw $t7, -0x54($a3)
/* A97A00 80020860 8D18FFB0 */ lw $t8, -0x50($t0)
/* A97A04 80020864 ACF8FFB0 */ sw $t8, -0x50($a3)
/* A97A08 80020868 8D0FFFB4 */ lw $t7, -0x4c($t0)
/* A97A0C 8002086C 144DFFCA */ bne $v0, $t5, .L80020798
/* A97A10 80020870 ACEFFFB4 */ sw $t7, -0x4c($a3)
/* A97A14 80020874 AC700000 */ sw $s0, ($v1)
/* A97A18 80020878 A4600008 */ sh $zero, 8($v1)
/* A97A1C 8002087C A460000A */ sh $zero, 0xa($v1)
/* A97A20 80020880 A460000C */ sh $zero, 0xc($v1)
/* A97A24 80020884 A460000E */ sh $zero, 0xe($v1)
/* A97A28 80020888 A4600010 */ sh $zero, 0x10($v1)
/* A97A2C 8002088C A4600012 */ sh $zero, 0x12($v1)
/* A97A30 80020890 A4600014 */ sh $zero, 0x14($v1)
/* A97A34 80020894 AC600004 */ sw $zero, 4($v1)
/* A97A38 80020898 9099019E */ lbu $t9, 0x19e($a0)
/* A97A3C 8002089C 00001025 */ move $v0, $zero
/* A97A40 800208A0 272EFFFF */ addiu $t6, $t9, -1
/* A97A44 800208A4 31CF00FF */ andi $t7, $t6, 0xff
/* A97A48 800208A8 1DE00003 */ bgtz $t7, .L800208B8
/* A97A4C 800208AC A08E019E */ sb $t6, 0x19e($a0)
/* A97A50 800208B0 10000008 */ b .L800208D4
/* A97A54 800208B4 A080019E */ sb $zero, 0x19e($a0)
.L800208B8:
/* A97A58 800208B8 10000006 */ b .L800208D4
/* A97A5C 800208BC 00001025 */ move $v0, $zero
/* A97A60 800208C0 8498018C */ lh $t8, 0x18c($a0)
.L800208C4:
/* A97A64 800208C4 8499018A */ lh $t9, 0x18a($a0)
/* A97A68 800208C8 00001025 */ move $v0, $zero
/* A97A6C 800208CC 03197021 */ addu $t6, $t8, $t9
/* A97A70 800208D0 A48E018C */ sh $t6, 0x18c($a0)
.L800208D4:
/* A97A74 800208D4 8FB00004 */ lw $s0, 4($sp)
/* A97A78 800208D8 03E00008 */ jr $ra
/* A97A7C 800208DC 27BD0008 */ addiu $sp, $sp, 8

View file

@ -189,8 +189,6 @@ void EffectBlure_Init2(void* thisx, void* initParamsx) {
void EffectBlure_Destroy(void* thisx) { void EffectBlure_Destroy(void* thisx) {
} }
#ifdef NON_MATCHING
// single register swap (saved vs temp register)
s32 EffectBlure_Update(void* thisx) { s32 EffectBlure_Update(void* thisx) {
EffectBlure* this = (EffectBlure*)thisx; EffectBlure* this = (EffectBlure*)thisx;
s32 i; s32 i;
@ -204,29 +202,29 @@ s32 EffectBlure_Update(void* thisx) {
} }
while (true) { while (true) {
if (this->elements[0].state != 0) { if (this->elements[0].state == 0) {
for (i = 0; i < 15; i++) {
this->elements[i] = this->elements[i + 1];
}
this->elements[i].state = 2;
this->elements[i].p1.x = 0;
this->elements[i].p1.y = 0;
this->elements[i].p1.z = 0;
this->elements[i].p2.x = 0;
this->elements[i].p2.y = 0;
this->elements[i].p2.z = 0;
this->elements[i].flags = 0;
this->elements[i].timer = 0;
this->numElements--;
if (this->numElements <= 0) {
this->numElements = 0;
return 0;
}
} else {
break; break;
} }
for (i = 0; i < 15; i++) {
this->elements[i] = this->elements[i + 1];
}
this->elements[i].state = 2;
this->elements[i].p1.x = 0;
this->elements[i].p1.y = 0;
this->elements[i].p1.z = 0;
this->elements[i].p2.x = 0;
this->elements[i].p2.y = 0;
this->elements[i].p2.z = 0;
this->elements[i].flags = 0;
this->elements[i].timer = 0;
this->numElements--;
if (this->numElements <= 0) {
this->numElements = 0;
return 0;
}
} }
if (this->elements[0].state == 2) { if (this->elements[0].state == 2) {
@ -263,9 +261,6 @@ s32 EffectBlure_Update(void* thisx) {
this->addAngle += this->addAngleChange; this->addAngle += this->addAngleChange;
return 0; return 0;
} }
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s")
#endif
void EffectBlure_UpdateFlags(EffectBlureElement* elem) { void EffectBlure_UpdateFlags(EffectBlureElement* elem) {
Vec3f sp64; Vec3f sp64;