diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s deleted file mode 100644 index c17eefc4ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel DemoEc_Destroy -/* 00000 8096D4B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8096D4B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8096D4B8 0C0295BC */ jal SkelAnime_Free -/* 0000C 8096D4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8096D4C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 8096D4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8096D4C8 03E00008 */ jr $ra -/* 0001C 8096D4CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s deleted file mode 100644 index f7145c2b56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s +++ /dev/null @@ -1,49 +0,0 @@ -.rdata -glabel D_809707D4 - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoEc_Draw -/* 02E0C 809702BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02E10 809702C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E14 809702C4 AFA5002C */ sw $a1, 0x002C($sp) -/* 02E18 809702C8 8C820198 */ lw $v0, 0x0198($a0) ## 00000198 -/* 02E1C 809702CC 0440000B */ bltz $v0, .L809702FC -/* 02E20 809702D0 28410018 */ slti $at, $v0, 0x0018 -/* 02E24 809702D4 10200009 */ beq $at, $zero, .L809702FC -/* 02E28 809702D8 00027080 */ sll $t6, $v0, 2 -/* 02E2C 809702DC 3C0F8097 */ lui $t7, %hi(D_809705B0) ## $t7 = 80970000 -/* 02E30 809702E0 25EF05B0 */ addiu $t7, $t7, %lo(D_809705B0) ## $t7 = 809705B0 -/* 02E34 809702E4 01CF1821 */ addu $v1, $t6, $t7 -/* 02E38 809702E8 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -/* 02E3C 809702EC 3C188097 */ lui $t8, %hi(D_809705B0) ## $t8 = 80970000 -/* 02E40 809702F0 271805B0 */ addiu $t8, $t8, %lo(D_809705B0) ## $t8 = 809705B0 -/* 02E44 809702F4 14C00006 */ bne $a2, $zero, .L80970310 -/* 02E48 809702F8 00000000 */ nop -.L809702FC: -/* 02E4C 809702FC 3C048097 */ lui $a0, %hi(D_809707D4) ## $a0 = 80970000 -/* 02E50 80970300 0C00084C */ jal osSyncPrintf - -/* 02E54 80970304 248407D4 */ addiu $a0, $a0, %lo(D_809707D4) ## $a0 = 809707D4 -/* 02E58 80970308 1000000C */ beq $zero, $zero, .L8097033C -/* 02E5C 8097030C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80970310: -/* 02E60 80970310 10780007 */ beq $v1, $t8, .L80970330 -/* 02E64 80970314 8FA5002C */ lw $a1, 0x002C($sp) -/* 02E68 80970318 AFA3001C */ sw $v1, 0x001C($sp) -/* 02E6C 8097031C 0C25B743 */ jal func_8096DD0C -/* 02E70 80970320 AFA40028 */ sw $a0, 0x0028($sp) -/* 02E74 80970324 8FA3001C */ lw $v1, 0x001C($sp) -/* 02E78 80970328 8FA40028 */ lw $a0, 0x0028($sp) -/* 02E7C 8097032C 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -.L80970330: -/* 02E80 80970330 00C0F809 */ jalr $ra, $a2 -/* 02E84 80970334 8FA5002C */ lw $a1, 0x002C($sp) -/* 02E88 80970338 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097033C: -/* 02E8C 8097033C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02E90 80970340 03E00008 */ jr $ra -/* 02E94 80970344 00000000 */ nop -/* 02E98 80970348 00000000 */ nop -/* 02E9C 8097034C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s deleted file mode 100644 index 5b4beb77be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_80970630 - .asciz "\x1b[31mDemo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoEc_Init -/* 00020 8096D4D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00024 8096D4D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 8096D4D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0002C 8096D4DC AFA5001C */ sw $a1, 0x001C($sp) -/* 00030 8096D4E0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00034 8096D4E4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00038 8096D4E8 3C048097 */ lui $a0, %hi(D_80970630) ## $a0 = 80970000 -/* 0003C 8096D4EC 04400002 */ bltz $v0, .L8096D4F8 -/* 00040 8096D4F0 28410023 */ slti $at, $v0, 0x0023 -/* 00044 8096D4F4 14200007 */ bne $at, $zero, .L8096D514 -.L8096D4F8: -/* 00048 8096D4F8 24840630 */ addiu $a0, $a0, %lo(D_80970630) ## $a0 = 80970630 -/* 0004C 8096D4FC 0C00084C */ jal osSyncPrintf - -/* 00050 8096D500 AFA50018 */ sw $a1, 0x0018($sp) -/* 00054 8096D504 0C00B55C */ jal Actor_Kill - -/* 00058 8096D508 8FA40018 */ lw $a0, 0x0018($sp) -/* 0005C 8096D50C 10000004 */ beq $zero, $zero, .L8096D520 -/* 00060 8096D510 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096D514: -/* 00064 8096D514 ACA00194 */ sw $zero, 0x0194($a1) ## 00000194 -/* 00068 8096D518 ACA00198 */ sw $zero, 0x0198($a1) ## 00000198 -/* 0006C 8096D51C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096D520: -/* 00070 8096D520 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00074 8096D524 03E00008 */ jr $ra -/* 00078 8096D528 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s deleted file mode 100644 index a38f9b7934..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s +++ /dev/null @@ -1,47 +0,0 @@ -.rdata -glabel D_80970798 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoEc_Update -/* 02D74 80970224 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D78 80970228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D7C 8097022C AFA5002C */ sw $a1, 0x002C($sp) -/* 02D80 80970230 8C820194 */ lw $v0, 0x0194($a0) ## 00000194 -/* 02D84 80970234 0440000B */ bltz $v0, .L80970264 -/* 02D88 80970238 2841001D */ slti $at, $v0, 0x001D -/* 02D8C 8097023C 10200009 */ beq $at, $zero, .L80970264 -/* 02D90 80970240 00027080 */ sll $t6, $v0, 2 -/* 02D94 80970244 3C0F8097 */ lui $t7, %hi(D_8097053C) ## $t7 = 80970000 -/* 02D98 80970248 25EF053C */ addiu $t7, $t7, %lo(D_8097053C) ## $t7 = 8097053C -/* 02D9C 8097024C 01CF1821 */ addu $v1, $t6, $t7 -/* 02DA0 80970250 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -/* 02DA4 80970254 3C188097 */ lui $t8, %hi(D_8097053C) ## $t8 = 80970000 -/* 02DA8 80970258 2718053C */ addiu $t8, $t8, %lo(D_8097053C) ## $t8 = 8097053C -/* 02DAC 8097025C 14C00006 */ bne $a2, $zero, .L80970278 -/* 02DB0 80970260 00000000 */ nop -.L80970264: -/* 02DB4 80970264 3C048097 */ lui $a0, %hi(D_80970798) ## $a0 = 80970000 -/* 02DB8 80970268 0C00084C */ jal osSyncPrintf - -/* 02DBC 8097026C 24840798 */ addiu $a0, $a0, %lo(D_80970798) ## $a0 = 80970798 -/* 02DC0 80970270 1000000C */ beq $zero, $zero, .L809702A4 -/* 02DC4 80970274 8FBF0014 */ lw $ra, 0x0014($sp) -.L80970278: -/* 02DC8 80970278 10780007 */ beq $v1, $t8, .L80970298 -/* 02DCC 8097027C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02DD0 80970280 AFA3001C */ sw $v1, 0x001C($sp) -/* 02DD4 80970284 0C25B76F */ jal func_8096DDBC -/* 02DD8 80970288 AFA40028 */ sw $a0, 0x0028($sp) -/* 02DDC 8097028C 8FA3001C */ lw $v1, 0x001C($sp) -/* 02DE0 80970290 8FA40028 */ lw $a0, 0x0028($sp) -/* 02DE4 80970294 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -.L80970298: -/* 02DE8 80970298 00C0F809 */ jalr $ra, $a2 -/* 02DEC 8097029C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02DF0 809702A0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809702A4: -/* 02DF4 809702A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DF8 809702A8 03E00008 */ jr $ra -/* 02DFC 809702AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s deleted file mode 100644 index effbeb204a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8096D52C -/* 0007C 8096D52C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00080 8096D530 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00084 8096D534 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00088 8096D538 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0008C 8096D53C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00090 8096D540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00094 8096D544 03E00008 */ jr $ra -/* 00098 8096D548 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s deleted file mode 100644 index 75bceab88e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096D54C -/* 0009C 8096D54C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000A0 8096D550 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 000A4 8096D554 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 000A8 8096D558 AFA50024 */ sw $a1, 0x0024($sp) -/* 000AC 8096D55C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 000B0 8096D560 AFBF001C */ sw $ra, 0x001C($sp) -/* 000B4 8096D564 AFA40020 */ sw $a0, 0x0020($sp) -/* 000B8 8096D568 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 000BC 8096D56C 44060000 */ mfc1 $a2, $f0 -/* 000C0 8096D570 AFAE0014 */ sw $t6, 0x0014($sp) -/* 000C4 8096D574 8FA40024 */ lw $a0, 0x0024($sp) -/* 000C8 8096D578 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 000CC 8096D57C 0C00B92D */ jal func_8002E4B4 -/* 000D0 8096D580 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 000D4 8096D584 8FBF001C */ lw $ra, 0x001C($sp) -/* 000D8 8096D588 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000DC 8096D58C 03E00008 */ jr $ra -/* 000E0 8096D590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s deleted file mode 100644 index 94cd7bf38b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096D594 -/* 000E4 8096D594 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E8 8096D598 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000EC 8096D59C AFA40018 */ sw $a0, 0x0018($sp) -/* 000F0 8096D5A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 000F4 8096D5A4 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 000F8 8096D5A8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 000FC 8096D5AC 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 00100 8096D5B0 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 -/* 00104 8096D5B4 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00108 8096D5B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0010C 8096D5BC 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 00110 8096D5C0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00114 8096D5C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00118 8096D5C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0011C 8096D5CC 03E00008 */ jr $ra -/* 00120 8096D5D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s deleted file mode 100644 index 887a6f34f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8096D5D4 -/* 00124 8096D5D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00128 8096D5D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0012C 8096D5DC AFA40018 */ sw $a0, 0x0018($sp) -/* 00130 8096D5E0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00134 8096D5E4 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C -/* 00138 8096D5E8 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C -/* 0013C 8096D5EC 908A0181 */ lbu $t2, 0x0181($a0) ## 00000181 -/* 00140 8096D5F0 89D80000 */ lwl $t8, 0x0000($t6) ## 00000000 -/* 00144 8096D5F4 99D80003 */ lwr $t8, 0x0003($t6) ## 00000003 -/* 00148 8096D5F8 354B0003 */ ori $t3, $t2, 0x0003 ## $t3 = 00000003 -/* 0014C 8096D5FC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00150 8096D600 A898018A */ swl $t8, 0x018A($a0) ## 0000018A -/* 00154 8096D604 B898018D */ swr $t8, 0x018D($a0) ## 0000018D -/* 00158 8096D608 95D80004 */ lhu $t8, 0x0004($t6) ## 00000004 -/* 0015C 8096D60C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 00160 8096D610 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00164 8096D614 A498018E */ sh $t8, 0x018E($a0) ## 0000018E -/* 00168 8096D618 8B290000 */ lwl $t1, 0x0000($t9) ## 00000000 -/* 0016C 8096D61C 9B290003 */ lwr $t1, 0x0003($t9) ## 00000003 -/* 00170 8096D620 A8890184 */ swl $t1, 0x0184($a0) ## 00000184 -/* 00174 8096D624 B8890187 */ swr $t1, 0x0187($a0) ## 00000187 -/* 00178 8096D628 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 -/* 0017C 8096D62C A08B0181 */ sb $t3, 0x0181($a0) ## 00000181 -/* 00180 8096D630 A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 00184 8096D634 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 00188 8096D638 8FA4001C */ lw $a0, 0x001C($sp) -/* 0018C 8096D63C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00190 8096D640 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 8096D644 03E00008 */ jr $ra -/* 00198 8096D648 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s deleted file mode 100644 index 5fa1563b82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096D64C -/* 0019C 8096D64C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 8096D650 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 8096D654 AFA40018 */ sw $a0, 0x0018($sp) -/* 001A8 8096D658 AFA5001C */ sw $a1, 0x001C($sp) -/* 001AC 8096D65C 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 001B0 8096D660 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 001B4 8096D664 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 001B8 8096D668 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 -/* 001BC 8096D66C A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 001C0 8096D670 8FA4001C */ lw $a0, 0x001C($sp) -/* 001C4 8096D674 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 001C8 8096D678 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 001CC 8096D67C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001D0 8096D680 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001D4 8096D684 03E00008 */ jr $ra -/* 001D8 8096D688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s deleted file mode 100644 index f553cf1247..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096D68C -/* 001DC 8096D68C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 001E0 8096D690 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001E4 8096D694 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 001E8 8096D698 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001EC 8096D69C 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 001F0 8096D6A0 15C00003 */ bne $t6, $zero, .L8096D6B0 -/* 001F4 8096D6A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001F8 8096D6A8 10000005 */ beq $zero, $zero, .L8096D6C0 -/* 001FC 8096D6AC 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L8096D6B0: -/* 00200 8096D6B0 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00204 8096D6B4 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00208 8096D6B8 A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 0020C 8096D6BC 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L8096D6C0: -/* 00210 8096D6C0 14400008 */ bne $v0, $zero, .L8096D6E4 -/* 00214 8096D6C4 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 00218 8096D6C8 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 0021C 8096D6CC AFA3001C */ sw $v1, 0x001C($sp) -/* 00220 8096D6D0 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00224 8096D6D4 AFA60038 */ sw $a2, 0x0038($sp) -/* 00228 8096D6D8 8FA3001C */ lw $v1, 0x001C($sp) -/* 0022C 8096D6DC 8FA60038 */ lw $a2, 0x0038($sp) -/* 00230 8096D6E0 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L8096D6E4: -/* 00234 8096D6E4 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00238 8096D6E8 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 0023C 8096D6EC A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00240 8096D6F0 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00244 8096D6F4 29010003 */ slti $at, $t0, 0x0003 -/* 00248 8096D6F8 54200003 */ bnel $at, $zero, .L8096D708 -/* 0024C 8096D6FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00250 8096D700 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00254 8096D704 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096D708: -/* 00258 8096D708 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0025C 8096D70C 03E00008 */ jr $ra -/* 00260 8096D710 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s deleted file mode 100644 index eb5169a910..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8096D714 -/* 00264 8096D714 AFA50004 */ sw $a1, 0x0004($sp) -/* 00268 8096D718 00052C00 */ sll $a1, $a1, 16 -/* 0026C 8096D71C 00052C03 */ sra $a1, $a1, 16 -/* 00270 8096D720 03E00008 */ jr $ra -/* 00274 8096D724 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s deleted file mode 100644 index 88ddc90799..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8096D728 -/* 00278 8096D728 00067900 */ sll $t7, $a2, 4 -/* 0027C 8096D72C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00280 8096D730 000FC702 */ srl $t8, $t7, 28 -/* 00284 8096D734 0018C880 */ sll $t9, $t8, 2 -/* 00288 8096D738 3C088016 */ lui $t0, %hi(gSegments) -/* 0028C 8096D73C 01194021 */ addu $t0, $t0, $t9 -/* 00290 8096D740 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00294 8096D744 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 00298 8096D748 AFA40028 */ sw $a0, 0x0028($sp) -/* 0029C 8096D74C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 002A0 8096D750 AFA5002C */ sw $a1, 0x002C($sp) -/* 002A4 8096D754 00C14824 */ and $t1, $a2, $at -/* 002A8 8096D758 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002AC 8096D75C 8FA50028 */ lw $a1, 0x0028($sp) -/* 002B0 8096D760 AFA60030 */ sw $a2, 0x0030($sp) -/* 002B4 8096D764 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002B8 8096D768 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002BC 8096D76C 01093021 */ addu $a2, $t0, $t1 -/* 002C0 8096D770 00C13021 */ addu $a2, $a2, $at -/* 002C4 8096D774 AFA00010 */ sw $zero, 0x0010($sp) -/* 002C8 8096D778 AFA00014 */ sw $zero, 0x0014($sp) -/* 002CC 8096D77C AFA00018 */ sw $zero, 0x0018($sp) -/* 002D0 8096D780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002D4 8096D784 0C0291BE */ jal SkelAnime_InitFlex -/* 002D8 8096D788 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002DC 8096D78C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002E0 8096D790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002E4 8096D794 03E00008 */ jr $ra -/* 002E8 8096D798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s deleted file mode 100644 index bb7553b560..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_8096D79C -/* 002EC 8096D79C 00057100 */ sll $t6, $a1, 4 -/* 002F0 8096D7A0 000E7F02 */ srl $t7, $t6, 28 -/* 002F4 8096D7A4 000FC080 */ sll $t8, $t7, 2 -/* 002F8 8096D7A8 3C198016 */ lui $t9, %hi(gSegments) -/* 002FC 8096D7AC 0338C821 */ addu $t9, $t9, $t8 -/* 00300 8096D7B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00304 8096D7B4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 00308 8096D7B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0030C 8096D7BC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00310 8096D7C0 00A14024 */ and $t0, $a1, $at -/* 00314 8096D7C4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00318 8096D7C8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0031C 8096D7CC 03282021 */ addu $a0, $t9, $t0 -/* 00320 8096D7D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00324 8096D7D4 00812021 */ addu $a0, $a0, $at -/* 00328 8096D7D8 AFA60040 */ sw $a2, 0x0040($sp) -/* 0032C 8096D7DC AFA70044 */ sw $a3, 0x0044($sp) -/* 00330 8096D7E0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00334 8096D7E4 AFA4002C */ sw $a0, 0x002C($sp) -/* 00338 8096D7E8 8FA90048 */ lw $t1, 0x0048($sp) -/* 0033C 8096D7EC 8FA40038 */ lw $a0, 0x0038($sp) -/* 00340 8096D7F0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00344 8096D7F4 15200007 */ bne $t1, $zero, .L8096D814 -/* 00348 8096D7F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0034C 8096D7FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00350 8096D800 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00354 8096D804 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00358 8096D808 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0035C 8096D80C 10000006 */ beq $zero, $zero, .L8096D828 -/* 00360 8096D810 468020A0 */ cvt.s.w $f2, $f4 -.L8096D814: -/* 00364 8096D814 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 00368 8096D818 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0036C 8096D81C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00370 8096D820 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00374 8096D824 46803020 */ cvt.s.w $f0, $f6 -.L8096D828: -/* 00378 8096D828 93AA0043 */ lbu $t2, 0x0043($sp) -/* 0037C 8096D82C C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 00380 8096D830 44066000 */ mfc1 $a2, $f12 -/* 00384 8096D834 44070000 */ mfc1 $a3, $f0 -/* 00388 8096D838 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0038C 8096D83C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00390 8096D840 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00394 8096D844 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00398 8096D848 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0039C 8096D84C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003A0 8096D850 03E00008 */ jr $ra -/* 003A4 8096D854 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s deleted file mode 100644 index 92e2302a06..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8096D858 -/* 003A8 8096D858 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003AC 8096D85C AFBF0014 */ sw $ra, 0x0014($sp) -/* 003B0 8096D860 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 003B4 8096D864 AFA6001C */ sw $a2, 0x001C($sp) -/* 003B8 8096D868 0C031A73 */ jal Graph_Alloc - -/* 003BC 8096D86C 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 003C0 8096D870 8FA6001C */ lw $a2, 0x001C($sp) -/* 003C4 8096D874 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 003C8 8096D878 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 003CC 8096D87C 90C80000 */ lbu $t0, 0x0000($a2) ## 00000000 -/* 003D0 8096D880 90D80003 */ lbu $t8, 0x0003($a2) ## 00000003 -/* 003D4 8096D884 90CC0001 */ lbu $t4, 0x0001($a2) ## 00000001 -/* 003D8 8096D888 90D90002 */ lbu $t9, 0x0002($a2) ## 00000002 -/* 003DC 8096D88C 00084E00 */ sll $t1, $t0, 24 -/* 003E0 8096D890 03095025 */ or $t2, $t8, $t1 ## $t2 = 00000000 -/* 003E4 8096D894 000C6C00 */ sll $t5, $t4, 16 -/* 003E8 8096D898 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000000 -/* 003EC 8096D89C 00194200 */ sll $t0, $t9, 8 -/* 003F0 8096D8A0 01C8C025 */ or $t8, $t6, $t0 ## $t8 = 00000000 -/* 003F4 8096D8A4 3C09DF00 */ lui $t1, 0xDF00 ## $t1 = DF000000 -/* 003F8 8096D8A8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 003FC 8096D8AC AC490008 */ sw $t1, 0x0008($v0) ## 00000008 -/* 00400 8096D8B0 AC40000C */ sw $zero, 0x000C($v0) ## 0000000C -/* 00404 8096D8B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00408 8096D8B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0040C 8096D8BC 03E00008 */ jr $ra -/* 00410 8096D8C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s deleted file mode 100644 index f7ae250403..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s +++ /dev/null @@ -1,124 +0,0 @@ -.rdata -glabel D_8097066C - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_8097067C - .asciz "../z_demo_ec.c" - .balign 4 - -.text -glabel func_8096D8C4 -/* 00414 8096D8C4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00418 8096D8C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0041C 8096D8CC AFB00028 */ sw $s0, 0x0028($sp) -/* 00420 8096D8D0 AFA40070 */ sw $a0, 0x0070($sp) -/* 00424 8096D8D4 AFA50074 */ sw $a1, 0x0074($sp) -/* 00428 8096D8D8 AFA60078 */ sw $a2, 0x0078($sp) -/* 0042C 8096D8DC AFA7007C */ sw $a3, 0x007C($sp) -/* 00430 8096D8E0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 00434 8096D8E4 3C068097 */ lui $a2, %hi(D_8097066C) ## $a2 = 80970000 -/* 00438 8096D8E8 24C6066C */ addiu $a2, $a2, %lo(D_8097066C) ## $a2 = 8097066C -/* 0043C 8096D8EC 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 00440 8096D8F0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00444 8096D8F4 0C031AB1 */ jal Graph_OpenDisps -/* 00448 8096D8F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0044C 8096D8FC 0C024F46 */ jal func_80093D18 -/* 00450 8096D900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00454 8096D904 8FA60078 */ lw $a2, 0x0078($sp) -/* 00458 8096D908 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 0045C 8096D90C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00460 8096D910 10C0001C */ beq $a2, $zero, .L8096D984 -/* 00464 8096D914 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00468 8096D918 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0046C 8096D91C 0006C900 */ sll $t9, $a2, 4 -/* 00470 8096D920 00194702 */ srl $t0, $t9, 28 -/* 00474 8096D924 3C0A8016 */ lui $t2, %hi(gSegments) -/* 00478 8096D928 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0047C 8096D92C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00480 8096D930 254A6FA8 */ addiu $t2, %lo(gSegments) -/* 00484 8096D934 00084880 */ sll $t1, $t0, 2 -/* 00488 8096D938 012A2021 */ addu $a0, $t1, $t2 -/* 0048C 8096D93C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00490 8096D940 8C8B0000 */ lw $t3, 0x0000($a0) ## 00000000 -/* 00494 8096D944 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00498 8096D948 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0049C 8096D94C 00C12824 */ and $a1, $a2, $at -/* 004A0 8096D950 01656021 */ addu $t4, $t3, $a1 -/* 004A4 8096D954 01876821 */ addu $t5, $t4, $a3 -/* 004A8 8096D958 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 004AC 8096D95C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004B0 8096D960 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 004B4 8096D964 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 004B8 8096D968 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 004BC 8096D96C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 004C0 8096D970 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 004C4 8096D974 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 004C8 8096D978 0305C821 */ addu $t9, $t8, $a1 -/* 004CC 8096D97C 03274021 */ addu $t0, $t9, $a3 -/* 004D0 8096D980 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -.L8096D984: -/* 004D4 8096D984 8FA4007C */ lw $a0, 0x007C($sp) -/* 004D8 8096D988 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 004DC 8096D98C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 004E0 8096D990 10800011 */ beq $a0, $zero, .L8096D9D8 -/* 004E4 8096D994 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 004E8 8096D998 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004EC 8096D99C 00045900 */ sll $t3, $a0, 4 -/* 004F0 8096D9A0 000B6702 */ srl $t4, $t3, 28 -/* 004F4 8096D9A4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 004F8 8096D9A8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 004FC 8096D9AC 000C6880 */ sll $t5, $t4, 2 -/* 00500 8096D9B0 3C0E8016 */ lui $t6, %hi(gSegments) -/* 00504 8096D9B4 01CD7021 */ addu $t6, $t6, $t5 -/* 00508 8096D9B8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0050C 8096D9BC 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00510 8096D9C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00514 8096D9C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00518 8096D9C8 00817824 */ and $t7, $a0, $at -/* 0051C 8096D9CC 01CFC021 */ addu $t8, $t6, $t7 -/* 00520 8096D9D0 0307C821 */ addu $t9, $t8, $a3 -/* 00524 8096D9D4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -.L8096D9D8: -/* 00528 8096D9D8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0052C 8096D9DC 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 00530 8096D9E0 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00534 8096D9E4 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00538 8096D9E8 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 0053C 8096D9EC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00540 8096D9F0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00544 8096D9F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00548 8096D9F8 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 0054C 8096D9FC 3C0D8011 */ lui $t5, %hi(D_80116280+0x10) -/* 00550 8096DA00 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00554 8096DA04 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00558 8096DA08 25AD6290 */ addiu $t5, %lo(D_80116280+0x10) -/* 0055C 8096DA0C 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 -/* 00560 8096DA10 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00564 8096DA14 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00568 8096DA18 8FA30070 */ lw $v1, 0x0070($sp) -/* 0056C 8096DA1C 8FAF0084 */ lw $t7, 0x0084($sp) -/* 00570 8096DA20 8FAE0080 */ lw $t6, 0x0080($sp) -/* 00574 8096DA24 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 00578 8096DA28 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 0057C 8096DA2C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00580 8096DA30 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00584 8096DA34 AFA30018 */ sw $v1, 0x0018($sp) -/* 00588 8096DA38 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0058C 8096DA3C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00590 8096DA40 8E1802C0 */ lw $t8, 0x02C0($s0) ## 000002C0 -/* 00594 8096DA44 8FA40074 */ lw $a0, 0x0074($sp) -/* 00598 8096DA48 0C0289CF */ jal SkelAnime_DrawFlex -/* 0059C 8096DA4C AFB8001C */ sw $t8, 0x001C($sp) -/* 005A0 8096DA50 3C068097 */ lui $a2, %hi(D_8097067C) ## $a2 = 80970000 -/* 005A4 8096DA54 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 005A8 8096DA58 24C6067C */ addiu $a2, $a2, %lo(D_8097067C) ## $a2 = 8097067C -/* 005AC 8096DA5C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 005B0 8096DA60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005B4 8096DA64 0C031AD5 */ jal Graph_CloseDisps -/* 005B8 8096DA68 24070253 */ addiu $a3, $zero, 0x0253 ## $a3 = 00000253 -/* 005BC 8096DA6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 005C0 8096DA70 8FB00028 */ lw $s0, 0x0028($sp) -/* 005C4 8096DA74 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 005C8 8096DA78 03E00008 */ jr $ra -/* 005CC 8096DA7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s deleted file mode 100644 index e1a4379617..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s +++ /dev/null @@ -1,178 +0,0 @@ -.rdata -glabel D_8097068C - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_8097069C - .asciz "../z_demo_ec.c" - .balign 4 - -.text -glabel func_8096DA80 -/* 005D0 8096DA80 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 005D4 8096DA84 AFBF002C */ sw $ra, 0x002C($sp) -/* 005D8 8096DA88 AFB00028 */ sw $s0, 0x0028($sp) -/* 005DC 8096DA8C AFA40070 */ sw $a0, 0x0070($sp) -/* 005E0 8096DA90 AFA50074 */ sw $a1, 0x0074($sp) -/* 005E4 8096DA94 AFA60078 */ sw $a2, 0x0078($sp) -/* 005E8 8096DA98 AFA7007C */ sw $a3, 0x007C($sp) -/* 005EC 8096DA9C 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 005F0 8096DAA0 3C068097 */ lui $a2, %hi(D_8097068C) ## $a2 = 80970000 -/* 005F4 8096DAA4 24C6068C */ addiu $a2, $a2, %lo(D_8097068C) ## $a2 = 8097068C -/* 005F8 8096DAA8 24070261 */ addiu $a3, $zero, 0x0261 ## $a3 = 00000261 -/* 005FC 8096DAAC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00600 8096DAB0 0C031AB1 */ jal Graph_OpenDisps -/* 00604 8096DAB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00608 8096DAB8 0C024F46 */ jal func_80093D18 -/* 0060C 8096DABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00610 8096DAC0 8FA40078 */ lw $a0, 0x0078($sp) -/* 00614 8096DAC4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00618 8096DAC8 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 0061C 8096DACC 10800011 */ beq $a0, $zero, .L8096DB14 -/* 00620 8096DAD0 0004C900 */ sll $t9, $a0, 4 -/* 00624 8096DAD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00628 8096DAD8 00194702 */ srl $t0, $t9, 28 -/* 0062C 8096DADC 00084880 */ sll $t1, $t0, 2 -/* 00630 8096DAE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00634 8096DAE4 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00638 8096DAE8 3C0A8016 */ lui $t2, %hi(gSegments) -/* 0063C 8096DAEC 01495021 */ addu $t2, $t2, $t1 -/* 00640 8096DAF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00644 8096DAF4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00648 8096DAF8 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 0064C 8096DAFC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00650 8096DB00 00815824 */ and $t3, $a0, $at -/* 00654 8096DB04 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00658 8096DB08 014B6021 */ addu $t4, $t2, $t3 -/* 0065C 8096DB0C 01816821 */ addu $t5, $t4, $at -/* 00660 8096DB10 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L8096DB14: -/* 00664 8096DB14 8FA4007C */ lw $a0, 0x007C($sp) -/* 00668 8096DB18 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0066C 8096DB1C 35EF002C */ ori $t7, $t7, 0x002C ## $t7 = DB06002C -/* 00670 8096DB20 10800011 */ beq $a0, $zero, .L8096DB68 -/* 00674 8096DB24 0004C100 */ sll $t8, $a0, 4 -/* 00678 8096DB28 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0067C 8096DB2C 0018CF02 */ srl $t9, $t8, 28 -/* 00680 8096DB30 00194080 */ sll $t0, $t9, 2 -/* 00684 8096DB34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00688 8096DB38 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 0068C 8096DB3C 3C098016 */ lui $t1, %hi(gSegments) -/* 00690 8096DB40 01284821 */ addu $t1, $t1, $t0 -/* 00694 8096DB44 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00698 8096DB48 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0069C 8096DB4C 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 006A0 8096DB50 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006A4 8096DB54 00815024 */ and $t2, $a0, $at -/* 006A8 8096DB58 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006AC 8096DB5C 012A5821 */ addu $t3, $t1, $t2 -/* 006B0 8096DB60 01616021 */ addu $t4, $t3, $at -/* 006B4 8096DB64 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -.L8096DB68: -/* 006B8 8096DB68 8FA50080 */ lw $a1, 0x0080($sp) -/* 006BC 8096DB6C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 006C0 8096DB70 50A0001E */ beql $a1, $zero, .L8096DBEC -/* 006C4 8096DB74 8FAE0084 */ lw $t6, 0x0084($sp) -/* 006C8 8096DB78 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 006CC 8096DB7C 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 006D0 8096DB80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D4 8096DB84 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 006D8 8096DB88 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 006DC 8096DB8C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006E0 8096DB90 0C25B616 */ jal func_8096D858 -/* 006E4 8096DB94 AFA20044 */ sw $v0, 0x0044($sp) -/* 006E8 8096DB98 AFA20034 */ sw $v0, 0x0034($sp) -/* 006EC 8096DB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006F0 8096DBA0 0C25B616 */ jal func_8096D858 -/* 006F4 8096DBA4 8FA50080 */ lw $a1, 0x0080($sp) -/* 006F8 8096DBA8 8FB80034 */ lw $t8, 0x0034($sp) -/* 006FC 8096DBAC 3C0A8016 */ lui $t2, %hi(gSegments) -/* 00700 8096DBB0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00704 8096DBB4 0018C900 */ sll $t9, $t8, 4 -/* 00708 8096DBB8 00194702 */ srl $t0, $t9, 28 -/* 0070C 8096DBBC 00084880 */ sll $t1, $t0, 2 -/* 00710 8096DBC0 01495021 */ addu $t2, $t2, $t1 -/* 00714 8096DBC4 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 00718 8096DBC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0071C 8096DBCC 00417824 */ and $t7, $v0, $at -/* 00720 8096DBD0 8FAD0044 */ lw $t5, 0x0044($sp) -/* 00724 8096DBD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00728 8096DBD8 01EA5821 */ addu $t3, $t7, $t2 -/* 0072C 8096DBDC 01616021 */ addu $t4, $t3, $at -/* 00730 8096DBE0 ADAC0004 */ sw $t4, 0x0004($t5) ## 00000004 -/* 00734 8096DBE4 8FA50080 */ lw $a1, 0x0080($sp) -/* 00738 8096DBE8 8FAE0084 */ lw $t6, 0x0084($sp) -.L8096DBEC: -/* 0073C 8096DBEC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00740 8096DBF0 51C0001D */ beql $t6, $zero, .L8096DC68 -/* 00744 8096DBF4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00748 8096DBF8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0074C 8096DBFC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 00750 8096DC00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00754 8096DC04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00758 8096DC08 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 0075C 8096DC0C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00760 8096DC10 0C25B616 */ jal func_8096D858 -/* 00764 8096DC14 AFA20040 */ sw $v0, 0x0040($sp) -/* 00768 8096DC18 AFA20034 */ sw $v0, 0x0034($sp) -/* 0076C 8096DC1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00770 8096DC20 0C25B616 */ jal func_8096D858 -/* 00774 8096DC24 8FA50080 */ lw $a1, 0x0080($sp) -/* 00778 8096DC28 8FA90034 */ lw $t1, 0x0034($sp) -/* 0077C 8096DC2C 3C0C8016 */ lui $t4, %hi(gSegments) -/* 00780 8096DC30 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00784 8096DC34 00097900 */ sll $t7, $t1, 4 -/* 00788 8096DC38 000F5702 */ srl $t2, $t7, 28 -/* 0078C 8096DC3C 000A5880 */ sll $t3, $t2, 2 -/* 00790 8096DC40 018B6021 */ addu $t4, $t4, $t3 -/* 00794 8096DC44 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 00798 8096DC48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0079C 8096DC4C 00414024 */ and $t0, $v0, $at -/* 007A0 8096DC50 8FB80040 */ lw $t8, 0x0040($sp) -/* 007A4 8096DC54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007A8 8096DC58 010C6821 */ addu $t5, $t0, $t4 -/* 007AC 8096DC5C 01A17021 */ addu $t6, $t5, $at -/* 007B0 8096DC60 AF0E0004 */ sw $t6, 0x0004($t8) ## 00000004 -/* 007B4 8096DC64 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L8096DC68: -/* 007B8 8096DC68 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 007BC 8096DC6C 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 007C0 8096DC70 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 007C4 8096DC74 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 007C8 8096DC78 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 007CC 8096DC7C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 007D0 8096DC80 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 007D4 8096DC84 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 007D8 8096DC88 3C088011 */ lui $t0, %hi(D_80116280+0x10) -/* 007DC 8096DC8C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 007E0 8096DC90 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 007E4 8096DC94 25086290 */ addiu $t0, %lo(D_80116280+0x10) -/* 007E8 8096DC98 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 007EC 8096DC9C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 007F0 8096DCA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 007F4 8096DCA4 8FA30070 */ lw $v1, 0x0070($sp) -/* 007F8 8096DCA8 8FAD008C */ lw $t5, 0x008C($sp) -/* 007FC 8096DCAC 8FAC0088 */ lw $t4, 0x0088($sp) -/* 00800 8096DCB0 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 00804 8096DCB4 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00808 8096DCB8 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 0080C 8096DCBC 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00810 8096DCC0 AFA30018 */ sw $v1, 0x0018($sp) -/* 00814 8096DCC4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00818 8096DCC8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0081C 8096DCCC 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 00820 8096DCD0 8FA40074 */ lw $a0, 0x0074($sp) -/* 00824 8096DCD4 0C0289CF */ jal SkelAnime_DrawFlex -/* 00828 8096DCD8 AFAE001C */ sw $t6, 0x001C($sp) -/* 0082C 8096DCDC 3C068097 */ lui $a2, %hi(D_8097069C) ## $a2 = 80970000 -/* 00830 8096DCE0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 00834 8096DCE4 24C6069C */ addiu $a2, $a2, %lo(D_8097069C) ## $a2 = 8097069C -/* 00838 8096DCE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 0083C 8096DCEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00840 8096DCF0 0C031AD5 */ jal Graph_CloseDisps -/* 00844 8096DCF4 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 -/* 00848 8096DCF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0084C 8096DCFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00850 8096DD00 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00854 8096DD04 03E00008 */ jr $ra -/* 00858 8096DD08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s deleted file mode 100644 index e9a2c4ce3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s +++ /dev/null @@ -1,55 +0,0 @@ -.rdata -glabel D_809706AC - .asciz "../z_demo_ec.c" - .balign 4 - -glabel D_809706BC - .asciz "../z_demo_ec.c" - .balign 4 - -.text -glabel func_8096DD0C -/* 0085C 8096DD0C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00860 8096DD10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00864 8096DD14 AFA40048 */ sw $a0, 0x0048($sp) -/* 00868 8096DD18 AFA5004C */ sw $a1, 0x004C($sp) -/* 0086C 8096DD1C 8C8F01A0 */ lw $t7, 0x01A0($a0) ## 000001A0 -/* 00870 8096DD20 3C068097 */ lui $a2, %hi(D_809706AC) ## $a2 = 80970000 -/* 00874 8096DD24 24C606AC */ addiu $a2, $a2, %lo(D_809706AC) ## $a2 = 809706AC -/* 00878 8096DD28 AFAF003C */ sw $t7, 0x003C($sp) -/* 0087C 8096DD2C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00880 8096DD30 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00884 8096DD34 24070296 */ addiu $a3, $zero, 0x0296 ## $a3 = 00000296 -/* 00888 8096DD38 0C031AB1 */ jal Graph_OpenDisps -/* 0088C 8096DD3C AFA50038 */ sw $a1, 0x0038($sp) -/* 00890 8096DD40 8FA50038 */ lw $a1, 0x0038($sp) -/* 00894 8096DD44 8FA6004C */ lw $a2, 0x004C($sp) -/* 00898 8096DD48 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 0089C 8096DD4C 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 008A0 8096DD50 35080018 */ ori $t0, $t0, 0x0018 ## $t0 = DB060018 -/* 008A4 8096DD54 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008A8 8096DD58 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 008AC 8096DD5C ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 -/* 008B0 8096DD60 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 008B4 8096DD64 8FA9003C */ lw $t1, 0x003C($sp) -/* 008B8 8096DD68 2407029E */ addiu $a3, $zero, 0x029E ## $a3 = 0000029E -/* 008BC 8096DD6C 00095100 */ sll $t2, $t1, 4 -/* 008C0 8096DD70 01495021 */ addu $t2, $t2, $t1 -/* 008C4 8096DD74 000A5080 */ sll $t2, $t2, 2 -/* 008C8 8096DD78 00CA2021 */ addu $a0, $a2, $t2 -/* 008CC 8096DD7C 00812021 */ addu $a0, $a0, $at -/* 008D0 8096DD80 8C8B17B4 */ lw $t3, 0x17B4($a0) ## 000017B4 -/* 008D4 8096DD84 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008D8 8096DD88 3C068097 */ lui $a2, %hi(D_809706BC) ## $a2 = 80970000 -/* 008DC 8096DD8C AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 008E0 8096DD90 8C8C17B4 */ lw $t4, 0x17B4($a0) ## 000017B4 -/* 008E4 8096DD94 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 008E8 8096DD98 24C606BC */ addiu $a2, $a2, %lo(D_809706BC) ## $a2 = 809706BC -/* 008EC 8096DD9C 01816821 */ addu $t5, $t4, $at -/* 008F0 8096DDA0 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 008F4 8096DDA4 0C031AD5 */ jal Graph_CloseDisps -/* 008F8 8096DDA8 AC2D6FC0 */ sw $t5, %lo(gSegments+0x18)($at) -/* 008FC 8096DDAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00900 8096DDB0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00904 8096DDB4 03E00008 */ jr $ra -/* 00908 8096DDB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s deleted file mode 100644 index fad8e78b9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096DDBC -/* 0090C 8096DDBC 8C8201A4 */ lw $v0, 0x01A4($a0) ## 000001A4 -/* 00910 8096DDC0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00914 8096DDC4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00918 8096DDC8 00027100 */ sll $t6, $v0, 4 -/* 0091C 8096DDCC 01C27021 */ addu $t6, $t6, $v0 -/* 00920 8096DDD0 000E7080 */ sll $t6, $t6, 2 -/* 00924 8096DDD4 00AE7821 */ addu $t7, $a1, $t6 -/* 00928 8096DDD8 030FC021 */ addu $t8, $t8, $t7 -/* 0092C 8096DDDC 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 -/* 00930 8096DDE0 0301C821 */ addu $t9, $t8, $at -/* 00934 8096DDE4 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 00938 8096DDE8 03E00008 */ jr $ra -/* 0093C 8096DDEC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s deleted file mode 100644 index e513391a23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8096DDF0 -/* 00940 8096DDF0 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00944 8096DDF4 00057880 */ sll $t7, $a1, 2 -/* 00948 8096DDF8 008FC021 */ addu $t8, $a0, $t7 -/* 0094C 8096DDFC 11C00003 */ beq $t6, $zero, .L8096DE0C -/* 00950 8096DE00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00954 8096DE04 03E00008 */ jr $ra -/* 00958 8096DE08 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L8096DE0C: -/* 0095C 8096DE0C 03E00008 */ jr $ra -/* 00960 8096DE10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s deleted file mode 100644 index 1ab071d9b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8096DE14 -/* 00964 8096DE14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00968 8096DE18 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0096C 8096DE1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00970 8096DE20 AFA5001C */ sw $a1, 0x001C($sp) -/* 00974 8096DE24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00978 8096DE28 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0097C 8096DE2C 0C25B77C */ jal func_8096DDF0 -/* 00980 8096DE30 AFA70018 */ sw $a3, 0x0018($sp) -/* 00984 8096DE34 10400013 */ beq $v0, $zero, .L8096DE84 -/* 00988 8096DE38 8FA70018 */ lw $a3, 0x0018($sp) -/* 0098C 8096DE3C 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00990 8096DE40 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00994 8096DE44 00000000 */ nop -/* 00998 8096DE48 468021A0 */ cvt.s.w $f6, $f4 -/* 0099C 8096DE4C E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 009A0 8096DE50 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 009A4 8096DE54 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 009A8 8096DE58 00000000 */ nop -/* 009AC 8096DE5C 468042A0 */ cvt.s.w $f10, $f8 -/* 009B0 8096DE60 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 009B4 8096DE64 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 009B8 8096DE68 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 009BC 8096DE6C 00000000 */ nop -/* 009C0 8096DE70 468084A0 */ cvt.s.w $f18, $f16 -/* 009C4 8096DE74 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 009C8 8096DE78 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 009CC 8096DE7C A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 009D0 8096DE80 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L8096DE84: -/* 009D4 8096DE84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009D8 8096DE88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009DC 8096DE8C 03E00008 */ jr $ra -/* 009E0 8096DE90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s deleted file mode 100644 index 02c939a772..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096DE94 -/* 009E4 8096DE94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009E8 8096DE98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009EC 8096DE9C AFB00020 */ sw $s0, 0x0020($sp) -/* 009F0 8096DEA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009F4 8096DEA4 0C25B743 */ jal func_8096DD0C -/* 009F8 8096DEA8 AFA5002C */ sw $a1, 0x002C($sp) -/* 009FC 8096DEAC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00A00 8096DEB0 24C63B88 */ addiu $a2, $a2, 0x3B88 ## $a2 = 06013B88 -/* 00A04 8096DEB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A08 8096DEB8 0C25B5CA */ jal func_8096D728 -/* 00A0C 8096DEBC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00A10 8096DEC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A14 8096DEC4 0C25B76F */ jal func_8096DDBC -/* 00A18 8096DEC8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00A1C 8096DECC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A20 8096DED0 24A548F4 */ addiu $a1, $a1, 0x48F4 ## $a1 = 060048F4 -/* 00A24 8096DED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A28 8096DED8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A2C 8096DEDC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00A30 8096DEE0 0C25B5E7 */ jal func_8096D79C -/* 00A34 8096DEE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A38 8096DEE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A3C 8096DEEC 0C25B593 */ jal func_8096D64C -/* 00A40 8096DEF0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00A44 8096DEF4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00A48 8096DEF8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00A4C 8096DEFC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00A50 8096DF00 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00A54 8096DF04 0C00AC78 */ jal ActorShape_Init - -/* 00A58 8096DF08 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00A5C 8096DF0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00A60 8096DF10 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 00A64 8096DF14 AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 00A68 8096DF18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A6C 8096DF1C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A70 8096DF20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A74 8096DF24 03E00008 */ jr $ra -/* 00A78 8096DF28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s deleted file mode 100644 index 87b4a50f03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096DF2C -/* 00A7C 8096DF2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A80 8096DF30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A84 8096DF34 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A88 8096DF38 0C25B54B */ jal func_8096D52C -/* 00A8C 8096DF3C AFA5001C */ sw $a1, 0x001C($sp) -/* 00A90 8096DF40 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A94 8096DF44 0C25B565 */ jal func_8096D594 -/* 00A98 8096DF48 8FA5001C */ lw $a1, 0x001C($sp) -/* 00A9C 8096DF4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00AA0 8096DF50 0C25B553 */ jal func_8096D54C -/* 00AA4 8096DF54 8FA5001C */ lw $a1, 0x001C($sp) -/* 00AA8 8096DF58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AAC 8096DF5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AB0 8096DF60 03E00008 */ jr $ra -/* 00AB4 8096DF64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s deleted file mode 100644 index 2398e62912..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096DF68 -/* 00AB8 8096DF68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00ABC 8096DF6C AFBF001C */ sw $ra, 0x001C($sp) -/* 00AC0 8096DF70 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00AC4 8096DF74 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00AC8 8096DF78 24E74350 */ addiu $a3, $a3, 0x4350 ## $a3 = 06004350 -/* 00ACC 8096DF7C 24C64390 */ addiu $a2, $a2, 0x4390 ## $a2 = 06004390 -/* 00AD0 8096DF80 AFA00010 */ sw $zero, 0x0010($sp) -/* 00AD4 8096DF84 0C25B631 */ jal func_8096D8C4 -/* 00AD8 8096DF88 AFA00014 */ sw $zero, 0x0014($sp) -/* 00ADC 8096DF8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AE0 8096DF90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AE4 8096DF94 03E00008 */ jr $ra -/* 00AE8 8096DF98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s deleted file mode 100644 index 95ccb92ee9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096DF9C -/* 00AEC 8096DF9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AF0 8096DFA0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AF4 8096DFA4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AF8 8096DFA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AFC 8096DFAC 0C25B743 */ jal func_8096DD0C -/* 00B00 8096DFB0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00B04 8096DFB4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00B08 8096DFB8 24C6B7B8 */ addiu $a2, $a2, 0xB7B8 ## $a2 = 0600B7B8 -/* 00B0C 8096DFBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B10 8096DFC0 0C25B5CA */ jal func_8096D728 -/* 00B14 8096DFC4 8FA5002C */ lw $a1, 0x002C($sp) -/* 00B18 8096DFC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B1C 8096DFCC 0C25B76F */ jal func_8096DDBC -/* 00B20 8096DFD0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00B24 8096DFD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00B28 8096DFD8 24A5BD38 */ addiu $a1, $a1, 0xBD38 ## $a1 = 0600BD38 -/* 00B2C 8096DFDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B30 8096DFE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B34 8096DFE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B38 8096DFE8 0C25B5E7 */ jal func_8096D79C -/* 00B3C 8096DFEC AFA00010 */ sw $zero, 0x0010($sp) -/* 00B40 8096DFF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B44 8096DFF4 0C25B593 */ jal func_8096D64C -/* 00B48 8096DFF8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00B4C 8096DFFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00B50 8096E000 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00B54 8096E004 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00B58 8096E008 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00B5C 8096E00C 0C00AC78 */ jal ActorShape_Init - -/* 00B60 8096E010 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00B64 8096E014 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00B68 8096E018 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 00B6C 8096E01C AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 00B70 8096E020 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B74 8096E024 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B78 8096E028 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B7C 8096E02C 03E00008 */ jr $ra -/* 00B80 8096E030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s deleted file mode 100644 index b78525c9e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096E034 -/* 00B84 8096E034 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B88 8096E038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B8C 8096E03C AFA40018 */ sw $a0, 0x0018($sp) -/* 00B90 8096E040 0C25B54B */ jal func_8096D52C -/* 00B94 8096E044 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B98 8096E048 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B9C 8096E04C 0C25B565 */ jal func_8096D594 -/* 00BA0 8096E050 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BA4 8096E054 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BA8 8096E058 0C25B553 */ jal func_8096D54C -/* 00BAC 8096E05C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BB0 8096E060 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BB4 8096E064 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BB8 8096E068 03E00008 */ jr $ra -/* 00BBC 8096E06C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s deleted file mode 100644 index ec78ecd356..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096E070 -/* 00BC0 8096E070 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00BC4 8096E074 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BC8 8096E078 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00BCC 8096E07C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00BD0 8096E080 24E77AC0 */ addiu $a3, $a3, 0x7AC0 ## $a3 = 06007AC0 -/* 00BD4 8096E084 24C676C0 */ addiu $a2, $a2, 0x76C0 ## $a2 = 060076C0 -/* 00BD8 8096E088 AFA00010 */ sw $zero, 0x0010($sp) -/* 00BDC 8096E08C 0C25B631 */ jal func_8096D8C4 -/* 00BE0 8096E090 AFA00014 */ sw $zero, 0x0014($sp) -/* 00BE4 8096E094 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BE8 8096E098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BEC 8096E09C 03E00008 */ jr $ra -/* 00BF0 8096E0A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s deleted file mode 100644 index b7c1ff293b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E0A4 -/* 00BF4 8096E0A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BF8 8096E0A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00BFC 8096E0AC AFB00020 */ sw $s0, 0x0020($sp) -/* 00C00 8096E0B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C04 8096E0B4 0C25B743 */ jal func_8096DD0C -/* 00C08 8096E0B8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00C0C 8096E0BC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00C10 8096E0C0 24C66C90 */ addiu $a2, $a2, 0x6C90 ## $a2 = 06006C90 -/* 00C14 8096E0C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C18 8096E0C8 0C25B5CA */ jal func_8096D728 -/* 00C1C 8096E0CC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C20 8096E0D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C24 8096E0D4 0C25B76F */ jal func_8096DDBC -/* 00C28 8096E0D8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C2C 8096E0DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C30 8096E0E0 24A5196C */ addiu $a1, $a1, 0x196C ## $a1 = 0600196C -/* 00C34 8096E0E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C38 8096E0E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C3C 8096E0EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C40 8096E0F0 0C25B5E7 */ jal func_8096D79C -/* 00C44 8096E0F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C48 8096E0F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C4C 8096E0FC 0C25B575 */ jal func_8096D5D4 -/* 00C50 8096E100 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C54 8096E104 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00C58 8096E108 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00C5C 8096E10C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00C60 8096E110 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00C64 8096E114 0C00AC78 */ jal ActorShape_Init - -/* 00C68 8096E118 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00C6C 8096E11C 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 00C70 8096E120 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 00C74 8096E124 AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 00C78 8096E128 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C7C 8096E12C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00C80 8096E130 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C84 8096E134 03E00008 */ jr $ra -/* 00C88 8096E138 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s deleted file mode 100644 index b5446b7855..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096E13C -/* 00C8C 8096E13C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C90 8096E140 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C94 8096E144 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C98 8096E148 0C25B54B */ jal func_8096D52C -/* 00C9C 8096E14C AFA5001C */ sw $a1, 0x001C($sp) -/* 00CA0 8096E150 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CA4 8096E154 0C25B565 */ jal func_8096D594 -/* 00CA8 8096E158 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CAC 8096E15C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CB0 8096E160 0C25B553 */ jal func_8096D54C -/* 00CB4 8096E164 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CB8 8096E168 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CBC 8096E16C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CC0 8096E170 03E00008 */ jr $ra -/* 00CC4 8096E174 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s deleted file mode 100644 index 62c70f0fc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096E178 -/* 00CC8 8096E178 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CCC 8096E17C AFBF001C */ sw $ra, 0x001C($sp) -/* 00CD0 8096E180 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00CD4 8096E184 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00CD8 8096E188 24E76920 */ addiu $a3, $a3, 0x6920 ## $a3 = 06006920 -/* 00CDC 8096E18C 24C65F20 */ addiu $a2, $a2, 0x5F20 ## $a2 = 06005F20 -/* 00CE0 8096E190 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CE4 8096E194 0C25B631 */ jal func_8096D8C4 -/* 00CE8 8096E198 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CEC 8096E19C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CF0 8096E1A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CF4 8096E1A4 03E00008 */ jr $ra -/* 00CF8 8096E1A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s deleted file mode 100644 index c589f8cade..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E1AC -/* 00CFC 8096E1AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D00 8096E1B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D04 8096E1B4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D08 8096E1B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D0C 8096E1BC 0C25B743 */ jal func_8096DD0C -/* 00D10 8096E1C0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00D14 8096E1C4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00D18 8096E1C8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 00D1C 8096E1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D20 8096E1D0 0C25B5CA */ jal func_8096D728 -/* 00D24 8096E1D4 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D28 8096E1D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D2C 8096E1DC 0C25B76F */ jal func_8096DDBC -/* 00D30 8096E1E0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D34 8096E1E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00D38 8096E1E8 24A55670 */ addiu $a1, $a1, 0x5670 ## $a1 = 06005670 -/* 00D3C 8096E1EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D40 8096E1F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D44 8096E1F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00D48 8096E1F8 0C25B5E7 */ jal func_8096D79C -/* 00D4C 8096E1FC AFA00010 */ sw $zero, 0x0010($sp) -/* 00D50 8096E200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D54 8096E204 0C25B575 */ jal func_8096D5D4 -/* 00D58 8096E208 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D5C 8096E20C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00D60 8096E210 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00D64 8096E214 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00D68 8096E218 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00D6C 8096E21C 0C00AC78 */ jal ActorShape_Init - -/* 00D70 8096E220 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00D74 8096E224 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 00D78 8096E228 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 00D7C 8096E22C AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 00D80 8096E230 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00D84 8096E234 8FB00020 */ lw $s0, 0x0020($sp) -/* 00D88 8096E238 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D8C 8096E23C 03E00008 */ jr $ra -/* 00D90 8096E240 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s deleted file mode 100644 index 9f874ac556..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096E244 -/* 00D94 8096E244 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D98 8096E248 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D9C 8096E24C AFB00020 */ sw $s0, 0x0020($sp) -/* 00DA0 8096E250 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DA4 8096E254 0C25B743 */ jal func_8096DD0C -/* 00DA8 8096E258 AFA5002C */ sw $a1, 0x002C($sp) -/* 00DAC 8096E25C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00DB0 8096E260 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 00DB4 8096E264 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DB8 8096E268 0C25B5CA */ jal func_8096D728 -/* 00DBC 8096E26C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DC0 8096E270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DC4 8096E274 0C25B76F */ jal func_8096DDBC -/* 00DC8 8096E278 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DCC 8096E27C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DD0 8096E280 24A5513C */ addiu $a1, $a1, 0x513C ## $a1 = 0600513C -/* 00DD4 8096E284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD8 8096E288 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00DDC 8096E28C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DE0 8096E290 0C25B5E7 */ jal func_8096D79C -/* 00DE4 8096E294 AFA00010 */ sw $zero, 0x0010($sp) -/* 00DE8 8096E298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DEC 8096E29C 0C25B575 */ jal func_8096D5D4 -/* 00DF0 8096E2A0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DF4 8096E2A4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00DF8 8096E2A8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00DFC 8096E2AC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00E00 8096E2B0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00E04 8096E2B4 0C00AC78 */ jal ActorShape_Init - -/* 00E08 8096E2B8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00E0C 8096E2BC 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 00E10 8096E2C0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00E14 8096E2C4 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 00E18 8096E2C8 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 00E1C 8096E2CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E20 8096E2D0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00E24 8096E2D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E28 8096E2D8 03E00008 */ jr $ra -/* 00E2C 8096E2DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s deleted file mode 100644 index a73b893e92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096E2E0 -/* 00E30 8096E2E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E34 8096E2E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E38 8096E2E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E3C 8096E2EC 0C25B54B */ jal func_8096D52C -/* 00E40 8096E2F0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E44 8096E2F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E48 8096E2F8 0C25B565 */ jal func_8096D594 -/* 00E4C 8096E2FC 8FA5001C */ lw $a1, 0x001C($sp) -/* 00E50 8096E300 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E54 8096E304 0C25B553 */ jal func_8096D54C -/* 00E58 8096E308 8FA5001C */ lw $a1, 0x001C($sp) -/* 00E5C 8096E30C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E60 8096E310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E64 8096E314 03E00008 */ jr $ra -/* 00E68 8096E318 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s deleted file mode 100644 index af8b0aff29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8096E31C -/* 00E6C 8096E31C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E70 8096E320 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E74 8096E324 0C25B8B8 */ jal func_8096E2E0 -/* 00E78 8096E328 00000000 */ nop -/* 00E7C 8096E32C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E80 8096E330 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E84 8096E334 03E00008 */ jr $ra -/* 00E88 8096E338 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s deleted file mode 100644 index 2ebc747990..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096E33C -/* 00E8C 8096E33C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E90 8096E340 3C0E8097 */ lui $t6, %hi(D_809703E0) ## $t6 = 80970000 -/* 00E94 8096E344 3C0F8097 */ lui $t7, %hi(D_809703E4) ## $t7 = 80970000 -/* 00E98 8096E348 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E9C 8096E34C 25EF03E4 */ addiu $t7, $t7, %lo(D_809703E4) ## $t7 = 809703E4 -/* 00EA0 8096E350 25CE03E0 */ addiu $t6, $t6, %lo(D_809703E0) ## $t6 = 809703E0 -/* 00EA4 8096E354 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00EA8 8096E358 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00EAC 8096E35C AFA00018 */ sw $zero, 0x0018($sp) -/* 00EB0 8096E360 AFA0001C */ sw $zero, 0x001C($sp) -/* 00EB4 8096E364 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00EB8 8096E368 0C25B6A0 */ jal func_8096DA80 -/* 00EBC 8096E36C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EC0 8096E370 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00EC4 8096E374 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00EC8 8096E378 03E00008 */ jr $ra -/* 00ECC 8096E37C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s deleted file mode 100644 index 72c308f08b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E380 -/* 00ED0 8096E380 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00ED4 8096E384 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00ED8 8096E388 AFB00020 */ sw $s0, 0x0020($sp) -/* 00EDC 8096E38C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EE0 8096E390 0C25B743 */ jal func_8096DD0C -/* 00EE4 8096E394 AFA5002C */ sw $a1, 0x002C($sp) -/* 00EE8 8096E398 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00EEC 8096E39C 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 00EF0 8096E3A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EF4 8096E3A4 0C25B5CA */ jal func_8096D728 -/* 00EF8 8096E3A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00EFC 8096E3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F00 8096E3B0 0C25B76F */ jal func_8096DDBC -/* 00F04 8096E3B4 8FA5002C */ lw $a1, 0x002C($sp) -/* 00F08 8096E3B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F0C 8096E3BC 24A55670 */ addiu $a1, $a1, 0x5670 ## $a1 = 06005670 -/* 00F10 8096E3C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F14 8096E3C4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F18 8096E3C8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F1C 8096E3CC 0C25B5E7 */ jal func_8096D79C -/* 00F20 8096E3D0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F24 8096E3D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F28 8096E3D8 0C25B575 */ jal func_8096D5D4 -/* 00F2C 8096E3DC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00F30 8096E3E0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00F34 8096E3E4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00F38 8096E3E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00F3C 8096E3EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00F40 8096E3F0 0C00AC78 */ jal ActorShape_Init - -/* 00F44 8096E3F4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00F48 8096E3F8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -/* 00F4C 8096E3FC AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 00F50 8096E400 AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 00F54 8096E404 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00F58 8096E408 8FB00020 */ lw $s0, 0x0020($sp) -/* 00F5C 8096E40C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F60 8096E410 03E00008 */ jr $ra -/* 00F64 8096E414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s deleted file mode 100644 index a4edda366f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096E418 -/* 00F68 8096E418 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F6C 8096E41C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F70 8096E420 AFB00020 */ sw $s0, 0x0020($sp) -/* 00F74 8096E424 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F78 8096E428 0C25B743 */ jal func_8096DD0C -/* 00F7C 8096E42C AFA5002C */ sw $a1, 0x002C($sp) -/* 00F80 8096E430 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00F84 8096E434 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 00F88 8096E438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F8C 8096E43C 0C25B5CA */ jal func_8096D728 -/* 00F90 8096E440 8FA5002C */ lw $a1, 0x002C($sp) -/* 00F94 8096E444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F98 8096E448 0C25B76F */ jal func_8096DDBC -/* 00F9C 8096E44C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00FA0 8096E450 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00FA4 8096E454 24A5513C */ addiu $a1, $a1, 0x513C ## $a1 = 0600513C -/* 00FA8 8096E458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FAC 8096E45C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00FB0 8096E460 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FB4 8096E464 0C25B5E7 */ jal func_8096D79C -/* 00FB8 8096E468 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FBC 8096E46C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FC0 8096E470 0C25B575 */ jal func_8096D5D4 -/* 00FC4 8096E474 8FA5002C */ lw $a1, 0x002C($sp) -/* 00FC8 8096E478 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00FCC 8096E47C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00FD0 8096E480 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00FD4 8096E484 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00FD8 8096E488 0C00AC78 */ jal ActorShape_Init - -/* 00FDC 8096E48C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00FE0 8096E490 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 00FE4 8096E494 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 00FE8 8096E498 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 00FEC 8096E49C AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 00FF0 8096E4A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FF4 8096E4A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00FF8 8096E4A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FFC 8096E4AC 03E00008 */ jr $ra -/* 01000 8096E4B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s deleted file mode 100644 index 6ece39d561..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096E4B4 -/* 01004 8096E4B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01008 8096E4B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0100C 8096E4BC AFA40018 */ sw $a0, 0x0018($sp) -/* 01010 8096E4C0 0C25B54B */ jal func_8096D52C -/* 01014 8096E4C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01018 8096E4C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0101C 8096E4CC 0C25B565 */ jal func_8096D594 -/* 01020 8096E4D0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01024 8096E4D4 0C25B5A3 */ jal func_8096D68C -/* 01028 8096E4D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0102C 8096E4DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01030 8096E4E0 0C25B553 */ jal func_8096D54C -/* 01034 8096E4E4 8FA5001C */ lw $a1, 0x001C($sp) -/* 01038 8096E4E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0103C 8096E4EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01040 8096E4F0 03E00008 */ jr $ra -/* 01044 8096E4F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s deleted file mode 100644 index 67648c0fac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8096E4F8 -/* 01048 8096E4F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0104C 8096E4FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01050 8096E500 0C25B92D */ jal func_8096E4B4 -/* 01054 8096E504 00000000 */ nop -/* 01058 8096E508 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0105C 8096E50C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01060 8096E510 03E00008 */ jr $ra -/* 01064 8096E514 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s deleted file mode 100644 index 78b0ee311e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096E518 -/* 01068 8096E518 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0106C 8096E51C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01070 8096E520 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01074 8096E524 3C068097 */ lui $a2, %hi(D_809703E8) ## $a2 = 80970000 -/* 01078 8096E528 3C0F8097 */ lui $t7, %hi(D_809703F4) ## $t7 = 80970000 -/* 0107C 8096E52C 3C188097 */ lui $t8, %hi(D_809703F8) ## $t8 = 80970000 -/* 01080 8096E530 00027080 */ sll $t6, $v0, 2 -/* 01084 8096E534 00CE3021 */ addu $a2, $a2, $t6 -/* 01088 8096E538 271803F8 */ addiu $t8, $t8, %lo(D_809703F8) ## $t8 = 809703F8 -/* 0108C 8096E53C 25EF03F4 */ addiu $t7, $t7, %lo(D_809703F4) ## $t7 = 809703F4 -/* 01090 8096E540 8CC603E8 */ lw $a2, %lo(D_809703E8)($a2) -/* 01094 8096E544 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01098 8096E548 AFB80014 */ sw $t8, 0x0014($sp) -/* 0109C 8096E54C AFA0001C */ sw $zero, 0x001C($sp) -/* 010A0 8096E550 AFA00018 */ sw $zero, 0x0018($sp) -/* 010A4 8096E554 0C25B6A0 */ jal func_8096DA80 -/* 010A8 8096E558 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 010AC 8096E55C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 010B0 8096E560 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 010B4 8096E564 03E00008 */ jr $ra -/* 010B8 8096E568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s deleted file mode 100644 index 0b322e4b5e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E56C -/* 010BC 8096E56C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010C0 8096E570 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010C4 8096E574 AFB00020 */ sw $s0, 0x0020($sp) -/* 010C8 8096E578 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010CC 8096E57C 0C25B743 */ jal func_8096DD0C -/* 010D0 8096E580 AFA5002C */ sw $a1, 0x002C($sp) -/* 010D4 8096E584 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 010D8 8096E588 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 010DC 8096E58C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010E0 8096E590 0C25B5CA */ jal func_8096D728 -/* 010E4 8096E594 8FA5002C */ lw $a1, 0x002C($sp) -/* 010E8 8096E598 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010EC 8096E59C 0C25B76F */ jal func_8096DDBC -/* 010F0 8096E5A0 8FA5002C */ lw $a1, 0x002C($sp) -/* 010F4 8096E5A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010F8 8096E5A8 24A55EA8 */ addiu $a1, $a1, 0x5EA8 ## $a1 = 06005EA8 -/* 010FC 8096E5AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01100 8096E5B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01104 8096E5B4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01108 8096E5B8 0C25B5E7 */ jal func_8096D79C -/* 0110C 8096E5BC AFA00010 */ sw $zero, 0x0010($sp) -/* 01110 8096E5C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01114 8096E5C4 0C25B575 */ jal func_8096D5D4 -/* 01118 8096E5C8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0111C 8096E5CC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01120 8096E5D0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01124 8096E5D4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01128 8096E5D8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0112C 8096E5DC 0C00AC78 */ jal ActorShape_Init - -/* 01130 8096E5E0 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 01134 8096E5E4 24020006 */ addiu $v0, $zero, 0x0006 ## $v0 = 00000006 -/* 01138 8096E5E8 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 0113C 8096E5EC AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 01140 8096E5F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01144 8096E5F4 8FB00020 */ lw $s0, 0x0020($sp) -/* 01148 8096E5F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0114C 8096E5FC 03E00008 */ jr $ra -/* 01150 8096E600 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s deleted file mode 100644 index 04168b7fb7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096E604 -/* 01154 8096E604 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01158 8096E608 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0115C 8096E60C AFA40018 */ sw $a0, 0x0018($sp) -/* 01160 8096E610 0C25B54B */ jal func_8096D52C -/* 01164 8096E614 AFA5001C */ sw $a1, 0x001C($sp) -/* 01168 8096E618 8FA40018 */ lw $a0, 0x0018($sp) -/* 0116C 8096E61C 0C25B565 */ jal func_8096D594 -/* 01170 8096E620 8FA5001C */ lw $a1, 0x001C($sp) -/* 01174 8096E624 0C25B5A3 */ jal func_8096D68C -/* 01178 8096E628 8FA40018 */ lw $a0, 0x0018($sp) -/* 0117C 8096E62C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01180 8096E630 0C25B553 */ jal func_8096D54C -/* 01184 8096E634 8FA5001C */ lw $a1, 0x001C($sp) -/* 01188 8096E638 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0118C 8096E63C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01190 8096E640 03E00008 */ jr $ra -/* 01194 8096E644 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s deleted file mode 100644 index 8f4449bfa1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096E648 -/* 01198 8096E648 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0119C 8096E64C AFBF0024 */ sw $ra, 0x0024($sp) -/* 011A0 8096E650 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 011A4 8096E654 3C068097 */ lui $a2, %hi(D_809703FC) ## $a2 = 80970000 -/* 011A8 8096E658 3C0F8097 */ lui $t7, %hi(D_80970408) ## $t7 = 80970000 -/* 011AC 8096E65C 3C188097 */ lui $t8, %hi(D_8097040C) ## $t8 = 80970000 -/* 011B0 8096E660 00027080 */ sll $t6, $v0, 2 -/* 011B4 8096E664 00CE3021 */ addu $a2, $a2, $t6 -/* 011B8 8096E668 2718040C */ addiu $t8, $t8, %lo(D_8097040C) ## $t8 = 8097040C -/* 011BC 8096E66C 25EF0408 */ addiu $t7, $t7, %lo(D_80970408) ## $t7 = 80970408 -/* 011C0 8096E670 8CC603FC */ lw $a2, %lo(D_809703FC)($a2) -/* 011C4 8096E674 AFAF0010 */ sw $t7, 0x0010($sp) -/* 011C8 8096E678 AFB80014 */ sw $t8, 0x0014($sp) -/* 011CC 8096E67C AFA0001C */ sw $zero, 0x001C($sp) -/* 011D0 8096E680 AFA00018 */ sw $zero, 0x0018($sp) -/* 011D4 8096E684 0C25B6A0 */ jal func_8096DA80 -/* 011D8 8096E688 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011DC 8096E68C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 011E0 8096E690 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 011E4 8096E694 03E00008 */ jr $ra -/* 011E8 8096E698 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s deleted file mode 100644 index ecef8dc88f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E69C -/* 011EC 8096E69C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011F0 8096E6A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 011F4 8096E6A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 011F8 8096E6A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011FC 8096E6AC 0C25B743 */ jal func_8096DD0C -/* 01200 8096E6B0 AFA5002C */ sw $a1, 0x002C($sp) -/* 01204 8096E6B4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01208 8096E6B8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0120C 8096E6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01210 8096E6C0 0C25B5CA */ jal func_8096D728 -/* 01214 8096E6C4 8FA5002C */ lw $a1, 0x002C($sp) -/* 01218 8096E6C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0121C 8096E6CC 0C25B76F */ jal func_8096DDBC -/* 01220 8096E6D0 8FA5002C */ lw $a1, 0x002C($sp) -/* 01224 8096E6D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01228 8096E6D8 24A55EA8 */ addiu $a1, $a1, 0x5EA8 ## $a1 = 06005EA8 -/* 0122C 8096E6DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01230 8096E6E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01234 8096E6E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01238 8096E6E8 0C25B5E7 */ jal func_8096D79C -/* 0123C 8096E6EC AFA00010 */ sw $zero, 0x0010($sp) -/* 01240 8096E6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01244 8096E6F4 0C25B575 */ jal func_8096D5D4 -/* 01248 8096E6F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0124C 8096E6FC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01250 8096E700 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01254 8096E704 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01258 8096E708 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0125C 8096E70C 0C00AC78 */ jal ActorShape_Init - -/* 01260 8096E710 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 01264 8096E714 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -/* 01268 8096E718 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 0126C 8096E71C AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 01270 8096E720 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01274 8096E724 8FB00020 */ lw $s0, 0x0020($sp) -/* 01278 8096E728 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0127C 8096E72C 03E00008 */ jr $ra -/* 01280 8096E730 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s deleted file mode 100644 index b19475a66c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096E734 -/* 01284 8096E734 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01288 8096E738 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0128C 8096E73C AFA40018 */ sw $a0, 0x0018($sp) -/* 01290 8096E740 0C25B54B */ jal func_8096D52C -/* 01294 8096E744 AFA5001C */ sw $a1, 0x001C($sp) -/* 01298 8096E748 8FA40018 */ lw $a0, 0x0018($sp) -/* 0129C 8096E74C 0C25B565 */ jal func_8096D594 -/* 012A0 8096E750 8FA5001C */ lw $a1, 0x001C($sp) -/* 012A4 8096E754 0C25B5A3 */ jal func_8096D68C -/* 012A8 8096E758 8FA40018 */ lw $a0, 0x0018($sp) -/* 012AC 8096E75C 8FA40018 */ lw $a0, 0x0018($sp) -/* 012B0 8096E760 0C25B553 */ jal func_8096D54C -/* 012B4 8096E764 8FA5001C */ lw $a1, 0x001C($sp) -/* 012B8 8096E768 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012BC 8096E76C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012C0 8096E770 03E00008 */ jr $ra -/* 012C4 8096E774 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s deleted file mode 100644 index 81e4e8ff97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096E778 -/* 012C8 8096E778 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012CC 8096E77C AFBF0024 */ sw $ra, 0x0024($sp) -/* 012D0 8096E780 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 012D4 8096E784 3C068097 */ lui $a2, %hi(D_80970410) ## $a2 = 80970000 -/* 012D8 8096E788 3C0F8097 */ lui $t7, %hi(D_8097041C) ## $t7 = 80970000 -/* 012DC 8096E78C 3C188097 */ lui $t8, %hi(D_80970420) ## $t8 = 80970000 -/* 012E0 8096E790 00027080 */ sll $t6, $v0, 2 -/* 012E4 8096E794 00CE3021 */ addu $a2, $a2, $t6 -/* 012E8 8096E798 27180420 */ addiu $t8, $t8, %lo(D_80970420) ## $t8 = 80970420 -/* 012EC 8096E79C 25EF041C */ addiu $t7, $t7, %lo(D_8097041C) ## $t7 = 8097041C -/* 012F0 8096E7A0 8CC60410 */ lw $a2, %lo(D_80970410)($a2) -/* 012F4 8096E7A4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 012F8 8096E7A8 AFB80014 */ sw $t8, 0x0014($sp) -/* 012FC 8096E7AC AFA0001C */ sw $zero, 0x001C($sp) -/* 01300 8096E7B0 AFA00018 */ sw $zero, 0x0018($sp) -/* 01304 8096E7B4 0C25B6A0 */ jal func_8096DA80 -/* 01308 8096E7B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0130C 8096E7BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01310 8096E7C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01314 8096E7C4 03E00008 */ jr $ra -/* 01318 8096E7C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s deleted file mode 100644 index b240e57314..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E7CC -/* 0131C 8096E7CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01320 8096E7D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01324 8096E7D4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01328 8096E7D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0132C 8096E7DC 0C25B743 */ jal func_8096DD0C -/* 01330 8096E7E0 AFA5002C */ sw $a1, 0x002C($sp) -/* 01334 8096E7E4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01338 8096E7E8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0133C 8096E7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01340 8096E7F0 0C25B5CA */ jal func_8096D728 -/* 01344 8096E7F4 8FA5002C */ lw $a1, 0x002C($sp) -/* 01348 8096E7F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0134C 8096E7FC 0C25B76F */ jal func_8096DDBC -/* 01350 8096E800 8FA5002C */ lw $a1, 0x002C($sp) -/* 01354 8096E804 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01358 8096E808 24A55EA8 */ addiu $a1, $a1, 0x5EA8 ## $a1 = 06005EA8 -/* 0135C 8096E80C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01360 8096E810 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01364 8096E814 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01368 8096E818 0C25B5E7 */ jal func_8096D79C -/* 0136C 8096E81C AFA00010 */ sw $zero, 0x0010($sp) -/* 01370 8096E820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01374 8096E824 0C25B575 */ jal func_8096D5D4 -/* 01378 8096E828 8FA5002C */ lw $a1, 0x002C($sp) -/* 0137C 8096E82C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01380 8096E830 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01384 8096E834 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01388 8096E838 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0138C 8096E83C 0C00AC78 */ jal ActorShape_Init - -/* 01390 8096E840 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 01394 8096E844 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -/* 01398 8096E848 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 0139C 8096E84C AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 013A0 8096E850 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013A4 8096E854 8FB00020 */ lw $s0, 0x0020($sp) -/* 013A8 8096E858 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013AC 8096E85C 03E00008 */ jr $ra -/* 013B0 8096E860 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s deleted file mode 100644 index c1bf81d111..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096E864 -/* 013B4 8096E864 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013B8 8096E868 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013BC 8096E86C AFA40018 */ sw $a0, 0x0018($sp) -/* 013C0 8096E870 0C25B54B */ jal func_8096D52C -/* 013C4 8096E874 AFA5001C */ sw $a1, 0x001C($sp) -/* 013C8 8096E878 8FA40018 */ lw $a0, 0x0018($sp) -/* 013CC 8096E87C 0C25B565 */ jal func_8096D594 -/* 013D0 8096E880 8FA5001C */ lw $a1, 0x001C($sp) -/* 013D4 8096E884 0C25B5A3 */ jal func_8096D68C -/* 013D8 8096E888 8FA40018 */ lw $a0, 0x0018($sp) -/* 013DC 8096E88C 8FA40018 */ lw $a0, 0x0018($sp) -/* 013E0 8096E890 0C25B553 */ jal func_8096D54C -/* 013E4 8096E894 8FA5001C */ lw $a1, 0x001C($sp) -/* 013E8 8096E898 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013EC 8096E89C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013F0 8096E8A0 03E00008 */ jr $ra -/* 013F4 8096E8A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s deleted file mode 100644 index dcbfe094b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096E8A8 -/* 013F8 8096E8A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013FC 8096E8AC AFBF001C */ sw $ra, 0x001C($sp) -/* 01400 8096E8B0 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01404 8096E8B4 3C068097 */ lui $a2, %hi(D_80970424) ## $a2 = 80970000 -/* 01408 8096E8B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0140C 8096E8BC 00027080 */ sll $t6, $v0, 2 -/* 01410 8096E8C0 00CE3021 */ addu $a2, $a2, $t6 -/* 01414 8096E8C4 8CC60424 */ lw $a2, %lo(D_80970424)($a2) -/* 01418 8096E8C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0141C 8096E8CC 0C25B631 */ jal func_8096D8C4 -/* 01420 8096E8D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01424 8096E8D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01428 8096E8D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0142C 8096E8DC 03E00008 */ jr $ra -/* 01430 8096E8E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s deleted file mode 100644 index 4f1c084e18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E8E4 -/* 01434 8096E8E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01438 8096E8E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0143C 8096E8EC AFB00020 */ sw $s0, 0x0020($sp) -/* 01440 8096E8F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01444 8096E8F4 0C25B743 */ jal func_8096DD0C -/* 01448 8096E8F8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0144C 8096E8FC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01450 8096E900 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 01454 8096E904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01458 8096E908 0C25B5CA */ jal func_8096D728 -/* 0145C 8096E90C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01460 8096E910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01464 8096E914 0C25B76F */ jal func_8096DDBC -/* 01468 8096E918 8FA5002C */ lw $a1, 0x002C($sp) -/* 0146C 8096E91C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01470 8096E920 24A55EA8 */ addiu $a1, $a1, 0x5EA8 ## $a1 = 06005EA8 -/* 01474 8096E924 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01478 8096E928 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0147C 8096E92C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01480 8096E930 0C25B5E7 */ jal func_8096D79C -/* 01484 8096E934 AFA00010 */ sw $zero, 0x0010($sp) -/* 01488 8096E938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0148C 8096E93C 0C25B575 */ jal func_8096D5D4 -/* 01490 8096E940 8FA5002C */ lw $a1, 0x002C($sp) -/* 01494 8096E944 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01498 8096E948 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0149C 8096E94C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 014A0 8096E950 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 014A4 8096E954 0C00AC78 */ jal ActorShape_Init - -/* 014A8 8096E958 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 014AC 8096E95C 24020009 */ addiu $v0, $zero, 0x0009 ## $v0 = 00000009 -/* 014B0 8096E960 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 014B4 8096E964 AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 014B8 8096E968 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014BC 8096E96C 8FB00020 */ lw $s0, 0x0020($sp) -/* 014C0 8096E970 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014C4 8096E974 03E00008 */ jr $ra -/* 014C8 8096E978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s deleted file mode 100644 index 6dac8af43c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096E97C -/* 014CC 8096E97C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014D0 8096E980 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014D4 8096E984 AFA40018 */ sw $a0, 0x0018($sp) -/* 014D8 8096E988 0C25B54B */ jal func_8096D52C -/* 014DC 8096E98C AFA5001C */ sw $a1, 0x001C($sp) -/* 014E0 8096E990 8FA40018 */ lw $a0, 0x0018($sp) -/* 014E4 8096E994 0C25B565 */ jal func_8096D594 -/* 014E8 8096E998 8FA5001C */ lw $a1, 0x001C($sp) -/* 014EC 8096E99C 8FA40018 */ lw $a0, 0x0018($sp) -/* 014F0 8096E9A0 0C25B553 */ jal func_8096D54C -/* 014F4 8096E9A4 8FA5001C */ lw $a1, 0x001C($sp) -/* 014F8 8096E9A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014FC 8096E9AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01500 8096E9B0 03E00008 */ jr $ra -/* 01504 8096E9B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s deleted file mode 100644 index e256a1b4de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8096E9B8 -/* 01508 8096E9B8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0150C 8096E9BC AFBF001C */ sw $ra, 0x001C($sp) -/* 01510 8096E9C0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01514 8096E9C4 24C604C8 */ addiu $a2, $a2, 0x04C8 ## $a2 = 060004C8 -/* 01518 8096E9C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0151C 8096E9CC AFA00014 */ sw $zero, 0x0014($sp) -/* 01520 8096E9D0 0C25B631 */ jal func_8096D8C4 -/* 01524 8096E9D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01528 8096E9D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0152C 8096E9DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01530 8096E9E0 03E00008 */ jr $ra -/* 01534 8096E9E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s deleted file mode 100644 index 1e81ea49f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096E9E8 -/* 01538 8096E9E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0153C 8096E9EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01540 8096E9F0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01544 8096E9F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01548 8096E9F8 0C25B743 */ jal func_8096DD0C -/* 0154C 8096E9FC AFA5002C */ sw $a1, 0x002C($sp) -/* 01550 8096EA00 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01554 8096EA04 24C67150 */ addiu $a2, $a2, 0x7150 ## $a2 = 06007150 -/* 01558 8096EA08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0155C 8096EA0C 0C25B5CA */ jal func_8096D728 -/* 01560 8096EA10 8FA5002C */ lw $a1, 0x002C($sp) -/* 01564 8096EA14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01568 8096EA18 0C25B76F */ jal func_8096DDBC -/* 0156C 8096EA1C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01570 8096EA20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01574 8096EA24 24A5164C */ addiu $a1, $a1, 0x164C ## $a1 = 0600164C -/* 01578 8096EA28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0157C 8096EA2C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01580 8096EA30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01584 8096EA34 0C25B5E7 */ jal func_8096D79C -/* 01588 8096EA38 AFA00010 */ sw $zero, 0x0010($sp) -/* 0158C 8096EA3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01590 8096EA40 0C25B575 */ jal func_8096D5D4 -/* 01594 8096EA44 8FA5002C */ lw $a1, 0x002C($sp) -/* 01598 8096EA48 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 0159C 8096EA4C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 015A0 8096EA50 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 015A4 8096EA54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 015A8 8096EA58 0C00AC78 */ jal ActorShape_Init - -/* 015AC 8096EA5C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 015B0 8096EA60 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A -/* 015B4 8096EA64 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 015B8 8096EA68 AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 015BC 8096EA6C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 015C0 8096EA70 8FB00020 */ lw $s0, 0x0020($sp) -/* 015C4 8096EA74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015C8 8096EA78 03E00008 */ jr $ra -/* 015CC 8096EA7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s deleted file mode 100644 index e58935b259..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096EA80 -/* 015D0 8096EA80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015D4 8096EA84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 015D8 8096EA88 AFA40018 */ sw $a0, 0x0018($sp) -/* 015DC 8096EA8C 0C25B54B */ jal func_8096D52C -/* 015E0 8096EA90 AFA5001C */ sw $a1, 0x001C($sp) -/* 015E4 8096EA94 8FA40018 */ lw $a0, 0x0018($sp) -/* 015E8 8096EA98 0C25B565 */ jal func_8096D594 -/* 015EC 8096EA9C 8FA5001C */ lw $a1, 0x001C($sp) -/* 015F0 8096EAA0 8FA40018 */ lw $a0, 0x0018($sp) -/* 015F4 8096EAA4 0C25B553 */ jal func_8096D54C -/* 015F8 8096EAA8 8FA5001C */ lw $a1, 0x001C($sp) -/* 015FC 8096EAAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01600 8096EAB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01604 8096EAB4 03E00008 */ jr $ra -/* 01608 8096EAB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s deleted file mode 100644 index c43e2fcb4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8096EABC -/* 0160C 8096EABC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01610 8096EAC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01614 8096EAC4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01618 8096EAC8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0161C 8096EACC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01620 8096EAD0 0C25B631 */ jal func_8096D8C4 -/* 01624 8096EAD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01628 8096EAD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0162C 8096EADC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01630 8096EAE0 03E00008 */ jr $ra -/* 01634 8096EAE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s deleted file mode 100644 index d28a37cd44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096EAE8 -/* 01638 8096EAE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0163C 8096EAEC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01640 8096EAF0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01644 8096EAF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01648 8096EAF8 0C25B743 */ jal func_8096DD0C -/* 0164C 8096EAFC AFA5002C */ sw $a1, 0x002C($sp) -/* 01650 8096EB00 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01654 8096EB04 24C67958 */ addiu $a2, $a2, 0x7958 ## $a2 = 06007958 -/* 01658 8096EB08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0165C 8096EB0C 0C25B5CA */ jal func_8096D728 -/* 01660 8096EB10 8FA5002C */ lw $a1, 0x002C($sp) -/* 01664 8096EB14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01668 8096EB18 0C25B76F */ jal func_8096DDBC -/* 0166C 8096EB1C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01670 8096EB20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01674 8096EB24 24A5164C */ addiu $a1, $a1, 0x164C ## $a1 = 0600164C -/* 01678 8096EB28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0167C 8096EB2C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01680 8096EB30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01684 8096EB34 0C25B5E7 */ jal func_8096D79C -/* 01688 8096EB38 AFA00010 */ sw $zero, 0x0010($sp) -/* 0168C 8096EB3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01690 8096EB40 0C25B575 */ jal func_8096D5D4 -/* 01694 8096EB44 8FA5002C */ lw $a1, 0x002C($sp) -/* 01698 8096EB48 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 0169C 8096EB4C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 016A0 8096EB50 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 016A4 8096EB54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 016A8 8096EB58 0C00AC78 */ jal ActorShape_Init - -/* 016AC 8096EB5C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 016B0 8096EB60 2402000B */ addiu $v0, $zero, 0x000B ## $v0 = 0000000B -/* 016B4 8096EB64 AE020194 */ sw $v0, 0x0194($s0) ## 00000194 -/* 016B8 8096EB68 AE020198 */ sw $v0, 0x0198($s0) ## 00000198 -/* 016BC 8096EB6C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016C0 8096EB70 8FB00020 */ lw $s0, 0x0020($sp) -/* 016C4 8096EB74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016C8 8096EB78 03E00008 */ jr $ra -/* 016CC 8096EB7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s deleted file mode 100644 index ef87a5af2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096EB80 -/* 016D0 8096EB80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016D4 8096EB84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 016D8 8096EB88 AFA40018 */ sw $a0, 0x0018($sp) -/* 016DC 8096EB8C 0C25B54B */ jal func_8096D52C -/* 016E0 8096EB90 AFA5001C */ sw $a1, 0x001C($sp) -/* 016E4 8096EB94 8FA40018 */ lw $a0, 0x0018($sp) -/* 016E8 8096EB98 0C25B565 */ jal func_8096D594 -/* 016EC 8096EB9C 8FA5001C */ lw $a1, 0x001C($sp) -/* 016F0 8096EBA0 8FA40018 */ lw $a0, 0x0018($sp) -/* 016F4 8096EBA4 0C25B553 */ jal func_8096D54C -/* 016F8 8096EBA8 8FA5001C */ lw $a1, 0x001C($sp) -/* 016FC 8096EBAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01700 8096EBB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01704 8096EBB4 03E00008 */ jr $ra -/* 01708 8096EBB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s deleted file mode 100644 index fe100ea368..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_8096EBBC -/* 0170C 8096EBBC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01710 8096EBC0 AFA40000 */ sw $a0, 0x0000($sp) -/* 01714 8096EBC4 AFA60008 */ sw $a2, 0x0008($sp) -/* 01718 8096EBC8 14A1003A */ bne $a1, $at, .L8096ECB4 -/* 0171C 8096EBCC AFA7000C */ sw $a3, 0x000C($sp) -/* 01720 8096EBD0 8FA30018 */ lw $v1, 0x0018($sp) -/* 01724 8096EBD4 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 01728 8096EBD8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0172C 8096EBDC 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 01730 8096EBE0 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 01734 8096EBE4 3C09AA0A */ lui $t1, 0xAA0A ## $t1 = AA0A0000 -/* 01738 8096EBE8 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 0173C 8096EBEC AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 01740 8096EBF0 AC800004 */ sw $zero, 0x0004($a0) ## 00000004 -/* 01744 8096EBF4 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 01748 8096EBF8 8FB80014 */ lw $t8, 0x0014($sp) -/* 0174C 8096EBFC 8702001C */ lh $v0, 0x001C($t8) ## 0000001C -/* 01750 8096EC00 1041000B */ beq $v0, $at, .L8096EC30 -/* 01754 8096EC04 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01758 8096EC08 10410011 */ beq $v0, $at, .L8096EC50 -/* 0175C 8096EC0C 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 01760 8096EC10 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01764 8096EC14 10410017 */ beq $v0, $at, .L8096EC74 -/* 01768 8096EC18 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 0176C 8096EC1C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01770 8096EC20 1041001D */ beq $v0, $at, .L8096EC98 -/* 01774 8096EC24 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01778 8096EC28 03E00008 */ jr $ra -/* 0177C 8096EC2C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8096EC30: -/* 01780 8096EC30 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 01784 8096EC34 352946FF */ ori $t1, $t1, 0x46FF ## $t1 = AA0A46FF -/* 01788 8096EC38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0178C 8096EC3C 24990008 */ addiu $t9, $a0, 0x0008 ## $t9 = 00000008 -/* 01790 8096EC40 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 01794 8096EC44 AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -/* 01798 8096EC48 03E00008 */ jr $ra -/* 0179C 8096EC4C AC880000 */ sw $t0, 0x0000($a0) ## 00000000 -.L8096EC50: -/* 017A0 8096EC50 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 017A4 8096EC54 3C0CAAC8 */ lui $t4, 0xAAC8 ## $t4 = AAC80000 -/* 017A8 8096EC58 358CFFFF */ ori $t4, $t4, 0xFFFF ## $t4 = AAC8FFFF -/* 017AC 8096EC5C 248A0008 */ addiu $t2, $a0, 0x0008 ## $t2 = 00000008 -/* 017B0 8096EC60 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 017B4 8096EC64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 017B8 8096EC68 AC8C0004 */ sw $t4, 0x0004($a0) ## 00000004 -/* 017BC 8096EC6C 03E00008 */ jr $ra -/* 017C0 8096EC70 AC8B0000 */ sw $t3, 0x0000($a0) ## 00000000 -.L8096EC74: -/* 017C4 8096EC74 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 017C8 8096EC78 3C0F00E6 */ lui $t7, 0x00E6 ## $t7 = 00E60000 -/* 017CC 8096EC7C 35EF46FF */ ori $t7, $t7, 0x46FF ## $t7 = 00E646FF -/* 017D0 8096EC80 248D0008 */ addiu $t5, $a0, 0x0008 ## $t5 = 00000008 -/* 017D4 8096EC84 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 017D8 8096EC88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 017DC 8096EC8C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 017E0 8096EC90 03E00008 */ jr $ra -/* 017E4 8096EC94 AC8E0000 */ sw $t6, 0x0000($a0) ## 00000000 -.L8096EC98: -/* 017E8 8096EC98 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 017EC 8096EC9C 3C08C800 */ lui $t0, 0xC800 ## $t0 = C8000000 -/* 017F0 8096ECA0 350896FF */ ori $t0, $t0, 0x96FF ## $t0 = C80096FF -/* 017F4 8096ECA4 24980008 */ addiu $t8, $a0, 0x0008 ## $t8 = 00000008 -/* 017F8 8096ECA8 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 017FC 8096ECAC AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 01800 8096ECB0 AC990000 */ sw $t9, 0x0000($a0) ## 00000000 -.L8096ECB4: -/* 01804 8096ECB4 03E00008 */ jr $ra -/* 01808 8096ECB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s deleted file mode 100644 index cd98bf7573..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s +++ /dev/null @@ -1,47 +0,0 @@ -.rdata -glabel D_809706CC - .asciz "\x1b[31mかつらが無い!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_8096ECBC -/* 0180C 8096ECBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01810 8096ECC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01814 8096ECC4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01818 8096ECC8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0181C 8096ECCC 10410009 */ beq $v0, $at, .L8096ECF4 -/* 01820 8096ECD0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01824 8096ECD4 1041000A */ beq $v0, $at, .L8096ED00 -/* 01828 8096ECD8 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 0182C 8096ECDC 1041000B */ beq $v0, $at, .L8096ED0C -/* 01830 8096ECE0 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01834 8096ECE4 1041000C */ beq $v0, $at, .L8096ED18 -/* 01838 8096ECE8 3C048097 */ lui $a0, %hi(D_809706CC) ## $a0 = 80970000 -/* 0183C 8096ECEC 1000000D */ beq $zero, $zero, .L8096ED24 -/* 01840 8096ECF0 00000000 */ nop -.L8096ECF4: -/* 01844 8096ECF4 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 01848 8096ECF8 1000000D */ beq $zero, $zero, .L8096ED30 -/* 0184C 8096ECFC 24425BD0 */ addiu $v0, $v0, 0x5BD0 ## $v0 = 06005BD0 -.L8096ED00: -/* 01850 8096ED00 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 01854 8096ED04 1000000A */ beq $zero, $zero, .L8096ED30 -/* 01858 8096ED08 24425AC0 */ addiu $v0, $v0, 0x5AC0 ## $v0 = 06005AC0 -.L8096ED0C: -/* 0185C 8096ED0C 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 01860 8096ED10 10000007 */ beq $zero, $zero, .L8096ED30 -/* 01864 8096ED14 24425990 */ addiu $v0, $v0, 0x5990 ## $v0 = 06005990 -.L8096ED18: -/* 01868 8096ED18 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 0186C 8096ED1C 10000004 */ beq $zero, $zero, .L8096ED30 -/* 01870 8096ED20 24425880 */ addiu $v0, $v0, 0x5880 ## $v0 = 06005880 -.L8096ED24: -/* 01874 8096ED24 0C00084C */ jal osSyncPrintf - -/* 01878 8096ED28 248406CC */ addiu $a0, $a0, %lo(D_809706CC) ## $a0 = 809706CC -/* 0187C 8096ED2C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8096ED30: -/* 01880 8096ED30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01884 8096ED34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01888 8096ED38 03E00008 */ jr $ra -/* 0188C 8096ED3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s deleted file mode 100644 index ebc72202e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8096ED40 -/* 01890 8096ED40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01894 8096ED44 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01898 8096ED48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0189C 8096ED4C AFA40018 */ sw $a0, 0x0018($sp) -/* 018A0 8096ED50 AFA60020 */ sw $a2, 0x0020($sp) -/* 018A4 8096ED54 14A10016 */ bne $a1, $at, .L8096EDB0 -/* 018A8 8096ED58 AFA70024 */ sw $a3, 0x0024($sp) -/* 018AC 8096ED5C 0C25BB2F */ jal func_8096ECBC -/* 018B0 8096ED60 8FA40028 */ lw $a0, 0x0028($sp) -/* 018B4 8096ED64 8FA5002C */ lw $a1, 0x002C($sp) -/* 018B8 8096ED68 0002C100 */ sll $t8, $v0, 4 -/* 018BC 8096ED6C 0018CF02 */ srl $t9, $t8, 28 -/* 018C0 8096ED70 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 018C4 8096ED74 00194080 */ sll $t0, $t9, 2 -/* 018C8 8096ED78 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 018CC 8096ED7C 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 018D0 8096ED80 3C098016 */ lui $t1, %hi(gSegments) -/* 018D4 8096ED84 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 -/* 018D8 8096ED88 01284821 */ addu $t1, $t1, $t0 -/* 018DC 8096ED8C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 018E0 8096ED90 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 018E4 8096ED94 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 018E8 8096ED98 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 018EC 8096ED9C 00415024 */ and $t2, $v0, $at -/* 018F0 8096EDA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 018F4 8096EDA4 012A5821 */ addu $t3, $t1, $t2 -/* 018F8 8096EDA8 01616021 */ addu $t4, $t3, $at -/* 018FC 8096EDAC AC8C0004 */ sw $t4, 0x0004($a0) ## 00000004 -.L8096EDB0: -/* 01900 8096EDB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01904 8096EDB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01908 8096EDB8 03E00008 */ jr $ra -/* 0190C 8096EDBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s deleted file mode 100644 index 02e9c688de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096EDC0 -/* 01910 8096EDC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01914 8096EDC4 3C0E8097 */ lui $t6, %hi(func_8096EBBC) ## $t6 = 80970000 -/* 01918 8096EDC8 3C0F8097 */ lui $t7, %hi(func_8096ED40) ## $t7 = 80970000 -/* 0191C 8096EDCC AFBF001C */ sw $ra, 0x001C($sp) -/* 01920 8096EDD0 25EFED40 */ addiu $t7, $t7, %lo(func_8096ED40) ## $t7 = 8096ED40 -/* 01924 8096EDD4 25CEEBBC */ addiu $t6, $t6, %lo(func_8096EBBC) ## $t6 = 8096EBBC -/* 01928 8096EDD8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0192C 8096EDDC AFAF0014 */ sw $t7, 0x0014($sp) -/* 01930 8096EDE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01934 8096EDE4 0C25B631 */ jal func_8096D8C4 -/* 01938 8096EDE8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0193C 8096EDEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01940 8096EDF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01944 8096EDF4 03E00008 */ jr $ra -/* 01948 8096EDF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s deleted file mode 100644 index 560c1b94a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096EDFC -/* 0194C 8096EDFC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01950 8096EE00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01954 8096EE04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01958 8096EE08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0195C 8096EE0C 0C25B743 */ jal func_8096DD0C -/* 01960 8096EE10 AFA5002C */ sw $a1, 0x002C($sp) -/* 01964 8096EE14 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01968 8096EE18 24C60330 */ addiu $a2, $a2, 0x0330 ## $a2 = 06000330 -/* 0196C 8096EE1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01970 8096EE20 0C25B5CA */ jal func_8096D728 -/* 01974 8096EE24 8FA5002C */ lw $a1, 0x002C($sp) -/* 01978 8096EE28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0197C 8096EE2C 0C25B76F */ jal func_8096DDBC -/* 01980 8096EE30 8FA5002C */ lw $a1, 0x002C($sp) -/* 01984 8096EE34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01988 8096EE38 24A52254 */ addiu $a1, $a1, 0x2254 ## $a1 = 06002254 -/* 0198C 8096EE3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01990 8096EE40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01994 8096EE44 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01998 8096EE48 0C25B5E7 */ jal func_8096D79C -/* 0199C 8096EE4C AFA00010 */ sw $zero, 0x0010($sp) -/* 019A0 8096EE50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019A4 8096EE54 0C25B575 */ jal func_8096D5D4 -/* 019A8 8096EE58 8FA5002C */ lw $a1, 0x002C($sp) -/* 019AC 8096EE5C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 019B0 8096EE60 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 019B4 8096EE64 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 019B8 8096EE68 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 019BC 8096EE6C 0C00AC78 */ jal ActorShape_Init - -/* 019C0 8096EE70 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 019C4 8096EE74 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 019C8 8096EE78 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C -/* 019CC 8096EE7C AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 019D0 8096EE80 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 019D4 8096EE84 8FBF0024 */ lw $ra, 0x0024($sp) -/* 019D8 8096EE88 8FB00020 */ lw $s0, 0x0020($sp) -/* 019DC 8096EE8C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 019E0 8096EE90 03E00008 */ jr $ra -/* 019E4 8096EE94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s deleted file mode 100644 index 8808bee852..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096EE98 -/* 019E8 8096EE98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 019EC 8096EE9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 019F0 8096EEA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 019F4 8096EEA4 0C25B54B */ jal func_8096D52C -/* 019F8 8096EEA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 019FC 8096EEAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A00 8096EEB0 0C25B565 */ jal func_8096D594 -/* 01A04 8096EEB4 8FA5001C */ lw $a1, 0x001C($sp) -/* 01A08 8096EEB8 0C25B5A3 */ jal func_8096D68C -/* 01A0C 8096EEBC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A10 8096EEC0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A14 8096EEC4 0C25B553 */ jal func_8096D54C -/* 01A18 8096EEC8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01A1C 8096EECC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A20 8096EED0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A24 8096EED4 03E00008 */ jr $ra -/* 01A28 8096EED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s deleted file mode 100644 index 368a29baca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s +++ /dev/null @@ -1,41 +0,0 @@ -.rdata -glabel D_809706F4 - .asciz "\x1b[31mかつらが無い!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_8096EEDC -/* 01A2C 8096EEDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A30 8096EEE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A34 8096EEE4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01A38 8096EEE8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01A3C 8096EEEC 10410007 */ beq $v0, $at, .L8096EF0C -/* 01A40 8096EEF0 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01A44 8096EEF4 10410008 */ beq $v0, $at, .L8096EF18 -/* 01A48 8096EEF8 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 01A4C 8096EEFC 10410009 */ beq $v0, $at, .L8096EF24 -/* 01A50 8096EF00 3C048097 */ lui $a0, %hi(D_809706F4) ## $a0 = 80970000 -/* 01A54 8096EF04 1000000A */ beq $zero, $zero, .L8096EF30 -/* 01A58 8096EF08 00000000 */ nop -.L8096EF0C: -/* 01A5C 8096EF0C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 01A60 8096EF10 1000000A */ beq $zero, $zero, .L8096EF3C -/* 01A64 8096EF14 24429198 */ addiu $v0, $v0, 0x9198 ## $v0 = 06009198 -.L8096EF18: -/* 01A68 8096EF18 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 01A6C 8096EF1C 10000007 */ beq $zero, $zero, .L8096EF3C -/* 01A70 8096EF20 24429430 */ addiu $v0, $v0, 0x9430 ## $v0 = 06009430 -.L8096EF24: -/* 01A74 8096EF24 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 01A78 8096EF28 10000004 */ beq $zero, $zero, .L8096EF3C -/* 01A7C 8096EF2C 24429690 */ addiu $v0, $v0, 0x9690 ## $v0 = 06009690 -.L8096EF30: -/* 01A80 8096EF30 0C00084C */ jal osSyncPrintf - -/* 01A84 8096EF34 248406F4 */ addiu $a0, $a0, %lo(D_809706F4) ## $a0 = 809706F4 -/* 01A88 8096EF38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8096EF3C: -/* 01A8C 8096EF3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A90 8096EF40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A94 8096EF44 03E00008 */ jr $ra -/* 01A98 8096EF48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s deleted file mode 100644 index 00569847aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8096EF4C -/* 01A9C 8096EF4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01AA0 8096EF50 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01AA4 8096EF54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01AA8 8096EF58 AFA40018 */ sw $a0, 0x0018($sp) -/* 01AAC 8096EF5C AFA60020 */ sw $a2, 0x0020($sp) -/* 01AB0 8096EF60 14A10016 */ bne $a1, $at, .L8096EFBC -/* 01AB4 8096EF64 AFA70024 */ sw $a3, 0x0024($sp) -/* 01AB8 8096EF68 0C25BBB7 */ jal func_8096EEDC -/* 01ABC 8096EF6C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01AC0 8096EF70 8FA5002C */ lw $a1, 0x002C($sp) -/* 01AC4 8096EF74 0002C100 */ sll $t8, $v0, 4 -/* 01AC8 8096EF78 0018CF02 */ srl $t9, $t8, 28 -/* 01ACC 8096EF7C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01AD0 8096EF80 00194080 */ sll $t0, $t9, 2 -/* 01AD4 8096EF84 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 01AD8 8096EF88 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 01ADC 8096EF8C 3C098016 */ lui $t1, %hi(gSegments) -/* 01AE0 8096EF90 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 -/* 01AE4 8096EF94 01284821 */ addu $t1, $t1, $t0 -/* 01AE8 8096EF98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01AEC 8096EF9C AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 01AF0 8096EFA0 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 01AF4 8096EFA4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01AF8 8096EFA8 00415024 */ and $t2, $v0, $at -/* 01AFC 8096EFAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01B00 8096EFB0 012A5821 */ addu $t3, $t1, $t2 -/* 01B04 8096EFB4 01616021 */ addu $t4, $t3, $at -/* 01B08 8096EFB8 AC8C0004 */ sw $t4, 0x0004($a0) ## 00000004 -.L8096EFBC: -/* 01B0C 8096EFBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B10 8096EFC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B14 8096EFC4 03E00008 */ jr $ra -/* 01B18 8096EFC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s deleted file mode 100644 index 2b881c9364..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096EFCC -/* 01B1C 8096EFCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B20 8096EFD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B24 8096EFD4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01B28 8096EFD8 3C068097 */ lui $a2, %hi(D_80970430) ## $a2 = 80970000 -/* 01B2C 8096EFDC 3C0F8097 */ lui $t7, %hi(func_8096EF4C) ## $t7 = 80970000 -/* 01B30 8096EFE0 00027080 */ sll $t6, $v0, 2 -/* 01B34 8096EFE4 00CE3021 */ addu $a2, $a2, $t6 -/* 01B38 8096EFE8 25EFEF4C */ addiu $t7, $t7, %lo(func_8096EF4C) ## $t7 = 8096EF4C -/* 01B3C 8096EFEC 8CC60430 */ lw $a2, %lo(D_80970430)($a2) -/* 01B40 8096EFF0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01B44 8096EFF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01B48 8096EFF8 0C25B631 */ jal func_8096D8C4 -/* 01B4C 8096EFFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01B50 8096F000 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B54 8096F004 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B58 8096F008 03E00008 */ jr $ra -/* 01B5C 8096F00C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s deleted file mode 100644 index 87862a7692..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096F010 -/* 01B60 8096F010 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B64 8096F014 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B68 8096F018 AFB00020 */ sw $s0, 0x0020($sp) -/* 01B6C 8096F01C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B70 8096F020 0C25B743 */ jal func_8096DD0C -/* 01B74 8096F024 AFA5002C */ sw $a1, 0x002C($sp) -/* 01B78 8096F028 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01B7C 8096F02C 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 01B80 8096F030 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B84 8096F034 0C25B5CA */ jal func_8096D728 -/* 01B88 8096F038 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B8C 8096F03C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B90 8096F040 0C25B76F */ jal func_8096DDBC -/* 01B94 8096F044 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B98 8096F048 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01B9C 8096F04C 24A5C918 */ addiu $a1, $a1, 0xC918 ## $a1 = 0600C918 -/* 01BA0 8096F050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BA4 8096F054 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01BA8 8096F058 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BAC 8096F05C 0C25B5E7 */ jal func_8096D79C -/* 01BB0 8096F060 AFA00010 */ sw $zero, 0x0010($sp) -/* 01BB4 8096F064 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BB8 8096F068 0C25B575 */ jal func_8096D5D4 -/* 01BBC 8096F06C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01BC0 8096F070 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01BC4 8096F074 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01BC8 8096F078 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01BCC 8096F07C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01BD0 8096F080 0C00AC78 */ jal ActorShape_Init - -/* 01BD4 8096F084 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 01BD8 8096F088 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 01BDC 8096F08C 240F000D */ addiu $t7, $zero, 0x000D ## $t7 = 0000000D -/* 01BE0 8096F090 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 01BE4 8096F094 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 01BE8 8096F098 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01BEC 8096F09C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01BF0 8096F0A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BF4 8096F0A4 03E00008 */ jr $ra -/* 01BF8 8096F0A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s deleted file mode 100644 index 051e802261..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096F0AC -/* 01BFC 8096F0AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C00 8096F0B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C04 8096F0B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01C08 8096F0B8 0C25B54B */ jal func_8096D52C -/* 01C0C 8096F0BC AFA5001C */ sw $a1, 0x001C($sp) -/* 01C10 8096F0C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C14 8096F0C4 0C25B565 */ jal func_8096D594 -/* 01C18 8096F0C8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01C1C 8096F0CC 0C25B5A3 */ jal func_8096D68C -/* 01C20 8096F0D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C24 8096F0D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C28 8096F0D8 0C25B553 */ jal func_8096D54C -/* 01C2C 8096F0DC 8FA5001C */ lw $a1, 0x001C($sp) -/* 01C30 8096F0E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C34 8096F0E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C38 8096F0E8 03E00008 */ jr $ra -/* 01C3C 8096F0EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s deleted file mode 100644 index 62e12cd084..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096F0F0 -/* 01C40 8096F0F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01C44 8096F0F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01C48 8096F0F8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01C4C 8096F0FC 3C068097 */ lui $a2, %hi(D_8097043C) ## $a2 = 80970000 -/* 01C50 8096F100 AFA00014 */ sw $zero, 0x0014($sp) -/* 01C54 8096F104 00027080 */ sll $t6, $v0, 2 -/* 01C58 8096F108 00CE3021 */ addu $a2, $a2, $t6 -/* 01C5C 8096F10C 8CC6043C */ lw $a2, %lo(D_8097043C)($a2) -/* 01C60 8096F110 AFA00010 */ sw $zero, 0x0010($sp) -/* 01C64 8096F114 0C25B631 */ jal func_8096D8C4 -/* 01C68 8096F118 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01C6C 8096F11C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C70 8096F120 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C74 8096F124 03E00008 */ jr $ra -/* 01C78 8096F128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s deleted file mode 100644 index 44b49a8b76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8096F12C -/* 01C7C 8096F12C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C80 8096F130 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C84 8096F134 AFB00020 */ sw $s0, 0x0020($sp) -/* 01C88 8096F138 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C8C 8096F13C 0C25B743 */ jal func_8096DD0C -/* 01C90 8096F140 AFA5002C */ sw $a1, 0x002C($sp) -/* 01C94 8096F144 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01C98 8096F148 24C686D0 */ addiu $a2, $a2, 0x86D0 ## $a2 = 060086D0 -/* 01C9C 8096F14C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CA0 8096F150 0C25B5CA */ jal func_8096D728 -/* 01CA4 8096F154 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CA8 8096F158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CAC 8096F15C 0C25B76F */ jal func_8096DDBC -/* 01CB0 8096F160 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CB4 8096F164 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01CB8 8096F168 24A56C40 */ addiu $a1, $a1, 0x6C40 ## $a1 = 06006C40 -/* 01CBC 8096F16C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CC0 8096F170 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01CC4 8096F174 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01CC8 8096F178 0C25B5E7 */ jal func_8096D79C -/* 01CCC 8096F17C AFA00010 */ sw $zero, 0x0010($sp) -/* 01CD0 8096F180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CD4 8096F184 0C25B575 */ jal func_8096D5D4 -/* 01CD8 8096F188 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CDC 8096F18C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01CE0 8096F190 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01CE4 8096F194 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01CE8 8096F198 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01CEC 8096F19C 0C00AC78 */ jal ActorShape_Init - -/* 01CF0 8096F1A0 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 01CF4 8096F1A4 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01CF8 8096F1A8 240F000E */ addiu $t7, $zero, 0x000E ## $t7 = 0000000E -/* 01CFC 8096F1AC AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 01D00 8096F1B0 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 01D04 8096F1B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D08 8096F1B8 0C25B5C5 */ jal func_8096D714 -/* 01D0C 8096F1BC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01D10 8096F1C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D14 8096F1C4 8FB00020 */ lw $s0, 0x0020($sp) -/* 01D18 8096F1C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D1C 8096F1CC 03E00008 */ jr $ra -/* 01D20 8096F1D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s deleted file mode 100644 index ce2633c52f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8096F1D4 -/* 01D24 8096F1D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D28 8096F1D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D2C 8096F1DC 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01D30 8096F1E0 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 01D34 8096F1E4 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 01D38 8096F1E8 00000000 */ nop -/* 01D3C 8096F1EC 4604003E */ c.le.s $f0, $f4 -/* 01D40 8096F1F0 00000000 */ nop -/* 01D44 8096F1F4 45000005 */ bc1f .L8096F20C -/* 01D48 8096F1F8 00000000 */ nop -/* 01D4C 8096F1FC 0C25B5C5 */ jal func_8096D714 -/* 01D50 8096F200 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01D54 8096F204 10000004 */ beq $zero, $zero, .L8096F218 -/* 01D58 8096F208 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096F20C: -/* 01D5C 8096F20C 0C25B5A3 */ jal func_8096D68C -/* 01D60 8096F210 00000000 */ nop -/* 01D64 8096F214 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096F218: -/* 01D68 8096F218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D6C 8096F21C 03E00008 */ jr $ra -/* 01D70 8096F220 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s deleted file mode 100644 index c412ec4ae3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096F224 -/* 01D74 8096F224 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01D78 8096F228 AFBF001C */ sw $ra, 0x001C($sp) -/* 01D7C 8096F22C 0C25B76F */ jal func_8096DDBC -/* 01D80 8096F230 AFA40020 */ sw $a0, 0x0020($sp) -/* 01D84 8096F234 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01D88 8096F238 24A56930 */ addiu $a1, $a1, 0x6930 ## $a1 = 06006930 -/* 01D8C 8096F23C 8FA40020 */ lw $a0, 0x0020($sp) -/* 01D90 8096F240 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D94 8096F244 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01D98 8096F248 0C25B5E7 */ jal func_8096D79C -/* 01D9C 8096F24C AFA00010 */ sw $zero, 0x0010($sp) -/* 01DA0 8096F250 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01DA4 8096F254 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 01DA8 8096F258 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -/* 01DAC 8096F25C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DB0 8096F260 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01DB4 8096F264 03E00008 */ jr $ra -/* 01DB8 8096F268 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s deleted file mode 100644 index 4a949b6d7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096F26C -/* 01DBC 8096F26C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DC0 8096F270 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DC4 8096F274 10A0000A */ beq $a1, $zero, .L8096F2A0 -/* 01DC8 8096F278 AFA40020 */ sw $a0, 0x0020($sp) -/* 01DCC 8096F27C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01DD0 8096F280 24A56220 */ addiu $a1, $a1, 0x6220 ## $a1 = 06006220 -/* 01DD4 8096F284 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01DD8 8096F288 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01DDC 8096F28C 0C25B5E7 */ jal func_8096D79C -/* 01DE0 8096F290 AFA00010 */ sw $zero, 0x0010($sp) -/* 01DE4 8096F294 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01DE8 8096F298 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 01DEC 8096F29C ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -.L8096F2A0: -/* 01DF0 8096F2A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DF4 8096F2A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01DF8 8096F2A8 03E00008 */ jr $ra -/* 01DFC 8096F2AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s deleted file mode 100644 index e0f306631a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8096F2B0 -/* 01E00 8096F2B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E04 8096F2B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01E08 8096F2B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E0C 8096F2BC AFA50024 */ sw $a1, 0x0024($sp) -/* 01E10 8096F2C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01E14 8096F2C4 0C25B77C */ jal func_8096DDF0 -/* 01E18 8096F2C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01E1C 8096F2CC 1040000D */ beq $v0, $zero, .L8096F304 -/* 01E20 8096F2D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01E24 8096F2D4 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 01E28 8096F2D8 8C83019C */ lw $v1, 0x019C($a0) ## 0000019C -/* 01E2C 8096F2DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E30 8096F2E0 50C30009 */ beql $a2, $v1, .L8096F308 -/* 01E34 8096F2E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E38 8096F2E8 14C10005 */ bne $a2, $at, .L8096F300 -/* 01E3C 8096F2EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 01E40 8096F2F0 0C25BC89 */ jal func_8096F224 -/* 01E44 8096F2F4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01E48 8096F2F8 8FA60018 */ lw $a2, 0x0018($sp) -/* 01E4C 8096F2FC 8FA40020 */ lw $a0, 0x0020($sp) -.L8096F300: -/* 01E50 8096F300 AC86019C */ sw $a2, 0x019C($a0) ## 0000019C -.L8096F304: -/* 01E54 8096F304 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096F308: -/* 01E58 8096F308 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E5C 8096F30C 03E00008 */ jr $ra -/* 01E60 8096F310 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s deleted file mode 100644 index b5956dd700..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8096F314 -/* 01E64 8096F314 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E68 8096F318 AFBF001C */ sw $ra, 0x001C($sp) -/* 01E6C 8096F31C AFB00018 */ sw $s0, 0x0018($sp) -/* 01E70 8096F320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E74 8096F324 0C25B54B */ jal func_8096D52C -/* 01E78 8096F328 AFA50024 */ sw $a1, 0x0024($sp) -/* 01E7C 8096F32C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E80 8096F330 0C25B565 */ jal func_8096D594 -/* 01E84 8096F334 8FA50024 */ lw $a1, 0x0024($sp) -/* 01E88 8096F338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E8C 8096F33C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01E90 8096F340 0C25B785 */ jal func_8096DE14 -/* 01E94 8096F344 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01E98 8096F348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E9C 8096F34C 0C25B553 */ jal func_8096D54C -/* 01EA0 8096F350 8FA50024 */ lw $a1, 0x0024($sp) -/* 01EA4 8096F354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EA8 8096F358 8FA50024 */ lw $a1, 0x0024($sp) -/* 01EAC 8096F35C 0C25BCAC */ jal func_8096F2B0 -/* 01EB0 8096F360 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01EB4 8096F364 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EB8 8096F368 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EBC 8096F36C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EC0 8096F370 03E00008 */ jr $ra -/* 01EC4 8096F374 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s deleted file mode 100644 index 79d5b62193..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8096F378 -/* 01EC8 8096F378 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01ECC 8096F37C AFBF001C */ sw $ra, 0x001C($sp) -/* 01ED0 8096F380 AFB00018 */ sw $s0, 0x0018($sp) -/* 01ED4 8096F384 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01ED8 8096F388 0C25B54B */ jal func_8096D52C -/* 01EDC 8096F38C AFA5002C */ sw $a1, 0x002C($sp) -/* 01EE0 8096F390 AFA20024 */ sw $v0, 0x0024($sp) -/* 01EE4 8096F394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EE8 8096F398 0C25B565 */ jal func_8096D594 -/* 01EEC 8096F39C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01EF0 8096F3A0 0C25BC75 */ jal func_8096F1D4 -/* 01EF4 8096F3A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EF8 8096F3A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EFC 8096F3AC 0C25B553 */ jal func_8096D54C -/* 01F00 8096F3B0 8FA5002C */ lw $a1, 0x002C($sp) -/* 01F04 8096F3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F08 8096F3B8 0C25BC9B */ jal func_8096F26C -/* 01F0C 8096F3BC 8FA50024 */ lw $a1, 0x0024($sp) -/* 01F10 8096F3C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F14 8096F3C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01F18 8096F3C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F1C 8096F3CC 03E00008 */ jr $ra -/* 01F20 8096F3D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s deleted file mode 100644 index bc0a1a1bde..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096F3D4 -/* 01F24 8096F3D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F28 8096F3D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F2C 8096F3DC AFA40018 */ sw $a0, 0x0018($sp) -/* 01F30 8096F3E0 0C25B54B */ jal func_8096D52C -/* 01F34 8096F3E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01F38 8096F3E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F3C 8096F3EC 0C25B565 */ jal func_8096D594 -/* 01F40 8096F3F0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01F44 8096F3F4 0C25B5A3 */ jal func_8096D68C -/* 01F48 8096F3F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F4C 8096F3FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F50 8096F400 0C25B553 */ jal func_8096D54C -/* 01F54 8096F404 8FA5001C */ lw $a1, 0x001C($sp) -/* 01F58 8096F408 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F5C 8096F40C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F60 8096F410 03E00008 */ jr $ra -/* 01F64 8096F414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s deleted file mode 100644 index d8ebf8bb25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096F418 -/* 01F68 8096F418 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F6C 8096F41C AFBF001C */ sw $ra, 0x001C($sp) -/* 01F70 8096F420 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01F74 8096F424 3C068097 */ lui $a2, %hi(D_80970448) ## $a2 = 80970000 -/* 01F78 8096F428 AFA00014 */ sw $zero, 0x0014($sp) -/* 01F7C 8096F42C 00027080 */ sll $t6, $v0, 2 -/* 01F80 8096F430 00CE3021 */ addu $a2, $a2, $t6 -/* 01F84 8096F434 8CC60448 */ lw $a2, %lo(D_80970448)($a2) -/* 01F88 8096F438 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F8C 8096F43C 0C25B631 */ jal func_8096D8C4 -/* 01F90 8096F440 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01F94 8096F444 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F98 8096F448 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F9C 8096F44C 03E00008 */ jr $ra -/* 01FA0 8096F450 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s deleted file mode 100644 index 78bc9e9b18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8096F454 -/* 01FA4 8096F454 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01FA8 8096F458 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01FAC 8096F45C AFB00020 */ sw $s0, 0x0020($sp) -/* 01FB0 8096F460 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01FB4 8096F464 0C25B743 */ jal func_8096DD0C -/* 01FB8 8096F468 AFA5002C */ sw $a1, 0x002C($sp) -/* 01FBC 8096F46C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 01FC0 8096F470 24C67FB8 */ addiu $a2, $a2, 0x7FB8 ## $a2 = 06007FB8 -/* 01FC4 8096F474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FC8 8096F478 0C25B5CA */ jal func_8096D728 -/* 01FCC 8096F47C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01FD0 8096F480 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FD4 8096F484 0C25B76F */ jal func_8096DDBC -/* 01FD8 8096F488 8FA5002C */ lw $a1, 0x002C($sp) -/* 01FDC 8096F48C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01FE0 8096F490 24A595DC */ addiu $a1, $a1, 0x95DC ## $a1 = 060095DC -/* 01FE4 8096F494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FE8 8096F498 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01FEC 8096F49C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01FF0 8096F4A0 0C25B5E7 */ jal func_8096D79C -/* 01FF4 8096F4A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01FF8 8096F4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FFC 8096F4AC 0C25B575 */ jal func_8096D5D4 -/* 02000 8096F4B0 8FA5002C */ lw $a1, 0x002C($sp) -/* 02004 8096F4B4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 02008 8096F4B8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0200C 8096F4BC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 02010 8096F4C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02014 8096F4C4 0C00AC78 */ jal ActorShape_Init - -/* 02018 8096F4C8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0201C 8096F4CC 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 02020 8096F4D0 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F -/* 02024 8096F4D4 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 02028 8096F4D8 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 0202C 8096F4DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02030 8096F4E0 0C25B5C5 */ jal func_8096D714 -/* 02034 8096F4E4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 02038 8096F4E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0203C 8096F4EC 8FB00020 */ lw $s0, 0x0020($sp) -/* 02040 8096F4F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02044 8096F4F4 03E00008 */ jr $ra -/* 02048 8096F4F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s deleted file mode 100644 index d1efcfc0e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096F4FC -/* 0204C 8096F4FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02050 8096F500 AFBF001C */ sw $ra, 0x001C($sp) -/* 02054 8096F504 0C25B76F */ jal func_8096DDBC -/* 02058 8096F508 AFA40020 */ sw $a0, 0x0020($sp) -/* 0205C 8096F50C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02060 8096F510 24A58D1C */ addiu $a1, $a1, 0x8D1C ## $a1 = 06008D1C -/* 02064 8096F514 8FA40020 */ lw $a0, 0x0020($sp) -/* 02068 8096F518 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0206C 8096F51C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02070 8096F520 0C25B5E7 */ jal func_8096D79C -/* 02074 8096F524 AFA00010 */ sw $zero, 0x0010($sp) -/* 02078 8096F528 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0207C 8096F52C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 02080 8096F530 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -/* 02084 8096F534 8FBF001C */ lw $ra, 0x001C($sp) -/* 02088 8096F538 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0208C 8096F53C 03E00008 */ jr $ra -/* 02090 8096F540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s deleted file mode 100644 index 23d4e5b74f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8096F544 -/* 02094 8096F544 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02098 8096F548 10A00007 */ beq $a1, $zero, .L8096F568 -/* 0209C 8096F54C AFBF001C */ sw $ra, 0x001C($sp) -/* 020A0 8096F550 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 020A4 8096F554 24A59234 */ addiu $a1, $a1, 0x9234 ## $a1 = 06009234 -/* 020A8 8096F558 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 020AC 8096F55C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 020B0 8096F560 0C25B5E7 */ jal func_8096D79C -/* 020B4 8096F564 AFA00010 */ sw $zero, 0x0010($sp) -.L8096F568: -/* 020B8 8096F568 8FBF001C */ lw $ra, 0x001C($sp) -/* 020BC 8096F56C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 020C0 8096F570 03E00008 */ jr $ra -/* 020C4 8096F574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s deleted file mode 100644 index 396c04baa1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8096F578 -/* 020C8 8096F578 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 020CC 8096F57C AFA40020 */ sw $a0, 0x0020($sp) -/* 020D0 8096F580 AFBF0014 */ sw $ra, 0x0014($sp) -/* 020D4 8096F584 AFA50024 */ sw $a1, 0x0024($sp) -/* 020D8 8096F588 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 020DC 8096F58C 0C25B77C */ jal func_8096DDF0 -/* 020E0 8096F590 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 020E4 8096F594 1040000D */ beq $v0, $zero, .L8096F5CC -/* 020E8 8096F598 8FA40020 */ lw $a0, 0x0020($sp) -/* 020EC 8096F59C 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 020F0 8096F5A0 8C83019C */ lw $v1, 0x019C($a0) ## 0000019C -/* 020F4 8096F5A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 020F8 8096F5A8 50C30009 */ beql $a2, $v1, .L8096F5D0 -/* 020FC 8096F5AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02100 8096F5B0 14C10005 */ bne $a2, $at, .L8096F5C8 -/* 02104 8096F5B4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02108 8096F5B8 0C25BD3F */ jal func_8096F4FC -/* 0210C 8096F5BC AFA60018 */ sw $a2, 0x0018($sp) -/* 02110 8096F5C0 8FA60018 */ lw $a2, 0x0018($sp) -/* 02114 8096F5C4 8FA40020 */ lw $a0, 0x0020($sp) -.L8096F5C8: -/* 02118 8096F5C8 AC86019C */ sw $a2, 0x019C($a0) ## 0000019C -.L8096F5CC: -/* 0211C 8096F5CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096F5D0: -/* 02120 8096F5D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02124 8096F5D4 03E00008 */ jr $ra -/* 02128 8096F5D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s deleted file mode 100644 index 4e51520db6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8096F5DC -/* 0212C 8096F5DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02130 8096F5E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02134 8096F5E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02138 8096F5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0213C 8096F5EC 0C25B54B */ jal func_8096D52C -/* 02140 8096F5F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 02144 8096F5F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02148 8096F5F8 0C25B565 */ jal func_8096D594 -/* 0214C 8096F5FC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02150 8096F600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02154 8096F604 8FA50024 */ lw $a1, 0x0024($sp) -/* 02158 8096F608 0C25B785 */ jal func_8096DE14 -/* 0215C 8096F60C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 02160 8096F610 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02164 8096F614 0C25B553 */ jal func_8096D54C -/* 02168 8096F618 8FA50024 */ lw $a1, 0x0024($sp) -/* 0216C 8096F61C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02170 8096F620 8FA50024 */ lw $a1, 0x0024($sp) -/* 02174 8096F624 0C25BD5E */ jal func_8096F578 -/* 02178 8096F628 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 0217C 8096F62C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02180 8096F630 8FB00018 */ lw $s0, 0x0018($sp) -/* 02184 8096F634 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02188 8096F638 03E00008 */ jr $ra -/* 0218C 8096F63C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s deleted file mode 100644 index 4b028c477a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8096F640 -/* 02190 8096F640 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02194 8096F644 AFBF001C */ sw $ra, 0x001C($sp) -/* 02198 8096F648 AFB00018 */ sw $s0, 0x0018($sp) -/* 0219C 8096F64C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021A0 8096F650 0C25B54B */ jal func_8096D52C -/* 021A4 8096F654 AFA5002C */ sw $a1, 0x002C($sp) -/* 021A8 8096F658 AFA20024 */ sw $v0, 0x0024($sp) -/* 021AC 8096F65C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021B0 8096F660 0C25B565 */ jal func_8096D594 -/* 021B4 8096F664 8FA5002C */ lw $a1, 0x002C($sp) -/* 021B8 8096F668 0C25B5A3 */ jal func_8096D68C -/* 021BC 8096F66C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021C0 8096F670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021C4 8096F674 0C25B553 */ jal func_8096D54C -/* 021C8 8096F678 8FA5002C */ lw $a1, 0x002C($sp) -/* 021CC 8096F67C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D0 8096F680 0C25BD51 */ jal func_8096F544 -/* 021D4 8096F684 8FA50024 */ lw $a1, 0x0024($sp) -/* 021D8 8096F688 8FBF001C */ lw $ra, 0x001C($sp) -/* 021DC 8096F68C 8FB00018 */ lw $s0, 0x0018($sp) -/* 021E0 8096F690 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 021E4 8096F694 03E00008 */ jr $ra -/* 021E8 8096F698 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s deleted file mode 100644 index f8c0fe76b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096F69C -/* 021EC 8096F69C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021F0 8096F6A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 021F4 8096F6A4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 021F8 8096F6A8 3C068097 */ lui $a2, %hi(D_80970458) ## $a2 = 80970000 -/* 021FC 8096F6AC AFA00014 */ sw $zero, 0x0014($sp) -/* 02200 8096F6B0 00027080 */ sll $t6, $v0, 2 -/* 02204 8096F6B4 00CE3021 */ addu $a2, $a2, $t6 -/* 02208 8096F6B8 8CC60458 */ lw $a2, %lo(D_80970458)($a2) -/* 0220C 8096F6BC AFA00010 */ sw $zero, 0x0010($sp) -/* 02210 8096F6C0 0C25B631 */ jal func_8096D8C4 -/* 02214 8096F6C4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02218 8096F6C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0221C 8096F6CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02220 8096F6D0 03E00008 */ jr $ra -/* 02224 8096F6D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s deleted file mode 100644 index 2479454f1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_8096F6D8 -/* 02228 8096F6D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0222C 8096F6DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02230 8096F6E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 02234 8096F6E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02238 8096F6E8 0C25B743 */ jal func_8096DD0C -/* 0223C 8096F6EC AFA5002C */ sw $a1, 0x002C($sp) -/* 02240 8096F6F0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02244 8096F6F4 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 02248 8096F6F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0224C 8096F6FC 0C25B5CA */ jal func_8096D728 -/* 02250 8096F700 8FA5002C */ lw $a1, 0x002C($sp) -/* 02254 8096F704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02258 8096F708 0C25B76F */ jal func_8096DDBC -/* 0225C 8096F70C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02260 8096F710 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 02264 8096F714 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 02268 8096F718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0226C 8096F71C 14410004 */ bne $v0, $at, .L8096F730 -/* 02270 8096F720 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02274 8096F724 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02278 8096F728 10000008 */ beq $zero, $zero, .L8096F74C -/* 0227C 8096F72C 24A59BB4 */ addiu $a1, $a1, 0x9BB4 ## $a1 = 06009BB4 -.L8096F730: -/* 02280 8096F730 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 02284 8096F734 14410004 */ bne $v0, $at, .L8096F748 -/* 02288 8096F738 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0228C 8096F73C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02290 8096F740 10000002 */ beq $zero, $zero, .L8096F74C -/* 02294 8096F744 24A5A07C */ addiu $a1, $a1, 0xA07C ## $a1 = 0600A07C -.L8096F748: -/* 02298 8096F748 24A5A474 */ addiu $a1, $a1, 0xA474 ## $a1 = 060044F0 -.L8096F74C: -/* 0229C 8096F74C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 022A0 8096F750 0C25B5E7 */ jal func_8096D79C -/* 022A4 8096F754 AFA00010 */ sw $zero, 0x0010($sp) -/* 022A8 8096F758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022AC 8096F75C 0C25B593 */ jal func_8096D64C -/* 022B0 8096F760 8FA5002C */ lw $a1, 0x002C($sp) -/* 022B4 8096F764 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 022B8 8096F768 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 022BC 8096F76C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 022C0 8096F770 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 022C4 8096F774 0C00AC78 */ jal ActorShape_Init - -/* 022C8 8096F778 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 022CC 8096F77C 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 022D0 8096F780 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 022D4 8096F784 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 022D8 8096F788 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 022DC 8096F78C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 022E0 8096F790 8FB00020 */ lw $s0, 0x0020($sp) -/* 022E4 8096F794 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 022E8 8096F798 03E00008 */ jr $ra -/* 022EC 8096F79C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s deleted file mode 100644 index f1762d3a90..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096F7A0 -/* 022F0 8096F7A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 022F4 8096F7A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 022F8 8096F7A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 022FC 8096F7AC 0C25B54B */ jal func_8096D52C -/* 02300 8096F7B0 AFA5001C */ sw $a1, 0x001C($sp) -/* 02304 8096F7B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02308 8096F7B8 0C25B565 */ jal func_8096D594 -/* 0230C 8096F7BC 8FA5001C */ lw $a1, 0x001C($sp) -/* 02310 8096F7C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02314 8096F7C4 0C25B553 */ jal func_8096D54C -/* 02318 8096F7C8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0231C 8096F7CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02320 8096F7D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02324 8096F7D4 03E00008 */ jr $ra -/* 02328 8096F7D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s deleted file mode 100644 index 14034bcfb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8096F7DC -/* 0232C 8096F7DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02330 8096F7E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02334 8096F7E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02338 8096F7E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0233C 8096F7EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02340 8096F7F0 0C25B631 */ jal func_8096D8C4 -/* 02344 8096F7F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02348 8096F7F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0234C 8096F7FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02350 8096F800 03E00008 */ jr $ra -/* 02354 8096F804 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s deleted file mode 100644 index 8d512a210d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096F808 -/* 02358 8096F808 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0235C 8096F80C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02360 8096F810 AFB00020 */ sw $s0, 0x0020($sp) -/* 02364 8096F814 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02368 8096F818 0C25B743 */ jal func_8096DD0C -/* 0236C 8096F81C AFA5002C */ sw $a1, 0x002C($sp) -/* 02370 8096F820 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02374 8096F824 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 02378 8096F828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0237C 8096F82C 0C25B5CA */ jal func_8096D728 -/* 02380 8096F830 8FA5002C */ lw $a1, 0x002C($sp) -/* 02384 8096F834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02388 8096F838 0C25B76F */ jal func_8096DDBC -/* 0238C 8096F83C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02390 8096F840 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02394 8096F844 24A50CD8 */ addiu $a1, $a1, 0x0CD8 ## $a1 = 06000CD8 -/* 02398 8096F848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0239C 8096F84C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 023A0 8096F850 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 023A4 8096F854 0C25B5E7 */ jal func_8096D79C -/* 023A8 8096F858 AFA00010 */ sw $zero, 0x0010($sp) -/* 023AC 8096F85C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023B0 8096F860 0C25B575 */ jal func_8096D5D4 -/* 023B4 8096F864 8FA5002C */ lw $a1, 0x002C($sp) -/* 023B8 8096F868 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 023BC 8096F86C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 023C0 8096F870 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 023C4 8096F874 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 023C8 8096F878 0C00AC78 */ jal ActorShape_Init - -/* 023CC 8096F87C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 023D0 8096F880 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 023D4 8096F884 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 -/* 023D8 8096F888 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 023DC 8096F88C AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 023E0 8096F890 8FBF0024 */ lw $ra, 0x0024($sp) -/* 023E4 8096F894 8FB00020 */ lw $s0, 0x0020($sp) -/* 023E8 8096F898 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 023EC 8096F89C 03E00008 */ jr $ra -/* 023F0 8096F8A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s deleted file mode 100644 index 0517fa06ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096F8A4 -/* 023F4 8096F8A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 023F8 8096F8A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 023FC 8096F8AC AFA40018 */ sw $a0, 0x0018($sp) -/* 02400 8096F8B0 0C25B54B */ jal func_8096D52C -/* 02404 8096F8B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02408 8096F8B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0240C 8096F8BC 0C25B565 */ jal func_8096D594 -/* 02410 8096F8C0 8FA5001C */ lw $a1, 0x001C($sp) -/* 02414 8096F8C4 0C25B5A3 */ jal func_8096D68C -/* 02418 8096F8C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0241C 8096F8CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02420 8096F8D0 0C25B553 */ jal func_8096D54C -/* 02424 8096F8D4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02428 8096F8D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0242C 8096F8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02430 8096F8E0 03E00008 */ jr $ra -/* 02434 8096F8E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s deleted file mode 100644 index a132daf121..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096F8E8 -/* 02438 8096F8E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0243C 8096F8EC AFBF001C */ sw $ra, 0x001C($sp) -/* 02440 8096F8F0 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 02444 8096F8F4 3C068097 */ lui $a2, %hi(D_80970468) ## $a2 = 80970000 -/* 02448 8096F8F8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0244C 8096F8FC 00027080 */ sll $t6, $v0, 2 -/* 02450 8096F900 00CE3021 */ addu $a2, $a2, $t6 -/* 02454 8096F904 8CC60468 */ lw $a2, %lo(D_80970468)($a2) -/* 02458 8096F908 AFA00010 */ sw $zero, 0x0010($sp) -/* 0245C 8096F90C 0C25B631 */ jal func_8096D8C4 -/* 02460 8096F910 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02464 8096F914 8FBF001C */ lw $ra, 0x001C($sp) -/* 02468 8096F918 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0246C 8096F91C 03E00008 */ jr $ra -/* 02470 8096F920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s deleted file mode 100644 index fc1de01a9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096F924 -/* 02474 8096F924 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02478 8096F928 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0247C 8096F92C AFB00020 */ sw $s0, 0x0020($sp) -/* 02480 8096F930 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02484 8096F934 0C25B743 */ jal func_8096DD0C -/* 02488 8096F938 AFA5002C */ sw $a1, 0x002C($sp) -/* 0248C 8096F93C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02490 8096F940 24C64258 */ addiu $a2, $a2, 0x4258 ## $a2 = 06004258 -/* 02494 8096F944 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02498 8096F948 0C25B5CA */ jal func_8096D728 -/* 0249C 8096F94C 8FA5002C */ lw $a1, 0x002C($sp) -/* 024A0 8096F950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024A4 8096F954 0C25B76F */ jal func_8096DDBC -/* 024A8 8096F958 8FA5002C */ lw $a1, 0x002C($sp) -/* 024AC 8096F95C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 024B0 8096F960 24A5AFE0 */ addiu $a1, $a1, 0xAFE0 ## $a1 = 0600AFE0 -/* 024B4 8096F964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024B8 8096F968 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 024BC 8096F96C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 024C0 8096F970 0C25B5E7 */ jal func_8096D79C -/* 024C4 8096F974 AFA00010 */ sw $zero, 0x0010($sp) -/* 024C8 8096F978 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024CC 8096F97C 0C25B575 */ jal func_8096D5D4 -/* 024D0 8096F980 8FA5002C */ lw $a1, 0x002C($sp) -/* 024D4 8096F984 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 024D8 8096F988 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 024DC 8096F98C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 024E0 8096F990 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 024E4 8096F994 0C00AC78 */ jal ActorShape_Init - -/* 024E8 8096F998 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 024EC 8096F99C 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 024F0 8096F9A0 240F0012 */ addiu $t7, $zero, 0x0012 ## $t7 = 00000012 -/* 024F4 8096F9A4 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 024F8 8096F9A8 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 024FC 8096F9AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02500 8096F9B0 8FB00020 */ lw $s0, 0x0020($sp) -/* 02504 8096F9B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02508 8096F9B8 03E00008 */ jr $ra -/* 0250C 8096F9BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s deleted file mode 100644 index 2e9647c304..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096F9C0 -/* 02510 8096F9C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02514 8096F9C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02518 8096F9C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0251C 8096F9CC 0C25B54B */ jal func_8096D52C -/* 02520 8096F9D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 02524 8096F9D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02528 8096F9D8 0C25B565 */ jal func_8096D594 -/* 0252C 8096F9DC 8FA5001C */ lw $a1, 0x001C($sp) -/* 02530 8096F9E0 0C25B5A3 */ jal func_8096D68C -/* 02534 8096F9E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02538 8096F9E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0253C 8096F9EC 0C25B553 */ jal func_8096D54C -/* 02540 8096F9F0 8FA5001C */ lw $a1, 0x001C($sp) -/* 02544 8096F9F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02548 8096F9F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0254C 8096F9FC 03E00008 */ jr $ra -/* 02550 8096FA00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s deleted file mode 100644 index e6d093481f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096FA04 -/* 02554 8096FA04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02558 8096FA08 AFBF001C */ sw $ra, 0x001C($sp) -/* 0255C 8096FA0C 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 02560 8096FA10 3C068097 */ lui $a2, %hi(D_80970474) ## $a2 = 80970000 -/* 02564 8096FA14 AFA00014 */ sw $zero, 0x0014($sp) -/* 02568 8096FA18 00027080 */ sll $t6, $v0, 2 -/* 0256C 8096FA1C 00CE3021 */ addu $a2, $a2, $t6 -/* 02570 8096FA20 8CC60474 */ lw $a2, %lo(D_80970474)($a2) -/* 02574 8096FA24 AFA00010 */ sw $zero, 0x0010($sp) -/* 02578 8096FA28 0C25B631 */ jal func_8096D8C4 -/* 0257C 8096FA2C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02580 8096FA30 8FBF001C */ lw $ra, 0x001C($sp) -/* 02584 8096FA34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02588 8096FA38 03E00008 */ jr $ra -/* 0258C 8096FA3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s deleted file mode 100644 index 32f21e7fe3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096FA40 -/* 02590 8096FA40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02594 8096FA44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02598 8096FA48 AFB00020 */ sw $s0, 0x0020($sp) -/* 0259C 8096FA4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025A0 8096FA50 0C25B743 */ jal func_8096DD0C -/* 025A4 8096FA54 AFA5002C */ sw $a1, 0x002C($sp) -/* 025A8 8096FA58 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 025AC 8096FA5C 24C64658 */ addiu $a2, $a2, 0x4658 ## $a2 = 06004658 -/* 025B0 8096FA60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025B4 8096FA64 0C25B5CA */ jal func_8096D728 -/* 025B8 8096FA68 8FA5002C */ lw $a1, 0x002C($sp) -/* 025BC 8096FA6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025C0 8096FA70 0C25B76F */ jal func_8096DDBC -/* 025C4 8096FA74 8FA5002C */ lw $a1, 0x002C($sp) -/* 025C8 8096FA78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 025CC 8096FA7C 24A5AFE0 */ addiu $a1, $a1, 0xAFE0 ## $a1 = 0600AFE0 -/* 025D0 8096FA80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025D4 8096FA84 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 025D8 8096FA88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 025DC 8096FA8C 0C25B5E7 */ jal func_8096D79C -/* 025E0 8096FA90 AFA00010 */ sw $zero, 0x0010($sp) -/* 025E4 8096FA94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025E8 8096FA98 0C25B575 */ jal func_8096D5D4 -/* 025EC 8096FA9C 8FA5002C */ lw $a1, 0x002C($sp) -/* 025F0 8096FAA0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 025F4 8096FAA4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 025F8 8096FAA8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 025FC 8096FAAC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02600 8096FAB0 0C00AC78 */ jal ActorShape_Init - -/* 02604 8096FAB4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02608 8096FAB8 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 0260C 8096FABC 240F0013 */ addiu $t7, $zero, 0x0013 ## $t7 = 00000013 -/* 02610 8096FAC0 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 02614 8096FAC4 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 02618 8096FAC8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0261C 8096FACC 8FB00020 */ lw $s0, 0x0020($sp) -/* 02620 8096FAD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02624 8096FAD4 03E00008 */ jr $ra -/* 02628 8096FAD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s deleted file mode 100644 index 17fdad1bc8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096FADC -/* 0262C 8096FADC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02630 8096FAE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02634 8096FAE4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02638 8096FAE8 0C25B54B */ jal func_8096D52C -/* 0263C 8096FAEC AFA5001C */ sw $a1, 0x001C($sp) -/* 02640 8096FAF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02644 8096FAF4 0C25B565 */ jal func_8096D594 -/* 02648 8096FAF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0264C 8096FAFC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02650 8096FB00 0C25B553 */ jal func_8096D54C -/* 02654 8096FB04 8FA5001C */ lw $a1, 0x001C($sp) -/* 02658 8096FB08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0265C 8096FB0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02660 8096FB10 03E00008 */ jr $ra -/* 02664 8096FB14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s deleted file mode 100644 index eee9a4ecf1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8096FB18 -/* 02668 8096FB18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0266C 8096FB1C AFBF001C */ sw $ra, 0x001C($sp) -/* 02670 8096FB20 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02674 8096FB24 24C635D8 */ addiu $a2, $a2, 0x35D8 ## $a2 = 060035D8 -/* 02678 8096FB28 AFA00010 */ sw $zero, 0x0010($sp) -/* 0267C 8096FB2C AFA00014 */ sw $zero, 0x0014($sp) -/* 02680 8096FB30 0C25B631 */ jal func_8096D8C4 -/* 02684 8096FB34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02688 8096FB38 8FBF001C */ lw $ra, 0x001C($sp) -/* 0268C 8096FB3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02690 8096FB40 03E00008 */ jr $ra -/* 02694 8096FB44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s deleted file mode 100644 index 9a4a8afdf6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096FB48 -/* 02698 8096FB48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0269C 8096FB4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 026A0 8096FB50 AFB00020 */ sw $s0, 0x0020($sp) -/* 026A4 8096FB54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 026A8 8096FB58 0C25B743 */ jal func_8096DD0C -/* 026AC 8096FB5C AFA5002C */ sw $a1, 0x002C($sp) -/* 026B0 8096FB60 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 026B4 8096FB64 24C685F8 */ addiu $a2, $a2, 0x85F8 ## $a2 = 060085F8 -/* 026B8 8096FB68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026BC 8096FB6C 0C25B5CA */ jal func_8096D728 -/* 026C0 8096FB70 8FA5002C */ lw $a1, 0x002C($sp) -/* 026C4 8096FB74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C8 8096FB78 0C25B76F */ jal func_8096DDBC -/* 026CC 8096FB7C 8FA5002C */ lw $a1, 0x002C($sp) -/* 026D0 8096FB80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 026D4 8096FB84 24A5AFE0 */ addiu $a1, $a1, 0xAFE0 ## $a1 = 0600AFE0 -/* 026D8 8096FB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026DC 8096FB8C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 026E0 8096FB90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 026E4 8096FB94 0C25B5E7 */ jal func_8096D79C -/* 026E8 8096FB98 AFA00010 */ sw $zero, 0x0010($sp) -/* 026EC 8096FB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026F0 8096FBA0 0C25B575 */ jal func_8096D5D4 -/* 026F4 8096FBA4 8FA5002C */ lw $a1, 0x002C($sp) -/* 026F8 8096FBA8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 026FC 8096FBAC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 02700 8096FBB0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 02704 8096FBB4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02708 8096FBB8 0C00AC78 */ jal ActorShape_Init - -/* 0270C 8096FBBC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02710 8096FBC0 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 02714 8096FBC4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 02718 8096FBC8 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 0271C 8096FBCC AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 02720 8096FBD0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02724 8096FBD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 02728 8096FBD8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0272C 8096FBDC 03E00008 */ jr $ra -/* 02730 8096FBE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s deleted file mode 100644 index 56c5515ffa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096FBE4 -/* 02734 8096FBE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02738 8096FBE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0273C 8096FBEC AFA40018 */ sw $a0, 0x0018($sp) -/* 02740 8096FBF0 0C25B54B */ jal func_8096D52C -/* 02744 8096FBF4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02748 8096FBF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0274C 8096FBFC 0C25B565 */ jal func_8096D594 -/* 02750 8096FC00 8FA5001C */ lw $a1, 0x001C($sp) -/* 02754 8096FC04 0C25B5A3 */ jal func_8096D68C -/* 02758 8096FC08 8FA40018 */ lw $a0, 0x0018($sp) -/* 0275C 8096FC0C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02760 8096FC10 0C25B553 */ jal func_8096D54C -/* 02764 8096FC14 8FA5001C */ lw $a1, 0x001C($sp) -/* 02768 8096FC18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0276C 8096FC1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02770 8096FC20 03E00008 */ jr $ra -/* 02774 8096FC24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s deleted file mode 100644 index 284ebcffea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8096FC28 -/* 02778 8096FC28 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0277C 8096FC2C AFA40000 */ sw $a0, 0x0000($sp) -/* 02780 8096FC30 AFA60008 */ sw $a2, 0x0008($sp) -/* 02784 8096FC34 14A1001A */ bne $a1, $at, .L8096FCA0 -/* 02788 8096FC38 AFA7000C */ sw $a3, 0x000C($sp) -/* 0278C 8096FC3C 3C0E8016 */ lui $t6, %hi(gSaveContext+0xec0) -/* 02790 8096FC40 8DCEF520 */ lw $t6, %lo(gSaveContext+0xec0)($t6) -/* 02794 8096FC44 8FA30014 */ lw $v1, 0x0014($sp) -/* 02798 8096FC48 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 0279C 8096FC4C 31CF1000 */ andi $t7, $t6, 0x1000 ## $t7 = 00000000 -/* 027A0 8096FC50 15E00013 */ bne $t7, $zero, .L8096FCA0 -/* 027A4 8096FC54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 027A8 8096FC58 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 027AC 8096FC5C 24A574C8 */ addiu $a1, $a1, 0x74C8 ## $a1 = 060074C8 -/* 027B0 8096FC60 00054100 */ sll $t0, $a1, 4 -/* 027B4 8096FC64 00084F02 */ srl $t1, $t0, 28 -/* 027B8 8096FC68 24980008 */ addiu $t8, $a0, 0x0008 ## $t8 = 00000008 -/* 027BC 8096FC6C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 027C0 8096FC70 00095080 */ sll $t2, $t1, 2 -/* 027C4 8096FC74 3C0B8016 */ lui $t3, %hi(gSegments) -/* 027C8 8096FC78 016A5821 */ addu $t3, $t3, $t2 -/* 027CC 8096FC7C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 027D0 8096FC80 AC990000 */ sw $t9, 0x0000($a0) ## 00000000 -/* 027D4 8096FC84 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* 027D8 8096FC88 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 027DC 8096FC8C 00A16024 */ and $t4, $a1, $at -/* 027E0 8096FC90 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 027E4 8096FC94 016C6821 */ addu $t5, $t3, $t4 -/* 027E8 8096FC98 01A17021 */ addu $t6, $t5, $at -/* 027EC 8096FC9C AC8E0004 */ sw $t6, 0x0004($a0) ## 00000004 -.L8096FCA0: -/* 027F0 8096FCA0 03E00008 */ jr $ra -/* 027F4 8096FCA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s deleted file mode 100644 index ec72b61d7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096FCA8 -/* 027F8 8096FCA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 027FC 8096FCAC AFBF001C */ sw $ra, 0x001C($sp) -/* 02800 8096FCB0 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 02804 8096FCB4 3C068097 */ lui $a2, %hi(D_80970480) ## $a2 = 80970000 -/* 02808 8096FCB8 3C0F8097 */ lui $t7, %hi(func_8096FC28) ## $t7 = 80970000 -/* 0280C 8096FCBC 00027080 */ sll $t6, $v0, 2 -/* 02810 8096FCC0 00CE3021 */ addu $a2, $a2, $t6 -/* 02814 8096FCC4 25EFFC28 */ addiu $t7, $t7, %lo(func_8096FC28) ## $t7 = 8096FC28 -/* 02818 8096FCC8 8CC60480 */ lw $a2, %lo(D_80970480)($a2) -/* 0281C 8096FCCC AFAF0014 */ sw $t7, 0x0014($sp) -/* 02820 8096FCD0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02824 8096FCD4 0C25B631 */ jal func_8096D8C4 -/* 02828 8096FCD8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0282C 8096FCDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02830 8096FCE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02834 8096FCE4 03E00008 */ jr $ra -/* 02838 8096FCE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s deleted file mode 100644 index 319de3e959..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096FCEC -/* 0283C 8096FCEC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02840 8096FCF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02844 8096FCF4 AFB00020 */ sw $s0, 0x0020($sp) -/* 02848 8096FCF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0284C 8096FCFC 0C25B743 */ jal func_8096DD0C -/* 02850 8096FD00 AFA5002C */ sw $a1, 0x002C($sp) -/* 02854 8096FD04 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02858 8096FD08 24C64868 */ addiu $a2, $a2, 0x4868 ## $a2 = 06004868 -/* 0285C 8096FD0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02860 8096FD10 0C25B5CA */ jal func_8096D728 -/* 02864 8096FD14 8FA5002C */ lw $a1, 0x002C($sp) -/* 02868 8096FD18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0286C 8096FD1C 0C25B76F */ jal func_8096DDBC -/* 02870 8096FD20 8FA5002C */ lw $a1, 0x002C($sp) -/* 02874 8096FD24 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02878 8096FD28 24A5AFE0 */ addiu $a1, $a1, 0xAFE0 ## $a1 = 0600AFE0 -/* 0287C 8096FD2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02880 8096FD30 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02884 8096FD34 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02888 8096FD38 0C25B5E7 */ jal func_8096D79C -/* 0288C 8096FD3C AFA00010 */ sw $zero, 0x0010($sp) -/* 02890 8096FD40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02894 8096FD44 0C25B575 */ jal func_8096D5D4 -/* 02898 8096FD48 8FA5002C */ lw $a1, 0x002C($sp) -/* 0289C 8096FD4C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 028A0 8096FD50 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 028A4 8096FD54 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 028A8 8096FD58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 028AC 8096FD5C 0C00AC78 */ jal ActorShape_Init - -/* 028B0 8096FD60 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 028B4 8096FD64 240E001A */ addiu $t6, $zero, 0x001A ## $t6 = 0000001A -/* 028B8 8096FD68 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 -/* 028BC 8096FD6C AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 028C0 8096FD70 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 028C4 8096FD74 8FBF0024 */ lw $ra, 0x0024($sp) -/* 028C8 8096FD78 8FB00020 */ lw $s0, 0x0020($sp) -/* 028CC 8096FD7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 028D0 8096FD80 03E00008 */ jr $ra -/* 028D4 8096FD84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s deleted file mode 100644 index 4bc84e2a97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096FD88 -/* 028D8 8096FD88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 028DC 8096FD8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 028E0 8096FD90 AFA40018 */ sw $a0, 0x0018($sp) -/* 028E4 8096FD94 0C25B54B */ jal func_8096D52C -/* 028E8 8096FD98 AFA5001C */ sw $a1, 0x001C($sp) -/* 028EC 8096FD9C 8FA40018 */ lw $a0, 0x0018($sp) -/* 028F0 8096FDA0 0C25B565 */ jal func_8096D594 -/* 028F4 8096FDA4 8FA5001C */ lw $a1, 0x001C($sp) -/* 028F8 8096FDA8 0C25B5A3 */ jal func_8096D68C -/* 028FC 8096FDAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02900 8096FDB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02904 8096FDB4 0C25B553 */ jal func_8096D54C -/* 02908 8096FDB8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0290C 8096FDBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02910 8096FDC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02914 8096FDC4 03E00008 */ jr $ra -/* 02918 8096FDC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s deleted file mode 100644 index 85991e48ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096FDCC -/* 0291C 8096FDCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02920 8096FDD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02924 8096FDD4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 02928 8096FDD8 3C068097 */ lui $a2, %hi(D_8097048C) ## $a2 = 80970000 -/* 0292C 8096FDDC AFA00014 */ sw $zero, 0x0014($sp) -/* 02930 8096FDE0 00027080 */ sll $t6, $v0, 2 -/* 02934 8096FDE4 00CE3021 */ addu $a2, $a2, $t6 -/* 02938 8096FDE8 8CC6048C */ lw $a2, %lo(D_8097048C)($a2) -/* 0293C 8096FDEC AFA00010 */ sw $zero, 0x0010($sp) -/* 02940 8096FDF0 0C25B631 */ jal func_8096D8C4 -/* 02944 8096FDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02948 8096FDF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0294C 8096FDFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02950 8096FE00 03E00008 */ jr $ra -/* 02954 8096FE04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s deleted file mode 100644 index 4aa92872ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_8096FE08 -/* 02958 8096FE08 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0295C 8096FE0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02960 8096FE10 AFB00020 */ sw $s0, 0x0020($sp) -/* 02964 8096FE14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02968 8096FE18 0C25B743 */ jal func_8096DD0C -/* 0296C 8096FE1C AFA5003C */ sw $a1, 0x003C($sp) -/* 02970 8096FE20 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 02974 8096FE24 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 02978 8096FE28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0297C 8096FE2C 0C25B5CA */ jal func_8096D728 -/* 02980 8096FE30 8FA5003C */ lw $a1, 0x003C($sp) -/* 02984 8096FE34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02988 8096FE38 0C25B76F */ jal func_8096DDBC -/* 0298C 8096FE3C 8FA5003C */ lw $a1, 0x003C($sp) -/* 02990 8096FE40 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 02994 8096FE44 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 02998 8096FE48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0299C 8096FE4C 14410006 */ bne $v0, $at, .L8096FE68 -/* 029A0 8096FE50 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029A4 8096FE54 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 029A8 8096FE58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 029AC 8096FE5C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 029B0 8096FE60 10000013 */ beq $zero, $zero, .L8096FEB0 -/* 029B4 8096FE64 24A52FA0 */ addiu $a1, $a1, 0x2FA0 ## $a1 = 06002FA0 -.L8096FE68: -/* 029B8 8096FE68 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 029BC 8096FE6C 14410005 */ bne $v0, $at, .L8096FE84 -/* 029C0 8096FE70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 029C4 8096FE74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 029C8 8096FE78 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 029CC 8096FE7C 1000000C */ beq $zero, $zero, .L8096FEB0 -/* 029D0 8096FE80 24A53A98 */ addiu $a1, $a1, 0x3A98 ## $a1 = 06003A98 -.L8096FE84: -/* 029D4 8096FE84 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 029D8 8096FE88 14410006 */ bne $v0, $at, .L8096FEA4 -/* 029DC 8096FE8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 029E0 8096FE90 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 029E4 8096FE94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 029E8 8096FE98 44810000 */ mtc1 $at, $f0 ## $f0 = 15.00 -/* 029EC 8096FE9C 10000004 */ beq $zero, $zero, .L8096FEB0 -/* 029F0 8096FEA0 24A52FA0 */ addiu $a1, $a1, 0x2FA0 ## $a1 = 06002FA0 -.L8096FEA4: -/* 029F4 8096FEA4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 029F8 8096FEA8 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 -/* 029FC 8096FEAC 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 06003258 -.L8096FEB0: -/* 02A00 8096FEB0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02A04 8096FEB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02A08 8096FEB8 0C25B5E7 */ jal func_8096D79C -/* 02A0C 8096FEBC E7A00028 */ swc1 $f0, 0x0028($sp) -/* 02A10 8096FEC0 26020050 */ addiu $v0, $s0, 0x0050 ## $v0 = 00000050 -/* 02A14 8096FEC4 C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 02A18 8096FEC8 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000050 -/* 02A1C 8096FECC C4480004 */ lwc1 $f8, 0x0004($v0) ## 00000054 -/* 02A20 8096FED0 C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000058 -/* 02A24 8096FED4 46002182 */ mul.s $f6, $f4, $f0 -/* 02A28 8096FED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A2C 8096FEDC 46004282 */ mul.s $f10, $f8, $f0 -/* 02A30 8096FEE0 00000000 */ nop -/* 02A34 8096FEE4 46008482 */ mul.s $f18, $f16, $f0 -/* 02A38 8096FEE8 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000050 -/* 02A3C 8096FEEC E44A0004 */ swc1 $f10, 0x0004($v0) ## 00000054 -/* 02A40 8096FEF0 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058 -/* 02A44 8096FEF4 0C25B593 */ jal func_8096D64C -/* 02A48 8096FEF8 8FA5003C */ lw $a1, 0x003C($sp) -/* 02A4C 8096FEFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 02A50 8096FF00 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 02A54 8096FF04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 02A58 8096FF08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02A5C 8096FF0C 0C00AC78 */ jal ActorShape_Init - -/* 02A60 8096FF10 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02A64 8096FF14 240E001B */ addiu $t6, $zero, 0x001B ## $t6 = 0000001B -/* 02A68 8096FF18 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 -/* 02A6C 8096FF1C AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 02A70 8096FF20 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 02A74 8096FF24 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02A78 8096FF28 8FB00020 */ lw $s0, 0x0020($sp) -/* 02A7C 8096FF2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02A80 8096FF30 03E00008 */ jr $ra -/* 02A84 8096FF34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s deleted file mode 100644 index afc5562b59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096FF38 -/* 02A88 8096FF38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A8C 8096FF3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A90 8096FF40 AFA40018 */ sw $a0, 0x0018($sp) -/* 02A94 8096FF44 0C25B54B */ jal func_8096D52C -/* 02A98 8096FF48 AFA5001C */ sw $a1, 0x001C($sp) -/* 02A9C 8096FF4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AA0 8096FF50 0C25B565 */ jal func_8096D594 -/* 02AA4 8096FF54 8FA5001C */ lw $a1, 0x001C($sp) -/* 02AA8 8096FF58 0C25B5A3 */ jal func_8096D68C -/* 02AAC 8096FF5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AB0 8096FF60 8FA40018 */ lw $a0, 0x0018($sp) -/* 02AB4 8096FF64 0C25B553 */ jal func_8096D54C -/* 02AB8 8096FF68 8FA5001C */ lw $a1, 0x001C($sp) -/* 02ABC 8096FF6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02AC0 8096FF70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AC4 8096FF74 03E00008 */ jr $ra -/* 02AC8 8096FF78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s deleted file mode 100644 index 1b1d773a64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096FF7C -/* 02ACC 8096FF7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02AD0 8096FF80 AFBF001C */ sw $ra, 0x001C($sp) -/* 02AD4 8096FF84 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 02AD8 8096FF88 3C068097 */ lui $a2, %hi(D_80970498) ## $a2 = 80970000 -/* 02ADC 8096FF8C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 02AE0 8096FF90 00027080 */ sll $t6, $v0, 2 -/* 02AE4 8096FF94 00CE3021 */ addu $a2, $a2, $t6 -/* 02AE8 8096FF98 8CC60498 */ lw $a2, %lo(D_80970498)($a2) -/* 02AEC 8096FF9C 24E7DE80 */ addiu $a3, $a3, 0xDE80 ## $a3 = 0600DE80 -/* 02AF0 8096FFA0 AFA00014 */ sw $zero, 0x0014($sp) -/* 02AF4 8096FFA4 0C25B631 */ jal func_8096D8C4 -/* 02AF8 8096FFA8 AFA00010 */ sw $zero, 0x0010($sp) -/* 02AFC 8096FFAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B00 8096FFB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02B04 8096FFB4 03E00008 */ jr $ra -/* 02B08 8096FFB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s deleted file mode 100644 index d0099797a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096FFBC -/* 02B0C 8096FFBC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02B10 8096FFC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02B14 8096FFC4 AFB00020 */ sw $s0, 0x0020($sp) -/* 02B18 8096FFC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B1C 8096FFCC 0C25B743 */ jal func_8096DD0C -/* 02B20 8096FFD0 AFA5002C */ sw $a1, 0x002C($sp) -/* 02B24 8096FFD4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 02B28 8096FFD8 24C68D90 */ addiu $a2, $a2, 0x8D90 ## $a2 = 06008D90 -/* 02B2C 8096FFDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B30 8096FFE0 0C25B5CA */ jal func_8096D728 -/* 02B34 8096FFE4 8FA5002C */ lw $a1, 0x002C($sp) -/* 02B38 8096FFE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B3C 8096FFEC 0C25B76F */ jal func_8096DDBC -/* 02B40 8096FFF0 8FA5002C */ lw $a1, 0x002C($sp) -/* 02B44 8096FFF4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02B48 8096FFF8 24A59EE0 */ addiu $a1, $a1, 0x9EE0 ## $a1 = 06009EE0 -/* 02B4C 8096FFFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B50 80970000 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02B54 80970004 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02B58 80970008 0C25B5E7 */ jal func_8096D79C -/* 02B5C 8097000C AFA00010 */ sw $zero, 0x0010($sp) -/* 02B60 80970010 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B64 80970014 0C25B575 */ jal func_8096D5D4 -/* 02B68 80970018 8FA5002C */ lw $a1, 0x002C($sp) -/* 02B6C 8097001C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 02B70 80970020 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 02B74 80970024 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 02B78 80970028 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02B7C 8097002C 0C00AC78 */ jal ActorShape_Init - -/* 02B80 80970030 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02B84 80970034 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 02B88 80970038 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 -/* 02B8C 8097003C AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 02B90 80970040 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 02B94 80970044 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02B98 80970048 8FB00020 */ lw $s0, 0x0020($sp) -/* 02B9C 8097004C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02BA0 80970050 03E00008 */ jr $ra -/* 02BA4 80970054 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s deleted file mode 100644 index 924223795f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80970058 -/* 02BA8 80970058 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BAC 8097005C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BB0 80970060 AFA40018 */ sw $a0, 0x0018($sp) -/* 02BB4 80970064 0C25B54B */ jal func_8096D52C -/* 02BB8 80970068 AFA5001C */ sw $a1, 0x001C($sp) -/* 02BBC 8097006C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BC0 80970070 0C25B565 */ jal func_8096D594 -/* 02BC4 80970074 8FA5001C */ lw $a1, 0x001C($sp) -/* 02BC8 80970078 0C25B5A3 */ jal func_8096D68C -/* 02BCC 8097007C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BD0 80970080 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BD4 80970084 0C25B553 */ jal func_8096D54C -/* 02BD8 80970088 8FA5001C */ lw $a1, 0x001C($sp) -/* 02BDC 8097008C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02BE0 80970090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BE4 80970094 03E00008 */ jr $ra -/* 02BE8 80970098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s deleted file mode 100644 index 0078de3ecd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8097009C -/* 02BEC 8097009C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02BF0 809700A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02BF4 809700A4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 02BF8 809700A8 3C068097 */ lui $a2, %hi(D_809704A4) ## $a2 = 80970000 -/* 02BFC 809700AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 02C00 809700B0 00027080 */ sll $t6, $v0, 2 -/* 02C04 809700B4 00CE3021 */ addu $a2, $a2, $t6 -/* 02C08 809700B8 8CC604A4 */ lw $a2, %lo(D_809704A4)($a2) -/* 02C0C 809700BC 24E73770 */ addiu $a3, $a3, 0x3770 ## $a3 = 06003770 -/* 02C10 809700C0 AFA00014 */ sw $zero, 0x0014($sp) -/* 02C14 809700C4 0C25B631 */ jal func_8096D8C4 -/* 02C18 809700C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 02C1C 809700CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C20 809700D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02C24 809700D4 03E00008 */ jr $ra -/* 02C28 809700D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s deleted file mode 100644 index 3b8bb257f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_8097071C - .asciz "\x1b[31m Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n\x1b[m" - .balign 4 - -.text -glabel func_809700DC -/* 02C2C 809700DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02C30 809700E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02C34 809700E4 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 02C38 809700E8 3C028097 */ lui $v0, %hi(D_809704B0) ## $v0 = 80970000 -/* 02C3C 809700EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02C40 809700F0 00067080 */ sll $t6, $a2, 2 -/* 02C44 809700F4 004E1021 */ addu $v0, $v0, $t6 -/* 02C48 809700F8 8C4204B0 */ lw $v0, %lo(D_809704B0)($v0) -/* 02C4C 809700FC 3C048097 */ lui $a0, %hi(D_8097071C) ## $a0 = 80970000 -/* 02C50 80970100 2484071C */ addiu $a0, $a0, %lo(D_8097071C) ## $a0 = 8097071C -/* 02C54 80970104 14400008 */ bne $v0, $zero, .L80970128 -/* 02C58 80970108 00000000 */ nop -/* 02C5C 8097010C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02C60 80970110 0C00084C */ jal osSyncPrintf - -/* 02C64 80970114 AFA70018 */ sw $a3, 0x0018($sp) -/* 02C68 80970118 0C00B55C */ jal Actor_Kill - -/* 02C6C 8097011C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02C70 80970120 10000004 */ beq $zero, $zero, .L80970134 -/* 02C74 80970124 8FBF0014 */ lw $ra, 0x0014($sp) -.L80970128: -/* 02C78 80970128 0040F809 */ jalr $ra, $v0 -/* 02C7C 8097012C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 02C80 80970130 8FBF0014 */ lw $ra, 0x0014($sp) -.L80970134: -/* 02C84 80970134 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C88 80970138 03E00008 */ jr $ra -/* 02C8C 8097013C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s deleted file mode 100644 index c8ae9cc9e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s +++ /dev/null @@ -1,74 +0,0 @@ -.rdata -glabel D_8097075C - .asciz "\x1b[31mDemo_Ec_main_bank:バンクを読めない arg_data = %d!\n\x1b[m" - .balign 4 - -.text -glabel func_80970140 -/* 02C90 80970140 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02C94 80970144 AFBF001C */ sw $ra, 0x001C($sp) -/* 02C98 80970148 AFB10018 */ sw $s1, 0x0018($sp) -/* 02C9C 8097014C AFB00014 */ sw $s0, 0x0014($sp) -/* 02CA0 80970150 AFA5003C */ sw $a1, 0x003C($sp) -/* 02CA4 80970154 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 02CA8 80970158 8FB0003C */ lw $s0, 0x003C($sp) -/* 02CAC 8097015C 3C0E8097 */ lui $t6, %hi(D_80970398) ## $t6 = 80970000 -/* 02CB0 80970160 00031040 */ sll $v0, $v1, 1 -/* 02CB4 80970164 01C27021 */ addu $t6, $t6, $v0 -/* 02CB8 80970168 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02CBC 8097016C 85CE0398 */ lh $t6, %lo(D_80970398)($t6) -/* 02CC0 80970170 3C058097 */ lui $a1, %hi(D_80970350) ## $a1 = 80970000 -/* 02CC4 80970174 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 02CC8 80970178 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02CCC 8097017C 00A22821 */ addu $a1, $a1, $v0 -/* 02CD0 80970180 02018021 */ addu $s0, $s0, $at -/* 02CD4 80970184 84A50350 */ lh $a1, %lo(D_80970350)($a1) -/* 02CD8 80970188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CDC 8097018C AFA3002C */ sw $v1, 0x002C($sp) -/* 02CE0 80970190 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 02CE4 80970194 A7AE0028 */ sh $t6, 0x0028($sp) -/* 02CE8 80970198 AFA20024 */ sw $v0, 0x0024($sp) -/* 02CEC 8097019C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CF0 809701A0 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 02CF4 809701A4 87A50028 */ lh $a1, 0x0028($sp) -/* 02CF8 809701A8 04400003 */ bltz $v0, .L809701B8 -/* 02CFC 809701AC AFA20020 */ sw $v0, 0x0020($sp) -/* 02D00 809701B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02D04 809701B4 04A10008 */ bgez $a1, .L809701D8 -.L809701B8: -/* 02D08 809701B8 3C048097 */ lui $a0, %hi(D_8097075C) ## $a0 = 80970000 -/* 02D0C 809701BC 2484075C */ addiu $a0, $a0, %lo(D_8097075C) ## $a0 = 8097075C -/* 02D10 809701C0 0C00084C */ jal osSyncPrintf - -/* 02D14 809701C4 8FA5002C */ lw $a1, 0x002C($sp) -/* 02D18 809701C8 0C00B55C */ jal Actor_Kill - -/* 02D1C 809701CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D20 809701D0 10000010 */ beq $zero, $zero, .L80970214 -/* 02D24 809701D4 8FBF001C */ lw $ra, 0x001C($sp) -.L809701D8: -/* 02D28 809701D8 0C026062 */ jal Object_IsLoaded - -/* 02D2C 809701DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D30 809701E0 1040000B */ beq $v0, $zero, .L80970210 -/* 02D34 809701E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D38 809701E8 0C026062 */ jal Object_IsLoaded - -/* 02D3C 809701EC 8FA50020 */ lw $a1, 0x0020($sp) -/* 02D40 809701F0 10400007 */ beq $v0, $zero, .L80970210 -/* 02D44 809701F4 8FAF0024 */ lw $t7, 0x0024($sp) -/* 02D48 809701F8 AE2F01A0 */ sw $t7, 0x01A0($s1) ## 000001A0 -/* 02D4C 809701FC 8FB80020 */ lw $t8, 0x0020($sp) -/* 02D50 80970200 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D54 80970204 AE3801A4 */ sw $t8, 0x01A4($s1) ## 000001A4 -/* 02D58 80970208 0C25C037 */ jal func_809700DC -/* 02D5C 8097020C 8FA5003C */ lw $a1, 0x003C($sp) -.L80970210: -/* 02D60 80970210 8FBF001C */ lw $ra, 0x001C($sp) -.L80970214: -/* 02D64 80970214 8FB00014 */ lw $s0, 0x0014($sp) -/* 02D68 80970218 8FB10018 */ lw $s1, 0x0018($sp) -/* 02D6C 8097021C 03E00008 */ jr $ra -/* 02D70 80970220 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s deleted file mode 100644 index cef453e827..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_809702B0 -/* 02E00 809702B0 AFA40000 */ sw $a0, 0x0000($sp) -/* 02E04 809702B4 03E00008 */ jr $ra -/* 02E08 809702B8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/data/overlays/actors/z_demo_ec.data.s b/data/overlays/actors/z_demo_ec.data.s deleted file mode 100644 index 2c0b7ef27f..0000000000 --- a/data/overlays/actors/z_demo_ec.data.s +++ /dev/null @@ -1,157 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80970350 - .word 0x00C00088, 0x013300FC, 0x00FD010C, 0x01070115, 0x010D0121, 0x01220122, 0x01220122, 0x00FC00FD, 0x01160116, 0x011600FE, 0x00FF00FB, 0x00130013, 0x00130110, 0x0159013E, 0x015B0165, 0x00C900C9, 0x00C900C9, 0x00D00000 -glabel D_80970398 - .word 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A015A, 0x015A0126, 0x00D00000 -glabel D_809703E0 - .word 0x008246FF -glabel D_809703E4 - .word 0x6EAA14FF -glabel D_809703E8 - .word 0x06000F4C, 0x06001A0C, 0x06001E0C -glabel D_809703F4 - .word 0x46BE3CFF -glabel D_809703F8 - .word 0x641E00FF -glabel D_809703FC - .word 0x060005FC, 0x060009FC, 0x06000DFC -glabel D_80970408 - .word 0x003264FF -glabel D_8097040C - .word 0x0032A0FF -glabel D_80970410 - .word 0x0600057C, 0x0600067C, 0x0600077C -glabel D_8097041C - .word 0xFFFFFFFF -glabel D_80970420 - .word 0xFFFFFFFF -glabel D_80970424 - .word 0x060007C8, 0x06000FC8, 0x060017C8 -glabel D_80970430 - .word 0x06000708, 0x06000F08, 0x06001708 -glabel D_8097043C - .word 0x06003E40, 0x06004640, 0x06004E40 -glabel D_80970448 - .word 0x06001470, 0x06001870, 0x06001C70, 0x06002070 -glabel D_80970458 - .word 0x06004FF0, 0x06005930, 0x06005D30, 0x06006130 -glabel D_80970468 - .word 0x060008C8, 0x060010C8, 0x060018C8 -glabel D_80970474 - .word 0x060030D8, 0x060034D8, 0x060038D8 -glabel D_80970480 - .word 0x06009250, 0x06009650, 0x06009A50 -glabel D_8097048C - .word 0x06003968, 0x06003D68, 0x06004168 -glabel D_80970498 - .word 0x0600CE80, 0x0600D280, 0x0600D680 -glabel D_809704A4 - .word 0x06002570, 0x06002C70, 0x06003070 -glabel D_809704B0 - .word func_8096DE94 -.word func_8096DF9C -.word func_8096E0A4 -.word func_8096E1AC -.word func_8096E380 -.word func_8096E56C -.word func_8096E69C -.word func_8096E7CC -.word func_8096E8E4 -.word func_8096E9E8 -.word func_8096EAE8 -.word func_8096EAE8 -.word func_8096EAE8 -.word func_8096EAE8 -.word func_8096E244 -.word func_8096E418 -.word func_8096EDFC -.word func_8096EDFC -.word func_8096EDFC -.word func_8096F010 -.word func_8096F12C -.word func_8096F454 -.word func_8096F6D8 -.word func_8096F6D8 -.word func_8096F6D8 -.word func_8096F808 -.word func_8096F924 -.word func_8096FA40 -.word func_8096FB48 -.word func_8096FCEC -.word func_8096FE08 -.word func_8096FE08 -.word func_8096FE08 -.word func_8096FE08 -.word func_8096FFBC -glabel D_8097053C - .word func_80970140 -.word func_8096DF2C -.word func_8096E034 -.word func_8096E13C -.word func_8096E2E0 -.word func_8096E4B4 -.word func_8096E604 -.word func_8096E734 -.word func_8096E864 -.word func_8096E97C -.word func_8096EA80 -.word func_8096EB80 -.word func_8096E31C -.word func_8096E4F8 -.word func_8096EE98 -.word func_8096F0AC -.word func_8096F314 -.word func_8096F378 -.word func_8096F3D4 -.word func_8096F5DC -.word func_8096F640 -.word func_8096F7A0 -.word func_8096F8A4 -.word func_8096F9C0 -.word func_8096FADC -.word func_8096FBE4 -.word func_8096FD88 -.word func_8096FF38 -.word func_80970058 -glabel D_809705B0 - .word func_809702B0 -.word func_8096DF68 -.word func_8096E070 -.word func_8096E178 -.word func_8096E33C -.word func_8096E518 -.word func_8096E648 -.word func_8096E778 -.word func_8096E8A8 -.word func_8096E9B8 -.word func_8096EABC -.word func_8096EDC0 -.word func_8096EFCC -.word func_8096F0F0 -.word func_8096F418 -.word func_8096F69C -.word func_8096F7DC -.word func_8096F8E8 -.word func_8096FA04 -.word func_8096FB18 -.word func_8096FCA8 -.word func_8096FDCC -.word func_8096FF7C -.word func_8097009C -glabel Demo_Ec_InitVars - .word 0x01820400, 0x00000010, 0x015A0000, 0x000001A8 -.word DemoEc_Init -.word DemoEc_Destroy -.word DemoEc_Update -.word DemoEc_Draw - diff --git a/data/overlays/actors/z_demo_ec.reloc.s b/data/overlays/actors/z_demo_ec.reloc.s deleted file mode 100644 index 70d0c8bdb4..0000000000 --- a/data/overlays/actors/z_demo_ec.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80970810 - .incbin "baserom/ovl_Demo_Ec", 0x3360, 0x00000740 diff --git a/include/z64save.h b/include/z64save.h index 1a3b3ca505..d69e1af7eb 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -96,7 +96,8 @@ typedef struct { /* 0x0E64 */ FaroresWindData fw; /* 0x0E8C */ char unk_E8C[0x10]; /* 0x0E9C */ s32 gsFlags[6]; - /* 0x0EB4 */ char unk_EB4[0x10]; + /* 0x0EB4 */ char unk_EB4[0xC]; + /* 0x0EC0 */ s32 unk_EC0; /* 0x0EC4 */ s32 horseRaceRecord; /* 0x0EC8 */ char unk_EC8[0x08]; /* 0x0ED0 */ s32 dampeRaceTime; diff --git a/spec b/spec index fdcf1c9aed..f3345dffd0 100644 --- a/spec +++ b/spec @@ -1503,8 +1503,7 @@ endseg beginseg name "ovl_Demo_Ec" include "build/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.o" - include "build/data/overlays/actors/z_demo_ec.data.o" - include "build/data/overlays/actors/z_demo_ec.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Ec/ovl_Demo_Ec_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 4d094923a8..26ab98fd00 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -1,4 +1,5 @@ #include "z_demo_ec.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -9,7 +10,1326 @@ void DemoEc_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoEc_Update(Actor* thisx, GlobalContext* globalCtx); void DemoEc_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +typedef enum { + /* 00 */ EC_UPDATE_COMMON, + /* 01 */ EC_UPDATE_INGO, + /* 02 */ EC_UPDATE_TALON, + /* 03 */ EC_UPDATE_WINDMILL_MAN, + /* 04 */ EC_UPDATE_KOKIRI_BOY, + /* 05 */ EC_UPDATE_KOKIRI_GIRL, + /* 06 */ EC_UPDATE_OLD_MAN, + /* 07 */ EC_UPDATE_BEARDED_MAN, + /* 08 */ EC_UPDATE_WOMAN, + /* 09 */ EC_UPDATE_OLD_WOMAN, + /* 10 */ EC_UPDATE_BOSS_CARPENTER, + /* 11 */ EC_UPDATE_CARPENTER, + /* 12 */ EC_UPDATE_DANCING_KOKIRI_BOY, + /* 13 */ EC_UPDATE_DANCING_KOKIRI_GIRL, + /* 14 */ EC_UPDATE_GERUDO, + /* 15 */ EC_UPDATE_DANCING_ZORA, + /* 16 */ EC_UPDATE_KING_ZORA, + /* 17 */ EC_UPDATE_17, + /* 18 */ EC_UPDATE_18, + /* 19 */ EC_UPDATE_MIDO, + /* 20 */ EC_UPDATE_20, + /* 21 */ EC_UPDATE_CUCCO, + /* 22 */ EC_UPDATE_CUCCO_LADY, + /* 23 */ EC_UPDATE_POTION_SHOP_OWNER, + /* 24 */ EC_UPDATE_MASK_SHOP_OWNER, + /* 25 */ EC_UPDATE_FISHING_MAN, + /* 26 */ EC_UPDATE_BOMBCHU_SHOP_OWNER, + /* 27 */ EC_UPDATE_GORON, + /* 28 */ EC_UPDATE_MALON +} DemoEcUpdateMode; + +typedef enum { + /* 00 */ EC_DRAW_COMMON, + /* 01 */ EC_DRAW_INGO, + /* 02 */ EC_DRAW_TALON, + /* 03 */ EC_DRAW_WINDMILL_MAN, + /* 04 */ EC_DRAW_KOKIRI_BOY, + /* 05 */ EC_DRAW_KOKIRI_GIRL, + /* 06 */ EC_DRAW_OLD_MAN, + /* 07 */ EC_DRAW_BEARDED_MAN, + /* 08 */ EC_DRAW_WOMAN, + /* 09 */ EC_DRAW_OLD_WOMAN, + /* 10 */ EC_DRAW_BOSS_CARPENTER, + /* 11 */ EC_DRAW_CARPENTER, + /* 12 */ EC_DRAW_GERUDO, + /* 13 */ EC_DRAW_DANCING_ZORA, + /* 14 */ EC_DRAW_KING_ZORA, + /* 15 */ EC_DRAW_MIDO, + /* 16 */ EC_DRAW_CUCCO, + /* 17 */ EC_DRAW_CUCCO_LADY, + /* 18 */ EC_DRAW_POTION_SHOP_OWNER, + /* 19 */ EC_DRAW_MASK_SHOP_OWNER, + /* 20 */ EC_DRAW_FISHING_MAN, + /* 21 */ EC_DRAW_BOMBCHU_SHOP_OWNER, + /* 22 */ EC_DRAW_GORON, + /* 23 */ EC_DRAW_MALON +} DemoEcDrawconfig; + +static s16 sDrawObjects[] = { + OBJECT_IN, OBJECT_TA, OBJECT_FU, OBJECT_KM1, OBJECT_KW1, OBJECT_BJI, OBJECT_AHG, + OBJECT_BOB, OBJECT_BBA, OBJECT_TORYO, OBJECT_DAIKU, OBJECT_DAIKU, OBJECT_DAIKU, OBJECT_DAIKU, + OBJECT_KM1, OBJECT_KW1, OBJECT_GE1, OBJECT_GE1, OBJECT_GE1, OBJECT_ZO, OBJECT_KZ, + OBJECT_MD, OBJECT_NIW, OBJECT_NIW, OBJECT_NIW, OBJECT_ANE, OBJECT_DS2, OBJECT_OS, + OBJECT_FISH, OBJECT_RS, OBJECT_OF1D_MAP, OBJECT_OF1D_MAP, OBJECT_OF1D_MAP, OBJECT_OF1D_MAP, OBJECT_MA2, +}; + +static s16 sAnimationObjects[] = { + OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, + OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, + OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, + OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_GM, OBJECT_MA2, +}; + +// skeletons +extern FlexSkeletonHeader D_06013B88; +extern FlexSkeletonHeader D_0600B7B8; +extern FlexSkeletonHeader D_06006C90; +extern FlexSkeletonHeader D_060000F0; +extern FlexSkeletonHeader D_06007150; +extern FlexSkeletonHeader D_06007958; +extern FlexSkeletonHeader D_06000330; +extern FlexSkeletonHeader D_0600BFA8; +extern FlexSkeletonHeader D_060086D0; +extern FlexSkeletonHeader D_06007FB8; +extern FlexSkeletonHeader D_06002530; +extern FlexSkeletonHeader D_06004258; +extern FlexSkeletonHeader D_06004658; +extern FlexSkeletonHeader D_060085F8; +extern FlexSkeletonHeader D_06004868; +extern FlexSkeletonHeader D_0600FEF0; +extern FlexSkeletonHeader D_06008D90; + +// animations +extern AnimationHeader D_0600BD38; +extern AnimationHeader D_060048F4; +extern AnimationHeader D_0600196C; +extern AnimationHeader D_06005670; +extern AnimationHeader D_06005EA8; +extern AnimationHeader D_0600164C; +extern AnimationHeader D_0600164C; +extern AnimationHeader D_0600513C; +extern AnimationHeader D_06002254; +extern AnimationHeader D_0600C918; +extern AnimationHeader D_06006C40; +extern AnimationHeader D_060095DC; +extern AnimationHeader D_06009BB4; +extern AnimationHeader D_0600A07C; +extern AnimationHeader D_0600A474; +extern AnimationHeader D_06000CD8; +extern AnimationHeader D_0600AFE0; +extern AnimationHeader D_0600AFE0; +extern AnimationHeader D_06002FA0; +extern AnimationHeader D_06003A98; +extern AnimationHeader D_06002FA0; +extern AnimationHeader D_060002B8; +extern AnimationHeader D_06009EE0; +extern AnimationHeader D_06006930; +extern AnimationHeader D_06006220; +extern AnimationHeader D_06008D1C; +extern AnimationHeader D_06009234; +extern AnimationHeader D_06004390; +extern AnimationHeader D_060076C0; +extern AnimationHeader D_06005F20; + +// mouth textures +extern u8 D_06004350[]; +extern u8 D_06007AC0[]; +extern u8 D_06006920[]; +extern u8 D_060004C8[]; +extern u8 D_060035D8[]; +extern u8 D_0600DE80[]; +extern u8 D_06003770[]; + +// PostLimbDraw display lists +extern Gfx D_06005BD0[]; +extern Gfx D_06005AC0[]; +extern Gfx D_06005990[]; +extern Gfx D_06005880[]; +extern Gfx D_06009198[]; +extern Gfx D_06009430[]; +extern Gfx D_06009690[]; +extern Gfx D_060074C8[]; + +void DemoEc_Destroy(Actor* thisx, GlobalContext* globalCtx) { + DemoEc* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); +} + +void DemoEc_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoEc* this = THIS; + + if ((this->actor.params < 0) || (this->actor.params > 34)) { + osSyncPrintf(VT_FGCOL(RED) "Demo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); + Actor_Kill(&this->actor); + } else { + this->updateMode = EC_UPDATE_COMMON; + this->drawConfig = EC_DRAW_COMMON; + } +} + +s32 DemoEc_UpdateSkelAnime(DemoEc* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +void DemoEc_UpdateBgFlags(DemoEc* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 30.0f, 25.0f, 30.0f, 7); +} + +void func_8096D594(DemoEc* this, GlobalContext* globalCtx) { + this->skelAnime.flags |= 3; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void func_8096D5D4(DemoEc* this, GlobalContext* globalCtx) { + this->skelAnime.unk_3E = this->skelAnime.limbDrawTbl[0]; + this->skelAnime.prevFramePos = this->skelAnime.limbDrawTbl[0]; + this->skelAnime.flags |= 3; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void func_8096D64C(DemoEc* this, GlobalContext* globalCtx) { + this->skelAnime.flags |= 3; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void DemoEc_UpdateEyes(DemoEc* this) { + s32 pad[3]; + s16* blinkTimer = &this->blinkTimer; + s16* eyeTexIndex = &this->eyeTexIndex; + + if (DECR(*blinkTimer) == 0) { + *blinkTimer = Math_Rand_S16Offset(60, 60); + } + + *eyeTexIndex = *blinkTimer; + + if (*eyeTexIndex >= 3) { + *eyeTexIndex = 0; + } +} + +void DemoEc_SetEyeTexIndex(DemoEc* this, s16 texIndex) { + this->eyeTexIndex = texIndex; +} + +void DemoEc_InitSkelAnime(DemoEc* this, GlobalContext* globalCtx, FlexSkeletonHeader* skeletonHeader) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, SEGMENTED_TO_VIRTUAL(skeletonHeader), NULL, NULL, NULL, 0); +} + +void DemoEc_ChangeAnimation(DemoEc* this, AnimationHeader* animation, u8 mode, f32 transitionRate, s32 reverse) { + f32 frameCount; + f32 startFrame; + AnimationHeader* anim; + f32 playbackSpeed; + s16 frameCountS; + + anim = SEGMENTED_TO_VIRTUAL(animation); + frameCountS = SkelAnime_GetFrameCount(anim); + + if (!reverse) { + startFrame = 0.0f; + frameCount = frameCountS; + playbackSpeed = 1.0f; + } else { + frameCount = 0.0f; + startFrame = frameCountS; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, anim, playbackSpeed, startFrame, frameCount, mode, transitionRate); +} + +Gfx* DemoEc_AllocColorDList(GraphicsContext* gfxCtx, u8* color) { + Gfx* dList; + + dList = Graph_Alloc(gfxCtx, sizeof(Gfx) * 2); + gDPSetEnvColor(dList, color[0], color[1], color[2], color[3]); + gSPEndDisplayList(dList + 1); + + return dList; +} + +void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTexture, void* arg3, + OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + SkelAnime* skelAnime = &this->skelAnime; + s32 pad; + + OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 565); + + func_80093D18(gfxCtx); + + if (eyeTexture != 0) { + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); + } + + if (arg3 != 0) { + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(arg3)); + } + + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); + POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP); + CLOSE_DISPS(gfxCtx, "../z_demo_ec.c", 595); +} + +void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx* arg2, Gfx* arg3, u8* color1, + u8* color2, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) { + s32 pad; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 609); + + func_80093D18(gfxCtx); + + if (arg2 != 0) { + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(arg2)); + } + + if (arg3 != 0) { + gSPSegment(POLY_OPA_DISP++, 0x0B, SEGMENTED_TO_VIRTUAL(arg3)); + } + + if (color1 != NULL) { + //! @bug DemoEc_AllocColorDList is called twice in SEGMENTED_TO_VIRTUAL, allocating two display lists + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(DemoEc_AllocColorDList(gfxCtx, color1))); + } + + if (color2 != NULL) { + //! @bug DemoEc_AllocColorDList is called twice in SEGMENTED_TO_VIRTUAL, allocating two display lists + //! @bug meant to pass color2 instead of color1? + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(DemoEc_AllocColorDList(gfxCtx, color1))); + } + + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); + POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP); + + CLOSE_DISPS(gfxCtx, "../z_demo_ec.c", 646); +} + +void DemoEc_UseDrawObject(DemoEc* this, GlobalContext* globalCtx) { + s32 pad[2]; + s32 drawObjBankIndex = this->drawObjBankIndex; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + + OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 662); + + gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[drawObjBankIndex].segment); + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[drawObjBankIndex].segment); + if (!globalCtx) {} + + CLOSE_DISPS(gfxCtx, "../z_demo_ec.c", 670); +} + +void DemoEc_UseAnimationObject(DemoEc* this, GlobalContext* globalCtx) { + s32 animObjBankIndex = this->animObjBankIndex; + + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[animObjBankIndex].segment); +} + +CsCmdActorAction* DemoEc_GetNpcAction(GlobalContext* globalCtx, s32 actionIndex) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[actionIndex]; + } else { + return NULL; + } +} + +void DemoEc_SetNpcActionPosRot(DemoEc* this, GlobalContext* globalCtx, s32 actionIndex) { + CsCmdActorAction* npcAction = DemoEc_GetNpcAction(globalCtx, actionIndex); + + if (npcAction != NULL) { + this->actor.posRot.pos.x = npcAction->startPos.x; + this->actor.posRot.pos.y = npcAction->startPos.y; + this->actor.posRot.pos.z = npcAction->startPos.z; + + this->actor.posRot.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + } +} + +void DemoEc_InitIngo(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06013B88); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_060048F4, 0, 0.0f, false); + func_8096D64C(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_INGO; + this->drawConfig = EC_DRAW_INGO; +} + +void DemoEc_UpdateIngo(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawIngo(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, &D_06004390, &D_06004350, 0, 0); +} + +void DemoEc_InitTalon(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_0600B7B8); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600BD38, 0, 0.0f, false); + func_8096D64C(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_TALON; + this->drawConfig = EC_DRAW_TALON; +} + +void DemoEc_UpdateTalon(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawTalon(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, &D_060076C0, &D_06007AC0, NULL, NULL); +} + +void DemoEc_InitWindmillMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06006C90); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600196C, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_WINDMILL_MAN; + this->drawConfig = EC_DRAW_WINDMILL_MAN; +} + +void DemoEc_UpdateWindmillMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawWindmillMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, &D_06005F20, &D_06006920, NULL, NULL); +} + +void DemoEc_InitKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06005670, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_KOKIRI_BOY; + this->drawConfig = EC_DRAW_KOKIRI_BOY; +} + +void DemoEc_InitDancingKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600513C, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_DANCING_KOKIRI_BOY; + this->drawConfig = EC_DRAW_KOKIRI_BOY; +} + +void DemoEc_UpdateKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_UpdateDancingKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateKokiriBoy(this, globalCtx); +} + +void DemoEc_DrawKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { + static u8 color1[] = { 0, 130, 70, 255 }; + static u8 color2[] = { 110, 170, 20, 255 }; + + DemoEc_DrawSkeletonCustomColor(this, globalCtx, NULL, NULL, color1, color2, NULL, NULL); +} + +void DemoEc_InitKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06005670, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_KOKIRI_GIRL; + this->drawConfig = EC_DRAW_KOKIRI_GIRL; +} + +void DemoEc_InitDancingKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600513C, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_DANCING_KOKIRI_GIRL; + this->drawConfig = EC_DRAW_KOKIRI_GIRL; +} + +void DemoEc_UpdateKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_UpdateDancingKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateKokiriGirl(this, globalCtx); +} + +void DemoEc_DrawKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06000F4C, 0x06001A0C, 0x06001E0C }; + static u8 color1[] = { 70, 190, 60, 255 }; + static u8 color2[] = { 100, 30, 0, 255 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeletonCustomColor(this, globalCtx, eyeTexture, NULL, color1, color2, NULL, NULL); +} +void DemoEc_InitOldMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06005EA8, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_OLD_MAN; + this->drawConfig = EC_DRAW_OLD_MAN; +} + +void DemoEc_UpdateOldMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawOldMan(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x060005FC, 0x060009FC, 0x06000DFC }; + static u8 color1[] = { 0, 50, 100, 255 }; + static u8 color2[] = { 0, 50, 160, 255 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeletonCustomColor(this, globalCtx, eyeTexture, NULL, color1, color2, NULL, NULL); +} + +void DemoEc_InitBeardedMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06005EA8, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_BEARDED_MAN; + this->drawConfig = EC_DRAW_BEARDED_MAN; +} + +void DemoEc_UpdateBeardedMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawBeardedMan(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x0600057C, 0x0600067C, 0x0600077C }; + static u8 color1[] = { 255, 255, 255, 255 }; + static u8 color2[] = { 255, 255, 255, 255 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeletonCustomColor(this, globalCtx, eyeTexture, NULL, color1, color2, NULL, NULL); +} + +void DemoEc_InitWoman(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06005EA8, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_WOMAN; + this->drawConfig = EC_DRAW_WOMAN; +} + +void DemoEc_UpdateWoman(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawWoman(DemoEc* this, GlobalContext* globalCtx) { + static Gfx* eyeTextures[] = { 0x060007C8, 0x06000FC8, 0x060017C8 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitOldWoman(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06005EA8, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_OLD_WOMAN; + this->drawConfig = EC_DRAW_OLD_WOMAN; +} + +void DemoEc_UpdateOldWoman(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawOldWoman(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, &D_060004C8, NULL, NULL, NULL); +} + +void DemoEc_InitBossCarpenter(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06007150); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600164C, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_BOSS_CARPENTER; + this->drawConfig = EC_DRAW_BOSS_CARPENTER; +} + +void DemoEc_UpdateBossCarpenter(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawBossCarpenter(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, NULL, NULL, NULL, NULL); +} + +void DemoEc_InitCarpenter(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06007958); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600164C, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_CARPENTER; + this->drawConfig = EC_DRAW_CARPENTER; +} + +void DemoEc_UpdateCarpenter(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +s32 DemoEc_CarpenterOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx, Gfx** gfx) { + DemoEc* this = THIS; + + if (limbIndex == 1) { + gDPPipeSync((*gfx)++); + switch (this->actor.params) { + case 10: + gDPSetEnvColor((*gfx)++, 170, 10, 70, 255); + break; + case 11: + gDPSetEnvColor((*gfx)++, 170, 200, 255, 255); + break; + case 12: + gDPSetEnvColor((*gfx)++, 0, 230, 70, 255); + break; + case 13: + gDPSetEnvColor((*gfx)++, 200, 0, 150, 255); + break; + } + } + + return 0; +} + +Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) { + switch (this->actor.params) { + case 10: + return D_06005BD0; + case 11: + return D_06005AC0; + case 12: + return D_06005990; + case 13: + return D_06005880; + default: + osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); + return 0; + } +} + +void DemoEc_CarpenterPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, + Gfx** gfx) { + DemoEc* this = THIS; + Gfx* postLimbDList; + + if (limbIndex == 15) { + postLimbDList = DemoEc_GetCarpenterPostLimbDList(this); + gSPDisplayList((*gfx)++, SEGMENTED_TO_VIRTUAL(postLimbDList)); + } +} + +void DemoEc_DrawCarpenter(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, NULL, 0, DemoEc_CarpenterOverrideLimbDraw, DemoEc_CarpenterPostLimbDraw); +} + +void DemoEc_InitGerudo(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06000330); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06002254, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_GERUDO; + this->drawConfig = EC_DRAW_GERUDO; +} + +void DemoEc_UpdateGerudo(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) { + switch (this->actor.params) { + case 16: + return D_06009198; + case 17: + return D_06009430; + case 18: + return D_06009690; + default: + osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); + return NULL; + } +} + +void DemoEc_GerudoPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, + Gfx** gfx) { + DemoEc* this = THIS; + Gfx* postLimbDList; + + if (limbIndex == 15) { + postLimbDList = DemoEc_GetGerudoPostLimbDList(this); + gSPDisplayList((*gfx)++, SEGMENTED_TO_VIRTUAL(postLimbDList)); + } +} + +void DemoEc_DrawGerudo(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06000708, 0x06000F08, 0x06001708 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, DemoEc_GerudoPostLimbDraw); +} + +void DemoEc_InitDancingZora(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_0600BFA8); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600C918, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_DANCING_ZORA; + this->drawConfig = EC_DRAW_DANCING_ZORA; +} + +void DemoEc_UpdateDancingZora(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawDancingZora(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06003E40, 0x06004640, 0x06004E40 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitKingZora(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060086D0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06006C40, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_KING_ZORA; + this->drawConfig = EC_DRAW_KING_ZORA; + DemoEc_SetEyeTexIndex(this, 3); +} + +void func_8096F1D4(DemoEc* this) { + f32 currentFrame = this->skelAnime.animCurrentFrame; + + if (currentFrame <= 32.0f) { + DemoEc_SetEyeTexIndex(this, 3); + } else { + DemoEc_UpdateEyes(this); + } +} + +void func_8096F224(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06006930, 2, -8.0f, false); + this->updateMode = EC_UPDATE_17; +} + +void func_8096F26C(DemoEc* this, s32 arg1) { + if (arg1 != 0) { + DemoEc_ChangeAnimation(this, &D_06006220, 0, 0.0f, false); + this->updateMode = EC_UPDATE_18; + } +} + +void func_8096F2B0(DemoEc* this, GlobalContext* globalCtx, s32 arg2) { + CsCmdActorAction* npcAction; + s32 sp18; + + npcAction = DemoEc_GetNpcAction(globalCtx, arg2); + + if (npcAction != NULL) { + sp18 = npcAction->action; + if ((sp18 != this->npcAction)) { + if (this->npcAction) {} + if (sp18 == 2) { + func_8096F224(this, globalCtx); + } + this->npcAction = sp18; + } + } +} + +void DemoEc_UpdateKingZora(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_SetNpcActionPosRot(this, globalCtx, 6); + DemoEc_UpdateBgFlags(this, globalCtx); + func_8096F2B0(this, globalCtx, 6); +} + +void func_8096F378(DemoEc* this, GlobalContext* globalCtx) { + s32 animDone = DemoEc_UpdateSkelAnime(this); + + func_8096D594(this, globalCtx); + func_8096F1D4(this); + DemoEc_UpdateBgFlags(this, globalCtx); + func_8096F26C(this, animDone); +} + +void func_8096F3D4(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawKingZora(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06001470, 0x06001870, 0x06001C70, 0x06002070 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitMido(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06007FB8); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_060095DC, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_MIDO; + this->drawConfig = EC_DRAW_MIDO; + DemoEc_SetEyeTexIndex(this, 3); +} + +void func_8096F4FC(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06008D1C, 2, -8.0f, false); + this->updateMode = EC_UPDATE_20; +} + +void func_8096F544(DemoEc* this, s32 changeAnim) { + if (changeAnim) { + DemoEc_ChangeAnimation(this, &D_06009234, 0, 0.0f, false); + } +} + +void func_8096F578(DemoEc* this, GlobalContext* globalCtx, s32 arg2) { + CsCmdActorAction* npcAction; + s32 sp18; + npcAction = DemoEc_GetNpcAction(globalCtx, arg2); + if (npcAction != NULL) { + sp18 = npcAction->action; + if ((sp18 != this->npcAction)) { + if (this->npcAction) {} + if (sp18 == 2) { + func_8096F4FC(this, globalCtx); + } + this->npcAction = sp18; + } + } +} + +void DemoEc_UpdateMido(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_SetNpcActionPosRot(this, globalCtx, 7); + DemoEc_UpdateBgFlags(this, globalCtx); + func_8096F578(this, globalCtx, 7); +} + +void func_8096F640(DemoEc* this, GlobalContext* globalCtx) { + s32 animDone = DemoEc_UpdateSkelAnime(this); + + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); + func_8096F544(this, animDone); +} + +void DemoEc_DrawMido(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06004FF0, 0x06005930, 0x06005D30, 0x06006130 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitCucco(DemoEc* this, GlobalContext* globalCtx) { + AnimationHeader* animation; + + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06002530); + DemoEc_UseAnimationObject(this, globalCtx); + + if (this->actor.params == 22) { + animation = &D_06009BB4; + } else if (this->actor.params == 23) { + animation = &D_0600A07C; + } else { + animation = &D_0600A474; + } + + DemoEc_ChangeAnimation(this, animation, 0, 0.0f, false); + func_8096D64C(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_CUCCO; + this->drawConfig = EC_DRAW_CUCCO; +} + +void DemoEc_UpdateCucco(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawCucco(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, NULL, NULL, NULL, NULL); +} + +void DemoEc_InitCuccoLady(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06000CD8, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_CUCCO_LADY; + this->drawConfig = EC_DRAW_CUCCO_LADY; +} + +void DemoEc_UpdateCuccoLady(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawCuccoLady(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x060008C8, 0x060010C8, 0x060018C8 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitPotionShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06004258); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600AFE0, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_POTION_SHOP_OWNER; + this->drawConfig = EC_DRAW_POTION_SHOP_OWNER; +} + +void DemoEc_UpdatePotionShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawPotionShopOwner(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x060030D8, 0x060034D8, 0x060038D8 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitMaskShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06004658); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600AFE0, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_MASK_SHOP_OWNER; + this->drawConfig = EC_DRAW_MASK_SHOP_OWNER; +} + +void DemoEc_UpdateMaskShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawMaskShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_DrawSkeleton(this, globalCtx, &D_060035D8, NULL, NULL, NULL); +} + +void DemoEc_InitFishingMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_060085F8); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600AFE0, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_FISHING_MAN; + this->drawConfig = EC_DRAW_FISHING_MAN; +} + +void DemoEc_UpdateFishingMan(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_FishingManPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, + Gfx** gfx) { + DemoEc* this = THIS; + + if ((limbIndex == 8) && !(gSaveContext.unk_EC0 & 0x1000)) { + gSPDisplayList((*gfx)++, SEGMENTED_TO_VIRTUAL(D_060074C8)); + } +} + +void DemoEc_DrawFishingMan(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06009250, 0x06009650, 0x06009A50 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, DemoEc_FishingManPostLimbDraw); +} + +void DemoEc_InitBombchuShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06004868); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_0600AFE0, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_BOMBCHU_SHOP_OWNER; + this->drawConfig = EC_DRAW_BOMBCHU_SHOP_OWNER; +} + +void DempEc_UpdateBombchuShopOwner(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} +void DemoEc_DrawBombchuShopOwner(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06003968, 0x06003D68, 0x06004168 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, NULL, NULL, NULL); +} + +void DemoEc_InitGorons(DemoEc* this, GlobalContext* globalCtx) { + s32 pad[2]; + AnimationHeader* animation; + f32 goronScale; + Vec3f* scale = &this->actor.scale; + + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_0600FEF0); + DemoEc_UseAnimationObject(this, globalCtx); + + if (this->actor.params == 30) { + animation = &D_06002FA0; + goronScale = 1.0f; + } else if (this->actor.params == 31) { + animation = &D_06003A98; + goronScale = 1.0f; + } else if (this->actor.params == 32) { + animation = &D_06002FA0; + goronScale = 15.0f; + } else { + goronScale = 5.0f; + animation = &D_060002B8; + } + + DemoEc_ChangeAnimation(this, animation, 0, 0.0f, false); + + scale->x *= goronScale; + scale->y *= goronScale; + scale->z *= goronScale; + + func_8096D64C(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_GORON; + this->drawConfig = EC_DRAW_GORON; +} + +void DemoEc_UpdateGorons(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x0600CE80, 0x0600D280, 0x0600D680 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &D_0600DE80, NULL, NULL); +} + +void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UseDrawObject(this, globalCtx); + DemoEc_InitSkelAnime(this, globalCtx, &D_06008D90); + DemoEc_UseAnimationObject(this, globalCtx); + DemoEc_ChangeAnimation(this, &D_06009EE0, 0, 0.0f, false); + func_8096D5D4(this, globalCtx); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->updateMode = EC_UPDATE_MALON; + this->drawConfig = EC_DRAW_MALON; +} + +void DemoEc_UpdateMalon(DemoEc* this, GlobalContext* globalCtx) { + DemoEc_UpdateSkelAnime(this); + func_8096D594(this, globalCtx); + DemoEc_UpdateEyes(this); + DemoEc_UpdateBgFlags(this, globalCtx); +} + +void DemoEc_DrawMalon(DemoEc* this, GlobalContext* globalCtx) { + static void* eyeTextures[] = { 0x06002570, 0x06002C70, 0x06003070 }; + s32 eyeTexIndex = this->eyeTexIndex; + void* eyeTexture = eyeTextures[eyeTexIndex]; + + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &D_06003770, NULL, NULL); +} + +static DemoEcInitFunc sInitFuncs[] = { + DemoEc_InitIngo, + DemoEc_InitTalon, + DemoEc_InitWindmillMan, + DemoEc_InitKokiriBoy, + DemoEc_InitKokiriGirl, + DemoEc_InitOldMan, + DemoEc_InitBeardedMan, + DemoEc_InitWoman, + DemoEc_InitOldWoman, + DemoEc_InitBossCarpenter, + DemoEc_InitCarpenter, + DemoEc_InitCarpenter, + DemoEc_InitCarpenter, + DemoEc_InitCarpenter, + DemoEc_InitDancingKokiriBoy, + DemoEc_InitDancingKokiriGirl, + DemoEc_InitGerudo, + DemoEc_InitGerudo, + DemoEc_InitGerudo, + DemoEc_InitDancingZora, + DemoEc_InitKingZora, + DemoEc_InitMido, + DemoEc_InitCucco, + DemoEc_InitCucco, + DemoEc_InitCucco, + DemoEc_InitCuccoLady, + DemoEc_InitPotionShopOwner, + DemoEc_InitMaskShopOwner, + DemoEc_InitFishingMan, + DemoEc_InitBombchuShopOwner, + DemoEc_InitGorons, + DemoEc_InitGorons, + DemoEc_InitGorons, + DemoEc_InitGorons, + DemoEc_InitMalon, +}; + +void DemoEc_InitNpc(DemoEc* this, GlobalContext* globalCtx) { + s16 type = this->actor.params; + + if (sInitFuncs[type] == NULL) { + // Demo_Ec_main_init: Initialization process is wrong arg_data + osSyncPrintf(VT_FGCOL(RED) " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, type); + Actor_Kill(&this->actor); + return; + } + + sInitFuncs[type](this, globalCtx); +} + +void DemoEc_InitCommon(DemoEc* this, GlobalContext* globalCtx) { + s32 pad; + s16 primary; + s32 type; + s16 pad2; + s16 sp28; + s32 primaryBankIndex; + s32 secondaryBankIndex; + + type = this->actor.params; + primary = sDrawObjects[type]; + sp28 = sAnimationObjects[type]; + primaryBankIndex = Object_GetIndex(&globalCtx->objectCtx, primary); + secondaryBankIndex = Object_GetIndex(&globalCtx->objectCtx, sp28); + + if ((secondaryBankIndex < 0) || (primaryBankIndex < 0)) { + // Demo_Ec_main_bank: Bank unreadable arg_data =% + osSyncPrintf(VT_FGCOL(RED) "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, type); + Actor_Kill(&this->actor); + return; + } + + if (Object_IsLoaded(&globalCtx->objectCtx, primaryBankIndex) && + Object_IsLoaded(&globalCtx->objectCtx, secondaryBankIndex)) { + + this->drawObjBankIndex = primaryBankIndex; + this->animObjBankIndex = secondaryBankIndex; + + DemoEc_InitNpc(this, globalCtx); + } +} + +static DemoEcUpdateFunc sUpdateFuncs[] = { + DemoEc_InitCommon, + DemoEc_UpdateIngo, + DemoEc_UpdateTalon, + DemoEc_UpdateWindmillMan, + DemoEc_UpdateKokiriBoy, + DemoEc_UpdateKokiriGirl, + DemoEc_UpdateOldMan, + DemoEc_UpdateBeardedMan, + DemoEc_UpdateWoman, + DemoEc_UpdateOldWoman, + DemoEc_UpdateBossCarpenter, + DemoEc_UpdateCarpenter, + DemoEc_UpdateDancingKokiriBoy, + DemoEc_UpdateDancingKokiriGirl, + DemoEc_UpdateGerudo, + DemoEc_UpdateDancingZora, + DemoEc_UpdateKingZora, + func_8096F378, + func_8096F3D4, + DemoEc_UpdateMido, + func_8096F640, + DemoEc_UpdateCucco, + DemoEc_UpdateCuccoLady, + DemoEc_UpdatePotionShopOwner, + DemoEc_UpdateMaskShopOwner, + DemoEc_UpdateFishingMan, + DempEc_UpdateBombchuShopOwner, + DemoEc_UpdateGorons, + DemoEc_UpdateMalon, +}; + +void DemoEc_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoEc* this = THIS; + s32 updateMode = this->updateMode; + + if ((updateMode < 0) || (updateMode >= ARRAY_COUNT(sUpdateFuncs)) || sUpdateFuncs[updateMode] == NULL) { + // The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!! + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + if (updateMode != EC_UPDATE_COMMON) { + DemoEc_UseAnimationObject(this, globalCtx); + } + sUpdateFuncs[updateMode](this, globalCtx); + } +} + +void DemoEc_DrawCommon(DemoEc* this, GlobalContext* globalCtx) { +} + +static DemoEcDrawFunc sDrawFuncs[] = { + DemoEc_DrawCommon, DemoEc_DrawIngo, + DemoEc_DrawTalon, DemoEc_DrawWindmillMan, + DemoEc_DrawKokiriBoy, DemoEc_DrawKokiriGirl, + DemoEc_DrawOldMan, DemoEc_DrawBeardedMan, + DemoEc_DrawWoman, DemoEc_DrawOldWoman, + DemoEc_DrawBossCarpenter, DemoEc_DrawCarpenter, + DemoEc_DrawGerudo, DemoEc_DrawDancingZora, + DemoEc_DrawKingZora, DemoEc_DrawMido, + DemoEc_DrawCucco, DemoEc_DrawCuccoLady, + DemoEc_DrawPotionShopOwner, DemoEc_DrawMaskShopOwner, + DemoEc_DrawFishingMan, DemoEc_DrawBombchuShopOwner, + DemoEc_DrawGorons, DemoEc_DrawMalon, +}; + +void DemoEc_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoEc* this = THIS; + s32 drawConfig = this->drawConfig; + + if ((drawConfig < 0) || (drawConfig >= ARRAY_COUNT(sDrawFuncs)) || sDrawFuncs[drawConfig] == NULL) { + // The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!! + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + if (drawConfig != EC_DRAW_COMMON) { + DemoEc_UseDrawObject(this, globalCtx); + } + sDrawFuncs[drawConfig](this, globalCtx); + } +} + const ActorInit Demo_Ec_InitVars = { ACTOR_DEMO_EC, ACTORTYPE_NPC, @@ -21,227 +1341,3 @@ const ActorInit Demo_Ec_InitVars = { (ActorFunc)DemoEc_Update, (ActorFunc)DemoEc_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D52C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D54C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D68C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D858.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DDF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DE94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DF9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E070.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E0A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E13C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E178.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E1AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E244.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E2E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E31C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E33C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E380.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E418.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E4F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E518.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E56C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E604.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E648.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E69C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E734.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E778.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E7CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E864.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E8E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E97C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096E9E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EA80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EABC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EAE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EB80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EBBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ECBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096ED40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EDFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EE98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EEDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EF4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096EFCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F010.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F0F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F12C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F1D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F26C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F2B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F314.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F378.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F3D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F418.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F454.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F4FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F578.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F5DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F640.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F69C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F6D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F7DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F808.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F8E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F924.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096F9C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FA40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FADC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FB48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FBE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FC28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FCEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FD88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FDCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FE08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FF7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096FFBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970058.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8097009C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809700DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_80970140.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_809702B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Draw.s") diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h index ed55c4db7e..c35cad94d7 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h @@ -6,9 +6,20 @@ struct DemoEc; +typedef void (*DemoEcInitFunc)(struct DemoEc*, GlobalContext*); +typedef void (*DemoEcUpdateFunc)(struct DemoEc*, GlobalContext*); +typedef void (*DemoEcDrawFunc)(struct DemoEc*, GlobalContext*); + typedef struct DemoEc { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x5C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 eyeTexIndex; + /* 0x0192 */ s16 blinkTimer; + /* 0x0194 */ s32 updateMode; + /* 0x0198 */ s32 drawConfig; + /* 0x019C */ s32 npcAction; + /* 0x01A0 */ s32 drawObjBankIndex; + /* 0x01A4 */ s32 animObjBankIndex; } DemoEc; // size = 0x01A8 extern const ActorInit Demo_Ec_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index df850c671d..cb61b19465 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -695,6 +695,70 @@ D_060135EC = 0x060135EC; D_06013CD8 = 0x06013CD8; D_060140BC = 0x060140BC; +// z_demo_ec +D_06013B88 = 0x06013B88; +D_060048F4 = 0x060048F4; +D_0600BD38 = 0x0600BD38; +D_0600B7B8 = 0x0600B7B8; +D_06006C90 = 0x06006C90; +D_0600196C = 0x0600196C; +D_060000F0 = 0x060000F0; +D_06005670 = 0x06005670; +D_06005EA8 = 0x06005EA8; +D_06007150 = 0x06007150; +D_0600164C = 0x0600164C; +D_06007958 = 0x06007958; +D_0600164C = 0x0600164C; +D_0600513C = 0x0600513C; +D_06000330 = 0x06000330; +D_06002254 = 0x06002254; +D_0600BFA8 = 0x0600BFA8; +D_0600C918 = 0x0600C918; +D_060086D0 = 0x060086D0; +D_06006C40 = 0x06006C40; +D_06007FB8 = 0x06007FB8; +D_060095DC = 0x060095DC; +D_06002530 = 0x06002530; +D_06009BB4 = 0x06009BB4; +D_0600A07C = 0x0600A07C; +D_0600A474 = 0x0600A474; +D_06000CD8 = 0x06000CD8; +D_06004258 = 0x06004258; +D_0600AFE0 = 0x0600AFE0; +D_06004658 = 0x06004658; +D_0600AFE0 = 0x0600AFE0; +D_060085F8 = 0x060085F8; +D_06004868 = 0x06004868; +D_0600FEF0 = 0x0600FEF0; +D_06002FA0 = 0x06002FA0; +D_06003A98 = 0x06003A98; +D_06002FA0 = 0x06002FA0; +D_060002B8 = 0x060002B8; +D_06008D90 = 0x06008D90; +D_06009EE0 = 0x06009EE0; +D_06006930 = 0x06006930; +D_06006220 = 0x06006220; +D_06008D1C = 0x06008D1C; +D_06009234 = 0x06009234; +D_06004390 = 0x06004390; +D_06004350 = 0x06004350; +D_060076C0 = 0x060076C0; +D_06007AC0 = 0x06007AC0; +D_06005F20 = 0x06005F20; +D_06006920 = 0x06006920; +D_060004C8 = 0x060004C8; +D_06005BD0 = 0x06005BD0; +D_06005AC0 = 0x06005AC0; +D_06005990 = 0x06005990; +D_06005880 = 0x06005880; +D_06009198 = 0x06009198; +D_06009430 = 0x06009430; +D_06009690 = 0x06009690; +D_060035D8 = 0x060035D8; +D_060074C8 = 0x060074C8; +D_0600DE80 = 0x0600DE80; +D_06003770 = 0x06003770; + // z_en_test D_0600316C = 0x0600316C; D_06007C28 = 0x06007C28; @@ -2642,25 +2706,6 @@ D_0600CD50 = 0x0600CD50; D_0600CF28 = 0x0600CF28; D_0600E3D8 = 0x0600E3D8; -// z_en_test -D_06000444 = 0x06000444; -D_06001420 = 0x06001420; -D_06001978 = 0x06001978; -D_06001C20 = 0x06001C20; -D_060026D4 = 0x060026D4; -D_0600316C = 0x0600316C; -D_06007C28 = 0x06007C28; -D_060081B4 = 0x060081B4; -D_06008604 = 0x06008604; -D_06009A90 = 0x06009A90; -D_0600A324 = 0x0600A324; -D_0600A99C = 0x0600A99C; -D_0600B00C = 0x0600B00C; -D_0600B4E4 = 0x0600B4E4; -D_0600BE4C = 0x0600BE4C; -D_0600C438 = 0x0600C438; -D_0600E2B0 = 0x0600E2B0; - // z_en_tg D_06005040 = 0x06005040; D_0600AE40 = 0x0600AE40;