diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s deleted file mode 100644 index 14109f00dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel DemoDu_Destroy -/* 00000 80969AD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80969AD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80969AD8 0C0295BC */ jal SkelAnime_Free -/* 0000C 80969ADC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80969AE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 80969AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80969AE8 03E00008 */ jr $ra -/* 0001C 80969AEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s deleted file mode 100644 index 982bb7e311..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata -glabel D_8096D0B0 - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoDu_Draw -/* 02668 8096C138 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0266C 8096C13C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02670 8096C140 8C82019C */ lw $v0, 0x019C($a0) ## 0000019C -/* 02674 8096C144 04400008 */ bltz $v0, .L8096C168 -/* 02678 8096C148 28410003 */ slti $at, $v0, 0x0003 -/* 0267C 8096C14C 10200006 */ beq $at, $zero, .L8096C168 -/* 02680 8096C150 00027080 */ sll $t6, $v0, 2 -/* 02684 8096C154 3C038097 */ lui $v1, %hi(D_8096CFA4) ## $v1 = 80970000 -/* 02688 8096C158 006E1821 */ addu $v1, $v1, $t6 -/* 0268C 8096C15C 8C63CFA4 */ lw $v1, %lo(D_8096CFA4)($v1) -/* 02690 8096C160 14600006 */ bne $v1, $zero, .L8096C17C -/* 02694 8096C164 00000000 */ nop -.L8096C168: -/* 02698 8096C168 3C048097 */ lui $a0, %hi(D_8096D0B0) ## $a0 = 80970000 -/* 0269C 8096C16C 0C00084C */ jal osSyncPrintf - -/* 026A0 8096C170 2484D0B0 */ addiu $a0, $a0, %lo(D_8096D0B0) ## $a0 = 8096D0B0 -/* 026A4 8096C174 10000004 */ beq $zero, $zero, .L8096C188 -/* 026A8 8096C178 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096C17C: -/* 026AC 8096C17C 0060F809 */ jalr $ra, $v1 -/* 026B0 8096C180 00000000 */ nop -/* 026B4 8096C184 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096C188: -/* 026B8 8096C188 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 026BC 8096C18C 03E00008 */ jr $ra -/* 026C0 8096C190 00000000 */ nop -/* 026C4 8096C194 00000000 */ nop -/* 026C8 8096C198 00000000 */ nop -/* 026CC 8096C19C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s deleted file mode 100644 index f0bac4d3c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel DemoDu_Init -/* 023E0 8096BEB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 023E4 8096BEB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 023E8 8096BEB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023EC 8096BEBC AFBF001C */ sw $ra, 0x001C($sp) -/* 023F0 8096BEC0 AFA50024 */ sw $a1, 0x0024($sp) -/* 023F4 8096BEC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 023F8 8096BEC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 023FC 8096BECC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02400 8096BED0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 02404 8096BED4 0C00AC78 */ jal ActorShape_Init - -/* 02408 8096BED8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0240C 8096BEDC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 02410 8096BEE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02414 8096BEE4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02418 8096BEE8 10410007 */ beq $v0, $at, .L8096BF08 -/* 0241C 8096BEEC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02420 8096BEF0 10410009 */ beq $v0, $at, .L8096BF18 -/* 02424 8096BEF4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02428 8096BEF8 1041000B */ beq $v0, $at, .L8096BF28 -/* 0242C 8096BEFC 00000000 */ nop -/* 02430 8096BF00 1000000D */ beq $zero, $zero, .L8096BF38 -/* 02434 8096BF04 00000000 */ nop -.L8096BF08: -/* 02438 8096BF08 0C25A8D8 */ jal func_8096A360 -/* 0243C 8096BF0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02440 8096BF10 1000000C */ beq $zero, $zero, .L8096BF44 -/* 02444 8096BF14 8FBF001C */ lw $ra, 0x001C($sp) -.L8096BF18: -/* 02448 8096BF18 0C25ACF9 */ jal func_8096B3E4 -/* 0244C 8096BF1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02450 8096BF20 10000008 */ beq $zero, $zero, .L8096BF44 -/* 02454 8096BF24 8FBF001C */ lw $ra, 0x001C($sp) -.L8096BF28: -/* 02458 8096BF28 0C25AE8B */ jal func_8096BA2C -/* 0245C 8096BF2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02460 8096BF30 10000004 */ beq $zero, $zero, .L8096BF44 -/* 02464 8096BF34 8FBF001C */ lw $ra, 0x001C($sp) -.L8096BF38: -/* 02468 8096BF38 0C25A79B */ jal func_80969E6C -/* 0246C 8096BF3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02470 8096BF40 8FBF001C */ lw $ra, 0x001C($sp) -.L8096BF44: -/* 02474 8096BF44 8FB00018 */ lw $s0, 0x0018($sp) -/* 02478 8096BF48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0247C 8096BF4C 03E00008 */ jr $ra -/* 02480 8096BF50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s deleted file mode 100644 index 6f3a5757d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_8096D054 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoDu_Update -/* 02384 8096BE54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02388 8096BE58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0238C 8096BE5C 8C820198 */ lw $v0, 0x0198($a0) ## 00000198 -/* 02390 8096BE60 04400008 */ bltz $v0, .L8096BE84 -/* 02394 8096BE64 2841001D */ slti $at, $v0, 0x001D -/* 02398 8096BE68 10200006 */ beq $at, $zero, .L8096BE84 -/* 0239C 8096BE6C 00027080 */ sll $t6, $v0, 2 -/* 023A0 8096BE70 3C038097 */ lui $v1, %hi(D_8096CF30) ## $v1 = 80970000 -/* 023A4 8096BE74 006E1821 */ addu $v1, $v1, $t6 -/* 023A8 8096BE78 8C63CF30 */ lw $v1, %lo(D_8096CF30)($v1) -/* 023AC 8096BE7C 14600006 */ bne $v1, $zero, .L8096BE98 -/* 023B0 8096BE80 00000000 */ nop -.L8096BE84: -/* 023B4 8096BE84 3C048097 */ lui $a0, %hi(D_8096D054) ## $a0 = 80970000 -/* 023B8 8096BE88 0C00084C */ jal osSyncPrintf - -/* 023BC 8096BE8C 2484D054 */ addiu $a0, $a0, %lo(D_8096D054) ## $a0 = 8096D054 -/* 023C0 8096BE90 10000004 */ beq $zero, $zero, .L8096BEA4 -/* 023C4 8096BE94 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096BE98: -/* 023C8 8096BE98 0060F809 */ jalr $ra, $v1 -/* 023CC 8096BE9C 00000000 */ nop -/* 023D0 8096BEA0 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096BEA4: -/* 023D4 8096BEA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023D8 8096BEA8 03E00008 */ jr $ra -/* 023DC 8096BEAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s deleted file mode 100644 index c153063560..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80969AF0 -/* 00020 80969AF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00024 80969AF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 80969AF8 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 80969AFC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 80969B00 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 80969B04 15C00003 */ bne $t6, $zero, .L80969B14 -/* 00038 80969B08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 80969B0C 10000005 */ beq $zero, $zero, .L80969B24 -/* 00040 80969B10 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L80969B14: -/* 00044 80969B14 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 80969B18 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 80969B1C A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 80969B20 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L80969B24: -/* 00054 80969B24 14400008 */ bne $v0, $zero, .L80969B48 -/* 00058 80969B28 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 80969B2C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 80969B30 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 80969B34 0C01DF64 */ jal Rand_S16Offset - -/* 00068 80969B38 AFA60038 */ sw $a2, 0x0038($sp) -/* 0006C 80969B3C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 80969B40 8FA60038 */ lw $a2, 0x0038($sp) -/* 00074 80969B44 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80969B48: -/* 00078 80969B48 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 80969B4C 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 80969B50 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 80969B54 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00088 80969B58 29010003 */ slti $at, $t0, 0x0003 -/* 0008C 80969B5C 54200003 */ bnel $at, $zero, .L80969B6C -/* 00090 80969B60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00094 80969B64 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 80969B68 8FBF0014 */ lw $ra, 0x0014($sp) -.L80969B6C: -/* 0009C 80969B6C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A0 80969B70 03E00008 */ jr $ra -/* 000A4 80969B74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s deleted file mode 100644 index 1ad3f2a74a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80969B78 -/* 000A8 80969B78 AFA50004 */ sw $a1, 0x0004($sp) -/* 000AC 80969B7C 00052C00 */ sll $a1, $a1, 16 -/* 000B0 80969B80 00052C03 */ sra $a1, $a1, 16 -/* 000B4 80969B84 03E00008 */ jr $ra -/* 000B8 80969B88 A4850190 */ sh $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s deleted file mode 100644 index 73e8e1c998..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80969B8C -/* 000BC 80969B8C AFA50004 */ sw $a1, 0x0004($sp) -/* 000C0 80969B90 00052C00 */ sll $a1, $a1, 16 -/* 000C4 80969B94 00052C03 */ sra $a1, $a1, 16 -/* 000C8 80969B98 03E00008 */ jr $ra -/* 000CC 80969B9C A4850194 */ sh $a1, 0x0194($a0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s deleted file mode 100644 index dd3980f0e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80969BA0 -/* 000D0 80969BA0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 000D4 80969BA4 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 000D8 80969BA8 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 000DC 80969BAC AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 000E0 80969BB0 AC8001A8 */ sw $zero, 0x01A8($a0) ## 000001A8 -/* 000E4 80969BB4 AC8001AC */ sw $zero, 0x01AC($a0) ## 000001AC -/* 000E8 80969BB8 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 000EC 80969BBC 03E00008 */ jr $ra -/* 000F0 80969BC0 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s deleted file mode 100644 index 765e423942..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80969BC4 -/* 000F4 80969BC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F8 80969BC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000FC 80969BCC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00100 80969BD0 3C0F8097 */ lui $t7, %hi(D_8096CE94) ## $t7 = 80970000 -/* 00104 80969BD4 3C198097 */ lui $t9, %hi(D_8096CE94) ## $t9 = 80970000 -/* 00108 80969BD8 15C0000D */ bne $t6, $zero, .L80969C10 -/* 0010C 80969BDC 00000000 */ nop -/* 00110 80969BE0 8DEFCE94 */ lw $t7, %lo(D_8096CE94)($t7) -/* 00114 80969BE4 51E00011 */ beql $t7, $zero, .L80969C2C -/* 00118 80969BE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0011C 80969BEC 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00120 80969BF0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00124 80969BF4 17010003 */ bne $t8, $at, .L80969C04 -/* 00128 80969BF8 00000000 */ nop -/* 0012C 80969BFC 0C25A6E8 */ jal func_80969BA0 -/* 00130 80969C00 00000000 */ nop -.L80969C04: -/* 00134 80969C04 3C018097 */ lui $at, %hi(D_8096CE94) ## $at = 80970000 -/* 00138 80969C08 10000007 */ beq $zero, $zero, .L80969C28 -/* 0013C 80969C0C AC20CE94 */ sw $zero, %lo(D_8096CE94)($at) -.L80969C10: -/* 00140 80969C10 8F39CE94 */ lw $t9, %lo(D_8096CE94)($t9) -/* 00144 80969C14 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00148 80969C18 3C018097 */ lui $at, %hi(D_8096CE94) ## $at = 80970000 -/* 0014C 80969C1C 57200003 */ bnel $t9, $zero, .L80969C2C -/* 00150 80969C20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00154 80969C24 AC28CE94 */ sw $t0, %lo(D_8096CE94)($at) -.L80969C28: -/* 00158 80969C28 8FBF0014 */ lw $ra, 0x0014($sp) -.L80969C2C: -/* 0015C 80969C2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00160 80969C30 03E00008 */ jr $ra -/* 00164 80969C34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s deleted file mode 100644 index 0fe9f3236f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80969C38 -/* 00168 80969C38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0016C 80969C3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00170 80969C40 0C02927F */ jal SkelAnime_Update - -/* 00174 80969C44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00178 80969C48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0017C 80969C4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00180 80969C50 03E00008 */ jr $ra -/* 00184 80969C54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s deleted file mode 100644 index 302c8b3a50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80969C58 -/* 00188 80969C58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0018C 80969C5C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00190 80969C60 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00194 80969C64 AFA50024 */ sw $a1, 0x0024($sp) -/* 00198 80969C68 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0019C 80969C6C AFBF001C */ sw $ra, 0x001C($sp) -/* 001A0 80969C70 AFA40020 */ sw $a0, 0x0020($sp) -/* 001A4 80969C74 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 001A8 80969C78 44070000 */ mfc1 $a3, $f0 -/* 001AC 80969C7C AFAE0014 */ sw $t6, 0x0014($sp) -/* 001B0 80969C80 8FA40024 */ lw $a0, 0x0024($sp) -/* 001B4 80969C84 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 001B8 80969C88 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 001BC 80969C8C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001C0 80969C90 8FBF001C */ lw $ra, 0x001C($sp) -/* 001C4 80969C94 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001C8 80969C98 03E00008 */ jr $ra -/* 001CC 80969C9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s deleted file mode 100644 index d6fc256992..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80969CA0 -/* 001D0 80969CA0 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 001D4 80969CA4 00057880 */ sll $t7, $a1, 2 -/* 001D8 80969CA8 008FC021 */ addu $t8, $a0, $t7 -/* 001DC 80969CAC 11C00003 */ beq $t6, $zero, .L80969CBC -/* 001E0 80969CB0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001E4 80969CB4 03E00008 */ jr $ra -/* 001E8 80969CB8 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80969CBC: -/* 001EC 80969CBC 03E00008 */ jr $ra -/* 001F0 80969CC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s deleted file mode 100644 index 473cae8fcc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80969CC4 -/* 001F4 80969CC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F8 80969CC8 AFA40018 */ sw $a0, 0x0018($sp) -/* 001FC 80969CCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00200 80969CD0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00204 80969CD4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00208 80969CD8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0020C 80969CDC 0C25A728 */ jal func_80969CA0 -/* 00210 80969CE0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00214 80969CE4 10400007 */ beq $v0, $zero, .L80969D04 -/* 00218 80969CE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0021C 80969CEC 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00220 80969CF0 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00224 80969CF4 55CF0004 */ bnel $t6, $t7, .L80969D08 -/* 00228 80969CF8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0022C 80969CFC 10000002 */ beq $zero, $zero, .L80969D08 -/* 00230 80969D00 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80969D04: -/* 00234 80969D04 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80969D08: -/* 00238 80969D08 03E00008 */ jr $ra -/* 0023C 80969D0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s deleted file mode 100644 index e934e10c79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80969D10 -/* 00240 80969D10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00244 80969D14 AFA40018 */ sw $a0, 0x0018($sp) -/* 00248 80969D18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0024C 80969D1C AFA5001C */ sw $a1, 0x001C($sp) -/* 00250 80969D20 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00254 80969D24 AFA60020 */ sw $a2, 0x0020($sp) -/* 00258 80969D28 0C25A728 */ jal func_80969CA0 -/* 0025C 80969D2C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00260 80969D30 10400007 */ beq $v0, $zero, .L80969D50 -/* 00264 80969D34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00268 80969D38 97AE0022 */ lhu $t6, 0x0022($sp) -/* 0026C 80969D3C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00270 80969D40 51CF0004 */ beql $t6, $t7, .L80969D54 -/* 00274 80969D44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00278 80969D48 10000002 */ beq $zero, $zero, .L80969D54 -/* 0027C 80969D4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80969D50: -/* 00280 80969D50 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80969D54: -/* 00284 80969D54 03E00008 */ jr $ra -/* 00288 80969D58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s deleted file mode 100644 index bf18b32ab5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80969D5C -/* 0028C 80969D5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00290 80969D60 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00294 80969D64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00298 80969D68 AFA5001C */ sw $a1, 0x001C($sp) -/* 0029C 80969D6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A0 80969D70 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 002A4 80969D74 0C25A728 */ jal func_80969CA0 -/* 002A8 80969D78 AFA70018 */ sw $a3, 0x0018($sp) -/* 002AC 80969D7C 10400013 */ beq $v0, $zero, .L80969DCC -/* 002B0 80969D80 8FA70018 */ lw $a3, 0x0018($sp) -/* 002B4 80969D84 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 002B8 80969D88 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 002BC 80969D8C 00000000 */ nop -/* 002C0 80969D90 468021A0 */ cvt.s.w $f6, $f4 -/* 002C4 80969D94 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 002C8 80969D98 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 002CC 80969D9C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 002D0 80969DA0 00000000 */ nop -/* 002D4 80969DA4 468042A0 */ cvt.s.w $f10, $f8 -/* 002D8 80969DA8 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 002DC 80969DAC 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 002E0 80969DB0 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 002E4 80969DB4 00000000 */ nop -/* 002E8 80969DB8 468084A0 */ cvt.s.w $f18, $f16 -/* 002EC 80969DBC E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 002F0 80969DC0 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 002F4 80969DC4 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 002F8 80969DC8 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80969DCC: -/* 002FC 80969DCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00300 80969DD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00304 80969DD4 03E00008 */ jr $ra -/* 00308 80969DD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s deleted file mode 100644 index 266ed3082a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80969DDC -/* 0030C 80969DDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00310 80969DE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00314 80969DE4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00318 80969DE8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0031C 80969DEC AFA60030 */ sw $a2, 0x0030($sp) -/* 00320 80969DF0 AFA70034 */ sw $a3, 0x0034($sp) -/* 00324 80969DF4 0C028800 */ jal Animation_GetLastFrame - -/* 00328 80969DF8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 80969DFC 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00330 80969E00 8FA40028 */ lw $a0, 0x0028($sp) -/* 00334 80969E04 8FA5002C */ lw $a1, 0x002C($sp) -/* 00338 80969E08 15C00007 */ bne $t6, $zero, .L80969E28 -/* 0033C 80969E0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00340 80969E10 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00344 80969E14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00348 80969E18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0034C 80969E1C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00350 80969E20 10000006 */ beq $zero, $zero, .L80969E3C -/* 00354 80969E24 468020A0 */ cvt.s.w $f2, $f4 -.L80969E28: -/* 00358 80969E28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0035C 80969E2C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00360 80969E30 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00364 80969E34 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00368 80969E38 46803020 */ cvt.s.w $f0, $f6 -.L80969E3C: -/* 0036C 80969E3C 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00370 80969E40 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00374 80969E44 44066000 */ mfc1 $a2, $f12 -/* 00378 80969E48 44070000 */ mfc1 $a3, $f0 -/* 0037C 80969E4C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 80969E50 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00384 80969E54 0C029468 */ jal Animation_Change - -/* 00388 80969E58 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0038C 80969E5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00390 80969E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00394 80969E64 03E00008 */ jr $ra -/* 00398 80969E68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s deleted file mode 100644 index 5db61ecadf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s +++ /dev/null @@ -1,34 +0,0 @@ -.late_rodata -glabel D_8096D0E8 - .word 0xC61C4000 - -.text -glabel func_80969E6C -/* 0039C 80969E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 80969E70 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 80969E74 AFA5002C */ sw $a1, 0x002C($sp) -/* 003A8 80969E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 80969E7C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 80969E80 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B4 80969E84 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 -/* 003B8 80969E88 3C070600 */ lui $a3, %hi(D_06006EB0) ## $a3 = 06000000 -/* 003BC 80969E8C 24E76EB0 */ addiu $a3, $a3, %lo(D_06006EB0) ## $a3 = 06006EB0 -/* 003C0 80969E90 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 -/* 003C4 80969E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 80969E98 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 80969E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 80969EA0 0C0291BE */ jal SkelAnime_InitFlex -/* 003D4 80969EA4 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 003D8 80969EA8 3C018097 */ lui $at, %hi(D_8096D0E8) ## $at = 80970000 -/* 003DC 80969EAC 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 80969EB0 C424D0E8 */ lwc1 $f4, %lo(D_8096D0E8)($at) -/* 003E4 80969EB4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 80969EB8 0C25A6DE */ jal func_80969B78 -/* 003EC 80969EBC E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 80969EC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 80969EC4 0C25A6E3 */ jal func_80969B8C -/* 003F8 80969EC8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003FC 80969ECC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00400 80969ED0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 80969ED4 03E00008 */ jr $ra -/* 00408 80969ED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s deleted file mode 100644 index 44cb7c03b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80969EDC -/* 0040C 80969EDC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00410 80969EE0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00414 80969EE4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00418 80969EE8 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 0041C 80969EEC C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 00420 80969EF0 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 00424 80969EF4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00428 80969EF8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0042C 80969EFC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00430 80969F00 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00434 80969F04 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00438 80969F08 AFA00024 */ sw $zero, 0x0024($sp) -/* 0043C 80969F0C AFA00020 */ sw $zero, 0x0020($sp) -/* 00440 80969F10 AFA0001C */ sw $zero, 0x001C($sp) -/* 00444 80969F14 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 00448 80969F18 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0044C 80969F1C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00450 80969F20 0C00C916 */ jal Actor_SpawnAsChild - -/* 00454 80969F24 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00458 80969F28 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0045C 80969F2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00460 80969F30 03E00008 */ jr $ra -/* 00464 80969F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s deleted file mode 100644 index 295793ef50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80969F38 -/* 00468 80969F38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0046C 80969F3C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00470 80969F40 AFA40038 */ sw $a0, 0x0038($sp) -/* 00474 80969F44 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00478 80969F48 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 0047C 80969F4C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00480 80969F50 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 00484 80969F54 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00488 80969F58 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0048C 80969F5C C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00490 80969F60 46062080 */ add.s $f2, $f4, $f6 -/* 00494 80969F64 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00498 80969F68 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 0049C 80969F6C AFAE0028 */ sw $t6, 0x0028($sp) -/* 004A0 80969F70 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 004A4 80969F74 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 004A8 80969F78 AFA6003C */ sw $a2, 0x003C($sp) -/* 004AC 80969F7C AFA00024 */ sw $zero, 0x0024($sp) -/* 004B0 80969F80 AFA00020 */ sw $zero, 0x0020($sp) -/* 004B4 80969F84 AFA0001C */ sw $zero, 0x001C($sp) -/* 004B8 80969F88 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 004BC 80969F8C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004C0 80969F90 0C00C916 */ jal Actor_SpawnAsChild - -/* 004C4 80969F94 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 004C8 80969F98 8FA4003C */ lw $a0, 0x003C($sp) -/* 004CC 80969F9C 0C021344 */ jal Item_Give -/* 004D0 80969FA0 24050067 */ addiu $a1, $zero, 0x0067 ## $a1 = 00000067 -/* 004D4 80969FA4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004D8 80969FA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004DC 80969FAC 03E00008 */ jr $ra -/* 004E0 80969FB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s deleted file mode 100644 index 08687a2b14..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_8096D0EC - .word 0x42A6AAAB - -.text -glabel func_80969FB4 -/* 004E4 80969FB4 AFA50004 */ sw $a1, 0x0004($sp) -/* 004E8 80969FB8 3C018097 */ lui $at, %hi(D_8096D0EC) ## $at = 80970000 -/* 004EC 80969FBC C426D0EC */ lwc1 $f6, %lo(D_8096D0EC)($at) -/* 004F0 80969FC0 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 004F4 80969FC4 46062200 */ add.s $f8, $f4, $f6 -/* 004F8 80969FC8 03E00008 */ jr $ra -/* 004FC 80969FCC E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s deleted file mode 100644 index 11f3988d18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80969FD0 -/* 00500 80969FD0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00504 80969FD4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00508 80969FD8 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 0050C 80969FDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00510 80969FE0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00514 80969FE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00518 80969FE8 14EE0018 */ bne $a3, $t6, .L8096A04C -/* 0051C 80969FEC AFA40028 */ sw $a0, 0x0028($sp) -/* 00520 80969FF0 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00524 80969FF4 3C198097 */ lui $t9, %hi(D_8096C1A4) ## $t9 = 80970000 -/* 00528 80969FF8 2739C1A4 */ addiu $t9, $t9, %lo(D_8096C1A4) ## $t9 = 8096C1A4 -/* 0052C 80969FFC 29E10004 */ slti $at, $t7, 0x0004 -/* 00530 8096A000 10200012 */ beq $at, $zero, .L8096A04C -/* 00534 8096A004 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00538 8096A008 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 0053C 8096A00C AC870198 */ sw $a3, 0x0198($a0) ## 00000198 -/* 00540 8096A010 ACB91D68 */ sw $t9, 0x1D68($a1) ## 00001D68 -/* 00544 8096A014 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00548 8096A018 A0481414 */ sb $t0, 0x1414($v0) ## 8015FA74 -/* 0054C 8096A01C 24050067 */ addiu $a1, $zero, 0x0067 ## $a1 = 00000067 -/* 00550 8096A020 0C021344 */ jal Item_Give -/* 00554 8096A024 AFA3001C */ sw $v1, 0x001C($sp) -/* 00558 8096A028 8FA90028 */ lw $t1, 0x0028($sp) -/* 0055C 8096A02C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00560 8096A030 8FA3001C */ lw $v1, 0x001C($sp) -/* 00564 8096A034 85220032 */ lh $v0, 0x0032($t1) ## 00000032 -/* 00568 8096A038 00411021 */ addu $v0, $v0, $at -/* 0056C 8096A03C 00021400 */ sll $v0, $v0, 16 -/* 00570 8096A040 00021403 */ sra $v0, $v0, 16 -/* 00574 8096A044 A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 00578 8096A048 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L8096A04C: -/* 0057C 8096A04C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00580 8096A050 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00584 8096A054 03E00008 */ jr $ra -/* 00588 8096A058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s deleted file mode 100644 index 58c5d68699..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096A05C -/* 0058C 8096A05C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00590 8096A060 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00594 8096A064 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00598 8096A068 51C0000D */ beql $t6, $zero, .L8096A0A0 -/* 0059C 8096A06C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005A0 8096A070 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 005A4 8096A074 5040000A */ beql $v0, $zero, .L8096A0A0 -/* 005A8 8096A078 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005AC 8096A07C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 005B0 8096A080 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 005B4 8096A084 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 005B8 8096A088 506F0005 */ beql $v1, $t7, .L8096A0A0 -/* 005BC 8096A08C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005C0 8096A090 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 005C4 8096A094 0C25A7B7 */ jal func_80969EDC -/* 005C8 8096A098 AC83019C */ sw $v1, 0x019C($a0) ## 0000019C -/* 005CC 8096A09C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096A0A0: -/* 005D0 8096A0A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005D4 8096A0A4 03E00008 */ jr $ra -/* 005D8 8096A0A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s deleted file mode 100644 index f8e648b7cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8096A0AC -/* 005DC 8096A0AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005E0 8096A0B0 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 005E4 8096A0B4 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 005E8 8096A0B8 4604003E */ c.le.s $f0, $f4 -/* 005EC 8096A0BC 00000000 */ nop -/* 005F0 8096A0C0 45000003 */ bc1f .L8096A0D0 -/* 005F4 8096A0C4 00000000 */ nop -/* 005F8 8096A0C8 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 005FC 8096A0CC E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L8096A0D0: -/* 00600 8096A0D0 03E00008 */ jr $ra -/* 00604 8096A0D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s deleted file mode 100644 index 0653f017c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096A0D8 -/* 00608 8096A0D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0060C 8096A0DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00610 8096A0E0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00614 8096A0E4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00618 8096A0E8 51C0001D */ beql $t6, $zero, .L8096A160 -/* 0061C 8096A0EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00620 8096A0F0 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 00624 8096A0F4 5040001A */ beql $v0, $zero, .L8096A160 -/* 00628 8096A0F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0062C 8096A0FC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00630 8096A100 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00634 8096A104 3C040600 */ lui $a0, %hi(D_06000800) ## $a0 = 06000000 -/* 00638 8096A108 51E10015 */ beql $t7, $at, .L8096A160 -/* 0063C 8096A10C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00640 8096A110 0C028800 */ jal Animation_GetLastFrame - -/* 00644 8096A114 24840800 */ addiu $a0, $a0, %lo(D_06000800) ## $a0 = 06000800 -/* 00648 8096A118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0064C 8096A11C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00650 8096A120 8FA40028 */ lw $a0, 0x0028($sp) -/* 00654 8096A124 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 8096A128 3C050600 */ lui $a1, %hi(D_06000800) ## $a1 = 06000000 -/* 0065C 8096A12C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00660 8096A130 44070000 */ mfc1 $a3, $f0 -/* 00664 8096A134 AFB80014 */ sw $t8, 0x0014($sp) -/* 00668 8096A138 24A50800 */ addiu $a1, $a1, %lo(D_06000800) ## $a1 = 06000800 -/* 0066C 8096A13C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00670 8096A140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00674 8096A144 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00678 8096A148 0C029468 */ jal Animation_Change - -/* 0067C 8096A14C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00680 8096A150 8FA80028 */ lw $t0, 0x0028($sp) -/* 00684 8096A154 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 00688 8096A158 AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 0068C 8096A15C 8FBF0024 */ lw $ra, 0x0024($sp) -.L8096A160: -/* 00690 8096A160 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00694 8096A164 03E00008 */ jr $ra -/* 00698 8096A168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s deleted file mode 100644 index 79ff06fcf6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8096A16C -/* 0069C 8096A16C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A0 8096A170 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A4 8096A174 10A00014 */ beq $a1, $zero, .L8096A1C8 -/* 006A8 8096A178 AFA40028 */ sw $a0, 0x0028($sp) -/* 006AC 8096A17C 3C040600 */ lui $a0, %hi(D_06000D00) ## $a0 = 06000000 -/* 006B0 8096A180 0C028800 */ jal Animation_GetLastFrame - -/* 006B4 8096A184 24840D00 */ addiu $a0, $a0, %lo(D_06000D00) ## $a0 = 06000D00 -/* 006B8 8096A188 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006BC 8096A18C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006C0 8096A190 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C4 8096A194 468021A0 */ cvt.s.w $f6, $f4 -/* 006C8 8096A198 3C050600 */ lui $a1, %hi(D_06000D00) ## $a1 = 06000000 -/* 006CC 8096A19C 44070000 */ mfc1 $a3, $f0 -/* 006D0 8096A1A0 24A50D00 */ addiu $a1, $a1, %lo(D_06000D00) ## $a1 = 06000D00 -/* 006D4 8096A1A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006D8 8096A1A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 006DC 8096A1AC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006E0 8096A1B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E4 8096A1B4 0C029468 */ jal Animation_Change - -/* 006E8 8096A1B8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006EC 8096A1BC 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F0 8096A1C0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 006F4 8096A1C4 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8096A1C8: -/* 006F8 8096A1C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006FC 8096A1CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00700 8096A1D0 03E00008 */ jr $ra -/* 00704 8096A1D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s deleted file mode 100644 index 73a1ffab57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8096A1D8 -/* 00708 8096A1D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0070C 8096A1DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00710 8096A1E0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00714 8096A1E4 51C0000C */ beql $t6, $zero, .L8096A218 -/* 00718 8096A1E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0071C 8096A1EC 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00720 8096A1F0 50400009 */ beql $v0, $zero, .L8096A218 -/* 00724 8096A1F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00728 8096A1F8 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 0072C 8096A1FC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00730 8096A200 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00734 8096A204 55E10004 */ bnel $t7, $at, .L8096A218 -/* 00738 8096A208 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0073C 8096A20C 0C25A7CE */ jal func_80969F38 -/* 00740 8096A210 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 00744 8096A214 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096A218: -/* 00748 8096A218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0074C 8096A21C 03E00008 */ jr $ra -/* 00750 8096A220 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s deleted file mode 100644 index f5fa99b745..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8096A224 -/* 00754 8096A224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00758 8096A228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0075C 8096A22C 0C25A7F4 */ jal func_80969FD0 -/* 00760 8096A230 00000000 */ nop -/* 00764 8096A234 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00768 8096A238 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0076C 8096A23C 03E00008 */ jr $ra -/* 00770 8096A240 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s deleted file mode 100644 index fde73a39b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8096A244 -/* 00774 8096A244 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00778 8096A248 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0077C 8096A24C 0C25A817 */ jal func_8096A05C -/* 00780 8096A250 00000000 */ nop -/* 00784 8096A254 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00788 8096A258 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0078C 8096A25C 03E00008 */ jr $ra -/* 00790 8096A260 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s deleted file mode 100644 index 519b3f6d9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8096A264 -/* 00794 8096A264 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00798 8096A268 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0079C 8096A26C 0C25A7ED */ jal func_80969FB4 -/* 007A0 8096A270 AFA40018 */ sw $a0, 0x0018($sp) -/* 007A4 8096A274 0C25A70E */ jal func_80969C38 -/* 007A8 8096A278 8FA40018 */ lw $a0, 0x0018($sp) -/* 007AC 8096A27C 0C25A82B */ jal func_8096A0AC -/* 007B0 8096A280 8FA40018 */ lw $a0, 0x0018($sp) -/* 007B4 8096A284 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007B8 8096A288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007BC 8096A28C 03E00008 */ jr $ra -/* 007C0 8096A290 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s deleted file mode 100644 index 2f4bac32ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8096A294 -/* 007C4 8096A294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007C8 8096A298 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007CC 8096A29C AFA40018 */ sw $a0, 0x0018($sp) -/* 007D0 8096A2A0 0C25A716 */ jal func_80969C58 -/* 007D4 8096A2A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 007D8 8096A2A8 0C25A70E */ jal func_80969C38 -/* 007DC 8096A2AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 007E0 8096A2B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 007E4 8096A2B4 0C25A836 */ jal func_8096A0D8 -/* 007E8 8096A2B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 007EC 8096A2BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007F0 8096A2C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 8096A2C4 03E00008 */ jr $ra -/* 007F8 8096A2C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s deleted file mode 100644 index d7e1e10237..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096A2CC -/* 007FC 8096A2CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00800 8096A2D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00804 8096A2D4 0C25A716 */ jal func_80969C58 -/* 00808 8096A2D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0080C 8096A2DC 0C25A70E */ jal func_80969C38 -/* 00810 8096A2E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00814 8096A2E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00818 8096A2E8 0C25A85B */ jal func_8096A16C -/* 0081C 8096A2EC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00820 8096A2F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00824 8096A2F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00828 8096A2F8 03E00008 */ jr $ra -/* 0082C 8096A2FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s deleted file mode 100644 index a1e2bfc076..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8096A300 -/* 00830 8096A300 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00834 8096A304 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00838 8096A308 AFA40018 */ sw $a0, 0x0018($sp) -/* 0083C 8096A30C 0C25A716 */ jal func_80969C58 -/* 00840 8096A310 AFA5001C */ sw $a1, 0x001C($sp) -/* 00844 8096A314 0C25A70E */ jal func_80969C38 -/* 00848 8096A318 8FA40018 */ lw $a0, 0x0018($sp) -/* 0084C 8096A31C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00850 8096A320 0C25A876 */ jal func_8096A1D8 -/* 00854 8096A324 8FA5001C */ lw $a1, 0x001C($sp) -/* 00858 8096A328 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0085C 8096A32C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00860 8096A330 03E00008 */ jr $ra -/* 00864 8096A334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s deleted file mode 100644 index 855d5a9d7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8096A338 -/* 00868 8096A338 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0086C 8096A33C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00870 8096A340 0C25A716 */ jal func_80969C58 -/* 00874 8096A344 AFA40018 */ sw $a0, 0x0018($sp) -/* 00878 8096A348 0C25A70E */ jal func_80969C38 -/* 0087C 8096A34C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00880 8096A350 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00884 8096A354 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00888 8096A358 03E00008 */ jr $ra -/* 0088C 8096A35C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s deleted file mode 100644 index a87752bee6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096A360 -/* 00890 8096A360 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00894 8096A364 AFA40028 */ sw $a0, 0x0028($sp) -/* 00898 8096A368 AFA5002C */ sw $a1, 0x002C($sp) -/* 0089C 8096A36C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008A0 8096A370 8FA50028 */ lw $a1, 0x0028($sp) -/* 008A4 8096A374 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008A8 8096A378 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 -/* 008AC 8096A37C 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 -/* 008B0 8096A380 AFA00010 */ sw $zero, 0x0010($sp) -/* 008B4 8096A384 AFA00014 */ sw $zero, 0x0014($sp) -/* 008B8 8096A388 AFA00018 */ sw $zero, 0x0018($sp) -/* 008BC 8096A38C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008C0 8096A390 0C0291BE */ jal SkelAnime_InitFlex -/* 008C4 8096A394 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 008C8 8096A398 8FAF0028 */ lw $t7, 0x0028($sp) -/* 008CC 8096A39C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 008D0 8096A3A0 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 008D4 8096A3A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008D8 8096A3A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008DC 8096A3AC 03E00008 */ jr $ra -/* 008E0 8096A3B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s deleted file mode 100644 index 1dd1302130..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8096A3B4 -/* 008E4 8096A3B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008E8 8096A3B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008EC 8096A3BC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 008F0 8096A3C0 0C01E245 */ jal func_80078914 -/* 008F4 8096A3C4 24053879 */ addiu $a1, $zero, 0x3879 ## $a1 = 00003879 -/* 008F8 8096A3C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008FC 8096A3CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00900 8096A3D0 03E00008 */ jr $ra -/* 00904 8096A3D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s deleted file mode 100644 index 6103e68405..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096A3D8 -/* 00908 8096A3D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0090C 8096A3DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00910 8096A3E0 948E1D74 */ lhu $t6, 0x1D74($a0) ## 00001D74 -/* 00914 8096A3E4 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 00918 8096A3E8 55C10004 */ bnel $t6, $at, .L8096A3FC -/* 0091C 8096A3EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00920 8096A3F0 0C01E233 */ jal func_800788CC -/* 00924 8096A3F4 240428A0 */ addiu $a0, $zero, 0x28A0 ## $a0 = 000028A0 -/* 00928 8096A3F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096A3FC: -/* 0092C 8096A3FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00930 8096A400 03E00008 */ jr $ra -/* 00934 8096A404 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s deleted file mode 100644 index 0539b3079d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8096A408 -/* 00938 8096A408 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0093C 8096A40C AFBF001C */ sw $ra, 0x001C($sp) -/* 00940 8096A410 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 00944 8096A414 24053925 */ addiu $a1, $zero, 0x3925 ## $a1 = 00003925 -/* 00948 8096A418 244400E4 */ addiu $a0, $v0, 0x00E4 ## $a0 = 000000E4 -/* 0094C 8096A41C 0C01E245 */ jal func_80078914 -/* 00950 8096A420 AFA40024 */ sw $a0, 0x0024($sp) -/* 00954 8096A424 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00958 8096A428 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 0095C 8096A42C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00960 8096A430 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 00964 8096A434 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00968 8096A438 AFA70010 */ sw $a3, 0x0010($sp) -/* 0096C 8096A43C 24046825 */ addiu $a0, $zero, 0x6825 ## $a0 = 00006825 -/* 00970 8096A440 8FA50024 */ lw $a1, 0x0024($sp) -/* 00974 8096A444 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00978 8096A448 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0097C 8096A44C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00980 8096A450 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00984 8096A454 03E00008 */ jr $ra -/* 00988 8096A458 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s deleted file mode 100644 index 0b424c0f47..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8096A45C -/* 0098C 8096A45C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00990 8096A460 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00994 8096A464 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 00998 8096A468 0C01E245 */ jal func_80078914 -/* 0099C 8096A46C 24053124 */ addiu $a1, $zero, 0x3124 ## $a1 = 00003124 -/* 009A0 8096A470 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009A4 8096A474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009A8 8096A478 03E00008 */ jr $ra -/* 009AC 8096A47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s deleted file mode 100644 index e3feab7a02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8096A480 -/* 009B0 8096A480 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009B4 8096A484 AFBF001C */ sw $ra, 0x001C($sp) -/* 009B8 8096A488 AFA40020 */ sw $a0, 0x0020($sp) -/* 009BC 8096A48C 948F1D74 */ lhu $t7, 0x1D74($a0) ## 00001D74 -/* 009C0 8096A490 24010578 */ addiu $at, $zero, 0x0578 ## $at = 00000578 -/* 009C4 8096A494 3C078013 */ lui $a3, %hi(D_801333E0) -/* 009C8 8096A498 15E1000A */ bne $t7, $at, .L8096A4C4 -/* 009CC 8096A49C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 009D0 8096A4A0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 009D4 8096A4A4 3C188013 */ lui $t8, %hi(D_801333E8) -/* 009D8 8096A4A8 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 009DC 8096A4AC AFB80014 */ sw $t8, 0x0014($sp) -/* 009E0 8096A4B0 AFA70010 */ sw $a3, 0x0010($sp) -/* 009E4 8096A4B4 24046828 */ addiu $a0, $zero, 0x6828 ## $a0 = 00006828 -/* 009E8 8096A4B8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 009EC 8096A4BC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 009F0 8096A4C0 244500E4 */ addiu $a1, $v0, 0x00E4 ## $a1 = 000000E4 -.L8096A4C4: -/* 009F4 8096A4C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 009F8 8096A4C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 009FC 8096A4CC 03E00008 */ jr $ra -/* 00A00 8096A4D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s deleted file mode 100644 index b4207a5f24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8096A4D4 -/* 00A04 8096A4D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A08 8096A4D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A0C 8096A4DC AFA40020 */ sw $a0, 0x0020($sp) -/* 00A10 8096A4E0 948F1D74 */ lhu $t7, 0x1D74($a0) ## 00001D74 -/* 00A14 8096A4E4 240100AE */ addiu $at, $zero, 0x00AE ## $at = 000000AE -/* 00A18 8096A4E8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00A1C 8096A4EC 15E1000A */ bne $t7, $at, .L8096A518 -/* 00A20 8096A4F0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00A24 8096A4F4 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 00A28 8096A4F8 3C188013 */ lui $t8, %hi(D_801333E8) -/* 00A2C 8096A4FC 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 00A30 8096A500 AFB80014 */ sw $t8, 0x0014($sp) -/* 00A34 8096A504 AFA70010 */ sw $a3, 0x0010($sp) -/* 00A38 8096A508 24046836 */ addiu $a0, $zero, 0x6836 ## $a0 = 00006836 -/* 00A3C 8096A50C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A40 8096A510 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00A44 8096A514 244500E4 */ addiu $a1, $v0, 0x00E4 ## $a1 = 000000E4 -.L8096A518: -/* 00A48 8096A518 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A4C 8096A51C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A50 8096A520 03E00008 */ jr $ra -/* 00A54 8096A524 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s deleted file mode 100644 index 05e0f6303d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_8096A528 -/* 00A58 8096A528 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A5C 8096A52C AFBF001C */ sw $ra, 0x001C($sp) -/* 00A60 8096A530 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A64 8096A534 94AE1D74 */ lhu $t6, 0x1D74($a1) ## 00001D74 -/* 00A68 8096A538 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A6C 8096A53C 29C10104 */ slti $at, $t6, 0x0104 -/* 00A70 8096A540 50200009 */ beql $at, $zero, .L8096A568 -/* 00A74 8096A544 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 00A78 8096A548 0C25A6BC */ jal func_80969AF0 -/* 00A7C 8096A54C 00000000 */ nop -/* 00A80 8096A550 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A84 8096A554 0C25A6E3 */ jal func_80969B8C -/* 00A88 8096A558 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A8C 8096A55C 10000030 */ beq $zero, $zero, .L8096A620 -/* 00A90 8096A560 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A94 8096A564 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -.L8096A568: -/* 00A98 8096A568 2841014F */ slti $at, $v0, 0x014F -/* 00A9C 8096A56C 50200009 */ beql $at, $zero, .L8096A594 -/* 00AA0 8096A570 2841016D */ slti $at, $v0, 0x016D -/* 00AA4 8096A574 0C25A6BC */ jal func_80969AF0 -/* 00AA8 8096A578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AAC 8096A57C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB0 8096A580 0C25A6E3 */ jal func_80969B8C -/* 00AB4 8096A584 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00AB8 8096A588 10000025 */ beq $zero, $zero, .L8096A620 -/* 00ABC 8096A58C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AC0 8096A590 2841016D */ slti $at, $v0, 0x016D -.L8096A594: -/* 00AC4 8096A594 10200008 */ beq $at, $zero, .L8096A5B8 -/* 00AC8 8096A598 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ACC 8096A59C 0C25A6DE */ jal func_80969B78 -/* 00AD0 8096A5A0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00AD4 8096A5A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AD8 8096A5A8 0C25A6E3 */ jal func_80969B8C -/* 00ADC 8096A5AC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00AE0 8096A5B0 1000001B */ beq $zero, $zero, .L8096A620 -/* 00AE4 8096A5B4 8FBF001C */ lw $ra, 0x001C($sp) -.L8096A5B8: -/* 00AE8 8096A5B8 2841018B */ slti $at, $v0, 0x018B -/* 00AEC 8096A5BC 10200008 */ beq $at, $zero, .L8096A5E0 -/* 00AF0 8096A5C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF4 8096A5C4 0C25A6DE */ jal func_80969B78 -/* 00AF8 8096A5C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00AFC 8096A5CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B00 8096A5D0 0C25A6E3 */ jal func_80969B8C -/* 00B04 8096A5D4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00B08 8096A5D8 10000011 */ beq $zero, $zero, .L8096A620 -/* 00B0C 8096A5DC 8FBF001C */ lw $ra, 0x001C($sp) -.L8096A5E0: -/* 00B10 8096A5E0 2841019A */ slti $at, $v0, 0x019A -/* 00B14 8096A5E4 10200008 */ beq $at, $zero, .L8096A608 -/* 00B18 8096A5E8 00000000 */ nop -/* 00B1C 8096A5EC 0C25A6BC */ jal func_80969AF0 -/* 00B20 8096A5F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B24 8096A5F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B28 8096A5F8 0C25A6E3 */ jal func_80969B8C -/* 00B2C 8096A5FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B30 8096A600 10000007 */ beq $zero, $zero, .L8096A620 -/* 00B34 8096A604 8FBF001C */ lw $ra, 0x001C($sp) -.L8096A608: -/* 00B38 8096A608 0C25A6BC */ jal func_80969AF0 -/* 00B3C 8096A60C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B40 8096A610 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B44 8096A614 0C25A6E3 */ jal func_80969B8C -/* 00B48 8096A618 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00B4C 8096A61C 8FBF001C */ lw $ra, 0x001C($sp) -.L8096A620: -/* 00B50 8096A620 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B54 8096A624 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B58 8096A628 03E00008 */ jr $ra -/* 00B5C 8096A62C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s deleted file mode 100644 index 76808fed47..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8096A630 -/* 00B60 8096A630 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00B64 8096A634 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B68 8096A638 AFA40038 */ sw $a0, 0x0038($sp) -/* 00B6C 8096A63C AFA5003C */ sw $a1, 0x003C($sp) -/* 00B70 8096A640 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 -/* 00B74 8096A644 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 00B78 8096A648 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00B7C 8096A64C ACB80000 */ sw $t8, 0x0000($a1) ## FFFFFFF0 -/* 00B80 8096A650 8C8F0028 */ lw $t7, 0x0028($a0) ## 00000028 -/* 00B84 8096A654 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00B88 8096A658 ACAF0004 */ sw $t7, 0x0004($a1) ## FFFFFFF4 -/* 00B8C 8096A65C 8C98002C */ lw $t8, 0x002C($a0) ## 0000002C -/* 00B90 8096A660 ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFF8 -/* 00B94 8096A664 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 00B98 8096A668 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 00B9C 8096A66C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00BA0 8096A670 8459145E */ lh $t9, 0x145E($v0) ## 8016145E -/* 00BA4 8096A674 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00BA8 8096A678 00000000 */ nop -/* 00BAC 8096A67C 46803220 */ cvt.s.w $f8, $f6 -/* 00BB0 8096A680 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00BB4 8096A684 46082280 */ add.s $f10, $f4, $f8 -/* 00BB8 8096A688 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 00BBC 8096A68C 84481456 */ lh $t0, 0x1456($v0) ## 80161456 -/* 00BC0 8096A690 8449145A */ lh $t1, 0x145A($v0) ## 8016145A -/* 00BC4 8096A694 84471458 */ lh $a3, 0x1458($v0) ## 80161458 -/* 00BC8 8096A698 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 00BCC 8096A69C 252A012C */ addiu $t2, $t1, 0x012C ## $t2 = 0000012C -/* 00BD0 8096A6A0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00BD4 8096A6A4 468084A0 */ cvt.s.w $f18, $f16 -/* 00BD8 8096A6A8 844B145C */ lh $t3, 0x145C($v0) ## 8016145C -/* 00BDC 8096A6AC AFA00018 */ sw $zero, 0x0018($sp) -/* 00BE0 8096A6B0 24E7000A */ addiu $a3, $a3, 0x000A ## $a3 = 0000000A -/* 00BE4 8096A6B4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00BE8 8096A6B8 46069100 */ add.s $f4, $f18, $f6 -/* 00BEC 8096A6BC 44062000 */ mfc1 $a2, $f4 -/* 00BF0 8096A6C0 0C00CD20 */ jal func_80033480 -/* 00BF4 8096A6C4 00000000 */ nop -/* 00BF8 8096A6C8 0C25A8ED */ jal func_8096A3B4 -/* 00BFC 8096A6CC 8FA40038 */ lw $a0, 0x0038($sp) -/* 00C00 8096A6D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C04 8096A6D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C08 8096A6D8 03E00008 */ jr $ra -/* 00C0C 8096A6DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s deleted file mode 100644 index 222fe01972..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s +++ /dev/null @@ -1,172 +0,0 @@ -glabel func_8096A6E0 -/* 00C10 8096A6E0 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 00C14 8096A6E4 F7BC0048 */ sdc1 $f28, 0x0048($sp) -/* 00C18 8096A6E8 3C0141F8 */ lui $at, 0x41F8 ## $at = 41F80000 -/* 00C1C 8096A6EC 4481E000 */ mtc1 $at, $f28 ## $f28 = 31.00 -/* 00C20 8096A6F0 AFA500D4 */ sw $a1, 0x00D4($sp) -/* 00C24 8096A6F4 AFBF0074 */ sw $ra, 0x0074($sp) -/* 00C28 8096A6F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C2C 8096A6FC 4405E000 */ mfc1 $a1, $f28 -/* 00C30 8096A700 AFBE0070 */ sw $s8, 0x0070($sp) -/* 00C34 8096A704 AFB7006C */ sw $s7, 0x006C($sp) -/* 00C38 8096A708 AFB60068 */ sw $s6, 0x0068($sp) -/* 00C3C 8096A70C AFB50064 */ sw $s5, 0x0064($sp) -/* 00C40 8096A710 AFB40060 */ sw $s4, 0x0060($sp) -/* 00C44 8096A714 AFB3005C */ sw $s3, 0x005C($sp) -/* 00C48 8096A718 AFB20058 */ sw $s2, 0x0058($sp) -/* 00C4C 8096A71C AFB10054 */ sw $s1, 0x0054($sp) -/* 00C50 8096A720 AFB00050 */ sw $s0, 0x0050($sp) -/* 00C54 8096A724 F7BA0040 */ sdc1 $f26, 0x0040($sp) -/* 00C58 8096A728 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 00C5C 8096A72C F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 00C60 8096A730 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 00C64 8096A734 0C0295B2 */ jal Animation_OnFrame -/* 00C68 8096A738 AFA40080 */ sw $a0, 0x0080($sp) -/* 00C6C 8096A73C 14400004 */ bne $v0, $zero, .L8096A750 -/* 00C70 8096A740 8FA40080 */ lw $a0, 0x0080($sp) -/* 00C74 8096A744 0C0295B2 */ jal Animation_OnFrame -/* 00C78 8096A748 3C054224 */ lui $a1, 0x4224 ## $a1 = 42240000 -/* 00C7C 8096A74C 10400077 */ beq $v0, $zero, .L8096A92C -.L8096A750: -/* 00C80 8096A750 3C0F8097 */ lui $t7, %hi(D_8096CE98) ## $t7 = 80970000 -/* 00C84 8096A754 8FAE00D4 */ lw $t6, 0x00D4($sp) -/* 00C88 8096A758 25EFCE98 */ addiu $t7, $t7, %lo(D_8096CE98) ## $t7 = 8096CE98 -/* 00C8C 8096A75C 8DF90000 */ lw $t9, 0x0000($t7) ## 8096CE98 -/* 00C90 8096A760 8DC21C44 */ lw $v0, 0x1C44($t6) ## 00001C44 -/* 00C94 8096A764 27B400B0 */ addiu $s4, $sp, 0x00B0 ## $s4 = FFFFFFE0 -/* 00C98 8096A768 AE990000 */ sw $t9, 0x0000($s4) ## FFFFFFE0 -/* 00C9C 8096A76C 8DF80004 */ lw $t8, 0x0004($t7) ## 8096CE9C -/* 00CA0 8096A770 3C088097 */ lui $t0, %hi(D_8096CEA4) ## $t0 = 80970000 -/* 00CA4 8096A774 2508CEA4 */ addiu $t0, $t0, %lo(D_8096CEA4) ## $t0 = 8096CEA4 -/* 00CA8 8096A778 AE980004 */ sw $t8, 0x0004($s4) ## FFFFFFE4 -/* 00CAC 8096A77C 8DF90008 */ lw $t9, 0x0008($t7) ## 8096CEA0 -/* 00CB0 8096A780 27B500A4 */ addiu $s5, $sp, 0x00A4 ## $s5 = FFFFFFD4 -/* 00CB4 8096A784 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00CB8 8096A788 AE990008 */ sw $t9, 0x0008($s4) ## FFFFFFE8 -/* 00CBC 8096A78C 8D0A0000 */ lw $t2, 0x0000($t0) ## 8096CEA4 -/* 00CC0 8096A790 4481D000 */ mtc1 $at, $f26 ## $f26 = 200.00 -/* 00CC4 8096A794 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00CC8 8096A798 AEAA0000 */ sw $t2, 0x0000($s5) ## FFFFFFD4 -/* 00CCC 8096A79C 8D090004 */ lw $t1, 0x0004($t0) ## 8096CEA8 -/* 00CD0 8096A7A0 4481C000 */ mtc1 $at, $f24 ## $f24 = 40.00 -/* 00CD4 8096A7A4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00CD8 8096A7A8 AEA90004 */ sw $t1, 0x0004($s5) ## FFFFFFD8 -/* 00CDC 8096A7AC 8D0A0008 */ lw $t2, 0x0008($t0) ## 8096CEAC -/* 00CE0 8096A7B0 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 -/* 00CE4 8096A7B4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00CE8 8096A7B8 3C108097 */ lui $s0, %hi(D_8096CEE8) ## $s0 = 80970000 -/* 00CEC 8096A7BC 3C178097 */ lui $s7, %hi(D_8096CEB4) ## $s7 = 80970000 -/* 00CF0 8096A7C0 3C168097 */ lui $s6, %hi(D_8096CEB0) ## $s6 = 80970000 -/* 00CF4 8096A7C4 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 00CF8 8096A7C8 26D6CEB0 */ addiu $s6, $s6, %lo(D_8096CEB0) ## $s6 = 8096CEB0 -/* 00CFC 8096A7CC 26F7CEB4 */ addiu $s7, $s7, %lo(D_8096CEB4) ## $s7 = 8096CEB4 -/* 00D00 8096A7D0 2610CEE8 */ addiu $s0, $s0, %lo(D_8096CEE8) ## $s0 = 8096CEE8 -/* 00D04 8096A7D4 27BE0088 */ addiu $s8, $sp, 0x0088 ## $s8 = FFFFFFB8 -/* 00D08 8096A7D8 27B30098 */ addiu $s3, $sp, 0x0098 ## $s3 = FFFFFFC8 -/* 00D0C 8096A7DC 27B2009C */ addiu $s2, $sp, 0x009C ## $s2 = FFFFFFCC -/* 00D10 8096A7E0 2451098C */ addiu $s1, $v0, 0x098C ## $s1 = 0000098C -/* 00D14 8096A7E4 AEAA0008 */ sw $t2, 0x0008($s5) ## FFFFFFDC -/* 00D18 8096A7E8 8ECC0000 */ lw $t4, 0x0000($s6) ## 8096CEB0 -.L8096A7EC: -/* 00D1C 8096A7EC 8EEE0000 */ lw $t6, 0x0000($s7) ## 8096CEB4 -/* 00D20 8096A7F0 4405E000 */ mfc1 $a1, $f28 -/* 00D24 8096A7F4 AE4C0000 */ sw $t4, 0x0000($s2) ## FFFFFFCC -/* 00D28 8096A7F8 AE6E0000 */ sw $t6, 0x0000($s3) ## FFFFFFC8 -/* 00D2C 8096A7FC 0C0295B2 */ jal Animation_OnFrame -/* 00D30 8096A800 8FA40080 */ lw $a0, 0x0080($sp) -/* 00D34 8096A804 5040000F */ beql $v0, $zero, .L8096A844 -/* 00D38 8096A808 C60A0000 */ lwc1 $f10, 0x0000($s0) ## 8096CEE8 -/* 00D3C 8096A80C C604003C */ lwc1 $f4, 0x003C($s0) ## 8096CF24 -/* 00D40 8096A810 C6260000 */ lwc1 $f6, 0x0000($s1) ## 0000098C -/* 00D44 8096A814 C60A0040 */ lwc1 $f10, 0x0040($s0) ## 8096CF28 -/* 00D48 8096A818 46062200 */ add.s $f8, $f4, $f6 -/* 00D4C 8096A81C C6040044 */ lwc1 $f4, 0x0044($s0) ## 8096CF2C -/* 00D50 8096A820 E7A80088 */ swc1 $f8, 0x0088($sp) -/* 00D54 8096A824 C6300004 */ lwc1 $f16, 0x0004($s1) ## 00000990 -/* 00D58 8096A828 46105480 */ add.s $f18, $f10, $f16 -/* 00D5C 8096A82C E7B2008C */ swc1 $f18, 0x008C($sp) -/* 00D60 8096A830 C6260008 */ lwc1 $f6, 0x0008($s1) ## 00000994 -/* 00D64 8096A834 46062200 */ add.s $f8, $f4, $f6 -/* 00D68 8096A838 1000000D */ beq $zero, $zero, .L8096A870 -/* 00D6C 8096A83C E7A80090 */ swc1 $f8, 0x0090($sp) -/* 00D70 8096A840 C60A0000 */ lwc1 $f10, 0x0000($s0) ## 8096CEE8 -.L8096A844: -/* 00D74 8096A844 C6300000 */ lwc1 $f16, 0x0000($s1) ## 0000098C -/* 00D78 8096A848 C6040004 */ lwc1 $f4, 0x0004($s0) ## 8096CEEC -/* 00D7C 8096A84C 46105480 */ add.s $f18, $f10, $f16 -/* 00D80 8096A850 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 8096CEF0 -/* 00D84 8096A854 E7B20088 */ swc1 $f18, 0x0088($sp) -/* 00D88 8096A858 C6260004 */ lwc1 $f6, 0x0004($s1) ## 00000990 -/* 00D8C 8096A85C 46062200 */ add.s $f8, $f4, $f6 -/* 00D90 8096A860 E7A8008C */ swc1 $f8, 0x008C($sp) -/* 00D94 8096A864 C6300008 */ lwc1 $f16, 0x0008($s1) ## 00000994 -/* 00D98 8096A868 46105480 */ add.s $f18, $f10, $f16 -/* 00D9C 8096A86C E7B20090 */ swc1 $f18, 0x0090($sp) -.L8096A870: -/* 00DA0 8096A870 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DA4 8096A874 00000000 */ nop -/* 00DA8 8096A878 46140102 */ mul.s $f4, $f0, $f20 -/* 00DAC 8096A87C 93B8009C */ lbu $t8, 0x009C($sp) -/* 00DB0 8096A880 93A8009D */ lbu $t0, 0x009D($sp) -/* 00DB4 8096A884 93AA009E */ lbu $t2, 0x009E($sp) -/* 00DB8 8096A888 93AC0098 */ lbu $t4, 0x0098($sp) -/* 00DBC 8096A88C 93AE0099 */ lbu $t6, 0x0099($sp) -/* 00DC0 8096A890 46162181 */ sub.s $f6, $f4, $f22 -/* 00DC4 8096A894 4600320D */ trunc.w.s $f8, $f6 -/* 00DC8 8096A898 44024000 */ mfc1 $v0, $f8 -/* 00DCC 8096A89C 00000000 */ nop -/* 00DD0 8096A8A0 0302C821 */ addu $t9, $t8, $v0 -/* 00DD4 8096A8A4 93B8009A */ lbu $t8, 0x009A($sp) -/* 00DD8 8096A8A8 A3B9009C */ sb $t9, 0x009C($sp) -/* 00DDC 8096A8AC 01024821 */ addu $t1, $t0, $v0 -/* 00DE0 8096A8B0 01425821 */ addu $t3, $t2, $v0 -/* 00DE4 8096A8B4 01826821 */ addu $t5, $t4, $v0 -/* 00DE8 8096A8B8 01C27821 */ addu $t7, $t6, $v0 -/* 00DEC 8096A8BC 0302C821 */ addu $t9, $t8, $v0 -/* 00DF0 8096A8C0 A3A9009D */ sb $t1, 0x009D($sp) -/* 00DF4 8096A8C4 A3AB009E */ sb $t3, 0x009E($sp) -/* 00DF8 8096A8C8 A3AD0098 */ sb $t5, 0x0098($sp) -/* 00DFC 8096A8CC A3AF0099 */ sb $t7, 0x0099($sp) -/* 00E00 8096A8D0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00E04 8096A8D4 A3B9009A */ sb $t9, 0x009A($sp) -/* 00E08 8096A8D8 46180282 */ mul.s $f10, $f0, $f24 -/* 00E0C 8096A8DC 8FA400D4 */ lw $a0, 0x00D4($sp) -/* 00E10 8096A8E0 03C02825 */ or $a1, $s8, $zero ## $a1 = FFFFFFB8 -/* 00E14 8096A8E4 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFE0 -/* 00E18 8096A8E8 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFD4 -/* 00E1C 8096A8EC AFB20010 */ sw $s2, 0x0010($sp) -/* 00E20 8096A8F0 AFB30014 */ sw $s3, 0x0014($sp) -/* 00E24 8096A8F4 461A5400 */ add.s $f16, $f10, $f26 -/* 00E28 8096A8F8 AFA0001C */ sw $zero, 0x001C($sp) -/* 00E2C 8096A8FC 4600848D */ trunc.w.s $f18, $f16 -/* 00E30 8096A900 44099000 */ mfc1 $t1, $f18 -/* 00E34 8096A904 0C00A0A7 */ jal func_8002829C -/* 00E38 8096A908 AFA90018 */ sw $t1, 0x0018($sp) -/* 00E3C 8096A90C 3C0A8097 */ lui $t2, %hi(D_8096CEB8) ## $t2 = 80970000 -/* 00E40 8096A910 254ACEB8 */ addiu $t2, $t2, %lo(D_8096CEB8) ## $t2 = 8096CEB8 -/* 00E44 8096A914 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 8096CEDC -/* 00E48 8096A918 020A082B */ sltu $at, $s0, $t2 -/* 00E4C 8096A91C 5020FFB3 */ beql $at, $zero, .L8096A7EC -/* 00E50 8096A920 8ECC0000 */ lw $t4, 0x0000($s6) ## 8096CEB0 -/* 00E54 8096A924 0C25A902 */ jal func_8096A408 -/* 00E58 8096A928 8FA400D4 */ lw $a0, 0x00D4($sp) -.L8096A92C: -/* 00E5C 8096A92C 8FBF0074 */ lw $ra, 0x0074($sp) -/* 00E60 8096A930 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 00E64 8096A934 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 00E68 8096A938 D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 00E6C 8096A93C D7BA0040 */ ldc1 $f26, 0x0040($sp) -/* 00E70 8096A940 D7BC0048 */ ldc1 $f28, 0x0048($sp) -/* 00E74 8096A944 8FB00050 */ lw $s0, 0x0050($sp) -/* 00E78 8096A948 8FB10054 */ lw $s1, 0x0054($sp) -/* 00E7C 8096A94C 8FB20058 */ lw $s2, 0x0058($sp) -/* 00E80 8096A950 8FB3005C */ lw $s3, 0x005C($sp) -/* 00E84 8096A954 8FB40060 */ lw $s4, 0x0060($sp) -/* 00E88 8096A958 8FB50064 */ lw $s5, 0x0064($sp) -/* 00E8C 8096A95C 8FB60068 */ lw $s6, 0x0068($sp) -/* 00E90 8096A960 8FB7006C */ lw $s7, 0x006C($sp) -/* 00E94 8096A964 8FBE0070 */ lw $s8, 0x0070($sp) -/* 00E98 8096A968 03E00008 */ jr $ra -/* 00E9C 8096A96C 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s deleted file mode 100644 index c9ddd1f88a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_8096A970 -/* 00EA0 8096A970 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00EA4 8096A974 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EA8 8096A978 AFA40038 */ sw $a0, 0x0038($sp) -/* 00EAC 8096A97C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00EB0 8096A980 24A31D64 */ addiu $v1, $a1, 0x1D64 ## $v1 = 00001D64 -/* 00EB4 8096A984 51C0002E */ beql $t6, $zero, .L8096AA40 -/* 00EB8 8096A988 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EBC 8096A98C 8C620030 */ lw $v0, 0x0030($v1) ## 00001D94 -/* 00EC0 8096A990 5040002B */ beql $v0, $zero, .L8096AA40 -/* 00EC4 8096A994 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EC8 8096A998 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 00ECC 8096A99C 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 00ED0 8096A9A0 94660010 */ lhu $a2, 0x0010($v1) ## 00001D74 -/* 00ED4 8096A9A4 0C01BE4F */ jal func_8006F93C -/* 00ED8 8096A9A8 AFA2002C */ sw $v0, 0x002C($sp) -/* 00EDC 8096A9AC 8FA2002C */ lw $v0, 0x002C($sp) -/* 00EE0 8096A9B0 8FA30038 */ lw $v1, 0x0038($sp) -/* 00EE4 8096A9B4 8C580010 */ lw $t8, 0x0010($v0) ## 00000010 -/* 00EE8 8096A9B8 8C4F000C */ lw $t7, 0x000C($v0) ## 0000000C -/* 00EEC 8096A9BC 8C480018 */ lw $t0, 0x0018($v0) ## 00000018 -/* 00EF0 8096A9C0 8C590014 */ lw $t9, 0x0014($v0) ## 00000014 -/* 00EF4 8096A9C4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00EF8 8096A9C8 8C4A0020 */ lw $t2, 0x0020($v0) ## 00000020 -/* 00EFC 8096A9CC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00F00 8096A9D0 8C49001C */ lw $t1, 0x001C($v0) ## 0000001C -/* 00F04 8096A9D4 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 00F08 8096A9D8 46803320 */ cvt.s.w $f12, $f6 -/* 00F0C 8096A9DC 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 00F10 8096A9E0 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 00F14 8096A9E4 24630024 */ addiu $v1, $v1, 0x0024 ## $v1 = 00000024 -/* 00F18 8096A9E8 468020A0 */ cvt.s.w $f2, $f4 -/* 00F1C 8096A9EC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00F20 8096A9F0 46805420 */ cvt.s.w $f16, $f10 -/* 00F24 8096A9F4 468043A0 */ cvt.s.w $f14, $f8 -/* 00F28 8096A9F8 46803220 */ cvt.s.w $f8, $f6 -/* 00F2C 8096A9FC 468024A0 */ cvt.s.w $f18, $f4 -/* 00F30 8096AA00 E7A8001C */ swc1 $f8, 0x001C($sp) -/* 00F34 8096AA04 46028281 */ sub.s $f10, $f16, $f2 -/* 00F38 8096AA08 460C9201 */ sub.s $f8, $f18, $f12 -/* 00F3C 8096AA0C 46005102 */ mul.s $f4, $f10, $f0 -/* 00F40 8096AA10 00000000 */ nop -/* 00F44 8096AA14 46004282 */ mul.s $f10, $f8, $f0 -/* 00F48 8096AA18 46022180 */ add.s $f6, $f4, $f2 -/* 00F4C 8096AA1C 460C5100 */ add.s $f4, $f10, $f12 -/* 00F50 8096AA20 E4660000 */ swc1 $f6, 0x0000($v1) ## 00000024 -/* 00F54 8096AA24 E4640004 */ swc1 $f4, 0x0004($v1) ## 00000028 -/* 00F58 8096AA28 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 00F5C 8096AA2C 460E3201 */ sub.s $f8, $f6, $f14 -/* 00F60 8096AA30 46004282 */ mul.s $f10, $f8, $f0 -/* 00F64 8096AA34 460E5100 */ add.s $f4, $f10, $f14 -/* 00F68 8096AA38 E4640008 */ swc1 $f4, 0x0008($v1) ## 0000002C -/* 00F6C 8096AA3C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096AA40: -/* 00F70 8096AA40 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00F74 8096AA44 03E00008 */ jr $ra -/* 00F78 8096AA48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s deleted file mode 100644 index d761f8b41d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8096AA4C -/* 00F7C 8096AA4C AFA50004 */ sw $a1, 0x0004($sp) -/* 00F80 8096AA50 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00F84 8096AA54 03E00008 */ jr $ra -/* 00F88 8096AA58 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s deleted file mode 100644 index 89f79795fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_8096AA5C -/* 00F8C 8096AA5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F90 8096AA60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F94 8096AA64 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F98 8096AA68 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00F9C 8096AA6C 51C00021 */ beql $t6, $zero, .L8096AAF4 -/* 00FA0 8096AA70 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FA4 8096AA74 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 00FA8 8096AA78 5040001E */ beql $v0, $zero, .L8096AAF4 -/* 00FAC 8096AA7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FB0 8096AA80 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00FB4 8096AA84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FB8 8096AA88 3C040600 */ lui $a0, %hi(D_0600288C) ## $a0 = 06000000 -/* 00FBC 8096AA8C 11E10018 */ beq $t7, $at, .L8096AAF0 -/* 00FC0 8096AA90 2484288C */ addiu $a0, $a0, %lo(D_0600288C) ## $a0 = 0600288C -/* 00FC4 8096AA94 0C028800 */ jal Animation_GetLastFrame - -/* 00FC8 8096AA98 AFA5002C */ sw $a1, 0x002C($sp) -/* 00FCC 8096AA9C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00FD0 8096AAA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00FD4 8096AAA4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FD8 8096AAA8 468021A0 */ cvt.s.w $f6, $f4 -/* 00FDC 8096AAAC 3C050600 */ lui $a1, %hi(D_0600288C) ## $a1 = 06000000 -/* 00FE0 8096AAB0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00FE4 8096AAB4 44070000 */ mfc1 $a3, $f0 -/* 00FE8 8096AAB8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00FEC 8096AABC 24A5288C */ addiu $a1, $a1, %lo(D_0600288C) ## $a1 = 0600288C -/* 00FF0 8096AAC0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00FF4 8096AAC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FF8 8096AAC8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FFC 8096AACC 0C029468 */ jal Animation_Change - -/* 01000 8096AAD0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01004 8096AAD4 8FA40028 */ lw $a0, 0x0028($sp) -/* 01008 8096AAD8 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 -/* 0100C 8096AADC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01010 8096AAE0 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 -/* 01014 8096AAE4 AC88019C */ sw $t0, 0x019C($a0) ## 0000019C -/* 01018 8096AAE8 0C25AA5C */ jal func_8096A970 -/* 0101C 8096AAEC 8FA5002C */ lw $a1, 0x002C($sp) -.L8096AAF0: -/* 01020 8096AAF0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8096AAF4: -/* 01024 8096AAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01028 8096AAF8 03E00008 */ jr $ra -/* 0102C 8096AAFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s deleted file mode 100644 index 523b951747..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8096AB00 -/* 01030 8096AB00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01034 8096AB04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01038 8096AB08 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0103C 8096AB0C 24A21D64 */ addiu $v0, $a1, 0x1D64 ## $v0 = 00001D64 -/* 01040 8096AB10 51C0000D */ beql $t6, $zero, .L8096AB48 -/* 01044 8096AB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01048 8096AB18 8C430030 */ lw $v1, 0x0030($v0) ## 00001D94 -/* 0104C 8096AB1C 5060000A */ beql $v1, $zero, .L8096AB48 -/* 01050 8096AB20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01054 8096AB24 944F0010 */ lhu $t7, 0x0010($v0) ## 00001D74 -/* 01058 8096AB28 94780004 */ lhu $t8, 0x0004($v1) ## 00000004 -/* 0105C 8096AB2C 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 01060 8096AB30 01F8082A */ slt $at, $t7, $t8 -/* 01064 8096AB34 54200004 */ bnel $at, $zero, .L8096AB48 -/* 01068 8096AB38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0106C 8096AB3C 0C25A98C */ jal func_8096A630 -/* 01070 8096AB40 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 -/* 01074 8096AB44 8FBF0014 */ lw $ra, 0x0014($sp) -.L8096AB48: -/* 01078 8096AB48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0107C 8096AB4C 03E00008 */ jr $ra -/* 01080 8096AB50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s deleted file mode 100644 index 6549cc996d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096AB54 -/* 01084 8096AB54 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01088 8096AB58 11C0000A */ beq $t6, $zero, .L8096AB84 -/* 0108C 8096AB5C 00000000 */ nop -/* 01090 8096AB60 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 01094 8096AB64 10400007 */ beq $v0, $zero, .L8096AB84 -/* 01098 8096AB68 00000000 */ nop -/* 0109C 8096AB6C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 010A0 8096AB70 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 010A4 8096AB74 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 010A8 8096AB78 11E10002 */ beq $t7, $at, .L8096AB84 -/* 010AC 8096AB7C 00000000 */ nop -/* 010B0 8096AB80 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -.L8096AB84: -/* 010B4 8096AB84 03E00008 */ jr $ra -/* 010B8 8096AB88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s deleted file mode 100644 index b16ba4360c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8096AB8C -/* 010BC 8096AB8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010C0 8096AB90 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010C4 8096AB94 10A00014 */ beq $a1, $zero, .L8096ABE8 -/* 010C8 8096AB98 AFA40028 */ sw $a0, 0x0028($sp) -/* 010CC 8096AB9C 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 -/* 010D0 8096ABA0 0C028800 */ jal Animation_GetLastFrame - -/* 010D4 8096ABA4 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 -/* 010D8 8096ABA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 010DC 8096ABAC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 010E0 8096ABB0 8FA40028 */ lw $a0, 0x0028($sp) -/* 010E4 8096ABB4 468021A0 */ cvt.s.w $f6, $f4 -/* 010E8 8096ABB8 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 -/* 010EC 8096ABBC 44070000 */ mfc1 $a3, $f0 -/* 010F0 8096ABC0 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 -/* 010F4 8096ABC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010F8 8096ABC8 AFA00014 */ sw $zero, 0x0014($sp) -/* 010FC 8096ABCC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01100 8096ABD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01104 8096ABD4 0C029468 */ jal Animation_Change - -/* 01108 8096ABD8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0110C 8096ABDC 8FAF0028 */ lw $t7, 0x0028($sp) -/* 01110 8096ABE0 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01114 8096ABE4 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8096ABE8: -/* 01118 8096ABE8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0111C 8096ABEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01120 8096ABF0 03E00008 */ jr $ra -/* 01124 8096ABF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s deleted file mode 100644 index 8c07d460a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8096ABF8 -/* 01128 8096ABF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0112C 8096ABFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01130 8096AC00 AFA40028 */ sw $a0, 0x0028($sp) -/* 01134 8096AC04 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01138 8096AC08 51C0001E */ beql $t6, $zero, .L8096AC84 -/* 0113C 8096AC0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01140 8096AC10 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 01144 8096AC14 5040001B */ beql $v0, $zero, .L8096AC84 -/* 01148 8096AC18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0114C 8096AC1C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 01150 8096AC20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01154 8096AC24 3C040600 */ lui $a0, %hi(D_06002374) ## $a0 = 06000000 -/* 01158 8096AC28 51E10016 */ beql $t7, $at, .L8096AC84 -/* 0115C 8096AC2C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01160 8096AC30 0C028800 */ jal Animation_GetLastFrame - -/* 01164 8096AC34 24842374 */ addiu $a0, $a0, %lo(D_06002374) ## $a0 = 06002374 -/* 01168 8096AC38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0116C 8096AC3C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 01170 8096AC40 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 01174 8096AC44 468021A0 */ cvt.s.w $f6, $f4 -/* 01178 8096AC48 8FA40028 */ lw $a0, 0x0028($sp) -/* 0117C 8096AC4C 3C050600 */ lui $a1, %hi(D_06002374) ## $a1 = 06000000 -/* 01180 8096AC50 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01184 8096AC54 AFB80014 */ sw $t8, 0x0014($sp) -/* 01188 8096AC58 24A52374 */ addiu $a1, $a1, %lo(D_06002374) ## $a1 = 06002374 -/* 0118C 8096AC5C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01190 8096AC60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01194 8096AC64 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01198 8096AC68 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0119C 8096AC6C 0C029468 */ jal Animation_Change - -/* 011A0 8096AC70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 011A4 8096AC74 8FA80028 */ lw $t0, 0x0028($sp) -/* 011A8 8096AC78 2419000D */ addiu $t9, $zero, 0x000D ## $t9 = 0000000D -/* 011AC 8096AC7C AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 011B0 8096AC80 8FBF0024 */ lw $ra, 0x0024($sp) -.L8096AC84: -/* 011B4 8096AC84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 011B8 8096AC88 03E00008 */ jr $ra -/* 011BC 8096AC8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s deleted file mode 100644 index 35f9da2d1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8096AC90 -/* 011C0 8096AC90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011C4 8096AC94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 011C8 8096AC98 10A00014 */ beq $a1, $zero, .L8096ACEC -/* 011CC 8096AC9C AFA40028 */ sw $a0, 0x0028($sp) -/* 011D0 8096ACA0 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 -/* 011D4 8096ACA4 0C028800 */ jal Animation_GetLastFrame - -/* 011D8 8096ACA8 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 -/* 011DC 8096ACAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 011E0 8096ACB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011E4 8096ACB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 011E8 8096ACB8 468021A0 */ cvt.s.w $f6, $f4 -/* 011EC 8096ACBC 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 -/* 011F0 8096ACC0 44070000 */ mfc1 $a3, $f0 -/* 011F4 8096ACC4 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 -/* 011F8 8096ACC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011FC 8096ACCC AFA00014 */ sw $zero, 0x0014($sp) -/* 01200 8096ACD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01204 8096ACD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01208 8096ACD8 0C029468 */ jal Animation_Change - -/* 0120C 8096ACDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01210 8096ACE0 8FAF0028 */ lw $t7, 0x0028($sp) -/* 01214 8096ACE4 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 01218 8096ACE8 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8096ACEC: -/* 0121C 8096ACEC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01220 8096ACF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01224 8096ACF4 03E00008 */ jr $ra -/* 01228 8096ACF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s deleted file mode 100644 index b7cb63bcd2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096ACFC -/* 0122C 8096ACFC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01230 8096AD00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01234 8096AD04 AFA40028 */ sw $a0, 0x0028($sp) -/* 01238 8096AD08 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0123C 8096AD0C 51C0001D */ beql $t6, $zero, .L8096AD84 -/* 01240 8096AD10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01244 8096AD14 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 01248 8096AD18 5040001A */ beql $v0, $zero, .L8096AD84 -/* 0124C 8096AD1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01250 8096AD20 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 01254 8096AD24 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01258 8096AD28 3C040600 */ lui $a0, %hi(D_06001D70) ## $a0 = 06000000 -/* 0125C 8096AD2C 51E10015 */ beql $t7, $at, .L8096AD84 -/* 01260 8096AD30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01264 8096AD34 0C028800 */ jal Animation_GetLastFrame - -/* 01268 8096AD38 24841D70 */ addiu $a0, $a0, %lo(D_06001D70) ## $a0 = 06001D70 -/* 0126C 8096AD3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01270 8096AD40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01274 8096AD44 8FA40028 */ lw $a0, 0x0028($sp) -/* 01278 8096AD48 468021A0 */ cvt.s.w $f6, $f4 -/* 0127C 8096AD4C 3C050600 */ lui $a1, %hi(D_06001D70) ## $a1 = 06000000 -/* 01280 8096AD50 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01284 8096AD54 44070000 */ mfc1 $a3, $f0 -/* 01288 8096AD58 AFB80014 */ sw $t8, 0x0014($sp) -/* 0128C 8096AD5C 24A51D70 */ addiu $a1, $a1, %lo(D_06001D70) ## $a1 = 06001D70 -/* 01290 8096AD60 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01294 8096AD64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01298 8096AD68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0129C 8096AD6C 0C029468 */ jal Animation_Change - -/* 012A0 8096AD70 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 012A4 8096AD74 8FA80028 */ lw $t0, 0x0028($sp) -/* 012A8 8096AD78 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 012AC 8096AD7C AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 012B0 8096AD80 8FBF0024 */ lw $ra, 0x0024($sp) -.L8096AD84: -/* 012B4 8096AD84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012B8 8096AD88 03E00008 */ jr $ra -/* 012BC 8096AD8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s deleted file mode 100644 index bf5bd52020..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8096AD90 -/* 012C0 8096AD90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012C4 8096AD94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 012C8 8096AD98 10A00015 */ beq $a1, $zero, .L8096ADF0 -/* 012CC 8096AD9C AFA40028 */ sw $a0, 0x0028($sp) -/* 012D0 8096ADA0 3C040600 */ lui $a0, %hi(D_06002374) ## $a0 = 06000000 -/* 012D4 8096ADA4 0C028800 */ jal Animation_GetLastFrame - -/* 012D8 8096ADA8 24842374 */ addiu $a0, $a0, %lo(D_06002374) ## $a0 = 06002374 -/* 012DC 8096ADAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 012E0 8096ADB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012E4 8096ADB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 012E8 8096ADB8 468021A0 */ cvt.s.w $f6, $f4 -/* 012EC 8096ADBC 3C050600 */ lui $a1, %hi(D_06002374) ## $a1 = 06000000 -/* 012F0 8096ADC0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 012F4 8096ADC4 44070000 */ mfc1 $a3, $f0 -/* 012F8 8096ADC8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 012FC 8096ADCC 24A52374 */ addiu $a1, $a1, %lo(D_06002374) ## $a1 = 06002374 -/* 01300 8096ADD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01304 8096ADD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01308 8096ADD8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0130C 8096ADDC 0C029468 */ jal Animation_Change - -/* 01310 8096ADE0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01314 8096ADE4 8FB80028 */ lw $t8, 0x0028($sp) -/* 01318 8096ADE8 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 0131C 8096ADEC AF0F0198 */ sw $t7, 0x0198($t8) ## 00000198 -.L8096ADF0: -/* 01320 8096ADF0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01324 8096ADF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01328 8096ADF8 03E00008 */ jr $ra -/* 0132C 8096ADFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s deleted file mode 100644 index f451a500f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8096AE00 -/* 01330 8096AE00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01334 8096AE04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01338 8096AE08 10A00014 */ beq $a1, $zero, .L8096AE5C -/* 0133C 8096AE0C AFA40028 */ sw $a0, 0x0028($sp) -/* 01340 8096AE10 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 -/* 01344 8096AE14 0C028800 */ jal Animation_GetLastFrame - -/* 01348 8096AE18 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 -/* 0134C 8096AE1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01350 8096AE20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01354 8096AE24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01358 8096AE28 468021A0 */ cvt.s.w $f6, $f4 -/* 0135C 8096AE2C 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 -/* 01360 8096AE30 44070000 */ mfc1 $a3, $f0 -/* 01364 8096AE34 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 -/* 01368 8096AE38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0136C 8096AE3C AFA00014 */ sw $zero, 0x0014($sp) -/* 01370 8096AE40 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01374 8096AE44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01378 8096AE48 0C029468 */ jal Animation_Change - -/* 0137C 8096AE4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01380 8096AE50 8FAF0028 */ lw $t7, 0x0028($sp) -/* 01384 8096AE54 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 01388 8096AE58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8096AE5C: -/* 0138C 8096AE5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01390 8096AE60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01394 8096AE64 03E00008 */ jr $ra -/* 01398 8096AE68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s deleted file mode 100644 index 2e3307ad46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096AE6C -/* 0139C 8096AE6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013A0 8096AE70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013A4 8096AE74 AFA40028 */ sw $a0, 0x0028($sp) -/* 013A8 8096AE78 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 013AC 8096AE7C 51C0001D */ beql $t6, $zero, .L8096AEF4 -/* 013B0 8096AE80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013B4 8096AE84 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 013B8 8096AE88 5040001A */ beql $v0, $zero, .L8096AEF4 -/* 013BC 8096AE8C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013C0 8096AE90 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 013C4 8096AE94 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 013C8 8096AE98 3C040600 */ lui $a0, %hi(D_06000800) ## $a0 = 06000000 -/* 013CC 8096AE9C 51E10015 */ beql $t7, $at, .L8096AEF4 -/* 013D0 8096AEA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013D4 8096AEA4 0C028800 */ jal Animation_GetLastFrame - -/* 013D8 8096AEA8 24840800 */ addiu $a0, $a0, %lo(D_06000800) ## $a0 = 06000800 -/* 013DC 8096AEAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 013E0 8096AEB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013E4 8096AEB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 013E8 8096AEB8 468021A0 */ cvt.s.w $f6, $f4 -/* 013EC 8096AEBC 3C050600 */ lui $a1, %hi(D_06000800) ## $a1 = 06000000 -/* 013F0 8096AEC0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 013F4 8096AEC4 44070000 */ mfc1 $a3, $f0 -/* 013F8 8096AEC8 AFB80014 */ sw $t8, 0x0014($sp) -/* 013FC 8096AECC 24A50800 */ addiu $a1, $a1, %lo(D_06000800) ## $a1 = 06000800 -/* 01400 8096AED0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01404 8096AED4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01408 8096AED8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0140C 8096AEDC 0C029468 */ jal Animation_Change - -/* 01410 8096AEE0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01414 8096AEE4 8FA80028 */ lw $t0, 0x0028($sp) -/* 01418 8096AEE8 24190012 */ addiu $t9, $zero, 0x0012 ## $t9 = 00000012 -/* 0141C 8096AEEC AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 01420 8096AEF0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8096AEF4: -/* 01424 8096AEF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01428 8096AEF8 03E00008 */ jr $ra -/* 0142C 8096AEFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s deleted file mode 100644 index d9e679d0c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8096AF00 -/* 01430 8096AF00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01434 8096AF04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01438 8096AF08 10A00014 */ beq $a1, $zero, .L8096AF5C -/* 0143C 8096AF0C AFA40028 */ sw $a0, 0x0028($sp) -/* 01440 8096AF10 3C040600 */ lui $a0, %hi(D_06000D00) ## $a0 = 06000000 -/* 01444 8096AF14 0C028800 */ jal Animation_GetLastFrame - -/* 01448 8096AF18 24840D00 */ addiu $a0, $a0, %lo(D_06000D00) ## $a0 = 06000D00 -/* 0144C 8096AF1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01450 8096AF20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01454 8096AF24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01458 8096AF28 468021A0 */ cvt.s.w $f6, $f4 -/* 0145C 8096AF2C 3C050600 */ lui $a1, %hi(D_06000D00) ## $a1 = 06000000 -/* 01460 8096AF30 44070000 */ mfc1 $a3, $f0 -/* 01464 8096AF34 24A50D00 */ addiu $a1, $a1, %lo(D_06000D00) ## $a1 = 06000D00 -/* 01468 8096AF38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0146C 8096AF3C AFA00014 */ sw $zero, 0x0014($sp) -/* 01470 8096AF40 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01474 8096AF44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01478 8096AF48 0C029468 */ jal Animation_Change - -/* 0147C 8096AF4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01480 8096AF50 8FAF0028 */ lw $t7, 0x0028($sp) -/* 01484 8096AF54 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 01488 8096AF58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8096AF5C: -/* 0148C 8096AF5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01490 8096AF60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01494 8096AF64 03E00008 */ jr $ra -/* 01498 8096AF68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s deleted file mode 100644 index 25ec347581..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8096AF6C -/* 0149C 8096AF6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 014A0 8096AF70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 014A4 8096AF74 AFA40028 */ sw $a0, 0x0028($sp) -/* 014A8 8096AF78 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 014AC 8096AF7C 51C0001C */ beql $t6, $zero, .L8096AFF0 -/* 014B0 8096AF80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014B4 8096AF84 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 014B8 8096AF88 50400019 */ beql $v0, $zero, .L8096AFF0 -/* 014BC 8096AF8C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014C0 8096AF90 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 014C4 8096AF94 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 014C8 8096AF98 3C040600 */ lui $a0, %hi(D_06006EB0) ## $a0 = 06000000 -/* 014CC 8096AF9C 51E10014 */ beql $t7, $at, .L8096AFF0 -/* 014D0 8096AFA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014D4 8096AFA4 0C028800 */ jal Animation_GetLastFrame - -/* 014D8 8096AFA8 24846EB0 */ addiu $a0, $a0, %lo(D_06006EB0) ## $a0 = 06006EB0 -/* 014DC 8096AFAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 014E0 8096AFB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 014E4 8096AFB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 014E8 8096AFB8 468021A0 */ cvt.s.w $f6, $f4 -/* 014EC 8096AFBC 3C050600 */ lui $a1, %hi(D_06006EB0) ## $a1 = 06000000 -/* 014F0 8096AFC0 44070000 */ mfc1 $a3, $f0 -/* 014F4 8096AFC4 24A56EB0 */ addiu $a1, $a1, %lo(D_06006EB0) ## $a1 = 06006EB0 -/* 014F8 8096AFC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014FC 8096AFCC AFA00014 */ sw $zero, 0x0014($sp) -/* 01500 8096AFD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01504 8096AFD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01508 8096AFD8 0C029468 */ jal Animation_Change - -/* 0150C 8096AFDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01510 8096AFE0 8FB90028 */ lw $t9, 0x0028($sp) -/* 01514 8096AFE4 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 01518 8096AFE8 AF380198 */ sw $t8, 0x0198($t9) ## 00000198 -/* 0151C 8096AFEC 8FBF0024 */ lw $ra, 0x0024($sp) -.L8096AFF0: -/* 01520 8096AFF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01524 8096AFF4 03E00008 */ jr $ra -/* 01528 8096AFF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s deleted file mode 100644 index 142fad4d39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8096AFFC -/* 0152C 8096AFFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01530 8096B000 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01534 8096B004 AFA40018 */ sw $a0, 0x0018($sp) -/* 01538 8096B008 AFA5001C */ sw $a1, 0x001C($sp) -/* 0153C 8096B00C 0C25A8F6 */ jal func_8096A3D8 -/* 01540 8096B010 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01544 8096B014 8FA40018 */ lw $a0, 0x0018($sp) -/* 01548 8096B018 0C25AA93 */ jal func_8096AA4C -/* 0154C 8096B01C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01550 8096B020 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01554 8096B024 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01558 8096B028 03E00008 */ jr $ra -/* 0155C 8096B02C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s deleted file mode 100644 index 929bce0958..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8096B030 -/* 01560 8096B030 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01564 8096B034 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01568 8096B038 AFA40018 */ sw $a0, 0x0018($sp) -/* 0156C 8096B03C AFA5001C */ sw $a1, 0x001C($sp) -/* 01570 8096B040 0C25A8F6 */ jal func_8096A3D8 -/* 01574 8096B044 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01578 8096B048 0C25A935 */ jal func_8096A4D4 -/* 0157C 8096B04C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01580 8096B050 8FA40018 */ lw $a0, 0x0018($sp) -/* 01584 8096B054 0C25AA97 */ jal func_8096AA5C -/* 01588 8096B058 8FA5001C */ lw $a1, 0x001C($sp) -/* 0158C 8096B05C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01590 8096B060 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01594 8096B064 03E00008 */ jr $ra -/* 01598 8096B068 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s deleted file mode 100644 index f5445f2dd9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096B06C -/* 0159C 8096B06C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 015A0 8096B070 AFBF001C */ sw $ra, 0x001C($sp) -/* 015A4 8096B074 AFB00018 */ sw $s0, 0x0018($sp) -/* 015A8 8096B078 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 015AC 8096B07C 0C25AA5C */ jal func_8096A970 -/* 015B0 8096B080 AFA40020 */ sw $a0, 0x0020($sp) -/* 015B4 8096B084 8FA40020 */ lw $a0, 0x0020($sp) -/* 015B8 8096B088 0C25A716 */ jal func_80969C58 -/* 015BC 8096B08C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 015C0 8096B090 0C25A8F6 */ jal func_8096A3D8 -/* 015C4 8096B094 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015C8 8096B098 0C25A935 */ jal func_8096A4D4 -/* 015CC 8096B09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D0 8096B0A0 8FA40020 */ lw $a0, 0x0020($sp) -/* 015D4 8096B0A4 0C25AAC0 */ jal func_8096AB00 -/* 015D8 8096B0A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 015DC 8096B0AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 015E0 8096B0B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 015E4 8096B0B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 015E8 8096B0B8 03E00008 */ jr $ra -/* 015EC 8096B0BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s deleted file mode 100644 index a7e1d13ed1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8096B0C0 -/* 015F0 8096B0C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015F4 8096B0C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 015F8 8096B0C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 015FC 8096B0CC 0C25A716 */ jal func_80969C58 -/* 01600 8096B0D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01604 8096B0D4 0C25A935 */ jal func_8096A4D4 -/* 01608 8096B0D8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0160C 8096B0DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01610 8096B0E0 0C25AAD5 */ jal func_8096AB54 -/* 01614 8096B0E4 8FA5001C */ lw $a1, 0x001C($sp) -/* 01618 8096B0E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0161C 8096B0EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01620 8096B0F0 03E00008 */ jr $ra -/* 01624 8096B0F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s deleted file mode 100644 index 21bc0a7fa2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096B0F8 -/* 01628 8096B0F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0162C 8096B0FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01630 8096B100 AFA40020 */ sw $a0, 0x0020($sp) -/* 01634 8096B104 0C25A716 */ jal func_80969C58 -/* 01638 8096B108 AFA50024 */ sw $a1, 0x0024($sp) -/* 0163C 8096B10C 0C25A70E */ jal func_80969C38 -/* 01640 8096B110 8FA40020 */ lw $a0, 0x0020($sp) -/* 01644 8096B114 AFA2001C */ sw $v0, 0x001C($sp) -/* 01648 8096B118 8FA40020 */ lw $a0, 0x0020($sp) -/* 0164C 8096B11C 0C25A94A */ jal func_8096A528 -/* 01650 8096B120 8FA50024 */ lw $a1, 0x0024($sp) -/* 01654 8096B124 8FA40020 */ lw $a0, 0x0020($sp) -/* 01658 8096B128 0C25AAE3 */ jal func_8096AB8C -/* 0165C 8096B12C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01660 8096B130 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01664 8096B134 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01668 8096B138 03E00008 */ jr $ra -/* 0166C 8096B13C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s deleted file mode 100644 index f011a59cdd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096B140 -/* 01670 8096B140 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01674 8096B144 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01678 8096B148 AFA40018 */ sw $a0, 0x0018($sp) -/* 0167C 8096B14C 0C25A716 */ jal func_80969C58 -/* 01680 8096B150 AFA5001C */ sw $a1, 0x001C($sp) -/* 01684 8096B154 0C25A70E */ jal func_80969C38 -/* 01688 8096B158 8FA40018 */ lw $a0, 0x0018($sp) -/* 0168C 8096B15C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01690 8096B160 0C25A94A */ jal func_8096A528 -/* 01694 8096B164 8FA5001C */ lw $a1, 0x001C($sp) -/* 01698 8096B168 8FA40018 */ lw $a0, 0x0018($sp) -/* 0169C 8096B16C 0C25AAFE */ jal func_8096ABF8 -/* 016A0 8096B170 8FA5001C */ lw $a1, 0x001C($sp) -/* 016A4 8096B174 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016A8 8096B178 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016AC 8096B17C 03E00008 */ jr $ra -/* 016B0 8096B180 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s deleted file mode 100644 index efb02ac1bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8096B184 -/* 016B4 8096B184 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 016B8 8096B188 AFBF001C */ sw $ra, 0x001C($sp) -/* 016BC 8096B18C AFB00018 */ sw $s0, 0x0018($sp) -/* 016C0 8096B190 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016C4 8096B194 0C25A716 */ jal func_80969C58 -/* 016C8 8096B198 AFA5002C */ sw $a1, 0x002C($sp) -/* 016CC 8096B19C 0C25A70E */ jal func_80969C38 -/* 016D0 8096B1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D4 8096B1A4 AFA20024 */ sw $v0, 0x0024($sp) -/* 016D8 8096B1A8 0C25A917 */ jal func_8096A45C -/* 016DC 8096B1AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E0 8096B1B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E4 8096B1B4 0C25A94A */ jal func_8096A528 -/* 016E8 8096B1B8 8FA5002C */ lw $a1, 0x002C($sp) -/* 016EC 8096B1BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F0 8096B1C0 0C25AB24 */ jal func_8096AC90 -/* 016F4 8096B1C4 8FA50024 */ lw $a1, 0x0024($sp) -/* 016F8 8096B1C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 016FC 8096B1CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01700 8096B1D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01704 8096B1D4 03E00008 */ jr $ra -/* 01708 8096B1D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s deleted file mode 100644 index 763244c8a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096B1DC -/* 0170C 8096B1DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01710 8096B1E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01714 8096B1E4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01718 8096B1E8 0C25A716 */ jal func_80969C58 -/* 0171C 8096B1EC AFA5001C */ sw $a1, 0x001C($sp) -/* 01720 8096B1F0 0C25A70E */ jal func_80969C38 -/* 01724 8096B1F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01728 8096B1F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0172C 8096B1FC 0C25A94A */ jal func_8096A528 -/* 01730 8096B200 8FA5001C */ lw $a1, 0x001C($sp) -/* 01734 8096B204 8FA40018 */ lw $a0, 0x0018($sp) -/* 01738 8096B208 0C25AB3F */ jal func_8096ACFC -/* 0173C 8096B20C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01740 8096B210 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01744 8096B214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01748 8096B218 03E00008 */ jr $ra -/* 0174C 8096B21C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s deleted file mode 100644 index 04570f61c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8096B220 -/* 01750 8096B220 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01754 8096B224 AFBF001C */ sw $ra, 0x001C($sp) -/* 01758 8096B228 AFB00018 */ sw $s0, 0x0018($sp) -/* 0175C 8096B22C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01760 8096B230 0C25A716 */ jal func_80969C58 -/* 01764 8096B234 AFA5002C */ sw $a1, 0x002C($sp) -/* 01768 8096B238 0C25A70E */ jal func_80969C38 -/* 0176C 8096B23C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 8096B240 AFA20024 */ sw $v0, 0x0024($sp) -/* 01774 8096B244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01778 8096B248 0C25A94A */ jal func_8096A528 -/* 0177C 8096B24C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01780 8096B250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01784 8096B254 0C25A9B8 */ jal func_8096A6E0 -/* 01788 8096B258 8FA5002C */ lw $a1, 0x002C($sp) -/* 0178C 8096B25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01790 8096B260 0C25AB64 */ jal func_8096AD90 -/* 01794 8096B264 8FA50024 */ lw $a1, 0x0024($sp) -/* 01798 8096B268 8FBF001C */ lw $ra, 0x001C($sp) -/* 0179C 8096B26C 8FB00018 */ lw $s0, 0x0018($sp) -/* 017A0 8096B270 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017A4 8096B274 03E00008 */ jr $ra -/* 017A8 8096B278 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s deleted file mode 100644 index 4c2960be42..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8096B27C -/* 017AC 8096B27C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 017B0 8096B280 AFBF001C */ sw $ra, 0x001C($sp) -/* 017B4 8096B284 AFB00018 */ sw $s0, 0x0018($sp) -/* 017B8 8096B288 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017BC 8096B28C 0C25A716 */ jal func_80969C58 -/* 017C0 8096B290 AFA5002C */ sw $a1, 0x002C($sp) -/* 017C4 8096B294 0C25A70E */ jal func_80969C38 -/* 017C8 8096B298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017CC 8096B29C AFA20024 */ sw $v0, 0x0024($sp) -/* 017D0 8096B2A0 0C25A917 */ jal func_8096A45C -/* 017D4 8096B2A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017D8 8096B2A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017DC 8096B2AC 0C25A94A */ jal func_8096A528 -/* 017E0 8096B2B0 8FA5002C */ lw $a1, 0x002C($sp) -/* 017E4 8096B2B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E8 8096B2B8 0C25AB80 */ jal func_8096AE00 -/* 017EC 8096B2BC 8FA50024 */ lw $a1, 0x0024($sp) -/* 017F0 8096B2C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 017F4 8096B2C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 017F8 8096B2C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017FC 8096B2CC 03E00008 */ jr $ra -/* 01800 8096B2D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s deleted file mode 100644 index 7746b10e52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096B2D4 -/* 01804 8096B2D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01808 8096B2D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0180C 8096B2DC AFA40018 */ sw $a0, 0x0018($sp) -/* 01810 8096B2E0 0C25A716 */ jal func_80969C58 -/* 01814 8096B2E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01818 8096B2E8 0C25A70E */ jal func_80969C38 -/* 0181C 8096B2EC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01820 8096B2F0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01824 8096B2F4 0C25A94A */ jal func_8096A528 -/* 01828 8096B2F8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0182C 8096B2FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01830 8096B300 0C25AB9B */ jal func_8096AE6C -/* 01834 8096B304 8FA5001C */ lw $a1, 0x001C($sp) -/* 01838 8096B308 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0183C 8096B30C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01840 8096B310 03E00008 */ jr $ra -/* 01844 8096B314 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s deleted file mode 100644 index c3b6241b63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096B318 -/* 01848 8096B318 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0184C 8096B31C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01850 8096B320 AFA40020 */ sw $a0, 0x0020($sp) -/* 01854 8096B324 0C25A716 */ jal func_80969C58 -/* 01858 8096B328 AFA50024 */ sw $a1, 0x0024($sp) -/* 0185C 8096B32C 0C25A70E */ jal func_80969C38 -/* 01860 8096B330 8FA40020 */ lw $a0, 0x0020($sp) -/* 01864 8096B334 AFA2001C */ sw $v0, 0x001C($sp) -/* 01868 8096B338 8FA40020 */ lw $a0, 0x0020($sp) -/* 0186C 8096B33C 0C25A94A */ jal func_8096A528 -/* 01870 8096B340 8FA50024 */ lw $a1, 0x0024($sp) -/* 01874 8096B344 8FA40020 */ lw $a0, 0x0020($sp) -/* 01878 8096B348 0C25ABC0 */ jal func_8096AF00 -/* 0187C 8096B34C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01880 8096B350 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01884 8096B354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01888 8096B358 03E00008 */ jr $ra -/* 0188C 8096B35C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s deleted file mode 100644 index 0594689634..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8096B360 -/* 01890 8096B360 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01894 8096B364 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01898 8096B368 AFA40018 */ sw $a0, 0x0018($sp) -/* 0189C 8096B36C 0C25A716 */ jal func_80969C58 -/* 018A0 8096B370 AFA5001C */ sw $a1, 0x001C($sp) -/* 018A4 8096B374 0C25A70E */ jal func_80969C38 -/* 018A8 8096B378 8FA40018 */ lw $a0, 0x0018($sp) -/* 018AC 8096B37C 8FA40018 */ lw $a0, 0x0018($sp) -/* 018B0 8096B380 0C25A94A */ jal func_8096A528 -/* 018B4 8096B384 8FA5001C */ lw $a1, 0x001C($sp) -/* 018B8 8096B388 8FA40018 */ lw $a0, 0x0018($sp) -/* 018BC 8096B38C 0C25ABDB */ jal func_8096AF6C -/* 018C0 8096B390 8FA5001C */ lw $a1, 0x001C($sp) -/* 018C4 8096B394 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018C8 8096B398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018CC 8096B39C 03E00008 */ jr $ra -/* 018D0 8096B3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s deleted file mode 100644 index 847621b699..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096B3A4 -/* 018D4 8096B3A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018D8 8096B3A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018DC 8096B3AC AFA40018 */ sw $a0, 0x0018($sp) -/* 018E0 8096B3B0 0C25A716 */ jal func_80969C58 -/* 018E4 8096B3B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 018E8 8096B3B8 0C25A70E */ jal func_80969C38 -/* 018EC 8096B3BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 018F0 8096B3C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 018F4 8096B3C4 0C25A94A */ jal func_8096A528 -/* 018F8 8096B3C8 8FA5001C */ lw $a1, 0x001C($sp) -/* 018FC 8096B3CC 0C25A920 */ jal func_8096A480 -/* 01900 8096B3D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 01904 8096B3D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01908 8096B3D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0190C 8096B3DC 03E00008 */ jr $ra -/* 01910 8096B3E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s deleted file mode 100644 index 2602dc57ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8096B3E4 -/* 01914 8096B3E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01918 8096B3E8 AFA40040 */ sw $a0, 0x0040($sp) -/* 0191C 8096B3EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01920 8096B3F0 3C040601 */ lui $a0, %hi(D_06012014) ## $a0 = 06010000 -/* 01924 8096B3F4 AFA50044 */ sw $a1, 0x0044($sp) -/* 01928 8096B3F8 0C028800 */ jal Animation_GetLastFrame - -/* 0192C 8096B3FC 24842014 */ addiu $a0, $a0, %lo(D_06012014) ## $a0 = 06012014 -/* 01930 8096B400 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01934 8096B404 8FA50040 */ lw $a1, 0x0040($sp) -/* 01938 8096B408 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 -/* 0193C 8096B40C 468021A0 */ cvt.s.w $f6, $f4 -/* 01940 8096B410 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 01944 8096B414 AFA5002C */ sw $a1, 0x002C($sp) -/* 01948 8096B418 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 -/* 0194C 8096B41C 8FA40044 */ lw $a0, 0x0044($sp) -/* 01950 8096B420 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01954 8096B424 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 01958 8096B428 AFA00010 */ sw $zero, 0x0010($sp) -/* 0195C 8096B42C AFA00014 */ sw $zero, 0x0014($sp) -/* 01960 8096B430 0C0291BE */ jal SkelAnime_InitFlex -/* 01964 8096B434 AFA00018 */ sw $zero, 0x0018($sp) -/* 01968 8096B438 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0196C 8096B43C C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 01970 8096B440 3C050601 */ lui $a1, %hi(D_06012014) ## $a1 = 06010000 -/* 01974 8096B444 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01978 8096B448 44070000 */ mfc1 $a3, $f0 -/* 0197C 8096B44C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01980 8096B450 24A52014 */ addiu $a1, $a1, %lo(D_06012014) ## $a1 = 06012014 -/* 01984 8096B454 8FA4002C */ lw $a0, 0x002C($sp) -/* 01988 8096B458 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0198C 8096B45C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01990 8096B460 0C029468 */ jal Animation_Change - -/* 01994 8096B464 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01998 8096B468 8FA20040 */ lw $v0, 0x0040($sp) -/* 0199C 8096B46C 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 -/* 019A0 8096B470 AC4F0198 */ sw $t7, 0x0198($v0) ## 00000198 -/* 019A4 8096B474 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 019A8 8096B478 8FBF0024 */ lw $ra, 0x0024($sp) -/* 019AC 8096B47C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 019B0 8096B480 03E00008 */ jr $ra -/* 019B4 8096B484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s deleted file mode 100644 index 6f5bacb883..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8096B488 -/* 019B8 8096B488 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 019BC 8096B48C AFBF0014 */ sw $ra, 0x0014($sp) -/* 019C0 8096B490 0C01E233 */ jal func_800788CC -/* 019C4 8096B494 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 019C8 8096B498 8FBF0014 */ lw $ra, 0x0014($sp) -/* 019CC 8096B49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 019D0 8096B4A0 03E00008 */ jr $ra -/* 019D4 8096B4A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s deleted file mode 100644 index 28b4e8d122..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8096B4A8 -/* 019D8 8096B4A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 019DC 8096B4AC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 019E0 8096B4B0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 019E4 8096B4B4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 019E8 8096B4B8 AFA40038 */ sw $a0, 0x0038($sp) -/* 019EC 8096B4BC C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 019F0 8096B4C0 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 019F4 8096B4C4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 019F8 8096B4C8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 019FC 8096B4CC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 01A00 8096B4D0 85CF1474 */ lh $t7, 0x1474($t6) ## 80161474 -/* 01A04 8096B4D4 44815000 */ mtc1 $at, $f10 ## $f10 = 22.00 -/* 01A08 8096B4D8 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 01A0C 8096B4DC 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01A10 8096B4E0 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01A14 8096B4E4 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01A18 8096B4E8 46803220 */ cvt.s.w $f8, $f6 -/* 01A1C 8096B4EC 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 01A20 8096B4F0 460A4400 */ add.s $f16, $f8, $f10 -/* 01A24 8096B4F4 46128100 */ add.s $f4, $f16, $f18 -/* 01A28 8096B4F8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01A2C 8096B4FC C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 01A30 8096B500 AFB80028 */ sw $t8, 0x0028($sp) -/* 01A34 8096B504 AFA00024 */ sw $zero, 0x0024($sp) -/* 01A38 8096B508 AFA00020 */ sw $zero, 0x0020($sp) -/* 01A3C 8096B50C AFA0001C */ sw $zero, 0x001C($sp) -/* 01A40 8096B510 0C00C916 */ jal Actor_SpawnAsChild - -/* 01A44 8096B514 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01A48 8096B518 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01A4C 8096B51C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01A50 8096B520 03E00008 */ jr $ra -/* 01A54 8096B524 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s deleted file mode 100644 index dbbb31f637..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8096B528 -/* 01A58 8096B528 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A5C 8096B52C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A60 8096B530 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A64 8096B534 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01A68 8096B538 0C25A731 */ jal func_80969CC4 -/* 01A6C 8096B53C 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 01A70 8096B540 1040000A */ beq $v0, $zero, .L8096B56C -/* 01A74 8096B544 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A78 8096B548 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01A7C 8096B54C 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 01A80 8096B550 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01A84 8096B554 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 01A88 8096B558 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 01A8C 8096B55C AC8001A8 */ sw $zero, 0x01A8($a0) ## 000001A8 -/* 01A90 8096B560 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 01A94 8096B564 0C25AD22 */ jal func_8096B488 -/* 01A98 8096B568 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 -.L8096B56C: -/* 01A9C 8096B56C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01AA0 8096B570 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01AA4 8096B574 03E00008 */ jr $ra -/* 01AA8 8096B578 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s deleted file mode 100644 index f3ccf2e34e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_8096B57C -/* 01AAC 8096B57C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01AB0 8096B580 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01AB4 8096B584 AFA40018 */ sw $a0, 0x0018($sp) -/* 01AB8 8096B588 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01ABC 8096B58C 0C25A731 */ jal func_80969CC4 -/* 01AC0 8096B590 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 01AC4 8096B594 10400025 */ beq $v0, $zero, .L8096B62C -/* 01AC8 8096B598 8FA40018 */ lw $a0, 0x0018($sp) -/* 01ACC 8096B59C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01AD0 8096B5A0 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 01AD4 8096B5A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01AD8 8096B5A8 248201A4 */ addiu $v0, $a0, 0x01A4 ## $v0 = 000001A4 -/* 01ADC 8096B5AC C4440000 */ lwc1 $f4, 0x0000($v0) ## 000001A4 -/* 01AE0 8096B5B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01AE4 8096B5B4 3C058016 */ lui $a1, %hi(gGameInfo) -/* 01AE8 8096B5B8 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 01AEC 8096B5BC 46062200 */ add.s $f8, $f4, $f6 -/* 01AF0 8096B5C0 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01AF4 8096B5C4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01AF8 8096B5C8 E4480000 */ swc1 $f8, 0x0000($v0) ## 000001A4 -/* 01AFC 8096B5CC 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 01B00 8096B5D0 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000001A4 -/* 01B04 8096B5D4 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 01B08 8096B5D8 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01B0C 8096B5DC 00000000 */ nop -/* 01B10 8096B5E0 46805420 */ cvt.s.w $f16, $f10 -/* 01B14 8096B5E4 46028480 */ add.s $f18, $f16, $f2 -/* 01B18 8096B5E8 4600903E */ c.le.s $f18, $f0 -/* 01B1C 8096B5EC 00000000 */ nop -/* 01B20 8096B5F0 45000020 */ bc1f .L8096B674 -/* 01B24 8096B5F4 00000000 */ nop -/* 01B28 8096B5F8 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 01B2C 8096B5FC AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -/* 01B30 8096B600 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 01B34 8096B604 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 01B38 8096B608 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 01B3C 8096B60C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 01B40 8096B610 00000000 */ nop -/* 01B44 8096B614 468021A0 */ cvt.s.w $f6, $f4 -/* 01B48 8096B618 46023200 */ add.s $f8, $f6, $f2 -/* 01B4C 8096B61C E4480000 */ swc1 $f8, 0x0000($v0) ## 000001A4 -/* 01B50 8096B620 AC8301A8 */ sw $v1, 0x01A8($a0) ## 000001A8 -/* 01B54 8096B624 10000026 */ beq $zero, $zero, .L8096B6C0 -/* 01B58 8096B628 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L8096B62C: -/* 01B5C 8096B62C 248201A4 */ addiu $v0, $a0, 0x01A4 ## $v0 = 000001A4 -/* 01B60 8096B630 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01B64 8096B634 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 01B68 8096B638 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000001A4 -/* 01B6C 8096B63C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01B70 8096B640 46105481 */ sub.s $f18, $f10, $f16 -/* 01B74 8096B644 E4520000 */ swc1 $f18, 0x0000($v0) ## 000001A4 -/* 01B78 8096B648 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000001A4 -/* 01B7C 8096B64C 4602003E */ c.le.s $f0, $f2 -/* 01B80 8096B650 00000000 */ nop -/* 01B84 8096B654 45000007 */ bc1f .L8096B674 -/* 01B88 8096B658 240A0015 */ addiu $t2, $zero, 0x0015 ## $t2 = 00000015 -/* 01B8C 8096B65C AC8A0198 */ sw $t2, 0x0198($a0) ## 00000198 -/* 01B90 8096B660 AC80019C */ sw $zero, 0x019C($a0) ## 0000019C -/* 01B94 8096B664 E4420000 */ swc1 $f2, 0x0000($v0) ## 000001A4 -/* 01B98 8096B668 AC8001A8 */ sw $zero, 0x01A8($a0) ## 000001A8 -/* 01B9C 8096B66C 10000014 */ beq $zero, $zero, .L8096B6C0 -/* 01BA0 8096B670 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L8096B674: -/* 01BA4 8096B674 3C058016 */ lui $a1, %hi(gGameInfo) -/* 01BA8 8096B678 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 01BAC 8096B67C 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 01BB0 8096B680 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01BB4 8096B684 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 01BB8 8096B688 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 01BBC 8096B68C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01BC0 8096B690 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 01BC4 8096B694 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 01BC8 8096B698 00000000 */ nop -/* 01BCC 8096B69C 468021A0 */ cvt.s.w $f6, $f4 -/* 01BD0 8096B6A0 46023200 */ add.s $f8, $f6, $f2 -/* 01BD4 8096B6A4 46080283 */ div.s $f10, $f0, $f8 -/* 01BD8 8096B6A8 46105482 */ mul.s $f18, $f10, $f16 -/* 01BDC 8096B6AC 4600910D */ trunc.w.s $f4, $f18 -/* 01BE0 8096B6B0 44022000 */ mfc1 $v0, $f4 -/* 01BE4 8096B6B4 00000000 */ nop -/* 01BE8 8096B6B8 AC8201A8 */ sw $v0, 0x01A8($a0) ## 000001A8 -/* 01BEC 8096B6BC A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8096B6C0: -/* 01BF0 8096B6C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01BF4 8096B6C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01BF8 8096B6C8 03E00008 */ jr $ra -/* 01BFC 8096B6CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s deleted file mode 100644 index 11a4f48f88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8096B6D0 -/* 01C00 8096B6D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C04 8096B6D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C08 8096B6D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01C0C 8096B6DC AFA40018 */ sw $a0, 0x0018($sp) -/* 01C10 8096B6E0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01C14 8096B6E4 0C25A744 */ jal func_80969D10 -/* 01C18 8096B6E8 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 01C1C 8096B6EC 1040001A */ beq $v0, $zero, .L8096B758 -/* 01C20 8096B6F0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C24 8096B6F4 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 01C28 8096B6F8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01C2C 8096B6FC AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 01C30 8096B700 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 01C34 8096B704 3C188016 */ lui $t8, %hi(gGameInfo) -/* 01C38 8096B708 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 01C3C 8096B70C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01C40 8096B710 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01C44 8096B714 8719145E */ lh $t9, 0x145E($t8) ## 8016145E -/* 01C48 8096B718 8C8901AC */ lw $t1, 0x01AC($a0) ## 000001AC -/* 01C4C 8096B71C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01C50 8096B720 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01C54 8096B724 AC8801A8 */ sw $t0, 0x01A8($a0) ## 000001A8 -/* 01C58 8096B728 468021A0 */ cvt.s.w $f6, $f4 -/* 01C5C 8096B72C 46083280 */ add.s $f10, $f6, $f8 -/* 01C60 8096B730 15200007 */ bne $t1, $zero, .L8096B750 -/* 01C64 8096B734 E48A01A4 */ swc1 $f10, 0x01A4($a0) ## 000001A4 -/* 01C68 8096B738 8FA5001C */ lw $a1, 0x001C($sp) -/* 01C6C 8096B73C 0C25AD2A */ jal func_8096B4A8 -/* 01C70 8096B740 AFA40018 */ sw $a0, 0x0018($sp) -/* 01C74 8096B744 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C78 8096B748 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01C7C 8096B74C AC8A01AC */ sw $t2, 0x01AC($a0) ## 000001AC -.L8096B750: -/* 01C80 8096B750 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 01C84 8096B754 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L8096B758: -/* 01C88 8096B758 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C8C 8096B75C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C90 8096B760 03E00008 */ jr $ra -/* 01C94 8096B764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s deleted file mode 100644 index fbd65f2317..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8096B768 -/* 01C98 8096B768 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C9C 8096B76C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CA0 8096B770 AFA40018 */ sw $a0, 0x0018($sp) -/* 01CA4 8096B774 0C25AD4A */ jal func_8096B528 -/* 01CA8 8096B778 AFA5001C */ sw $a1, 0x001C($sp) -/* 01CAC 8096B77C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01CB0 8096B780 0C25A6F1 */ jal func_80969BC4 -/* 01CB4 8096B784 8FA5001C */ lw $a1, 0x001C($sp) -/* 01CB8 8096B788 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CBC 8096B78C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CC0 8096B790 03E00008 */ jr $ra -/* 01CC4 8096B794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s deleted file mode 100644 index 5dee6a70a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096B798 -/* 01CC8 8096B798 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CCC 8096B79C AFBF001C */ sw $ra, 0x001C($sp) -/* 01CD0 8096B7A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01CD4 8096B7A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CD8 8096B7A8 0C25A716 */ jal func_80969C58 -/* 01CDC 8096B7AC AFA50024 */ sw $a1, 0x0024($sp) -/* 01CE0 8096B7B0 0C25A70E */ jal func_80969C38 -/* 01CE4 8096B7B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CE8 8096B7B8 0C25A6BC */ jal func_80969AF0 -/* 01CEC 8096B7BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CF0 8096B7C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CF4 8096B7C4 0C25AD5F */ jal func_8096B57C -/* 01CF8 8096B7C8 8FA50024 */ lw $a1, 0x0024($sp) -/* 01CFC 8096B7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D00 8096B7D0 0C25A6F1 */ jal func_80969BC4 -/* 01D04 8096B7D4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D08 8096B7D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D0C 8096B7DC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D10 8096B7E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D14 8096B7E4 03E00008 */ jr $ra -/* 01D18 8096B7E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s deleted file mode 100644 index 3f975a6510..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8096B7EC -/* 01D1C 8096B7EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01D20 8096B7F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01D24 8096B7F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01D28 8096B7F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D2C 8096B7FC 0C25A716 */ jal func_80969C58 -/* 01D30 8096B800 AFA50024 */ sw $a1, 0x0024($sp) -/* 01D34 8096B804 0C25A70E */ jal func_80969C38 -/* 01D38 8096B808 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D3C 8096B80C 0C25A6BC */ jal func_80969AF0 -/* 01D40 8096B810 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D44 8096B814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D48 8096B818 0C25ADB4 */ jal func_8096B6D0 -/* 01D4C 8096B81C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D50 8096B820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D54 8096B824 0C25A6F1 */ jal func_80969BC4 -/* 01D58 8096B828 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D5C 8096B82C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D60 8096B830 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D64 8096B834 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D68 8096B838 03E00008 */ jr $ra -/* 01D6C 8096B83C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s deleted file mode 100644 index 07260ed892..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s +++ /dev/null @@ -1,134 +0,0 @@ -.rdata -glabel D_8096CFD0 - .asciz "../z_demo_du_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_8096CFF4 - .asciz "../z_demo_du_inKenjyanomaDemo02.c" - .balign 4 - -.text -glabel func_8096B840 -/* 01D70 8096B840 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01D74 8096B844 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D78 8096B848 AFB00028 */ sw $s0, 0x0028($sp) -/* 01D7C 8096B84C AFA40080 */ sw $a0, 0x0080($sp) -/* 01D80 8096B850 AFA50084 */ sw $a1, 0x0084($sp) -/* 01D84 8096B854 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 01D88 8096B858 3C188097 */ lui $t8, %hi(D_8096CE74) ## $t8 = 80970000 -/* 01D8C 8096B85C 3C098097 */ lui $t1, %hi(D_8096CE84) ## $t1 = 80970000 -/* 01D90 8096B860 00027880 */ sll $t7, $v0, 2 -/* 01D94 8096B864 030FC021 */ addu $t8, $t8, $t7 -/* 01D98 8096B868 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) -/* 01D9C 8096B86C 3C068097 */ lui $a2, %hi(D_8096CFD0) ## $a2 = 80970000 -/* 01DA0 8096B870 24C6CFD0 */ addiu $a2, $a2, %lo(D_8096CFD0) ## $a2 = 8096CFD0 -/* 01DA4 8096B874 AFB80070 */ sw $t8, 0x0070($sp) -/* 01DA8 8096B878 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 01DAC 8096B87C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC -/* 01DB0 8096B880 24070113 */ addiu $a3, $zero, 0x0113 ## $a3 = 00000113 -/* 01DB4 8096B884 0003C880 */ sll $t9, $v1, 2 -/* 01DB8 8096B888 01394821 */ addu $t1, $t1, $t9 -/* 01DBC 8096B88C 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) -/* 01DC0 8096B890 AFA90064 */ sw $t1, 0x0064($sp) -/* 01DC4 8096B894 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01DC8 8096B898 0C031AB1 */ jal Graph_OpenDisps -/* 01DCC 8096B89C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01DD0 8096B8A0 8FAB0084 */ lw $t3, 0x0084($sp) -/* 01DD4 8096B8A4 0C024F61 */ jal func_80093D84 -/* 01DD8 8096B8A8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01DDC 8096B8AC 8FA40070 */ lw $a0, 0x0070($sp) -/* 01DE0 8096B8B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01DE4 8096B8B4 3C058016 */ lui $a1, %hi(gSegments) -/* 01DE8 8096B8B8 00047900 */ sll $t7, $a0, 4 -/* 01DEC 8096B8BC 000FC702 */ srl $t8, $t7, 28 -/* 01DF0 8096B8C0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 01DF4 8096B8C4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01DF8 8096B8C8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 01DFC 8096B8CC 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01E00 8096B8D0 00187080 */ sll $t6, $t8, 2 -/* 01E04 8096B8D4 24A56FA8 */ addiu $a1, %lo(gSegments) -/* 01E08 8096B8D8 00AEC821 */ addu $t9, $a1, $t6 -/* 01E0C 8096B8DC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01E10 8096B8E0 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 01E14 8096B8E4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 01E18 8096B8E8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 01E1C 8096B8EC 00865024 */ and $t2, $a0, $a2 -/* 01E20 8096B8F0 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01E24 8096B8F4 012A5821 */ addu $t3, $t1, $t2 -/* 01E28 8096B8F8 01676021 */ addu $t4, $t3, $a3 -/* 01E2C 8096B8FC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01E30 8096B900 8FA40064 */ lw $a0, 0x0064($sp) -/* 01E34 8096B904 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01E38 8096B908 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01E3C 8096B90C 0004C100 */ sll $t8, $a0, 4 -/* 01E40 8096B910 00187702 */ srl $t6, $t8, 28 -/* 01E44 8096B914 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01E48 8096B918 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01E4C 8096B91C 000EC880 */ sll $t9, $t6, 2 -/* 01E50 8096B920 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 01E54 8096B924 00B94821 */ addu $t1, $a1, $t9 -/* 01E58 8096B928 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01E5C 8096B92C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 01E60 8096B930 00865824 */ and $t3, $a0, $a2 -/* 01E64 8096B934 3C040600 */ lui $a0, %hi(D_06007FC0) ## $a0 = 06000000 -/* 01E68 8096B938 014B6021 */ addu $t4, $t2, $t3 -/* 01E6C 8096B93C 01876821 */ addu $t5, $t4, $a3 -/* 01E70 8096B940 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01E74 8096B944 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01E78 8096B948 24847FC0 */ addiu $a0, $a0, %lo(D_06007FC0) ## $a0 = 06007FC0 -/* 01E7C 8096B94C 00047100 */ sll $t6, $a0, 4 -/* 01E80 8096B950 000ECF02 */ srl $t9, $t6, 28 -/* 01E84 8096B954 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01E88 8096B958 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01E8C 8096B95C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 01E90 8096B960 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 01E94 8096B964 00194880 */ sll $t1, $t9, 2 -/* 01E98 8096B968 00A95021 */ addu $t2, $a1, $t1 -/* 01E9C 8096B96C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01EA0 8096B970 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 01EA4 8096B974 00866024 */ and $t4, $a0, $a2 -/* 01EA8 8096B978 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 01EAC 8096B97C 016C6821 */ addu $t5, $t3, $t4 -/* 01EB0 8096B980 01A77821 */ addu $t7, $t5, $a3 -/* 01EB4 8096B984 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01EB8 8096B988 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01EBC 8096B98C 8FA80080 */ lw $t0, 0x0080($sp) -/* 01EC0 8096B990 3C0C8011 */ lui $t4, %hi(D_80116280) -/* 01EC4 8096B994 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01EC8 8096B998 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 01ECC 8096B99C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01ED0 8096B9A0 8D1901A8 */ lw $t9, 0x01A8($t0) ## 000001A8 -/* 01ED4 8096B9A4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01ED8 8096B9A8 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 01EDC 8096B9AC 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 01EE0 8096B9B0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 01EE4 8096B9B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01EE8 8096B9B8 258C6280 */ addiu $t4, %lo(D_80116280) -/* 01EEC 8096B9BC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01EF0 8096B9C0 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 01EF4 8096B9C4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01EF8 8096B9C8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01EFC 8096B9CC 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C -/* 01F00 8096B9D0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 01F04 8096B9D4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 01F08 8096B9D8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01F0C 8096B9DC AFA00018 */ sw $zero, 0x0018($sp) -/* 01F10 8096B9E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 01F14 8096B9E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F18 8096B9E8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01F1C 8096B9EC 8FA40084 */ lw $a0, 0x0084($sp) -/* 01F20 8096B9F0 0C0289CF */ jal SkelAnime_DrawFlex -/* 01F24 8096B9F4 AFAD001C */ sw $t5, 0x001C($sp) -/* 01F28 8096B9F8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01F2C 8096B9FC 8FAF0084 */ lw $t7, 0x0084($sp) -/* 01F30 8096BA00 3C068097 */ lui $a2, %hi(D_8096CFF4) ## $a2 = 80970000 -/* 01F34 8096BA04 24C6CFF4 */ addiu $a2, $a2, %lo(D_8096CFF4) ## $a2 = 8096CFF4 -/* 01F38 8096BA08 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC -/* 01F3C 8096BA0C 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 01F40 8096BA10 0C031AD5 */ jal Graph_CloseDisps -/* 01F44 8096BA14 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01F48 8096BA18 8FBF002C */ lw $ra, 0x002C($sp) -/* 01F4C 8096BA1C 8FB00028 */ lw $s0, 0x0028($sp) -/* 01F50 8096BA20 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01F54 8096BA24 03E00008 */ jr $ra -/* 01F58 8096BA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s deleted file mode 100644 index ae89ed5665..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8096BA2C -/* 01F5C 8096BA2C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01F60 8096BA30 AFB00028 */ sw $s0, 0x0028($sp) -/* 01F64 8096BA34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F68 8096BA38 AFBF002C */ sw $ra, 0x002C($sp) -/* 01F6C 8096BA3C AFA50034 */ sw $a1, 0x0034($sp) -/* 01F70 8096BA40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01F74 8096BA44 3C060601 */ lui $a2, %hi(D_06011CA8) ## $a2 = 06010000 -/* 01F78 8096BA48 3C070600 */ lui $a3, %hi(D_060067CC) ## $a3 = 06000000 -/* 01F7C 8096BA4C 24E767CC */ addiu $a3, $a3, %lo(D_060067CC) ## $a3 = 060067CC -/* 01F80 8096BA50 24C61CA8 */ addiu $a2, $a2, %lo(D_06011CA8) ## $a2 = 06011CA8 -/* 01F84 8096BA54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01F88 8096BA58 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F8C 8096BA5C AFA00014 */ sw $zero, 0x0014($sp) -/* 01F90 8096BA60 0C0291BE */ jal SkelAnime_InitFlex -/* 01F94 8096BA64 AFA00018 */ sw $zero, 0x0018($sp) -/* 01F98 8096BA68 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 01F9C 8096BA6C AE0E0198 */ sw $t6, 0x0198($s0) ## 00000198 -/* 01FA0 8096BA70 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C -/* 01FA4 8096BA74 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 01FA8 8096BA78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FAC 8096BA7C 0C25A6E3 */ jal func_80969B8C -/* 01FB0 8096BA80 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01FB4 8096BA84 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FB8 8096BA88 8FB00028 */ lw $s0, 0x0028($sp) -/* 01FBC 8096BA8C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01FC0 8096BA90 03E00008 */ jr $ra -/* 01FC4 8096BA94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s deleted file mode 100644 index 7b0e57c1bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8096BA98 -/* 01FC8 8096BA98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01FCC 8096BA9C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01FD0 8096BAA0 C48401A4 */ lwc1 $f4, 0x01A4($a0) ## 000001A4 -/* 01FD4 8096BAA4 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01FD8 8096BAA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01FDC 8096BAAC 46062200 */ add.s $f8, $f4, $f6 -/* 01FE0 8096BAB0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01FE4 8096BAB4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 01FE8 8096BAB8 E48801A4 */ swc1 $f8, 0x01A4($a0) ## 000001A4 -/* 01FEC 8096BABC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01FF0 8096BAC0 C48401A4 */ lwc1 $f4, 0x01A4($a0) ## 000001A4 -/* 01FF4 8096BAC4 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 01FF8 8096BAC8 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01FFC 8096BACC 00000000 */ nop -/* 02000 8096BAD0 46805420 */ cvt.s.w $f16, $f10 -/* 02004 8096BAD4 46128000 */ add.s $f0, $f16, $f18 -/* 02008 8096BAD8 4604003E */ c.le.s $f0, $f4 -/* 0200C 8096BADC 00000000 */ nop -/* 02010 8096BAE0 45020005 */ bc1fl .L8096BAF8 -/* 02014 8096BAE4 C48601A4 */ lwc1 $f6, 0x01A4($a0) ## 000001A4 -/* 02018 8096BAE8 AC8201A8 */ sw $v0, 0x01A8($a0) ## 000001A8 -/* 0201C 8096BAEC 03E00008 */ jr $ra -/* 02020 8096BAF0 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L8096BAF4: -/* 02024 8096BAF4 C48601A4 */ lwc1 $f6, 0x01A4($a0) ## 000001A4 -.L8096BAF8: -/* 02028 8096BAF8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0202C 8096BAFC 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 02030 8096BB00 46003203 */ div.s $f8, $f6, $f0 -/* 02034 8096BB04 460A4402 */ mul.s $f16, $f8, $f10 -/* 02038 8096BB08 4600848D */ trunc.w.s $f18, $f16 -/* 0203C 8096BB0C 44029000 */ mfc1 $v0, $f18 -/* 02040 8096BB10 00000000 */ nop -/* 02044 8096BB14 AC8201A8 */ sw $v0, 0x01A8($a0) ## 000001A8 -/* 02048 8096BB18 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 0204C 8096BB1C 03E00008 */ jr $ra -/* 02050 8096BB20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s deleted file mode 100644 index 20ebd04604..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8096BB24 -/* 02054 8096BB24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02058 8096BB28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0205C 8096BB2C AFA40018 */ sw $a0, 0x0018($sp) -/* 02060 8096BB30 0C25A757 */ jal func_80969D5C -/* 02064 8096BB34 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02068 8096BB38 8FA40018 */ lw $a0, 0x0018($sp) -/* 0206C 8096BB3C 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 02070 8096BB40 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02074 8096BB44 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 02078 8096BB48 AC8F019C */ sw $t7, 0x019C($a0) ## 0000019C -/* 0207C 8096BB4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02080 8096BB50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02084 8096BB54 03E00008 */ jr $ra -/* 02088 8096BB58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s deleted file mode 100644 index af3c2ad999..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8096BB5C -/* 0208C 8096BB5C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 02090 8096BB60 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 02094 8096BB64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02098 8096BB68 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 0209C 8096BB6C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 020A0 8096BB70 C48401A4 */ lwc1 $f4, 0x01A4($a0) ## 000001A4 -/* 020A4 8096BB74 2418001A */ addiu $t8, $zero, 0x001A ## $t8 = 0000001A -/* 020A8 8096BB78 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 020AC 8096BB7C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 020B0 8096BB80 46803220 */ cvt.s.w $f8, $f6 -/* 020B4 8096BB84 460A4400 */ add.s $f16, $f8, $f10 -/* 020B8 8096BB88 4604803E */ c.le.s $f16, $f4 -/* 020BC 8096BB8C 00000000 */ nop -/* 020C0 8096BB90 45000003 */ bc1f .L8096BBA0 -/* 020C4 8096BB94 00000000 */ nop -/* 020C8 8096BB98 AC980198 */ sw $t8, 0x0198($a0) ## 00000198 -/* 020CC 8096BB9C AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -.L8096BBA0: -/* 020D0 8096BBA0 03E00008 */ jr $ra -/* 020D4 8096BBA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s deleted file mode 100644 index 781d04eed6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096BBA8 -/* 020D8 8096BBA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 020DC 8096BBAC AFBF001C */ sw $ra, 0x001C($sp) -/* 020E0 8096BBB0 3C050600 */ lui $a1, %hi(D_06005458) ## $a1 = 06000000 -/* 020E4 8096BBB4 AFA40020 */ sw $a0, 0x0020($sp) -/* 020E8 8096BBB8 24A55458 */ addiu $a1, $a1, %lo(D_06005458) ## $a1 = 06005458 -/* 020EC 8096BBBC AFA00010 */ sw $zero, 0x0010($sp) -/* 020F0 8096BBC0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 020F4 8096BBC4 0C25A777 */ jal func_80969DDC -/* 020F8 8096BBC8 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 020FC 8096BBCC 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02100 8096BBD0 240E001B */ addiu $t6, $zero, 0x001B ## $t6 = 0000001B -/* 02104 8096BBD4 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 02108 8096BBD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0210C 8096BBDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02110 8096BBE0 03E00008 */ jr $ra -/* 02114 8096BBE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s deleted file mode 100644 index cc797a6c31..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096BBE8 -/* 02118 8096BBE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0211C 8096BBEC AFBF001C */ sw $ra, 0x001C($sp) -/* 02120 8096BBF0 3C050600 */ lui $a1, %hi(D_06006104) ## $a1 = 06000000 -/* 02124 8096BBF4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02128 8096BBF8 24A56104 */ addiu $a1, $a1, %lo(D_06006104) ## $a1 = 06006104 -/* 0212C 8096BBFC AFA00010 */ sw $zero, 0x0010($sp) -/* 02130 8096BC00 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02134 8096BC04 0C25A777 */ jal func_80969DDC -/* 02138 8096BC08 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0213C 8096BC0C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02140 8096BC10 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 02144 8096BC14 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 02148 8096BC18 8FBF001C */ lw $ra, 0x001C($sp) -/* 0214C 8096BC1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02150 8096BC20 03E00008 */ jr $ra -/* 02154 8096BC24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s deleted file mode 100644 index ac906f17bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096BC28 -/* 02158 8096BC28 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0215C 8096BC2C AFBF001C */ sw $ra, 0x001C($sp) -/* 02160 8096BC30 10A0000A */ beq $a1, $zero, .L8096BC5C -/* 02164 8096BC34 AFA40020 */ sw $a0, 0x0020($sp) -/* 02168 8096BC38 3C050600 */ lui $a1, %hi(D_060067CC) ## $a1 = 06000000 -/* 0216C 8096BC3C 24A567CC */ addiu $a1, $a1, %lo(D_060067CC) ## $a1 = 060067CC -/* 02170 8096BC40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02174 8096BC44 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02178 8096BC48 0C25A777 */ jal func_80969DDC -/* 0217C 8096BC4C AFA00010 */ sw $zero, 0x0010($sp) -/* 02180 8096BC50 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02184 8096BC54 240E001A */ addiu $t6, $zero, 0x001A ## $t6 = 0000001A -/* 02188 8096BC58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -.L8096BC5C: -/* 0218C 8096BC5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02190 8096BC60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02194 8096BC64 03E00008 */ jr $ra -/* 02198 8096BC68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s deleted file mode 100644 index 78180d6c27..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s +++ /dev/null @@ -1,62 +0,0 @@ -.rdata -glabel D_8096D018 - .asciz "Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.text -glabel func_8096BC6C -/* 0219C 8096BC6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 021A0 8096BC70 AFB00018 */ sw $s0, 0x0018($sp) -/* 021A4 8096BC74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021A8 8096BC78 AFBF001C */ sw $ra, 0x001C($sp) -/* 021AC 8096BC7C AFA5002C */ sw $a1, 0x002C($sp) -/* 021B0 8096BC80 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 021B4 8096BC84 0C25A728 */ jal func_80969CA0 -/* 021B8 8096BC88 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 021BC 8096BC8C 50400023 */ beql $v0, $zero, .L8096BD1C -/* 021C0 8096BC90 8FBF001C */ lw $ra, 0x001C($sp) -/* 021C4 8096BC94 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 021C8 8096BC98 8E0301B0 */ lw $v1, 0x01B0($s0) ## 000001B0 -/* 021CC 8096BC9C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 021D0 8096BCA0 50C3001E */ beql $a2, $v1, .L8096BD1C -/* 021D4 8096BCA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 021D8 8096BCA8 10C10009 */ beq $a2, $at, .L8096BCD0 -/* 021DC 8096BCAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021E0 8096BCB0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 021E4 8096BCB4 10C1000B */ beq $a2, $at, .L8096BCE4 -/* 021E8 8096BCB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021EC 8096BCBC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 021F0 8096BCC0 10C1000C */ beq $a2, $at, .L8096BCF4 -/* 021F4 8096BCC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F8 8096BCC8 1000000E */ beq $zero, $zero, .L8096BD04 -/* 021FC 8096BCCC 3C048097 */ lui $a0, %hi(D_8096D018) ## $a0 = 80970000 -.L8096BCD0: -/* 02200 8096BCD0 8FA5002C */ lw $a1, 0x002C($sp) -/* 02204 8096BCD4 0C25AEC9 */ jal func_8096BB24 -/* 02208 8096BCD8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0220C 8096BCDC 1000000D */ beq $zero, $zero, .L8096BD14 -/* 02210 8096BCE0 8FA60020 */ lw $a2, 0x0020($sp) -.L8096BCE4: -/* 02214 8096BCE4 0C25AEEA */ jal func_8096BBA8 -/* 02218 8096BCE8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0221C 8096BCEC 10000009 */ beq $zero, $zero, .L8096BD14 -/* 02220 8096BCF0 8FA60020 */ lw $a2, 0x0020($sp) -.L8096BCF4: -/* 02224 8096BCF4 0C25AEFA */ jal func_8096BBE8 -/* 02228 8096BCF8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0222C 8096BCFC 10000005 */ beq $zero, $zero, .L8096BD14 -/* 02230 8096BD00 8FA60020 */ lw $a2, 0x0020($sp) -.L8096BD04: -/* 02234 8096BD04 2484D018 */ addiu $a0, $a0, %lo(D_8096D018) ## $a0 = FFFFD018 -/* 02238 8096BD08 0C00084C */ jal osSyncPrintf - -/* 0223C 8096BD0C AFA60020 */ sw $a2, 0x0020($sp) -/* 02240 8096BD10 8FA60020 */ lw $a2, 0x0020($sp) -.L8096BD14: -/* 02244 8096BD14 AE0601B0 */ sw $a2, 0x01B0($s0) ## 000001B0 -/* 02248 8096BD18 8FBF001C */ lw $ra, 0x001C($sp) -.L8096BD1C: -/* 0224C 8096BD1C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02250 8096BD20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02254 8096BD24 03E00008 */ jr $ra -/* 02258 8096BD28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s deleted file mode 100644 index f38919ba49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8096BD2C -/* 0225C 8096BD2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02260 8096BD30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02264 8096BD34 0C25AF1B */ jal func_8096BC6C -/* 02268 8096BD38 00000000 */ nop -/* 0226C 8096BD3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02270 8096BD40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02274 8096BD44 03E00008 */ jr $ra -/* 02278 8096BD48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s deleted file mode 100644 index af24c6bd95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8096BD4C -/* 0227C 8096BD4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02280 8096BD50 AFBF001C */ sw $ra, 0x001C($sp) -/* 02284 8096BD54 AFB00018 */ sw $s0, 0x0018($sp) -/* 02288 8096BD58 0C25A716 */ jal func_80969C58 -/* 0228C 8096BD5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02290 8096BD60 0C25A70E */ jal func_80969C38 -/* 02294 8096BD64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02298 8096BD68 0C25A6BC */ jal func_80969AF0 -/* 0229C 8096BD6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022A0 8096BD70 0C25AEA6 */ jal func_8096BA98 -/* 022A4 8096BD74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022A8 8096BD78 0C25AED7 */ jal func_8096BB5C -/* 022AC 8096BD7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022B0 8096BD80 8FBF001C */ lw $ra, 0x001C($sp) -/* 022B4 8096BD84 8FB00018 */ lw $s0, 0x0018($sp) -/* 022B8 8096BD88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022BC 8096BD8C 03E00008 */ jr $ra -/* 022C0 8096BD90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s deleted file mode 100644 index d203c3424f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096BD94 -/* 022C4 8096BD94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 022C8 8096BD98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 022CC 8096BD9C AFA40018 */ sw $a0, 0x0018($sp) -/* 022D0 8096BDA0 0C25A716 */ jal func_80969C58 -/* 022D4 8096BDA4 AFA5001C */ sw $a1, 0x001C($sp) -/* 022D8 8096BDA8 0C25A70E */ jal func_80969C38 -/* 022DC 8096BDAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 022E0 8096BDB0 0C25A6BC */ jal func_80969AF0 -/* 022E4 8096BDB4 8FA40018 */ lw $a0, 0x0018($sp) -/* 022E8 8096BDB8 8FA40018 */ lw $a0, 0x0018($sp) -/* 022EC 8096BDBC 0C25AF1B */ jal func_8096BC6C -/* 022F0 8096BDC0 8FA5001C */ lw $a1, 0x001C($sp) -/* 022F4 8096BDC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 022F8 8096BDC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 022FC 8096BDCC 03E00008 */ jr $ra -/* 02300 8096BDD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s deleted file mode 100644 index 3b510486eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096BDD4 -/* 02304 8096BDD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02308 8096BDD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0230C 8096BDDC AFA40018 */ sw $a0, 0x0018($sp) -/* 02310 8096BDE0 0C25A716 */ jal func_80969C58 -/* 02314 8096BDE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02318 8096BDE8 0C25A70E */ jal func_80969C38 -/* 0231C 8096BDEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02320 8096BDF0 0C25A6BC */ jal func_80969AF0 -/* 02324 8096BDF4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02328 8096BDF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0232C 8096BDFC 0C25AF1B */ jal func_8096BC6C -/* 02330 8096BE00 8FA5001C */ lw $a1, 0x001C($sp) -/* 02334 8096BE04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02338 8096BE08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0233C 8096BE0C 03E00008 */ jr $ra -/* 02340 8096BE10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s deleted file mode 100644 index 6efcf85d4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8096BE14 -/* 02344 8096BE14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02348 8096BE18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0234C 8096BE1C 0C25A716 */ jal func_80969C58 -/* 02350 8096BE20 AFA40020 */ sw $a0, 0x0020($sp) -/* 02354 8096BE24 0C25A70E */ jal func_80969C38 -/* 02358 8096BE28 8FA40020 */ lw $a0, 0x0020($sp) -/* 0235C 8096BE2C AFA2001C */ sw $v0, 0x001C($sp) -/* 02360 8096BE30 0C25A6BC */ jal func_80969AF0 -/* 02364 8096BE34 8FA40020 */ lw $a0, 0x0020($sp) -/* 02368 8096BE38 8FA40020 */ lw $a0, 0x0020($sp) -/* 0236C 8096BE3C 0C25AF0A */ jal func_8096BC28 -/* 02370 8096BE40 8FA5001C */ lw $a1, 0x001C($sp) -/* 02374 8096BE44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02378 8096BE48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0237C 8096BE4C 03E00008 */ jr $ra -/* 02380 8096BE50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s deleted file mode 100644 index 63bde1a447..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8096BF54 -/* 02484 8096BF54 AFA40000 */ sw $a0, 0x0000($sp) -/* 02488 8096BF58 03E00008 */ jr $ra -/* 0248C 8096BF5C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s deleted file mode 100644 index 4adab1391a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s +++ /dev/null @@ -1,129 +0,0 @@ -.rdata -glabel D_8096D090 - .asciz "../z_demo_du.c" - .balign 4 - -glabel D_8096D0A0 - .asciz "../z_demo_du.c" - .balign 4 - -.text -glabel func_8096BF60 -/* 02490 8096BF60 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 02494 8096BF64 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02498 8096BF68 AFA40078 */ sw $a0, 0x0078($sp) -/* 0249C 8096BF6C AFA5007C */ sw $a1, 0x007C($sp) -/* 024A0 8096BF70 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 024A4 8096BF74 3C188097 */ lui $t8, %hi(D_8096CE74) ## $t8 = 80970000 -/* 024A8 8096BF78 3C098097 */ lui $t1, %hi(D_8096CE84) ## $t1 = 80970000 -/* 024AC 8096BF7C 00027880 */ sll $t7, $v0, 2 -/* 024B0 8096BF80 030FC021 */ addu $t8, $t8, $t7 -/* 024B4 8096BF84 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) -/* 024B8 8096BF88 3C068097 */ lui $a2, %hi(D_8096D090) ## $a2 = 80970000 -/* 024BC 8096BF8C 24C6D090 */ addiu $a2, $a2, %lo(D_8096D090) ## $a2 = 8096D090 -/* 024C0 8096BF90 AFB80068 */ sw $t8, 0x0068($sp) -/* 024C4 8096BF94 84830194 */ lh $v1, 0x0194($a0) ## 00000194 -/* 024C8 8096BF98 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC -/* 024CC 8096BF9C 24070267 */ addiu $a3, $zero, 0x0267 ## $a3 = 00000267 -/* 024D0 8096BFA0 0003C880 */ sll $t9, $v1, 2 -/* 024D4 8096BFA4 01394821 */ addu $t1, $t1, $t9 -/* 024D8 8096BFA8 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) -/* 024DC 8096BFAC AFA9005C */ sw $t1, 0x005C($sp) -/* 024E0 8096BFB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 024E4 8096BFB4 0C031AB1 */ jal Graph_OpenDisps -/* 024E8 8096BFB8 AFA50054 */ sw $a1, 0x0054($sp) -/* 024EC 8096BFBC 8FAB007C */ lw $t3, 0x007C($sp) -/* 024F0 8096BFC0 0C024F46 */ jal func_80093D18 -/* 024F4 8096BFC4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 024F8 8096BFC8 8FA80054 */ lw $t0, 0x0054($sp) -/* 024FC 8096BFCC 8FA40068 */ lw $a0, 0x0068($sp) -/* 02500 8096BFD0 3C058016 */ lui $a1, %hi(gSegments) -/* 02504 8096BFD4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02508 8096BFD8 00047900 */ sll $t7, $a0, 4 -/* 0250C 8096BFDC 000FC702 */ srl $t8, $t7, 28 -/* 02510 8096BFE0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 02514 8096BFE4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 02518 8096BFE8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 0251C 8096BFEC 00187080 */ sll $t6, $t8, 2 -/* 02520 8096BFF0 24A56FA8 */ addiu $a1, %lo(gSegments) -/* 02524 8096BFF4 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 02528 8096BFF8 00AEC821 */ addu $t9, $a1, $t6 -/* 0252C 8096BFFC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 02530 8096C000 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 02534 8096C004 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 02538 8096C008 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0253C 8096C00C 00865024 */ and $t2, $a0, $a2 -/* 02540 8096C010 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02544 8096C014 012A5821 */ addu $t3, $t1, $t2 -/* 02548 8096C018 01676021 */ addu $t4, $t3, $a3 -/* 0254C 8096C01C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 02550 8096C020 8FA4005C */ lw $a0, 0x005C($sp) -/* 02554 8096C024 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02558 8096C028 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0255C 8096C02C 0004C100 */ sll $t8, $a0, 4 -/* 02560 8096C030 00187702 */ srl $t6, $t8, 28 -/* 02564 8096C034 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02568 8096C038 000EC880 */ sll $t9, $t6, 2 -/* 0256C 8096C03C 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 02570 8096C040 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 02574 8096C044 00B94821 */ addu $t1, $a1, $t9 -/* 02578 8096C048 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0257C 8096C04C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 02580 8096C050 00865824 */ and $t3, $a0, $a2 -/* 02584 8096C054 3C040600 */ lui $a0, %hi(D_06007FC0) ## $a0 = 06000000 -/* 02588 8096C058 014B6021 */ addu $t4, $t2, $t3 -/* 0258C 8096C05C 01876821 */ addu $t5, $t4, $a3 -/* 02590 8096C060 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 02594 8096C064 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02598 8096C068 24847FC0 */ addiu $a0, $a0, %lo(D_06007FC0) ## $a0 = 06007FC0 -/* 0259C 8096C06C 00047100 */ sll $t6, $a0, 4 -/* 025A0 8096C070 000ECF02 */ srl $t9, $t6, 28 -/* 025A4 8096C074 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 025A8 8096C078 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 025AC 8096C07C 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 025B0 8096C080 00194880 */ sll $t1, $t9, 2 -/* 025B4 8096C084 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 025B8 8096C088 00A95021 */ addu $t2, $a1, $t1 -/* 025BC 8096C08C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 025C0 8096C090 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 025C4 8096C094 00866024 */ and $t4, $a0, $a2 -/* 025C8 8096C098 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 025CC 8096C09C 016C6821 */ addu $t5, $t3, $t4 -/* 025D0 8096C0A0 01A77821 */ addu $t7, $t5, $a3 -/* 025D4 8096C0A4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 025D8 8096C0A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 025DC 8096C0AC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 025E0 8096C0B0 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) -/* 025E4 8096C0B4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 025E8 8096C0B8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 025EC 8096C0BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 025F0 8096C0C0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 025F4 8096C0C4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 025F8 8096C0C8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 025FC 8096C0CC 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 02600 8096C0D0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 02604 8096C0D4 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 02608 8096C0D8 256B6290 */ addiu $t3, %lo(D_80116280+0x10) -/* 0260C 8096C0DC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 02610 8096C0E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02614 8096C0E4 8FA30078 */ lw $v1, 0x0078($sp) -/* 02618 8096C0E8 8FA4007C */ lw $a0, 0x007C($sp) -/* 0261C 8096C0EC 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 02620 8096C0F0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 02624 8096C0F4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 02628 8096C0F8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0262C 8096C0FC AFA00014 */ sw $zero, 0x0014($sp) -/* 02630 8096C100 AFA00010 */ sw $zero, 0x0010($sp) -/* 02634 8096C104 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 02638 8096C108 AFA30018 */ sw $v1, 0x0018($sp) -/* 0263C 8096C10C 8FAC007C */ lw $t4, 0x007C($sp) -/* 02640 8096C110 3C068097 */ lui $a2, %hi(D_8096D0A0) ## $a2 = 80970000 -/* 02644 8096C114 24C6D0A0 */ addiu $a2, $a2, %lo(D_8096D0A0) ## $a2 = 8096D0A0 -/* 02648 8096C118 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC -/* 0264C 8096C11C 2407027E */ addiu $a3, $zero, 0x027E ## $a3 = 0000027E -/* 02650 8096C120 0C031AD5 */ jal Graph_CloseDisps -/* 02654 8096C124 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02658 8096C128 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0265C 8096C12C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 02660 8096C130 03E00008 */ jr $ra -/* 02664 8096C134 00000000 */ nop diff --git a/data/overlays/actors/z_demo_du.data.s b/data/overlays/actors/z_demo_du.data.s deleted file mode 100644 index 9eebb10b50..0000000000 --- a/data/overlays/actors/z_demo_du.data.s +++ /dev/null @@ -1,71 +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 - -.word 0x00000000 -glabel D_8096C1A4 - .word 0x0000001F, 0x00000BB8, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, 0x00010000, 0x02220000, 0x00000000, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x00020222, 0x02230000, 0x00000000, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x00040223, 0x02680000, 0x00000000, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x00020268, 0x029B0000, 0x00000000, 0x00000000, 0x000000D8, 0xFFFFFFF6, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0xC0282828, 0x00000000, 0x0003029B, 0x0B120000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x000D0000, 0x01180000, 0x6AAA0000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00050118, 0x02130000, 0x6AAA0000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00130213, 0x06B40000, 0xEAAA0000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000029, 0x00000003, 0x00010000, 0x00AA0000, 0x00000000, 0x00000062, 0x00000006, 0xFFFFFF57, 0x00000062, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000200AA, 0x01D10000, 0x00000000, 0x00000062, 0x00000006, 0xFFFFFF57, 0x00000062, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x000301D1, 0x0B630000, 0x00000000, 0x00000062, 0x00000006, 0xFFFFFF57, 0x00000062, 0x00000006, 0xFFFFFF57, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x00010212, 0x021B021B, 0x0000002D, 0x00000001, 0x0005021C, 0x023A023A, 0x00000004, 0x00000002, 0x00010000, 0x000A0000, 0x00000000, 0xFFFFFFDC, 0x00000000, 0x00000018, 0xFFFFFFDC, 0x00000000, 0x00000018, 0x00000000, 0x00000000, 0x00000000, 0x0001000A, 0x0BB80000, 0x00000000, 0xFFFFFFDC, 0x00000000, 0x00000018, 0xFFFFFFDC, 0x00000000, 0x00000018, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x00010325, 0x03430343, 0x0000003E, 0x00000001, 0x00040000, 0x0BB80000, 0x00000000, 0x00000020, 0x00000050, 0xFFFFFFCD, 0x00000020, 0x00000050, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000001, 0x00620389, 0x04060406, 0x00000056, 0x00000001, 0x00440267, 0x02680000, 0x00000000, 0xFFFFFF97, 0x00000000, 0x00000030, 0xFFFFFF97, 0x00000000, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x000401F4, 0x02260000, 0x00000000, 0x00000000, 0xFFFFFFC3, 0x0000006E, 0x00000000, 0xFFFFFFC3, 0x0000006E, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x0000000A, 0xFFFF0000, 0x0136FFFF, 0xFFFFFFFF, 0x303C0136, 0x01430000, 0x00000000, 0xFFFF0143, 0x0158FFFF, 0xFFFFFFFF, 0x30450158, 0x018A0000, 0x00000000, 0xFFFF018A, 0x019FFFFF, 0xFFFFFFFF, 0x3046019F, 0x01D10000, 0x00000000, 0xFFFF01D1, 0x0320FFFF, 0xFFFFFFFF, 0x003C0320, 0x03250000, 0x00000000, 0xFFFF0325, 0x0361FFFF, 0xFFFFFFFF, 0x303D0361, 0x036B0000, 0x00000000, 0x00000001, 0x00010000, 0x05510000, 0x00000000, 0x4271999A, 0xFFAB0C8B, 0x031B00C6, 0x00000000, 0x4271999A, 0xFFAB0C8B, 0x031B00C8, 0x00000000, 0x4271999A, 0xFFAB0B6D, 0x031B00D7, 0x00000000, 0x4271999A, 0x004603CE, 0x01F100E8, 0x00000000, 0x4271999A, 0x0140010C, 0x012800EA, 0x00000000, 0x4271999A, 0x013800BE, 0x0096013D, 0x00000000, 0x4271999A, 0x0105003D, 0xFFBF013F, 0x00000000, 0x4271999A, 0x0105003D, 0xFFBF014E, 0x00000000, 0x4271999A, 0x0105003D, 0xFFBF015F, 0xFF000000, 0x4271999A, 0x0105003D, 0xFFBF0161, 0x00000001, 0x00010107, 0x01FD0000, 0x00000000, 0x41EB32F7, 0x0059001E, 0xFF9900C6, 0x00000000, 0x4270CCCD, 0x0059001E, 0xFF9900C8, 0x00000000, 0x4270CCCD, 0x0059001E, 0xFF9900D7, 0x00000000, 0x4270CCCD, 0x0059001E, 0xFF9900E8, 0xFF000000, 0x4270CCCD, 0x0059001E, 0xFF9900EA, 0x00000001, 0x0001014D, 0x05900000, 0x00000000, 0x4237FFF2, 0x00720032, 0xFF8C00C6, 0x00000000, 0x4237FFF2, 0x00720032, 0xFF8C00C8, 0x00000000, 0x4237FFF2, 0x00720032, 0xFF8C00D7, 0x00000000, 0x4237FFF2, 0x00720032, 0xFF8C00E8, 0xFF000000, 0x4237FFF2, 0x00720032, 0xFF8C00EA, 0x00000001, 0x00010193, 0x05D60000, 0x00000000, 0x42366658, 0x001A002D, 0xFFF600C6, 0x00000000, 0x42366658, 0x001A002D, 0xFFF600C8, 0x00000000, 0x42366658, 0x001A002D, 0xFFF600D7, 0x00000000, 0x42366658, 0x001A002D, 0xFFF600E8, 0xFF000000, 0x42366658, 0x001A002D, 0xFFF600EA, 0x00000001, 0x000101BB, 0x06580000, 0x00000000, 0x4235998B, 0x000B0017, 0xFFEF00C6, 0x00000000, 0x4235998B, 0x000B0017, 0xFFEF00C8, 0x00000000, 0x4235998B, 0x001B001F, 0xFFD300D7, 0x00000000, 0x4235998B, 0x002D0028, 0xFFB400E8, 0x00000000, 0x4235998B, 0x002D0028, 0xFFB400EA, 0x00000000, 0x4235998B, 0x002D0028, 0xFFB4013D, 0x00000000, 0x4235998B, 0x002D0028, 0xFFB4013F, 0xFF000000, 0x4235998B, 0x002D0028, 0xFFB4002E, 0x00000001, 0x000101D9, 0x06440000, 0x00000000, 0x4234CCBE, 0x00C0001D, 0xFF0A00C6, 0x00000000, 0x4234CCBE, 0x00C0001D, 0xFF0A00C8, 0x00000000, 0x4234CCBE, 0x00C0001D, 0xFF0A00D7, 0x00000000, 0x4234CCBE, 0x00C0001D, 0xFF0A00E8, 0x00000000, 0x428CCCC2, 0x00C00116, 0xFF0A00EA, 0x00000000, 0x428CCCC2, 0x00C00116, 0xFF0A013D, 0x00000000, 0x428CCCC2, 0x00C00116, 0xFF0A013F, 0x00000000, 0x428CCCC2, 0x00C00116, 0xFF0A002E, 0xFF000000, 0x428CCCC2, 0x00C00116, 0xFF0A0063, 0x00000001, 0x0001021B, 0x03710000, 0x00000000, 0x42700000, 0x000D0356, 0x000200C6, 0x00000000, 0x42700000, 0x00090355, 0x000500C8, 0x00000000, 0x42700000, 0xFFFD0355, 0x000500D7, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA00E8, 0x00000000, 0x42700000, 0xFFFE0354, 0xFFEF00EA, 0x00000000, 0x42700000, 0x00090354, 0xFFEF013D, 0x00000000, 0x42700000, 0x00100354, 0xFFFA013F, 0x00000000, 0x42700000, 0x00090354, 0x0005002E, 0xFF000000, 0x42700000, 0xFFFD0353, 0x00050063, 0x00000005, 0x00010267, 0x07040000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE500C6, 0x00000000, 0x4289332C, 0x00000021, 0xFFE500C8, 0x00000000, 0x4289332C, 0x00000044, 0xFFE600D7, 0x00000000, 0x4289332C, 0x00000067, 0xFFE600E8, 0x00000000, 0x4289332C, 0x00000067, 0xFFE600EA, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6013D, 0x00000000, 0x4289332C, 0x00000067, 0xFFE6013F, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE6002E, 0x00000002, 0x00010000, 0x056E0000, 0x0000003C, 0x4271999A, 0xFF8D0C5B, 0x024900C6, 0x0000003C, 0x4271999A, 0xFF8D0C5B, 0x024900C8, 0x0000003C, 0x4271999A, 0xFF8D0B3D, 0x024900D7, 0x0000001E, 0x4271999A, 0x001B0338, 0x015C00E8, 0x00000028, 0x4271999A, 0x00C5008F, 0x00AE00EA, 0x00000028, 0x4271999A, 0x00930064, 0x0037013D, 0x00000028, 0x4271999A, 0x00370023, 0xFFBF013F, 0x000003E8, 0x4271999A, 0x00370023, 0xFFBF014E, 0x0000001E, 0x4271999A, 0x00370023, 0xFFBF015F, 0xFF00001E, 0x4271999A, 0x00380023, 0xFFBF0161, 0x00000002, 0x00010107, 0x021A0000, 0x0000001E, 0x429DFFE4, 0x0057009D, 0xFE7900C6, 0x00000052, 0x429D997E, 0x0057009D, 0xFE7900C8, 0x00000067, 0x428D998E, 0x0057009D, 0xFE7900D7, 0x0000001E, 0x4270CCCD, 0x0057009D, 0xFE7900E8, 0xFF00001E, 0x4270CCCD, 0x0057009D, 0xFE7900EA, 0x00000002, 0x0001014D, 0x05AD0000, 0x0000001E, 0x4237FFF2, 0xFFCC007F, 0xFECB00C6, 0x0000001E, 0x4237FFF2, 0xFFCC007F, 0xFECB00C8, 0x000003E8, 0x4237FFF2, 0xFFCC007F, 0xFECB00D7, 0x0000001E, 0x4237FFF2, 0xFFCC007F, 0xFECB00E8, 0xFF00001E, 0x4237FFF2, 0xFFCC007F, 0xFECB00EA, 0x00000002, 0x00010193, 0x05F30000, 0x0000001E, 0x42366658, 0xFEF300BA, 0x000D00C6, 0x0000001E, 0x42366658, 0xFEF300BA, 0x000D00C8, 0x000003E8, 0x42366658, 0xFEF300BA, 0x000D00D7, 0x0000001E, 0x42366658, 0xFEF300BA, 0x000D00E8, 0xFF00001E, 0x42366658, 0xFEF300BA, 0x000D00EA, 0x00000002, 0x000101BB, 0x06750000, 0x0000001E, 0x4235998B, 0x00A30046, 0xFEE500C6, 0x0000001E, 0x4235998B, 0x00A30046, 0xFEE500C8, 0x0000001E, 0x4235998B, 0x00B1004A, 0xFECB00D7, 0x0000001E, 0x4235998B, 0x00C1005C, 0xFEAF00E8, 0x0000001E, 0x4235998B, 0x00C1005C, 0xFEAF00EA, 0x000003E8, 0x4235998B, 0x00C0005B, 0xFEB0013D, 0x0000001E, 0x4235998B, 0x00C0005B, 0xFEB0013F, 0xFF00001E, 0x4235998B, 0x00C0005B, 0xFEB0002E, 0x00000002, 0x000101D9, 0x06610000, 0x00000014, 0x4234CCBE, 0xFFF70039, 0xFFCB00C6, 0x00000014, 0x4234CCBE, 0xFFF70039, 0xFFCB00C8, 0x00000014, 0x4234CCBE, 0xFFF70039, 0xFFCA00D7, 0x00000014, 0x4237FFF2, 0xFFF80039, 0xFFCA00E8, 0x0000000A, 0x428CCCC2, 0x00950223, 0xFF3300EA, 0x0000000A, 0x428CCCC2, 0x00950223, 0xFF33013D, 0x000003E8, 0x428CCCC2, 0x00950223, 0xFF33013F, 0x0000001E, 0x428CCCC2, 0x00950223, 0xFF33002E, 0xFF00001E, 0x428CCCC2, 0x00950223, 0xFF330063, 0x00000002, 0x0001021B, 0x03A20000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA00C6, 0x00000028, 0x42700000, 0x00030006, 0xFFFA00C8, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFA00D7, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA00E8, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA00EA, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA013D, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA013F, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA002E, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA0063, 0x00000006, 0x00010267, 0x07210000, 0x0000001E, 0x4289332C, 0x00000064, 0x000500C6, 0x0000001E, 0x4289332C, 0x00000065, 0x000600C8, 0x0000001E, 0x4289332C, 0x00010063, 0x002900D7, 0x0000001E, 0x4289332C, 0x0000002A, 0x001000E8, 0x0000001E, 0x4289332C, 0x0000002A, 0x001000EA, 0x000003E8, 0x4289332C, 0x0000002A, 0x0010013D, 0x0000001E, 0x4289332C, 0x0000002A, 0x0010013F, 0xFF00001E, 0x4289332C, 0x0000002A, 0x0010002E, 0xFFFFFFFF, 0x00000000 -glabel D_8096CE74 - .word 0x06008080, 0x06008480, 0x06008880, 0x0600A540 -glabel D_8096CE84 - .word 0x06008C80, 0x06009D40, 0x0600A940, 0x0600B180 -glabel D_8096CE94 - .word 0x00000000 -glabel D_8096CE98 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8096CEA4 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_8096CEB0 - .word 0xBE966EFF -glabel D_8096CEB4 - .word 0x785028FF -glabel D_8096CEB8 - .word 0x41300000, 0xC1300000, 0xC0C00000, 0x00000000, 0x41600000, 0xC1500000, 0x41600000, 0xC0000000, 0xC1200000, 0x41200000, 0xC0C00000, 0xC1000000 -glabel D_8096CEE8 - .word 0x41000000, 0x40C00000, 0x41000000, 0x41500000, 0x41000000, 0xC1200000, 0xC1600000, 0x3F800000, 0xC1600000, 0x40A00000, 0x41400000, 0xC1100000, 0x41300000, 0x40C00000, 0xC0E00000, 0x41600000, 0x41600000, 0xC1600000 -glabel D_8096CF30 - .word func_8096A224 -.word func_8096A244 -.word func_8096A264 -.word func_8096A294 -.word func_8096A2CC -.word func_8096A300 -.word func_8096A338 -.word func_8096AFFC -.word func_8096B030 -.word func_8096B06C -.word func_8096B0C0 -.word func_8096B0F8 -.word func_8096B140 -.word func_8096B184 -.word func_8096B1DC -.word func_8096B220 -.word func_8096B27C -.word func_8096B2D4 -.word func_8096B318 -.word func_8096B360 -.word func_8096B3A4 -.word func_8096B768 -.word func_8096B798 -.word func_8096B7EC -.word func_8096BD2C -.word func_8096BD4C -.word func_8096BD94 -.word func_8096BDD4 -.word func_8096BE14 -glabel D_8096CFA4 - .word func_8096BF54 -.word func_8096BF60 -.word func_8096B840 -glabel Demo_Du_InitVars - .word 0x00A80400, 0x00000010, 0x009D0000, 0x000001B4 -.word DemoDu_Init -.word DemoDu_Destroy -.word DemoDu_Update -.word DemoDu_Draw - diff --git a/data/overlays/actors/z_demo_du.reloc.s b/data/overlays/actors/z_demo_du.reloc.s deleted file mode 100644 index 440dabdcba..0000000000 --- a/data/overlays/actors/z_demo_du.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_8096D0F0 - .incbin "baserom/ovl_Demo_Du", 0x3620, 0x000003C0 diff --git a/spec b/spec index 18c742c8d4..591c5bebdf 100644 --- a/spec +++ b/spec @@ -1466,8 +1466,7 @@ endseg beginseg name "ovl_Demo_Du" include "build/src/overlays/actors/ovl_Demo_Du/z_demo_du.o" - include "build/data/overlays/actors/z_demo_du.data.o" - include "build/data/overlays/actors/z_demo_du.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Du/ovl_Demo_Du_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 49ed284eed..1290da3abf 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -1,28 +1,1038 @@ #include "z_demo_du.h" +#include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" +#include "vt.h" #define FLAGS 0x00000010 #define THIS ((DemoDu*)thisx) +typedef void (*DemoDuActionFunc)(DemoDu*, GlobalContext*); +typedef void (*DemoDuDrawFunc)(Actor*, GlobalContext*); + void DemoDu_Init(Actor* thisx, GlobalContext* globalCtx); void DemoDu_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoDu_Update(Actor* thisx, GlobalContext* globalCtx); void DemoDu_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000800; -extern UNK_TYPE D_06000D00; -extern UNK_TYPE D_06001D70; -extern UNK_TYPE D_06002374; -extern UNK_TYPE D_0600288C; -extern UNK_TYPE D_06005458; -extern UNK_TYPE D_06006104; -extern UNK_TYPE D_060067CC; -extern UNK_TYPE D_06006EB0; -extern UNK_TYPE D_06007FC0; -extern UNK_TYPE D_06011CA8; -extern UNK_TYPE D_06012014; +extern AnimationHeader D_06000800; +extern AnimationHeader D_06000D00; +extern AnimationHeader D_06001D70; +extern AnimationHeader D_06002374; +extern AnimationHeader D_0600288C; +extern AnimationHeader D_06005458; +extern AnimationHeader D_06006104; +extern AnimationHeader D_060067CC; +extern AnimationHeader D_06006EB0; +extern u64* D_06007FC0; +extern FlexSkeletonHeader D_06011CA8; +extern AnimationHeader D_06012014; + +static s32 sUnused = 0; + +#include "z_demo_du_cutscene_data.c" EARLY + +static u64* sEyeTextures[] = { 0x06008080, 0x06008480, 0x06008880, 0x0600A540 }; +static u64* sMouthTextures[] = { 0x06008C80, 0x06009D40, 0x0600A940, 0x0600B180 }; + +/** + * Cs => Cutscene + * + * FM => Fire Medallion + * GR => Goron's Ruby + * AG => In the chamber of sages, just After the final blow on Ganon. + * CR => Credits + * + */ + +// Each macro maps its argument to an index of sUpdateFuncs. +#define CS_FIREMEDALLION_SUBSCENE(x) (0 + (x)) // DEMO_DU_CS_FIREMEDALLION +#define CS_GORONSRUBY_SUBSCENE(x) (7 + (x)) // DEMO_DU_CS_GORONS_RUBY +#define CS_CHAMBERAFTERGANON_SUBSCENE(x) (21 + (x)) // DEMO_DU_CS_CHAMBER_AFTER_GANON +#define CS_CREDITS_SUBSCENE(x) (24 + (x)) // DEMO_DU_CS_CREDITS + +void DemoDu_Destroy(Actor* thisx, GlobalContext* globalCtx) { + DemoDu* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); +} + +void DemoDu_UpdateEyes(DemoDu* this) { + s16* blinkTimer = &this->blinkTimer; + s16* eyeTexIndex = &this->eyeTexIndex; + s32 pad[3]; + + if (DECR(*blinkTimer) == 0) { + *blinkTimer = Rand_S16Offset(60, 60); + } + + *eyeTexIndex = *blinkTimer; + if (*eyeTexIndex >= 3) { + *eyeTexIndex = 0; + } +} + +void DemoDu_SetEyeTexIndex(DemoDu* this, s16 eyeTexIndex) { + this->eyeTexIndex = eyeTexIndex; +} + +void DemoDu_SetMouthTexIndex(DemoDu* this, s16 mouthTexIndex) { + this->mouthTexIndex = mouthTexIndex; +} + +// Resets all the values used in this cutscene. +void DemoDu_CsAfterGanon_Reset(DemoDu* this) { + this->updateIndex = CS_CHAMBERAFTERGANON_SUBSCENE(0); + this->drawIndex = 0; + this->shadowAlpha = 0; + this->demo6KSpawned = 0; + this->actor.shape.shadowAlpha = 0; + this->unk_1A4 = 0.0f; +} + +void DemoDu_CsAfterGanon_CheckIfShouldReset(DemoDu* this, GlobalContext* globalCtx) { + static s32 D_8096CE94 = false; + + if (globalCtx->csCtx.state == 0) { + if (D_8096CE94) { + if (this->actor.params == DEMO_DU_CS_CHAMBER_AFTER_GANON) { + DemoDu_CsAfterGanon_Reset(this); + } + D_8096CE94 = false; + return; + } + } else if (!D_8096CE94) { + D_8096CE94 = true; + } +} + +s32 DemoDu_UpdateSkelAnime(DemoDu* this) { + return SkelAnime_Update(&this->skelAnime); +} + +void DemoDu_UpdateBgCheckInfo(DemoDu* this, GlobalContext* globalCtx) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +CsCmdActorAction* DemoDu_GetNpcAction(GlobalContext* globalCtx, s32 idx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.npcActions[idx]; + } + return NULL; +} + +s32 DemoDu_IsNpcDoingThisAction(DemoDu* this, GlobalContext* globalCtx, u16 action, s32 idx) { + CsCmdActorAction* npcAction = DemoDu_GetNpcAction(globalCtx, idx); + + if ((npcAction != NULL) && (npcAction->action == action)) { + return true; + } + return false; +} + +s32 DemoDu_IsNpcNotDoingThisAction(DemoDu* this, GlobalContext* globalCtx, u16 action, s32 idx) { + CsCmdActorAction* npcAction = DemoDu_GetNpcAction(globalCtx, idx); + + if ((npcAction != NULL) && (npcAction->action != action)) { + return true; + } + return false; +} + +void DemoDu_MoveToNpcPos(DemoDu* this, GlobalContext* globalCtx, s32 idx) { + CsCmdActorAction* npcAction = DemoDu_GetNpcAction(globalCtx, idx); + s32 pad; + + if (npcAction != NULL) { + this->actor.world.pos.x = npcAction->startPos.x; + this->actor.world.pos.y = npcAction->startPos.y; + this->actor.world.pos.z = npcAction->startPos.z; + + this->actor.world.rot.y = this->actor.shape.rot.y = npcAction->rot.y; + } +} + +void func_80969DDC(DemoDu* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 arg4) { + f32 startFrame; + s16 lastFrame = Animation_GetLastFrame(animation); + f32 endFrame; + f32 playSpeed; + + if (arg4 == 0) { + startFrame = 0.0f; + endFrame = lastFrame; + playSpeed = 1.0f; + } else { + endFrame = 0.0f; + playSpeed = -1.0f; + startFrame = lastFrame; + } + Animation_Change(&this->skelAnime, animation, playSpeed, startFrame, endFrame, mode, morphFrames); +} + +void DemoDu_InitCs_FireMedallion(DemoDu* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011CA8, &D_06006EB0, NULL, NULL, 0); + this->actor.shape.yOffset = -10000.0f; + DemoDu_SetEyeTexIndex(this, 1); + DemoDu_SetMouthTexIndex(this, 3); +} + +// A.k.a Warp portal +void DemoDu_CsFireMedallion_SpawnDoorWarp(DemoDu* this, GlobalContext* globalCtx) { + f32 posX = this->actor.world.pos.x; + f32 posY = this->actor.world.pos.y; + f32 posZ = this->actor.world.pos.z; + + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} + +// Gives the Fire Medallion to Link. +void func_80969F38(DemoDu* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 posX = player->actor.world.pos.x; + f32 posY = player->actor.world.pos.y + 80.0f; + f32 posZ = player->actor.world.pos.z; + + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, + DEMO_EFFECT_MEDAL_FIRE); + Item_Give(globalCtx, ITEM_MEDALLION_FIRE); +} + +void func_80969FB4(DemoDu* this, GlobalContext* globalCtx) { + this->actor.shape.yOffset += 250.0f / 3.0f; +} + +// Gives the Fire Medallion to Link too. +void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, GlobalContext* globalCtx) { + s32 pad[2]; + + if ((gSaveContext.chamberCutsceneNum == 1) && (gSaveContext.sceneSetupIndex < 4)) { + Player* player = PLAYER; + + this->updateIndex = CS_FIREMEDALLION_SUBSCENE(1); + globalCtx->csCtx.segment = D_8096C1A4; + gSaveContext.cutsceneTrigger = 2; + Item_Give(globalCtx, ITEM_MEDALLION_FIRE); + + player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; + } +} + +void DemoDu_CsFireMedallion_AdvanceTo02(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 1)) { + this->updateIndex = CS_FIREMEDALLION_SUBSCENE(2); + this->drawIndex = 1; + DemoDu_CsFireMedallion_SpawnDoorWarp(this, globalCtx); + } + } +} + +void DemoDu_CsFireMedallion_AdvanceTo03(DemoDu* this) { + if (this->actor.shape.yOffset >= 0.0f) { + this->updateIndex = CS_FIREMEDALLION_SUBSCENE(3); + this->actor.shape.yOffset = 0.0f; + } +} + +void DemoDu_CsFireMedallion_AdvanceTo04(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 2)) { + Animation_Change(&this->skelAnime, &D_06000800, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000800), 2, 0.0f); + this->updateIndex = CS_FIREMEDALLION_SUBSCENE(4); + } + } +} + +void DemoDu_CsFireMedallion_AdvanceTo05(DemoDu* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &D_06000D00, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000D00), 0, 0.0f); + this->updateIndex = CS_FIREMEDALLION_SUBSCENE(5); + } +} + +void DemoDu_CsFireMedallion_AdvanceTo06(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[6]; + + if ((npcAction != NULL) && (npcAction->action == 2)) { + this->updateIndex = CS_FIREMEDALLION_SUBSCENE(6); + func_80969F38(this, globalCtx); + } + } +} + +void DemoDu_UpdateCs_FM_00(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsFireMedallion_AdvanceTo01(this, globalCtx); +} + +void DemoDu_UpdateCs_FM_01(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsFireMedallion_AdvanceTo02(this, globalCtx); +} + +void DemoDu_UpdateCs_FM_02(DemoDu* this, GlobalContext* globalCtx) { + func_80969FB4(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsFireMedallion_AdvanceTo03(this); +} + +void DemoDu_UpdateCs_FM_03(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsFireMedallion_AdvanceTo04(this, globalCtx); +} + +void DemoDu_UpdateCs_FM_04(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_CsFireMedallion_AdvanceTo05(this, animFinished); +} + +void DemoDu_UpdateCs_FM_05(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsFireMedallion_AdvanceTo06(this, globalCtx); +} + +void DemoDu_UpdateCs_FM_06(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); +} + +void DemoDu_InitCs_GoronsRuby(DemoDu* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011CA8, NULL, NULL, NULL, 0); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(0); +} + +// Cutscene: Darunia gives Link the Goron's Ruby. +// Sfx played when Darunia lands at the floor at the start of the cutscene. +void DemoDu_CsPlaySfx_GoronLanding(DemoDu* this) { + func_80078914(&this->actor.projectedPos, NA_SE_EN_GOLON_LAND_BIG); +} + +// Cutscene: Darunia gives Link the Goron's Ruby. +// Sfx played when Darunia is falling at the start of the cutscene. +void DemoDu_CsPlaySfx_DaruniaFalling(GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames == 160) { + func_800788CC(NA_SE_EV_OBJECT_FALL); + } +} + +// Cutscene: Darunia gives Link the Goron's Ruby. +void DemoDu_CsPlaySfx_DaruniaHitsLink(GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; + + func_80078914(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK); + Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); +} + +// Cutscene: Darunia gives Link the Goron's Ruby. +void DemoDu_CsPlaySfx_HitBreast(DemoDu* this) { + func_80078914(&this->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_BREAST - SFX_FLAG); +} + +// Cutscene: Darunia gives Link the Goron's Ruby. +// Sfx played when Link is escaping from the gorons at the end of the scene. +void DemoDu_CsPlaySfx_LinkEscapeFromGorons(GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames == 1400) { + Player* player = PLAYER; + + Audio_PlaySoundGeneral(NA_SE_VO_LI_FALL_L_KID, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } +} + +// Cutscene: Darunia gives Link the Goron's Ruby. +// Sfx played when Link is surprised by Darunia falling from the sky. +void DemoDu_CsPlaySfx_LinkSurprised(GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames == 174) { + Player* player = PLAYER; + + Audio_PlaySoundGeneral(NA_SE_VO_LI_SURPRISE_KID, &player->actor.projectedPos, 4U, &D_801333E0, &D_801333E0, + &D_801333E8); + } +} + +void DemoDu_CsGoronsRuby_UpdateFaceTextures(DemoDu* this, GlobalContext* globalCtx) { + u16* frames = &globalCtx->csCtx.frames; + + if (*frames < 260) { + DemoDu_UpdateEyes(this); + DemoDu_SetMouthTexIndex(this, 0); + } else if (*frames < 335) { + DemoDu_UpdateEyes(this); + DemoDu_SetMouthTexIndex(this, 3); + } else if (*frames < 365) { + DemoDu_SetEyeTexIndex(this, 3); + DemoDu_SetMouthTexIndex(this, 1); + } else if (*frames < 395) { + DemoDu_SetEyeTexIndex(this, 0); + DemoDu_SetMouthTexIndex(this, 3); + } else if (*frames < 410) { + DemoDu_UpdateEyes(this); + DemoDu_SetMouthTexIndex(this, 0); + } else { + DemoDu_UpdateEyes(this); + DemoDu_SetMouthTexIndex(this, 3); + } +} + +void func_8096A630(DemoDu* this, GlobalContext* globalCtx) { + s32 pad; + Vec3f pos = this->actor.world.pos; + + pos.y += kREG(5); + func_80033480(globalCtx, &pos, kREG(1) + 100.0f, kREG(2) + 10, kREG(3) + 300, kREG(4), 0); + DemoDu_CsPlaySfx_GoronLanding(this); +} + +void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, GlobalContext* globalCtx) { + static Vec3f dustPosOffsets[] = { + { 11.0f, -11.0f, -6.0f }, { 0.0f, 14.0f, -13.0f }, { 14.0f, -2.0f, -10.0f }, { 10.0f, -6.0f, -8.0f }, + { 8.0f, 6.0f, 8.0f }, { 13.0f, 8.0f, -10.0f }, { -14.0f, 1.0f, -14.0f }, { 5.0f, 12.0f, -9.0f }, + { 11.0f, 6.0f, -7.0f }, { 14.0f, 14.0f, -14.0f }, + }; + + if (Animation_OnFrame(&this->skelAnime, 31.0f) || Animation_OnFrame(&this->skelAnime, 41.0f)) { + s32 pad[2]; + s32 i; + Player* player = PLAYER; + Vec3f* headPos = &player->bodyPartsPos[PLAYER_LIMB_HEAD]; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + s32 pad2; + + for (i = 4; i >= 0; --i) { + Color_RGBA8 primColor = { 190, 150, 110, 255 }; + Color_RGBA8 envColor = { 120, 80, 40, 255 }; + s32 colorDelta; + Vec3f position; + + if (Animation_OnFrame(&this->skelAnime, 31.0f)) { + position.x = dustPosOffsets[i + 5].x + headPos->x; + position.y = dustPosOffsets[i + 5].y + headPos->y; + position.z = dustPosOffsets[i + 5].z + headPos->z; + } else { + position.x = dustPosOffsets[i + 0].x + headPos->x; + position.y = dustPosOffsets[i + 0].y + headPos->y; + position.z = dustPosOffsets[i + 0].z + headPos->z; + } + + colorDelta = Rand_ZeroOne() * 20.0f - 10.0f; + + primColor.r += colorDelta; + primColor.g += colorDelta; + primColor.b += colorDelta; + envColor.r += colorDelta; + envColor.g += colorDelta; + envColor.b += colorDelta; + + func_8002829C(globalCtx, &position, &velocity, &accel, &primColor, &envColor, + Rand_ZeroOne() * 40.0f + 200.0f, 0); + } + + DemoDu_CsPlaySfx_DaruniaHitsLink(globalCtx); + } +} + +void DemoDu_CsGoronsRuby_DaruniaFalling(DemoDu* this, GlobalContext* globalCtx) { + s32 pad; + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->state != 0) { + CsCmdActorAction* npcAction = csCtx->npcActions[2]; + Vec3f startPos; + Vec3f endPos; + Vec3f* pos = &this->actor.world.pos; + + if (npcAction != NULL) { + f32 traveledPercent = func_8006F93C(npcAction->endFrame, npcAction->startFrame, csCtx->frames); + + startPos.x = npcAction->startPos.x; + startPos.y = npcAction->startPos.y; + startPos.z = npcAction->startPos.z; + + endPos.x = npcAction->endPos.x; + endPos.y = npcAction->endPos.y; + endPos.z = npcAction->endPos.z; + + pos->x = ((endPos.x - startPos.x) * traveledPercent) + startPos.x; + pos->y = ((endPos.y - startPos.y) * traveledPercent) + startPos.y; + pos->z = ((endPos.z - startPos.z) * traveledPercent) + startPos.z; + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo01(DemoDu* this, GlobalContext* globalCtx) { + this->updateIndex = CS_GORONSRUBY_SUBSCENE(1); +} + +void DemoDu_CsGoronsRuby_AdvanceTo02(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 1)) { + Animation_Change(&this->skelAnime, &D_0600288C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600288C), 2, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(2); + this->drawIndex = 1; + DemoDu_CsGoronsRuby_DaruniaFalling(this, globalCtx); + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo03(DemoDu* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->state != 0) { + CsCmdActorAction* npcAction = csCtx->npcActions[2]; + + if ((npcAction != NULL) && (csCtx->frames >= npcAction->endFrame)) { + this->updateIndex = CS_GORONSRUBY_SUBSCENE(3); + func_8096A630(this, globalCtx); + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo04(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 2)) { + this->updateIndex = CS_GORONSRUBY_SUBSCENE(4); + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo05(DemoDu* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &D_06006EB0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06006EB0), 0, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(5); + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo06(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 3)) { + Animation_Change(&this->skelAnime, &D_06002374, 1.0f, 0.0f, Animation_GetLastFrame(&D_06002374), 2, -4.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(6); + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo07(DemoDu* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &D_06006EB0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06006EB0), 0, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(7); + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo08(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 4)) { + Animation_Change(&this->skelAnime, &D_06001D70, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001D70), 2, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(8); + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo09(DemoDu* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &D_06002374, 1.0f, 0.0f, Animation_GetLastFrame(&D_06002374), 2, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(9); + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo10(DemoDu* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &D_06006EB0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06006EB0), 0, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(10); + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo11(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 5)) { + Animation_Change(&this->skelAnime, &D_06000800, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000800), 2, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(11); + } + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo12(DemoDu* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &D_06000D00, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000D00), 0, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(12); + } +} + +void DemoDu_CsGoronsRuby_AdvanceTo13(DemoDu* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[2]; + + if ((npcAction != NULL) && (npcAction->action != 6)) { + Animation_Change(&this->skelAnime, &D_06006EB0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06006EB0), 0, 0.0f); + this->updateIndex = CS_GORONSRUBY_SUBSCENE(13); + } + } +} + +void DemoDu_UpdateCs_GR_00(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsPlaySfx_DaruniaFalling(globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo01(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_01(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsPlaySfx_DaruniaFalling(globalCtx); + DemoDu_CsPlaySfx_LinkSurprised(globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo02(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_02(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsGoronsRuby_DaruniaFalling(this, globalCtx); + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_CsPlaySfx_DaruniaFalling(globalCtx); + DemoDu_CsPlaySfx_LinkSurprised(globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo03(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_03(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_CsPlaySfx_LinkSurprised(globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo04(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_04(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo05(this, animFinished); +} + +void DemoDu_UpdateCs_GR_05(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo06(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_06(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_CsPlaySfx_HitBreast(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo07(this, animFinished); +} + +void DemoDu_UpdateCs_GR_07(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo08(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_08(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo09(this, animFinished); +} + +void DemoDu_UpdateCs_GR_09(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_CsPlaySfx_HitBreast(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo10(this, animFinished); +} + +void DemoDu_UpdateCs_GR_10(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo11(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_11(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo12(this, animFinished); +} + +void DemoDu_UpdateCs_GR_12(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsGoronsRuby_AdvanceTo13(this, globalCtx); +} + +void DemoDu_UpdateCs_GR_13(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_CsGoronsRuby_UpdateFaceTextures(this, globalCtx); + DemoDu_CsPlaySfx_LinkEscapeFromGorons(globalCtx); +} + +void DemoDu_InitCs_AfterGanon(DemoDu* this, GlobalContext* globalCtx) { + s32 pad[3]; + f32 lastFrame = Animation_GetLastFrame(&D_06012014); + + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011CA8, NULL, NULL, NULL, 0); + Animation_Change(&this->skelAnime, &D_06012014, 1.0f, 0.0f, lastFrame, 2, 0.0f); + this->updateIndex = CS_CHAMBERAFTERGANON_SUBSCENE(0); + this->actor.shape.shadowAlpha = 0; +} + +void DemoDu_CsPlaySfx_WhiteOut() { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +void DemoDu_CsAfterGanon_SpawnDemo6K(DemoDu* this, GlobalContext* globalCtx) { + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.world.pos.x, + kREG(16) + 22.0f + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 3); +} + +void DemoDu_CsAfterGanon_AdvanceTo01(DemoDu* this, GlobalContext* globalCtx) { + if (DemoDu_IsNpcDoingThisAction(this, globalCtx, 4, 2)) { + this->updateIndex = CS_CHAMBERAFTERGANON_SUBSCENE(1); + this->drawIndex = 2; + this->shadowAlpha = 0; + this->actor.shape.shadowAlpha = 0; + this->unk_1A4 = 0.0f; + DemoDu_CsPlaySfx_WhiteOut(); + } +} + +void DemoDu_CsAfterGanon_AdvanceTo02(DemoDu* this, GlobalContext* globalCtx) { + f32* unk_1A4 = &this->unk_1A4; + s32 shadowAlpha = 255; + + if (DemoDu_IsNpcDoingThisAction(this, globalCtx, 4, 2)) { + *unk_1A4 += 1.0f; + if (*unk_1A4 >= kREG(5) + 10.0f) { + this->updateIndex = CS_CHAMBERAFTERGANON_SUBSCENE(2); + this->drawIndex = 1; + *unk_1A4 = kREG(5) + 10.0f; + this->shadowAlpha = shadowAlpha; + this->actor.shape.shadowAlpha = shadowAlpha; + return; + } + } else { + *unk_1A4 -= 1.0f; + if (*unk_1A4 <= 0.0f) { + this->updateIndex = CS_CHAMBERAFTERGANON_SUBSCENE(0); + this->drawIndex = 0; + *unk_1A4 = 0.0f; + this->shadowAlpha = 0; + this->actor.shape.shadowAlpha = 0; + return; + } + } + shadowAlpha = (*unk_1A4 / (kREG(5) + 10.0f)) * 255.0f; + this->shadowAlpha = shadowAlpha; + this->actor.shape.shadowAlpha = shadowAlpha; +} + +void DemoDu_CsAfterGanon_BackTo01(DemoDu* this, GlobalContext* globalCtx) { + if (DemoDu_IsNpcNotDoingThisAction(this, globalCtx, 4, 2)) { + this->updateIndex = CS_CHAMBERAFTERGANON_SUBSCENE(1); + this->drawIndex = 2; + this->unk_1A4 = kREG(5) + 10.0f; + this->shadowAlpha = 255; + if (!this->demo6KSpawned) { + DemoDu_CsAfterGanon_SpawnDemo6K(this, globalCtx); + this->demo6KSpawned = 1; + } + this->actor.shape.shadowAlpha = 255; + } +} + +void DemoDu_UpdateCs_AG_00(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsAfterGanon_AdvanceTo01(this, globalCtx); + DemoDu_CsAfterGanon_CheckIfShouldReset(this, globalCtx); +} + +void DemoDu_UpdateCs_AG_01(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_UpdateEyes(this); + DemoDu_CsAfterGanon_AdvanceTo02(this, globalCtx); + DemoDu_CsAfterGanon_CheckIfShouldReset(this, globalCtx); +} + +void DemoDu_UpdateCs_AG_02(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_UpdateEyes(this); + DemoDu_CsAfterGanon_BackTo01(this, globalCtx); + DemoDu_CsAfterGanon_CheckIfShouldReset(this, globalCtx); +} + +// Similar to DemoDu_Draw_01, but this uses POLY_XLU_DISP. Also uses this->shadowAlpha for setting the env color. +void DemoDu_Draw_02(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + DemoDu* this = THIS; + s16 eyeTexIndex = this->eyeTexIndex; + u64* eyeTexture = sEyeTextures[eyeTexIndex]; + s32 pad; + s16 mouthTexIndex = this->mouthTexIndex; + u64* mouthTexture = sMouthTextures[mouthTexIndex]; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_du_inKenjyanomaDemo02.c", 275); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTexture)); + gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(&D_06007FC0)); + + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->shadowAlpha); + + gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]); + + POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, 0, + 0, 0, POLY_XLU_DISP); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_du_inKenjyanomaDemo02.c", 304); +} + +void DemoDu_InitCs_Credits(DemoDu* this, GlobalContext* globalCtx) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011CA8, &D_060067CC, NULL, NULL, 0); + this->updateIndex = CS_CREDITS_SUBSCENE(0); + this->drawIndex = 0; + this->actor.shape.shadowAlpha = 0; + DemoDu_SetMouthTexIndex(this, 3); +} + +void DemoDu_CsCredits_UpdateShadowAlpha(DemoDu* this) { + s32 shadowAlpha = 255; + f32 temp_f0; + f32* unk_1A4; + + this->unk_1A4 += 1.0f; + temp_f0 = kREG(17) + 10.0f; + unk_1A4 = &this->unk_1A4; + + if (temp_f0 <= *unk_1A4) { + this->shadowAlpha = shadowAlpha; + this->actor.shape.shadowAlpha = shadowAlpha; + } else { + shadowAlpha = *unk_1A4 / temp_f0 * 255.0f; + this->shadowAlpha = shadowAlpha; + this->actor.shape.shadowAlpha = shadowAlpha; + } +} + +void DemoDu_CsCredits_AdvanceTo01(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_MoveToNpcPos(this, globalCtx, 2); + this->updateIndex = CS_CREDITS_SUBSCENE(1); + this->drawIndex = 2; +} + +void DemoDu_CsCredits_AdvanceTo02(DemoDu* this) { + if (this->unk_1A4 >= kREG(17) + 10.0f) { + this->updateIndex = CS_CREDITS_SUBSCENE(2); + this->drawIndex = 1; + } +} + +void DemoDu_CsCredits_AdvanceTo03(DemoDu* this) { + func_80969DDC(this, &D_06005458, ANIMMODE_ONCE, -8.0f, 0); + this->updateIndex = CS_CREDITS_SUBSCENE(3); +} + +void DemoDu_CsCredits_AdvanceTo04(DemoDu* this) { + func_80969DDC(this, &D_06006104, ANIMMODE_ONCE, 0.0f, 0); + this->updateIndex = CS_CREDITS_SUBSCENE(4); +} + +void DemoDu_CsCredits_BackTo02(DemoDu* this, s32 animFinished) { + if (animFinished) { + func_80969DDC(this, &D_060067CC, ANIMMODE_LOOP, 0.0f, 0); + this->updateIndex = CS_CREDITS_SUBSCENE(2); + } +} + +void DemoDu_CsCredits_HandleSubscenesByNpcAction(DemoDu* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = DemoDu_GetNpcAction(globalCtx, 2); + + if (npcAction != NULL) { + s32 action = npcAction->action; + s32 lastAction = this->lastAction; + + if (action != lastAction) { + switch (action) { + case 9: + DemoDu_CsCredits_AdvanceTo01(this, globalCtx); + break; + case 10: + DemoDu_CsCredits_AdvanceTo03(this); + break; + case 11: + DemoDu_CsCredits_AdvanceTo04(this); + break; + default: + // Demo_Du_inEnding_Check_DemoMode:There is no such operation!!!!!!!! + osSyncPrintf("Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + this->lastAction = action; + } + } +} + +void DemoDu_UpdateCs_CR_00(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_CsCredits_HandleSubscenesByNpcAction(this, globalCtx); +} + +void DemoDu_UpdateCs_CR_01(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_UpdateEyes(this); + DemoDu_CsCredits_UpdateShadowAlpha(this); + DemoDu_CsCredits_AdvanceTo02(this); +} + +void DemoDu_UpdateCs_CR_02(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_UpdateEyes(this); + DemoDu_CsCredits_HandleSubscenesByNpcAction(this, globalCtx); +} + +void DemoDu_UpdateCs_CR_03(DemoDu* this, GlobalContext* globalCtx) { + DemoDu_UpdateBgCheckInfo(this, globalCtx); + DemoDu_UpdateSkelAnime(this); + DemoDu_UpdateEyes(this); + DemoDu_CsCredits_HandleSubscenesByNpcAction(this, globalCtx); +} + +void DemoDu_UpdateCs_CR_04(DemoDu* this, GlobalContext* globalCtx) { + s32 animFinished; + + DemoDu_UpdateBgCheckInfo(this, globalCtx); + animFinished = DemoDu_UpdateSkelAnime(this); + DemoDu_UpdateEyes(this); + DemoDu_CsCredits_BackTo02(this, animFinished); +} + +static DemoDuActionFunc sUpdateFuncs[] = { + DemoDu_UpdateCs_FM_00, DemoDu_UpdateCs_FM_01, DemoDu_UpdateCs_FM_02, DemoDu_UpdateCs_FM_03, DemoDu_UpdateCs_FM_04, + DemoDu_UpdateCs_FM_05, DemoDu_UpdateCs_FM_06, DemoDu_UpdateCs_GR_00, DemoDu_UpdateCs_GR_01, DemoDu_UpdateCs_GR_02, + DemoDu_UpdateCs_GR_03, DemoDu_UpdateCs_GR_04, DemoDu_UpdateCs_GR_05, DemoDu_UpdateCs_GR_06, DemoDu_UpdateCs_GR_07, + DemoDu_UpdateCs_GR_08, DemoDu_UpdateCs_GR_09, DemoDu_UpdateCs_GR_10, DemoDu_UpdateCs_GR_11, DemoDu_UpdateCs_GR_12, + DemoDu_UpdateCs_GR_13, DemoDu_UpdateCs_AG_00, DemoDu_UpdateCs_AG_01, DemoDu_UpdateCs_AG_02, DemoDu_UpdateCs_CR_00, + DemoDu_UpdateCs_CR_01, DemoDu_UpdateCs_CR_02, DemoDu_UpdateCs_CR_03, DemoDu_UpdateCs_CR_04, +}; + +void DemoDu_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoDu* this = THIS; + + if (this->updateIndex < 0 || this->updateIndex >= 29 || sUpdateFuncs[this->updateIndex] == NULL) { + // The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!! + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sUpdateFuncs[this->updateIndex](this, globalCtx); +} + +void DemoDu_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoDu* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); + switch (this->actor.params) { + case DEMO_DU_CS_GORONS_RUBY: + DemoDu_InitCs_GoronsRuby(this, globalCtx); + break; + + case DEMO_DU_CS_CHAMBER_AFTER_GANON: + DemoDu_InitCs_AfterGanon(this, globalCtx); + break; + + case DEMO_DU_CS_CREDITS: + DemoDu_InitCs_Credits(this, globalCtx); + break; + + default: + DemoDu_InitCs_FireMedallion(this, globalCtx); + break; + } +} + +void DemoDu_Draw_NoDraw(Actor* thisx, GlobalContext* globalCtx2) { +} + +// Similar to DemoDu_Draw_02, but this uses POLY_OPA_DISP. Sets the env color to 255. +void DemoDu_Draw_01(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + DemoDu* this = THIS; + s16 eyeTexIndex = this->eyeTexIndex; + u64* eyeTexture = sEyeTextures[eyeTexIndex]; + s32 pad; + s16 mouthTexIndex = this->mouthTexIndex; + u64* mouthTexture = sMouthTextures[mouthTexIndex]; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_du.c", 615); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTexture)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(&D_06007FC0)); + + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, + this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_du.c", 638); +} + +static DemoDuDrawFunc sDrawFuncs[] = { + DemoDu_Draw_NoDraw, + DemoDu_Draw_01, + DemoDu_Draw_02, +}; + +void DemoDu_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoDu* this = THIS; + + if (this->drawIndex < 0 || this->drawIndex >= 3 || sDrawFuncs[this->drawIndex] == NULL) { + // The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!! + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawIndex](thisx, globalCtx); +} -/* const ActorInit Demo_Du_InitVars = { ACTOR_DEMO_DU, ACTORCAT_NPC, @@ -34,195 +1044,3 @@ const ActorInit Demo_Du_InitVars = { (ActorFunc)DemoDu_Update, (ActorFunc)DemoDu_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969AF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969B8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969BC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969C58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969CC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969D5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969EDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969FD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A05C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A1D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A244.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A264.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A294.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A2CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A300.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A338.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A3D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A408.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A45C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A4D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A528.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A630.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A6E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A970.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AFFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B030.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B06C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B0F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B140.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B184.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B1DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B220.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B27C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B2D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B318.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B360.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B488.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B4A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B528.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B57C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B6D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B768.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B798.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B7EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BB5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BBE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BC6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BD94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BDD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BE14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Draw.s") diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h index fb6adf8e6a..e29f7f9fbd 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h @@ -8,9 +8,36 @@ struct DemoDu; typedef struct DemoDu { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x68]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 eyeTexIndex; + /* 0x0192 */ s16 blinkTimer; + /* 0x0194 */ s16 mouthTexIndex; + /* 0x0198 */ s32 updateIndex; + /* 0x019C */ s32 drawIndex; + /* 0x01A0 */ s32 unused; + /* 0x01A4 */ f32 unk_1A4; + /* 0x01A8 */ s32 shadowAlpha; + /* 0x01AC */ s32 demo6KSpawned; + /* 0x01B0 */ s32 lastAction; } DemoDu; // size = 0x01B4 extern const ActorInit Demo_Du_InitVars; +// This is the parameter of this actor, +typedef enum DemoDu_Cutscene { + /* 0x00 */ DEMO_DU_CS_FIREMEDALLION, // default + /* 0x01 */ DEMO_DU_CS_GORONS_RUBY, + /* 0x02 */ DEMO_DU_CS_CHAMBER_AFTER_GANON, + /* 0x03 */ DEMO_DU_CS_CREDITS +} DemoDu_Cutscene; + +/** + * To see each one of the cutscenes on the debug rom: + * DEMO_DU_CS_FIREMEDALLION: I couldn't find how to trigger this one from the map selector, but you can go to Map 78 and beat Volvagia (or use the gameshark 8015E98B 0002 so the game thinks you already has beaten it). + * DEMO_DU_CS_GORONS_RUBY: Map selector -> Map 16 (SPOT16) -> Stage 01 + * DEMO_DU_CS_CHAMBER_AFTER_GANON: Map selector -> Map 21 -> Stage 02 + * DEMO_DU_CS_CREDITS: Map selector -> Map 16 (SPOT16) -> Stage 04 + * + */ + #endif diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.c new file mode 100644 index 0000000000..cb05625366 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.c @@ -0,0 +1,187 @@ +#include "z_demo_du.h" +#include "z64cutscene_commands.h" + +// clang-format off +static CutsceneData D_8096C1A4[] = { + CS_BEGIN_CUTSCENE(31, 3000), + CS_UNK_DATA_LIST(0x00000020, 1), + CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), + CS_NPC_ACTION_LIST(31, 5), + CS_NPC_ACTION(0x0001, 0, 546, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 216, -10, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 546, 547, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 216, -10, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0004, 547, 616, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 216, -10, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 616, 667, 0x0000, 0x0000, 0x0000, 0, 216, -10, 0, 82, 0, 0.0f, -2.627450942993164f, 0.0f), + CS_NPC_ACTION(0x0003, 667, 2834, 0x0000, 0x0000, 0x0000, 0, 82, 0, 0, 82, 0, 0.0f, 0.0f, 0.0f), + CS_PLAYER_ACTION_LIST(3), + CS_PLAYER_ACTION(0x000D, 0, 280, 0x0000, 0x6AAA, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 1.401298464324817e-45f), + CS_PLAYER_ACTION(0x0005, 280, 531, 0x0000, 0x6AAA, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 1.401298464324817e-45f), + CS_PLAYER_ACTION(0x0013, 531, 1716, 0x0000, 0xEAAA, 0x0000, 0, 6, 0, 0, 6, 0, 0.0f, 0.0f, 1.401298464324817e-45f), + CS_NPC_ACTION_LIST(41, 3), + CS_NPC_ACTION(0x0001, 0, 170, 0x0000, 0x0000, 0x0000, 98, 6, -169, 98, 6, -169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0002, 170, 465, 0x0000, 0x0000, 0x0000, 98, 6, -169, 98, 6, -169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION(0x0003, 465, 2915, 0x0000, 0x0000, 0x0000, 98, 6, -169, 98, 6, -169, 0.0f, 0.0f, 0.0f), + CS_NPC_ACTION_LIST(49, 1), + CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, -16, -121, 0, -16, -121, 0.0f, 0.0f, 0.0f), + CS_SCENE_TRANS_FX(0x0001, 530, 539), + CS_SCENE_TRANS_FX(0x0005, 540, 570), + CS_LIGHTING_LIST(2), + CS_LIGHTING(0x0001, 0, 10, 0x0000, 0x00000000, 0xFFFFFFDC, 0x00000000, 0x00000018, 0xFFFFFFDC, 0x00000000, 0x00000018), + CS_LIGHTING(0x0001, 10, 3000, 0x0000, 0x00000000, 0xFFFFFFDC, 0x00000000, 0x00000018, 0xFFFFFFDC, 0x00000000, 0x00000018), + CS_NPC_ACTION_LIST(39, 1), + CS_NPC_ACTION(0x0001, 0, 3000, 0x0000, 0x0000, 0x0000, 0, 0, -2, 0, 0, -2, 0.0f, 0.0f, 0.0f), + CS_SCENE_TRANS_FX(0x0001, 805, 835), + CS_NPC_ACTION_LIST(62, 1), + CS_NPC_ACTION(0x0004, 0, 3000, 0x0000, 0x0000, 0x0000, 32, 80, -51, 32, 80, -51, 0.0f, 0.0f, 0.0f), + CS_TERMINATOR(DEATH_MOUNTAIN_CRATER_AFTER_FIRE_BLUE_WARP, 905, 1030), + CS_PLAY_BGM_LIST(1), + CS_PLAY_BGM(0x0044, 615, 616, 0x0000, 0x00000000, 0xFFFFFF97, 0x00000000, 0x00000030, 0xFFFFFF97, 0x00000000, 0x00000030), + CS_FADE_BGM_LIST(1), + CS_FADE_BGM(0x0004, 500, 550, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFC3, 0x0000006E, 0x00000000, 0xFFFFFFC3, 0x0000006E), + CS_TEXT_LIST(10), + CS_TEXT_NONE(0, 310), + CS_TEXT_DISPLAY_TEXTBOX(0x303C, 310, 323, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(323, 344), + CS_TEXT_DISPLAY_TEXTBOX(0x3045, 344, 394, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(394, 415), + CS_TEXT_DISPLAY_TEXTBOX(0x3046, 415, 465, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(465, 800), + CS_TEXT_DISPLAY_TEXTBOX(0x003C, 800, 805, 0x0000, 0x0000, 0x0000), + CS_TEXT_NONE(805, 865), + CS_TEXT_DISPLAY_TEXTBOX(0x303D, 865, 875, 0x0000, 0x0000, 0x0000), + CS_CAM_POS_LIST(0, 1361), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, -85, 3211, 795, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, -85, 3211, 795, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, -85, 2925, 795, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, 70, 974, 497, 0x00E8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, 320, 268, 296, 0x00EA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, 312, 190, 150, 0x013D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, 261, 61, -65, 0x013F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, 261, 61, -65, 0x014E), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.400001525878906f, 261, 61, -65, 0x015F), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.400001525878906f, 261, 61, -65, 0x0161), + CS_CAM_POS_LIST(263, 509), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 29.399885177612305f, 89, 30, -103, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.20000076293945f, 89, 30, -103, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.20000076293945f, 89, 30, -103, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.20000076293945f, 89, 30, -103, 0x00E8), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.20000076293945f, 89, 30, -103, 0x00EA), + CS_CAM_POS_LIST(333, 1424), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.99994659423828f, 114, 50, -116, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.99994659423828f, 114, 50, -116, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.99994659423828f, 114, 50, -116, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.99994659423828f, 114, 50, -116, 0x00E8), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.99994659423828f, 114, 50, -116, 0x00EA), + CS_CAM_POS_LIST(403, 1494), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 26, 45, -10, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 26, 45, -10, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 26, 45, -10, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.599945068359375f, 26, 45, -10, 0x00E8), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.599945068359375f, 26, 45, -10, 0x00EA), + CS_CAM_POS_LIST(443, 1624), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 11, 23, -17, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 11, 23, -17, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 27, 31, -45, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 45, 40, -76, 0x00E8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 45, 40, -76, 0x00EA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 45, 40, -76, 0x013D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.39994430541992f, 45, 40, -76, 0x013F), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 45.39994430541992f, 45, 40, -76, 0x002E), + CS_CAM_POS_LIST(473, 1604), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, 192, 29, -246, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, 192, 29, -246, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, 192, 29, -246, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 45.19994354248047f, 192, 29, -246, 0x00E8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.39991760253906f, 192, 278, -246, 0x00EA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.39991760253906f, 192, 278, -246, 0x013D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.39991760253906f, 192, 278, -246, 0x013F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 70.39991760253906f, 192, 278, -246, 0x002E), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 70.39991760253906f, 192, 278, -246, 0x0063), + CS_CAM_POS_LIST(539, 881), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 13, 854, 2, 0x00C6), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 853, 5, 0x00C8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -3, 853, 5, 0x00D7), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -9, 853, -6, 0x00E8), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, -2, 852, -17, 0x00EA), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, -17, 0x013D), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 16, 852, -6, 0x013F), + CS_CAM_POS(CS_CMD_CONTINUE, 0x00, 0, 60.0f, 9, 852, 5, 0x002E), + CS_CAM_POS(CS_CMD_STOP, 0x00, 0, 60.0f, -3, 851, 5, 0x0063), + CS_CAM_POS_PLAYER_LIST(615, 1796), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x00C6), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 33, -27, 0x00C8), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 68, -26, 0x00D7), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x00E8), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x00EA), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x013D), + CS_CAM_POS_PLAYER(CS_CMD_CONTINUE, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x013F), + CS_CAM_POS_PLAYER(CS_CMD_STOP, 0x00, 0, 68.59994506835938f, 0, 103, -26, 0x002E), + CS_CAM_FOCUS_POINT_LIST(0, 1390), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 60, 60.400001525878906f, -115, 3163, 585, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 60, 60.400001525878906f, -115, 3163, 585, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 60, 60.400001525878906f, -115, 2877, 585, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.400001525878906f, 27, 824, 348, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.400001525878906f, 197, 143, 174, 0x00EA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.400001525878906f, 147, 100, 55, 0x013D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.400001525878906f, 55, 35, -65, 0x013F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 60.400001525878906f, 55, 35, -65, 0x014E), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.400001525878906f, 55, 35, -65, 0x015F), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.400001525878906f, 56, 35, -65, 0x0161), + CS_CAM_FOCUS_POINT_LIST(263, 538), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 78.99978637695312f, 87, 157, -391, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 82, 78.79978942871094f, 87, 157, -391, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 103, 70.79991149902344f, 87, 157, -391, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 60.20000076293945f, 87, 157, -391, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 60.20000076293945f, 87, 157, -391, 0x00EA), + CS_CAM_FOCUS_POINT_LIST(333, 1453), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.99994659423828f, -52, 127, -309, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.99994659423828f, -52, 127, -309, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 45.99994659423828f, -52, 127, -309, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.99994659423828f, -52, 127, -309, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.99994659423828f, -52, 127, -309, 0x00EA), + CS_CAM_FOCUS_POINT_LIST(403, 1523), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, -269, 186, 13, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, -269, 186, 13, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 45.599945068359375f, -269, 186, 13, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.599945068359375f, -269, 186, 13, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.599945068359375f, -269, 186, 13, 0x00EA), + CS_CAM_FOCUS_POINT_LIST(443, 1653), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 163, 70, -283, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 163, 70, -283, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 177, 74, -309, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 193, 92, -337, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 193, 92, -337, 0x00EA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 45.39994430541992f, 192, 91, -336, 0x013D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 45.39994430541992f, 192, 91, -336, 0x013F), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 45.39994430541992f, 192, 91, -336, 0x002E), + CS_CAM_FOCUS_POINT_LIST(473, 1633), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 45.19994354248047f, -9, 57, -53, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 45.19994354248047f, -9, 57, -53, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 45.19994354248047f, -9, 57, -54, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 45.99994659423828f, -8, 57, -54, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 70.39991760253906f, 149, 547, -205, 0x00EA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 10, 70.39991760253906f, 149, 547, -205, 0x013D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 1000, 70.39991760253906f, 149, 547, -205, 0x013F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 70.39991760253906f, 149, 547, -205, 0x002E), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 30, 70.39991760253906f, 149, 547, -205, 0x0063), + CS_CAM_FOCUS_POINT_LIST(539, 930), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 60.0f, 3, 6, -6, 0x00C6), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 40, 60.0f, 3, 6, -6, 0x00C8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 30, 50.99996566772461f, 3, 6, -6, 0x00D7), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 20, 20.599849700927734f, 3, 6, -6, 0x00E8), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 51, 10.799838066101074f, 3, 6, -6, 0x00EA), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x013D), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.3998384475708f, 3, 6, -6, 0x013F), + CS_CAM_FOCUS_POINT(CS_CMD_CONTINUE, 0x00, 50, 10.199838638305664f, 3, 6, -6, 0x002E), + CS_CAM_FOCUS_POINT(CS_CMD_STOP, 0x00, 50, 10.999837875366211f, 3, 6, -6, 0x0063), + CS_CAM_FOCUS_POINT_PLAYER_LIST(615, 1825), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 100, 5, 0x00C6), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 101, 6, 0x00C8), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 1, 99, 41, 0x00D7), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x00E8), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x00EA), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 1000, 68.59994506835938f, 0, 42, 16, 0x013D), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_CONTINUE, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x013F), + CS_CAM_FOCUS_POINT_PLAYER(CS_CMD_STOP, 0x00, 30, 68.59994506835938f, 0, 42, 16, 0x002E), + CS_END(), +}; +// clang-format on