diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s deleted file mode 100644 index 2b0ab92ee5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel DemoGt_Destroy -/* 00000 8097D670 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8097D674 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8097D678 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 8097D67C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00010 8097D680 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00014 8097D684 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00018 8097D688 10410003 */ beq $v0, $at, .L8097D698 -/* 0001C 8097D68C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00020 8097D690 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00024 8097D694 14410003 */ bne $v0, $at, .L8097D6A4 -.L8097D698: -/* 00028 8097D698 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 0002C 8097D69C 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00030 8097D6A0 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -.L8097D6A4: -/* 00034 8097D6A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00038 8097D6A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0003C 8097D6AC 03E00008 */ jr $ra -/* 00040 8097D6B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s deleted file mode 100644 index 06f4291094..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata -glabel D_80982A3C - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel DemoGt_Draw -/* 04EE8 80982558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04EEC 8098255C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04EF0 80982560 8C820168 */ lw $v0, 0x0168($a0) ## 00000168 -/* 04EF4 80982564 04400008 */ bltz $v0, .L80982588 -/* 04EF8 80982568 28410009 */ slti $at, $v0, 0x0009 -/* 04EFC 8098256C 10200006 */ beq $at, $zero, .L80982588 -/* 04F00 80982570 00027080 */ sll $t6, $v0, 2 -/* 04F04 80982574 3C038098 */ lui $v1, %hi(D_80982734) ## $v1 = 80980000 -/* 04F08 80982578 006E1821 */ addu $v1, $v1, $t6 -/* 04F0C 8098257C 8C632734 */ lw $v1, %lo(D_80982734)($v1) -/* 04F10 80982580 14600006 */ bne $v1, $zero, .L8098259C -/* 04F14 80982584 00000000 */ nop -.L80982588: -/* 04F18 80982588 3C048098 */ lui $a0, %hi(D_80982A3C) ## $a0 = 80980000 -/* 04F1C 8098258C 0C00084C */ jal osSyncPrintf - -/* 04F20 80982590 24842A3C */ addiu $a0, $a0, %lo(D_80982A3C) ## $a0 = 80982A3C -/* 04F24 80982594 10000004 */ beq $zero, $zero, .L809825A8 -/* 04F28 80982598 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098259C: -/* 04F2C 8098259C 0060F809 */ jalr $ra, $v1 -/* 04F30 809825A0 00000000 */ nop -/* 04F34 809825A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809825A8: -/* 04F38 809825A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04F3C 809825AC 03E00008 */ jr $ra -/* 04F40 809825B0 00000000 */ nop -/* 04F44 809825B4 00000000 */ nop -/* 04F48 809825B8 00000000 */ nop -/* 04F4C 809825BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s deleted file mode 100644 index dca52c2dd6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s +++ /dev/null @@ -1,103 +0,0 @@ -.rdata -glabel D_809829FC - .asciz "Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.late_rodata -.late_rodata_alignment 4 -glabel jtbl_80982B54 -.word L809824A4 -.word L809824B4 -.word L809824C4 -.word L80982524 -.word L80982524 -.word L809824D4 -.word L809824E4 -.word L809824F4 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982524 -.word L80982504 -.word L80982514 - -.text -glabel DemoGt_Init -/* 04E04 80982474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04E08 80982478 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04E0C 8098247C 948E001C */ lhu $t6, 0x001C($a0) ## 0000001C -/* 04E10 80982480 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 04E14 80982484 2DC10019 */ sltiu $at, $t6, 0x0019 -/* 04E18 80982488 10200026 */ beq $at, $zero, .L80982524 -/* 04E1C 8098248C 000E7080 */ sll $t6, $t6, 2 -/* 04E20 80982490 3C018098 */ lui $at, %hi(jtbl_80982B54) ## $at = 80980000 -/* 04E24 80982494 002E0821 */ addu $at, $at, $t6 -/* 04E28 80982498 8C2E2B54 */ lw $t6, %lo(jtbl_80982B54)($at) -/* 04E2C 8098249C 01C00008 */ jr $t6 -/* 04E30 809824A0 00000000 */ nop -glabel L809824A4 -/* 04E34 809824A4 0C25FBAA */ jal func_8097EEA8 -/* 04E38 809824A8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E3C 809824AC 10000024 */ beq $zero, $zero, .L80982540 -/* 04E40 809824B0 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L809824B4 -/* 04E44 809824B4 0C25FE41 */ jal func_8097F904 -/* 04E48 809824B8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E4C 809824BC 10000020 */ beq $zero, $zero, .L80982540 -/* 04E50 809824C0 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L809824C4 -/* 04E54 809824C4 0C260044 */ jal func_80980110 -/* 04E58 809824C8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E5C 809824CC 1000001C */ beq $zero, $zero, .L80982540 -/* 04E60 809824D0 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L809824D4 -/* 04E64 809824D4 0C2603C0 */ jal func_80980F00 -/* 04E68 809824D8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E6C 809824DC 10000018 */ beq $zero, $zero, .L80982540 -/* 04E70 809824E0 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L809824E4 -/* 04E74 809824E4 0C2604F3 */ jal func_809813CC -/* 04E78 809824E8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E7C 809824EC 10000014 */ beq $zero, $zero, .L80982540 -/* 04E80 809824F0 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L809824F4 -/* 04E84 809824F4 0C260629 */ jal func_809818A4 -/* 04E88 809824F8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E8C 809824FC 10000010 */ beq $zero, $zero, .L80982540 -/* 04E90 80982500 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80982504 -/* 04E94 80982504 0C260725 */ jal func_80981C94 -/* 04E98 80982508 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04E9C 8098250C 1000000C */ beq $zero, $zero, .L80982540 -/* 04EA0 80982510 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80982514 -/* 04EA4 80982514 0C260815 */ jal func_80982054 -/* 04EA8 80982518 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04EAC 8098251C 10000008 */ beq $zero, $zero, .L80982540 -/* 04EB0 80982520 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L80982524 -.L80982524: -/* 04EB4 80982524 3C048098 */ lui $a0, %hi(D_809829FC) ## $a0 = 80980000 -/* 04EB8 80982528 248429FC */ addiu $a0, $a0, %lo(D_809829FC) ## $a0 = 809829FC -/* 04EBC 8098252C 0C00084C */ jal osSyncPrintf - -/* 04EC0 80982530 AFA60018 */ sw $a2, 0x0018($sp) -/* 04EC4 80982534 0C00B55C */ jal Actor_Kill - -/* 04EC8 80982538 8FA40018 */ lw $a0, 0x0018($sp) -/* 04ECC 8098253C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80982540: -/* 04ED0 80982540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04ED4 80982544 03E00008 */ jr $ra -/* 04ED8 80982548 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s deleted file mode 100644 index b8534883bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_809829C0 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.balign 4 - -.text -glabel DemoGt_Update -/* 04DA8 80982418 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04DAC 8098241C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04DB0 80982420 8C820164 */ lw $v0, 0x0164($a0) ## 00000164 -/* 04DB4 80982424 04400008 */ bltz $v0, .L80982448 -/* 04DB8 80982428 28410013 */ slti $at, $v0, 0x0013 -/* 04DBC 8098242C 10200006 */ beq $at, $zero, .L80982448 -/* 04DC0 80982430 00027080 */ sll $t6, $v0, 2 -/* 04DC4 80982434 3C038098 */ lui $v1, %hi(D_809826E8) ## $v1 = 80980000 -/* 04DC8 80982438 006E1821 */ addu $v1, $v1, $t6 -/* 04DCC 8098243C 8C6326E8 */ lw $v1, %lo(D_809826E8)($v1) -/* 04DD0 80982440 14600006 */ bne $v1, $zero, .L8098245C -/* 04DD4 80982444 00000000 */ nop -.L80982448: -/* 04DD8 80982448 3C048098 */ lui $a0, %hi(D_809829C0) ## $a0 = 80980000 -/* 04DDC 8098244C 0C00084C */ jal osSyncPrintf - -/* 04DE0 80982450 248429C0 */ addiu $a0, $a0, %lo(D_809829C0) ## $a0 = 809829C0 -/* 04DE4 80982454 10000004 */ beq $zero, $zero, .L80982468 -/* 04DE8 80982458 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098245C: -/* 04DEC 8098245C 0060F809 */ jalr $ra, $v1 -/* 04DF0 80982460 00000000 */ nop -/* 04DF4 80982464 8FBF0014 */ lw $ra, 0x0014($sp) -.L80982468: -/* 04DF8 80982468 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04DFC 8098246C 03E00008 */ jr $ra -/* 04E00 80982470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s deleted file mode 100644 index cefc49da66..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8097D6B4 -/* 00044 8097D6B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00048 8097D6B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0004C 8097D6BC 0C01E233 */ jal func_800788CC -/* 00050 8097D6C0 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 00054 8097D6C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00058 8097D6C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0005C 8097D6CC 03E00008 */ jr $ra -/* 00060 8097D6D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s deleted file mode 100644 index 8683111417..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8097D6D4 -/* 00064 8097D6D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00068 8097D6D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0006C 8097D6DC 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 00070 8097D6E0 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00074 8097D6E4 2407180E */ addiu $a3, $zero, 0x180E ## $a3 = 0000180E -/* 00078 8097D6E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0007C 8097D6EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00080 8097D6F0 03E00008 */ jr $ra -/* 00084 8097D6F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s deleted file mode 100644 index c5d52f5282..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8097D6F8 -/* 00088 8097D6F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0008C 8097D6FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00090 8097D700 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 00094 8097D704 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00098 8097D708 240728C2 */ addiu $a3, $zero, 0x28C2 ## $a3 = 000028C2 -/* 0009C 8097D70C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000A0 8097D710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000A4 8097D714 03E00008 */ jr $ra -/* 000A8 8097D718 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s deleted file mode 100644 index 55c47e74d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097D71C -/* 000AC 8097D71C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B0 8097D720 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000B4 8097D724 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 000B8 8097D728 AFA40018 */ sw $a0, 0x0018($sp) -/* 000BC 8097D72C 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 000C0 8097D730 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 000C4 8097D734 0C02A800 */ jal func_800AA000 -/* 000C8 8097D738 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 000CC 8097D73C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000D0 8097D740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000D4 8097D744 03E00008 */ jr $ra -/* 000D8 8097D748 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s deleted file mode 100644 index 863792cee4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s +++ /dev/null @@ -1,42 +0,0 @@ -.late_rodata -glabel D_80982A74 - .float 0.2 - -.text -glabel func_8097D74C -/* 000DC 8097D74C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000E0 8097D750 AFBF002C */ sw $ra, 0x002C($sp) -/* 000E4 8097D754 AFA40030 */ sw $a0, 0x0030($sp) -/* 000E8 8097D758 AFA50034 */ sw $a1, 0x0034($sp) -/* 000EC 8097D75C AFA60038 */ sw $a2, 0x0038($sp) -/* 000F0 8097D760 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000F4 8097D764 AFA7003C */ sw $a3, 0x003C($sp) -/* 000F8 8097D768 3C018098 */ lui $at, %hi(D_80982A74) ## $at = 80980000 -/* 000FC 8097D76C C4242A74 */ lwc1 $f4, %lo(D_80982A74)($at) -/* 00100 8097D770 C7A20040 */ lwc1 $f2, 0x0040($sp) -/* 00104 8097D774 87A80046 */ lh $t0, 0x0046($sp) -/* 00108 8097D778 87A9004A */ lh $t1, 0x004A($sp) -/* 0010C 8097D77C 46041182 */ mul.s $f6, $f2, $f4 -/* 00110 8097D780 3C0E8098 */ lui $t6, %hi(D_809825C0) ## $t6 = 80980000 -/* 00114 8097D784 3C0F8098 */ lui $t7, %hi(D_809825C4) ## $t7 = 80980000 -/* 00118 8097D788 25EF25C4 */ addiu $t7, $t7, %lo(D_809825C4) ## $t7 = 809825C4 -/* 0011C 8097D78C 25CE25C0 */ addiu $t6, $t6, %lo(D_809825C0) ## $t6 = 809825C0 -/* 00120 8097D790 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00124 8097D794 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00128 8097D798 46060202 */ mul.s $f8, $f0, $f6 -/* 0012C 8097D79C 8FA40030 */ lw $a0, 0x0030($sp) -/* 00130 8097D7A0 8FA50034 */ lw $a1, 0x0034($sp) -/* 00134 8097D7A4 8FA60038 */ lw $a2, 0x0038($sp) -/* 00138 8097D7A8 8FA7003C */ lw $a3, 0x003C($sp) -/* 0013C 8097D7AC AFA8001C */ sw $t0, 0x001C($sp) -/* 00140 8097D7B0 AFA90020 */ sw $t1, 0x0020($sp) -/* 00144 8097D7B4 46024280 */ add.s $f10, $f8, $f2 -/* 00148 8097D7B8 4600540D */ trunc.w.s $f16, $f10 -/* 0014C 8097D7BC 44198000 */ mfc1 $t9, $f16 -/* 00150 8097D7C0 0C00A10F */ jal func_8002843C -/* 00154 8097D7C4 AFB90018 */ sw $t9, 0x0018($sp) -/* 00158 8097D7C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0015C 8097D7CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00160 8097D7D0 03E00008 */ jr $ra -/* 00164 8097D7D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s deleted file mode 100644 index e6fca6ae2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_8097D7D8 -/* 00168 8097D7D8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0016C 8097D7DC 44876000 */ mtc1 $a3, $f12 ## $f12 = 0.00 -/* 00170 8097D7E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00174 8097D7E4 AFA5005C */ sw $a1, 0x005C($sp) -/* 00178 8097D7E8 AFA40058 */ sw $a0, 0x0058($sp) -/* 0017C 8097D7EC AFA60060 */ sw $a2, 0x0060($sp) -/* 00180 8097D7F0 0C03034A */ jal func_800C0D28 -/* 00184 8097D7F4 E7AC0064 */ swc1 $f12, 0x0064($sp) -/* 00188 8097D7F8 8FA40058 */ lw $a0, 0x0058($sp) -/* 0018C 8097D7FC 8FA60060 */ lw $a2, 0x0060($sp) -/* 00190 8097D800 14400054 */ bne $v0, $zero, .L8097D954 -/* 00194 8097D804 C7AC0064 */ lwc1 $f12, 0x0064($sp) -/* 00198 8097D808 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 0019C 8097D80C 00441021 */ addu $v0, $v0, $a0 -/* 001A0 8097D810 8C421DE4 */ lw $v0, 0x1DE4($v0) ## 00011DE4 -/* 001A4 8097D814 8FAE0068 */ lw $t6, 0x0068($sp) -/* 001A8 8097D818 3C198098 */ lui $t9, %hi(D_809825C8) ## $t9 = 80980000 -/* 001AC 8097D81C 8FAF006C */ lw $t7, 0x006C($sp) -/* 001B0 8097D820 004E001A */ div $zero, $v0, $t6 -/* 001B4 8097D824 00001810 */ mfhi $v1 -/* 001B8 8097D828 273925C8 */ addiu $t9, $t9, %lo(D_809825C8) ## $t9 = 809825C8 -/* 001BC 8097D82C 15C00002 */ bne $t6, $zero, .L8097D838 -/* 001C0 8097D830 00000000 */ nop -/* 001C4 8097D834 0007000D */ break 7 -.L8097D838: -/* 001C8 8097D838 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 001CC 8097D83C 15C10004 */ bne $t6, $at, .L8097D850 -/* 001D0 8097D840 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001D4 8097D844 14410002 */ bne $v0, $at, .L8097D850 -/* 001D8 8097D848 00000000 */ nop -/* 001DC 8097D84C 0006000D */ break 6 -.L8097D850: -/* 001E0 8097D850 00031023 */ subu $v0, $zero, $v1 -/* 001E4 8097D854 04600003 */ bltz $v1, .L8097D864 -/* 001E8 8097D858 27B8003C */ addiu $t8, $sp, 0x003C ## $t8 = FFFFFFE4 -/* 001EC 8097D85C 10000001 */ beq $zero, $zero, .L8097D864 -/* 001F0 8097D860 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8097D864: -/* 001F4 8097D864 544F003C */ bnel $v0, $t7, .L8097D958 -/* 001F8 8097D868 8FBF0024 */ lw $ra, 0x0024($sp) -/* 001FC 8097D86C 8F290000 */ lw $t1, 0x0000($t9) ## 809825C8 -/* 00200 8097D870 8F280004 */ lw $t0, 0x0004($t9) ## 809825CC -/* 00204 8097D874 3C0A8098 */ lui $t2, %hi(D_809825D4) ## $t2 = 80980000 -/* 00208 8097D878 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFE4 -/* 0020C 8097D87C 8F290008 */ lw $t1, 0x0008($t9) ## 809825D0 -/* 00210 8097D880 254A25D4 */ addiu $t2, $t2, %lo(D_809825D4) ## $t2 = 809825D4 -/* 00214 8097D884 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFE8 -/* 00218 8097D888 AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFEC -/* 0021C 8097D88C 8D4C0000 */ lw $t4, 0x0000($t2) ## 809825D4 -/* 00220 8097D890 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFD8 -/* 00224 8097D894 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00228 8097D898 ACEC0000 */ sw $t4, 0x0000($a3) ## FFFFFFD8 -/* 0022C 8097D89C 8D4B0004 */ lw $t3, 0x0004($t2) ## 809825D8 -/* 00230 8097D8A0 ACEB0004 */ sw $t3, 0x0004($a3) ## FFFFFFDC -/* 00234 8097D8A4 8D4C0008 */ lw $t4, 0x0008($t2) ## 809825DC -/* 00238 8097D8A8 ACEC0008 */ sw $t4, 0x0008($a3) ## FFFFFFE0 -/* 0023C 8097D8AC C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 00240 8097D8B0 C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 00244 8097D8B4 C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 00248 8097D8B8 460C2182 */ mul.s $f6, $f4, $f12 -/* 0024C 8097D8BC 87AF0072 */ lh $t7, 0x0072($sp) -/* 00250 8097D8C0 8FA5005C */ lw $a1, 0x005C($sp) -/* 00254 8097D8C4 460C4282 */ mul.s $f10, $f8, $f12 -/* 00258 8097D8C8 00000000 */ nop -/* 0025C 8097D8CC 460C8482 */ mul.s $f18, $f16, $f12 -/* 00260 8097D8D0 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00264 8097D8D4 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 00268 8097D8D8 E7B20044 */ swc1 $f18, 0x0044($sp) -/* 0026C 8097D8DC C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 -/* 00270 8097D8E0 46043200 */ add.s $f8, $f6, $f4 -/* 00274 8097D8E4 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 00278 8097D8E8 C4D00004 */ lwc1 $f16, 0x0004($a2) ## 00000004 -/* 0027C 8097D8EC 46105180 */ add.s $f6, $f10, $f16 -/* 00280 8097D8F0 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 00284 8097D8F4 E7A60040 */ swc1 $f6, 0x0040($sp) -/* 00288 8097D8F8 C4C40008 */ lwc1 $f4, 0x0008($a2) ## 00000008 -/* 0028C 8097D8FC 460C5402 */ mul.s $f16, $f10, $f12 -/* 00290 8097D900 C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 00294 8097D904 46049200 */ add.s $f8, $f18, $f4 -/* 00298 8097D908 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 0029C 8097D90C 460C3482 */ mul.s $f18, $f6, $f12 -/* 002A0 8097D910 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 002A4 8097D914 E7A80044 */ swc1 $f8, 0x0044($sp) -/* 002A8 8097D918 460C2202 */ mul.s $f8, $f4, $f12 -/* 002AC 8097D91C E7B00030 */ swc1 $f16, 0x0030($sp) -/* 002B0 8097D920 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 002B4 8097D924 460C5402 */ mul.s $f16, $f10, $f12 -/* 002B8 8097D928 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 002BC 8097D92C E7B20034 */ swc1 $f18, 0x0034($sp) -/* 002C0 8097D930 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFE4 -/* 002C4 8097D934 460C3482 */ mul.s $f18, $f6, $f12 -/* 002C8 8097D938 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 002CC 8097D93C AFAF0018 */ sw $t7, 0x0018($sp) -/* 002D0 8097D940 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 002D4 8097D944 4600910D */ trunc.w.s $f4, $f18 -/* 002D8 8097D948 440E2000 */ mfc1 $t6, $f4 -/* 002DC 8097D94C 0C25F5D3 */ jal func_8097D74C -/* 002E0 8097D950 AFAE0014 */ sw $t6, 0x0014($sp) -.L8097D954: -/* 002E4 8097D954 8FBF0024 */ lw $ra, 0x0024($sp) -.L8097D958: -/* 002E8 8097D958 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 002EC 8097D95C 03E00008 */ jr $ra -/* 002F0 8097D960 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s deleted file mode 100644 index e66badca30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8097D964 -/* 002F4 8097D964 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 002F8 8097D968 AFA50034 */ sw $a1, 0x0034($sp) -/* 002FC 8097D96C 8FAE0034 */ lw $t6, 0x0034($sp) -/* 00300 8097D970 AFBF002C */ sw $ra, 0x002C($sp) -/* 00304 8097D974 AFA40030 */ sw $a0, 0x0030($sp) -/* 00308 8097D978 AFA60038 */ sw $a2, 0x0038($sp) -/* 0030C 8097D97C C5C40004 */ lwc1 $f4, 0x0004($t6) ## 00000004 -/* 00310 8097D980 8DC70000 */ lw $a3, 0x0000($t6) ## 00000000 -/* 00314 8097D984 87AF003A */ lh $t7, 0x003A($sp) -/* 00318 8097D988 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0031C 8097D98C C5C60008 */ lwc1 $f6, 0x0008($t6) ## 00000008 -/* 00320 8097D990 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00324 8097D994 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 -/* 00328 8097D998 AFA00020 */ sw $zero, 0x0020($sp) -/* 0032C 8097D99C AFA0001C */ sw $zero, 0x001C($sp) -/* 00330 8097D9A0 AFA00018 */ sw $zero, 0x0018($sp) -/* 00334 8097D9A4 240600E5 */ addiu $a2, $zero, 0x00E5 ## $a2 = 000000E5 -/* 00338 8097D9A8 AFAF0024 */ sw $t7, 0x0024($sp) -/* 0033C 8097D9AC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00340 8097D9B0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00344 8097D9B4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00348 8097D9B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0034C 8097D9BC 03E00008 */ jr $ra -/* 00350 8097D9C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s deleted file mode 100644 index 59b230a588..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_8097D9C4 -/* 00354 8097D9C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00358 8097D9C8 3C0E8098 */ lui $t6, %hi(D_809825E0) ## $t6 = 80980000 -/* 0035C 8097D9CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00360 8097D9D0 AFA40040 */ sw $a0, 0x0040($sp) -/* 00364 8097D9D4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00368 8097D9D8 25CE25E0 */ addiu $t6, $t6, %lo(D_809825E0) ## $t6 = 809825E0 -/* 0036C 8097D9DC 8DD80000 */ lw $t8, 0x0000($t6) ## 809825E0 -/* 00370 8097D9E0 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00374 8097D9E4 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 -/* 00378 8097D9E8 ACD80000 */ sw $t8, 0x0000($a2) ## FFFFFFF0 -/* 0037C 8097D9EC 8DCF0004 */ lw $t7, 0x0004($t6) ## 809825E4 -/* 00380 8097D9F0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00384 8097D9F4 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00388 8097D9F8 ACCF0004 */ sw $t7, 0x0004($a2) ## FFFFFFF4 -/* 0038C 8097D9FC 8DD80008 */ lw $t8, 0x0008($t6) ## 809825E8 -/* 00390 8097DA00 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00394 8097DA04 460C2182 */ mul.s $f6, $f4, $f12 -/* 00398 8097DA08 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 0039C 8097DA0C 3C198098 */ lui $t9, %hi(D_809825EC) ## $t9 = 80980000 -/* 003A0 8097DA10 273925EC */ addiu $t9, $t9, %lo(D_809825EC) ## $t9 = 809825EC -/* 003A4 8097DA14 ACD80008 */ sw $t8, 0x0008($a2) ## FFFFFFF8 -/* 003A8 8097DA18 8F290000 */ lw $t1, 0x0000($t9) ## 809825EC -/* 003AC 8097DA1C 460C5402 */ mul.s $f16, $f10, $f12 -/* 003B0 8097DA20 27A70024 */ addiu $a3, $sp, 0x0024 ## $a3 = FFFFFFE4 -/* 003B4 8097DA24 ACE90000 */ sw $t1, 0x0000($a3) ## FFFFFFE4 -/* 003B8 8097DA28 8F280004 */ lw $t0, 0x0004($t9) ## 809825F0 -/* 003BC 8097DA2C ACE80004 */ sw $t0, 0x0004($a3) ## FFFFFFE8 -/* 003C0 8097DA30 4600848D */ trunc.w.s $f18, $f16 -/* 003C4 8097DA34 8F290008 */ lw $t1, 0x0008($t9) ## 809825F4 -/* 003C8 8097DA38 4600320D */ trunc.w.s $f8, $f6 -/* 003CC 8097DA3C ACE90008 */ sw $t1, 0x0008($a3) ## FFFFFFEC -/* 003D0 8097DA40 440D9000 */ mfc1 $t5, $f18 -/* 003D4 8097DA44 8FA50044 */ lw $a1, 0x0044($sp) -/* 003D8 8097DA48 440B4000 */ mfc1 $t3, $f8 -/* 003DC 8097DA4C 8FA40040 */ lw $a0, 0x0040($sp) -/* 003E0 8097DA50 AFAD0014 */ sw $t5, 0x0014($sp) -/* 003E4 8097DA54 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered -/* 003E8 8097DA58 AFAB0010 */ sw $t3, 0x0010($sp) -/* 003EC 8097DA5C 8FA40040 */ lw $a0, 0x0040($sp) -/* 003F0 8097DA60 0C25F5B5 */ jal func_8097D6D4 -/* 003F4 8097DA64 8FA50044 */ lw $a1, 0x0044($sp) -/* 003F8 8097DA68 8FBF001C */ lw $ra, 0x001C($sp) -/* 003FC 8097DA6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00400 8097DA70 03E00008 */ jr $ra -/* 00404 8097DA74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s deleted file mode 100644 index 8322d40590..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8097DA78 -/* 00408 8097DA78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0040C 8097DA7C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00410 8097DA80 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00414 8097DA84 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00418 8097DA88 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 0041C 8097DA8C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 00420 8097DA90 460C2182 */ mul.s $f6, $f4, $f12 -/* 00424 8097DA94 AFBF001C */ sw $ra, 0x001C($sp) -/* 00428 8097DA98 460C5402 */ mul.s $f16, $f10, $f12 -/* 0042C 8097DA9C 4600320D */ trunc.w.s $f8, $f6 -/* 00430 8097DAA0 4600848D */ trunc.w.s $f18, $f16 -/* 00434 8097DAA4 440F4000 */ mfc1 $t7, $f8 -/* 00438 8097DAA8 44199000 */ mfc1 $t9, $f18 -/* 0043C 8097DAAC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00440 8097DAB0 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered -/* 00444 8097DAB4 AFB90014 */ sw $t9, 0x0014($sp) -/* 00448 8097DAB8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0044C 8097DABC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00450 8097DAC0 03E00008 */ jr $ra -/* 00454 8097DAC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s deleted file mode 100644 index c99c97c860..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s +++ /dev/null @@ -1,172 +0,0 @@ -.late_rodata -glabel D_80982A78 - .float 0.1 - -glabel D_80982A7C - .float 0.7 - -.text -glabel func_8097DAC8 -/* 00458 8097DAC8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 0045C 8097DACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00460 8097DAD0 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00464 8097DAD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00468 8097DAD8 4481F000 */ mtc1 $at, $f30 ## $f30 = 20.00 -/* 0046C 8097DADC 4600218D */ trunc.w.s $f6, $f4 -/* 00470 8097DAE0 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 00474 8097DAE4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00478 8097DAE8 4481E000 */ mtc1 $at, $f28 ## $f28 = 2.00 -/* 0047C 8097DAEC F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00480 8097DAF0 3C014296 */ lui $at, 0x4296 ## $at = 42960000 -/* 00484 8097DAF4 AFB40088 */ sw $s4, 0x0088($sp) -/* 00488 8097DAF8 4481D000 */ mtc1 $at, $f26 ## $f26 = 75.00 -/* 0048C 8097DAFC 44143000 */ mfc1 $s4, $f6 -/* 00490 8097DB00 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 00494 8097DB04 3C014238 */ lui $at, 0x4238 ## $at = 42380000 -/* 00498 8097DB08 AFBE0098 */ sw $s8, 0x0098($sp) -/* 0049C 8097DB0C 4481C000 */ mtc1 $at, $f24 ## $f24 = 46.00 -/* 004A0 8097DB10 AFB70094 */ sw $s7, 0x0094($sp) -/* 004A4 8097DB14 AFB60090 */ sw $s6, 0x0090($sp) -/* 004A8 8097DB18 AFB5008C */ sw $s5, 0x008C($sp) -/* 004AC 8097DB1C AFB30084 */ sw $s3, 0x0084($sp) -/* 004B0 8097DB20 AFB20080 */ sw $s2, 0x0080($sp) -/* 004B4 8097DB24 AFB1007C */ sw $s1, 0x007C($sp) -/* 004B8 8097DB28 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 004BC 8097DB2C 3C018098 */ lui $at, %hi(D_80982A78) ## $at = 80980000 -/* 004C0 8097DB30 3C1E0600 */ lui $s8, 0x0600 ## $s8 = 06000000 -/* 004C4 8097DB34 00C09025 */ or $s2, $a2, $zero ## $s2 = 00000000 -/* 004C8 8097DB38 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 004CC 8097DB3C AFBF009C */ sw $ra, 0x009C($sp) -/* 004D0 8097DB40 AFB00078 */ sw $s0, 0x0078($sp) -/* 004D4 8097DB44 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 004D8 8097DB48 AFA400D0 */ sw $a0, 0x00D0($sp) -/* 004DC 8097DB4C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 004E0 8097DB50 27DE0EA0 */ addiu $s8, $s8, 0x0EA0 ## $s8 = 06000EA0 -/* 004E4 8097DB54 C4362A78 */ lwc1 $f22, %lo(D_80982A78)($at) -/* 004E8 8097DB58 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 004EC 8097DB5C 27B600C4 */ addiu $s6, $sp, 0x00C4 ## $s6 = FFFFFFF4 -/* 004F0 8097DB60 27B700B8 */ addiu $s7, $sp, 0x00B8 ## $s7 = FFFFFFE8 -/* 004F4 8097DB64 2694001E */ addiu $s4, $s4, 0x001E ## $s4 = 0000001E -.L8097DB68: -/* 004F8 8097DB68 00112400 */ sll $a0, $s1, 16 -/* 004FC 8097DB6C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00500 8097DB70 00042403 */ sra $a0, $a0, 16 -/* 00504 8097DB74 46180202 */ mul.s $f8, $f0, $f24 -/* 00508 8097DB78 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0050C 8097DB7C E7A800C4 */ swc1 $f8, 0x00C4($sp) -/* 00510 8097DB80 461A0282 */ mul.s $f10, $f0, $f26 -/* 00514 8097DB84 00112400 */ sll $a0, $s1, 16 -/* 00518 8097DB88 00042403 */ sra $a0, $a0, 16 -/* 0051C 8097DB8C 461C5400 */ add.s $f16, $f10, $f28 -/* 00520 8097DB90 0C01DE0D */ jal Math_Coss - ## coss? -/* 00524 8097DB94 E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 00528 8097DB98 46180482 */ mul.s $f18, $f0, $f24 -/* 0052C 8097DB9C C7A400C4 */ lwc1 $f4, 0x00C4($sp) -/* 00530 8097DBA0 46162182 */ mul.s $f6, $f4, $f22 -/* 00534 8097DBA4 E7B200CC */ swc1 $f18, 0x00CC($sp) -/* 00538 8097DBA8 461E3200 */ add.s $f8, $f6, $f30 -/* 0053C 8097DBAC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00540 8097DBB0 E7A800B8 */ swc1 $f8, 0x00B8($sp) -/* 00544 8097DBB4 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 00548 8097DBB8 44815000 */ mtc1 $at, $f10 ## $f10 = 16.00 -/* 0054C 8097DBBC C7B200CC */ lwc1 $f18, 0x00CC($sp) -/* 00550 8097DBC0 C7A600C4 */ lwc1 $f6, 0x00C4($sp) -/* 00554 8097DBC4 460A0402 */ mul.s $f16, $f0, $f10 -/* 00558 8097DBC8 00000000 */ nop -/* 0055C 8097DBCC 46169102 */ mul.s $f4, $f18, $f22 -/* 00560 8097DBD0 E7B000BC */ swc1 $f16, 0x00BC($sp) -/* 00564 8097DBD4 C7B000C8 */ lwc1 $f16, 0x00C8($sp) -/* 00568 8097DBD8 E7A400C0 */ swc1 $f4, 0x00C0($sp) -/* 0056C 8097DBDC C6480000 */ lwc1 $f8, 0x0000($s2) ## 00000000 -/* 00570 8097DBE0 46083280 */ add.s $f10, $f6, $f8 -/* 00574 8097DBE4 E7AA00C4 */ swc1 $f10, 0x00C4($sp) -/* 00578 8097DBE8 C6440004 */ lwc1 $f4, 0x0004($s2) ## 00000004 -/* 0057C 8097DBEC 46048180 */ add.s $f6, $f16, $f4 -/* 00580 8097DBF0 E7A600C8 */ swc1 $f6, 0x00C8($sp) -/* 00584 8097DBF4 C6480008 */ lwc1 $f8, 0x0008($s2) ## 00000008 -/* 00588 8097DBF8 46089280 */ add.s $f10, $f18, $f8 -/* 0058C 8097DBFC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00590 8097DC00 E7AA00CC */ swc1 $f10, 0x00CC($sp) -/* 00594 8097DC04 4616003C */ c.lt.s $f0, $f22 -/* 00598 8097DC08 3C018098 */ lui $at, %hi(D_80982A7C) ## $at = 80980000 -/* 0059C 8097DC0C 45000003 */ bc1f .L8097DC1C -/* 005A0 8097DC10 00000000 */ nop -/* 005A4 8097DC14 10000009 */ beq $zero, $zero, .L8097DC3C -/* 005A8 8097DC18 24100060 */ addiu $s0, $zero, 0x0060 ## $s0 = 00000060 -.L8097DC1C: -/* 005AC 8097DC1C C4302A7C */ lwc1 $f16, %lo(D_80982A7C)($at) -/* 005B0 8097DC20 24100020 */ addiu $s0, $zero, 0x0020 ## $s0 = 00000020 -/* 005B4 8097DC24 4610003C */ c.lt.s $f0, $f16 -/* 005B8 8097DC28 00000000 */ nop -/* 005BC 8097DC2C 45000003 */ bc1f .L8097DC3C -/* 005C0 8097DC30 00000000 */ nop -/* 005C4 8097DC34 10000001 */ beq $zero, $zero, .L8097DC3C -/* 005C8 8097DC38 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 -.L8097DC3C: -/* 005CC 8097DC3C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 005D0 8097DC40 00000000 */ nop -/* 005D4 8097DC44 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 005D8 8097DC48 46000506 */ mov.s $f20, $f0 -/* 005DC 8097DC4C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 005E0 8097DC50 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 005E4 8097DC54 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 005E8 8097DC58 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 005EC 8097DC5C 4604A182 */ mul.s $f6, $f20, $f4 -/* 005F0 8097DC60 240FFF09 */ addiu $t7, $zero, 0xFF09 ## $t7 = FFFFFF09 -/* 005F4 8097DC64 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 005F8 8097DC68 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 005FC 8097DC6C 240A012C */ addiu $t2, $zero, 0x012C ## $t2 = 0000012C -/* 00600 8097DC70 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00604 8097DC74 240C0186 */ addiu $t4, $zero, 0x0186 ## $t4 = 00000186 -/* 00608 8097DC78 46123200 */ add.s $f8, $f6, $f18 -/* 0060C 8097DC7C AFAC0038 */ sw $t4, 0x0038($sp) -/* 00610 8097DC80 AFAB0034 */ sw $t3, 0x0034($sp) -/* 00614 8097DC84 AFAA002C */ sw $t2, 0x002C($sp) -/* 00618 8097DC88 4600428D */ trunc.w.s $f10, $f8 -/* 0061C 8097DC8C AFA90028 */ sw $t1, 0x0028($sp) -/* 00620 8097DC90 AFB80018 */ sw $t8, 0x0018($sp) -/* 00624 8097DC94 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00628 8097DC98 44085000 */ mfc1 $t0, $f10 -/* 0062C 8097DC9C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00630 8097DCA0 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFF4 -/* 00634 8097DCA4 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFE8 -/* 00638 8097DCA8 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 0063C 8097DCAC AFB00014 */ sw $s0, 0x0014($sp) -/* 00640 8097DCB0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00644 8097DCB4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00648 8097DCB8 AFB40030 */ sw $s4, 0x0030($sp) -/* 0064C 8097DCBC AFBE003C */ sw $s8, 0x003C($sp) -/* 00650 8097DCC0 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00654 8097DCC4 AFA80024 */ sw $t0, 0x0024($sp) -/* 00658 8097DCC8 26311555 */ addiu $s1, $s1, 0x1555 ## $s1 = 00001555 -/* 0065C 8097DCCC 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 00660 8097DCD0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00664 8097DCD4 00118C00 */ sll $s1, $s1, 16 -/* 00668 8097DCD8 1661FFA3 */ bne $s3, $at, .L8097DB68 -/* 0066C 8097DCDC 00118C03 */ sra $s1, $s1, 16 -/* 00670 8097DCE0 8FBF009C */ lw $ra, 0x009C($sp) -/* 00674 8097DCE4 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00678 8097DCE8 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 0067C 8097DCEC D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00680 8097DCF0 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 00684 8097DCF4 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00688 8097DCF8 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 0068C 8097DCFC 8FB00078 */ lw $s0, 0x0078($sp) -/* 00690 8097DD00 8FB1007C */ lw $s1, 0x007C($sp) -/* 00694 8097DD04 8FB20080 */ lw $s2, 0x0080($sp) -/* 00698 8097DD08 8FB30084 */ lw $s3, 0x0084($sp) -/* 0069C 8097DD0C 8FB40088 */ lw $s4, 0x0088($sp) -/* 006A0 8097DD10 8FB5008C */ lw $s5, 0x008C($sp) -/* 006A4 8097DD14 8FB60090 */ lw $s6, 0x0090($sp) -/* 006A8 8097DD18 8FB70094 */ lw $s7, 0x0094($sp) -/* 006AC 8097DD1C 8FBE0098 */ lw $s8, 0x0098($sp) -/* 006B0 8097DD20 03E00008 */ jr $ra -/* 006B4 8097DD24 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s deleted file mode 100644 index 874416f30a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s +++ /dev/null @@ -1,166 +0,0 @@ -.late_rodata -glabel D_80982A80 - .float 0.1 - -glabel D_80982A84 - .float 0.7 - -.text -glabel func_8097DD28 -/* 006B8 8097DD28 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 006BC 8097DD2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006C0 8097DD30 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 006C4 8097DD34 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 006C8 8097DD38 4600218D */ trunc.w.s $f6, $f4 -/* 006CC 8097DD3C 4481E000 */ mtc1 $at, $f28 ## $f28 = 2.00 -/* 006D0 8097DD40 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 006D4 8097DD44 3C014296 */ lui $at, 0x4296 ## $at = 42960000 -/* 006D8 8097DD48 4481D000 */ mtc1 $at, $f26 ## $f26 = 75.00 -/* 006DC 8097DD4C AFB40088 */ sw $s4, 0x0088($sp) -/* 006E0 8097DD50 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 006E4 8097DD54 3C018098 */ lui $at, %hi(D_80982A80) ## $at = 80980000 -/* 006E8 8097DD58 44143000 */ mfc1 $s4, $f6 -/* 006EC 8097DD5C C4382A80 */ lwc1 $f24, %lo(D_80982A80)($at) -/* 006F0 8097DD60 AFBE0098 */ sw $s8, 0x0098($sp) -/* 006F4 8097DD64 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 006F8 8097DD68 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 006FC 8097DD6C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00700 8097DD70 AFB70094 */ sw $s7, 0x0094($sp) -/* 00704 8097DD74 AFB60090 */ sw $s6, 0x0090($sp) -/* 00708 8097DD78 AFB5008C */ sw $s5, 0x008C($sp) -/* 0070C 8097DD7C AFB30084 */ sw $s3, 0x0084($sp) -/* 00710 8097DD80 AFB20080 */ sw $s2, 0x0080($sp) -/* 00714 8097DD84 AFB1007C */ sw $s1, 0x007C($sp) -/* 00718 8097DD88 3C1E0600 */ lui $s8, 0x0600 ## $s8 = 06000000 -/* 0071C 8097DD8C 4481B000 */ mtc1 $at, $f22 ## $f22 = 30.00 -/* 00720 8097DD90 4480F000 */ mtc1 $zero, $f30 ## $f30 = 0.00 -/* 00724 8097DD94 00C09025 */ or $s2, $a2, $zero ## $s2 = 00000000 -/* 00728 8097DD98 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 0072C 8097DD9C AFBF009C */ sw $ra, 0x009C($sp) -/* 00730 8097DDA0 AFB00078 */ sw $s0, 0x0078($sp) -/* 00734 8097DDA4 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00738 8097DDA8 AFA400D0 */ sw $a0, 0x00D0($sp) -/* 0073C 8097DDAC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00740 8097DDB0 27DE0EA0 */ addiu $s8, $s8, 0x0EA0 ## $s8 = 06000EA0 -/* 00744 8097DDB4 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 00748 8097DDB8 27B600C4 */ addiu $s6, $sp, 0x00C4 ## $s6 = FFFFFFF4 -/* 0074C 8097DDBC 27B700B8 */ addiu $s7, $sp, 0x00B8 ## $s7 = FFFFFFE8 -/* 00750 8097DDC0 2694001E */ addiu $s4, $s4, 0x001E ## $s4 = 0000001E -.L8097DDC4: -/* 00754 8097DDC4 00112400 */ sll $a0, $s1, 16 -/* 00758 8097DDC8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0075C 8097DDCC 00042403 */ sra $a0, $a0, 16 -/* 00760 8097DDD0 46160202 */ mul.s $f8, $f0, $f22 -/* 00764 8097DDD4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00768 8097DDD8 E7A800C4 */ swc1 $f8, 0x00C4($sp) -/* 0076C 8097DDDC 461A0282 */ mul.s $f10, $f0, $f26 -/* 00770 8097DDE0 00112400 */ sll $a0, $s1, 16 -/* 00774 8097DDE4 00042403 */ sra $a0, $a0, 16 -/* 00778 8097DDE8 461C5400 */ add.s $f16, $f10, $f28 -/* 0077C 8097DDEC 0C01DE0D */ jal Math_Coss - ## coss? -/* 00780 8097DDF0 E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 00784 8097DDF4 46160482 */ mul.s $f18, $f0, $f22 -/* 00788 8097DDF8 E7BE00B8 */ swc1 $f30, 0x00B8($sp) -/* 0078C 8097DDFC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00790 8097DE00 E7B200CC */ swc1 $f18, 0x00CC($sp) -/* 00794 8097DE04 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00798 8097DE08 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 0079C 8097DE0C C7A800CC */ lwc1 $f8, 0x00CC($sp) -/* 007A0 8097DE10 C7B000C4 */ lwc1 $f16, 0x00C4($sp) -/* 007A4 8097DE14 46040182 */ mul.s $f6, $f0, $f4 -/* 007A8 8097DE18 00000000 */ nop -/* 007AC 8097DE1C 46184282 */ mul.s $f10, $f8, $f24 -/* 007B0 8097DE20 E7A600BC */ swc1 $f6, 0x00BC($sp) -/* 007B4 8097DE24 C7A600C8 */ lwc1 $f6, 0x00C8($sp) -/* 007B8 8097DE28 E7AA00C0 */ swc1 $f10, 0x00C0($sp) -/* 007BC 8097DE2C C6520000 */ lwc1 $f18, 0x0000($s2) ## 00000000 -/* 007C0 8097DE30 46128100 */ add.s $f4, $f16, $f18 -/* 007C4 8097DE34 E7A400C4 */ swc1 $f4, 0x00C4($sp) -/* 007C8 8097DE38 C64A0004 */ lwc1 $f10, 0x0004($s2) ## 00000004 -/* 007CC 8097DE3C 460A3400 */ add.s $f16, $f6, $f10 -/* 007D0 8097DE40 E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 007D4 8097DE44 C6520008 */ lwc1 $f18, 0x0008($s2) ## 00000008 -/* 007D8 8097DE48 46124100 */ add.s $f4, $f8, $f18 -/* 007DC 8097DE4C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007E0 8097DE50 E7A400CC */ swc1 $f4, 0x00CC($sp) -/* 007E4 8097DE54 4618003C */ c.lt.s $f0, $f24 -/* 007E8 8097DE58 3C018098 */ lui $at, %hi(D_80982A84) ## $at = 80980000 -/* 007EC 8097DE5C 45000003 */ bc1f .L8097DE6C -/* 007F0 8097DE60 00000000 */ nop -/* 007F4 8097DE64 10000009 */ beq $zero, $zero, .L8097DE8C -/* 007F8 8097DE68 24100060 */ addiu $s0, $zero, 0x0060 ## $s0 = 00000060 -.L8097DE6C: -/* 007FC 8097DE6C C4262A84 */ lwc1 $f6, %lo(D_80982A84)($at) -/* 00800 8097DE70 24100020 */ addiu $s0, $zero, 0x0020 ## $s0 = 00000020 -/* 00804 8097DE74 4606003C */ c.lt.s $f0, $f6 -/* 00808 8097DE78 00000000 */ nop -/* 0080C 8097DE7C 45000003 */ bc1f .L8097DE8C -/* 00810 8097DE80 00000000 */ nop -/* 00814 8097DE84 10000001 */ beq $zero, $zero, .L8097DE8C -/* 00818 8097DE88 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 -.L8097DE8C: -/* 0081C 8097DE8C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00820 8097DE90 00000000 */ nop -/* 00824 8097DE94 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00828 8097DE98 46000506 */ mov.s $f20, $f0 -/* 0082C 8097DE9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00830 8097DEA0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00834 8097DEA4 240FFF09 */ addiu $t7, $zero, 0xFF09 ## $t7 = FFFFFF09 -/* 00838 8097DEA8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 0083C 8097DEAC 460AA402 */ mul.s $f16, $f20, $f10 -/* 00840 8097DEB0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00844 8097DEB4 240A012C */ addiu $t2, $zero, 0x012C ## $t2 = 0000012C -/* 00848 8097DEB8 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 0084C 8097DEBC 240C0186 */ addiu $t4, $zero, 0x0186 ## $t4 = 00000186 -/* 00850 8097DEC0 AFAC0038 */ sw $t4, 0x0038($sp) -/* 00854 8097DEC4 AFAB0034 */ sw $t3, 0x0034($sp) -/* 00858 8097DEC8 46168200 */ add.s $f8, $f16, $f22 -/* 0085C 8097DECC AFAA002C */ sw $t2, 0x002C($sp) -/* 00860 8097DED0 AFA90028 */ sw $t1, 0x0028($sp) -/* 00864 8097DED4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00868 8097DED8 4600448D */ trunc.w.s $f18, $f8 -/* 0086C 8097DEDC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00870 8097DEE0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00874 8097DEE4 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFF4 -/* 00878 8097DEE8 44089000 */ mfc1 $t0, $f18 -/* 0087C 8097DEEC 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFE8 -/* 00880 8097DEF0 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 00884 8097DEF4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00888 8097DEF8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0088C 8097DEFC AFA00020 */ sw $zero, 0x0020($sp) -/* 00890 8097DF00 AFB40030 */ sw $s4, 0x0030($sp) -/* 00894 8097DF04 AFBE003C */ sw $s8, 0x003C($sp) -/* 00898 8097DF08 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 0089C 8097DF0C AFA80024 */ sw $t0, 0x0024($sp) -/* 008A0 8097DF10 26312000 */ addiu $s1, $s1, 0x2000 ## $s1 = 00002000 -/* 008A4 8097DF14 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 008A8 8097DF18 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 008AC 8097DF1C 00118C00 */ sll $s1, $s1, 16 -/* 008B0 8097DF20 1661FFA8 */ bne $s3, $at, .L8097DDC4 -/* 008B4 8097DF24 00118C03 */ sra $s1, $s1, 16 -/* 008B8 8097DF28 8FBF009C */ lw $ra, 0x009C($sp) -/* 008BC 8097DF2C D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 008C0 8097DF30 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 008C4 8097DF34 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 008C8 8097DF38 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 008CC 8097DF3C D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 008D0 8097DF40 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 008D4 8097DF44 8FB00078 */ lw $s0, 0x0078($sp) -/* 008D8 8097DF48 8FB1007C */ lw $s1, 0x007C($sp) -/* 008DC 8097DF4C 8FB20080 */ lw $s2, 0x0080($sp) -/* 008E0 8097DF50 8FB30084 */ lw $s3, 0x0084($sp) -/* 008E4 8097DF54 8FB40088 */ lw $s4, 0x0088($sp) -/* 008E8 8097DF58 8FB5008C */ lw $s5, 0x008C($sp) -/* 008EC 8097DF5C 8FB60090 */ lw $s6, 0x0090($sp) -/* 008F0 8097DF60 8FB70094 */ lw $s7, 0x0094($sp) -/* 008F4 8097DF64 8FBE0098 */ lw $s8, 0x0098($sp) -/* 008F8 8097DF68 03E00008 */ jr $ra -/* 008FC 8097DF6C 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s deleted file mode 100644 index a89e7208c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s +++ /dev/null @@ -1,176 +0,0 @@ -.late_rodata -glabel D_80982A88 - .float 0.6 - -glabel D_80982A8C - .float 0.1 - -glabel D_80982A90 - .float 0.7 - -.text -glabel func_8097DF70 -/* 00900 8097DF70 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 00904 8097DF74 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00908 8097DF78 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0090C 8097DF7C 4481F000 */ mtc1 $at, $f30 ## $f30 = 2.00 -/* 00910 8097DF80 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 00914 8097DF84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00918 8097DF88 4481E000 */ mtc1 $at, $f28 ## $f28 = 5.00 -/* 0091C 8097DF8C F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00920 8097DF90 3C018098 */ lui $at, %hi(D_80982A88) ## $at = 80980000 -/* 00924 8097DF94 C43A2A88 */ lwc1 $f26, %lo(D_80982A88)($at) -/* 00928 8097DF98 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 0092C 8097DF9C 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 00930 8097DFA0 4481C000 */ mtc1 $at, $f24 ## $f24 = 16.00 -/* 00934 8097DFA4 AFB70094 */ sw $s7, 0x0094($sp) -/* 00938 8097DFA8 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 0093C 8097DFAC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00940 8097DFB0 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00944 8097DFB4 AFB60090 */ sw $s6, 0x0090($sp) -/* 00948 8097DFB8 AFB5008C */ sw $s5, 0x008C($sp) -/* 0094C 8097DFBC AFB40088 */ sw $s4, 0x0088($sp) -/* 00950 8097DFC0 AFB30084 */ sw $s3, 0x0084($sp) -/* 00954 8097DFC4 AFB20080 */ sw $s2, 0x0080($sp) -/* 00958 8097DFC8 AFB1007C */ sw $s1, 0x007C($sp) -/* 0095C 8097DFCC 3C170600 */ lui $s7, 0x0600 ## $s7 = 06000000 -/* 00960 8097DFD0 4481B000 */ mtc1 $at, $f22 ## $f22 = 30.00 -/* 00964 8097DFD4 00C09025 */ or $s2, $a2, $zero ## $s2 = 00000000 -/* 00968 8097DFD8 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 0096C 8097DFDC AFBF009C */ sw $ra, 0x009C($sp) -/* 00970 8097DFE0 AFB00078 */ sw $s0, 0x0078($sp) -/* 00974 8097DFE4 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00978 8097DFE8 AFA400D0 */ sw $a0, 0x00D0($sp) -/* 0097C 8097DFEC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00980 8097DFF0 26F70EA0 */ addiu $s7, $s7, 0x0EA0 ## $s7 = 06000EA0 -/* 00984 8097DFF4 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 00988 8097DFF8 27B500C4 */ addiu $s5, $sp, 0x00C4 ## $s5 = FFFFFFF4 -/* 0098C 8097DFFC 27B600B8 */ addiu $s6, $sp, 0x00B8 ## $s6 = FFFFFFE8 -/* 00990 8097E000 241E000C */ addiu $s8, $zero, 0x000C ## $s8 = 0000000C -.L8097E004: -/* 00994 8097E004 00112400 */ sll $a0, $s1, 16 -/* 00998 8097E008 0C01DE1C */ jal Math_Sins - ## sins? -/* 0099C 8097E00C 00042403 */ sra $a0, $a0, 16 -/* 009A0 8097E010 46180102 */ mul.s $f4, $f0, $f24 -/* 009A4 8097E014 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 009A8 8097E018 E7A400C4 */ swc1 $f4, 0x00C4($sp) -/* 009AC 8097E01C 461C0182 */ mul.s $f6, $f0, $f28 -/* 009B0 8097E020 00112400 */ sll $a0, $s1, 16 -/* 009B4 8097E024 00042403 */ sra $a0, $a0, 16 -/* 009B8 8097E028 461E3200 */ add.s $f8, $f6, $f30 -/* 009BC 8097E02C 0C01DE0D */ jal Math_Coss - ## coss? -/* 009C0 8097E030 E7A800C8 */ swc1 $f8, 0x00C8($sp) -/* 009C4 8097E034 46180282 */ mul.s $f10, $f0, $f24 -/* 009C8 8097E038 C7B000C4 */ lwc1 $f16, 0x00C4($sp) -/* 009CC 8097E03C 461A8482 */ mul.s $f18, $f16, $f26 -/* 009D0 8097E040 E7AA00CC */ swc1 $f10, 0x00CC($sp) -/* 009D4 8097E044 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 009D8 8097E048 E7B200B8 */ swc1 $f18, 0x00B8($sp) -/* 009DC 8097E04C 3C014210 */ lui $at, 0x4210 ## $at = 42100000 -/* 009E0 8097E050 44812000 */ mtc1 $at, $f4 ## $f4 = 36.00 -/* 009E4 8097E054 C7B000CC */ lwc1 $f16, 0x00CC($sp) -/* 009E8 8097E058 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 009EC 8097E05C 46040182 */ mul.s $f6, $f0, $f4 -/* 009F0 8097E060 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 009F4 8097E064 C7A400C4 */ lwc1 $f4, 0x00C4($sp) -/* 009F8 8097E068 461A8482 */ mul.s $f18, $f16, $f26 -/* 009FC 8097E06C 46083280 */ add.s $f10, $f6, $f8 -/* 00A00 8097E070 E7B200C0 */ swc1 $f18, 0x00C0($sp) -/* 00A04 8097E074 E7AA00BC */ swc1 $f10, 0x00BC($sp) -/* 00A08 8097E078 C6460000 */ lwc1 $f6, 0x0000($s2) ## 00000000 -/* 00A0C 8097E07C C7AA00C8 */ lwc1 $f10, 0x00C8($sp) -/* 00A10 8097E080 46062200 */ add.s $f8, $f4, $f6 -/* 00A14 8097E084 E7A800C4 */ swc1 $f8, 0x00C4($sp) -/* 00A18 8097E088 C6520004 */ lwc1 $f18, 0x0004($s2) ## 00000004 -/* 00A1C 8097E08C 46125100 */ add.s $f4, $f10, $f18 -/* 00A20 8097E090 E7A400C8 */ swc1 $f4, 0x00C8($sp) -/* 00A24 8097E094 C6460008 */ lwc1 $f6, 0x0008($s2) ## 00000008 -/* 00A28 8097E098 46068200 */ add.s $f8, $f16, $f6 -/* 00A2C 8097E09C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A30 8097E0A0 E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 00A34 8097E0A4 3C018098 */ lui $at, %hi(D_80982A8C) ## $at = 80980000 -/* 00A38 8097E0A8 C42A2A8C */ lwc1 $f10, %lo(D_80982A8C)($at) -/* 00A3C 8097E0AC 3C018098 */ lui $at, %hi(D_80982A90) ## $at = 80980000 -/* 00A40 8097E0B0 460A003C */ c.lt.s $f0, $f10 -/* 00A44 8097E0B4 00000000 */ nop -/* 00A48 8097E0B8 45000003 */ bc1f .L8097E0C8 -/* 00A4C 8097E0BC 00000000 */ nop -/* 00A50 8097E0C0 10000009 */ beq $zero, $zero, .L8097E0E8 -/* 00A54 8097E0C4 24100061 */ addiu $s0, $zero, 0x0061 ## $s0 = 00000061 -.L8097E0C8: -/* 00A58 8097E0C8 C4322A90 */ lwc1 $f18, %lo(D_80982A90)($at) -/* 00A5C 8097E0CC 24100021 */ addiu $s0, $zero, 0x0021 ## $s0 = 00000021 -/* 00A60 8097E0D0 4612003C */ c.lt.s $f0, $f18 -/* 00A64 8097E0D4 00000000 */ nop -/* 00A68 8097E0D8 45000003 */ bc1f .L8097E0E8 -/* 00A6C 8097E0DC 00000000 */ nop -/* 00A70 8097E0E0 10000001 */ beq $zero, $zero, .L8097E0E8 -/* 00A74 8097E0E4 24100041 */ addiu $s0, $zero, 0x0041 ## $s0 = 00000041 -.L8097E0E8: -/* 00A78 8097E0E8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A7C 8097E0EC 00000000 */ nop -/* 00A80 8097E0F0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A84 8097E0F4 46000506 */ mov.s $f20, $f0 -/* 00A88 8097E0F8 4616A102 */ mul.s $f4, $f20, $f22 -/* 00A8C 8097E0FC 240EFF38 */ addiu $t6, $zero, 0xFF38 ## $t6 = FFFFFF38 -/* 00A90 8097E100 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 00A94 8097E104 46160202 */ mul.s $f8, $f0, $f22 -/* 00A98 8097E108 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00A9C 8097E10C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00AA0 8097E110 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00AA4 8097E114 240F0186 */ addiu $t7, $zero, 0x0186 ## $t7 = 00000186 -/* 00AA8 8097E118 46162400 */ add.s $f16, $f4, $f22 -/* 00AAC 8097E11C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 00AB0 8097E120 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00AB4 8097E124 4600428D */ trunc.w.s $f10, $f8 -/* 00AB8 8097E128 240A012C */ addiu $t2, $zero, 0x012C ## $t2 = 0000012C -/* 00ABC 8097E12C AFAA002C */ sw $t2, 0x002C($sp) -/* 00AC0 8097E130 4600818D */ trunc.w.s $f6, $f16 -/* 00AC4 8097E134 440C5000 */ mfc1 $t4, $f10 -/* 00AC8 8097E138 AFA90028 */ sw $t1, 0x0028($sp) -/* 00ACC 8097E13C AFB8001C */ sw $t8, 0x001C($sp) -/* 00AD0 8097E140 44083000 */ mfc1 $t0, $f6 -/* 00AD4 8097E144 258D001E */ addiu $t5, $t4, 0x001E ## $t5 = 0000001E -/* 00AD8 8097E148 AFAD0030 */ sw $t5, 0x0030($sp) -/* 00ADC 8097E14C AFAF0038 */ sw $t7, 0x0038($sp) -/* 00AE0 8097E150 AFAE0034 */ sw $t6, 0x0034($sp) -/* 00AE4 8097E154 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00AE8 8097E158 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF4 -/* 00AEC 8097E15C 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFE8 -/* 00AF0 8097E160 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 00AF4 8097E164 AFB00014 */ sw $s0, 0x0014($sp) -/* 00AF8 8097E168 AFA00020 */ sw $zero, 0x0020($sp) -/* 00AFC 8097E16C AFB7003C */ sw $s7, 0x003C($sp) -/* 00B00 8097E170 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00B04 8097E174 AFA80024 */ sw $t0, 0x0024($sp) -/* 00B08 8097E178 26311555 */ addiu $s1, $s1, 0x1555 ## $s1 = 00001555 -/* 00B0C 8097E17C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 00B10 8097E180 00118C00 */ sll $s1, $s1, 16 -/* 00B14 8097E184 167EFF9F */ bne $s3, $s8, .L8097E004 -/* 00B18 8097E188 00118C03 */ sra $s1, $s1, 16 -/* 00B1C 8097E18C 8FBF009C */ lw $ra, 0x009C($sp) -/* 00B20 8097E190 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00B24 8097E194 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00B28 8097E198 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00B2C 8097E19C D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 00B30 8097E1A0 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00B34 8097E1A4 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00B38 8097E1A8 8FB00078 */ lw $s0, 0x0078($sp) -/* 00B3C 8097E1AC 8FB1007C */ lw $s1, 0x007C($sp) -/* 00B40 8097E1B0 8FB20080 */ lw $s2, 0x0080($sp) -/* 00B44 8097E1B4 8FB30084 */ lw $s3, 0x0084($sp) -/* 00B48 8097E1B8 8FB40088 */ lw $s4, 0x0088($sp) -/* 00B4C 8097E1BC 8FB5008C */ lw $s5, 0x008C($sp) -/* 00B50 8097E1C0 8FB60090 */ lw $s6, 0x0090($sp) -/* 00B54 8097E1C4 8FB70094 */ lw $s7, 0x0094($sp) -/* 00B58 8097E1C8 8FBE0098 */ lw $s8, 0x0098($sp) -/* 00B5C 8097E1CC 03E00008 */ jr $ra -/* 00B60 8097E1D0 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s deleted file mode 100644 index 7a536fc378..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s +++ /dev/null @@ -1,182 +0,0 @@ -.late_rodata -glabel D_80982A94 - .float 0.1 - -glabel D_80982A98 - .float 0.7 - -.text -glabel func_8097E1D4 -/* 00B64 8097E1D4 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 00B68 8097E1D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00B6C 8097E1DC F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00B70 8097E1E0 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 00B74 8097E1E4 4481F000 */ mtc1 $at, $f30 ## $f30 = 28.00 -/* 00B78 8097E1E8 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 00B7C 8097E1EC 3C014296 */ lui $at, 0x4296 ## $at = 42960000 -/* 00B80 8097E1F0 4600218D */ trunc.w.s $f6, $f4 -/* 00B84 8097E1F4 4481E000 */ mtc1 $at, $f28 ## $f28 = 75.00 -/* 00B88 8097E1F8 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00B8C 8097E1FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B90 8097E200 4481D000 */ mtc1 $at, $f26 ## $f26 = 10.00 -/* 00B94 8097E204 AFB5008C */ sw $s5, 0x008C($sp) -/* 00B98 8097E208 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 00B9C 8097E20C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00BA0 8097E210 44153000 */ mfc1 $s5, $f6 -/* 00BA4 8097E214 4481C000 */ mtc1 $at, $f24 ## $f24 = 3.00 -/* 00BA8 8097E218 AFB40088 */ sw $s4, 0x0088($sp) -/* 00BAC 8097E21C F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 00BB0 8097E220 3C014238 */ lui $at, 0x4238 ## $at = 42380000 -/* 00BB4 8097E224 0006A400 */ sll $s4, $a2, 16 -/* 00BB8 8097E228 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00BBC 8097E22C AFB70094 */ sw $s7, 0x0094($sp) -/* 00BC0 8097E230 AFB60090 */ sw $s6, 0x0090($sp) -/* 00BC4 8097E234 AFB30084 */ sw $s3, 0x0084($sp) -/* 00BC8 8097E238 AFB20080 */ sw $s2, 0x0080($sp) -/* 00BCC 8097E23C AFB1007C */ sw $s1, 0x007C($sp) -/* 00BD0 8097E240 4481B000 */ mtc1 $at, $f22 ## $f22 = 46.00 -/* 00BD4 8097E244 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00BD8 8097E248 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 -/* 00BDC 8097E24C 0014A403 */ sra $s4, $s4, 16 -/* 00BE0 8097E250 AFBF009C */ sw $ra, 0x009C($sp) -/* 00BE4 8097E254 AFB00078 */ sw $s0, 0x0078($sp) -/* 00BE8 8097E258 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00BEC 8097E25C AFA600D8 */ sw $a2, 0x00D8($sp) -/* 00BF0 8097E260 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00BF4 8097E264 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 00BF8 8097E268 27B700C4 */ addiu $s7, $sp, 0x00C4 ## $s7 = FFFFFFF4 -/* 00BFC 8097E26C 27BE00B8 */ addiu $s8, $sp, 0x00B8 ## $s8 = FFFFFFE8 -/* 00C00 8097E270 26B5001E */ addiu $s5, $s5, 0x001E ## $s5 = 0000001E -.L8097E274: -/* 00C04 8097E274 00112400 */ sll $a0, $s1, 16 -/* 00C08 8097E278 0C01DE1C */ jal Math_Sins - ## sins? -/* 00C0C 8097E27C 00042403 */ sra $a0, $a0, 16 -/* 00C10 8097E280 46160202 */ mul.s $f8, $f0, $f22 -/* 00C14 8097E284 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00C18 8097E288 E7A800C4 */ swc1 $f8, 0x00C4($sp) -/* 00C1C 8097E28C 461C0282 */ mul.s $f10, $f0, $f28 -/* 00C20 8097E290 00112400 */ sll $a0, $s1, 16 -/* 00C24 8097E294 00042403 */ sra $a0, $a0, 16 -/* 00C28 8097E298 461E5401 */ sub.s $f16, $f10, $f30 -/* 00C2C 8097E29C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00C30 8097E2A0 E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 00C34 8097E2A4 46160482 */ mul.s $f18, $f0, $f22 -/* 00C38 8097E2A8 00142400 */ sll $a0, $s4, 16 -/* 00C3C 8097E2AC 00042403 */ sra $a0, $a0, 16 -/* 00C40 8097E2B0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00C44 8097E2B4 E7B200CC */ swc1 $f18, 0x00CC($sp) -/* 00C48 8097E2B8 46180102 */ mul.s $f4, $f0, $f24 -/* 00C4C 8097E2BC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00C50 8097E2C0 E7A400B8 */ swc1 $f4, 0x00B8($sp) -/* 00C54 8097E2C4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00C58 8097E2C8 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 00C5C 8097E2CC 00142400 */ sll $a0, $s4, 16 -/* 00C60 8097E2D0 00042403 */ sra $a0, $a0, 16 -/* 00C64 8097E2D4 46060202 */ mul.s $f8, $f0, $f6 -/* 00C68 8097E2D8 461A4280 */ add.s $f10, $f8, $f26 -/* 00C6C 8097E2DC 0C01DE0D */ jal Math_Coss - ## coss? -/* 00C70 8097E2E0 E7AA00BC */ swc1 $f10, 0x00BC($sp) -/* 00C74 8097E2E4 46180402 */ mul.s $f16, $f0, $f24 -/* 00C78 8097E2E8 C7B200C4 */ lwc1 $f18, 0x00C4($sp) -/* 00C7C 8097E2EC C7A800C8 */ lwc1 $f8, 0x00C8($sp) -/* 00C80 8097E2F0 E7B000C0 */ swc1 $f16, 0x00C0($sp) -/* 00C84 8097E2F4 C6440000 */ lwc1 $f4, 0x0000($s2) ## 00000000 -/* 00C88 8097E2F8 46049180 */ add.s $f6, $f18, $f4 -/* 00C8C 8097E2FC C7B200CC */ lwc1 $f18, 0x00CC($sp) -/* 00C90 8097E300 E7A600C4 */ swc1 $f6, 0x00C4($sp) -/* 00C94 8097E304 C64A0004 */ lwc1 $f10, 0x0004($s2) ## 00000004 -/* 00C98 8097E308 460A4400 */ add.s $f16, $f8, $f10 -/* 00C9C 8097E30C E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 00CA0 8097E310 C6440008 */ lwc1 $f4, 0x0008($s2) ## 00000008 -/* 00CA4 8097E314 46049180 */ add.s $f6, $f18, $f4 -/* 00CA8 8097E318 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00CAC 8097E31C E7A600CC */ swc1 $f6, 0x00CC($sp) -/* 00CB0 8097E320 3C018098 */ lui $at, %hi(D_80982A94) ## $at = 80980000 -/* 00CB4 8097E324 C4282A94 */ lwc1 $f8, %lo(D_80982A94)($at) -/* 00CB8 8097E328 3C018098 */ lui $at, %hi(D_80982A98) ## $at = 80980000 -/* 00CBC 8097E32C 4608003C */ c.lt.s $f0, $f8 -/* 00CC0 8097E330 00000000 */ nop -/* 00CC4 8097E334 45000003 */ bc1f .L8097E344 -/* 00CC8 8097E338 00000000 */ nop -/* 00CCC 8097E33C 10000009 */ beq $zero, $zero, .L8097E364 -/* 00CD0 8097E340 24100061 */ addiu $s0, $zero, 0x0061 ## $s0 = 00000061 -.L8097E344: -/* 00CD4 8097E344 C42A2A98 */ lwc1 $f10, %lo(D_80982A98)($at) -/* 00CD8 8097E348 24100021 */ addiu $s0, $zero, 0x0021 ## $s0 = 00000021 -/* 00CDC 8097E34C 460A003C */ c.lt.s $f0, $f10 -/* 00CE0 8097E350 00000000 */ nop -/* 00CE4 8097E354 45000003 */ bc1f .L8097E364 -/* 00CE8 8097E358 00000000 */ nop -/* 00CEC 8097E35C 10000001 */ beq $zero, $zero, .L8097E364 -/* 00CF0 8097E360 24100041 */ addiu $s0, $zero, 0x0041 ## $s0 = 00000041 -.L8097E364: -/* 00CF4 8097E364 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00CF8 8097E368 00000000 */ nop -/* 00CFC 8097E36C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00D00 8097E370 46000506 */ mov.s $f20, $f0 -/* 00D04 8097E374 461AA402 */ mul.s $f16, $f20, $f26 -/* 00D08 8097E378 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00D0C 8097E37C 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 00D10 8097E380 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00D14 8097E384 25AD0EA0 */ addiu $t5, $t5, 0x0EA0 ## $t5 = 06000EA0 -/* 00D18 8097E388 240FFF09 */ addiu $t7, $zero, 0xFF09 ## $t7 = FFFFFF09 -/* 00D1C 8097E38C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00D20 8097E390 46128100 */ add.s $f4, $f16, $f18 -/* 00D24 8097E394 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00D28 8097E398 240A012C */ addiu $t2, $zero, 0x012C ## $t2 = 0000012C -/* 00D2C 8097E39C 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00D30 8097E3A0 4600218D */ trunc.w.s $f6, $f4 -/* 00D34 8097E3A4 240C0186 */ addiu $t4, $zero, 0x0186 ## $t4 = 00000186 -/* 00D38 8097E3A8 AFAC0038 */ sw $t4, 0x0038($sp) -/* 00D3C 8097E3AC AFAB0034 */ sw $t3, 0x0034($sp) -/* 00D40 8097E3B0 44083000 */ mfc1 $t0, $f6 -/* 00D44 8097E3B4 AFAA002C */ sw $t2, 0x002C($sp) -/* 00D48 8097E3B8 AFA90028 */ sw $t1, 0x0028($sp) -/* 00D4C 8097E3BC AFB80018 */ sw $t8, 0x0018($sp) -/* 00D50 8097E3C0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00D54 8097E3C4 AFAD003C */ sw $t5, 0x003C($sp) -/* 00D58 8097E3C8 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00D5C 8097E3CC 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFF4 -/* 00D60 8097E3D0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFE8 -/* 00D64 8097E3D4 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 00D68 8097E3D8 AFB00014 */ sw $s0, 0x0014($sp) -/* 00D6C 8097E3DC AFA0001C */ sw $zero, 0x001C($sp) -/* 00D70 8097E3E0 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D74 8097E3E4 AFB50030 */ sw $s5, 0x0030($sp) -/* 00D78 8097E3E8 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00D7C 8097E3EC AFA80024 */ sw $t0, 0x0024($sp) -/* 00D80 8097E3F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D84 8097E3F4 02218821 */ addu $s1, $s1, $at -/* 00D88 8097E3F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D8C 8097E3FC 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 00D90 8097E400 00118C00 */ sll $s1, $s1, 16 -/* 00D94 8097E404 1661FF9B */ bne $s3, $at, .L8097E274 -/* 00D98 8097E408 00118C03 */ sra $s1, $s1, 16 -/* 00D9C 8097E40C 8FBF009C */ lw $ra, 0x009C($sp) -/* 00DA0 8097E410 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00DA4 8097E414 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00DA8 8097E418 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00DAC 8097E41C D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 00DB0 8097E420 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00DB4 8097E424 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00DB8 8097E428 8FB00078 */ lw $s0, 0x0078($sp) -/* 00DBC 8097E42C 8FB1007C */ lw $s1, 0x007C($sp) -/* 00DC0 8097E430 8FB20080 */ lw $s2, 0x0080($sp) -/* 00DC4 8097E434 8FB30084 */ lw $s3, 0x0084($sp) -/* 00DC8 8097E438 8FB40088 */ lw $s4, 0x0088($sp) -/* 00DCC 8097E43C 8FB5008C */ lw $s5, 0x008C($sp) -/* 00DD0 8097E440 8FB60090 */ lw $s6, 0x0090($sp) -/* 00DD4 8097E444 8FB70094 */ lw $s7, 0x0094($sp) -/* 00DD8 8097E448 8FBE0098 */ lw $s8, 0x0098($sp) -/* 00DDC 8097E44C 03E00008 */ jr $ra -/* 00DE0 8097E450 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s index 9bafe46f7d..0385c5e77f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s @@ -126,7 +126,7 @@ glabel func_8097E454 /* 00F98 8097E608 460A4400 */ add.s $f16, $f8, $f10 /* 00F9C 8097E60C 8FA600B0 */ lw $a2, 0x00B0($sp) /* 00FA0 8097E610 8FA700B4 */ lw $a3, 0x00B4($sp) -/* 00FA4 8097E614 0C25F5D3 */ jal func_8097D74C +/* 00FA4 8097E614 0C25F5D3 */ jal DemoGt_SpawnDust /* 00FA8 8097E618 E7B00084 */ swc1 $f16, 0x0084($sp) /* 00FAC 8097E61C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s deleted file mode 100644 index 08e0d05ab2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8097E69C -/* 0102C 8097E69C 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 01030 8097E6A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01034 8097E6A4 15C00003 */ bne $t6, $zero, .L8097E6B4 -/* 01038 8097E6A8 00000000 */ nop -/* 0103C 8097E6AC 03E00008 */ jr $ra -/* 01040 8097E6B0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8097E6B4: -/* 01044 8097E6B4 03E00008 */ jr $ra -/* 01048 8097E6B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s deleted file mode 100644 index 8b4d667b69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8097E6BC -/* 0104C 8097E6BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01050 8097E6C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01054 8097E6C4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01058 8097E6C8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0105C 8097E6CC 0C25F9A7 */ jal func_8097E69C -/* 01060 8097E6D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 01064 8097E6D4 14400006 */ bne $v0, $zero, .L8097E6F0 -/* 01068 8097E6D8 8FA3001C */ lw $v1, 0x001C($sp) -/* 0106C 8097E6DC 8FAF002C */ lw $t7, 0x002C($sp) -/* 01070 8097E6E0 8FAE0028 */ lw $t6, 0x0028($sp) -/* 01074 8097E6E4 000FC080 */ sll $t8, $t7, 2 -/* 01078 8097E6E8 01D8C821 */ addu $t9, $t6, $t8 -/* 0107C 8097E6EC 8F231D8C */ lw $v1, 0x1D8C($t9) ## 00001D8C -.L8097E6F0: -/* 01080 8097E6F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01084 8097E6F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01088 8097E6F8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 0108C 8097E6FC 03E00008 */ jr $ra -/* 01090 8097E700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s deleted file mode 100644 index 84f0ca193b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8097E704 -/* 01094 8097E704 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01098 8097E708 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0109C 8097E70C AFA5001C */ sw $a1, 0x001C($sp) -/* 010A0 8097E710 0C25F9AF */ jal func_8097E6BC -/* 010A4 8097E714 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 010A8 8097E718 10400007 */ beq $v0, $zero, .L8097E738 -/* 010AC 8097E71C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010B0 8097E720 97AE001E */ lhu $t6, 0x001E($sp) -/* 010B4 8097E724 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 010B8 8097E728 55CF0004 */ bnel $t6, $t7, .L8097E73C -/* 010BC 8097E72C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 010C0 8097E730 10000002 */ beq $zero, $zero, .L8097E73C -/* 010C4 8097E734 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8097E738: -/* 010C8 8097E738 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8097E73C: -/* 010CC 8097E73C 03E00008 */ jr $ra -/* 010D0 8097E740 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s deleted file mode 100644 index 2a1a773365..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_8097E744 -/* 010D4 8097E744 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 010D8 8097E748 AFA40040 */ sw $a0, 0x0040($sp) -/* 010DC 8097E74C AFBF001C */ sw $ra, 0x001C($sp) -/* 010E0 8097E750 AFA50044 */ sw $a1, 0x0044($sp) -/* 010E4 8097E754 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 010E8 8097E758 0C25F9AF */ jal func_8097E6BC -/* 010EC 8097E75C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 010F0 8097E760 1040002C */ beq $v0, $zero, .L8097E814 -/* 010F4 8097E764 8FAE0044 */ lw $t6, 0x0044($sp) -/* 010F8 8097E768 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 010FC 8097E76C 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 01100 8097E770 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 01104 8097E774 AFA2003C */ sw $v0, 0x003C($sp) -/* 01108 8097E778 AFA00010 */ sw $zero, 0x0010($sp) -/* 0110C 8097E77C 0C01BE6F */ jal func_8006F9BC -/* 01110 8097E780 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01114 8097E784 8FA3003C */ lw $v1, 0x003C($sp) -/* 01118 8097E788 8FA20040 */ lw $v0, 0x0040($sp) -/* 0111C 8097E78C 8C780010 */ lw $t8, 0x0010($v1) ## 00000010 -/* 01120 8097E790 8C6F000C */ lw $t7, 0x000C($v1) ## 0000000C -/* 01124 8097E794 8C680018 */ lw $t0, 0x0018($v1) ## 00000018 -/* 01128 8097E798 8C790014 */ lw $t9, 0x0014($v1) ## 00000014 -/* 0112C 8097E79C 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 01130 8097E7A0 8C6A0020 */ lw $t2, 0x0020($v1) ## 00000020 -/* 01134 8097E7A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01138 8097E7A8 8C69001C */ lw $t1, 0x001C($v1) ## 0000001C -/* 0113C 8097E7AC 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 01140 8097E7B0 46803320 */ cvt.s.w $f12, $f6 -/* 01144 8097E7B4 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 01148 8097E7B8 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 0114C 8097E7BC 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 01150 8097E7C0 468020A0 */ cvt.s.w $f2, $f4 -/* 01154 8097E7C4 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 01158 8097E7C8 46805420 */ cvt.s.w $f16, $f10 -/* 0115C 8097E7CC 468043A0 */ cvt.s.w $f14, $f8 -/* 01160 8097E7D0 46803220 */ cvt.s.w $f8, $f6 -/* 01164 8097E7D4 468024A0 */ cvt.s.w $f18, $f4 -/* 01168 8097E7D8 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 0116C 8097E7DC 46028281 */ sub.s $f10, $f16, $f2 -/* 01170 8097E7E0 460C9201 */ sub.s $f8, $f18, $f12 -/* 01174 8097E7E4 46005102 */ mul.s $f4, $f10, $f0 -/* 01178 8097E7E8 00000000 */ nop -/* 0117C 8097E7EC 46004282 */ mul.s $f10, $f8, $f0 -/* 01180 8097E7F0 46022180 */ add.s $f6, $f4, $f2 -/* 01184 8097E7F4 460C5100 */ add.s $f4, $f10, $f12 -/* 01188 8097E7F8 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 0118C 8097E7FC E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 01190 8097E800 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01194 8097E804 460E3201 */ sub.s $f8, $f6, $f14 -/* 01198 8097E808 46004282 */ mul.s $f10, $f8, $f0 -/* 0119C 8097E80C 460E5100 */ add.s $f4, $f10, $f14 -/* 011A0 8097E810 E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -.L8097E814: -/* 011A4 8097E814 8FBF001C */ lw $ra, 0x001C($sp) -/* 011A8 8097E818 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 011AC 8097E81C 03E00008 */ jr $ra -/* 011B0 8097E820 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s deleted file mode 100644 index db3edb1f97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097ED64 -/* 016F4 8097ED64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016F8 8097ED68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 016FC 8097ED6C AFA40018 */ sw $a0, 0x0018($sp) -/* 01700 8097ED70 0C25F9D1 */ jal func_8097E744 -/* 01704 8097ED74 AFA60020 */ sw $a2, 0x0020($sp) -/* 01708 8097ED78 8FA40018 */ lw $a0, 0x0018($sp) -/* 0170C 8097ED7C 0C25FA09 */ jal func_8097E824 -/* 01710 8097ED80 8FA50020 */ lw $a1, 0x0020($sp) -/* 01714 8097ED84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01718 8097ED88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0171C 8097ED8C 03E00008 */ jr $ra -/* 01720 8097ED90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s deleted file mode 100644 index baa275e30c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8097ED94 -/* 01724 8097ED94 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01728 8097ED98 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0172C 8097ED9C 3C188016 */ lui $t8, %hi(gSaveContext+0x1360) -/* 01730 8097EDA0 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 01734 8097EDA4 11E00003 */ beq $t7, $zero, .L8097EDB4 -/* 01738 8097EDA8 00000000 */ nop -/* 0173C 8097EDAC 03E00008 */ jr $ra -/* 01740 8097EDB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8097EDB4: -/* 01744 8097EDB4 8F18F9C0 */ lw $t8, %lo(gSaveContext+0x1360)($t8) -/* 01748 8097EDB8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0174C 8097EDBC 2B010004 */ slti $at, $t8, 0x0004 -/* 01750 8097EDC0 10200003 */ beq $at, $zero, .L8097EDD0 -/* 01754 8097EDC4 00000000 */ nop -/* 01758 8097EDC8 03E00008 */ jr $ra -/* 0175C 8097EDCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8097EDD0: -/* 01760 8097EDD0 03E00008 */ jr $ra -/* 01764 8097EDD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s deleted file mode 100644 index 905657ee67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8097EDD8 -/* 01768 8097EDD8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0176C 8097EDDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01770 8097EDE0 AFA40028 */ sw $a0, 0x0028($sp) -/* 01774 8097EDE4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01778 8097EDE8 10C00012 */ beq $a2, $zero, .L8097EE34 -/* 0177C 8097EDEC AFA60030 */ sw $a2, 0x0030($sp) -/* 01780 8097EDF0 3C058098 */ lui $a1, %hi(D_809825F8) ## $a1 = 80980000 -/* 01784 8097EDF4 0C01E037 */ jal Actor_ProcessInitChain - -/* 01788 8097EDF8 24A525F8 */ addiu $a1, $a1, %lo(D_809825F8) ## $a1 = 809825F8 -/* 0178C 8097EDFC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01790 8097EE00 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 01794 8097EE04 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01798 8097EE08 AFA00018 */ sw $zero, 0x0018($sp) -/* 0179C 8097EE0C 8FA40030 */ lw $a0, 0x0030($sp) -/* 017A0 8097EE10 0C010620 */ jal DynaPolyInfo_Alloc - -/* 017A4 8097EE14 27A50018 */ addiu $a1, $sp, 0x0018 ## $a1 = FFFFFFF0 -/* 017A8 8097EE18 8FA4002C */ lw $a0, 0x002C($sp) -/* 017AC 8097EE1C 8FA60028 */ lw $a2, 0x0028($sp) -/* 017B0 8097EE20 8FA70018 */ lw $a3, 0x0018($sp) -/* 017B4 8097EE24 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 017B8 8097EE28 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 017BC 8097EE2C 8FAF0028 */ lw $t7, 0x0028($sp) -/* 017C0 8097EE30 ADE2014C */ sw $v0, 0x014C($t7) ## 0000014C -.L8097EE34: -/* 017C4 8097EE34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017C8 8097EE38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017CC 8097EE3C 03E00008 */ jr $ra -/* 017D0 8097EE40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s deleted file mode 100644 index 5ae88bda9f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8097EE44 -/* 017D4 8097EE44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017D8 8097EE48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017DC 8097EE4C AFA5001C */ sw $a1, 0x001C($sp) -/* 017E0 8097EE50 AFA60020 */ sw $a2, 0x0020($sp) -/* 017E4 8097EE54 AFA70024 */ sw $a3, 0x0024($sp) -/* 017E8 8097EE58 0C25FB65 */ jal func_8097ED94 -/* 017EC 8097EE5C AFA40018 */ sw $a0, 0x0018($sp) -/* 017F0 8097EE60 1040000A */ beq $v0, $zero, .L8097EE8C -/* 017F4 8097EE64 8FA40018 */ lw $a0, 0x0018($sp) -/* 017F8 8097EE68 8FAE0020 */ lw $t6, 0x0020($sp) -/* 017FC 8097EE6C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 01800 8097EE70 8FAF0024 */ lw $t7, 0x0024($sp) -/* 01804 8097EE74 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 -/* 01808 8097EE78 8FA60028 */ lw $a2, 0x0028($sp) -/* 0180C 8097EE7C 0C25FB76 */ jal func_8097EDD8 -/* 01810 8097EE80 8FA5001C */ lw $a1, 0x001C($sp) -/* 01814 8097EE84 10000004 */ beq $zero, $zero, .L8097EE98 -/* 01818 8097EE88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8097EE8C: -/* 0181C 8097EE8C 0C00B55C */ jal Actor_Kill - -/* 01820 8097EE90 00000000 */ nop -/* 01824 8097EE94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8097EE98: -/* 01828 8097EE98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0182C 8097EE9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01830 8097EEA0 03E00008 */ jr $ra -/* 01834 8097EEA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s deleted file mode 100644 index 42bfe38913..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8097EEA8 -/* 01838 8097EEA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0183C 8097EEAC AFBF001C */ sw $ra, 0x001C($sp) -/* 01840 8097EEB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01844 8097EEB4 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 01848 8097EEB8 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 0184C 8097EEBC C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 01850 8097EEC0 C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 01854 8097EEC4 46002182 */ mul.s $f6, $f4, $f0 -/* 01858 8097EEC8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0185C 8097EECC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01860 8097EED0 46004282 */ mul.s $f10, $f8, $f0 -/* 01864 8097EED4 00000000 */ nop -/* 01868 8097EED8 46008482 */ mul.s $f18, $f16, $f0 -/* 0186C 8097EEDC E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 01870 8097EEE0 E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 01874 8097EEE4 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 01878 8097EEE8 0C25FB91 */ jal func_8097EE44 -/* 0187C 8097EEEC AFA00010 */ sw $zero, 0x0010($sp) -/* 01880 8097EEF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01884 8097EEF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01888 8097EEF8 03E00008 */ jr $ra -/* 0188C 8097EEFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s deleted file mode 100644 index aee9f6cbe5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8097EF00 -/* 01890 8097EF00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01894 8097EF04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01898 8097EF08 AFA40018 */ sw $a0, 0x0018($sp) -/* 0189C 8097EF0C 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 018A0 8097EF10 2401020F */ addiu $at, $zero, 0x020F ## $at = 0000020F -/* 018A4 8097EF14 54410004 */ bnel $v0, $at, .L8097EF28 -/* 018A8 8097EF18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018AC 8097EF1C 0C03CFCF */ jal func_800F3F3C -/* 018B0 8097EF20 2404000D */ addiu $a0, $zero, 0x000D ## $a0 = 0000000D -/* 018B4 8097EF24 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097EF28: -/* 018B8 8097EF28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018BC 8097EF2C 03E00008 */ jr $ra -/* 018C0 8097EF30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s deleted file mode 100644 index 1da9369116..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8097EF34 -/* 018C4 8097EF34 AFA40000 */ sw $a0, 0x0000($sp) -/* 018C8 8097EF38 03E00008 */ jr $ra -/* 018CC 8097EF3C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s deleted file mode 100644 index 5073840f76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s +++ /dev/null @@ -1,108 +0,0 @@ -.late_rodata -glabel D_80982AC0 - .float 679.0 - -glabel D_80982AC4 - .float 1700.0 - -glabel D_80982AC8 - .float 679.0 - -glabel D_80982ACC - .float 1700.0 - -.text -glabel func_8097EF40 -/* 018D0 8097EF40 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 018D4 8097EF44 3C0F8098 */ lui $t7, %hi(D_809825FC) ## $t7 = 80980000 -/* 018D8 8097EF48 AFBF0024 */ sw $ra, 0x0024($sp) -/* 018DC 8097EF4C AFA40068 */ sw $a0, 0x0068($sp) -/* 018E0 8097EF50 AFA5006C */ sw $a1, 0x006C($sp) -/* 018E4 8097EF54 25EF25FC */ addiu $t7, $t7, %lo(D_809825FC) ## $t7 = 809825FC -/* 018E8 8097EF58 8DF90000 */ lw $t9, 0x0000($t7) ## 809825FC -/* 018EC 8097EF5C 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFD8 -/* 018F0 8097EF60 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 018F4 8097EF64 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD8 -/* 018F8 8097EF68 8DF80004 */ lw $t8, 0x0004($t7) ## 80982600 -/* 018FC 8097EF6C 3C088098 */ lui $t0, %hi(D_80982608) ## $t0 = 80980000 -/* 01900 8097EF70 25082608 */ addiu $t0, $t0, %lo(D_80982608) ## $t0 = 80982608 -/* 01904 8097EF74 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFDC -/* 01908 8097EF78 8DF90008 */ lw $t9, 0x0008($t7) ## 80982604 -/* 0190C 8097EF7C 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFCC -/* 01910 8097EF80 3C0B8016 */ lui $t3, %hi(gGameInfo) -/* 01914 8097EF84 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFE0 -/* 01918 8097EF88 8D0A0000 */ lw $t2, 0x0000($t0) ## 80982608 -/* 0191C 8097EF8C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01920 8097EF90 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFE4 -/* 01924 8097EF94 ACEA0000 */ sw $t2, 0x0000($a3) ## FFFFFFCC -/* 01928 8097EF98 8D090004 */ lw $t1, 0x0004($t0) ## 8098260C -/* 0192C 8097EF9C ACE90004 */ sw $t1, 0x0004($a3) ## FFFFFFD0 -/* 01930 8097EFA0 8D0A0008 */ lw $t2, 0x0008($t0) ## 80982610 -/* 01934 8097EFA4 ACEA0008 */ sw $t2, 0x0008($a3) ## FFFFFFD4 -/* 01938 8097EFA8 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) -/* 0193C 8097EFAC 856C1456 */ lh $t4, 0x1456($t3) ## 80161456 -/* 01940 8097EFB0 11810003 */ beq $t4, $at, .L8097EFC0 -/* 01944 8097EFB4 240100DC */ addiu $at, $zero, 0x00DC ## $at = 000000DC -/* 01948 8097EFB8 54410039 */ bnel $v0, $at, .L8097F0A0 -/* 0194C 8097EFBC 8FBF0024 */ lw $ra, 0x0024($sp) -.L8097EFC0: -/* 01950 8097EFC0 8FA20068 */ lw $v0, 0x0068($sp) -/* 01954 8097EFC4 3C014380 */ lui $at, 0x4380 ## $at = 43800000 -/* 01958 8097EFC8 44813000 */ mtc1 $at, $f6 ## $f6 = 256.00 -/* 0195C 8097EFCC C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 01960 8097EFD0 3C018098 */ lui $at, %hi(D_80982AC0) ## $at = 80980000 -/* 01964 8097EFD4 C4302AC0 */ lwc1 $f16, %lo(D_80982AC0)($at) -/* 01968 8097EFD8 46062200 */ add.s $f8, $f4, $f6 -/* 0196C 8097EFDC 3C0142A4 */ lui $at, 0x42A4 ## $at = 42A40000 -/* 01970 8097EFE0 44813000 */ mtc1 $at, $f6 ## $f6 = 82.00 -/* 01974 8097EFE4 3C018098 */ lui $at, %hi(D_80982AC4) ## $at = 80980000 -/* 01978 8097EFE8 E7A8004C */ swc1 $f8, 0x004C($sp) -/* 0197C 8097EFEC C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 01980 8097EFF0 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 01984 8097EFF4 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 01988 8097EFF8 46105480 */ add.s $f18, $f10, $f16 -/* 0198C 8097EFFC C42A2AC4 */ lwc1 $f10, %lo(D_80982AC4)($at) -/* 01990 8097F000 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 01994 8097F004 8FA4006C */ lw $a0, 0x006C($sp) -/* 01998 8097F008 E7B20050 */ swc1 $f18, 0x0050($sp) -/* 0199C 8097F00C C4440008 */ lwc1 $f4, 0x0008($v0) ## 0000002C -/* 019A0 8097F010 AFA20028 */ sw $v0, 0x0028($sp) -/* 019A4 8097F014 AFAE0018 */ sw $t6, 0x0018($sp) -/* 019A8 8097F018 46062200 */ add.s $f8, $f4, $f6 -/* 019AC 8097F01C AFAD0014 */ sw $t5, 0x0014($sp) -/* 019B0 8097F020 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 019B4 8097F024 0C25F5D3 */ jal func_8097D74C -/* 019B8 8097F028 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 019BC 8097F02C 8FA20028 */ lw $v0, 0x0028($sp) -/* 019C0 8097F030 3C014380 */ lui $at, 0x4380 ## $at = 43800000 -/* 019C4 8097F034 44819000 */ mtc1 $at, $f18 ## $f18 = 256.00 -/* 019C8 8097F038 C4500000 */ lwc1 $f16, 0x0000($v0) ## 00000000 -/* 019CC 8097F03C 3C018098 */ lui $at, %hi(D_80982AC8) ## $at = 80980000 -/* 019D0 8097F040 C4282AC8 */ lwc1 $f8, %lo(D_80982AC8)($at) -/* 019D4 8097F044 46128100 */ add.s $f4, $f16, $f18 -/* 019D8 8097F048 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 019DC 8097F04C 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 -/* 019E0 8097F050 3C018098 */ lui $at, %hi(D_80982ACC) ## $at = 80980000 -/* 019E4 8097F054 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 019E8 8097F058 C4460004 */ lwc1 $f6, 0x0004($v0) ## 00000004 -/* 019EC 8097F05C 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F -/* 019F0 8097F060 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 019F4 8097F064 46083280 */ add.s $f10, $f6, $f8 -/* 019F8 8097F068 C4262ACC */ lwc1 $f6, %lo(D_80982ACC)($at) -/* 019FC 8097F06C 8FA4006C */ lw $a0, 0x006C($sp) -/* 01A00 8097F070 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFE4 -/* 01A04 8097F074 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 01A08 8097F078 C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000008 -/* 01A0C 8097F07C AFB80018 */ sw $t8, 0x0018($sp) -/* 01A10 8097F080 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01A14 8097F084 46128101 */ sub.s $f4, $f16, $f18 -/* 01A18 8097F088 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFD8 -/* 01A1C 8097F08C 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFCC -/* 01A20 8097F090 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01A24 8097F094 0C25F5D3 */ jal func_8097D74C -/* 01A28 8097F098 E7A40054 */ swc1 $f4, 0x0054($sp) -/* 01A2C 8097F09C 8FBF0024 */ lw $ra, 0x0024($sp) -.L8097F0A0: -/* 01A30 8097F0A0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 01A34 8097F0A4 03E00008 */ jr $ra -/* 01A38 8097F0A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s deleted file mode 100644 index 615c0076a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_8097F0AC -/* 01A3C 8097F0AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01A40 8097F0B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A44 8097F0B4 AFA50054 */ sw $a1, 0x0054($sp) -/* 01A48 8097F0B8 94A31D74 */ lhu $v1, 0x1D74($a1) ## 00001D74 -/* 01A4C 8097F0BC 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 01A50 8097F0C0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01A54 8097F0C4 10610005 */ beq $v1, $at, .L8097F0DC -/* 01A58 8097F0C8 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 01A5C 8097F0CC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01A60 8097F0D0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 01A64 8097F0D4 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 -/* 01A68 8097F0D8 17010017 */ bne $t8, $at, .L8097F138 -.L8097F0DC: -/* 01A6C 8097F0DC 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 01A70 8097F0E0 44813000 */ mtc1 $at, $f6 ## $f6 = 260.00 -/* 01A74 8097F0E4 C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 -/* 01A78 8097F0E8 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 -/* 01A7C 8097F0EC 44818000 */ mtc1 $at, $f16 ## $f16 = 340.00 -/* 01A80 8097F0F0 46062200 */ add.s $f8, $f4, $f6 -/* 01A84 8097F0F4 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01A88 8097F0F8 44813000 */ mtc1 $at, $f6 ## $f6 = 45.00 -/* 01A8C 8097F0FC 8FA40054 */ lw $a0, 0x0054($sp) -/* 01A90 8097F100 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 01A94 8097F104 C4EA0028 */ lwc1 $f10, 0x0028($a3) ## 00000028 -/* 01A98 8097F108 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE8 -/* 01A9C 8097F10C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01AA0 8097F110 46105480 */ add.s $f18, $f10, $f16 -/* 01AA4 8097F114 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 01AA8 8097F118 C4E4002C */ lwc1 $f4, 0x002C($a3) ## 0000002C -/* 01AAC 8097F11C AFA70050 */ sw $a3, 0x0050($sp) -/* 01AB0 8097F120 AFA30018 */ sw $v1, 0x0018($sp) -/* 01AB4 8097F124 46062200 */ add.s $f8, $f4, $f6 -/* 01AB8 8097F128 0C25F671 */ jal func_8097D9C4 -/* 01ABC 8097F12C E7A80040 */ swc1 $f8, 0x0040($sp) -/* 01AC0 8097F130 8FA30018 */ lw $v1, 0x0018($sp) -/* 01AC4 8097F134 8FA70050 */ lw $a3, 0x0050($sp) -.L8097F138: -/* 01AC8 8097F138 240100B0 */ addiu $at, $zero, 0x00B0 ## $at = 000000B0 -/* 01ACC 8097F13C 14610013 */ bne $v1, $at, .L8097F18C -/* 01AD0 8097F140 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 01AD4 8097F144 44818000 */ mtc1 $at, $f16 ## $f16 = 260.00 -/* 01AD8 8097F148 C4EA0024 */ lwc1 $f10, 0x0024($a3) ## 00000024 -/* 01ADC 8097F14C 3C014452 */ lui $at, 0x4452 ## $at = 44520000 -/* 01AE0 8097F150 44813000 */ mtc1 $at, $f6 ## $f6 = 840.00 -/* 01AE4 8097F154 46105480 */ add.s $f18, $f10, $f16 -/* 01AE8 8097F158 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01AEC 8097F15C 44818000 */ mtc1 $at, $f16 ## $f16 = 45.00 -/* 01AF0 8097F160 8FA40054 */ lw $a0, 0x0054($sp) -/* 01AF4 8097F164 E7B20024 */ swc1 $f18, 0x0024($sp) -/* 01AF8 8097F168 C4E40028 */ lwc1 $f4, 0x0028($a3) ## 00000028 -/* 01AFC 8097F16C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFD4 -/* 01B00 8097F170 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01B04 8097F174 46062200 */ add.s $f8, $f4, $f6 -/* 01B08 8097F178 E7A80028 */ swc1 $f8, 0x0028($sp) -/* 01B0C 8097F17C C4EA002C */ lwc1 $f10, 0x002C($a3) ## 0000002C -/* 01B10 8097F180 46105480 */ add.s $f18, $f10, $f16 -/* 01B14 8097F184 0C25F671 */ jal func_8097D9C4 -/* 01B18 8097F188 E7B2002C */ swc1 $f18, 0x002C($sp) -.L8097F18C: -/* 01B1C 8097F18C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B20 8097F190 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01B24 8097F194 03E00008 */ jr $ra -/* 01B28 8097F198 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s deleted file mode 100644 index 674ad85137..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8097F19C -/* 01B2C 8097F19C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B30 8097F1A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B34 8097F1A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01B38 8097F1A8 0C25FBCD */ jal func_8097EF34 -/* 01B3C 8097F1AC AFA5001C */ sw $a1, 0x001C($sp) -/* 01B40 8097F1B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B44 8097F1B4 0C25FBD0 */ jal func_8097EF40 -/* 01B48 8097F1B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01B4C 8097F1BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B50 8097F1C0 0C25FC2B */ jal func_8097F0AC -/* 01B54 8097F1C4 8FA5001C */ lw $a1, 0x001C($sp) -/* 01B58 8097F1C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B5C 8097F1CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B60 8097F1D0 03E00008 */ jr $ra -/* 01B64 8097F1D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s deleted file mode 100644 index dd55ee8274..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_80982AD0 - .float 0.001 - -glabel D_80982AD4 - .float 0.048 - -.text -glabel func_8097F1D8 -/* 01B68 8097F1D8 3C068016 */ lui $a2, %hi(gGameInfo) -/* 01B6C 8097F1DC 24C6FA90 */ addiu $a2, %lo(gGameInfo) -/* 01B70 8097F1E0 8CC30000 */ lw $v1, 0x0000($a2) ## 8015FA90 -/* 01B74 8097F1E4 84820172 */ lh $v0, 0x0172($a0) ## 00000172 -/* 01B78 8097F1E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01B7C 8097F1EC 846E14E4 */ lh $t6, 0x14E4($v1) ## 000014E4 -/* 01B80 8097F1F0 846F14D4 */ lh $t7, 0x14D4($v1) ## 000014D4 -/* 01B84 8097F1F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01B88 8097F1F8 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 01B8C 8097F1FC 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01B90 8097F200 46802020 */ cvt.s.w $f0, $f4 -/* 01B94 8097F204 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01B98 8097F208 3C018098 */ lui $at, %hi(D_80982AD0) ## $at = 80980000 -/* 01B9C 8097F20C 46803220 */ cvt.s.w $f8, $f6 -/* 01BA0 8097F210 C4262AD0 */ lwc1 $f6, %lo(D_80982AD0)($at) -/* 01BA4 8097F214 3C018098 */ lui $at, %hi(D_80982AD4) ## $at = 80980000 -/* 01BA8 8097F218 46809120 */ cvt.s.w $f4, $f18 -/* 01BAC 8097F21C 460A4400 */ add.s $f16, $f8, $f10 -/* 01BB0 8097F220 46062202 */ mul.s $f8, $f4, $f6 -/* 01BB4 8097F224 C42A2AD4 */ lwc1 $f10, %lo(D_80982AD4)($at) -/* 01BB8 8097F228 460A4480 */ add.s $f18, $f8, $f10 -/* 01BBC 8097F22C 46120102 */ mul.s $f4, $f0, $f18 -/* 01BC0 8097F230 46048180 */ add.s $f6, $f16, $f4 -/* 01BC4 8097F234 4600320D */ trunc.w.s $f8, $f6 -/* 01BC8 8097F238 44194000 */ mfc1 $t9, $f8 -/* 01BCC 8097F23C 00000000 */ nop -/* 01BD0 8097F240 A4990174 */ sh $t9, 0x0174($a0) ## 00000174 -/* 01BD4 8097F244 84880174 */ lh $t0, 0x0174($a0) ## 00000174 -/* 01BD8 8097F248 00484821 */ addu $t1, $v0, $t0 -/* 01BDC 8097F24C A4890172 */ sh $t1, 0x0172($a0) ## 00000172 -/* 01BE0 8097F250 8CCA0000 */ lw $t2, 0x0000($a2) ## 8015FA90 -/* 01BE4 8097F254 848D0172 */ lh $t5, 0x0172($a0) ## 00000172 -/* 01BE8 8097F258 854514E6 */ lh $a1, 0x14E6($t2) ## 000014E6 -/* 01BEC 8097F25C 24A50250 */ addiu $a1, $a1, 0x0250 ## $a1 = 00000250 -/* 01BF0 8097F260 00055C00 */ sll $t3, $a1, 16 -/* 01BF4 8097F264 000B6403 */ sra $t4, $t3, 16 -/* 01BF8 8097F268 018D082A */ slt $at, $t4, $t5 -/* 01BFC 8097F26C 10200002 */ beq $at, $zero, .L8097F278 -/* 01C00 8097F270 00000000 */ nop -/* 01C04 8097F274 A4850172 */ sh $a1, 0x0172($a0) ## 00000172 -.L8097F278: -/* 01C08 8097F278 03E00008 */ jr $ra -/* 01C0C 8097F27C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s deleted file mode 100644 index 48fd55557f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_8097F280 -/* 01C10 8097F280 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C14 8097F284 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C18 8097F288 AFB00020 */ sw $s0, 0x0020($sp) -/* 01C1C 8097F28C 94A61D74 */ lhu $a2, 0x1D74($a1) ## 00001D74 -/* 01C20 8097F290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C24 8097F294 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 01C28 8097F298 28C100A0 */ slti $at, $a2, 0x00A0 -/* 01C2C 8097F29C 10200014 */ beq $at, $zero, .L8097F2F0 -/* 01C30 8097F2A0 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -/* 01C34 8097F2A4 24820178 */ addiu $v0, $a0, 0x0178 ## $v0 = 00000178 -/* 01C38 8097F2A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01C3C 8097F2AC 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 01C40 8097F2B0 AC450000 */ sw $a1, 0x0000($v0) ## 00000178 -/* 01C44 8097F2B4 AC460004 */ sw $a2, 0x0004($v0) ## 0000017C -/* 01C48 8097F2B8 AC4E0008 */ sw $t6, 0x0008($v0) ## 00000180 -/* 01C4C 8097F2BC 24830188 */ addiu $v1, $a0, 0x0188 ## $v1 = 00000188 -/* 01C50 8097F2C0 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 01C54 8097F2C4 AC660000 */ sw $a2, 0x0000($v1) ## 00000188 -/* 01C58 8097F2C8 AC6F0004 */ sw $t7, 0x0004($v1) ## 0000018C -/* 01C5C 8097F2CC AC650008 */ sw $a1, 0x0008($v1) ## 00000190 -/* 01C60 8097F2D0 8C980198 */ lw $t8, 0x0198($a0) ## 00000198 -/* 01C64 8097F2D4 8C88019C */ lw $t0, 0x019C($a0) ## 0000019C -/* 01C68 8097F2D8 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 01C6C 8097F2DC 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 01C70 8097F2E0 2509FFFF */ addiu $t1, $t0, 0xFFFF ## $t1 = FFFFFFFF -/* 01C74 8097F2E4 AC990000 */ sw $t9, 0x0000($a0) ## 00000198 -/* 01C78 8097F2E8 1000003B */ beq $zero, $zero, .L8097F3D8 -/* 01C7C 8097F2EC AC890004 */ sw $t1, 0x0004($a0) ## 0000019C -.L8097F2F0: -/* 01C80 8097F2F0 284100AA */ slti $at, $v0, 0x00AA -/* 01C84 8097F2F4 10200030 */ beq $at, $zero, .L8097F3B8 -/* 01C88 8097F2F8 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 01C8C 8097F2FC 240400AA */ addiu $a0, $zero, 0x00AA ## $a0 = 000000AA -/* 01C90 8097F300 240500A0 */ addiu $a1, $zero, 0x00A0 ## $a1 = 000000A0 -/* 01C94 8097F304 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01C98 8097F308 0C01BE6F */ jal func_8006F9BC -/* 01C9C 8097F30C AFA00010 */ sw $zero, 0x0010($sp) -/* 01CA0 8097F310 3C01C27C */ lui $at, 0xC27C ## $at = C27C0000 -/* 01CA4 8097F314 44812000 */ mtc1 $at, $f4 ## $f4 = -63.00 -/* 01CA8 8097F318 3C014323 */ lui $at, 0x4323 ## $at = 43230000 -/* 01CAC 8097F31C 44814000 */ mtc1 $at, $f8 ## $f8 = 163.00 -/* 01CB0 8097F320 46040182 */ mul.s $f6, $f0, $f4 -/* 01CB4 8097F324 3C01C31B */ lui $at, 0xC31B ## $at = C31B0000 -/* 01CB8 8097F328 44819000 */ mtc1 $at, $f18 ## $f18 = -155.00 -/* 01CBC 8097F32C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01CC0 8097F330 26020178 */ addiu $v0, $s0, 0x0178 ## $v0 = 00000178 -/* 01CC4 8097F334 46120102 */ mul.s $f4, $f0, $f18 -/* 01CC8 8097F338 26030188 */ addiu $v1, $s0, 0x0188 ## $v1 = 00000188 -/* 01CCC 8097F33C 46083280 */ add.s $f10, $f6, $f8 -/* 01CD0 8097F340 44813000 */ mtc1 $at, $f6 ## $f6 = 255.00 -/* 01CD4 8097F344 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 01CD8 8097F348 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 01CDC 8097F34C 4600540D */ trunc.w.s $f16, $f10 -/* 01CE0 8097F350 46062200 */ add.s $f8, $f4, $f6 -/* 01CE4 8097F354 440B8000 */ mfc1 $t3, $f16 -/* 01CE8 8097F358 44818000 */ mtc1 $at, $f16 ## $f16 = -100.00 -/* 01CEC 8097F35C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01CF0 8097F360 4600428D */ trunc.w.s $f10, $f8 -/* 01CF4 8097F364 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 01CF8 8097F368 46100482 */ mul.s $f18, $f0, $f16 -/* 01CFC 8097F36C 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 01D00 8097F370 44045000 */ mfc1 $a0, $f10 -/* 01D04 8097F374 44815000 */ mtc1 $at, $f10 ## $f10 = -20.00 -/* 01D08 8097F378 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 01D0C 8097F37C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000178 -/* 01D10 8097F380 460A0402 */ mul.s $f16, $f0, $f10 -/* 01D14 8097F384 46049180 */ add.s $f6, $f18, $f4 -/* 01D18 8097F388 44819000 */ mtc1 $at, $f18 ## $f18 = 120.00 -/* 01D1C 8097F38C AC440004 */ sw $a0, 0x0004($v0) ## 0000017C -/* 01D20 8097F390 4600320D */ trunc.w.s $f8, $f6 -/* 01D24 8097F394 46128100 */ add.s $f4, $f16, $f18 -/* 01D28 8097F398 440E4000 */ mfc1 $t6, $f8 -/* 01D2C 8097F39C 4600218D */ trunc.w.s $f6, $f4 -/* 01D30 8097F3A0 AC4E0008 */ sw $t6, 0x0008($v0) ## 00000180 -/* 01D34 8097F3A4 AC650008 */ sw $a1, 0x0008($v1) ## 00000190 -/* 01D38 8097F3A8 AC640000 */ sw $a0, 0x0000($v1) ## 00000188 -/* 01D3C 8097F3AC 44183000 */ mfc1 $t8, $f6 -/* 01D40 8097F3B0 10000009 */ beq $zero, $zero, .L8097F3D8 -/* 01D44 8097F3B4 AC780004 */ sw $t8, 0x0004($v1) ## 0000018C -.L8097F3B8: -/* 01D48 8097F3B8 26020178 */ addiu $v0, $s0, 0x0178 ## $v0 = 00000178 -/* 01D4C 8097F3BC AC450000 */ sw $a1, 0x0000($v0) ## 00000178 -/* 01D50 8097F3C0 AC450004 */ sw $a1, 0x0004($v0) ## 0000017C -/* 01D54 8097F3C4 AC450008 */ sw $a1, 0x0008($v0) ## 00000180 -/* 01D58 8097F3C8 26030188 */ addiu $v1, $s0, 0x0188 ## $v1 = 00000188 -/* 01D5C 8097F3CC AC650000 */ sw $a1, 0x0000($v1) ## 00000188 -/* 01D60 8097F3D0 AC650004 */ sw $a1, 0x0004($v1) ## 0000018C -/* 01D64 8097F3D4 AC650008 */ sw $a1, 0x0008($v1) ## 00000190 -.L8097F3D8: -/* 01D68 8097F3D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D6C 8097F3DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01D70 8097F3E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D74 8097F3E4 03E00008 */ jr $ra -/* 01D78 8097F3E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s deleted file mode 100644 index 98675a64ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8097F3EC -/* 01D7C 8097F3EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D80 8097F3F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D84 8097F3F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D88 8097F3F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01D8C 8097F3FC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01D90 8097F400 0C25F9C1 */ jal func_8097E704 -/* 01D94 8097F404 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01D98 8097F408 10400003 */ beq $v0, $zero, .L8097F418 -/* 01D9C 8097F40C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01DA0 8097F410 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01DA4 8097F414 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L8097F418: -/* 01DA8 8097F418 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DAC 8097F41C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DB0 8097F420 03E00008 */ jr $ra -/* 01DB4 8097F424 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s deleted file mode 100644 index d9c9cb65d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8097F428 -/* 01DB8 8097F428 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DBC 8097F42C AFBF001C */ sw $ra, 0x001C($sp) -/* 01DC0 8097F430 AFB10018 */ sw $s1, 0x0018($sp) -/* 01DC4 8097F434 AFB00014 */ sw $s0, 0x0014($sp) -/* 01DC8 8097F438 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DCC 8097F43C 0C25FCA0 */ jal func_8097F280 -/* 01DD0 8097F440 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01DD4 8097F444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DD8 8097F448 0C25FA09 */ jal func_8097E824 -/* 01DDC 8097F44C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01DE0 8097F450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DE4 8097F454 0C25FC67 */ jal func_8097F19C -/* 01DE8 8097F458 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01DEC 8097F45C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DF0 8097F460 0C25FCFB */ jal func_8097F3EC -/* 01DF4 8097F464 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01DF8 8097F468 0C25F5AD */ jal func_8097D6B4 -/* 01DFC 8097F46C 00000000 */ nop -/* 01E00 8097F470 0C25F5C7 */ jal func_8097D71C -/* 01E04 8097F474 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01E08 8097F478 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E0C 8097F47C 0C25FBC0 */ jal func_8097EF00 -/* 01E10 8097F480 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E14 8097F484 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E18 8097F488 8FB00014 */ lw $s0, 0x0014($sp) -/* 01E1C 8097F48C 8FB10018 */ lw $s1, 0x0018($sp) -/* 01E20 8097F490 03E00008 */ jr $ra -/* 01E24 8097F494 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s deleted file mode 100644 index 74b865e3e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8097F498 -/* 01E28 8097F498 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E2C 8097F49C AFBF001C */ sw $ra, 0x001C($sp) -/* 01E30 8097F4A0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01E34 8097F4A4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01E38 8097F4A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E3C 8097F4AC 0C25FCA0 */ jal func_8097F280 -/* 01E40 8097F4B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01E44 8097F4B4 0C25FC76 */ jal func_8097F1D8 -/* 01E48 8097F4B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E4C 8097F4BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E50 8097F4C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E54 8097F4C4 0C25FB59 */ jal func_8097ED64 -/* 01E58 8097F4C8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01E5C 8097F4CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E60 8097F4D0 0C25FC67 */ jal func_8097F19C -/* 01E64 8097F4D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E68 8097F4D8 0C25F5AD */ jal func_8097D6B4 -/* 01E6C 8097F4DC 00000000 */ nop -/* 01E70 8097F4E0 0C25F5C7 */ jal func_8097D71C -/* 01E74 8097F4E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01E78 8097F4E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E7C 8097F4EC 0C25FBC0 */ jal func_8097EF00 -/* 01E80 8097F4F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E84 8097F4F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E88 8097F4F8 8FB00014 */ lw $s0, 0x0014($sp) -/* 01E8C 8097F4FC 8FB10018 */ lw $s1, 0x0018($sp) -/* 01E90 8097F500 03E00008 */ jr $ra -/* 01E94 8097F504 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s deleted file mode 100644 index 5cfb7900a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s +++ /dev/null @@ -1,281 +0,0 @@ -.rdata -glabel D_80982780 - .asciz "../z_demo_gt_part1.c" - .balign 4 - -glabel D_80982798 - .asciz "../z_demo_gt_part1.c" - .balign 4 - -glabel D_809827B0 - .asciz "../z_demo_gt_part1.c" - .balign 4 - -.late_rodata -glabel D_80982AD8 - .float 9.58738019108e-05 - -.text -glabel func_8097F508 -/* 01E98 8097F508 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 01E9C 8097F50C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 01EA0 8097F510 AFBF004C */ sw $ra, 0x004C($sp) -/* 01EA4 8097F514 AFB00048 */ sw $s0, 0x0048($sp) -/* 01EA8 8097F518 AFA400D8 */ sw $a0, 0x00D8($sp) -/* 01EAC 8097F51C 01C57021 */ addu $t6, $t6, $a1 -/* 01EB0 8097F520 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 01EB4 8097F524 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 01EB8 8097F528 3C018098 */ lui $at, %hi(D_80982AD8) ## $at = 80980000 -/* 01EBC 8097F52C AFAE00CC */ sw $t6, 0x00CC($sp) -/* 01EC0 8097F530 84870172 */ lh $a3, 0x0172($a0) ## 00000172 -/* 01EC4 8097F534 C4282AD8 */ lwc1 $f8, %lo(D_80982AD8)($at) -/* 01EC8 8097F538 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01ECC 8097F53C 44872000 */ mtc1 $a3, $f4 ## $f4 = 0.00 -/* 01ED0 8097F540 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01ED4 8097F544 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 01ED8 8097F548 468021A0 */ cvt.s.w $f6, $f4 -/* 01EDC 8097F54C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EE0 8097F550 46083002 */ mul.s $f0, $f6, $f8 -/* 01EE4 8097F554 46000005 */ abs.s $f0, $f0 -/* 01EE8 8097F558 E7A000C0 */ swc1 $f0, 0x00C0($sp) -/* 01EEC 8097F55C 845814E2 */ lh $t8, 0x14E2($v0) ## 801614E2 -/* 01EF0 8097F560 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 01EF4 8097F564 00000000 */ nop -/* 01EF8 8097F568 46805420 */ cvt.s.w $f16, $f10 -/* 01EFC 8097F56C E7B000BC */ swc1 $f16, 0x00BC($sp) -/* 01F00 8097F570 844B14E0 */ lh $t3, 0x14E0($v0) ## 801614E0 -/* 01F04 8097F574 A7A700C6 */ sh $a3, 0x00C6($sp) -/* 01F08 8097F578 256C4000 */ addiu $t4, $t3, 0x4000 ## $t4 = 00004000 -/* 01F0C 8097F57C A7AC00B8 */ sh $t4, 0x00B8($sp) -/* 01F10 8097F580 0C031A73 */ jal Graph_Alloc - -/* 01F14 8097F584 A7AB00BA */ sh $t3, 0x00BA($sp) -/* 01F18 8097F588 AFA200B4 */ sw $v0, 0x00B4($sp) -/* 01F1C 8097F58C 0C01DE0D */ jal Math_Coss - ## coss? -/* 01F20 8097F590 87A400C6 */ lh $a0, 0x00C6($sp) -/* 01F24 8097F594 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01F28 8097F598 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01F2C 8097F59C 3C068098 */ lui $a2, %hi(D_80982780) ## $a2 = 80980000 -/* 01F30 8097F5A0 24C62780 */ addiu $a2, $a2, %lo(D_80982780) ## $a2 = 80982780 -/* 01F34 8097F5A4 46009101 */ sub.s $f4, $f18, $f0 -/* 01F38 8097F5A8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 -/* 01F3C 8097F5AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01F40 8097F5B0 240701CA */ addiu $a3, $zero, 0x01CA ## $a3 = 000001CA -/* 01F44 8097F5B4 0C031AB1 */ jal Graph_OpenDisps -/* 01F48 8097F5B8 E7A40098 */ swc1 $f4, 0x0098($sp) -/* 01F4C 8097F5BC 0C01DE0D */ jal Math_Coss - ## coss? -/* 01F50 8097F5C0 87A400B8 */ lh $a0, 0x00B8($sp) -/* 01F54 8097F5C4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01F58 8097F5C8 E7A000A8 */ swc1 $f0, 0x00A8($sp) -/* 01F5C 8097F5CC 87A400B8 */ lh $a0, 0x00B8($sp) -/* 01F60 8097F5D0 0C01DE1C */ jal Math_Sins - ## sins? -/* 01F64 8097F5D4 E7A600AC */ swc1 $f6, 0x00AC($sp) -/* 01F68 8097F5D8 E7A000B0 */ swc1 $f0, 0x00B0($sp) -/* 01F6C 8097F5DC 0C01DE0D */ jal Math_Coss - ## coss? -/* 01F70 8097F5E0 87A400BA */ lh $a0, 0x00BA($sp) -/* 01F74 8097F5E4 C7A800BC */ lwc1 $f8, 0x00BC($sp) -/* 01F78 8097F5E8 C7B00098 */ lwc1 $f16, 0x0098($sp) -/* 01F7C 8097F5EC 87A400C6 */ lh $a0, 0x00C6($sp) -/* 01F80 8097F5F0 46080282 */ mul.s $f10, $f0, $f8 -/* 01F84 8097F5F4 00000000 */ nop -/* 01F88 8097F5F8 46105482 */ mul.s $f18, $f10, $f16 -/* 01F8C 8097F5FC 0C01DE1C */ jal Math_Sins - ## sins? -/* 01F90 8097F600 E7B2009C */ swc1 $f18, 0x009C($sp) -/* 01F94 8097F604 C7A400BC */ lwc1 $f4, 0x00BC($sp) -/* 01F98 8097F608 87A400BA */ lh $a0, 0x00BA($sp) -/* 01F9C 8097F60C 46040182 */ mul.s $f6, $f0, $f4 -/* 01FA0 8097F610 0C01DE1C */ jal Math_Sins - ## sins? -/* 01FA4 8097F614 E7A600A0 */ swc1 $f6, 0x00A0($sp) -/* 01FA8 8097F618 C7A800BC */ lwc1 $f8, 0x00BC($sp) -/* 01FAC 8097F61C C7B00098 */ lwc1 $f16, 0x0098($sp) -/* 01FB0 8097F620 46080282 */ mul.s $f10, $f0, $f8 -/* 01FB4 8097F624 00000000 */ nop -/* 01FB8 8097F628 46105482 */ mul.s $f18, $f10, $f16 -/* 01FBC 8097F62C 0C034213 */ jal Matrix_Push -/* 01FC0 8097F630 E7B200A4 */ swc1 $f18, 0x00A4($sp) -/* 01FC4 8097F634 C7AC00C0 */ lwc1 $f12, 0x00C0($sp) -/* 01FC8 8097F638 27A500A8 */ addiu $a1, $sp, 0x00A8 ## $a1 = FFFFFFD0 -/* 01FCC 8097F63C 0C0348FF */ jal func_800D23FC -/* 01FD0 8097F640 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01FD4 8097F644 C7AC009C */ lwc1 $f12, 0x009C($sp) -/* 01FD8 8097F648 C7AE00A0 */ lwc1 $f14, 0x00A0($sp) -/* 01FDC 8097F64C 8FA600A4 */ lw $a2, 0x00A4($sp) -/* 01FE0 8097F650 0C034261 */ jal Matrix_Translate -/* 01FE4 8097F654 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01FE8 8097F658 3C058098 */ lui $a1, %hi(D_80982798) ## $a1 = 80980000 -/* 01FEC 8097F65C 24A52798 */ addiu $a1, $a1, %lo(D_80982798) ## $a1 = 80982798 -/* 01FF0 8097F660 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 01FF4 8097F664 0C034695 */ jal Matrix_ToMtx -/* 01FF8 8097F668 240601DA */ addiu $a2, $zero, 0x01DA ## $a2 = 000001DA -/* 01FFC 8097F66C 0C034221 */ jal Matrix_Pull -/* 02000 8097F670 00000000 */ nop -/* 02004 8097F674 0C024F46 */ jal func_80093D18 -/* 02008 8097F678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0200C 8097F67C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02010 8097F680 8FAA00D8 */ lw $t2, 0x00D8($sp) -/* 02014 8097F684 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 02018 8097F688 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0201C 8097F68C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 02020 8097F690 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 02024 8097F694 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02028 8097F698 25480198 */ addiu $t0, $t2, 0x0198 ## $t0 = 00000198 -/* 0202C 8097F69C 8D070000 */ lw $a3, 0x0000($t0) ## 00000198 -/* 02030 8097F6A0 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 02034 8097F6A4 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 02038 8097F6A8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0203C 8097F6AC AFB90018 */ sw $t9, 0x0018($sp) -/* 02040 8097F6B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 02044 8097F6B4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02048 8097F6B8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0204C 8097F6BC 8D0B0004 */ lw $t3, 0x0004($t0) ## 0000019C -/* 02050 8097F6C0 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 02054 8097F6C4 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 02058 8097F6C8 AFAC0024 */ sw $t4, 0x0024($sp) -/* 0205C 8097F6CC AFAD0028 */ sw $t5, 0x0028($sp) -/* 02060 8097F6D0 25430178 */ addiu $v1, $t2, 0x0178 ## $v1 = 00000178 -/* 02064 8097F6D4 AFAB0020 */ sw $t3, 0x0020($sp) -/* 02068 8097F6D8 8C6E0000 */ lw $t6, 0x0000($v1) ## 00000178 -/* 0206C 8097F6DC 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 -/* 02070 8097F6E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02074 8097F6E4 AFAE002C */ sw $t6, 0x002C($sp) -/* 02078 8097F6E8 8C6F0004 */ lw $t7, 0x0004($v1) ## 0000017C -/* 0207C 8097F6EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02080 8097F6F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02084 8097F6F4 AFAF0030 */ sw $t7, 0x0030($sp) -/* 02088 8097F6F8 8C780008 */ lw $t8, 0x0008($v1) ## 00000180 -/* 0208C 8097F6FC AFA80054 */ sw $t0, 0x0054($sp) -/* 02090 8097F700 AFB90038 */ sw $t9, 0x0038($sp) -/* 02094 8097F704 AFA20074 */ sw $v0, 0x0074($sp) -/* 02098 8097F708 0C02541A */ jal Gfx_TwoTexScrollEnvColor -/* 0209C 8097F70C AFB80034 */ sw $t8, 0x0034($sp) -/* 020A0 8097F710 8FA90074 */ lw $t1, 0x0074($sp) -/* 020A4 8097F714 8FA80054 */ lw $t0, 0x0054($sp) -/* 020A8 8097F718 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 020AC 8097F71C AD220004 */ sw $v0, 0x0004($t1) ## 00000004 -/* 020B0 8097F720 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 020B4 8097F724 358C0028 */ ori $t4, $t4, 0x0028 ## $t4 = DB060028 -/* 020B8 8097F728 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 020BC 8097F72C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 020C0 8097F730 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 020C4 8097F734 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 020C8 8097F738 8D070000 */ lw $a3, 0x0000($t0) ## 00000000 -/* 020CC 8097F73C 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 020D0 8097F740 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 020D4 8097F744 AFAF0018 */ sw $t7, 0x0018($sp) -/* 020D8 8097F748 AFAE0014 */ sw $t6, 0x0014($sp) -/* 020DC 8097F74C AFA0001C */ sw $zero, 0x001C($sp) -/* 020E0 8097F750 AFAD0010 */ sw $t5, 0x0010($sp) -/* 020E4 8097F754 8D180004 */ lw $t8, 0x0004($t0) ## 00000004 -/* 020E8 8097F758 8FA300D8 */ lw $v1, 0x00D8($sp) -/* 020EC 8097F75C 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 020F0 8097F760 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 020F4 8097F764 AFB90024 */ sw $t9, 0x0024($sp) -/* 020F8 8097F768 AFAB0028 */ sw $t3, 0x0028($sp) -/* 020FC 8097F76C AFB80020 */ sw $t8, 0x0020($sp) -/* 02100 8097F770 8C6C0188 */ lw $t4, 0x0188($v1) ## 00000188 -/* 02104 8097F774 240F0080 */ addiu $t7, $zero, 0x0080 ## $t7 = 00000080 -/* 02108 8097F778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0210C 8097F77C AFAC002C */ sw $t4, 0x002C($sp) -/* 02110 8097F780 8C6D018C */ lw $t5, 0x018C($v1) ## 0000018C -/* 02114 8097F784 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02118 8097F788 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0211C 8097F78C AFAD0030 */ sw $t5, 0x0030($sp) -/* 02120 8097F790 8C6E0190 */ lw $t6, 0x0190($v1) ## 00000190 -/* 02124 8097F794 AFAF0038 */ sw $t7, 0x0038($sp) -/* 02128 8097F798 AFA20070 */ sw $v0, 0x0070($sp) -/* 0212C 8097F79C 24630188 */ addiu $v1, $v1, 0x0188 ## $v1 = 00000188 -/* 02130 8097F7A0 0C02541A */ jal Gfx_TwoTexScrollEnvColor -/* 02134 8097F7A4 AFAE0034 */ sw $t6, 0x0034($sp) -/* 02138 8097F7A8 8FA90070 */ lw $t1, 0x0070($sp) -/* 0213C 8097F7AC 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 02140 8097F7B0 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 02144 8097F7B4 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 -/* 02148 8097F7B8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0214C 8097F7BC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 02150 8097F7C0 25CE2910 */ addiu $t6, $t6, 0x2910 ## $t6 = 06002910 -/* 02154 8097F7C4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02158 8097F7C8 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 0215C 8097F7CC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02160 8097F7D0 8FAB00B4 */ lw $t3, 0x00B4($sp) -/* 02164 8097F7D4 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 02168 8097F7D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0216C 8097F7DC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 02170 8097F7E0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02174 8097F7E4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 02178 8097F7E8 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0217C 8097F7EC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02180 8097F7F0 0C024F61 */ jal func_80093D84 -/* 02184 8097F7F4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 02188 8097F7F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0218C 8097F7FC 3C198080 */ lui $t9, 0x8080 ## $t9 = 80800000 -/* 02190 8097F800 37398080 */ ori $t9, $t9, 0x8080 ## $t9 = 80808080 -/* 02194 8097F804 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02198 8097F808 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 0219C 8097F80C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 021A0 8097F810 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 021A4 8097F814 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 021A8 8097F818 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 021AC 8097F81C 8FA800CC */ lw $t0, 0x00CC($sp) -/* 021B0 8097F820 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 021B4 8097F824 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 021B8 8097F828 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 021BC 8097F82C 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 021C0 8097F830 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 021C4 8097F834 0008C100 */ sll $t8, $t0, 4 -/* 021C8 8097F838 0308C023 */ subu $t8, $t8, $t0 -/* 021CC 8097F83C 00083880 */ sll $a3, $t0, 2 -/* 021D0 8097F840 0018C040 */ sll $t8, $t8, 1 -/* 021D4 8097F844 240B0200 */ addiu $t3, $zero, 0x0200 ## $t3 = 00000200 -/* 021D8 8097F848 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 021DC 8097F84C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 021E0 8097F850 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 021E4 8097F854 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 021E8 8097F858 00E83821 */ addu $a3, $a3, $t0 -/* 021EC 8097F85C 00073880 */ sll $a3, $a3, 2 -/* 021F0 8097F860 AFAE0014 */ sw $t6, 0x0014($sp) -/* 021F4 8097F864 AFAD0010 */ sw $t5, 0x0010($sp) -/* 021F8 8097F868 AFAF0018 */ sw $t7, 0x0018($sp) -/* 021FC 8097F86C AFB90024 */ sw $t9, 0x0024($sp) -/* 02200 8097F870 AFAB0028 */ sw $t3, 0x0028($sp) -/* 02204 8097F874 AFB80020 */ sw $t8, 0x0020($sp) -/* 02208 8097F878 AFA0001C */ sw $zero, 0x001C($sp) -/* 0220C 8097F87C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02210 8097F880 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02214 8097F884 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02218 8097F888 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0221C 8097F88C AFA20060 */ sw $v0, 0x0060($sp) -/* 02220 8097F890 8FA30060 */ lw $v1, 0x0060($sp) -/* 02224 8097F894 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 02228 8097F898 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 0222C 8097F89C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02230 8097F8A0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02234 8097F8A4 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 02238 8097F8A8 273941A0 */ addiu $t9, $t9, 0x41A0 ## $t9 = 060041A0 -/* 0223C 8097F8AC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 02240 8097F8B0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 02244 8097F8B4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 02248 8097F8B8 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 0224C 8097F8BC 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 02250 8097F8C0 3C068098 */ lui $a2, %hi(D_809827B0) ## $a2 = 80980000 -/* 02254 8097F8C4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02258 8097F8C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0225C 8097F8CC 24C627B0 */ addiu $a2, $a2, %lo(D_809827B0) ## $a2 = 809827B0 -/* 02260 8097F8D0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 -/* 02264 8097F8D4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02268 8097F8D8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 0226C 8097F8DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02270 8097F8E0 2407022D */ addiu $a3, $zero, 0x022D ## $a3 = 0000022D -/* 02274 8097F8E4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 02278 8097F8E8 0C031AD5 */ jal Graph_CloseDisps -/* 0227C 8097F8EC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02280 8097F8F0 8FBF004C */ lw $ra, 0x004C($sp) -/* 02284 8097F8F4 8FB00048 */ lw $s0, 0x0048($sp) -/* 02288 8097F8F8 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 -/* 0228C 8097F8FC 03E00008 */ jr $ra -/* 02290 8097F900 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s deleted file mode 100644 index a7ded0b614..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8097F904 -/* 02294 8097F904 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02298 8097F908 AFBF001C */ sw $ra, 0x001C($sp) -/* 0229C 8097F90C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 022A0 8097F910 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 022A4 8097F914 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 022A8 8097F918 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 022AC 8097F91C C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 022B0 8097F920 46002182 */ mul.s $f6, $f4, $f0 -/* 022B4 8097F924 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 022B8 8097F928 25CE5CB8 */ addiu $t6, $t6, 0x5CB8 ## $t6 = 06005CB8 -/* 022BC 8097F92C 46004282 */ mul.s $f10, $f8, $f0 -/* 022C0 8097F930 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 022C4 8097F934 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 022C8 8097F938 46008482 */ mul.s $f18, $f16, $f0 -/* 022CC 8097F93C E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 022D0 8097F940 E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 022D4 8097F944 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 022D8 8097F948 0C25FB91 */ jal func_8097EE44 -/* 022DC 8097F94C AFAE0010 */ sw $t6, 0x0010($sp) -/* 022E0 8097F950 8FBF001C */ lw $ra, 0x001C($sp) -/* 022E4 8097F954 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022E8 8097F958 03E00008 */ jr $ra -/* 022EC 8097F95C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s deleted file mode 100644 index 0791471378..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8097F960 -/* 022F0 8097F960 AFA40000 */ sw $a0, 0x0000($sp) -/* 022F4 8097F964 03E00008 */ jr $ra -/* 022F8 8097F968 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s deleted file mode 100644 index d10093550f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_8097F96C -/* 022FC 8097F96C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02300 8097F970 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02304 8097F974 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02308 8097F978 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0230C 8097F97C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 02310 8097F980 28410424 */ slti $at, $v0, 0x0424 -/* 02314 8097F984 14200003 */ bne $at, $zero, .L8097F994 -/* 02318 8097F988 28410426 */ slti $at, $v0, 0x0426 -/* 0231C 8097F98C 54200007 */ bnel $at, $zero, .L8097F9AC -/* 02320 8097F990 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -.L8097F994: -/* 02324 8097F994 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 02328 8097F998 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 0232C 8097F99C 85CF1456 */ lh $t7, 0x1456($t6) ## 80161456 -/* 02330 8097F9A0 55E1001B */ bnel $t7, $at, .L8097FA10 -/* 02334 8097F9A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02338 8097F9A8 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -.L8097F9AC: -/* 0233C 8097F9AC 3C014419 */ lui $at, 0x4419 ## $at = 44190000 -/* 02340 8097F9B0 44814000 */ mtc1 $at, $f8 ## $f8 = 612.00 -/* 02344 8097F9B4 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 02348 8097F9B8 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 0234C 8097F9BC 3C038098 */ lui $v1, %hi(D_80982614) ## $v1 = 80980000 -/* 02350 8097F9C0 8C632614 */ lw $v1, %lo(D_80982614)($v1) -/* 02354 8097F9C4 46083280 */ add.s $f10, $f6, $f8 -/* 02358 8097F9C8 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFE4 -/* 0235C 8097F9CC C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 02360 8097F9D0 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 02364 8097F9D4 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 02368 8097F9D8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0236C 8097F9DC 14600006 */ bne $v1, $zero, .L8097F9F8 -/* 02370 8097F9E0 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 02374 8097F9E4 0C25F659 */ jal func_8097D964 -/* 02378 8097F9E8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0237C 8097F9EC 3C018098 */ lui $at, %hi(D_80982614) ## $at = 80980000 -/* 02380 8097F9F0 10000006 */ beq $zero, $zero, .L8097FA0C -/* 02384 8097F9F4 AC222614 */ sw $v0, %lo(D_80982614)($at) -.L8097F9F8: -/* 02388 8097F9F8 E4720024 */ swc1 $f18, 0x0024($v1) ## 00000024 -/* 0238C 8097F9FC C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 02390 8097FA00 E4640028 */ swc1 $f4, 0x0028($v1) ## 00000028 -/* 02394 8097FA04 C7A6002C */ lwc1 $f6, 0x002C($sp) -/* 02398 8097FA08 E466002C */ swc1 $f6, 0x002C($v1) ## 0000002C -.L8097FA0C: -/* 0239C 8097FA0C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097FA10: -/* 023A0 8097FA10 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 023A4 8097FA14 03E00008 */ jr $ra -/* 023A8 8097FA18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s deleted file mode 100644 index 3d659c9001..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s +++ /dev/null @@ -1,65 +0,0 @@ -.late_rodata -glabel D_80982ADC - .float 377.0 - -.text -glabel func_8097FA1C -/* 023AC 8097FA1C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 023B0 8097FA20 3C0F8098 */ lui $t7, %hi(D_80982618) ## $t7 = 80980000 -/* 023B4 8097FA24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 023B8 8097FA28 AFA40068 */ sw $a0, 0x0068($sp) -/* 023BC 8097FA2C AFA5006C */ sw $a1, 0x006C($sp) -/* 023C0 8097FA30 25EF2618 */ addiu $t7, $t7, %lo(D_80982618) ## $t7 = 80982618 -/* 023C4 8097FA34 8DF90000 */ lw $t9, 0x0000($t7) ## 80982618 -/* 023C8 8097FA38 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 023CC 8097FA3C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 023D0 8097FA40 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 023D4 8097FA44 8DF80004 */ lw $t8, 0x0004($t7) ## 8098261C -/* 023D8 8097FA48 284101F7 */ slti $at, $v0, 0x01F7 -/* 023DC 8097FA4C 3C088016 */ lui $t0, %hi(gGameInfo) -/* 023E0 8097FA50 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 023E4 8097FA54 8DF90008 */ lw $t9, 0x0008($t7) ## 80982620 -/* 023E8 8097FA58 14200004 */ bne $at, $zero, .L8097FA6C -/* 023EC 8097FA5C ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 023F0 8097FA60 28410245 */ slti $at, $v0, 0x0245 -/* 023F4 8097FA64 54200007 */ bnel $at, $zero, .L8097FA84 -/* 023F8 8097FA68 8FA20068 */ lw $v0, 0x0068($sp) -.L8097FA6C: -/* 023FC 8097FA6C 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 02400 8097FA70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02404 8097FA74 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 02408 8097FA78 5521001D */ bnel $t1, $at, .L8097FAF0 -/* 0240C 8097FA7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02410 8097FA80 8FA20068 */ lw $v0, 0x0068($sp) -.L8097FA84: -/* 02414 8097FA84 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 02418 8097FA88 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 0241C 8097FA8C C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02420 8097FA90 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 -/* 02424 8097FA94 44818000 */ mtc1 $at, $f16 ## $f16 = 360.00 -/* 02428 8097FA98 46062200 */ add.s $f8, $f4, $f6 -/* 0242C 8097FA9C 3C018098 */ lui $at, %hi(D_80982ADC) ## $at = 80980000 -/* 02430 8097FAA0 C4262ADC */ lwc1 $f6, %lo(D_80982ADC)($at) -/* 02434 8097FAA4 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 02438 8097FAA8 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 0243C 8097FAAC C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 02440 8097FAB0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02444 8097FAB4 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 02448 8097FAB8 46105480 */ add.s $f18, $f10, $f16 -/* 0244C 8097FABC 8FA4006C */ lw $a0, 0x006C($sp) -/* 02450 8097FAC0 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 02454 8097FAC4 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 02458 8097FAC8 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 0245C 8097FACC C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 02460 8097FAD0 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02464 8097FAD4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 02468 8097FAD8 46062201 */ sub.s $f8, $f4, $f6 -/* 0246C 8097FADC AFAA0010 */ sw $t2, 0x0010($sp) -/* 02470 8097FAE0 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 02474 8097FAE4 0C25F5F6 */ jal func_8097D7D8 -/* 02478 8097FAE8 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 0247C 8097FAEC 8FBF0024 */ lw $ra, 0x0024($sp) -.L8097FAF0: -/* 02480 8097FAF0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02484 8097FAF4 03E00008 */ jr $ra -/* 02488 8097FAF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s deleted file mode 100644 index 03ac70b6fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_8097FAFC -/* 0248C 8097FAFC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02490 8097FB00 AFBF002C */ sw $ra, 0x002C($sp) -/* 02494 8097FB04 AFA50054 */ sw $a1, 0x0054($sp) -/* 02498 8097FB08 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 0249C 8097FB0C 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 024A0 8097FB10 28410247 */ slti $at, $v0, 0x0247 -/* 024A4 8097FB14 14200004 */ bne $at, $zero, .L8097FB28 -/* 024A8 8097FB18 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 024AC 8097FB1C 284102AB */ slti $at, $v0, 0x02AB -/* 024B0 8097FB20 54200007 */ bnel $at, $zero, .L8097FB40 -/* 024B4 8097FB24 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 -.L8097FB28: -/* 024B8 8097FB28 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 024BC 8097FB2C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 024C0 8097FB30 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 -/* 024C4 8097FB34 57010036 */ bnel $t8, $at, .L8097FC10 -/* 024C8 8097FB38 8FBF002C */ lw $ra, 0x002C($sp) -/* 024CC 8097FB3C 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 -.L8097FB40: -/* 024D0 8097FB40 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE8 -/* 024D4 8097FB44 3C01442A */ lui $at, 0x442A ## $at = 442A0000 -/* 024D8 8097FB48 ACA80000 */ sw $t0, 0x0000($a1) ## FFFFFFE8 -/* 024DC 8097FB4C 8C990028 */ lw $t9, 0x0028($a0) ## 00000028 -/* 024E0 8097FB50 44813000 */ mtc1 $at, $f6 ## $f6 = 680.00 -/* 024E4 8097FB54 240102AA */ addiu $at, $zero, 0x02AA ## $at = 000002AA -/* 024E8 8097FB58 ACB90004 */ sw $t9, 0x0004($a1) ## FFFFFFEC -/* 024EC 8097FB5C 8C88002C */ lw $t0, 0x002C($a0) ## 0000002C -/* 024F0 8097FB60 3C068098 */ lui $a2, %hi(D_80982624) ## $a2 = 80980000 -/* 024F4 8097FB64 3C078098 */ lui $a3, %hi(D_80982630) ## $a3 = 80980000 -/* 024F8 8097FB68 ACA80008 */ sw $t0, 0x0008($a1) ## FFFFFFF0 -/* 024FC 8097FB6C C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 02500 8097FB70 24E72630 */ addiu $a3, $a3, %lo(D_80982630) ## $a3 = 80982630 -/* 02504 8097FB74 24C62624 */ addiu $a2, $a2, %lo(D_80982624) ## $a2 = 80982624 -/* 02508 8097FB78 46062200 */ add.s $f8, $f4, $f6 -/* 0250C 8097FB7C 3C098098 */ lui $t1, %hi(D_80982644) ## $t1 = 80980000 -/* 02510 8097FB80 3C0A8098 */ lui $t2, %hi(D_80982648) ## $t2 = 80980000 -/* 02514 8097FB84 14610009 */ bne $v1, $at, .L8097FBAC -/* 02518 8097FB88 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 0251C 8097FB8C 3C018098 */ lui $at, %hi(D_80982628) ## $at = 80980000 -/* 02520 8097FB90 C42A2628 */ lwc1 $f10, %lo(D_80982628)($at) -/* 02524 8097FB94 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 02528 8097FB98 44818000 */ mtc1 $at, $f16 ## $f16 = -200.00 -/* 0252C 8097FB9C 3C018098 */ lui $at, %hi(D_80982628) ## $at = 80980000 -/* 02530 8097FBA0 46105480 */ add.s $f18, $f10, $f16 -/* 02534 8097FBA4 1000000A */ beq $zero, $zero, .L8097FBD0 -/* 02538 8097FBA8 E4322628 */ swc1 $f18, %lo(D_80982628)($at) -.L8097FBAC: -/* 0253C 8097FBAC 240102A9 */ addiu $at, $zero, 0x02A9 ## $at = 000002A9 -/* 02540 8097FBB0 14610007 */ bne $v1, $at, .L8097FBD0 -/* 02544 8097FBB4 3C018098 */ lui $at, %hi(D_80982634) ## $at = 80980000 -/* 02548 8097FBB8 C4242634 */ lwc1 $f4, %lo(D_80982634)($at) -/* 0254C 8097FBBC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 02550 8097FBC0 44813000 */ mtc1 $at, $f6 ## $f6 = -200.00 -/* 02554 8097FBC4 3C018098 */ lui $at, %hi(D_80982634) ## $at = 80980000 -/* 02558 8097FBC8 46062200 */ add.s $f8, $f4, $f6 -/* 0255C 8097FBCC E4282634 */ swc1 $f8, %lo(D_80982634)($at) -.L8097FBD0: -/* 02560 8097FBD0 3C018098 */ lui $at, %hi(D_8098263C) ## $at = 80980000 -/* 02564 8097FBD4 C42A263C */ lwc1 $f10, %lo(D_8098263C)($at) -/* 02568 8097FBD8 3C018098 */ lui $at, %hi(D_80982640) ## $at = 80980000 -/* 0256C 8097FBDC 3C0B8098 */ lui $t3, %hi(D_8098264C) ## $t3 = 80980000 -/* 02570 8097FBE0 856B264C */ lh $t3, %lo(D_8098264C)($t3) -/* 02574 8097FBE4 C4302640 */ lwc1 $f16, %lo(D_80982640)($at) -/* 02578 8097FBE8 8D292644 */ lw $t1, %lo(D_80982644)($t1) -/* 0257C 8097FBEC 8D4A2648 */ lw $t2, %lo(D_80982648)($t2) -/* 02580 8097FBF0 8FA40054 */ lw $a0, 0x0054($sp) -/* 02584 8097FBF4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02588 8097FBF8 AFAB0020 */ sw $t3, 0x0020($sp) -/* 0258C 8097FBFC E7B00014 */ swc1 $f16, 0x0014($sp) -/* 02590 8097FC00 AFA90018 */ sw $t1, 0x0018($sp) -/* 02594 8097FC04 0C25F915 */ jal func_8097E454 -/* 02598 8097FC08 AFAA001C */ sw $t2, 0x001C($sp) -/* 0259C 8097FC0C 8FBF002C */ lw $ra, 0x002C($sp) -.L8097FC10: -/* 025A0 8097FC10 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 025A4 8097FC14 03E00008 */ jr $ra -/* 025A8 8097FC18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s deleted file mode 100644 index b40a9b1486..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_8097FC1C -/* 025AC 8097FC1C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 025B0 8097FC20 3C0F8098 */ lui $t7, %hi(D_80982650) ## $t7 = 80980000 -/* 025B4 8097FC24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 025B8 8097FC28 AFA40068 */ sw $a0, 0x0068($sp) -/* 025BC 8097FC2C AFA5006C */ sw $a1, 0x006C($sp) -/* 025C0 8097FC30 25EF2650 */ addiu $t7, $t7, %lo(D_80982650) ## $t7 = 80982650 -/* 025C4 8097FC34 8DF90000 */ lw $t9, 0x0000($t7) ## 80982650 -/* 025C8 8097FC38 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 025CC 8097FC3C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 025D0 8097FC40 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 025D4 8097FC44 8DF80004 */ lw $t8, 0x0004($t7) ## 80982654 -/* 025D8 8097FC48 284102AB */ slti $at, $v0, 0x02AB -/* 025DC 8097FC4C 3C088016 */ lui $t0, %hi(gGameInfo) -/* 025E0 8097FC50 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 025E4 8097FC54 8DF90008 */ lw $t9, 0x0008($t7) ## 80982658 -/* 025E8 8097FC58 10200006 */ beq $at, $zero, .L8097FC74 -/* 025EC 8097FC5C ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 025F0 8097FC60 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 025F4 8097FC64 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 025F8 8097FC68 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 025FC 8097FC6C 5521001A */ bnel $t1, $at, .L8097FCD8 -/* 02600 8097FC70 8FBF0024 */ lw $ra, 0x0024($sp) -.L8097FC74: -/* 02604 8097FC74 8FA20068 */ lw $v0, 0x0068($sp) -/* 02608 8097FC78 3C014382 */ lui $at, 0x4382 ## $at = 43820000 -/* 0260C 8097FC7C 44810000 */ mtc1 $at, $f0 ## $f0 = 260.00 -/* 02610 8097FC80 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02614 8097FC84 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 -/* 02618 8097FC88 44815000 */ mtc1 $at, $f10 ## $f10 = 360.00 -/* 0261C 8097FC8C 46002180 */ add.s $f6, $f4, $f0 -/* 02620 8097FC90 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 02624 8097FC94 240B0023 */ addiu $t3, $zero, 0x0023 ## $t3 = 00000023 -/* 02628 8097FC98 8FA4006C */ lw $a0, 0x006C($sp) -/* 0262C 8097FC9C E7A60050 */ swc1 $f6, 0x0050($sp) -/* 02630 8097FCA0 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 02634 8097FCA4 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 02638 8097FCA8 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0263C 8097FCAC 460A4400 */ add.s $f16, $f8, $f10 -/* 02640 8097FCB0 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 02644 8097FCB4 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 02648 8097FCB8 C4520008 */ lwc1 $f18, 0x0008($v0) ## 0000002C -/* 0264C 8097FCBC AFAB0018 */ sw $t3, 0x0018($sp) -/* 02650 8097FCC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 02654 8097FCC4 46009100 */ add.s $f4, $f18, $f0 -/* 02658 8097FCC8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0265C 8097FCCC 0C25F5F6 */ jal func_8097D7D8 -/* 02660 8097FCD0 E7A40058 */ swc1 $f4, 0x0058($sp) -/* 02664 8097FCD4 8FBF0024 */ lw $ra, 0x0024($sp) -.L8097FCD8: -/* 02668 8097FCD8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 0266C 8097FCDC 03E00008 */ jr $ra -/* 02670 8097FCE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s deleted file mode 100644 index b0c68a40a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s +++ /dev/null @@ -1,43 +0,0 @@ -.late_rodata -glabel D_80982AE0 - .float 377.0 - -.text -glabel func_8097FCE4 -/* 02674 8097FCE4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02678 8097FCE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0267C 8097FCEC AFA5003C */ sw $a1, 0x003C($sp) -/* 02680 8097FCF0 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02684 8097FCF4 240101F7 */ addiu $at, $zero, 0x01F7 ## $at = 000001F7 -/* 02688 8097FCF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0268C 8097FCFC 10410005 */ beq $v0, $at, .L8097FD14 -/* 02690 8097FD00 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 02694 8097FD04 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 02698 8097FD08 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0269C 8097FD0C 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 -/* 026A0 8097FD10 17010013 */ bne $t8, $at, .L8097FD60 -.L8097FD14: -/* 026A4 8097FD14 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 026A8 8097FD18 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 026AC 8097FD1C C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 -/* 026B0 8097FD20 3C01440C */ lui $at, 0x440C ## $at = 440C0000 -/* 026B4 8097FD24 44818000 */ mtc1 $at, $f16 ## $f16 = 560.00 -/* 026B8 8097FD28 46062200 */ add.s $f8, $f4, $f6 -/* 026BC 8097FD2C 3C018098 */ lui $at, %hi(D_80982AE0) ## $at = 80980000 -/* 026C0 8097FD30 C4262AE0 */ lwc1 $f6, %lo(D_80982AE0)($at) -/* 026C4 8097FD34 8FA4003C */ lw $a0, 0x003C($sp) -/* 026C8 8097FD38 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 026CC 8097FD3C C4EA0028 */ lwc1 $f10, 0x0028($a3) ## 00000028 -/* 026D0 8097FD40 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFE8 -/* 026D4 8097FD44 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 026D8 8097FD48 46105480 */ add.s $f18, $f10, $f16 -/* 026DC 8097FD4C E7B20024 */ swc1 $f18, 0x0024($sp) -/* 026E0 8097FD50 C4E4002C */ lwc1 $f4, 0x002C($a3) ## 0000002C -/* 026E4 8097FD54 46062201 */ sub.s $f8, $f4, $f6 -/* 026E8 8097FD58 0C25F671 */ jal func_8097D9C4 -/* 026EC 8097FD5C E7A80028 */ swc1 $f8, 0x0028($sp) -.L8097FD60: -/* 026F0 8097FD60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026F4 8097FD64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 026F8 8097FD68 03E00008 */ jr $ra -/* 026FC 8097FD6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s deleted file mode 100644 index 8946c5a52d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8097FD70 -/* 02700 8097FD70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02704 8097FD74 AFBF001C */ sw $ra, 0x001C($sp) -/* 02708 8097FD78 AFB10018 */ sw $s1, 0x0018($sp) -/* 0270C 8097FD7C AFB00014 */ sw $s0, 0x0014($sp) -/* 02710 8097FD80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02714 8097FD84 0C25FE58 */ jal func_8097F960 -/* 02718 8097FD88 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0271C 8097FD8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02720 8097FD90 0C25FE5B */ jal func_8097F96C -/* 02724 8097FD94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02728 8097FD98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0272C 8097FD9C 0C25FE87 */ jal func_8097FA1C -/* 02730 8097FDA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02734 8097FDA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02738 8097FDA8 0C25FEBF */ jal func_8097FAFC -/* 0273C 8097FDAC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02740 8097FDB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02744 8097FDB4 0C25FF07 */ jal func_8097FC1C -/* 02748 8097FDB8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0274C 8097FDBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02750 8097FDC0 0C25FF39 */ jal func_8097FCE4 -/* 02754 8097FDC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02758 8097FDC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0275C 8097FDCC 8FB00014 */ lw $s0, 0x0014($sp) -/* 02760 8097FDD0 8FB10018 */ lw $s1, 0x0018($sp) -/* 02764 8097FDD4 03E00008 */ jr $ra -/* 02768 8097FDD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s deleted file mode 100644 index 8ab73de01b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_8097FDDC -/* 0276C 8097FDDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02770 8097FDE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02774 8097FDE4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02778 8097FDE8 94A61D74 */ lhu $a2, 0x1D74($a1) ## 00001D74 -/* 0277C 8097FDEC 28C10262 */ slti $at, $a2, 0x0262 -/* 02780 8097FDF0 10200011 */ beq $at, $zero, .L8097FE38 -/* 02784 8097FDF4 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -/* 02788 8097FDF8 8FA20020 */ lw $v0, 0x0020($sp) -/* 0278C 8097FDFC 240400C1 */ addiu $a0, $zero, 0x00C1 ## $a0 = 000000C1 -/* 02790 8097FE00 240E00A3 */ addiu $t6, $zero, 0x00A3 ## $t6 = 000000A3 -/* 02794 8097FE04 AC4E0178 */ sw $t6, 0x0178($v0) ## 00000178 -/* 02798 8097FE08 AC44017C */ sw $a0, 0x017C($v0) ## 0000017C -/* 0279C 8097FE0C AC440180 */ sw $a0, 0x0180($v0) ## 00000180 -/* 027A0 8097FE10 8FA30020 */ lw $v1, 0x0020($sp) -/* 027A4 8097FE14 24420178 */ addiu $v0, $v0, 0x0178 ## $v0 = 00000178 -/* 027A8 8097FE18 8C6F0198 */ lw $t7, 0x0198($v1) ## 00000198 -/* 027AC 8097FE1C 8C79019C */ lw $t9, 0x019C($v1) ## 0000019C -/* 027B0 8097FE20 24630198 */ addiu $v1, $v1, 0x0198 ## $v1 = 00000198 -/* 027B4 8097FE24 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 027B8 8097FE28 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF -/* 027BC 8097FE2C AC780000 */ sw $t8, 0x0000($v1) ## 00000198 -/* 027C0 8097FE30 10000025 */ beq $zero, $zero, .L8097FEC8 -/* 027C4 8097FE34 AC680004 */ sw $t0, 0x0004($v1) ## 0000019C -.L8097FE38: -/* 027C8 8097FE38 2841026C */ slti $at, $v0, 0x026C -/* 027CC 8097FE3C 1020001D */ beq $at, $zero, .L8097FEB4 -/* 027D0 8097FE40 8FA20020 */ lw $v0, 0x0020($sp) -/* 027D4 8097FE44 2404026C */ addiu $a0, $zero, 0x026C ## $a0 = 0000026C -/* 027D8 8097FE48 24050262 */ addiu $a1, $zero, 0x0262 ## $a1 = 00000262 -/* 027DC 8097FE4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 027E0 8097FE50 0C01BE6F */ jal func_8006F9BC -/* 027E4 8097FE54 AFA00010 */ sw $zero, 0x0010($sp) -/* 027E8 8097FE58 3C01C150 */ lui $at, 0xC150 ## $at = C1500000 -/* 027EC 8097FE5C 44812000 */ mtc1 $at, $f4 ## $f4 = -13.00 -/* 027F0 8097FE60 3C014323 */ lui $at, 0x4323 ## $at = 43230000 -/* 027F4 8097FE64 44814000 */ mtc1 $at, $f8 ## $f8 = 163.00 -/* 027F8 8097FE68 46040182 */ mul.s $f6, $f0, $f4 -/* 027FC 8097FE6C 3C01C22C */ lui $at, 0xC22C ## $at = C22C0000 -/* 02800 8097FE70 44819000 */ mtc1 $at, $f18 ## $f18 = -43.00 -/* 02804 8097FE74 3C014341 */ lui $at, 0x4341 ## $at = 43410000 -/* 02808 8097FE78 8FA20020 */ lw $v0, 0x0020($sp) -/* 0280C 8097FE7C 46120102 */ mul.s $f4, $f0, $f18 -/* 02810 8097FE80 46083280 */ add.s $f10, $f6, $f8 -/* 02814 8097FE84 44813000 */ mtc1 $at, $f6 ## $f6 = 193.00 -/* 02818 8097FE88 24420178 */ addiu $v0, $v0, 0x0178 ## $v0 = 00000178 -/* 0281C 8097FE8C 4600540D */ trunc.w.s $f16, $f10 -/* 02820 8097FE90 46062200 */ add.s $f8, $f4, $f6 -/* 02824 8097FE94 440A8000 */ mfc1 $t2, $f16 -/* 02828 8097FE98 4600428D */ trunc.w.s $f10, $f8 -/* 0282C 8097FE9C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000178 -/* 02830 8097FEA0 44035000 */ mfc1 $v1, $f10 -/* 02834 8097FEA4 00000000 */ nop -/* 02838 8097FEA8 AC430004 */ sw $v1, 0x0004($v0) ## 0000017C -/* 0283C 8097FEAC 10000006 */ beq $zero, $zero, .L8097FEC8 -/* 02840 8097FEB0 AC430008 */ sw $v1, 0x0008($v0) ## 00000180 -.L8097FEB4: -/* 02844 8097FEB4 24030096 */ addiu $v1, $zero, 0x0096 ## $v1 = 00000096 -/* 02848 8097FEB8 AC430178 */ sw $v1, 0x0178($v0) ## 000002F0 -/* 0284C 8097FEBC 24420178 */ addiu $v0, $v0, 0x0178 ## $v0 = 000002F0 -/* 02850 8097FEC0 AC430004 */ sw $v1, 0x0004($v0) ## 000002F4 -/* 02854 8097FEC4 AC430008 */ sw $v1, 0x0008($v0) ## 000002F8 -.L8097FEC8: -/* 02858 8097FEC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0285C 8097FECC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02860 8097FED0 03E00008 */ jr $ra -/* 02864 8097FED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s deleted file mode 100644 index 4ce5f47e1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8097FED8 -/* 02868 8097FED8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0286C 8097FEDC AFA40018 */ sw $a0, 0x0018($sp) -/* 02870 8097FEE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02874 8097FEE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02878 8097FEE8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0287C 8097FEEC 0C25F9C1 */ jal func_8097E704 -/* 02880 8097FEF0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02884 8097FEF4 10400003 */ beq $v0, $zero, .L8097FF04 -/* 02888 8097FEF8 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0288C 8097FEFC 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 02890 8097FF00 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L8097FF04: -/* 02894 8097FF04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02898 8097FF08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0289C 8097FF0C 03E00008 */ jr $ra -/* 028A0 8097FF10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s deleted file mode 100644 index e4c331b6be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8097FF14 -/* 028A4 8097FF14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 028A8 8097FF18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 028AC 8097FF1C AFA40018 */ sw $a0, 0x0018($sp) -/* 028B0 8097FF20 0C25FF77 */ jal func_8097FDDC -/* 028B4 8097FF24 AFA5001C */ sw $a1, 0x001C($sp) -/* 028B8 8097FF28 8FA40018 */ lw $a0, 0x0018($sp) -/* 028BC 8097FF2C 0C25FA09 */ jal func_8097E824 -/* 028C0 8097FF30 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 028C4 8097FF34 8FA40018 */ lw $a0, 0x0018($sp) -/* 028C8 8097FF38 0C25FF5C */ jal func_8097FD70 -/* 028CC 8097FF3C 8FA5001C */ lw $a1, 0x001C($sp) -/* 028D0 8097FF40 8FA40018 */ lw $a0, 0x0018($sp) -/* 028D4 8097FF44 0C25FFB6 */ jal func_8097FED8 -/* 028D8 8097FF48 8FA5001C */ lw $a1, 0x001C($sp) -/* 028DC 8097FF4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 028E0 8097FF50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 028E4 8097FF54 03E00008 */ jr $ra -/* 028E8 8097FF58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s deleted file mode 100644 index 580c5bd47c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8097FF5C -/* 028EC 8097FF5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 028F0 8097FF60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 028F4 8097FF64 AFA40018 */ sw $a0, 0x0018($sp) -/* 028F8 8097FF68 0C25FF77 */ jal func_8097FDDC -/* 028FC 8097FF6C AFA5001C */ sw $a1, 0x001C($sp) -/* 02900 8097FF70 8FA40018 */ lw $a0, 0x0018($sp) -/* 02904 8097FF74 8FA5001C */ lw $a1, 0x001C($sp) -/* 02908 8097FF78 0C25FB59 */ jal func_8097ED64 -/* 0290C 8097FF7C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02910 8097FF80 8FA40018 */ lw $a0, 0x0018($sp) -/* 02914 8097FF84 0C25FF5C */ jal func_8097FD70 -/* 02918 8097FF88 8FA5001C */ lw $a1, 0x001C($sp) -/* 0291C 8097FF8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02920 8097FF90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02924 8097FF94 03E00008 */ jr $ra -/* 02928 8097FF98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s deleted file mode 100644 index b3bbb5f7b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s +++ /dev/null @@ -1,108 +0,0 @@ -.rdata -glabel D_809827C8 - .asciz "../z_demo_gt_part2.c" - .balign 4 - -glabel D_809827E0 - .asciz "../z_demo_gt_part2.c" - .balign 4 - -glabel D_809827F8 - .asciz "../z_demo_gt_part2.c" - .balign 4 - -.text -glabel func_8097FF9C -/* 0292C 8097FF9C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 02930 8097FFA0 AFBF004C */ sw $ra, 0x004C($sp) -/* 02934 8097FFA4 AFB00048 */ sw $s0, 0x0048($sp) -/* 02938 8097FFA8 AFA40088 */ sw $a0, 0x0088($sp) -/* 0293C 8097FFAC AFA5008C */ sw $a1, 0x008C($sp) -/* 02940 8097FFB0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 02944 8097FFB4 3C068098 */ lui $a2, %hi(D_809827C8) ## $a2 = 80980000 -/* 02948 8097FFB8 24C627C8 */ addiu $a2, $a2, %lo(D_809827C8) ## $a2 = 809827C8 -/* 0294C 8097FFBC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 02950 8097FFC0 240701D6 */ addiu $a3, $zero, 0x01D6 ## $a3 = 000001D6 -/* 02954 8097FFC4 0C031AB1 */ jal Graph_OpenDisps -/* 02958 8097FFC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0295C 8097FFCC 0C024F46 */ jal func_80093D18 -/* 02960 8097FFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02964 8097FFD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02968 8097FFD8 8FAA0088 */ lw $t2, 0x0088($sp) -/* 0296C 8097FFDC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 02970 8097FFE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02974 8097FFE4 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 02978 8097FFE8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 0297C 8097FFEC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02980 8097FFF0 25480198 */ addiu $t0, $t2, 0x0198 ## $t0 = 00000198 -/* 02984 8097FFF4 8D070000 */ lw $a3, 0x0000($t0) ## 00000198 -/* 02988 8097FFF8 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 0298C 8097FFFC 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 02990 80980000 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 02994 80980004 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02998 80980008 AFAB0014 */ sw $t3, 0x0014($sp) -/* 0299C 8098000C AFB90010 */ sw $t9, 0x0010($sp) -/* 029A0 80980010 AFA0001C */ sw $zero, 0x001C($sp) -/* 029A4 80980014 8D0D0004 */ lw $t5, 0x0004($t0) ## 0000019C -/* 029A8 80980018 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 -/* 029AC 8098001C 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 029B0 80980020 AFAE0024 */ sw $t6, 0x0024($sp) -/* 029B4 80980024 AFAF0028 */ sw $t7, 0x0028($sp) -/* 029B8 80980028 25430178 */ addiu $v1, $t2, 0x0178 ## $v1 = 00000178 -/* 029BC 8098002C AFAD0020 */ sw $t5, 0x0020($sp) -/* 029C0 80980030 8C780000 */ lw $t8, 0x0000($v1) ## 00000178 -/* 029C4 80980034 240C0080 */ addiu $t4, $zero, 0x0080 ## $t4 = 00000080 -/* 029C8 80980038 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029CC 8098003C AFB8002C */ sw $t8, 0x002C($sp) -/* 029D0 80980040 8C790004 */ lw $t9, 0x0004($v1) ## 0000017C -/* 029D4 80980044 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 029D8 80980048 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029DC 8098004C AFB90030 */ sw $t9, 0x0030($sp) -/* 029E0 80980050 8C6B0008 */ lw $t3, 0x0008($v1) ## 00000180 -/* 029E4 80980054 AFAC0038 */ sw $t4, 0x0038($sp) -/* 029E8 80980058 AFA20060 */ sw $v0, 0x0060($sp) -/* 029EC 8098005C 0C02541A */ jal Gfx_TwoTexScrollEnvColor -/* 029F0 80980060 AFAB0034 */ sw $t3, 0x0034($sp) -/* 029F4 80980064 8FA90060 */ lw $t1, 0x0060($sp) -/* 029F8 80980068 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 029FC 8098006C 35CE0002 */ ori $t6, $t6, 0x0002 ## $t6 = DA380002 -/* 02A00 80980070 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 -/* 02A04 80980074 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02A08 80980078 3C058098 */ lui $a1, %hi(D_809827E0) ## $a1 = 80980000 -/* 02A0C 8098007C 24A527E0 */ addiu $a1, $a1, %lo(D_809827E0) ## $a1 = 809827E0 -/* 02A10 80980080 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02A14 80980084 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 02A18 80980088 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02A1C 8098008C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A20 80980090 240601E5 */ addiu $a2, $zero, 0x01E5 ## $a2 = 000001E5 -/* 02A24 80980094 0C0346A2 */ jal Matrix_NewMtx -/* 02A28 80980098 AFA2005C */ sw $v0, 0x005C($sp) -/* 02A2C 8098009C 8FA3005C */ lw $v1, 0x005C($sp) -/* 02A30 809800A0 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 02A34 809800A4 27394F90 */ addiu $t9, $t9, 0x4F90 ## $t9 = 06004F90 -/* 02A38 809800A8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02A3C 809800AC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02A40 809800B0 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 02A44 809800B4 3C0CD838 */ lui $t4, 0xD838 ## $t4 = D8380000 -/* 02A48 809800B8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02A4C 809800BC AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 02A50 809800C0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 02A54 809800C4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02A58 809800C8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02A5C 809800CC 358C0002 */ ori $t4, $t4, 0x0002 ## $t4 = D8380002 -/* 02A60 809800D0 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 02A64 809800D4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 02A68 809800D8 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 02A6C 809800DC 3C068098 */ lui $a2, %hi(D_809827F8) ## $a2 = 80980000 -/* 02A70 809800E0 24C627F8 */ addiu $a2, $a2, %lo(D_809827F8) ## $a2 = 809827F8 -/* 02A74 809800E4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 02A78 809800E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02A7C 809800EC 240701E9 */ addiu $a3, $zero, 0x01E9 ## $a3 = 000001E9 -/* 02A80 809800F0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 02A84 809800F4 0C031AD5 */ jal Graph_CloseDisps -/* 02A88 809800F8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 02A8C 809800FC 8FBF004C */ lw $ra, 0x004C($sp) -/* 02A90 80980100 8FB00048 */ lw $s0, 0x0048($sp) -/* 02A94 80980104 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 02A98 80980108 03E00008 */ jr $ra -/* 02A9C 8098010C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s deleted file mode 100644 index 35472158ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80980110 -/* 02AA0 80980110 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02AA4 80980114 AFBF001C */ sw $ra, 0x001C($sp) -/* 02AA8 80980118 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02AAC 8098011C 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 02AB0 80980120 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 02AB4 80980124 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 02AB8 80980128 C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 02ABC 8098012C 46002182 */ mul.s $f6, $f4, $f0 -/* 02AC0 80980130 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 02AC4 80980134 25CE91E4 */ addiu $t6, $t6, 0x91E4 ## $t6 = 060091E4 -/* 02AC8 80980138 46004282 */ mul.s $f10, $f8, $f0 -/* 02ACC 8098013C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02AD0 80980140 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 02AD4 80980144 46008482 */ mul.s $f18, $f16, $f0 -/* 02AD8 80980148 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 02ADC 8098014C E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 02AE0 80980150 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 02AE4 80980154 0C25FB91 */ jal func_8097EE44 -/* 02AE8 80980158 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02AEC 8098015C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02AF0 80980160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02AF4 80980164 03E00008 */ jr $ra -/* 02AF8 80980168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s deleted file mode 100644 index 9da8a533f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8098016C -/* 02AFC 8098016C AFA40000 */ sw $a0, 0x0000($sp) -/* 02B00 80980170 03E00008 */ jr $ra -/* 02B04 80980174 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s deleted file mode 100644 index 4736ec4b09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80980178 -/* 02B08 80980178 AFA40000 */ sw $a0, 0x0000($sp) -/* 02B0C 8098017C 03E00008 */ jr $ra -/* 02B10 80980180 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s deleted file mode 100644 index 39dcf5eeaa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80980184 -/* 02B14 80980184 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02B18 80980188 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B1C 8098018C 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02B20 80980190 28410404 */ slti $at, $v0, 0x0404 -/* 02B24 80980194 1420001C */ bne $at, $zero, .L80980208 -/* 02B28 80980198 28410407 */ slti $at, $v0, 0x0407 -/* 02B2C 8098019C 5020001B */ beql $at, $zero, .L8098020C -/* 02B30 809801A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B34 809801A4 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 02B38 809801A8 3C014377 */ lui $at, 0x4377 ## $at = 43770000 -/* 02B3C 809801AC 44814000 */ mtc1 $at, $f8 ## $f8 = 247.00 -/* 02B40 809801B0 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 02B44 809801B4 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 02B48 809801B8 3C038098 */ lui $v1, %hi(D_8098265C) ## $v1 = 80980000 -/* 02B4C 809801BC 8C63265C */ lw $v1, %lo(D_8098265C)($v1) -/* 02B50 809801C0 46083280 */ add.s $f10, $f6, $f8 -/* 02B54 809801C4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 02B58 809801C8 C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 02B5C 809801CC E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 02B60 809801D0 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 02B64 809801D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02B68 809801D8 14600006 */ bne $v1, $zero, .L809801F4 -/* 02B6C 809801DC E7B0002C */ swc1 $f16, 0x002C($sp) -/* 02B70 809801E0 0C25F659 */ jal func_8097D964 -/* 02B74 809801E4 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFE4 -/* 02B78 809801E8 3C018098 */ lui $at, %hi(D_8098265C) ## $at = 80980000 -/* 02B7C 809801EC 10000006 */ beq $zero, $zero, .L80980208 -/* 02B80 809801F0 AC22265C */ sw $v0, %lo(D_8098265C)($at) -.L809801F4: -/* 02B84 809801F4 E4720024 */ swc1 $f18, 0x0024($v1) ## 00000024 -/* 02B88 809801F8 C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 02B8C 809801FC E4640028 */ swc1 $f4, 0x0028($v1) ## 00000028 -/* 02B90 80980200 C7A6002C */ lwc1 $f6, 0x002C($sp) -/* 02B94 80980204 E466002C */ swc1 $f6, 0x002C($v1) ## 0000002C -.L80980208: -/* 02B98 80980208 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098020C: -/* 02B9C 8098020C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02BA0 80980210 03E00008 */ jr $ra -/* 02BA4 80980214 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s deleted file mode 100644 index 5bfa1abf86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80980218 -/* 02BA8 80980218 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02BAC 8098021C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BB0 80980220 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02BB4 80980224 284103E6 */ slti $at, $v0, 0x03E6 -/* 02BB8 80980228 1420001C */ bne $at, $zero, .L8098029C -/* 02BBC 8098022C 284103E9 */ slti $at, $v0, 0x03E9 -/* 02BC0 80980230 5020001B */ beql $at, $zero, .L809802A0 -/* 02BC4 80980234 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02BC8 80980238 C4840008 */ lwc1 $f4, 0x0008($a0) ## 00000008 -/* 02BCC 8098023C 3C014218 */ lui $at, 0x4218 ## $at = 42180000 -/* 02BD0 80980240 44814000 */ mtc1 $at, $f8 ## $f8 = 38.00 -/* 02BD4 80980244 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 02BD8 80980248 C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C -/* 02BDC 8098024C 3C038098 */ lui $v1, %hi(D_80982660) ## $v1 = 80980000 -/* 02BE0 80980250 8C632660 */ lw $v1, %lo(D_80982660)($v1) -/* 02BE4 80980254 46083280 */ add.s $f10, $f6, $f8 -/* 02BE8 80980258 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02BEC 8098025C C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 02BF0 80980260 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 02BF4 80980264 C4900010 */ lwc1 $f16, 0x0010($a0) ## 00000010 -/* 02BF8 80980268 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02BFC 8098026C 14600006 */ bne $v1, $zero, .L80980288 -/* 02C00 80980270 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 02C04 80980274 0C25F659 */ jal func_8097D964 -/* 02C08 80980278 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFE4 -/* 02C0C 8098027C 3C018098 */ lui $at, %hi(D_80982660) ## $at = 80980000 -/* 02C10 80980280 10000006 */ beq $zero, $zero, .L8098029C -/* 02C14 80980284 AC222660 */ sw $v0, %lo(D_80982660)($at) -.L80980288: -/* 02C18 80980288 E4720024 */ swc1 $f18, 0x0024($v1) ## 00000024 -/* 02C1C 8098028C C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 02C20 80980290 E4640028 */ swc1 $f4, 0x0028($v1) ## 00000028 -/* 02C24 80980294 C7A6002C */ lwc1 $f6, 0x002C($sp) -/* 02C28 80980298 E466002C */ swc1 $f6, 0x002C($v1) ## 0000002C -.L8098029C: -/* 02C2C 8098029C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809802A0: -/* 02C30 809802A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02C34 809802A4 03E00008 */ jr $ra -/* 02C38 809802A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s deleted file mode 100644 index 311bbcf5c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -glabel D_80982AE4 - .float 1260.0 - -glabel D_80982AE8 - .float 323.0 - -.text -glabel func_809802AC -/* 02C3C 809802AC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02C40 809802B0 3C0F8098 */ lui $t7, %hi(D_80982664) ## $t7 = 80980000 -/* 02C44 809802B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02C48 809802B8 AFA40068 */ sw $a0, 0x0068($sp) -/* 02C4C 809802BC AFA5006C */ sw $a1, 0x006C($sp) -/* 02C50 809802C0 25EF2664 */ addiu $t7, $t7, %lo(D_80982664) ## $t7 = 80982664 -/* 02C54 809802C4 8DF90000 */ lw $t9, 0x0000($t7) ## 80982664 -/* 02C58 809802C8 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02C5C 809802CC 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 02C60 809802D0 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 02C64 809802D4 8DF80004 */ lw $t8, 0x0004($t7) ## 80982668 -/* 02C68 809802D8 2841006E */ slti $at, $v0, 0x006E -/* 02C6C 809802DC ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 02C70 809802E0 8DF90008 */ lw $t9, 0x0008($t7) ## 8098266C -/* 02C74 809802E4 1420001D */ bne $at, $zero, .L8098035C -/* 02C78 809802E8 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02C7C 809802EC 2841008C */ slti $at, $v0, 0x008C -/* 02C80 809802F0 1020001A */ beq $at, $zero, .L8098035C -/* 02C84 809802F4 8FA20068 */ lw $v0, 0x0068($sp) -/* 02C88 809802F8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02C8C 809802FC 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 02C90 80980300 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02C94 80980304 3C018098 */ lui $at, %hi(D_80982AE4) ## $at = 80980000 -/* 02C98 80980308 C4302AE4 */ lwc1 $f16, %lo(D_80982AE4)($at) -/* 02C9C 8098030C 46062201 */ sub.s $f8, $f4, $f6 -/* 02CA0 80980310 3C018098 */ lui $at, %hi(D_80982AE8) ## $at = 80980000 -/* 02CA4 80980314 C4262AE8 */ lwc1 $f6, %lo(D_80982AE8)($at) -/* 02CA8 80980318 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 02CAC 8098031C E7A80050 */ swc1 $f8, 0x0050($sp) -/* 02CB0 80980320 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 02CB4 80980324 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 02CB8 80980328 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 02CBC 8098032C 46105480 */ add.s $f18, $f10, $f16 -/* 02CC0 80980330 8FA4006C */ lw $a0, 0x006C($sp) -/* 02CC4 80980334 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 02CC8 80980338 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 02CCC 8098033C E7B20054 */ swc1 $f18, 0x0054($sp) -/* 02CD0 80980340 C4440008 */ lwc1 $f4, 0x0008($v0) ## 0000002C -/* 02CD4 80980344 AFA90018 */ sw $t1, 0x0018($sp) -/* 02CD8 80980348 AFA00014 */ sw $zero, 0x0014($sp) -/* 02CDC 8098034C 46062201 */ sub.s $f8, $f4, $f6 -/* 02CE0 80980350 AFA80010 */ sw $t0, 0x0010($sp) -/* 02CE4 80980354 0C25F5F6 */ jal func_8097D7D8 -/* 02CE8 80980358 E7A80058 */ swc1 $f8, 0x0058($sp) -.L8098035C: -/* 02CEC 8098035C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02CF0 80980360 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02CF4 80980364 03E00008 */ jr $ra -/* 02CF8 80980368 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s deleted file mode 100644 index ce57ddfc3c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_8098036C -/* 02CFC 8098036C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02D00 80980370 3C0F8098 */ lui $t7, %hi(D_80982670) ## $t7 = 80980000 -/* 02D04 80980374 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02D08 80980378 AFA40068 */ sw $a0, 0x0068($sp) -/* 02D0C 8098037C AFA5006C */ sw $a1, 0x006C($sp) -/* 02D10 80980380 25EF2670 */ addiu $t7, $t7, %lo(D_80982670) ## $t7 = 80982670 -/* 02D14 80980384 8DF90000 */ lw $t9, 0x0000($t7) ## 80982670 -/* 02D18 80980388 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02D1C 8098038C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 02D20 80980390 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 02D24 80980394 8DF80004 */ lw $t8, 0x0004($t7) ## 80982674 -/* 02D28 80980398 2841011D */ slti $at, $v0, 0x011D -/* 02D2C 8098039C ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 02D30 809803A0 8DF90008 */ lw $t9, 0x0008($t7) ## 80982678 -/* 02D34 809803A4 1420001E */ bne $at, $zero, .L80980420 -/* 02D38 809803A8 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02D3C 809803AC 284101A5 */ slti $at, $v0, 0x01A5 -/* 02D40 809803B0 1020001B */ beq $at, $zero, .L80980420 -/* 02D44 809803B4 8FA20068 */ lw $v0, 0x0068($sp) -/* 02D48 809803B8 3C01443E */ lui $at, 0x443E ## $at = 443E0000 -/* 02D4C 809803BC 44813000 */ mtc1 $at, $f6 ## $f6 = 760.00 -/* 02D50 809803C0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02D54 809803C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 02D58 809803C8 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 02D5C 809803CC 46062200 */ add.s $f8, $f4, $f6 -/* 02D60 809803D0 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 02D64 809803D4 44813000 */ mtc1 $at, $f6 ## $f6 = 240.00 -/* 02D68 809803D8 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 -/* 02D6C 809803DC E7A80050 */ swc1 $f8, 0x0050($sp) -/* 02D70 809803E0 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 02D74 809803E4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02D78 809803E8 240A0023 */ addiu $t2, $zero, 0x0023 ## $t2 = 00000023 -/* 02D7C 809803EC 46105481 */ sub.s $f18, $f10, $f16 -/* 02D80 809803F0 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 02D84 809803F4 8FA4006C */ lw $a0, 0x006C($sp) -/* 02D88 809803F8 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 02D8C 809803FC E7B20054 */ swc1 $f18, 0x0054($sp) -/* 02D90 80980400 C4440008 */ lwc1 $f4, 0x0008($v0) ## 0000002C -/* 02D94 80980404 AFAA0018 */ sw $t2, 0x0018($sp) -/* 02D98 80980408 AFA90014 */ sw $t1, 0x0014($sp) -/* 02D9C 8098040C 46062201 */ sub.s $f8, $f4, $f6 -/* 02DA0 80980410 AFA80010 */ sw $t0, 0x0010($sp) -/* 02DA4 80980414 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 02DA8 80980418 0C25F5F6 */ jal func_8097D7D8 -/* 02DAC 8098041C E7A80058 */ swc1 $f8, 0x0058($sp) -.L80980420: -/* 02DB0 80980420 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02DB4 80980424 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02DB8 80980428 03E00008 */ jr $ra -/* 02DBC 8098042C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s deleted file mode 100644 index ddd0aa7d49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80980430 -/* 02DC0 80980430 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02DC4 80980434 3C0F8098 */ lui $t7, %hi(D_8098267C) ## $t7 = 80980000 -/* 02DC8 80980438 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02DCC 8098043C AFA40068 */ sw $a0, 0x0068($sp) -/* 02DD0 80980440 AFA5006C */ sw $a1, 0x006C($sp) -/* 02DD4 80980444 25EF267C */ addiu $t7, $t7, %lo(D_8098267C) ## $t7 = 8098267C -/* 02DD8 80980448 8DF90000 */ lw $t9, 0x0000($t7) ## 8098267C -/* 02DDC 8098044C 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02DE0 80980450 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 02DE4 80980454 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 02DE8 80980458 8DF80004 */ lw $t8, 0x0004($t7) ## 80982680 -/* 02DEC 8098045C 284102C6 */ slti $at, $v0, 0x02C6 -/* 02DF0 80980460 3C088016 */ lui $t0, %hi(gGameInfo) -/* 02DF4 80980464 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 02DF8 80980468 8DF90008 */ lw $t9, 0x0008($t7) ## 80982684 -/* 02DFC 8098046C 10200006 */ beq $at, $zero, .L80980488 -/* 02E00 80980470 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02E04 80980474 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 02E08 80980478 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02E0C 8098047C 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 02E10 80980480 5521001D */ bnel $t1, $at, .L809804F8 -/* 02E14 80980484 8FBF0024 */ lw $ra, 0x0024($sp) -.L80980488: -/* 02E18 80980488 8FA20068 */ lw $v0, 0x0068($sp) -/* 02E1C 8098048C 3C01443E */ lui $at, 0x443E ## $at = 443E0000 -/* 02E20 80980490 44813000 */ mtc1 $at, $f6 ## $f6 = 760.00 -/* 02E24 80980494 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02E28 80980498 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 02E2C 8098049C 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 02E30 809804A0 46062200 */ add.s $f8, $f4, $f6 -/* 02E34 809804A4 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 02E38 809804A8 44813000 */ mtc1 $at, $f6 ## $f6 = 240.00 -/* 02E3C 809804AC 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 02E40 809804B0 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 02E44 809804B4 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 02E48 809804B8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02E4C 809804BC 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 02E50 809804C0 46105481 */ sub.s $f18, $f10, $f16 -/* 02E54 809804C4 8FA4006C */ lw $a0, 0x006C($sp) -/* 02E58 809804C8 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 02E5C 809804CC 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 02E60 809804D0 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 02E64 809804D4 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 02E68 809804D8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02E6C 809804DC AFAB0014 */ sw $t3, 0x0014($sp) -/* 02E70 809804E0 46062201 */ sub.s $f8, $f4, $f6 -/* 02E74 809804E4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02E78 809804E8 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 02E7C 809804EC 0C25F5F6 */ jal func_8097D7D8 -/* 02E80 809804F0 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 02E84 809804F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809804F8: -/* 02E88 809804F8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02E8C 809804FC 03E00008 */ jr $ra -/* 02E90 80980500 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s deleted file mode 100644 index bd764eeeff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80982AEC - .float 830.0 - -.text -glabel func_80980504 -/* 02E94 80980504 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02E98 80980508 3C0F8098 */ lui $t7, %hi(D_80982688) ## $t7 = 80980000 -/* 02E9C 8098050C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02EA0 80980510 AFA40068 */ sw $a0, 0x0068($sp) -/* 02EA4 80980514 AFA5006C */ sw $a1, 0x006C($sp) -/* 02EA8 80980518 25EF2688 */ addiu $t7, $t7, %lo(D_80982688) ## $t7 = 80982688 -/* 02EAC 8098051C 8DF90000 */ lw $t9, 0x0000($t7) ## 80982688 -/* 02EB0 80980520 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02EB4 80980524 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 02EB8 80980528 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 02EBC 8098052C 8DF80004 */ lw $t8, 0x0004($t7) ## 8098268C -/* 02EC0 80980530 284102C1 */ slti $at, $v0, 0x02C1 -/* 02EC4 80980534 3C088016 */ lui $t0, %hi(gGameInfo) -/* 02EC8 80980538 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 02ECC 8098053C 8DF90008 */ lw $t9, 0x0008($t7) ## 80982690 -/* 02ED0 80980540 10200006 */ beq $at, $zero, .L8098055C -/* 02ED4 80980544 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02ED8 80980548 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 02EDC 8098054C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 02EE0 80980550 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 02EE4 80980554 5521001D */ bnel $t1, $at, .L809805CC -/* 02EE8 80980558 8FBF0024 */ lw $ra, 0x0024($sp) -.L8098055C: -/* 02EEC 8098055C 8FA20068 */ lw $v0, 0x0068($sp) -/* 02EF0 80980560 3C018098 */ lui $at, %hi(D_80982AEC) ## $at = 80980000 -/* 02EF4 80980564 C4262AEC */ lwc1 $f6, %lo(D_80982AEC)($at) -/* 02EF8 80980568 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02EFC 8098056C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02F00 80980570 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 02F04 80980574 46062200 */ add.s $f8, $f4, $f6 -/* 02F08 80980578 3C0143C3 */ lui $at, 0x43C3 ## $at = 43C30000 -/* 02F0C 8098057C 44813000 */ mtc1 $at, $f6 ## $f6 = 390.00 -/* 02F10 80980580 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 02F14 80980584 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 02F18 80980588 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 02F1C 8098058C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 02F20 80980590 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 02F24 80980594 46105480 */ add.s $f18, $f10, $f16 -/* 02F28 80980598 8FA4006C */ lw $a0, 0x006C($sp) -/* 02F2C 8098059C 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 02F30 809805A0 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 02F34 809805A4 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 02F38 809805A8 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 02F3C 809805AC AFAC0018 */ sw $t4, 0x0018($sp) -/* 02F40 809805B0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 02F44 809805B4 46062200 */ add.s $f8, $f4, $f6 -/* 02F48 809805B8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02F4C 809805BC 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 02F50 809805C0 0C25F5F6 */ jal func_8097D7D8 -/* 02F54 809805C4 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 02F58 809805C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809805CC: -/* 02F5C 809805CC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02F60 809805D0 03E00008 */ jr $ra -/* 02F64 809805D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s deleted file mode 100644 index bbad581d95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s +++ /dev/null @@ -1,65 +0,0 @@ -.late_rodata -glabel D_80982AF0 - .float 550.0 - -.text -glabel func_809805D8 -/* 02F68 809805D8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02F6C 809805DC 3C0F8098 */ lui $t7, %hi(D_80982694) ## $t7 = 80980000 -/* 02F70 809805E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02F74 809805E4 AFA40068 */ sw $a0, 0x0068($sp) -/* 02F78 809805E8 AFA5006C */ sw $a1, 0x006C($sp) -/* 02F7C 809805EC 25EF2694 */ addiu $t7, $t7, %lo(D_80982694) ## $t7 = 80982694 -/* 02F80 809805F0 8DF90000 */ lw $t9, 0x0000($t7) ## 80982694 -/* 02F84 809805F4 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02F88 809805F8 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 02F8C 809805FC ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 02F90 80980600 8DF80004 */ lw $t8, 0x0004($t7) ## 80982698 -/* 02F94 80980604 284102E4 */ slti $at, $v0, 0x02E4 -/* 02F98 80980608 3C088016 */ lui $t0, %hi(gGameInfo) -/* 02F9C 8098060C ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 02FA0 80980610 8DF90008 */ lw $t9, 0x0008($t7) ## 8098269C -/* 02FA4 80980614 14200004 */ bne $at, $zero, .L80980628 -/* 02FA8 80980618 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 02FAC 8098061C 2841030D */ slti $at, $v0, 0x030D -/* 02FB0 80980620 54200007 */ bnel $at, $zero, .L80980640 -/* 02FB4 80980624 8FA20068 */ lw $v0, 0x0068($sp) -.L80980628: -/* 02FB8 80980628 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 02FBC 8098062C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 02FC0 80980630 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 02FC4 80980634 5521001D */ bnel $t1, $at, .L809806AC -/* 02FC8 80980638 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02FCC 8098063C 8FA20068 */ lw $v0, 0x0068($sp) -.L80980640: -/* 02FD0 80980640 3C018098 */ lui $at, %hi(D_80982AF0) ## $at = 80980000 -/* 02FD4 80980644 C4262AF0 */ lwc1 $f6, %lo(D_80982AF0)($at) -/* 02FD8 80980648 C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000008 -/* 02FDC 8098064C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 02FE0 80980650 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 -/* 02FE4 80980654 46062200 */ add.s $f8, $f4, $f6 -/* 02FE8 80980658 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02FEC 8098065C 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 02FF0 80980660 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 02FF4 80980664 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 02FF8 80980668 C44A000C */ lwc1 $f10, 0x000C($v0) ## 0000000C -/* 02FFC 8098066C 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 03000 80980670 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 03004 80980674 46105481 */ sub.s $f18, $f10, $f16 -/* 03008 80980678 8FA4006C */ lw $a0, 0x006C($sp) -/* 0300C 8098067C 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 03010 80980680 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 03014 80980684 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 03018 80980688 C4440010 */ lwc1 $f4, 0x0010($v0) ## 00000010 -/* 0301C 8098068C AFAC0018 */ sw $t4, 0x0018($sp) -/* 03020 80980690 AFAB0014 */ sw $t3, 0x0014($sp) -/* 03024 80980694 46062200 */ add.s $f8, $f4, $f6 -/* 03028 80980698 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0302C 8098069C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000008 -/* 03030 809806A0 0C25F5F6 */ jal func_8097D7D8 -/* 03034 809806A4 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 03038 809806A8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809806AC: -/* 0303C 809806AC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 03040 809806B0 03E00008 */ jr $ra -/* 03044 809806B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s deleted file mode 100644 index bd3597718b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_809806B8 -/* 03048 809806B8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0304C 809806BC 3C0F8098 */ lui $t7, %hi(D_809826A0) ## $t7 = 80980000 -/* 03050 809806C0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03054 809806C4 AFA40068 */ sw $a0, 0x0068($sp) -/* 03058 809806C8 AFA5006C */ sw $a1, 0x006C($sp) -/* 0305C 809806CC 25EF26A0 */ addiu $t7, $t7, %lo(D_809826A0) ## $t7 = 809826A0 -/* 03060 809806D0 8DF90000 */ lw $t9, 0x0000($t7) ## 809826A0 -/* 03064 809806D4 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03068 809806D8 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 0306C 809806DC ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 03070 809806E0 8DF80004 */ lw $t8, 0x0004($t7) ## 809826A4 -/* 03074 809806E4 284103C5 */ slti $at, $v0, 0x03C5 -/* 03078 809806E8 3C088016 */ lui $t0, %hi(gGameInfo) -/* 0307C 809806EC ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 03080 809806F0 8DF90008 */ lw $t9, 0x0008($t7) ## 809826A8 -/* 03084 809806F4 10200006 */ beq $at, $zero, .L80980710 -/* 03088 809806F8 ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 0308C 809806FC 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 03090 80980700 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 03094 80980704 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 03098 80980708 5521001D */ bnel $t1, $at, .L80980780 -/* 0309C 8098070C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80980710: -/* 030A0 80980710 8FA20068 */ lw $v0, 0x0068($sp) -/* 030A4 80980714 3C0143E6 */ lui $at, 0x43E6 ## $at = 43E60000 -/* 030A8 80980718 44813000 */ mtc1 $at, $f6 ## $f6 = 460.00 -/* 030AC 8098071C C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 030B0 80980720 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 030B4 80980724 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 030B8 80980728 46062200 */ add.s $f8, $f4, $f6 -/* 030BC 8098072C 3C01443E */ lui $at, 0x443E ## $at = 443E0000 -/* 030C0 80980730 44813000 */ mtc1 $at, $f6 ## $f6 = 760.00 -/* 030C4 80980734 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 030C8 80980738 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 030CC 8098073C C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 030D0 80980740 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 030D4 80980744 240C0023 */ addiu $t4, $zero, 0x0023 ## $t4 = 00000023 -/* 030D8 80980748 46105480 */ add.s $f18, $f10, $f16 -/* 030DC 8098074C 8FA4006C */ lw $a0, 0x006C($sp) -/* 030E0 80980750 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 030E4 80980754 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 030E8 80980758 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 030EC 8098075C C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 030F0 80980760 AFAC0018 */ sw $t4, 0x0018($sp) -/* 030F4 80980764 AFAB0014 */ sw $t3, 0x0014($sp) -/* 030F8 80980768 46062200 */ add.s $f8, $f4, $f6 -/* 030FC 8098076C AFAA0010 */ sw $t2, 0x0010($sp) -/* 03100 80980770 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 03104 80980774 0C25F5F6 */ jal func_8097D7D8 -/* 03108 80980778 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 0310C 8098077C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80980780: -/* 03110 80980780 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 03114 80980784 03E00008 */ jr $ra -/* 03118 80980788 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s deleted file mode 100644 index 2a49a05bbe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_8098078C -/* 0311C 8098078C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03120 80980790 3C0F8098 */ lui $t7, %hi(D_809826AC) ## $t7 = 80980000 -/* 03124 80980794 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03128 80980798 AFA40068 */ sw $a0, 0x0068($sp) -/* 0312C 8098079C AFA5006C */ sw $a1, 0x006C($sp) -/* 03130 809807A0 25EF26AC */ addiu $t7, $t7, %lo(D_809826AC) ## $t7 = 809826AC -/* 03134 809807A4 8DF90000 */ lw $t9, 0x0000($t7) ## 809826AC -/* 03138 809807A8 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 0313C 809807AC 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFD4 -/* 03140 809807B0 ACD90000 */ sw $t9, 0x0000($a2) ## FFFFFFD4 -/* 03144 809807B4 8DF80004 */ lw $t8, 0x0004($t7) ## 809826B0 -/* 03148 809807B8 284103AC */ slti $at, $v0, 0x03AC -/* 0314C 809807BC 3C088016 */ lui $t0, %hi(gGameInfo) -/* 03150 809807C0 ACD80004 */ sw $t8, 0x0004($a2) ## FFFFFFD8 -/* 03154 809807C4 8DF90008 */ lw $t9, 0x0008($t7) ## 809826B4 -/* 03158 809807C8 10200006 */ beq $at, $zero, .L809807E4 -/* 0315C 809807CC ACD90008 */ sw $t9, 0x0008($a2) ## FFFFFFDC -/* 03160 809807D0 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 03164 809807D4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 03168 809807D8 85091456 */ lh $t1, 0x1456($t0) ## 80161456 -/* 0316C 809807DC 5521001C */ bnel $t1, $at, .L80980850 -/* 03170 809807E0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809807E4: -/* 03174 809807E4 8FA20068 */ lw $v0, 0x0068($sp) -/* 03178 809807E8 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 -/* 0317C 809807EC 44813000 */ mtc1 $at, $f6 ## $f6 = 360.00 -/* 03180 809807F0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 03184 809807F4 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 03188 809807F8 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00 -/* 0318C 809807FC 46062200 */ add.s $f8, $f4, $f6 -/* 03190 80980800 3C014420 */ lui $at, 0x4420 ## $at = 44200000 -/* 03194 80980804 44813000 */ mtc1 $at, $f6 ## $f6 = 640.00 -/* 03198 80980808 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 0319C 8098080C E7A80050 */ swc1 $f8, 0x0050($sp) -/* 031A0 80980810 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 031A4 80980814 240B0023 */ addiu $t3, $zero, 0x0023 ## $t3 = 00000023 -/* 031A8 80980818 8FA4006C */ lw $a0, 0x006C($sp) -/* 031AC 8098081C 46105480 */ add.s $f18, $f10, $f16 -/* 031B0 80980820 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 031B4 80980824 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 031B8 80980828 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 031BC 8098082C E7B20054 */ swc1 $f18, 0x0054($sp) -/* 031C0 80980830 C4440008 */ lwc1 $f4, 0x0008($v0) ## 0000002C -/* 031C4 80980834 AFAB0018 */ sw $t3, 0x0018($sp) -/* 031C8 80980838 AFA00014 */ sw $zero, 0x0014($sp) -/* 031CC 8098083C 46062201 */ sub.s $f8, $f4, $f6 -/* 031D0 80980840 AFAA0010 */ sw $t2, 0x0010($sp) -/* 031D4 80980844 0C25F5F6 */ jal func_8097D7D8 -/* 031D8 80980848 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 031DC 8098084C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80980850: -/* 031E0 80980850 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 031E4 80980854 03E00008 */ jr $ra -/* 031E8 80980858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s deleted file mode 100644 index df3728edb9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s +++ /dev/null @@ -1,106 +0,0 @@ -.late_rodata -glabel D_80982AF4 - .float 810.0 - -glabel D_80982AF8 - .float 1350.0 - -glabel D_80982AFC - .float 287.0 - -.text -glabel func_8098085C -/* 031EC 8098085C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 031F0 80980860 AFBF0014 */ sw $ra, 0x0014($sp) -/* 031F4 80980864 AFA40040 */ sw $a0, 0x0040($sp) -/* 031F8 80980868 94A31D74 */ lhu $v1, 0x1D74($a1) ## 00001D74 -/* 031FC 8098086C 2401003A */ addiu $at, $zero, 0x003A ## $at = 0000003A -/* 03200 80980870 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 03204 80980874 10610006 */ beq $v1, $at, .L80980890 -/* 03208 80980878 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0320C 8098087C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 03210 80980880 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03214 80980884 85CF1456 */ lh $t7, 0x1456($t6) ## 80161456 -/* 03218 80980888 55E10019 */ bnel $t7, $at, .L809808F0 -/* 0321C 8098088C 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -.L80980890: -/* 03220 80980890 8FA20040 */ lw $v0, 0x0040($sp) -/* 03224 80980894 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 03228 80980898 44813000 */ mtc1 $at, $f6 ## $f6 = 900.00 -/* 0322C 8098089C C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 03230 809808A0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03234 809808A4 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 03238 809808A8 46062200 */ add.s $f8, $f4, $f6 -/* 0323C 809808AC 3C0142BA */ lui $at, 0x42BA ## $at = 42BA0000 -/* 03240 809808B0 44813000 */ mtc1 $at, $f6 ## $f6 = 93.00 -/* 03244 809808B4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03248 809808B8 E7A80028 */ swc1 $f8, 0x0028($sp) -/* 0324C 809808BC C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 03250 809808C0 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 03254 809808C4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 03258 809808C8 46105481 */ sub.s $f18, $f10, $f16 -/* 0325C 809808CC 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 03260 809808D0 E7B2002C */ swc1 $f18, 0x002C($sp) -/* 03264 809808D4 C4440008 */ lwc1 $f4, 0x0008($v0) ## 0000002C -/* 03268 809808D8 46062200 */ add.s $f8, $f4, $f6 -/* 0326C 809808DC 0C25F671 */ jal func_8097D9C4 -/* 03270 809808E0 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 03274 809808E4 10000033 */ beq $zero, $zero, .L809809B4 -/* 03278 809808E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0327C 809808EC 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -.L809808F0: -/* 03280 809808F0 14610018 */ bne $v1, $at, .L80980954 -/* 03284 809808F4 8FA20040 */ lw $v0, 0x0040($sp) -/* 03288 809808F8 3C018098 */ lui $at, %hi(D_80982AF4) ## $at = 80980000 -/* 0328C 809808FC C4302AF4 */ lwc1 $f16, %lo(D_80982AF4)($at) -/* 03290 80980900 C44A0024 */ lwc1 $f10, 0x0024($v0) ## 00000024 -/* 03294 80980904 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 03298 80980908 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 0329C 8098090C 46105480 */ add.s $f18, $f10, $f16 -/* 032A0 80980910 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -/* 032A4 80980914 44818000 */ mtc1 $at, $f16 ## $f16 = 37.00 -/* 032A8 80980918 3C063F66 */ lui $a2, 0x3F66 ## $a2 = 3F660000 -/* 032AC 8098091C E7B20028 */ swc1 $f18, 0x0028($sp) -/* 032B0 80980920 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 032B4 80980924 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 032B8 80980928 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3F666666 -/* 032BC 8098092C 46062200 */ add.s $f8, $f4, $f6 -/* 032C0 80980930 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 032C4 80980934 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 032C8 80980938 E7A8002C */ swc1 $f8, 0x002C($sp) -/* 032CC 8098093C C44A0008 */ lwc1 $f10, 0x0008($v0) ## 0000002C -/* 032D0 80980940 46105481 */ sub.s $f18, $f10, $f16 -/* 032D4 80980944 0C25F671 */ jal func_8097D9C4 -/* 032D8 80980948 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 032DC 8098094C 10000019 */ beq $zero, $zero, .L809809B4 -/* 032E0 80980950 8FBF0014 */ lw $ra, 0x0014($sp) -.L80980954: -/* 032E4 80980954 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 032E8 80980958 14610015 */ bne $v1, $at, .L809809B0 -/* 032EC 8098095C 8FA20040 */ lw $v0, 0x0040($sp) -/* 032F0 80980960 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 032F4 80980964 44813000 */ mtc1 $at, $f6 ## $f6 = 220.00 -/* 032F8 80980968 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 032FC 8098096C 3C018098 */ lui $at, %hi(D_80982AF8) ## $at = 80980000 -/* 03300 80980970 C4302AF8 */ lwc1 $f16, %lo(D_80982AF8)($at) -/* 03304 80980974 46062201 */ sub.s $f8, $f4, $f6 -/* 03308 80980978 3C018098 */ lui $at, %hi(D_80982AFC) ## $at = 80980000 -/* 0330C 8098097C C4262AFC */ lwc1 $f6, %lo(D_80982AFC)($at) -/* 03310 80980980 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 03314 80980984 E7A80028 */ swc1 $f8, 0x0028($sp) -/* 03318 80980988 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000028 -/* 0331C 8098098C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03320 80980990 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 03324 80980994 46105480 */ add.s $f18, $f10, $f16 -/* 03328 80980998 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 0332C 8098099C E7B2002C */ swc1 $f18, 0x002C($sp) -/* 03330 809809A0 C4440008 */ lwc1 $f4, 0x0008($v0) ## 0000002C -/* 03334 809809A4 46062201 */ sub.s $f8, $f4, $f6 -/* 03338 809809A8 0C25F671 */ jal func_8097D9C4 -/* 0333C 809809AC E7A80030 */ swc1 $f8, 0x0030($sp) -.L809809B0: -/* 03340 809809B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809809B4: -/* 03344 809809B4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03348 809809B8 03E00008 */ jr $ra -/* 0334C 809809BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s deleted file mode 100644 index f7235be708..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s +++ /dev/null @@ -1,80 +0,0 @@ -.late_rodata -glabel D_80982B00 - .float 790.0 - -.text -glabel func_809809C0 -/* 03350 809809C0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03354 809809C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03358 809809C8 AFA50074 */ sw $a1, 0x0074($sp) -/* 0335C 809809CC 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03360 809809D0 3C060001 */ lui $a2, 0x0001 ## $a2 = 00010000 -/* 03364 809809D4 00C53021 */ addu $a2, $a2, $a1 -/* 03368 809809D8 284101D6 */ slti $at, $v0, 0x01D6 -/* 0336C 809809DC 14200003 */ bne $at, $zero, .L809809EC -/* 03370 809809E0 8CC61DE4 */ lw $a2, 0x1DE4($a2) ## 00011DE4 -/* 03374 809809E4 284101E1 */ slti $at, $v0, 0x01E1 -/* 03378 809809E8 14200005 */ bne $at, $zero, .L80980A00 -.L809809EC: -/* 0337C 809809EC 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 03380 809809F0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 03384 809809F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03388 809809F8 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 -/* 0338C 809809FC 17010031 */ bne $t8, $at, .L80980AC4 -.L80980A00: -/* 03390 80980A00 3C088098 */ lui $t0, %hi(D_809826B8) ## $t0 = 80980000 -/* 03394 80980A04 250826B8 */ addiu $t0, $t0, %lo(D_809826B8) ## $t0 = 809826B8 -/* 03398 80980A08 8D0A0000 */ lw $t2, 0x0000($t0) ## 809826B8 -/* 0339C 80980A0C 27B90040 */ addiu $t9, $sp, 0x0040 ## $t9 = FFFFFFD0 -/* 033A0 80980A10 8D090004 */ lw $t1, 0x0004($t0) ## 809826BC -/* 033A4 80980A14 AF2A0000 */ sw $t2, 0x0000($t9) ## FFFFFFD0 -/* 033A8 80980A18 8D0A0008 */ lw $t2, 0x0008($t0) ## 809826C0 -/* 033AC 80980A1C 3C0B8098 */ lui $t3, %hi(D_809826C4) ## $t3 = 80980000 -/* 033B0 80980A20 256B26C4 */ addiu $t3, $t3, %lo(D_809826C4) ## $t3 = 809826C4 -/* 033B4 80980A24 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFFD4 -/* 033B8 80980A28 AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFFD8 -/* 033BC 80980A2C 8D6D0000 */ lw $t5, 0x0000($t3) ## 809826C4 -/* 033C0 80980A30 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFC4 -/* 033C4 80980A34 3C018098 */ lui $at, %hi(D_80982B00) ## $at = 80980000 -/* 033C8 80980A38 ACED0000 */ sw $t5, 0x0000($a3) ## FFFFFFC4 -/* 033CC 80980A3C 8D6C0004 */ lw $t4, 0x0004($t3) ## 809826C8 -/* 033D0 80980A40 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFE4 -/* 033D4 80980A44 ACEC0004 */ sw $t4, 0x0004($a3) ## FFFFFFC8 -/* 033D8 80980A48 8D6D0008 */ lw $t5, 0x0008($t3) ## 809826CC -/* 033DC 80980A4C ACED0008 */ sw $t5, 0x0008($a3) ## FFFFFFCC -/* 033E0 80980A50 C4262B00 */ lwc1 $f6, %lo(D_80982B00)($at) -/* 033E4 80980A54 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 033E8 80980A58 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 033EC 80980A5C 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 033F0 80980A60 46062200 */ add.s $f8, $f4, $f6 -/* 033F4 80980A64 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 033F8 80980A68 44813000 */ mtc1 $at, $f6 ## $f6 = 23.00 -/* 033FC 80980A6C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 03400 80980A70 00C1001A */ div $zero, $a2, $at -/* 03404 80980A74 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 03408 80980A78 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 0340C 80980A7C 00001010 */ mfhi $v0 -/* 03410 80980A80 00021823 */ subu $v1, $zero, $v0 -/* 03414 80980A84 46105480 */ add.s $f18, $f10, $f16 -/* 03418 80980A88 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0341C 80980A8C E7B20058 */ swc1 $f18, 0x0058($sp) -/* 03420 80980A90 C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 03424 80980A94 8FA40074 */ lw $a0, 0x0074($sp) -/* 03428 80980A98 46062200 */ add.s $f8, $f4, $f6 -/* 0342C 80980A9C 04400003 */ bltz $v0, .L80980AAC -/* 03430 80980AA0 E7A8005C */ swc1 $f8, 0x005C($sp) -/* 03434 80980AA4 10000001 */ beq $zero, $zero, .L80980AAC -/* 03438 80980AA8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80980AAC: -/* 0343C 80980AAC 54600006 */ bnel $v1, $zero, .L80980AC8 -/* 03440 80980AB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03444 80980AB4 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 03448 80980AB8 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFD0 -/* 0344C 80980ABC 0C25F69E */ jal func_8097DA78 -/* 03450 80980AC0 E7AA0010 */ swc1 $f10, 0x0010($sp) -.L80980AC4: -/* 03454 80980AC4 8FBF001C */ lw $ra, 0x001C($sp) -.L80980AC8: -/* 03458 80980AC8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 0345C 80980ACC 03E00008 */ jr $ra -/* 03460 80980AD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s deleted file mode 100644 index 5a2beb3726..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_80982B04 - .float 790.0 - -.text -glabel func_80980AD4 -/* 03464 80980AD4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03468 80980AD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0346C 80980ADC 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03470 80980AE0 240101DD */ addiu $at, $zero, 0x01DD ## $at = 000001DD -/* 03474 80980AE4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 03478 80980AE8 10410005 */ beq $v0, $at, .L80980B00 -/* 0347C 80980AEC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 03480 80980AF0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 03484 80980AF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03488 80980AF8 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 0348C 80980AFC 15E10016 */ bne $t7, $at, .L80980B58 -.L80980B00: -/* 03490 80980B00 3C018098 */ lui $at, %hi(D_80982B04) ## $at = 80980000 -/* 03494 80980B04 C4262B04 */ lwc1 $f6, %lo(D_80982B04)($at) -/* 03498 80980B08 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0349C 80980B0C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 034A0 80980B10 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 034A4 80980B14 46062200 */ add.s $f8, $f4, $f6 -/* 034A8 80980B18 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 034AC 80980B1C 44813000 */ mtc1 $at, $f6 ## $f6 = 23.00 -/* 034B0 80980B20 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 034B4 80980B24 E7A8001C */ swc1 $f8, 0x001C($sp) -/* 034B8 80980B28 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 034BC 80980B2C 27A6001C */ addiu $a2, $sp, 0x001C ## $a2 = FFFFFFE4 -/* 034C0 80980B30 46105480 */ add.s $f18, $f10, $f16 -/* 034C4 80980B34 E7B20020 */ swc1 $f18, 0x0020($sp) -/* 034C8 80980B38 C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 034CC 80980B3C AFA7003C */ sw $a3, 0x003C($sp) -/* 034D0 80980B40 46062200 */ add.s $f8, $f4, $f6 -/* 034D4 80980B44 0C25F6B2 */ jal func_8097DAC8 -/* 034D8 80980B48 E7A80024 */ swc1 $f8, 0x0024($sp) -/* 034DC 80980B4C 8FA4003C */ lw $a0, 0x003C($sp) -/* 034E0 80980B50 0C25F5BE */ jal func_8097D6F8 -/* 034E4 80980B54 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFE4 -.L80980B58: -/* 034E8 80980B58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 034EC 80980B5C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 034F0 80980B60 03E00008 */ jr $ra -/* 034F4 80980B64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s deleted file mode 100644 index 58b8c9f35e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80980B68 -/* 034F8 80980B68 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 034FC 80980B6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03500 80980B70 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03504 80980B74 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 03508 80980B78 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0350C 80980B7C 10410005 */ beq $v0, $at, .L80980B94 -/* 03510 80980B80 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 03514 80980B84 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 03518 80980B88 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0351C 80980B8C 85CF145A */ lh $t7, 0x145A($t6) ## 8016145A -/* 03520 80980B90 15E10016 */ bne $t7, $at, .L80980BEC -.L80980B94: -/* 03524 80980B94 3C014475 */ lui $at, 0x4475 ## $at = 44750000 -/* 03528 80980B98 44813000 */ mtc1 $at, $f6 ## $f6 = 980.00 -/* 0352C 80980B9C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 03530 80980BA0 3C0143CD */ lui $at, 0x43CD ## $at = 43CD0000 -/* 03534 80980BA4 44818000 */ mtc1 $at, $f16 ## $f16 = 410.00 -/* 03538 80980BA8 46062200 */ add.s $f8, $f4, $f6 -/* 0353C 80980BAC 3C014331 */ lui $at, 0x4331 ## $at = 43310000 -/* 03540 80980BB0 44813000 */ mtc1 $at, $f6 ## $f6 = 177.00 -/* 03544 80980BB4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 03548 80980BB8 E7A8001C */ swc1 $f8, 0x001C($sp) -/* 0354C 80980BBC C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 03550 80980BC0 27A6001C */ addiu $a2, $sp, 0x001C ## $a2 = FFFFFFE4 -/* 03554 80980BC4 46105480 */ add.s $f18, $f10, $f16 -/* 03558 80980BC8 E7B20020 */ swc1 $f18, 0x0020($sp) -/* 0355C 80980BCC C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 03560 80980BD0 AFA7003C */ sw $a3, 0x003C($sp) -/* 03564 80980BD4 46062201 */ sub.s $f8, $f4, $f6 -/* 03568 80980BD8 0C25F74A */ jal func_8097DD28 -/* 0356C 80980BDC E7A80024 */ swc1 $f8, 0x0024($sp) -/* 03570 80980BE0 8FA4003C */ lw $a0, 0x003C($sp) -/* 03574 80980BE4 0C25F5BE */ jal func_8097D6F8 -/* 03578 80980BE8 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFE4 -.L80980BEC: -/* 0357C 80980BEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03580 80980BF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03584 80980BF4 03E00008 */ jr $ra -/* 03588 80980BF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s deleted file mode 100644 index c7045a5de1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_80982B08 - .float 790.0 - -.text -glabel func_80980BFC -/* 0358C 80980BFC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03590 80980C00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03594 80980C04 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03598 80980C08 240102E4 */ addiu $at, $zero, 0x02E4 ## $at = 000002E4 -/* 0359C 80980C0C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 035A0 80980C10 10410005 */ beq $v0, $at, .L80980C28 -/* 035A4 80980C14 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 035A8 80980C18 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 035AC 80980C1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 035B0 80980C20 85CF145C */ lh $t7, 0x145C($t6) ## 8016145C -/* 035B4 80980C24 15E10016 */ bne $t7, $at, .L80980C80 -.L80980C28: -/* 035B8 80980C28 3C018098 */ lui $at, %hi(D_80982B08) ## $at = 80980000 -/* 035BC 80980C2C C4262B08 */ lwc1 $f6, %lo(D_80982B08)($at) -/* 035C0 80980C30 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 035C4 80980C34 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 035C8 80980C38 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 035CC 80980C3C 46062200 */ add.s $f8, $f4, $f6 -/* 035D0 80980C40 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 035D4 80980C44 44813000 */ mtc1 $at, $f6 ## $f6 = 23.00 -/* 035D8 80980C48 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 035DC 80980C4C E7A8001C */ swc1 $f8, 0x001C($sp) -/* 035E0 80980C50 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 035E4 80980C54 27A6001C */ addiu $a2, $sp, 0x001C ## $a2 = FFFFFFE4 -/* 035E8 80980C58 46105480 */ add.s $f18, $f10, $f16 -/* 035EC 80980C5C E7B20020 */ swc1 $f18, 0x0020($sp) -/* 035F0 80980C60 C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 035F4 80980C64 AFA7003C */ sw $a3, 0x003C($sp) -/* 035F8 80980C68 46062200 */ add.s $f8, $f4, $f6 -/* 035FC 80980C6C 0C25F7DC */ jal func_8097DF70 -/* 03600 80980C70 E7A80024 */ swc1 $f8, 0x0024($sp) -/* 03604 80980C74 8FA4003C */ lw $a0, 0x003C($sp) -/* 03608 80980C78 0C25F5BE */ jal func_8097D6F8 -/* 0360C 80980C7C 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFE4 -.L80980C80: -/* 03610 80980C80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03614 80980C84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03618 80980C88 03E00008 */ jr $ra -/* 0361C 80980C8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s deleted file mode 100644 index 763075aedb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80980C90 -/* 03620 80980C90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03624 80980C94 AFBF001C */ sw $ra, 0x001C($sp) -/* 03628 80980C98 AFB10018 */ sw $s1, 0x0018($sp) -/* 0362C 80980C9C AFB00014 */ sw $s0, 0x0014($sp) -/* 03630 80980CA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03634 80980CA4 0C26005B */ jal func_8098016C -/* 03638 80980CA8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0363C 80980CAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03640 80980CB0 0C26005E */ jal func_80980178 -/* 03644 80980CB4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03648 80980CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0364C 80980CBC 0C260061 */ jal func_80980184 -/* 03650 80980CC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03654 80980CC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03658 80980CC8 0C260086 */ jal func_80980218 -/* 0365C 80980CCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03660 80980CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03664 80980CD4 0C2600AB */ jal func_809802AC -/* 03668 80980CD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0366C 80980CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03670 80980CE0 0C2600DB */ jal func_8098036C -/* 03674 80980CE4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03678 80980CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0367C 80980CEC 0C26010C */ jal func_80980430 -/* 03680 80980CF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03684 80980CF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03688 80980CF8 0C260141 */ jal func_80980504 -/* 0368C 80980CFC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03690 80980D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03694 80980D04 0C260176 */ jal func_809805D8 -/* 03698 80980D08 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0369C 80980D0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036A0 80980D10 0C2601AE */ jal func_809806B8 -/* 036A4 80980D14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036A8 80980D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036AC 80980D1C 0C2601E3 */ jal func_8098078C -/* 036B0 80980D20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036B4 80980D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036B8 80980D28 0C260217 */ jal func_8098085C -/* 036BC 80980D2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036C0 80980D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036C4 80980D34 0C260270 */ jal func_809809C0 -/* 036C8 80980D38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036CC 80980D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036D0 80980D40 0C2602B5 */ jal func_80980AD4 -/* 036D4 80980D44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036D8 80980D48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036DC 80980D4C 0C2602DA */ jal func_80980B68 -/* 036E0 80980D50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036E4 80980D54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036E8 80980D58 0C2602FF */ jal func_80980BFC -/* 036EC 80980D5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036F0 80980D60 8FBF001C */ lw $ra, 0x001C($sp) -/* 036F4 80980D64 8FB00014 */ lw $s0, 0x0014($sp) -/* 036F8 80980D68 8FB10018 */ lw $s1, 0x0018($sp) -/* 036FC 80980D6C 03E00008 */ jr $ra -/* 03700 80980D70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s deleted file mode 100644 index 2993732e3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80980D74 -/* 03704 80980D74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03708 80980D78 AFA40018 */ sw $a0, 0x0018($sp) -/* 0370C 80980D7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03710 80980D80 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03714 80980D84 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 03718 80980D88 0C25F9C1 */ jal func_8097E704 -/* 0371C 80980D8C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03720 80980D90 10400003 */ beq $v0, $zero, .L80980DA0 -/* 03724 80980D94 8FAF0018 */ lw $t7, 0x0018($sp) -/* 03728 80980D98 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 0372C 80980D9C ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L80980DA0: -/* 03730 80980DA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03734 80980DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03738 80980DA8 03E00008 */ jr $ra -/* 0373C 80980DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s deleted file mode 100644 index af5af6717e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80980DB0 -/* 03740 80980DB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03744 80980DB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03748 80980DB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0374C 80980DBC AFA40018 */ sw $a0, 0x0018($sp) -/* 03750 80980DC0 0C25FA09 */ jal func_8097E824 -/* 03754 80980DC4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 03758 80980DC8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0375C 80980DCC 0C260324 */ jal func_80980C90 -/* 03760 80980DD0 8FA5001C */ lw $a1, 0x001C($sp) -/* 03764 80980DD4 8FA40018 */ lw $a0, 0x0018($sp) -/* 03768 80980DD8 0C26035D */ jal func_80980D74 -/* 0376C 80980DDC 8FA5001C */ lw $a1, 0x001C($sp) -/* 03770 80980DE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03774 80980DE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03778 80980DE8 03E00008 */ jr $ra -/* 0377C 80980DEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s deleted file mode 100644 index d9704fbdf1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80980DF0 -/* 03780 80980DF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03784 80980DF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03788 80980DF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0378C 80980DFC AFA5001C */ sw $a1, 0x001C($sp) -/* 03790 80980E00 0C25FB59 */ jal func_8097ED64 -/* 03794 80980E04 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03798 80980E08 8FA40018 */ lw $a0, 0x0018($sp) -/* 0379C 80980E0C 0C260324 */ jal func_80980C90 -/* 037A0 80980E10 8FA5001C */ lw $a1, 0x001C($sp) -/* 037A4 80980E14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 037A8 80980E18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 037AC 80980E1C 03E00008 */ jr $ra -/* 037B0 80980E20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s deleted file mode 100644 index 42b78d4157..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s +++ /dev/null @@ -1,70 +0,0 @@ -.rdata -glabel D_80982810 - .asciz "../z_demo_gt_part3.c" - .balign 4 - -glabel D_80982828 - .asciz "../z_demo_gt_part3.c" - .balign 4 - -glabel D_80982840 - .asciz "../z_demo_gt_part3.c" - .balign 4 - -.text -glabel func_80980E24 -/* 037B4 80980E24 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 037B8 80980E28 AFBF001C */ sw $ra, 0x001C($sp) -/* 037BC 80980E2C AFB00018 */ sw $s0, 0x0018($sp) -/* 037C0 80980E30 AFA40048 */ sw $a0, 0x0048($sp) -/* 037C4 80980E34 AFA5004C */ sw $a1, 0x004C($sp) -/* 037C8 80980E38 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 037CC 80980E3C 3C068098 */ lui $a2, %hi(D_80982810) ## $a2 = 80980000 -/* 037D0 80980E40 24C62810 */ addiu $a2, $a2, %lo(D_80982810) ## $a2 = 80982810 -/* 037D4 80980E44 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 037D8 80980E48 24070402 */ addiu $a3, $zero, 0x0402 ## $a3 = 00000402 -/* 037DC 80980E4C 0C031AB1 */ jal Graph_OpenDisps -/* 037E0 80980E50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 037E4 80980E54 0C024F46 */ jal func_80093D18 -/* 037E8 80980E58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037EC 80980E5C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 037F0 80980E60 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 037F4 80980E64 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = DA380002 -/* 037F8 80980E68 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 037FC 80980E6C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 03800 80980E70 3C058098 */ lui $a1, %hi(D_80982828) ## $a1 = 80980000 -/* 03804 80980E74 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03808 80980E78 24A52828 */ addiu $a1, $a1, %lo(D_80982828) ## $a1 = 80982828 -/* 0380C 80980E7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03810 80980E80 24060404 */ addiu $a2, $zero, 0x0404 ## $a2 = 00000404 -/* 03814 80980E84 0C0346A2 */ jal Matrix_NewMtx -/* 03818 80980E88 AFA2002C */ sw $v0, 0x002C($sp) -/* 0381C 80980E8C 8FA3002C */ lw $v1, 0x002C($sp) -/* 03820 80980E90 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 03824 80980E94 25297630 */ addiu $t1, $t1, 0x7630 ## $t1 = 06007630 -/* 03828 80980E98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0382C 80980E9C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03830 80980EA0 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 03834 80980EA4 3C0BD838 */ lui $t3, 0xD838 ## $t3 = D8380000 -/* 03838 80980EA8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0383C 80980EAC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03840 80980EB0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 03844 80980EB4 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 03848 80980EB8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0384C 80980EBC 356B0002 */ ori $t3, $t3, 0x0002 ## $t3 = D8380002 -/* 03850 80980EC0 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 03854 80980EC4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03858 80980EC8 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 0385C 80980ECC 3C068098 */ lui $a2, %hi(D_80982840) ## $a2 = 80980000 -/* 03860 80980ED0 24C62840 */ addiu $a2, $a2, %lo(D_80982840) ## $a2 = 80982840 -/* 03864 80980ED4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 03868 80980ED8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0386C 80980EDC 24070408 */ addiu $a3, $zero, 0x0408 ## $a3 = 00000408 -/* 03870 80980EE0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03874 80980EE4 0C031AD5 */ jal Graph_CloseDisps -/* 03878 80980EE8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0387C 80980EEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03880 80980EF0 8FB00018 */ lw $s0, 0x0018($sp) -/* 03884 80980EF4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03888 80980EF8 03E00008 */ jr $ra -/* 0388C 80980EFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s deleted file mode 100644 index e851c73cac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80980F00 -/* 03890 80980F00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03894 80980F04 AFBF001C */ sw $ra, 0x001C($sp) -/* 03898 80980F08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0389C 80980F0C 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 038A0 80980F10 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 038A4 80980F14 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 038A8 80980F18 C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 038AC 80980F1C 46002182 */ mul.s $f6, $f4, $f0 -/* 038B0 80980F20 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 038B4 80980F24 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 038B8 80980F28 46004282 */ mul.s $f10, $f8, $f0 -/* 038BC 80980F2C 00000000 */ nop -/* 038C0 80980F30 46008482 */ mul.s $f18, $f16, $f0 -/* 038C4 80980F34 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 038C8 80980F38 E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 038CC 80980F3C E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 038D0 80980F40 0C25FB91 */ jal func_8097EE44 -/* 038D4 80980F44 AFA00010 */ sw $zero, 0x0010($sp) -/* 038D8 80980F48 8FBF001C */ lw $ra, 0x001C($sp) -/* 038DC 80980F4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 038E0 80980F50 03E00008 */ jr $ra -/* 038E4 80980F54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s deleted file mode 100644 index 99d31b6a0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80980F58 -/* 038E8 80980F58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 038EC 80980F5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 038F0 80980F60 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 038F4 80980F64 240100F4 */ addiu $at, $zero, 0x00F4 ## $at = 000000F4 -/* 038F8 80980F68 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 038FC 80980F6C 54410004 */ bnel $v0, $at, .L80980F80 -/* 03900 80980F70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03904 80980F74 0C01E245 */ jal func_80078914 -/* 03908 80980F78 240520DE */ addiu $a1, $zero, 0x20DE ## $a1 = 000020DE -/* 0390C 80980F7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80980F80: -/* 03910 80980F80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03914 80980F84 03E00008 */ jr $ra -/* 03918 80980F88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s deleted file mode 100644 index 7d2d70ed52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s +++ /dev/null @@ -1,51 +0,0 @@ -.late_rodata -glabel D_80982B0C - .float 2100.0 - -.text -glabel func_80980F8C -/* 0391C 80980F8C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03920 80980F90 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03924 80980F94 AFA40070 */ sw $a0, 0x0070($sp) -/* 03928 80980F98 AFA50074 */ sw $a1, 0x0074($sp) -/* 0392C 80980F9C 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03930 80980FA0 28410104 */ slti $at, $v0, 0x0104 -/* 03934 80980FA4 14200021 */ bne $at, $zero, .L8098102C -/* 03938 80980FA8 28410121 */ slti $at, $v0, 0x0121 -/* 0393C 80980FAC 1020001F */ beq $at, $zero, .L8098102C -/* 03940 80980FB0 27AF003C */ addiu $t7, $sp, 0x003C ## $t7 = FFFFFFCC -/* 03944 80980FB4 3C188098 */ lui $t8, %hi(D_809826D0) ## $t8 = 80980000 -/* 03948 80980FB8 271826D0 */ addiu $t8, $t8, %lo(D_809826D0) ## $t8 = 809826D0 -/* 0394C 80980FBC 8F080000 */ lw $t0, 0x0000($t8) ## 809826D0 -/* 03950 80980FC0 8F190004 */ lw $t9, 0x0004($t8) ## 809826D4 -/* 03954 80980FC4 3C014420 */ lui $at, 0x4420 ## $at = 44200000 -/* 03958 80980FC8 ADE80000 */ sw $t0, 0x0000($t7) ## FFFFFFCC -/* 0395C 80980FCC 8F080008 */ lw $t0, 0x0008($t8) ## 809826D8 -/* 03960 80980FD0 44812000 */ mtc1 $at, $f4 ## $f4 = 640.00 -/* 03964 80980FD4 3C018098 */ lui $at, %hi(D_80982B0C) ## $at = 80980000 -/* 03968 80980FD8 ADF90004 */ sw $t9, 0x0004($t7) ## FFFFFFD0 -/* 0396C 80980FDC ADE80008 */ sw $t0, 0x0008($t7) ## FFFFFFD4 -/* 03970 80980FE0 C4262B0C */ lwc1 $f6, %lo(D_80982B0C)($at) -/* 03974 80980FE4 3C01C32A */ lui $at, 0xC32A ## $at = C32A0000 -/* 03978 80980FE8 44814000 */ mtc1 $at, $f8 ## $f8 = -170.00 -/* 0397C 80980FEC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 03980 80980FF0 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFDC -/* 03984 80980FF4 E7A40058 */ swc1 $f4, 0x0058($sp) -/* 03988 80980FF8 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 0398C 80980FFC 0C0346BD */ jal Matrix_MultVec3f -/* 03990 80981000 E7A80060 */ swc1 $f8, 0x0060($sp) -/* 03994 80981004 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 03998 80981008 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E -/* 0399C 8098100C AFAA0018 */ sw $t2, 0x0018($sp) -/* 039A0 80981010 AFA90010 */ sw $t1, 0x0010($sp) -/* 039A4 80981014 8FA40074 */ lw $a0, 0x0074($sp) -/* 039A8 80981018 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFDC -/* 039AC 8098101C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFCC -/* 039B0 80981020 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 039B4 80981024 0C25F5F6 */ jal func_8097D7D8 -/* 039B8 80981028 AFA00014 */ sw $zero, 0x0014($sp) -.L8098102C: -/* 039BC 8098102C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 039C0 80981030 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 039C4 80981034 03E00008 */ jr $ra -/* 039C8 80981038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s deleted file mode 100644 index 35a1806043..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8098103C -/* 039CC 8098103C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 039D0 80981040 AFA40018 */ sw $a0, 0x0018($sp) -/* 039D4 80981044 AFBF0014 */ sw $ra, 0x0014($sp) -/* 039D8 80981048 AFA5001C */ sw $a1, 0x001C($sp) -/* 039DC 8098104C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 039E0 80981050 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 039E4 80981054 0C25F9C1 */ jal func_8097E704 -/* 039E8 80981058 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 039EC 8098105C 10400005 */ beq $v0, $zero, .L80981074 -/* 039F0 80981060 8FA4001C */ lw $a0, 0x001C($sp) -/* 039F4 80981064 8FAF0018 */ lw $t7, 0x0018($sp) -/* 039F8 80981068 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 039FC 8098106C 10000008 */ beq $zero, $zero, .L80981090 -/* 03A00 80981070 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L80981074: -/* 03A04 80981074 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 03A08 80981078 0C25F9C1 */ jal func_8097E704 -/* 03A0C 8098107C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03A10 80981080 10400003 */ beq $v0, $zero, .L80981090 -/* 03A14 80981084 8FB90018 */ lw $t9, 0x0018($sp) -/* 03A18 80981088 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 03A1C 8098108C AF380164 */ sw $t8, 0x0164($t9) ## 00000164 -.L80981090: -/* 03A20 80981090 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A24 80981094 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A28 80981098 03E00008 */ jr $ra -/* 03A2C 8098109C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s deleted file mode 100644 index 3a02ef056a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809810A0 -/* 03A30 809810A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03A34 809810A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03A38 809810A8 AFA5001C */ sw $a1, 0x001C($sp) -/* 03A3C 809810AC AFA40018 */ sw $a0, 0x0018($sp) -/* 03A40 809810B0 0C25FA09 */ jal func_8097E824 -/* 03A44 809810B4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 03A48 809810B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 03A4C 809810BC 0C2603D6 */ jal func_80980F58 -/* 03A50 809810C0 8FA5001C */ lw $a1, 0x001C($sp) -/* 03A54 809810C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 03A58 809810C8 0C26040F */ jal func_8098103C -/* 03A5C 809810CC 8FA5001C */ lw $a1, 0x001C($sp) -/* 03A60 809810D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A64 809810D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A68 809810D8 03E00008 */ jr $ra -/* 03A6C 809810DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s deleted file mode 100644 index e7973b3c56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809810E0 -/* 03A70 809810E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03A74 809810E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03A78 809810E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 03A7C 809810EC AFA5001C */ sw $a1, 0x001C($sp) -/* 03A80 809810F0 0C25FB59 */ jal func_8097ED64 -/* 03A84 809810F4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03A88 809810F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 03A8C 809810FC 0C2603D6 */ jal func_80980F58 -/* 03A90 80981100 8FA5001C */ lw $a1, 0x001C($sp) -/* 03A94 80981104 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A98 80981108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A9C 8098110C 03E00008 */ jr $ra -/* 03AA0 80981110 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s deleted file mode 100644 index 4bb6e04d0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_80982B10 - .float 0.001 - -glabel D_80982B14 - .float 0.048 - -.text -glabel func_80981114 -/* 03AA4 80981114 3C038016 */ lui $v1, %hi(gGameInfo) -/* 03AA8 80981118 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 03AAC 8098111C AFA50004 */ sw $a1, 0x0004($sp) -/* 03AB0 80981120 84820172 */ lh $v0, 0x0172($a0) ## 00000172 -/* 03AB4 80981124 846E14D6 */ lh $t6, 0x14D6($v1) ## 801614D6 -/* 03AB8 80981128 846F14D4 */ lh $t7, 0x14D4($v1) ## 801614D4 -/* 03ABC 8098112C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03AC0 80981130 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 03AC4 80981134 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 03AC8 80981138 46802020 */ cvt.s.w $f0, $f4 -/* 03ACC 8098113C 3C0142C4 */ lui $at, 0x42C4 ## $at = 42C40000 -/* 03AD0 80981140 44815000 */ mtc1 $at, $f10 ## $f10 = 98.00 -/* 03AD4 80981144 3C018098 */ lui $at, %hi(D_80982B10) ## $at = 80980000 -/* 03AD8 80981148 240B4000 */ addiu $t3, $zero, 0x4000 ## $t3 = 00004000 -/* 03ADC 8098114C 46803220 */ cvt.s.w $f8, $f6 -/* 03AE0 80981150 C4262B10 */ lwc1 $f6, %lo(D_80982B10)($at) -/* 03AE4 80981154 3C018098 */ lui $at, %hi(D_80982B14) ## $at = 80980000 -/* 03AE8 80981158 46809120 */ cvt.s.w $f4, $f18 -/* 03AEC 8098115C 460A4400 */ add.s $f16, $f8, $f10 -/* 03AF0 80981160 46062202 */ mul.s $f8, $f4, $f6 -/* 03AF4 80981164 C42A2B14 */ lwc1 $f10, %lo(D_80982B14)($at) -/* 03AF8 80981168 460A4480 */ add.s $f18, $f8, $f10 -/* 03AFC 8098116C 46120102 */ mul.s $f4, $f0, $f18 -/* 03B00 80981170 46048180 */ add.s $f6, $f16, $f4 -/* 03B04 80981174 4600320D */ trunc.w.s $f8, $f6 -/* 03B08 80981178 44194000 */ mfc1 $t9, $f8 -/* 03B0C 8098117C 00000000 */ nop -/* 03B10 80981180 A4990174 */ sh $t9, 0x0174($a0) ## 00000174 -/* 03B14 80981184 84880174 */ lh $t0, 0x0174($a0) ## 00000174 -/* 03B18 80981188 00484821 */ addu $t1, $v0, $t0 -/* 03B1C 8098118C A4890172 */ sh $t1, 0x0172($a0) ## 00000172 -/* 03B20 80981190 848A0172 */ lh $t2, 0x0172($a0) ## 00000172 -/* 03B24 80981194 29414001 */ slti $at, $t2, 0x4001 -/* 03B28 80981198 14200002 */ bne $at, $zero, .L809811A4 -/* 03B2C 8098119C 00000000 */ nop -/* 03B30 809811A0 A48B0172 */ sh $t3, 0x0172($a0) ## 00000172 -.L809811A4: -/* 03B34 809811A4 03E00008 */ jr $ra -/* 03B38 809811A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s deleted file mode 100644 index 5ae8db213f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s +++ /dev/null @@ -1,164 +0,0 @@ -.rdata -glabel D_80982858 - .asciz "../z_demo_gt_part4_1.c" - .balign 4 - -glabel D_80982870 - .asciz "../z_demo_gt_part4_1.c" - .balign 4 - -glabel D_80982888 - .asciz "../z_demo_gt_part4_1.c" - .balign 4 - -.late_rodata -glabel D_80982B18 - .float 9.58738019108e-05 - -.text -glabel func_809811AC -/* 03B3C 809811AC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03B40 809811B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03B44 809811B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 03B48 809811B8 AFA40088 */ sw $a0, 0x0088($sp) -/* 03B4C 809811BC 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03B50 809811C0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 03B54 809811C4 2841012D */ slti $at, $v0, 0x012D -/* 03B58 809811C8 5020007C */ beql $at, $zero, .L809813BC -/* 03B5C 809811CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03B60 809811D0 84860172 */ lh $a2, 0x0172($a0) ## 00000172 -/* 03B64 809811D4 3C018098 */ lui $at, %hi(D_80982B18) ## $at = 80980000 -/* 03B68 809811D8 C4282B18 */ lwc1 $f8, %lo(D_80982B18)($at) -/* 03B6C 809811DC 44862000 */ mtc1 $a2, $f4 ## $f4 = 0.00 -/* 03B70 809811E0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 03B74 809811E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 03B78 809811E8 468021A0 */ cvt.s.w $f6, $f4 -/* 03B7C 809811EC 46083002 */ mul.s $f0, $f6, $f8 -/* 03B80 809811F0 46000005 */ abs.s $f0, $f0 -/* 03B84 809811F4 E7A00070 */ swc1 $f0, 0x0070($sp) -/* 03B88 809811F8 844F14CE */ lh $t7, 0x14CE($v0) ## 801614CE -/* 03B8C 809811FC 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 03B90 80981200 00000000 */ nop -/* 03B94 80981204 46805420 */ cvt.s.w $f16, $f10 -/* 03B98 80981208 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 03B9C 8098120C 845914C8 */ lh $t9, 0x14C8($v0) ## 801614C8 -/* 03BA0 80981210 27284000 */ addiu $t0, $t9, 0x4000 ## $t0 = 00004000 -/* 03BA4 80981214 A7A80068 */ sh $t0, 0x0068($sp) -/* 03BA8 80981218 A7B9006A */ sh $t9, 0x006A($sp) -/* 03BAC 8098121C 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 03BB0 80981220 AFA7008C */ sw $a3, 0x008C($sp) -/* 03BB4 80981224 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 03BB8 80981228 A7A60076 */ sh $a2, 0x0076($sp) -/* 03BBC 8098122C 0C031A73 */ jal Graph_Alloc - -/* 03BC0 80981230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03BC4 80981234 AFA20060 */ sw $v0, 0x0060($sp) -/* 03BC8 80981238 0C01DE0D */ jal Math_Coss - ## coss? -/* 03BCC 8098123C 87A40076 */ lh $a0, 0x0076($sp) -/* 03BD0 80981240 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03BD4 80981244 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 03BD8 80981248 3C068098 */ lui $a2, %hi(D_80982858) ## $a2 = 80980000 -/* 03BDC 8098124C 24C62858 */ addiu $a2, $a2, %lo(D_80982858) ## $a2 = 80982858 -/* 03BE0 80981250 46009101 */ sub.s $f4, $f18, $f0 -/* 03BE4 80981254 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFA8 -/* 03BE8 80981258 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03BEC 8098125C 240700D9 */ addiu $a3, $zero, 0x00D9 ## $a3 = 000000D9 -/* 03BF0 80981260 0C031AB1 */ jal Graph_OpenDisps -/* 03BF4 80981264 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 03BF8 80981268 0C01DE0D */ jal Math_Coss - ## coss? -/* 03BFC 8098126C 87A40068 */ lh $a0, 0x0068($sp) -/* 03C00 80981270 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03C04 80981274 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 03C08 80981278 87A40068 */ lh $a0, 0x0068($sp) -/* 03C0C 8098127C 0C01DE1C */ jal Math_Sins - ## sins? -/* 03C10 80981280 E7A60058 */ swc1 $f6, 0x0058($sp) -/* 03C14 80981284 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 03C18 80981288 0C01DE0D */ jal Math_Coss - ## coss? -/* 03C1C 8098128C 87A4006A */ lh $a0, 0x006A($sp) -/* 03C20 80981290 C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 03C24 80981294 C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 03C28 80981298 87A40076 */ lh $a0, 0x0076($sp) -/* 03C2C 8098129C 46080282 */ mul.s $f10, $f0, $f8 -/* 03C30 809812A0 00000000 */ nop -/* 03C34 809812A4 46105482 */ mul.s $f18, $f10, $f16 -/* 03C38 809812A8 0C01DE1C */ jal Math_Sins - ## sins? -/* 03C3C 809812AC E7B20048 */ swc1 $f18, 0x0048($sp) -/* 03C40 809812B0 C7A4006C */ lwc1 $f4, 0x006C($sp) -/* 03C44 809812B4 87A4006A */ lh $a0, 0x006A($sp) -/* 03C48 809812B8 46040182 */ mul.s $f6, $f0, $f4 -/* 03C4C 809812BC 0C01DE1C */ jal Math_Sins - ## sins? -/* 03C50 809812C0 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 03C54 809812C4 C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 03C58 809812C8 C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 03C5C 809812CC 46080282 */ mul.s $f10, $f0, $f8 -/* 03C60 809812D0 00000000 */ nop -/* 03C64 809812D4 46105482 */ mul.s $f18, $f10, $f16 -/* 03C68 809812D8 0C034213 */ jal Matrix_Push -/* 03C6C 809812DC E7B20050 */ swc1 $f18, 0x0050($sp) -/* 03C70 809812E0 C7AC0070 */ lwc1 $f12, 0x0070($sp) -/* 03C74 809812E4 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFCC -/* 03C78 809812E8 0C0348FF */ jal func_800D23FC -/* 03C7C 809812EC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03C80 809812F0 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 03C84 809812F4 C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 03C88 809812F8 8FA60050 */ lw $a2, 0x0050($sp) -/* 03C8C 809812FC 0C034261 */ jal Matrix_Translate -/* 03C90 80981300 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03C94 80981304 3C058098 */ lui $a1, %hi(D_80982870) ## $a1 = 80980000 -/* 03C98 80981308 24A52870 */ addiu $a1, $a1, %lo(D_80982870) ## $a1 = 80982870 -/* 03C9C 8098130C 8FA40060 */ lw $a0, 0x0060($sp) -/* 03CA0 80981310 0C034695 */ jal Matrix_ToMtx -/* 03CA4 80981314 240600E8 */ addiu $a2, $zero, 0x00E8 ## $a2 = 000000E8 -/* 03CA8 80981318 0C03034A */ jal func_800C0D28 -/* 03CAC 8098131C 8FA4008C */ lw $a0, 0x008C($sp) -/* 03CB0 80981320 14400003 */ bne $v0, $zero, .L80981330 -/* 03CB4 80981324 8FA40088 */ lw $a0, 0x0088($sp) -/* 03CB8 80981328 0C2603E3 */ jal func_80980F8C -/* 03CBC 8098132C 8FA5008C */ lw $a1, 0x008C($sp) -.L80981330: -/* 03CC0 80981330 0C034221 */ jal Matrix_Pull -/* 03CC4 80981334 00000000 */ nop -/* 03CC8 80981338 0C024F46 */ jal func_80093D18 -/* 03CCC 8098133C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03CD0 80981340 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03CD4 80981344 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 03CD8 80981348 354A0002 */ ori $t2, $t2, 0x0002 ## $t2 = DA380002 -/* 03CDC 8098134C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 03CE0 80981350 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 03CE4 80981354 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03CE8 80981358 8FAB0060 */ lw $t3, 0x0060($sp) -/* 03CEC 8098135C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 03CF0 80981360 25CE9610 */ addiu $t6, $t6, 0x9610 ## $t6 = 06009610 -/* 03CF4 80981364 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03CF8 80981368 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03CFC 8098136C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 03D00 80981370 3C18D838 */ lui $t8, 0xD838 ## $t8 = D8380000 -/* 03D04 80981374 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03D08 80981378 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03D0C 8098137C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 03D10 80981380 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03D14 80981384 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03D18 80981388 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = D8380002 -/* 03D1C 8098138C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 03D20 80981390 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03D24 80981394 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 03D28 80981398 3C068098 */ lui $a2, %hi(D_80982888) ## $a2 = 80980000 -/* 03D2C 8098139C 24C62888 */ addiu $a2, $a2, %lo(D_80982888) ## $a2 = 80982888 -/* 03D30 809813A0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFA8 -/* 03D34 809813A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D38 809813A8 240700F6 */ addiu $a3, $zero, 0x00F6 ## $a3 = 000000F6 -/* 03D3C 809813AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03D40 809813B0 0C031AD5 */ jal Graph_CloseDisps -/* 03D44 809813B4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03D48 809813B8 8FBF001C */ lw $ra, 0x001C($sp) -.L809813BC: -/* 03D4C 809813BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03D50 809813C0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 03D54 809813C4 03E00008 */ jr $ra -/* 03D58 809813C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s deleted file mode 100644 index 12a43baa93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_809813CC -/* 03D5C 809813CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03D60 809813D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03D64 809813D4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03D68 809813D8 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 03D6C 809813DC C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 03D70 809813E0 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 03D74 809813E4 C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 03D78 809813E8 46002182 */ mul.s $f6, $f4, $f0 -/* 03D7C 809813EC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03D80 809813F0 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 03D84 809813F4 46004282 */ mul.s $f10, $f8, $f0 -/* 03D88 809813F8 00000000 */ nop -/* 03D8C 809813FC 46008482 */ mul.s $f18, $f16, $f0 -/* 03D90 80981400 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 03D94 80981404 E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 03D98 80981408 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 03D9C 8098140C 0C25FB91 */ jal func_8097EE44 -/* 03DA0 80981410 AFA00010 */ sw $zero, 0x0010($sp) -/* 03DA4 80981414 8FBF001C */ lw $ra, 0x001C($sp) -/* 03DA8 80981418 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03DAC 8098141C 03E00008 */ jr $ra -/* 03DB0 80981420 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s deleted file mode 100644 index 1a98638a86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80981424 -/* 03DB4 80981424 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03DB8 80981428 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03DBC 8098142C 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03DC0 80981430 24010315 */ addiu $at, $zero, 0x0315 ## $at = 00000315 -/* 03DC4 80981434 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 03DC8 80981438 54410004 */ bnel $v0, $at, .L8098144C -/* 03DCC 8098143C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03DD0 80981440 0C01E245 */ jal func_80078914 -/* 03DD4 80981444 240520DE */ addiu $a1, $zero, 0x20DE ## $a1 = 000020DE -/* 03DD8 80981448 8FBF0014 */ lw $ra, 0x0014($sp) -.L8098144C: -/* 03DDC 8098144C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03DE0 80981450 03E00008 */ jr $ra -/* 03DE4 80981454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s deleted file mode 100644 index 3b11f6e893..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s +++ /dev/null @@ -1,63 +0,0 @@ -.late_rodata -glabel D_80982B1C - .float 1170.0 - -glabel D_80982B20 - .float -1100.0 - -.text -glabel func_80981458 -/* 03DE8 80981458 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03DEC 8098145C AFBF0024 */ sw $ra, 0x0024($sp) -/* 03DF0 80981460 AFA40070 */ sw $a0, 0x0070($sp) -/* 03DF4 80981464 AFA50074 */ sw $a1, 0x0074($sp) -/* 03DF8 80981468 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 03DFC 8098146C 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 03E00 80981470 28410358 */ slti $at, $v0, 0x0358 -/* 03E04 80981474 14200003 */ bne $at, $zero, .L80981484 -/* 03E08 80981478 2841037B */ slti $at, $v0, 0x037B -/* 03E0C 8098147C 14200005 */ bne $at, $zero, .L80981494 -/* 03E10 80981480 00000000 */ nop -.L80981484: -/* 03E14 80981484 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 03E18 80981488 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 03E1C 8098148C 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 -/* 03E20 80981490 17010020 */ bne $t8, $at, .L80981514 -.L80981494: -/* 03E24 80981494 3C088098 */ lui $t0, %hi(D_809826DC) ## $t0 = 80980000 -/* 03E28 80981498 250826DC */ addiu $t0, $t0, %lo(D_809826DC) ## $t0 = 809826DC -/* 03E2C 8098149C 8D0A0000 */ lw $t2, 0x0000($t0) ## 809826DC -/* 03E30 809814A0 27B9003C */ addiu $t9, $sp, 0x003C ## $t9 = FFFFFFCC -/* 03E34 809814A4 8D090004 */ lw $t1, 0x0004($t0) ## 809826E0 -/* 03E38 809814A8 AF2A0000 */ sw $t2, 0x0000($t9) ## FFFFFFCC -/* 03E3C 809814AC 8D0A0008 */ lw $t2, 0x0008($t0) ## 809826E4 -/* 03E40 809814B0 3C018098 */ lui $at, %hi(D_80982B1C) ## $at = 80980000 -/* 03E44 809814B4 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFFD0 -/* 03E48 809814B8 AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFFD4 -/* 03E4C 809814BC C4262B1C */ lwc1 $f6, %lo(D_80982B1C)($at) -/* 03E50 809814C0 3C018098 */ lui $at, %hi(D_80982B20) ## $at = 80980000 -/* 03E54 809814C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03E58 809814C8 C4282B20 */ lwc1 $f8, %lo(D_80982B20)($at) -/* 03E5C 809814CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 03E60 809814D0 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFDC -/* 03E64 809814D4 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 03E68 809814D8 E7A40058 */ swc1 $f4, 0x0058($sp) -/* 03E6C 809814DC 0C0346BD */ jal Matrix_MultVec3f -/* 03E70 809814E0 E7A80060 */ swc1 $f8, 0x0060($sp) -/* 03E74 809814E4 3C0740E3 */ lui $a3, 0x40E3 ## $a3 = 40E30000 -/* 03E78 809814E8 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 -/* 03E7C 809814EC 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 03E80 809814F0 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E -/* 03E84 809814F4 AFAD0018 */ sw $t5, 0x0018($sp) -/* 03E88 809814F8 AFAC0014 */ sw $t4, 0x0014($sp) -/* 03E8C 809814FC AFAB0010 */ sw $t3, 0x0010($sp) -/* 03E90 80981500 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40E33333 -/* 03E94 80981504 8FA40074 */ lw $a0, 0x0074($sp) -/* 03E98 80981508 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFDC -/* 03E9C 8098150C 0C25F5F6 */ jal func_8097D7D8 -/* 03EA0 80981510 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFCC -.L80981514: -/* 03EA4 80981514 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03EA8 80981518 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 03EAC 8098151C 03E00008 */ jr $ra -/* 03EB0 80981520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s deleted file mode 100644 index f8c620e750..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80981524 -/* 03EB4 80981524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03EB8 80981528 AFA40018 */ sw $a0, 0x0018($sp) -/* 03EBC 8098152C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03EC0 80981530 AFA5001C */ sw $a1, 0x001C($sp) -/* 03EC4 80981534 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03EC8 80981538 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 03ECC 8098153C 0C25F9C1 */ jal func_8097E704 -/* 03ED0 80981540 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03ED4 80981544 10400005 */ beq $v0, $zero, .L8098155C -/* 03ED8 80981548 8FA4001C */ lw $a0, 0x001C($sp) -/* 03EDC 8098154C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 03EE0 80981550 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 03EE4 80981554 10000008 */ beq $zero, $zero, .L80981578 -/* 03EE8 80981558 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L8098155C: -/* 03EEC 8098155C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 03EF0 80981560 0C25F9C1 */ jal func_8097E704 -/* 03EF4 80981564 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03EF8 80981568 10400003 */ beq $v0, $zero, .L80981578 -/* 03EFC 8098156C 8FB90018 */ lw $t9, 0x0018($sp) -/* 03F00 80981570 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 03F04 80981574 AF380164 */ sw $t8, 0x0164($t9) ## 00000164 -.L80981578: -/* 03F08 80981578 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F0C 8098157C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F10 80981580 03E00008 */ jr $ra -/* 03F14 80981584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s deleted file mode 100644 index 1a25d0c808..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80981588 -/* 03F18 80981588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03F1C 8098158C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03F20 80981590 AFA5001C */ sw $a1, 0x001C($sp) -/* 03F24 80981594 AFA40018 */ sw $a0, 0x0018($sp) -/* 03F28 80981598 0C25FA09 */ jal func_8097E824 -/* 03F2C 8098159C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 03F30 809815A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 03F34 809815A4 0C260509 */ jal func_80981424 -/* 03F38 809815A8 8FA5001C */ lw $a1, 0x001C($sp) -/* 03F3C 809815AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03F40 809815B0 0C260549 */ jal func_80981524 -/* 03F44 809815B4 8FA5001C */ lw $a1, 0x001C($sp) -/* 03F48 809815B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F4C 809815BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F50 809815C0 03E00008 */ jr $ra -/* 03F54 809815C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s deleted file mode 100644 index 9990f1fae3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809815C8 -/* 03F58 809815C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03F5C 809815CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03F60 809815D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 03F64 809815D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03F68 809815D8 0C25FB59 */ jal func_8097ED64 -/* 03F6C 809815DC 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03F70 809815E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 03F74 809815E4 0C260509 */ jal func_80981424 -/* 03F78 809815E8 8FA5001C */ lw $a1, 0x001C($sp) -/* 03F7C 809815EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F80 809815F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F84 809815F4 03E00008 */ jr $ra -/* 03F88 809815F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s deleted file mode 100644 index e690662e0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_80982B24 - .float 0.001 - -glabel D_80982B28 - .float 0.048 - -.text -glabel func_809815FC -/* 03F8C 809815FC 3C038016 */ lui $v1, %hi(gGameInfo) -/* 03F90 80981600 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 03F94 80981604 AFA50004 */ sw $a1, 0x0004($sp) -/* 03F98 80981608 84820172 */ lh $v0, 0x0172($a0) ## 00000172 -/* 03F9C 8098160C 846E14DA */ lh $t6, 0x14DA($v1) ## 801614DA -/* 03FA0 80981610 846F14D8 */ lh $t7, 0x14D8($v1) ## 801614D8 -/* 03FA4 80981614 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03FA8 80981618 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 03FAC 8098161C 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 03FB0 80981620 46802020 */ cvt.s.w $f0, $f4 -/* 03FB4 80981624 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03FB8 80981628 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 03FBC 8098162C 3C018098 */ lui $at, %hi(D_80982B24) ## $at = 80980000 -/* 03FC0 80981630 240B4000 */ addiu $t3, $zero, 0x4000 ## $t3 = 00004000 -/* 03FC4 80981634 46803220 */ cvt.s.w $f8, $f6 -/* 03FC8 80981638 C4262B24 */ lwc1 $f6, %lo(D_80982B24)($at) -/* 03FCC 8098163C 3C018098 */ lui $at, %hi(D_80982B28) ## $at = 80980000 -/* 03FD0 80981640 46809120 */ cvt.s.w $f4, $f18 -/* 03FD4 80981644 460A4400 */ add.s $f16, $f8, $f10 -/* 03FD8 80981648 46062202 */ mul.s $f8, $f4, $f6 -/* 03FDC 8098164C C42A2B28 */ lwc1 $f10, %lo(D_80982B28)($at) -/* 03FE0 80981650 460A4480 */ add.s $f18, $f8, $f10 -/* 03FE4 80981654 46120102 */ mul.s $f4, $f0, $f18 -/* 03FE8 80981658 46048180 */ add.s $f6, $f16, $f4 -/* 03FEC 8098165C 4600320D */ trunc.w.s $f8, $f6 -/* 03FF0 80981660 44194000 */ mfc1 $t9, $f8 -/* 03FF4 80981664 00000000 */ nop -/* 03FF8 80981668 A4990174 */ sh $t9, 0x0174($a0) ## 00000174 -/* 03FFC 8098166C 84880174 */ lh $t0, 0x0174($a0) ## 00000174 -/* 04000 80981670 00484821 */ addu $t1, $v0, $t0 -/* 04004 80981674 A4890172 */ sh $t1, 0x0172($a0) ## 00000172 -/* 04008 80981678 848A0172 */ lh $t2, 0x0172($a0) ## 00000172 -/* 0400C 8098167C 29414001 */ slti $at, $t2, 0x4001 -/* 04010 80981680 14200002 */ bne $at, $zero, .L8098168C -/* 04014 80981684 00000000 */ nop -/* 04018 80981688 A48B0172 */ sh $t3, 0x0172($a0) ## 00000172 -.L8098168C: -/* 0401C 8098168C 03E00008 */ jr $ra -/* 04020 80981690 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s deleted file mode 100644 index b5b3d6afb1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s +++ /dev/null @@ -1,159 +0,0 @@ -.rdata -glabel D_809828A0 - .asciz "../z_demo_gt_part4_2.c" - .balign 4 - -glabel D_809828B8 - .asciz "../z_demo_gt_part4_2.c" - .balign 4 - -glabel D_809828D0 - .asciz "../z_demo_gt_part4_2.c" - .balign 4 - -.late_rodata -glabel D_80982B2C - .float 9.58738019108e-05 - -.text -glabel func_80981694 -/* 04024 80981694 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 04028 80981698 AFBF001C */ sw $ra, 0x001C($sp) -/* 0402C 8098169C AFB00018 */ sw $s0, 0x0018($sp) -/* 04030 809816A0 AFA40080 */ sw $a0, 0x0080($sp) -/* 04034 809816A4 AFA50084 */ sw $a1, 0x0084($sp) -/* 04038 809816A8 84860172 */ lh $a2, 0x0172($a0) ## 00000172 -/* 0403C 809816AC 3C018098 */ lui $at, %hi(D_80982B2C) ## $at = 80980000 -/* 04040 809816B0 C4282B2C */ lwc1 $f8, %lo(D_80982B2C)($at) -/* 04044 809816B4 44862000 */ mtc1 $a2, $f4 ## $f4 = 0.00 -/* 04048 809816B8 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0404C 809816BC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 04050 809816C0 468021A0 */ cvt.s.w $f6, $f4 -/* 04054 809816C4 46083002 */ mul.s $f0, $f6, $f8 -/* 04058 809816C8 46000005 */ abs.s $f0, $f0 -/* 0405C 809816CC E7A00070 */ swc1 $f0, 0x0070($sp) -/* 04060 809816D0 844F14D0 */ lh $t7, 0x14D0($v0) ## 801614D0 -/* 04064 809816D4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 04068 809816D8 00000000 */ nop -/* 0406C 809816DC 46805420 */ cvt.s.w $f16, $f10 -/* 04070 809816E0 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 04074 809816E4 844314CA */ lh $v1, 0x14CA($v0) ## 801614CA -/* 04078 809816E8 2479C000 */ addiu $t9, $v1, 0xC000 ## $t9 = FFFFC000 -/* 0407C 809816EC 27284000 */ addiu $t0, $t9, 0x4000 ## $t0 = 00000000 -/* 04080 809816F0 A7B9006A */ sh $t9, 0x006A($sp) -/* 04084 809816F4 A7A80068 */ sh $t0, 0x0068($sp) -/* 04088 809816F8 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 0408C 809816FC 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04090 80981700 A7A60076 */ sh $a2, 0x0076($sp) -/* 04094 80981704 0C031A73 */ jal Graph_Alloc - -/* 04098 80981708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0409C 8098170C AFA20060 */ sw $v0, 0x0060($sp) -/* 040A0 80981710 0C01DE0D */ jal Math_Coss - ## coss? -/* 040A4 80981714 87A40076 */ lh $a0, 0x0076($sp) -/* 040A8 80981718 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 040AC 8098171C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 040B0 80981720 3C068098 */ lui $a2, %hi(D_809828A0) ## $a2 = 80980000 -/* 040B4 80981724 24C628A0 */ addiu $a2, $a2, %lo(D_809828A0) ## $a2 = 809828A0 -/* 040B8 80981728 46009101 */ sub.s $f4, $f18, $f0 -/* 040BC 8098172C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFB0 -/* 040C0 80981730 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 040C4 80981734 240700D4 */ addiu $a3, $zero, 0x00D4 ## $a3 = 000000D4 -/* 040C8 80981738 0C031AB1 */ jal Graph_OpenDisps -/* 040CC 8098173C E7A40044 */ swc1 $f4, 0x0044($sp) -/* 040D0 80981740 0C01DE0D */ jal Math_Coss - ## coss? -/* 040D4 80981744 87A40068 */ lh $a0, 0x0068($sp) -/* 040D8 80981748 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 040DC 8098174C E7A00054 */ swc1 $f0, 0x0054($sp) -/* 040E0 80981750 87A40068 */ lh $a0, 0x0068($sp) -/* 040E4 80981754 0C01DE1C */ jal Math_Sins - ## sins? -/* 040E8 80981758 E7A60058 */ swc1 $f6, 0x0058($sp) -/* 040EC 8098175C E7A0005C */ swc1 $f0, 0x005C($sp) -/* 040F0 80981760 0C01DE0D */ jal Math_Coss - ## coss? -/* 040F4 80981764 87A4006A */ lh $a0, 0x006A($sp) -/* 040F8 80981768 C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 040FC 8098176C C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 04100 80981770 87A40076 */ lh $a0, 0x0076($sp) -/* 04104 80981774 46080282 */ mul.s $f10, $f0, $f8 -/* 04108 80981778 00000000 */ nop -/* 0410C 8098177C 46105482 */ mul.s $f18, $f10, $f16 -/* 04110 80981780 0C01DE1C */ jal Math_Sins - ## sins? -/* 04114 80981784 E7B20048 */ swc1 $f18, 0x0048($sp) -/* 04118 80981788 C7A4006C */ lwc1 $f4, 0x006C($sp) -/* 0411C 8098178C 87A4006A */ lh $a0, 0x006A($sp) -/* 04120 80981790 46040182 */ mul.s $f6, $f0, $f4 -/* 04124 80981794 0C01DE1C */ jal Math_Sins - ## sins? -/* 04128 80981798 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 0412C 8098179C C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 04130 809817A0 C7B00044 */ lwc1 $f16, 0x0044($sp) -/* 04134 809817A4 46080282 */ mul.s $f10, $f0, $f8 -/* 04138 809817A8 00000000 */ nop -/* 0413C 809817AC 46105482 */ mul.s $f18, $f10, $f16 -/* 04140 809817B0 0C034213 */ jal Matrix_Push -/* 04144 809817B4 E7B20050 */ swc1 $f18, 0x0050($sp) -/* 04148 809817B8 C7AC0070 */ lwc1 $f12, 0x0070($sp) -/* 0414C 809817BC 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFD4 -/* 04150 809817C0 0C0348FF */ jal func_800D23FC -/* 04154 809817C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04158 809817C8 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 0415C 809817CC C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 04160 809817D0 8FA60050 */ lw $a2, 0x0050($sp) -/* 04164 809817D4 0C034261 */ jal Matrix_Translate -/* 04168 809817D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0416C 809817DC 3C058098 */ lui $a1, %hi(D_809828B8) ## $a1 = 80980000 -/* 04170 809817E0 24A528B8 */ addiu $a1, $a1, %lo(D_809828B8) ## $a1 = 809828B8 -/* 04174 809817E4 8FA40060 */ lw $a0, 0x0060($sp) -/* 04178 809817E8 0C034695 */ jal Matrix_ToMtx -/* 0417C 809817EC 240600E3 */ addiu $a2, $zero, 0x00E3 ## $a2 = 000000E3 -/* 04180 809817F0 0C03034A */ jal func_800C0D28 -/* 04184 809817F4 8FA40084 */ lw $a0, 0x0084($sp) -/* 04188 809817F8 14400003 */ bne $v0, $zero, .L80981808 -/* 0418C 809817FC 8FA40080 */ lw $a0, 0x0080($sp) -/* 04190 80981800 0C260516 */ jal func_80981458 -/* 04194 80981804 8FA50084 */ lw $a1, 0x0084($sp) -.L80981808: -/* 04198 80981808 0C034221 */ jal Matrix_Pull -/* 0419C 8098180C 00000000 */ nop -/* 041A0 80981810 0C024F46 */ jal func_80093D18 -/* 041A4 80981814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041A8 80981818 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 041AC 8098181C 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 041B0 80981820 356B0002 */ ori $t3, $t3, 0x0002 ## $t3 = DA380002 -/* 041B4 80981824 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 041B8 80981828 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 041BC 8098182C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 041C0 80981830 8FAC0060 */ lw $t4, 0x0060($sp) -/* 041C4 80981834 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 041C8 80981838 25EF9610 */ addiu $t7, $t7, 0x9610 ## $t7 = 06009610 -/* 041CC 8098183C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 041D0 80981840 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 041D4 80981844 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 041D8 80981848 3C19D838 */ lui $t9, 0xD838 ## $t9 = D8380000 -/* 041DC 8098184C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 041E0 80981850 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 041E4 80981854 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 041E8 80981858 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 041EC 8098185C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 041F0 80981860 37390002 */ ori $t9, $t9, 0x0002 ## $t9 = D8380002 -/* 041F4 80981864 24080040 */ addiu $t0, $zero, 0x0040 ## $t0 = 00000040 -/* 041F8 80981868 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 041FC 8098186C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 04200 80981870 3C068098 */ lui $a2, %hi(D_809828D0) ## $a2 = 80980000 -/* 04204 80981874 24C628D0 */ addiu $a2, $a2, %lo(D_809828D0) ## $a2 = 809828D0 -/* 04208 80981878 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFB0 -/* 0420C 8098187C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04210 80981880 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 -/* 04214 80981884 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 04218 80981888 0C031AD5 */ jal Graph_CloseDisps -/* 0421C 8098188C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04220 80981890 8FBF001C */ lw $ra, 0x001C($sp) -/* 04224 80981894 8FB00018 */ lw $s0, 0x0018($sp) -/* 04228 80981898 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 0422C 8098189C 03E00008 */ jr $ra -/* 04230 809818A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s deleted file mode 100644 index 0f176094ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_809818A4 -/* 04234 809818A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04238 809818A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0423C 809818AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 04240 809818B0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 04244 809818B4 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 04248 809818B8 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 0424C 809818BC C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 04250 809818C0 46002182 */ mul.s $f6, $f4, $f0 -/* 04254 809818C4 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 04258 809818C8 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 0425C 809818CC 46004282 */ mul.s $f10, $f8, $f0 -/* 04260 809818D0 00000000 */ nop -/* 04264 809818D4 46008482 */ mul.s $f18, $f16, $f0 -/* 04268 809818D8 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 0426C 809818DC E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 04270 809818E0 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 04274 809818E4 0C25FB91 */ jal func_8097EE44 -/* 04278 809818E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0427C 809818EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 04280 809818F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04284 809818F4 03E00008 */ jr $ra -/* 04288 809818F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s deleted file mode 100644 index 1ae597f18c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809818FC -/* 0428C 809818FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04290 80981900 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04294 80981904 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 04298 80981908 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D -/* 0429C 8098190C 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 042A0 80981910 54410004 */ bnel $v0, $at, .L80981924 -/* 042A4 80981914 8FBF0014 */ lw $ra, 0x0014($sp) -/* 042A8 80981918 0C01E245 */ jal func_80078914 -/* 042AC 8098191C 240520DE */ addiu $a1, $zero, 0x20DE ## $a1 = 000020DE -/* 042B0 80981920 8FBF0014 */ lw $ra, 0x0014($sp) -.L80981924: -/* 042B4 80981924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 042B8 80981928 03E00008 */ jr $ra -/* 042BC 8098192C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s deleted file mode 100644 index 196e424d13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80981930 -/* 042C0 80981930 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 042C4 80981934 AFA40018 */ sw $a0, 0x0018($sp) -/* 042C8 80981938 AFBF0014 */ sw $ra, 0x0014($sp) -/* 042CC 8098193C AFA5001C */ sw $a1, 0x001C($sp) -/* 042D0 80981940 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 042D4 80981944 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 042D8 80981948 0C25F9C1 */ jal func_8097E704 -/* 042DC 8098194C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 042E0 80981950 10400005 */ beq $v0, $zero, .L80981968 -/* 042E4 80981954 8FA4001C */ lw $a0, 0x001C($sp) -/* 042E8 80981958 8FAF0018 */ lw $t7, 0x0018($sp) -/* 042EC 8098195C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 042F0 80981960 10000008 */ beq $zero, $zero, .L80981984 -/* 042F4 80981964 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L80981968: -/* 042F8 80981968 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 042FC 8098196C 0C25F9C1 */ jal func_8097E704 -/* 04300 80981970 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04304 80981974 10400003 */ beq $v0, $zero, .L80981984 -/* 04308 80981978 8FB90018 */ lw $t9, 0x0018($sp) -/* 0430C 8098197C 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 04310 80981980 AF380164 */ sw $t8, 0x0164($t9) ## 00000164 -.L80981984: -/* 04314 80981984 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04318 80981988 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0431C 8098198C 03E00008 */ jr $ra -/* 04320 80981990 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s deleted file mode 100644 index a4606d4f09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80981994 -/* 04324 80981994 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04328 80981998 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0432C 8098199C AFA5001C */ sw $a1, 0x001C($sp) -/* 04330 809819A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 04334 809819A4 0C25FA09 */ jal func_8097E824 -/* 04338 809819A8 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 0433C 809819AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 04340 809819B0 0C26063F */ jal func_809818FC -/* 04344 809819B4 8FA5001C */ lw $a1, 0x001C($sp) -/* 04348 809819B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0434C 809819BC 0C26064C */ jal func_80981930 -/* 04350 809819C0 8FA5001C */ lw $a1, 0x001C($sp) -/* 04354 809819C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04358 809819C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0435C 809819CC 03E00008 */ jr $ra -/* 04360 809819D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s deleted file mode 100644 index db61d2faa3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809819D4 -/* 04364 809819D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04368 809819D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0436C 809819DC AFA40018 */ sw $a0, 0x0018($sp) -/* 04370 809819E0 AFA5001C */ sw $a1, 0x001C($sp) -/* 04374 809819E4 0C25FB59 */ jal func_8097ED64 -/* 04378 809819E8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0437C 809819EC 8FA40018 */ lw $a0, 0x0018($sp) -/* 04380 809819F0 0C26063F */ jal func_809818FC -/* 04384 809819F4 8FA5001C */ lw $a1, 0x001C($sp) -/* 04388 809819F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0438C 809819FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04390 80981A00 03E00008 */ jr $ra -/* 04394 80981A04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s deleted file mode 100644 index a88b01667b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_80982B30 - .float 0.001 - -glabel D_80982B34 - .float 0.005 - -.text -glabel func_80981A08 -/* 04398 80981A08 3C038016 */ lui $v1, %hi(gGameInfo) -/* 0439C 80981A0C 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 043A0 80981A10 AFA50004 */ sw $a1, 0x0004($sp) -/* 043A4 80981A14 84820172 */ lh $v0, 0x0172($a0) ## 00000172 -/* 043A8 80981A18 846E14DE */ lh $t6, 0x14DE($v1) ## 801614DE -/* 043AC 80981A1C 846F14DC */ lh $t7, 0x14DC($v1) ## 801614DC -/* 043B0 80981A20 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 043B4 80981A24 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 043B8 80981A28 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 043BC 80981A2C 46802020 */ cvt.s.w $f0, $f4 -/* 043C0 80981A30 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 043C4 80981A34 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 043C8 80981A38 3C018098 */ lui $at, %hi(D_80982B30) ## $at = 80980000 -/* 043CC 80981A3C 240B4000 */ addiu $t3, $zero, 0x4000 ## $t3 = 00004000 -/* 043D0 80981A40 46803220 */ cvt.s.w $f8, $f6 -/* 043D4 80981A44 C4262B30 */ lwc1 $f6, %lo(D_80982B30)($at) -/* 043D8 80981A48 3C018098 */ lui $at, %hi(D_80982B34) ## $at = 80980000 -/* 043DC 80981A4C 46809120 */ cvt.s.w $f4, $f18 -/* 043E0 80981A50 460A4400 */ add.s $f16, $f8, $f10 -/* 043E4 80981A54 46062202 */ mul.s $f8, $f4, $f6 -/* 043E8 80981A58 C42A2B34 */ lwc1 $f10, %lo(D_80982B34)($at) -/* 043EC 80981A5C 460A4480 */ add.s $f18, $f8, $f10 -/* 043F0 80981A60 46120102 */ mul.s $f4, $f0, $f18 -/* 043F4 80981A64 46048180 */ add.s $f6, $f16, $f4 -/* 043F8 80981A68 4600320D */ trunc.w.s $f8, $f6 -/* 043FC 80981A6C 44194000 */ mfc1 $t9, $f8 -/* 04400 80981A70 00000000 */ nop -/* 04404 80981A74 A4990174 */ sh $t9, 0x0174($a0) ## 00000174 -/* 04408 80981A78 84880174 */ lh $t0, 0x0174($a0) ## 00000174 -/* 0440C 80981A7C 00484821 */ addu $t1, $v0, $t0 -/* 04410 80981A80 A4890172 */ sh $t1, 0x0172($a0) ## 00000172 -/* 04414 80981A84 848A0172 */ lh $t2, 0x0172($a0) ## 00000172 -/* 04418 80981A88 29414001 */ slti $at, $t2, 0x4001 -/* 0441C 80981A8C 14200002 */ bne $at, $zero, .L80981A98 -/* 04420 80981A90 00000000 */ nop -/* 04424 80981A94 A48B0172 */ sh $t3, 0x0172($a0) ## 00000172 -.L80981A98: -/* 04428 80981A98 03E00008 */ jr $ra -/* 0442C 80981A9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s deleted file mode 100644 index 21b32a7f25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s +++ /dev/null @@ -1,151 +0,0 @@ -.rdata -glabel D_809828E8 - .asciz "../z_demo_gt_part4_3.c" - .balign 4 - -glabel D_80982900 - .asciz "../z_demo_gt_part4_3.c" - .balign 4 - -glabel D_80982918 - .asciz "../z_demo_gt_part4_3.c" - .balign 4 - -.late_rodata -glabel D_80982B38 - .float 9.58738019108e-05 - -.text -glabel func_80981AA0 -/* 04430 80981AA0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 04434 80981AA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 04438 80981AA8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0443C 80981AAC AFA50084 */ sw $a1, 0x0084($sp) -/* 04440 80981AB0 84870172 */ lh $a3, 0x0172($a0) ## 00000172 -/* 04444 80981AB4 3C018098 */ lui $at, %hi(D_80982B38) ## $at = 80980000 -/* 04448 80981AB8 C4282B38 */ lwc1 $f8, %lo(D_80982B38)($at) -/* 0444C 80981ABC 44872000 */ mtc1 $a3, $f4 ## $f4 = 0.00 -/* 04450 80981AC0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 04454 80981AC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 04458 80981AC8 468021A0 */ cvt.s.w $f6, $f4 -/* 0445C 80981ACC 46083002 */ mul.s $f0, $f6, $f8 -/* 04460 80981AD0 46000005 */ abs.s $f0, $f0 -/* 04464 80981AD4 E7A00074 */ swc1 $f0, 0x0074($sp) -/* 04468 80981AD8 844E14D2 */ lh $t6, 0x14D2($v0) ## 801614D2 -/* 0446C 80981ADC 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 04470 80981AE0 00000000 */ nop -/* 04474 80981AE4 46805420 */ cvt.s.w $f16, $f10 -/* 04478 80981AE8 E7B00070 */ swc1 $f16, 0x0070($sp) -/* 0447C 80981AEC 844314CC */ lh $v1, 0x14CC($v0) ## 801614CC -/* 04480 80981AF0 24784000 */ addiu $t8, $v1, 0x4000 ## $t8 = 00004000 -/* 04484 80981AF4 27194000 */ addiu $t9, $t8, 0x4000 ## $t9 = 00008000 -/* 04488 80981AF8 A7B8006E */ sh $t8, 0x006E($sp) -/* 0448C 80981AFC A7B9006C */ sh $t9, 0x006C($sp) -/* 04490 80981B00 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 04494 80981B04 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04498 80981B08 A7A7007A */ sh $a3, 0x007A($sp) -/* 0449C 80981B0C 0C031A73 */ jal Graph_Alloc - -/* 044A0 80981B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044A4 80981B14 AFA20064 */ sw $v0, 0x0064($sp) -/* 044A8 80981B18 0C01DE0D */ jal Math_Coss - ## coss? -/* 044AC 80981B1C 87A4007A */ lh $a0, 0x007A($sp) -/* 044B0 80981B20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 044B4 80981B24 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 044B8 80981B28 3C068098 */ lui $a2, %hi(D_809828E8) ## $a2 = 80980000 -/* 044BC 80981B2C 24C628E8 */ addiu $a2, $a2, %lo(D_809828E8) ## $a2 = 809828E8 -/* 044C0 80981B30 46009101 */ sub.s $f4, $f18, $f0 -/* 044C4 80981B34 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 044C8 80981B38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044CC 80981B3C 24070114 */ addiu $a3, $zero, 0x0114 ## $a3 = 00000114 -/* 044D0 80981B40 0C031AB1 */ jal Graph_OpenDisps -/* 044D4 80981B44 E7A40048 */ swc1 $f4, 0x0048($sp) -/* 044D8 80981B48 0C01DE0D */ jal Math_Coss - ## coss? -/* 044DC 80981B4C 87A4006C */ lh $a0, 0x006C($sp) -/* 044E0 80981B50 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 044E4 80981B54 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 044E8 80981B58 87A4006C */ lh $a0, 0x006C($sp) -/* 044EC 80981B5C 0C01DE1C */ jal Math_Sins - ## sins? -/* 044F0 80981B60 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 044F4 80981B64 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 044F8 80981B68 0C01DE0D */ jal Math_Coss - ## coss? -/* 044FC 80981B6C 87A4006E */ lh $a0, 0x006E($sp) -/* 04500 80981B70 C7A80070 */ lwc1 $f8, 0x0070($sp) -/* 04504 80981B74 C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 04508 80981B78 87A4007A */ lh $a0, 0x007A($sp) -/* 0450C 80981B7C 46080282 */ mul.s $f10, $f0, $f8 -/* 04510 80981B80 00000000 */ nop -/* 04514 80981B84 46105482 */ mul.s $f18, $f10, $f16 -/* 04518 80981B88 0C01DE1C */ jal Math_Sins - ## sins? -/* 0451C 80981B8C E7B2004C */ swc1 $f18, 0x004C($sp) -/* 04520 80981B90 C7A40070 */ lwc1 $f4, 0x0070($sp) -/* 04524 80981B94 87A4006E */ lh $a0, 0x006E($sp) -/* 04528 80981B98 46040182 */ mul.s $f6, $f0, $f4 -/* 0452C 80981B9C 0C01DE1C */ jal Math_Sins - ## sins? -/* 04530 80981BA0 E7A60050 */ swc1 $f6, 0x0050($sp) -/* 04534 80981BA4 C7A80070 */ lwc1 $f8, 0x0070($sp) -/* 04538 80981BA8 C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 0453C 80981BAC 46080282 */ mul.s $f10, $f0, $f8 -/* 04540 80981BB0 00000000 */ nop -/* 04544 80981BB4 46105482 */ mul.s $f18, $f10, $f16 -/* 04548 80981BB8 0C034213 */ jal Matrix_Push -/* 0454C 80981BBC E7B20054 */ swc1 $f18, 0x0054($sp) -/* 04550 80981BC0 C7AC0074 */ lwc1 $f12, 0x0074($sp) -/* 04554 80981BC4 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFD8 -/* 04558 80981BC8 0C0348FF */ jal func_800D23FC -/* 0455C 80981BCC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04560 80981BD0 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 04564 80981BD4 C7AE0050 */ lwc1 $f14, 0x0050($sp) -/* 04568 80981BD8 8FA60054 */ lw $a2, 0x0054($sp) -/* 0456C 80981BDC 0C034261 */ jal Matrix_Translate -/* 04570 80981BE0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04574 80981BE4 3C058098 */ lui $a1, %hi(D_80982900) ## $a1 = 80980000 -/* 04578 80981BE8 24A52900 */ addiu $a1, $a1, %lo(D_80982900) ## $a1 = 80982900 -/* 0457C 80981BEC 8FA40064 */ lw $a0, 0x0064($sp) -/* 04580 80981BF0 0C034695 */ jal Matrix_ToMtx -/* 04584 80981BF4 24060123 */ addiu $a2, $zero, 0x0123 ## $a2 = 00000123 -/* 04588 80981BF8 0C034221 */ jal Matrix_Pull -/* 0458C 80981BFC 00000000 */ nop -/* 04590 80981C00 0C024F46 */ jal func_80093D18 -/* 04594 80981C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04598 80981C08 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0459C 80981C0C 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 045A0 80981C10 354A0002 */ ori $t2, $t2, 0x0002 ## $t2 = DA380002 -/* 045A4 80981C14 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 045A8 80981C18 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 045AC 80981C1C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 045B0 80981C20 8FAB0064 */ lw $t3, 0x0064($sp) -/* 045B4 80981C24 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 045B8 80981C28 25CE9610 */ addiu $t6, $t6, 0x9610 ## $t6 = 06009610 -/* 045BC 80981C2C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 045C0 80981C30 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 045C4 80981C34 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 045C8 80981C38 3C18D838 */ lui $t8, 0xD838 ## $t8 = D8380000 -/* 045CC 80981C3C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 045D0 80981C40 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 045D4 80981C44 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 045D8 80981C48 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 045DC 80981C4C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 045E0 80981C50 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = D8380002 -/* 045E4 80981C54 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 045E8 80981C58 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 045EC 80981C5C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 045F0 80981C60 3C068098 */ lui $a2, %hi(D_80982918) ## $a2 = 80980000 -/* 045F4 80981C64 24C62918 */ addiu $a2, $a2, %lo(D_80982918) ## $a2 = 80982918 -/* 045F8 80981C68 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 -/* 045FC 80981C6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04600 80981C70 24070133 */ addiu $a3, $zero, 0x0133 ## $a3 = 00000133 -/* 04604 80981C74 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 04608 80981C78 0C031AD5 */ jal Graph_CloseDisps -/* 0460C 80981C7C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 04610 80981C80 8FBF001C */ lw $ra, 0x001C($sp) -/* 04614 80981C84 8FB00018 */ lw $s0, 0x0018($sp) -/* 04618 80981C88 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 0461C 80981C8C 03E00008 */ jr $ra -/* 04620 80981C90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s deleted file mode 100644 index bc49fbdea4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80981C94 -/* 04624 80981C94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04628 80981C98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0462C 80981C9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 04630 80981CA0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 04634 80981CA4 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 04638 80981CA8 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 0463C 80981CAC C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 04640 80981CB0 46002182 */ mul.s $f6, $f4, $f0 -/* 04644 80981CB4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04648 80981CB8 24070007 */ addiu $a3, $zero, 0x0007 ## $a3 = 00000007 -/* 0464C 80981CBC 46004282 */ mul.s $f10, $f8, $f0 -/* 04650 80981CC0 00000000 */ nop -/* 04654 80981CC4 46008482 */ mul.s $f18, $f16, $f0 -/* 04658 80981CC8 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 0465C 80981CCC E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 04660 80981CD0 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 04664 80981CD4 0C25FB91 */ jal func_8097EE44 -/* 04668 80981CD8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0466C 80981CDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 04670 80981CE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04674 80981CE4 03E00008 */ jr $ra -/* 04678 80981CE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s deleted file mode 100644 index 78d73b8729..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80981CEC -/* 0467C 80981CEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04680 80981CF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04684 80981CF4 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 04688 80981CF8 240100B7 */ addiu $at, $zero, 0x00B7 ## $at = 000000B7 -/* 0468C 80981CFC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 04690 80981D00 54410004 */ bnel $v0, $at, .L80981D14 -/* 04694 80981D04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04698 80981D08 0C01E245 */ jal func_80078914 -/* 0469C 80981D0C 240520DE */ addiu $a1, $zero, 0x20DE ## $a1 = 000020DE -/* 046A0 80981D10 8FBF0014 */ lw $ra, 0x0014($sp) -.L80981D14: -/* 046A4 80981D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 046A8 80981D18 03E00008 */ jr $ra -/* 046AC 80981D1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s deleted file mode 100644 index 1d2c5076e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_80982B3C - .float 0.001 - -glabel D_80982B40 - .float 0.048 - -.text -glabel func_80981D20 -/* 046B0 80981D20 3C068016 */ lui $a2, %hi(gGameInfo) -/* 046B4 80981D24 24C6FA90 */ addiu $a2, %lo(gGameInfo) -/* 046B8 80981D28 8CC30000 */ lw $v1, 0x0000($a2) ## 8015FA90 -/* 046BC 80981D2C 84820172 */ lh $v0, 0x0172($a0) ## 00000172 -/* 046C0 80981D30 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 046C4 80981D34 846E14EC */ lh $t6, 0x14EC($v1) ## 000014EC -/* 046C8 80981D38 846F14D4 */ lh $t7, 0x14D4($v1) ## 000014D4 -/* 046CC 80981D3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 046D0 80981D40 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 046D4 80981D44 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 046D8 80981D48 46802020 */ cvt.s.w $f0, $f4 -/* 046DC 80981D4C 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 046E0 80981D50 3C018098 */ lui $at, %hi(D_80982B3C) ## $at = 80980000 -/* 046E4 80981D54 46803220 */ cvt.s.w $f8, $f6 -/* 046E8 80981D58 C4262B3C */ lwc1 $f6, %lo(D_80982B3C)($at) -/* 046EC 80981D5C 3C018098 */ lui $at, %hi(D_80982B40) ## $at = 80980000 -/* 046F0 80981D60 46809120 */ cvt.s.w $f4, $f18 -/* 046F4 80981D64 460A4400 */ add.s $f16, $f8, $f10 -/* 046F8 80981D68 46062202 */ mul.s $f8, $f4, $f6 -/* 046FC 80981D6C C42A2B40 */ lwc1 $f10, %lo(D_80982B40)($at) -/* 04700 80981D70 460A4480 */ add.s $f18, $f8, $f10 -/* 04704 80981D74 46120102 */ mul.s $f4, $f0, $f18 -/* 04708 80981D78 46048180 */ add.s $f6, $f16, $f4 -/* 0470C 80981D7C 4600320D */ trunc.w.s $f8, $f6 -/* 04710 80981D80 44194000 */ mfc1 $t9, $f8 -/* 04714 80981D84 00000000 */ nop -/* 04718 80981D88 A4990174 */ sh $t9, 0x0174($a0) ## 00000174 -/* 0471C 80981D8C 84880174 */ lh $t0, 0x0174($a0) ## 00000174 -/* 04720 80981D90 00484821 */ addu $t1, $v0, $t0 -/* 04724 80981D94 A4890172 */ sh $t1, 0x0172($a0) ## 00000172 -/* 04728 80981D98 8CCA0000 */ lw $t2, 0x0000($a2) ## 8015FA90 -/* 0472C 80981D9C 848D0172 */ lh $t5, 0x0172($a0) ## 00000172 -/* 04730 80981DA0 854514F4 */ lh $a1, 0x14F4($t2) ## 000014F4 -/* 04734 80981DA4 24A54000 */ addiu $a1, $a1, 0x4000 ## $a1 = 00004000 -/* 04738 80981DA8 00055C00 */ sll $t3, $a1, 16 -/* 0473C 80981DAC 000B6403 */ sra $t4, $t3, 16 -/* 04740 80981DB0 018D082A */ slt $at, $t4, $t5 -/* 04744 80981DB4 10200002 */ beq $at, $zero, .L80981DC0 -/* 04748 80981DB8 00000000 */ nop -/* 0474C 80981DBC A4850172 */ sh $a1, 0x0172($a0) ## 00000172 -.L80981DC0: -/* 04750 80981DC0 03E00008 */ jr $ra -/* 04754 80981DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s deleted file mode 100644 index 8ddf3d2439..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80981DC8 -/* 04758 80981DC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0475C 80981DCC AFA40018 */ sw $a0, 0x0018($sp) -/* 04760 80981DD0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04764 80981DD4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04768 80981DD8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0476C 80981DDC 0C25F9C1 */ jal func_8097E704 -/* 04770 80981DE0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 04774 80981DE4 10400003 */ beq $v0, $zero, .L80981DF4 -/* 04778 80981DE8 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0477C 80981DEC 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 04780 80981DF0 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L80981DF4: -/* 04784 80981DF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04788 80981DF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0478C 80981DFC 03E00008 */ jr $ra -/* 04790 80981E00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s deleted file mode 100644 index 2c35af6dfd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80981E04 -/* 04794 80981E04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04798 80981E08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0479C 80981E0C AFA5001C */ sw $a1, 0x001C($sp) -/* 047A0 80981E10 AFA40018 */ sw $a0, 0x0018($sp) -/* 047A4 80981E14 0C25FA09 */ jal func_8097E824 -/* 047A8 80981E18 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 047AC 80981E1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 047B0 80981E20 0C26073B */ jal func_80981CEC -/* 047B4 80981E24 8FA5001C */ lw $a1, 0x001C($sp) -/* 047B8 80981E28 8FA40018 */ lw $a0, 0x0018($sp) -/* 047BC 80981E2C 0C260772 */ jal func_80981DC8 -/* 047C0 80981E30 8FA5001C */ lw $a1, 0x001C($sp) -/* 047C4 80981E34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 047C8 80981E38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 047CC 80981E3C 03E00008 */ jr $ra -/* 047D0 80981E40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s deleted file mode 100644 index dbecb8e819..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80981E44 -/* 047D4 80981E44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 047D8 80981E48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 047DC 80981E4C AFA40018 */ sw $a0, 0x0018($sp) -/* 047E0 80981E50 0C260748 */ jal func_80981D20 -/* 047E4 80981E54 AFA5001C */ sw $a1, 0x001C($sp) -/* 047E8 80981E58 8FA40018 */ lw $a0, 0x0018($sp) -/* 047EC 80981E5C 8FA5001C */ lw $a1, 0x001C($sp) -/* 047F0 80981E60 0C25FB59 */ jal func_8097ED64 -/* 047F4 80981E64 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 047F8 80981E68 8FA40018 */ lw $a0, 0x0018($sp) -/* 047FC 80981E6C 0C26073B */ jal func_80981CEC -/* 04800 80981E70 8FA5001C */ lw $a1, 0x001C($sp) -/* 04804 80981E74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04808 80981E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0480C 80981E7C 03E00008 */ jr $ra -/* 04810 80981E80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s deleted file mode 100644 index 2cc2df7247..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s +++ /dev/null @@ -1,142 +0,0 @@ -.rdata -glabel D_80982930 - .asciz "../z_demo_gt_part5.c" - .balign 4 - -glabel D_80982948 - .asciz "../z_demo_gt_part5.c" - .balign 4 - -glabel D_80982960 - .asciz "../z_demo_gt_part5.c" - .balign 4 - -.late_rodata -glabel D_80982B44 - .float 9.58738019108e-05 - -.text -glabel func_80981E84 -/* 04814 80981E84 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 04818 80981E88 AFBF001C */ sw $ra, 0x001C($sp) -/* 0481C 80981E8C AFB00018 */ sw $s0, 0x0018($sp) -/* 04820 80981E90 84880172 */ lh $t0, 0x0172($a0) ## 00000172 -/* 04824 80981E94 3C018098 */ lui $at, %hi(D_80982B44) ## $at = 80980000 -/* 04828 80981E98 C4282B44 */ lwc1 $f8, %lo(D_80982B44)($at) -/* 0482C 80981E9C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04830 80981EA0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 04834 80981EA4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 04838 80981EA8 468021A0 */ cvt.s.w $f6, $f4 -/* 0483C 80981EAC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 04840 80981EB0 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04844 80981EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04848 80981EB8 46083002 */ mul.s $f0, $f6, $f8 -/* 0484C 80981EBC 46000005 */ abs.s $f0, $f0 -/* 04850 80981EC0 E7A00068 */ swc1 $f0, 0x0068($sp) -/* 04854 80981EC4 844E14EA */ lh $t6, 0x14EA($v0) ## 801614EA -/* 04858 80981EC8 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 0485C 80981ECC 00000000 */ nop -/* 04860 80981ED0 46805420 */ cvt.s.w $f16, $f10 -/* 04864 80981ED4 E7B00064 */ swc1 $f16, 0x0064($sp) -/* 04868 80981ED8 844314E8 */ lh $v1, 0x14E8($v0) ## 801614E8 -/* 0486C 80981EDC A7A8006E */ sh $t0, 0x006E($sp) -/* 04870 80981EE0 24787FEC */ addiu $t8, $v1, 0x7FEC ## $t8 = 00007FEC -/* 04874 80981EE4 27194000 */ addiu $t9, $t8, 0x4000 ## $t9 = 0000BFEC -/* 04878 80981EE8 A7B80062 */ sh $t8, 0x0062($sp) -/* 0487C 80981EEC 0C031A73 */ jal Graph_Alloc - -/* 04880 80981EF0 A7B90060 */ sh $t9, 0x0060($sp) -/* 04884 80981EF4 AFA2005C */ sw $v0, 0x005C($sp) -/* 04888 80981EF8 0C01DE0D */ jal Math_Coss - ## coss? -/* 0488C 80981EFC 87A4006E */ lh $a0, 0x006E($sp) -/* 04890 80981F00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04894 80981F04 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 04898 80981F08 3C068098 */ lui $a2, %hi(D_80982930) ## $a2 = 80980000 -/* 0489C 80981F0C 24C62930 */ addiu $a2, $a2, %lo(D_80982930) ## $a2 = 80982930 -/* 048A0 80981F10 46009101 */ sub.s $f4, $f18, $f0 -/* 048A4 80981F14 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 -/* 048A8 80981F18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 048AC 80981F1C 24070088 */ addiu $a3, $zero, 0x0088 ## $a3 = 00000088 -/* 048B0 80981F20 0C031AB1 */ jal Graph_OpenDisps -/* 048B4 80981F24 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 048B8 80981F28 0C01DE0D */ jal Math_Coss - ## coss? -/* 048BC 80981F2C 87A40060 */ lh $a0, 0x0060($sp) -/* 048C0 80981F30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 048C4 80981F34 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 048C8 80981F38 87A40060 */ lh $a0, 0x0060($sp) -/* 048CC 80981F3C 0C01DE1C */ jal Math_Sins - ## sins? -/* 048D0 80981F40 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 048D4 80981F44 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 048D8 80981F48 0C01DE0D */ jal Math_Coss - ## coss? -/* 048DC 80981F4C 87A40062 */ lh $a0, 0x0062($sp) -/* 048E0 80981F50 C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 048E4 80981F54 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 048E8 80981F58 87A4006E */ lh $a0, 0x006E($sp) -/* 048EC 80981F5C 46080282 */ mul.s $f10, $f0, $f8 -/* 048F0 80981F60 00000000 */ nop -/* 048F4 80981F64 46105482 */ mul.s $f18, $f10, $f16 -/* 048F8 80981F68 0C01DE1C */ jal Math_Sins - ## sins? -/* 048FC 80981F6C E7B20044 */ swc1 $f18, 0x0044($sp) -/* 04900 80981F70 C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 04904 80981F74 87A40062 */ lh $a0, 0x0062($sp) -/* 04908 80981F78 46040182 */ mul.s $f6, $f0, $f4 -/* 0490C 80981F7C 0C01DE1C */ jal Math_Sins - ## sins? -/* 04910 80981F80 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 04914 80981F84 C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 04918 80981F88 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 0491C 80981F8C 46080282 */ mul.s $f10, $f0, $f8 -/* 04920 80981F90 00000000 */ nop -/* 04924 80981F94 46105482 */ mul.s $f18, $f10, $f16 -/* 04928 80981F98 0C034213 */ jal Matrix_Push -/* 0492C 80981F9C E7B2004C */ swc1 $f18, 0x004C($sp) -/* 04930 80981FA0 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 04934 80981FA4 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFD8 -/* 04938 80981FA8 0C0348FF */ jal func_800D23FC -/* 0493C 80981FAC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04940 80981FB0 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 04944 80981FB4 C7AE0048 */ lwc1 $f14, 0x0048($sp) -/* 04948 80981FB8 8FA6004C */ lw $a2, 0x004C($sp) -/* 0494C 80981FBC 0C034261 */ jal Matrix_Translate -/* 04950 80981FC0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04954 80981FC4 3C058098 */ lui $a1, %hi(D_80982948) ## $a1 = 80980000 -/* 04958 80981FC8 24A52948 */ addiu $a1, $a1, %lo(D_80982948) ## $a1 = 80982948 -/* 0495C 80981FCC 8FA4005C */ lw $a0, 0x005C($sp) -/* 04960 80981FD0 0C034695 */ jal Matrix_ToMtx -/* 04964 80981FD4 24060098 */ addiu $a2, $zero, 0x0098 ## $a2 = 00000098 -/* 04968 80981FD8 0C034221 */ jal Matrix_Pull -/* 0496C 80981FDC 00000000 */ nop -/* 04970 80981FE0 0C024F46 */ jal func_80093D18 -/* 04974 80981FE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04978 80981FE8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 0497C 80981FEC 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 04980 80981FF0 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 04984 80981FF4 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 04988 80981FF8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 0498C 80981FFC AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 04990 80982000 8FAB005C */ lw $t3, 0x005C($sp) -/* 04994 80982004 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 04998 80982008 25CE9970 */ addiu $t6, $t6, 0x9970 ## $t6 = 06009970 -/* 0499C 8098200C AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 049A0 80982010 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 049A4 80982014 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 049A8 80982018 3C068098 */ lui $a2, %hi(D_80982960) ## $a2 = 80980000 -/* 049AC 8098201C 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 049B0 80982020 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 049B4 80982024 24C62960 */ addiu $a2, $a2, %lo(D_80982960) ## $a2 = 80982960 -/* 049B8 80982028 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 -/* 049BC 8098202C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 049C0 80982030 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 049C4 80982034 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 049C8 80982038 0C031AD5 */ jal Graph_CloseDisps -/* 049CC 8098203C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 049D0 80982040 8FBF001C */ lw $ra, 0x001C($sp) -/* 049D4 80982044 8FB00018 */ lw $s0, 0x0018($sp) -/* 049D8 80982048 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 049DC 8098204C 03E00008 */ jr $ra -/* 049E0 80982050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s deleted file mode 100644 index 56c2aa5868..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80982054 -/* 049E4 80982054 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 049E8 80982058 AFBF001C */ sw $ra, 0x001C($sp) -/* 049EC 8098205C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 049F0 80982060 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 049F4 80982064 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 049F8 80982068 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 049FC 8098206C C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 04A00 80982070 46002182 */ mul.s $f6, $f4, $f0 -/* 04A04 80982074 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 04A08 80982078 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 04A0C 8098207C 46004282 */ mul.s $f10, $f8, $f0 -/* 04A10 80982080 00000000 */ nop -/* 04A14 80982084 46008482 */ mul.s $f18, $f16, $f0 -/* 04A18 80982088 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 04A1C 8098208C E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 04A20 80982090 E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -/* 04A24 80982094 0C25FB91 */ jal func_8097EE44 -/* 04A28 80982098 AFA00010 */ sw $zero, 0x0010($sp) -/* 04A2C 8098209C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04A30 809820A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04A34 809820A4 03E00008 */ jr $ra -/* 04A38 809820A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s deleted file mode 100644 index 55dadd57fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809820AC -/* 04A3C 809820AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04A40 809820B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04A44 809820B4 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 04A48 809820B8 2401009A */ addiu $at, $zero, 0x009A ## $at = 0000009A -/* 04A4C 809820BC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 04A50 809820C0 54410004 */ bnel $v0, $at, .L809820D4 -/* 04A54 809820C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04A58 809820C8 0C01E245 */ jal func_80078914 -/* 04A5C 809820CC 240520DE */ addiu $a1, $zero, 0x20DE ## $a1 = 000020DE -/* 04A60 809820D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809820D4: -/* 04A64 809820D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04A68 809820D8 03E00008 */ jr $ra -/* 04A6C 809820DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s deleted file mode 100644 index 21018de01c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_80982B48 - .float 0.001 - -glabel D_80982B4C - .float 0.048 - -.text -glabel func_809820E0 -/* 04A70 809820E0 3C068016 */ lui $a2, %hi(gGameInfo) -/* 04A74 809820E4 24C6FA90 */ addiu $a2, %lo(gGameInfo) -/* 04A78 809820E8 8CC30000 */ lw $v1, 0x0000($a2) ## 8015FA90 -/* 04A7C 809820EC 84820172 */ lh $v0, 0x0172($a0) ## 00000172 -/* 04A80 809820F0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 04A84 809820F4 846E14F2 */ lh $t6, 0x14F2($v1) ## 000014F2 -/* 04A88 809820F8 846F14D4 */ lh $t7, 0x14D4($v1) ## 000014D4 -/* 04A8C 809820FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04A90 80982100 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 04A94 80982104 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 04A98 80982108 46802020 */ cvt.s.w $f0, $f4 -/* 04A9C 8098210C 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 04AA0 80982110 3C018098 */ lui $at, %hi(D_80982B48) ## $at = 80980000 -/* 04AA4 80982114 46803220 */ cvt.s.w $f8, $f6 -/* 04AA8 80982118 C4262B48 */ lwc1 $f6, %lo(D_80982B48)($at) -/* 04AAC 8098211C 3C018098 */ lui $at, %hi(D_80982B4C) ## $at = 80980000 -/* 04AB0 80982120 46809120 */ cvt.s.w $f4, $f18 -/* 04AB4 80982124 460A4400 */ add.s $f16, $f8, $f10 -/* 04AB8 80982128 46062202 */ mul.s $f8, $f4, $f6 -/* 04ABC 8098212C C42A2B4C */ lwc1 $f10, %lo(D_80982B4C)($at) -/* 04AC0 80982130 460A4480 */ add.s $f18, $f8, $f10 -/* 04AC4 80982134 46120102 */ mul.s $f4, $f0, $f18 -/* 04AC8 80982138 46048180 */ add.s $f6, $f16, $f4 -/* 04ACC 8098213C 4600320D */ trunc.w.s $f8, $f6 -/* 04AD0 80982140 44194000 */ mfc1 $t9, $f8 -/* 04AD4 80982144 00000000 */ nop -/* 04AD8 80982148 A4990174 */ sh $t9, 0x0174($a0) ## 00000174 -/* 04ADC 8098214C 84880174 */ lh $t0, 0x0174($a0) ## 00000174 -/* 04AE0 80982150 00484821 */ addu $t1, $v0, $t0 -/* 04AE4 80982154 A4890172 */ sh $t1, 0x0172($a0) ## 00000172 -/* 04AE8 80982158 8CCA0000 */ lw $t2, 0x0000($a2) ## 8015FA90 -/* 04AEC 8098215C 848D0172 */ lh $t5, 0x0172($a0) ## 00000172 -/* 04AF0 80982160 854514F6 */ lh $a1, 0x14F6($t2) ## 000014F6 -/* 04AF4 80982164 24A54000 */ addiu $a1, $a1, 0x4000 ## $a1 = 00004000 -/* 04AF8 80982168 00055C00 */ sll $t3, $a1, 16 -/* 04AFC 8098216C 000B6403 */ sra $t4, $t3, 16 -/* 04B00 80982170 018D082A */ slt $at, $t4, $t5 -/* 04B04 80982174 10200002 */ beq $at, $zero, .L80982180 -/* 04B08 80982178 00000000 */ nop -/* 04B0C 8098217C A4850172 */ sh $a1, 0x0172($a0) ## 00000172 -.L80982180: -/* 04B10 80982180 03E00008 */ jr $ra -/* 04B14 80982184 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s deleted file mode 100644 index d79751c02f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80982188 -/* 04B18 80982188 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B1C 8098218C AFA40018 */ sw $a0, 0x0018($sp) -/* 04B20 80982190 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B24 80982194 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04B28 80982198 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04B2C 8098219C 0C25F9C1 */ jal func_8097E704 -/* 04B30 809821A0 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 04B34 809821A4 10400003 */ beq $v0, $zero, .L809821B4 -/* 04B38 809821A8 8FAF0018 */ lw $t7, 0x0018($sp) -/* 04B3C 809821AC 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 04B40 809821B0 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164 -.L809821B4: -/* 04B44 809821B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B48 809821B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B4C 809821BC 03E00008 */ jr $ra -/* 04B50 809821C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s deleted file mode 100644 index 411fed9e3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809821C4 -/* 04B54 809821C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B58 809821C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B5C 809821CC AFA5001C */ sw $a1, 0x001C($sp) -/* 04B60 809821D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 04B64 809821D4 0C25FA09 */ jal func_8097E824 -/* 04B68 809821D8 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 04B6C 809821DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 04B70 809821E0 0C26082B */ jal func_809820AC -/* 04B74 809821E4 8FA5001C */ lw $a1, 0x001C($sp) -/* 04B78 809821E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 04B7C 809821EC 0C260862 */ jal func_80982188 -/* 04B80 809821F0 8FA5001C */ lw $a1, 0x001C($sp) -/* 04B84 809821F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B88 809821F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B8C 809821FC 03E00008 */ jr $ra -/* 04B90 80982200 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s deleted file mode 100644 index 6c27cbf2a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80982204 -/* 04B94 80982204 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B98 80982208 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B9C 8098220C AFA40018 */ sw $a0, 0x0018($sp) -/* 04BA0 80982210 0C260838 */ jal func_809820E0 -/* 04BA4 80982214 AFA5001C */ sw $a1, 0x001C($sp) -/* 04BA8 80982218 8FA40018 */ lw $a0, 0x0018($sp) -/* 04BAC 8098221C 8FA5001C */ lw $a1, 0x001C($sp) -/* 04BB0 80982220 0C25FB59 */ jal func_8097ED64 -/* 04BB4 80982224 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 04BB8 80982228 8FA40018 */ lw $a0, 0x0018($sp) -/* 04BBC 8098222C 0C26082B */ jal func_809820AC -/* 04BC0 80982230 8FA5001C */ lw $a1, 0x001C($sp) -/* 04BC4 80982234 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04BC8 80982238 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04BCC 8098223C 03E00008 */ jr $ra -/* 04BD0 80982240 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s deleted file mode 100644 index cef3b5e5b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s +++ /dev/null @@ -1,143 +0,0 @@ -.rdata -glabel D_80982978 - .asciz "../z_demo_gt_part6.c" - .balign 4 - -glabel D_80982990 - .asciz "../z_demo_gt_part6.c" - .balign 4 - -glabel D_809829A8 - .asciz "../z_demo_gt_part6.c" - .balign 4 - -.late_rodata -glabel D_80982B50 - .float 9.58738019108e-05 - -.text -glabel func_80982244 -/* 04BD4 80982244 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 04BD8 80982248 AFBF001C */ sw $ra, 0x001C($sp) -/* 04BDC 8098224C AFB00018 */ sw $s0, 0x0018($sp) -/* 04BE0 80982250 84880172 */ lh $t0, 0x0172($a0) ## 00000172 -/* 04BE4 80982254 3C018098 */ lui $at, %hi(D_80982B50) ## $at = 80980000 -/* 04BE8 80982258 C4282B50 */ lwc1 $f8, %lo(D_80982B50)($at) -/* 04BEC 8098225C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04BF0 80982260 3C028016 */ lui $v0, %hi(gGameInfo) -/* 04BF4 80982264 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 04BF8 80982268 468021A0 */ cvt.s.w $f6, $f4 -/* 04BFC 8098226C 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 04C00 80982270 3401BE80 */ ori $at, $zero, 0xBE80 ## $at = 0000BE80 -/* 04C04 80982274 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04C08 80982278 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C0C 8098227C 46083002 */ mul.s $f0, $f6, $f8 -/* 04C10 80982280 46000005 */ abs.s $f0, $f0 -/* 04C14 80982284 E7A00068 */ swc1 $f0, 0x0068($sp) -/* 04C18 80982288 844E14F0 */ lh $t6, 0x14F0($v0) ## 801614F0 -/* 04C1C 8098228C 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 04C20 80982290 00000000 */ nop -/* 04C24 80982294 46805420 */ cvt.s.w $f16, $f10 -/* 04C28 80982298 E7B00064 */ swc1 $f16, 0x0064($sp) -/* 04C2C 8098229C 844314EE */ lh $v1, 0x14EE($v0) ## 801614EE -/* 04C30 809822A0 A7A8006E */ sh $t0, 0x006E($sp) -/* 04C34 809822A4 0061C021 */ addu $t8, $v1, $at -/* 04C38 809822A8 27194000 */ addiu $t9, $t8, 0x4000 ## $t9 = 00004000 -/* 04C3C 809822AC A7B80062 */ sh $t8, 0x0062($sp) -/* 04C40 809822B0 0C031A73 */ jal Graph_Alloc - -/* 04C44 809822B4 A7B90060 */ sh $t9, 0x0060($sp) -/* 04C48 809822B8 AFA2005C */ sw $v0, 0x005C($sp) -/* 04C4C 809822BC 0C01DE0D */ jal Math_Coss - ## coss? -/* 04C50 809822C0 87A4006E */ lh $a0, 0x006E($sp) -/* 04C54 809822C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04C58 809822C8 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 04C5C 809822CC 3C068098 */ lui $a2, %hi(D_80982978) ## $a2 = 80980000 -/* 04C60 809822D0 24C62978 */ addiu $a2, $a2, %lo(D_80982978) ## $a2 = 80982978 -/* 04C64 809822D4 46009101 */ sub.s $f4, $f18, $f0 -/* 04C68 809822D8 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 -/* 04C6C 809822DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04C70 809822E0 24070089 */ addiu $a3, $zero, 0x0089 ## $a3 = 00000089 -/* 04C74 809822E4 0C031AB1 */ jal Graph_OpenDisps -/* 04C78 809822E8 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 04C7C 809822EC 0C01DE0D */ jal Math_Coss - ## coss? -/* 04C80 809822F0 87A40060 */ lh $a0, 0x0060($sp) -/* 04C84 809822F4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04C88 809822F8 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 04C8C 809822FC 87A40060 */ lh $a0, 0x0060($sp) -/* 04C90 80982300 0C01DE1C */ jal Math_Sins - ## sins? -/* 04C94 80982304 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 04C98 80982308 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 04C9C 8098230C 0C01DE0D */ jal Math_Coss - ## coss? -/* 04CA0 80982310 87A40062 */ lh $a0, 0x0062($sp) -/* 04CA4 80982314 C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 04CA8 80982318 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 04CAC 8098231C 87A4006E */ lh $a0, 0x006E($sp) -/* 04CB0 80982320 46080282 */ mul.s $f10, $f0, $f8 -/* 04CB4 80982324 00000000 */ nop -/* 04CB8 80982328 46105482 */ mul.s $f18, $f10, $f16 -/* 04CBC 8098232C 0C01DE1C */ jal Math_Sins - ## sins? -/* 04CC0 80982330 E7B20044 */ swc1 $f18, 0x0044($sp) -/* 04CC4 80982334 C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 04CC8 80982338 87A40062 */ lh $a0, 0x0062($sp) -/* 04CCC 8098233C 46040182 */ mul.s $f6, $f0, $f4 -/* 04CD0 80982340 0C01DE1C */ jal Math_Sins - ## sins? -/* 04CD4 80982344 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 04CD8 80982348 C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 04CDC 8098234C C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 04CE0 80982350 46080282 */ mul.s $f10, $f0, $f8 -/* 04CE4 80982354 00000000 */ nop -/* 04CE8 80982358 46105482 */ mul.s $f18, $f10, $f16 -/* 04CEC 8098235C 0C034213 */ jal Matrix_Push -/* 04CF0 80982360 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 04CF4 80982364 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 04CF8 80982368 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFD8 -/* 04CFC 8098236C 0C0348FF */ jal func_800D23FC -/* 04D00 80982370 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04D04 80982374 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 04D08 80982378 C7AE0048 */ lwc1 $f14, 0x0048($sp) -/* 04D0C 8098237C 8FA6004C */ lw $a2, 0x004C($sp) -/* 04D10 80982380 0C034261 */ jal Matrix_Translate -/* 04D14 80982384 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04D18 80982388 3C058098 */ lui $a1, %hi(D_80982990) ## $a1 = 80980000 -/* 04D1C 8098238C 24A52990 */ addiu $a1, $a1, %lo(D_80982990) ## $a1 = 80982990 -/* 04D20 80982390 8FA4005C */ lw $a0, 0x005C($sp) -/* 04D24 80982394 0C034695 */ jal Matrix_ToMtx -/* 04D28 80982398 24060099 */ addiu $a2, $zero, 0x0099 ## $a2 = 00000099 -/* 04D2C 8098239C 0C034221 */ jal Matrix_Pull -/* 04D30 809823A0 00000000 */ nop -/* 04D34 809823A4 0C024F46 */ jal func_80093D18 -/* 04D38 809823A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D3C 809823AC 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 04D40 809823B0 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 04D44 809823B4 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 04D48 809823B8 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 04D4C 809823BC AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 04D50 809823C0 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 04D54 809823C4 8FAB005C */ lw $t3, 0x005C($sp) -/* 04D58 809823C8 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 04D5C 809823CC 25CE9B80 */ addiu $t6, $t6, 0x9B80 ## $t6 = 06009B80 -/* 04D60 809823D0 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 04D64 809823D4 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 04D68 809823D8 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 04D6C 809823DC 3C068098 */ lui $a2, %hi(D_809829A8) ## $a2 = 80980000 -/* 04D70 809823E0 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 04D74 809823E4 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 04D78 809823E8 24C629A8 */ addiu $a2, $a2, %lo(D_809829A8) ## $a2 = 809829A8 -/* 04D7C 809823EC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 -/* 04D80 809823F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04D84 809823F4 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 -/* 04D88 809823F8 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 04D8C 809823FC 0C031AD5 */ jal Graph_CloseDisps -/* 04D90 80982400 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 04D94 80982404 8FBF001C */ lw $ra, 0x001C($sp) -/* 04D98 80982408 8FB00018 */ lw $s0, 0x0018($sp) -/* 04D9C 8098240C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 04DA0 80982410 03E00008 */ jr $ra -/* 04DA4 80982414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s deleted file mode 100644 index c022fe8b70..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8098254C -/* 04EDC 8098254C AFA40000 */ sw $a0, 0x0000($sp) -/* 04EE0 80982550 03E00008 */ jr $ra -/* 04EE4 80982554 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/data/overlays/actors/z_demo_gt.data.s b/data/overlays/actors/z_demo_gt.data.s deleted file mode 100644 index af4398591e..0000000000 --- a/data/overlays/actors/z_demo_gt.data.s +++ /dev/null @@ -1,117 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809825C0 - .word 0x64506400 -glabel D_809825C4 - .word 0xFF6E6000 -glabel D_809825C8 - .word 0x00000000, 0x40C00000, 0x00000000 -glabel D_809825D4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809825E0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809825EC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809825F8 - .word 0x48500064 -glabel D_809825FC - .word 0x00000000, 0xC1800000, 0x00000000 -glabel D_80982608 - .word 0x00000000, 0x3F99999A, 0x00000000 -glabel D_80982614 - .word 0x00000000 -glabel D_80982618 - .word 0xC1400000, 0xC1880000, 0x40A00000 -glabel D_80982624 - .word 0x00000000 -glabel D_80982628 - .word 0x3F800000, 0x00000000 -glabel D_80982630 - .word 0x00000000 -glabel D_80982634 - .word 0x00000000, 0x00000000 -glabel D_8098263C - .word 0x438C0000 -glabel D_80982640 - .word 0x41000000 -glabel D_80982644 - .word 0x0000000B -glabel D_80982648 - .word 0x00000001 -glabel D_8098264C - .word 0x00030000 -glabel D_80982650 - .word 0x40A00000, 0xC1800000, 0xC1800000 -glabel D_8098265C - .word 0x00000000 -glabel D_80982660 - .word 0x00000000 -glabel D_80982664 - .word 0x00000000, 0x00000000, 0xC1200000 -glabel D_80982670 - .word 0x40A00000, 0xC0400000, 0x00000000 -glabel D_8098267C - .word 0x40A00000, 0xC0400000, 0x00000000 -glabel D_80982688 - .word 0x40A00000, 0xC1800000, 0xC1800000 -glabel D_80982694 - .word 0x41700000, 0xC1D00000, 0x00000000 -glabel D_809826A0 - .word 0x40A00000, 0xC1800000, 0xC1800000 -glabel D_809826AC - .word 0x40A00000, 0xC1800000, 0xC1800000 -glabel D_809826B8 - .word 0x41A00000, 0x40C00000, 0x00000000 -glabel D_809826C4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809826D0 - .word 0x00000000, 0xC1880000, 0x00000000 -glabel D_809826DC - .word 0x00000000, 0xC1F00000, 0x00000000 -glabel D_809826E8 - .word func_8097F428 -.word func_8097FF14 -.word func_80980DB0 -.word func_809810A0 -.word func_80981588 -.word func_80981994 -.word func_80981E04 -.word func_809821C4 -.word func_8097F498 -.word func_8097FF5C -.word func_80980DF0 -.word func_809810E0 -.word func_809815C8 -.word func_809819D4 -.word func_80981E44 -.word func_80982204 -.word func_80981114 -.word func_809815FC -.word func_80981A08 -glabel D_80982734 - .word func_8098254C -.word func_8097F508 -.word func_8097FF9C -.word func_80980E24 -.word func_809811AC -.word func_80981694 -.word func_80981AA0 -.word func_80981E84 -.word func_80982244 -glabel Demo_Gt_InitVars - .word 0x01740600, 0x00000030, 0x014C0000, 0x000001A8 -.word DemoGt_Init -.word DemoGt_Destroy -.word DemoGt_Update -.word DemoGt_Draw -.word 0x00000000, 0x00000000 - diff --git a/include/functions.h b/include/functions.h index 8b55f35a14..4e44c8cf83 100644 --- a/include/functions.h +++ b/include/functions.h @@ -985,7 +985,7 @@ s32 func_8006F0A0(s32 arg0); // ? func_8006F0FC(?); u8 func_8006F140(GlobalContext*, EnvironmentContext*, UNK_TYPE); f32 func_8006F93C(u16, u16, u16); -f32 func_8006F9BC(u16, u16, u16, u16, u16); +f32 func_8006F9BC(u16 endFrame, u16 startFrame, u16 frames, u16, u16); // ? func_8006FB94(?); // ? func_8006FC88(?); // ? func_80070600(?); diff --git a/spec b/spec index 73dfc5e207..fdcf1c9aed 100644 --- a/spec +++ b/spec @@ -1543,8 +1543,11 @@ endseg beginseg name "ovl_Demo_Gt" include "build/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.o" - include "build/data/overlays/actors/z_demo_gt.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_Demo_Gt/ovl_Demo_Gt_reloc.o" +#else include "build/data/overlays/actors/z_demo_gt.reloc.o" +#endif endseg beginseg diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 2a35e075d5..0f1f01ba54 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -159,9 +159,9 @@ void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) { DemoGt* demoGt = this->demoGt; s16 params = this->actor.params; if (demoGt != NULL && (params != 6) && (params != 7) && (params != 8)) { - this->actor.posRot.pos.x = demoGt->actor.posRot.pos.x + this->deltaPosX; - this->actor.posRot.pos.y = demoGt->actor.posRot.pos.y + this->deltaPosY; - this->actor.posRot.pos.z = demoGt->actor.posRot.pos.z + this->deltaPosZ; + this->actor.posRot.pos.x = demoGt->dyna.actor.posRot.pos.x + this->deltaPosX; + this->actor.posRot.pos.y = demoGt->dyna.actor.posRot.pos.y + this->deltaPosY; + this->actor.posRot.pos.z = demoGt->dyna.actor.posRot.pos.z + this->deltaPosZ; } } diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 0c406311e7..b2349780d5 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1,4 +1,6 @@ #include "z_demo_gt.h" +#include "vt.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000030 @@ -9,7 +11,1790 @@ void DemoGt_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoGt_Update(Actor* thisx, GlobalContext* globalCtx); void DemoGt_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +extern UNK_TYPE D_06005CB8; +extern UNK_TYPE D_060091E4; + +extern Gfx D_06009970[]; +extern Gfx D_06007630[]; +extern Gfx D_06004F90[]; +extern Gfx D_06009610[]; +extern Gfx D_06002910[]; +extern Gfx D_060041A0[]; +extern Gfx D_06009B08[]; +extern Gfx D_06000EA0[]; + +void DemoGt_Destroy(Actor* thisx, GlobalContext* globalCtx) { + DemoGt* this = THIS; + + if ((this->dyna.actor.params == 1) || (this->dyna.actor.params == 2)) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } +} + +void DemoGt_PlayEarthquakeSfx() { + func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG); +} + +void DemoGt_PlayExplosion1Sfx(GlobalContext* globalCtx, Vec3f* pos) { + Audio_PlaySoundAtPosition(globalCtx, pos, 60, NA_SE_IT_BOMB_EXPLOSION); +} + +void DemoGt_PlayExplosion2Sfx(GlobalContext* globalCtx, Vec3f* pos) { + Audio_PlaySoundAtPosition(globalCtx, pos, 60, NA_SE_EV_GRAVE_EXPLOSION); +} + +void DemoGt_Rumble(GlobalContext* globalCtx) { + func_800AA000(0.0f, 0x32, 0xA, 5); +} + +void DemoGt_SpawnDust(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 scaleStep, + s16 life) { + static Color_RGBA8 brownPrim = { 100, 80, 100, 0 }; + static Color_RGBA8 redEnv = { 255, 110, 96, 0 }; + + func_8002843C(globalCtx, pos, velocity, accel, &brownPrim, &redEnv, + ((Math_Rand_ZeroOne() * (scale * 0.2f)) + scale), scaleStep, life); +} + +void func_8097D7D8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velOffset, f32 scale, s32 arg4, s32 arg5, s16 life) { + s32 pad; + + if (func_800C0D28(globalCtx) == 0) { + s32 frames = globalCtx->gameplayFrames; + + if (ABS(frames % arg4) == arg5) { + s32 pad[2]; + Vec3f velocity = { 0.0f, 6.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.0f, 0.0f }; + + velocity.x *= scale; + velocity.y *= scale; + velocity.z *= scale; + + velocity.x += velOffset->x; + velocity.y += velOffset->y; + velocity.z += velOffset->z; + + if (0) {} + + accel.x *= scale; + accel.y *= scale; + accel.z *= scale; + + DemoGt_SpawnDust(globalCtx, pos, &velocity, &accel, (300.0f * scale), (15.0f * scale), life); + } + } +} + +Actor* DemoGt_SpawnCloudRing(GlobalContext* globalCtx, Vec3f* pos, s16 params) { + return Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_SPOT16_DOUGHNUT, pos->x, pos->y, pos->z, 0, 0, 0, + params); +} + +void DemoGt_SpawnExplosionWithSound(GlobalContext* globalCtx, Vec3f* pos, f32 scale) { + s32 pad; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.0f, 0.0f }; + + EffectSsBomb2_SpawnLayered(globalCtx, pos, &velocity, &accel, (100.0f * scale), (15.0f * scale)); + DemoGt_PlayExplosion1Sfx(globalCtx, pos); +} + +void DemoGt_SpawnExplosionNoSound(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale) { + EffectSsBomb2_SpawnLayered(globalCtx, pos, velocity, accel, (100.0f * scale), (25.0f * scale)); +} + +void func_8097DAC8(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { + Vec3f pos; + Vec3f velocity; + f32 temp_f0; + s16 angle; + s16 phi_s0; + s32 i; + + angle = 0; + + for (i = 0; i < 12; i++) { + + pos.x = Math_Sins(angle) * 46.0f; + pos.y = (Math_Rand_ZeroOne() * 75.0f) + 2.0f; + pos.z = Math_Coss(angle) * 46.0f; + + velocity.x = (pos.x * 0.1f) + 20.0f; + velocity.y = Math_Rand_ZeroOne() * 16.0f; + velocity.z = pos.z * 0.1f; + + pos.x += spawnerPos->x; + pos.y += spawnerPos->y; + pos.z += spawnerPos->z; + + temp_f0 = Math_Rand_ZeroOne(); + + if (temp_f0 < 0.1f) { + phi_s0 = 96; + } else if (temp_f0 < 0.7f) { + phi_s0 = 64; + } else { + phi_s0 = 32; + } + + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0, + (s32)(Math_Rand_ZeroOne() * 10.0f + 30.0f), 2, 300, (s32)(Math_Rand_ZeroOne() * 0.0f) + 30, + KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + angle += 0x1555; + } +} + +void func_8097DD28(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { + Vec3f pos; + Vec3f velocity; + f32 temp_f0; + s16 angle; + s16 phi_s0; + s32 i; + + angle = 0; + + for (i = 0; i < 8; i++) { + + pos.x = Math_Sins(angle) * 30.0f; + pos.y = (Math_Rand_ZeroOne() * 75.0f) + 2.0f; + pos.z = Math_Coss(angle) * 30.0f; + + velocity.x = 0.0f; + velocity.y = Math_Rand_ZeroOne() * -4.0f; + velocity.z = pos.z * 0.1f; + + pos.x += spawnerPos->x; + pos.y += spawnerPos->y; + pos.z += spawnerPos->z; + + temp_f0 = Math_Rand_ZeroOne(); + + if (temp_f0 < 0.1f) { + phi_s0 = 96; + } else if (temp_f0 < 0.7f) { + phi_s0 = 64; + } else { + phi_s0 = 32; + } + + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0, + (s32)((Math_Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, + (s32)(Math_Rand_ZeroOne() * 0.0f) + 0x1E, KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + + angle += 0x2000; + } +} + +void func_8097DF70(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) { + Vec3f pos; + Vec3f velocity; + f32 temp_f0; + s16 angle; + s16 phi_s0; + s32 i; + + angle = 0; + + for (i = 0; i < 12; i++) { + + pos.x = Math_Sins(angle) * 16.0f; + pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.z = Math_Coss(angle) * 16.0f; + + velocity.x = pos.x * 0.6f; + velocity.y = (Math_Rand_ZeroOne() * 36.0f) + 6.0f; + velocity.z = pos.z * 0.6f; + + pos.x += spawnerPos->x; + pos.y += spawnerPos->y; + pos.z += spawnerPos->z; + + temp_f0 = Math_Rand_ZeroOne(); + + if (temp_f0 < 0.1f) { + phi_s0 = 97; + } else if (temp_f0 < 0.7f) { + phi_s0 = 65; + } else { + phi_s0 = 33; + } + + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -200, phi_s0, 10, 10, 0, + Math_Rand_ZeroOne() * 30.0f + 30.0f, 2, 300, (s32)(Math_Rand_ZeroOne() * 30.0f) + 30, + KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + angle += 0x1555; + } +} + +void func_8097E1D4(GlobalContext* globalCtx, Vec3f* arg1, s16 arg2) { + Vec3f pos; + Vec3f velocity; + f32 temp_f0; + s16 angle; + s16 phi_s0; + s32 i; + + angle = 0; + + for (i = 0; i < 1; i++) { + + pos.x = Math_Sins(angle) * 46.0f; + pos.y = (Math_Rand_ZeroOne() * 75.0f) - 28.0f; + pos.z = Math_Coss(angle) * 46.0f; + + velocity.x = Math_Sins(arg2) * 3.0f; + velocity.y = (Math_Rand_ZeroOne() * -4.0f) + 10.0f; + velocity.z = Math_Coss(arg2) * 3.0f; + + pos.x += arg1->x; + pos.y += arg1->y; + pos.z += arg1->z; + + temp_f0 = Math_Rand_ZeroOne(); + + if (temp_f0 < 0.1f) { + phi_s0 = 97; + } else if (temp_f0 < 0.7f) { + phi_s0 = 65; + } else { + phi_s0 = 33; + } + + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, arg1, -247, phi_s0, 3, 0, 0, + (s32)((Math_Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, + (s32)(Math_Rand_ZeroOne() * 0.0f) + 30, KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0); + + angle += 0x10000; + } +} + +#ifdef NON_MATCHING +void func_8097E454(GlobalContext* globalCtx, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale, + s32 arg6, s32 arg7, s16 life) { + s32 pad2[4]; + s16 increment; + s32 frames; + s32 i; + s16 phi_s0; + s16 dustScaleStep = 15.0f * scale; + f32 dustScale = 300.0f * scale; + Vec3f pos; + + if ((func_800C0D28(globalCtx) == 0) && (arg7 > 0) && (arg6 > 0)) { + frames = 0x10000 * (ABS((s32)globalCtx->gameplayFrames) % arg7); + phi_s0 = frames / arg6; + increment = 0x10000 / arg6; + + for (i = frames; i < arg6; i += arg7) { + + pos.x = (Math_Sins(phi_s0) * arg4) + spawnerPos->x; + pos.y = spawnerPos->y; + pos.z = (Math_Coss(phi_s0) * arg4) + spawnerPos->z; + + DemoGt_SpawnDust(globalCtx, &pos, velocity, accel, dustScale, dustScaleStep, life); + + if (Math_Rand_ZeroOne() <= 0.05f) { + func_8097E1D4(globalCtx, &pos, phi_s0); + } + + phi_s0 += increment; + } + } +} +#else +void func_8097E454(GlobalContext* globalCtx, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale, + s32 arg6, s32 arg7, s16 life); +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s") +#endif + +u8 func_8097E69C(GlobalContext* globalCtx) { + if (globalCtx->csCtx.state == 0) { + return true; + } else { + return false; + } +} + +CsCmdActorAction* DemoGt_GetNpcAction(GlobalContext* globalCtx, u32 actionIdx) { + s32 pad[2]; + CsCmdActorAction* ret = NULL; + + if (!func_8097E69C(globalCtx)) { + ret = globalCtx->csCtx.npcActions[actionIdx]; + } + + return ret; +} + +u8 func_8097E704(GlobalContext* globalCtx, u16 arg1, s32 arg2) { + CsCmdActorAction* action = DemoGt_GetNpcAction(globalCtx, arg2); + + if ((action != NULL) && (action->action == arg1)) { + return true; + } else { + return false; + } +} + +void func_8097E744(DemoGt* this, GlobalContext* globalCtx, u32 actionIdx) { + CsCmdActorAction* npcAction = DemoGt_GetNpcAction(globalCtx, actionIdx); + Vec3f* pos = &this->dyna.actor.posRot.pos; + f32 startX; + f32 startY; + f32 startZ; + f32 endX; + f32 endY; + f32 endZ; + f32 someFloat; + + if (npcAction != NULL) { + someFloat = func_8006F9BC(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames, 8, 0); + startX = npcAction->startPos.x; + startY = npcAction->startPos.y; + startZ = npcAction->startPos.z; + endX = npcAction->endPos.x; + endY = npcAction->endPos.y; + endZ = npcAction->endPos.z; + + pos->x = ((endX - startX) * someFloat) + startX; + pos->y = ((endY - startY) * someFloat) + startY; + pos->z = ((endZ - startZ) * someFloat) + startZ; + } +} + +#ifdef NON_MATCHING +void func_8097E824(DemoGt* this, s32 arg1) { + s16 phi_a1; + s16 phi_a2; + s16 phi_a3; + + f32 tempf1; + f32 tempf2; + f32 tempf3; + + f32 phi_f2; + f32 phi_f12; + f32 phi_f14; + + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3s* unk16C = &this->unk_16C; + + if (arg1 == 1) { + phi_a1 = kREG(19) + 0x8000; + phi_a2 = kREG(20) + 0x8000; + phi_a3 = kREG(21) + 0x8000; + phi_f14 = kREG(16) * 0.1f; + phi_f12 = (kREG(17) * 0.1f) + 0.5f; + phi_f2 = kREG(18) * 0.1f; + } else if (arg1 == 2) { + phi_a1 = kREG(25) + 0x8000; + phi_a2 = kREG(26) + 0x8000; + phi_a3 = kREG(27) + 0x8000; + phi_f14 = kREG(22) * 0.1f; + phi_f12 = (kREG(23) * 0.1f) + 0.5f; + phi_f2 = kREG(24) * 0.1f; + } else if (arg1 == 3) { + phi_a1 = kREG(31) + 0x8000; + phi_a2 = kREG(32) + 0x8000; + phi_a3 = kREG(33) + 0x8000; + phi_f14 = kREG(28) * 0.1f; + phi_f12 = (kREG(29) * 0.1f) + 0.5f; + phi_f2 = kREG(30) * 0.1f; + } else if (arg1 == 4) { + phi_a1 = kREG(37) + 0x8000; + phi_a2 = kREG(38) + 0x8000; + phi_a3 = kREG(39) + 0x8000; + phi_f14 = kREG(34) * 0.1f; + phi_f12 = (kREG(35) * 0.1f) + 0.5f; + phi_f2 = kREG(36) * 0.1f; + } else if (arg1 == 5) { + phi_a1 = kREG(43) + 0x8000; + phi_a2 = kREG(44) + 0x8000; + phi_a3 = kREG(45) + 0x8000; + phi_f14 = kREG(40) * 0.1f; + phi_f12 = (kREG(41) * 0.1f) + 0.5f; + phi_f2 = kREG(42) * 0.1f; + } else if (arg1 == 6) { + phi_a1 = kREG(49) + 0x8000; + phi_a2 = kREG(50) + 0x8000; + phi_a3 = kREG(51) + 0x8000; + phi_f14 = kREG(46) * 0.1f; + phi_f12 = (kREG(47) * 0.1f) + 0.5f; + phi_f2 = kREG(48) * 0.1f; + } else if (arg1 == 7) { + phi_a1 = kREG(85) + 0x8000; + phi_a2 = kREG(86) + 0x8000; + phi_a3 = kREG(87) + 0x8000; + phi_f14 = kREG(82) * 0.1f; + phi_f12 = (kREG(83) * 0.1f) + 0.5f; + phi_f2 = kREG(84) * 0.1f; + } else { + phi_a1 = kREG(91) + 0x8000; + phi_a2 = kREG(92) + 0x8000; + phi_a3 = kREG(93) + 0x8000; + phi_f14 = kREG(88) * 0.1f; + phi_f12 = (kREG(89) * 0.1f) + 0.5f; + phi_f2 = kREG(90) * 0.1f; + } + + unk16C->x += phi_a1; + unk16C->y += phi_a2; + unk16C->z += phi_a3; + + tempf1 = Math_Coss(unk16C->x) * phi_f2; + tempf2 = Math_Coss(unk16C->y) * phi_f12; + tempf3 = Math_Coss(unk16C->z) * phi_f14; + + pos->x += tempf1; + pos->y += tempf2; + pos->z += tempf3; +} +#else +void func_8097E824(DemoGt* this, s32 arg1); +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s") +#endif + +void func_8097ED64(DemoGt* this, GlobalContext* globalCtx, s32 actionIdx) { + func_8097E744(this, globalCtx, actionIdx); + func_8097E824(this, actionIdx); +} + +u8 func_8097ED94() { + if (kREG(2) != 0) { + return true; + } else if (gSaveContext.sceneSetupIndex < 4) { + return false; + } else { + return true; + } +} + +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; + +void func_8097EDD8(DemoGt* this, GlobalContext* globalCtx, UNK_PTR arg0) { + s32 pad[3]; + ColHeader* localC; + + if (arg0 != NULL) { + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + DynaPolyInfo_SetActorMove(&this->dyna, 0); + localC = NULL; + DynaPolyInfo_Alloc(arg0, &localC); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localC); + } +} + +u8 func_8097EE44(DemoGt* this, GlobalContext* globalCtx, s32 arg0, s32 arg1, UNK_PTR arg2) { + + if (func_8097ED94()) { + this->updateMode = arg0; + this->drawConfig = arg1; + func_8097EDD8(this, globalCtx, arg2); + return true; + } else { + Actor_Kill(&this->dyna.actor); + return false; + } +} + +void func_8097EEA8_Init0(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + + func_8097EE44(this, globalCtx, 0, 1, NULL); +} + +void func_8097EF00(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + + if (frames == 527) { + func_800F3F3C(13); + } +} + +void func_8097EF34(DemoGt* this, GlobalContext* globalCtx) { +} + +void func_8097EF40(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + s32 pad1[3]; + Vec3f dustPos; + Vec3f velocity = { 0.0f, -16.0f, 0.0f }; + Vec3f accel = { 0.0f, 1.20000004768f, 0.0f }; + Vec3f* pos = &this->dyna.actor.posRot.pos; + s32 pad; + + if ((kREG(1) == 20) || (frames == 220)) { + dustPos.x = pos->x + 256.0f; + dustPos.y = pos->y + 679.0f; + dustPos.z = pos->z + 82.0f; + + DemoGt_SpawnDust(globalCtx, &dustPos, &velocity, &accel, 1700.0f, 15, 30); + + dustPos.x = pos->x + 256.0f; + dustPos.y = pos->y + 679.0f; + dustPos.z = pos->z - 60.0f; + + DemoGt_SpawnDust(globalCtx, &dustPos, &velocity, &accel, 1700.0f, 15, 30); + } +} + +void func_8097F0AC(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f sp38; + s16 pad1[3]; + Vec3f sp24; + u16 frames = globalCtx->csCtx.frames; + s32 pad2; + + if ((frames == 140) || (kREG(1) == 19)) { + sp38.x = this->dyna.actor.posRot.pos.x + 260.0f; + sp38.y = this->dyna.actor.posRot.pos.y + 340.0f; + sp38.z = this->dyna.actor.posRot.pos.z + 45.0f; + DemoGt_SpawnExplosionWithSound(globalCtx, &sp38, 2.0f); + } + + if (frames == 176) { + sp24.x = this->dyna.actor.posRot.pos.x + 260.0f; + sp24.y = this->dyna.actor.posRot.pos.y + 840.0f; + sp24.z = this->dyna.actor.posRot.pos.z + 45.0f; + DemoGt_SpawnExplosionWithSound(globalCtx, &sp24, 2.0f); + } +} + +void func_8097F19C(DemoGt* this, GlobalContext* globalCtx) { + func_8097EF34(this, globalCtx); + func_8097EF40(this, globalCtx); + func_8097F0AC(this, globalCtx); +} + +void func_8097F1D8(DemoGt* this) { + f32 temp_v0 = this->unk_172; + + this->unk_174 = (temp_v0 * ((kREG(64) * 0.001f) + 0.048f)) + (kREG(72) + 10.0f); + this->unk_172 += this->unk_174; + + if (this->unk_172 > (s16)(kREG(73) + 0x250)) { + this->unk_172 = kREG(73) + 0x250; + } +} + +void func_8097F280(DemoGt* this, GlobalContext* globalCtx) { + s32* unk178 = this->unk_178; + s32* unk188 = this->unk_188; + s32* unk198 = this->unk_198; + f32 temp_f0; + + if (globalCtx->csCtx.frames < 160) { + unk178[0] = 100; + unk178[1] = 255; + unk178[2] = 200; + + unk188[0] = 255; + unk188[1] = 120; + unk188[2] = 100; + + unk198[0]++; + unk198[1]--; + } else if (globalCtx->csCtx.frames < 170) { + temp_f0 = func_8006F9BC(170, 160, globalCtx->csCtx.frames, 0, 0); + + unk178[0] = (temp_f0 * -63.0f) + 163.0f; + unk178[1] = (temp_f0 * -155.0f) + 255.0f; + unk178[2] = temp_f0 * -100.0f + 200.0f; + + unk188[0] = (temp_f0 * -155.0f) + 255.0f; + unk188[1] = (temp_f0 * -20.0f) + 120.0f; + unk188[2] = 100; + } else { + unk178[0] = 100; + unk178[1] = 100; + unk178[2] = 100; + + unk188[0] = 100; + unk188[1] = 100; + unk188[2] = 100; + } +} + +void func_8097F3EC(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 1)) { + this->updateMode = 8; + } +} + +void DemoGt_Update0(DemoGt* this, GlobalContext* globalCtx) { + func_8097F280(this, globalCtx); + func_8097E824(this, 1); + func_8097F19C(this, globalCtx); + func_8097F3EC(this, globalCtx); + DemoGt_PlayEarthquakeSfx(); + DemoGt_Rumble(globalCtx); + func_8097EF00(this, globalCtx); +} + +void DemoGt_Update8(DemoGt* this, GlobalContext* globalCtx) { + func_8097F280(this, globalCtx); + func_8097F1D8(this); + func_8097ED64(this, globalCtx, 1); + func_8097F19C(this, globalCtx); + DemoGt_PlayEarthquakeSfx(); + DemoGt_Rumble(globalCtx); + func_8097EF00(this, globalCtx); +} + +void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) { + s32 pad; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + u32 gameplayFrames = globalCtx->gameplayFrames; + s16 pad2[2]; + s16 spC6; + f32 spC0; + f32 spBC; + s16 spBA; + s16 spB8; + Mtx* spB4; + Vec3f spA8; + Vec3f sp9C; + f32 sp98; + s32* unk198; + s32* unk188; + s32* unk178; + + spC6 = this->unk_172; + spC0 = fabsf(spC6 * (M_PI / 0x8000)); + spBC = kREG(71); + spB8 = (s16)((s32)kREG(70)) + 0x4000; + spBA = kREG(70); + spB4 = Graph_Alloc(gfxCtx, sizeof(Mtx)); + sp98 = 1.0f - Math_Coss(spC6); + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part1.c", 458); + + spA8.x = Math_Coss(spB8); + spA8.y = 0.0f; + spA8.z = Math_Sins(spB8); + sp9C.x = Math_Coss(spBA) * spBC * sp98; + sp9C.y = Math_Sins(spC6) * spBC; + sp9C.z = Math_Sins(spBA) * spBC * sp98; + + Matrix_Push(); + + func_800D23FC(spC0, &spA8, 1); + Matrix_Translate(sp9C.x, sp9C.y, sp9C.z, MTXMODE_APPLY); + Matrix_ToMtx(spB4, "../z_demo_gt_part1.c", 474); + unk198 = this->unk_198; + unk188 = this->unk_188; + unk178 = this->unk_178; + + Matrix_Pull(); + + func_80093D18(gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, + Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk178[0], + unk178[1], unk178[2], 0x80)); + gSPSegment(POLY_OPA_DISP++, 0x0A, + Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk188[0], + unk188[1], unk188[2], 0x80)); + gSPMatrix(POLY_OPA_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06002910); + func_80093D84(gfxCtx); + gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); + gSPSegment( + POLY_XLU_DISP++, 0x09, + Gfx_TwoTexScroll(gfxCtx, 0, 0, gameplayFrames * 0x14, 0x10, 0x200, 1, 0, gameplayFrames * 0x1E, 0x10, 0x200)); + gSPMatrix(POLY_XLU_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_060041A0); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part1.c", 557); +} + +void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + func_8097EE44(this, globalCtx, 1, 2, &D_06005CB8); +} + +void func_8097F960(DemoGt* this, GlobalContext* globalCtx) { +} + +void func_8097F96C(DemoGt* this, GlobalContext* globalCtx) { + static Actor* cloudRing = NULL; + s32 pad[4]; + Vec3f pos; + Actor* actor; + u16 frames = globalCtx->csCtx.frames; + + if (((frames > 1059) && (frames < 1062)) || kREG(1) == 17) { + pos.x = this->dyna.actor.posRot.pos.x; + pos.y = this->dyna.actor.posRot.pos.y + 612.0f; + pos.z = this->dyna.actor.posRot.pos.z; + + if (cloudRing == NULL) { + cloudRing = DemoGt_SpawnCloudRing(globalCtx, &pos, 2); + } else { + actor = cloudRing; + actor->posRot.pos.x = pos.x; + actor->posRot.pos.y = pos.y; + actor->posRot.pos.z = pos.z; + } + } +} + +void func_8097FA1C(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { -12.0f, -17.0, 5.0 }; + s32 pad1[3]; + + if (((frames > 502) && !(frames >= 581)) || (kREG(1) == 5)) { + dustPos.x = pos->x + 300.0f; + dustPos.y = pos->y + 360.0f; + dustPos.z = pos->z - 377.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 6.0f, 6, 1, 35); + } +} + +void func_8097FAFC(DemoGt* this, GlobalContext* globalCtx) { + static Vec3f velocity = { 0.0f, 1.0f, 0.0f }; + static Vec3f accel = { 0.0f, 0.0f, 0.0f }; + static f32 arg4 = 280.0f; + static f32 scale = 8.0f; + static s32 arg6 = 11; + static s32 arg7 = 1; + static s16 life = 3; + s32 pad[2]; + u16 frames = globalCtx->csCtx.frames; + Vec3f pos; + f32 new_var = -200.0; + + if (((frames > 582) && (frames < 683)) || (kREG(1) == 6)) { + pos = this->dyna.actor.posRot.pos; + pos.y += 680.0f; + + if (frames == 682) { + velocity.y += new_var; + } else if (frames == 681) { + accel.y += new_var; + } + + func_8097E454(globalCtx, &pos, &velocity, &accel, arg4, scale, arg6, arg7, life); + } +} + +void func_8097FC1C(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; + s32 pad1[3]; + + if (frames > 682 || kREG(1) == 7) { + dustPos.x = pos->x + 260.0f; + dustPos.y = pos->y + 360.0f; + dustPos.z = pos->z + 260.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 6.0f, 6, 0, 35); + } +} + +void func_8097FCE4(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f vec; + u16 frames = globalCtx->csCtx.frames; + + if (frames == 0x1F7 || kREG(1) == 4) { + vec.x = this->dyna.actor.posRot.pos.x + 300.0f; + vec.y = this->dyna.actor.posRot.pos.y + 560.0f; + vec.z = this->dyna.actor.posRot.pos.z - 377.0f; + DemoGt_SpawnExplosionWithSound(globalCtx, &vec, 2.0f); + } +} + +void func_8097FD70(DemoGt* this, GlobalContext* globalCtx) { + func_8097F960(this, globalCtx); + func_8097F96C(this, globalCtx); + func_8097FA1C(this, globalCtx); + func_8097FAFC(this, globalCtx); + func_8097FC1C(this, globalCtx); + func_8097FCE4(this, globalCtx); +} + +void func_8097FDDC(DemoGt* this, GlobalContext* globalCtx) { + s32* unk178 = this->unk_178; + s32* unk198 = this->unk_198; + + if (globalCtx->csCtx.frames < 610) { + unk178[0] = 163; + unk178[1] = 193; + unk178[2] = 193; + unk198[0]++; + unk198[1]--; + } else if (globalCtx->csCtx.frames < 620) { + f32 temp_f0 = func_8006F9BC(620, 610, globalCtx->csCtx.frames, 0, 0); + + unk178[0] = (temp_f0 * (-13.0f)) + 163.0f; + unk178[1] = (temp_f0 * (-43.0f)) + 193.0f; + unk178[2] = (temp_f0 * (-43.0f)) + 193.0f; + } else { + unk178[0] = 150; + unk178[1] = 150; + unk178[2] = 150; + } +} + +void func_8097FED8(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 2)) { + this->updateMode = 9; + } +} + +void DemoGt_Update1(DemoGt* this, GlobalContext* globalCtx) { + func_8097FDDC(this, globalCtx); + func_8097E824(this, 2); + func_8097FD70(this, globalCtx); + func_8097FED8(this, globalCtx); +} + +void DemoGt_Update9(DemoGt* this, GlobalContext* globalCtx) { + func_8097FDDC(this, globalCtx); + func_8097ED64(this, globalCtx, 2); + func_8097FD70(this, globalCtx); +} + +void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32* unk198; + s32* unk178; + s32 pad; + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part2.c", 470); + + func_80093D18(gfxCtx); + unk198 = this->unk_198; + unk178 = this->unk_178; + gSPSegment(POLY_OPA_DISP++, 0x08, + Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk178[0], + unk178[1], unk178[2], 128)); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part2.c", 485), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06004F90); + gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part2.c", 489); +} + +void func_80980110_Init2(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + func_8097EE44(this, globalCtx, 2, 3, &D_060091E4); +} + +void func_8098016C(DemoGt* this, GlobalContext* globalCtx) { +} + +void func_80980178(DemoGt* this, GlobalContext* globalCtx) { +} + +void func_80980184(DemoGt* this, GlobalContext* globalCtx) { + static Actor* cloudRing = NULL; + s32 pad[4]; + Vec3f pos; + Actor* actor; + + if ((globalCtx->csCtx.frames > 1027) && (globalCtx->csCtx.frames < 1031)) { + pos.x = this->dyna.actor.posRot.pos.x; + pos.y = this->dyna.actor.posRot.pos.y + 247.0f; + pos.z = this->dyna.actor.posRot.pos.z; + + if (cloudRing == NULL) { + cloudRing = DemoGt_SpawnCloudRing(globalCtx, &pos, 3); + } else { + actor = cloudRing; + actor->posRot.pos.x = pos.x; + actor->posRot.pos.y = pos.y; + actor->posRot.pos.z = pos.z; + } + } +} + +void func_80980218(DemoGt* this, GlobalContext* globalCtx) { + static Actor* cloudRing = NULL; + s32 pad[4]; + Vec3f pos; + Actor* actor; + + if ((globalCtx->csCtx.frames > 997) && (globalCtx->csCtx.frames < 1001)) { + pos.x = this->dyna.actor.initPosRot.pos.x; + pos.y = this->dyna.actor.initPosRot.pos.y + 38.0f; + pos.z = this->dyna.actor.initPosRot.pos.z; + + if (cloudRing == NULL) { + cloudRing = DemoGt_SpawnCloudRing(globalCtx, &pos, 4); + } else { + actor = cloudRing; + actor->posRot.pos.x = pos.x; + actor->posRot.pos.y = pos.y; + actor->posRot.pos.z = pos.z; + } + } +} + +void func_809802AC(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 0.0f, 0.0f, -10.0f }; + s32 pad1[3]; + + if (frames > 109 && frames < 140) { + dustPos.x = pos->x - 100.0f; + dustPos.y = pos->y + 1260.0f; + dustPos.z = pos->z - 323.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 4.0f, 3, 0, 20); + } +} + +void func_8098036C(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + Vec3f* posRot = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; + s32 pad1[3]; + + if ((frames > 284) && (frames < 421)) { + dustPos.x = posRot->x + 760.0f; + dustPos.y = posRot->y - 40.0f; + dustPos.z = posRot->z - 240.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 6.0f, 6, 1, 35); + } +} + +void func_80980430(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + s32 frames = globalCtx->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; + s32 pad1[3]; + + if (frames > 709 || kREG(1) == 8) { + dustPos.x = pos->x + 760.0f; + dustPos.y = pos->y - 40.0f; + dustPos.z = pos->z - 240.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 6.0f, 6, 1, 35); + } +} + +void func_80980504(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; + s32 pad1[3]; + + if ((frames > 704) || kREG(1) == 9) { + dustPos.x = pos->x + 830.0f; + dustPos.y = pos->y + 60.0f; + dustPos.z = pos->z + 390.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 6.0f, 6, 2, 35); + } +} + +void func_809805D8(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + Vec3f* homePos = &this->dyna.actor.initPosRot.pos; + Vec3f velOffset = { 15.0f, -26.0, 0.0f }; + s32 pad1[3]; + + if (((frames > 739) && (frames < 781)) || kREG(1) == 11) { + dustPos.x = homePos->x + 550.0f; + dustPos.y = homePos->y - 110.0f; + dustPos.z = homePos->z + 50.0f; + func_8097D7D8(globalCtx, &dustPos, &velOffset, 6.0f, 6, 4, 35); + } +} + +void func_809806B8(DemoGt* this, GlobalContext* globalContext) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalContext->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; + s32 pad1[3]; + + if ((frames > 964) || (kREG(1) == 12)) { + dustPos.x = pos->x + 460.0f; + dustPos.y = pos->y + 60.0f; + dustPos.z = pos->z + 760.0f; + func_8097D7D8(globalContext, &dustPos, &velOffset, 6.0f, 6, 3, 35); + } +} + +void func_8098078C(DemoGt* this, GlobalContext* globalContext) { + s32 pad[3]; + Vec3f dustPos; + u16 frames = globalContext->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; + s32 pad1[3]; + + if ((frames > 939) || (kREG(1) == 14)) { + dustPos.x = pos->x + 360.0f; + dustPos.y = pos->y + 70.0f; + dustPos.z = pos->z - 640.0f; + func_8097D7D8(globalContext, &dustPos, &velOffset, 6.0, 6, 0, 35); + } +} + +void func_8098085C(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f sp28; + u16 frames = globalCtx->csCtx.frames; + Vec3f* pos = &this->dyna.actor.posRot.pos; + + if ((frames == 58) || (kREG(1) == 1)) { + sp28.x = pos->x + 900.0f; + sp28.y = pos->y - 50.0f; + sp28.z = pos->z + 93.0f; + DemoGt_SpawnExplosionWithSound(globalCtx, &sp28, 2.0f); + } else if (frames == 80) { + sp28.x = pos->x + 810.0f; + sp28.y = pos->y + 200.0f; + sp28.z = pos->z - 37.0f; + DemoGt_SpawnExplosionWithSound(globalCtx, &sp28, 0.899999976158f); + } else if (frames == 90) { + sp28.x = pos->x - 220.0f; + sp28.y = pos->y + 1350.0f; + sp28.z = pos->z - 287.0f; + DemoGt_SpawnExplosionWithSound(globalCtx, &sp28, 2.0f); + } +} + +void func_809809C0(DemoGt* this, GlobalContext* globalCtx) { + GlobalContext* globalCtx2 = globalCtx; + DemoGt* this2 = this; + s32 gameplayFrames = globalCtx2->gameplayFrames; + u16 frames = globalCtx2->csCtx.frames; + Vec3f sp54; + s16 pad[3]; + + if (((frames > 469) && (frames < 481)) || (kREG(1) == 3)) { + Vec3f sp40 = { 20.0f, 6.0f, 0.0f }; + Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; + s16 pad2[3]; + + sp54.x = this2->dyna.actor.posRot.pos.x + 790.0f; + sp54.y = this2->dyna.actor.posRot.pos.y + 60.0f; + sp54.z = this2->dyna.actor.posRot.pos.z + 23.0f; + + if (ABS(gameplayFrames % 12) == 0) { + DemoGt_SpawnExplosionNoSound(globalCtx2, &sp54, &sp40, &sp34, 2.0f); + } + } +} + +void func_80980AD4(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[4]; + Vec3f pos; + u16 frames = globalCtx->csCtx.frames; + + if ((frames == 477) || (kREG(2) == 1)) { + pos.x = this->dyna.actor.posRot.pos.x + 790.0f; + pos.y = this->dyna.actor.posRot.pos.y + 60.0f; + pos.z = this->dyna.actor.posRot.pos.z + 23.0f; + + func_8097DAC8(this, globalCtx, &pos); + DemoGt_PlayExplosion2Sfx(globalCtx, &pos); + } +} + +void func_80980B68(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[4]; + Vec3f pos; + u16 frames = globalCtx->csCtx.frames; + + if ((frames == 317) || (kREG(3) == 1)) { + pos.x = this->dyna.actor.posRot.pos.x + 980.0f; + pos.y = this->dyna.actor.posRot.pos.y + 410.0f; + pos.z = this->dyna.actor.posRot.pos.z - 177.0f; + func_8097DD28(this, globalCtx, &pos); + DemoGt_PlayExplosion2Sfx(globalCtx, &pos); + } +} + +void func_80980BFC(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[4]; + Vec3f pos; + u16 frames = globalCtx->csCtx.frames; + + if ((frames == 740) || (kREG(4) == 1)) { + pos.x = this->dyna.actor.posRot.pos.x + 790.0f; + pos.y = this->dyna.actor.posRot.pos.y + 60.0f; + pos.z = this->dyna.actor.posRot.pos.z + 23.0f; + + func_8097DF70(this, globalCtx, &pos); + DemoGt_PlayExplosion2Sfx(globalCtx, &pos); + } +} + +void func_80980C90(DemoGt* this, GlobalContext* globalCtx) { + func_8098016C(this, globalCtx); + func_80980178(this, globalCtx); + func_80980184(this, globalCtx); + func_80980218(this, globalCtx); + func_809802AC(this, globalCtx); + func_8098036C(this, globalCtx); + func_80980430(this, globalCtx); + func_80980504(this, globalCtx); + func_809805D8(this, globalCtx); + func_809806B8(this, globalCtx); + func_8098078C(this, globalCtx); + func_8098085C(this, globalCtx); + func_809809C0(this, globalCtx); + func_80980AD4(this, globalCtx); + func_80980B68(this, globalCtx); + func_80980BFC(this, globalCtx); +} + +void func_80980D74(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 3)) { + this->updateMode = 10; + } +} + +void DemoGt_Update2(DemoGt* this, GlobalContext* globalCtx) { + func_8097E824(this, 3); + func_80980C90(this, globalCtx); + func_80980D74(this, globalCtx); +} + +void DemoGt_Update10(DemoGt* this, GlobalContext* globalCtx) { + func_8097ED64(this, globalCtx, 3); + func_80980C90(this, globalCtx); +} + +void DemoGt_Draw3(DemoGt* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1026); + + func_80093D18(gfxCtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part3.c", 1028), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06007630); + gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1032); +} + +void func_80980F00_Init5(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + + func_8097EE44(this, globalCtx, 3, 4, NULL); +} + +void func_80980F58(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + + if (frames == 244) { + func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + } +} + +void func_80980F8C(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f sp58; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + + if ((frames > 259) && (frames < 289)) { + Vec3f velOfset = { 0.0f, -17.0f, 0.0f }; + s32 pad[3]; + + sp58.x = 640.0f; + sp58.y = 2100.0f; + sp58.z = -170.0f; + + Matrix_MultVec3f(&sp58, &dustPos); + func_8097D7D8(globalCtx, &dustPos, &velOfset, 3.0f, 5, 0, 30); + } +} + +void func_8098103C(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 4)) { + this->updateMode = 11; + } else if (func_8097E704(globalCtx, 3, 4)) { + this->updateMode = 16; + } +} + +void DemoGt_Update3(DemoGt* this, GlobalContext* globalCtx) { + func_8097E824(this, 4); + func_80980F58(this, globalCtx); + func_8098103C(this, globalCtx); +} + +void DemoGt_Update11(DemoGt* this, GlobalContext* globalCtx) { + func_8097ED64(this, globalCtx, 4); + func_80980F58(this, globalCtx); +} + +void DemoGt_Update16(DemoGt* this, GlobalContext* globalCtx) { + f32 temp = this->unk_172; + + this->unk_174 = (temp * ((kREG(64) * 0.001f) + 0.048f)) + (kREG(65) + 98.0f); + this->unk_172 += this->unk_174; + + if (this->unk_172 > 0x4000) { + this->unk_172 = 0x4000; + } +} + +void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + GlobalContext* globalCtx2 = globalCtx; + u16 frames = globalCtx->csCtx.frames; + s32 pad; + s16 sp76; + f32 sp70; + f32 sp6C; + s16 sp6A; + s16 sp68; + s16 pad2; + Mtx* sp60; + Vec3f sp54; + Vec3f sp48; + f32 sp44; + + if (frames < 301) { + + sp76 = this->unk_172; + sp70 = fabsf(sp76 * (M_PI / 0x8000)); + sp6C = kREG(61); + sp68 = (s16)((s32)kREG(58)) + 0x4000; + sp6A = kREG(58); + gfxCtx = globalCtx2->state.gfxCtx; + sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); + sp44 = 1.0f - Math_Coss(sp76); + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 217); + + sp54.x = Math_Coss(sp68); + sp54.y = 0.0f; + sp54.z = Math_Sins(sp68); + + sp48.x = (Math_Coss(sp6A) * sp6C) * sp44; + sp48.y = Math_Sins(sp76) * sp6C; + sp48.z = (Math_Sins(sp6A) * sp6C) * sp44; + + Matrix_Push(); + + func_800D23FC(sp70, &sp54, 1); + Matrix_Translate(sp48.x, sp48.y, sp48.z, MTXMODE_APPLY); + Matrix_ToMtx(sp60, "../z_demo_gt_part4_1.c", 232); + + if (func_800C0D28(globalCtx2) == 0) { + func_80980F8C(this, globalCtx2); + } + + Matrix_Pull(); + + func_80093D18(gfxCtx); + gSPMatrix(POLY_OPA_DISP++, sp60, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06009610); + gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 246); + } +} + +void func_809813CC_Init6(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + + func_8097EE44(this, globalCtx, 4, 5, NULL); +} + +void func_80981424(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + + if (frames == 789) { + func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + } +} + +void func_80981458(DemoGt* this, GlobalContext* globalCtx) { + s32 pad[3]; + Vec3f sp58; + Vec3f dustPos; + u16 frames = globalCtx->csCtx.frames; + + if (((frames > 855) && (frames < 891)) || (kREG(1) == 13)) { + Vec3f velOffset = { 0.0f, -30.0f, 0.0f }; + s32 pad1[3]; + + sp58.x = 0.0f; + sp58.y = 1170.0f; + sp58.z = -1100.0f; + + Matrix_MultVec3f(&sp58, &dustPos); + func_8097D7D8(globalCtx, &dustPos, &velOffset, 7.1f, 5, 1, 30); + } +} + +void func_80981524(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 5)) { + this->updateMode = 12; + } else if (func_8097E704(globalCtx, 3, 5)) { + this->updateMode = 17; + } +} + +void DemoGt_Update4(DemoGt* this, GlobalContext* globalCtx) { + func_8097E824(this, 5); + func_80981424(this, globalCtx); + func_80981524(this, globalCtx); +} + +void DemoGt_Update12(DemoGt* this, GlobalContext* globalCtx) { + func_8097ED64(this, globalCtx, 5); + func_80981424(this, globalCtx); +} + +void DemoGt_Update17(DemoGt* this, GlobalContext* globalCtx) { + f32 temp = this->unk_172; + + this->unk_174 = temp * ((kREG(66) * 0.001f) + 0.048f) + (kREG(67) + 50.0f); + this->unk_172 += this->unk_174; + + if (this->unk_172 > 0x4000) { + this->unk_172 = 0x4000; + } +} + +void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + s32 pad; + s16 sp76; + f32 sp70; + f32 sp6C; + s16 sp6A; + s16 sp68; + s16 pad1; + Mtx* sp60; + Vec3f sp54; + Vec3f sp48; + f32 sp44; + + sp76 = this->unk_172; + sp70 = fabsf(sp76 * (M_PI / 0x8000)); + sp6C = kREG(62); + sp6A = kREG(59) - 0x4000; + sp68 = (s16)(kREG(59) - 0x4000) + 0x4000; + gfxCtx = globalCtx->state.gfxCtx; + sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); + sp44 = 1 - Math_Coss(sp76); + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 212); + + sp54.x = Math_Coss(sp68); + sp54.y = 0.0f; + sp54.z = Math_Sins(sp68); + + sp48.x = Math_Coss(sp6A) * sp6C * sp44; + sp48.y = Math_Sins(sp76) * sp6C; + sp48.z = Math_Sins(sp6A) * sp6C * sp44; + + Matrix_Push(); + + func_800D23FC(sp70, &sp54, 1); + Matrix_Translate(sp48.x, sp48.y, sp48.z, MTXMODE_APPLY); + Matrix_ToMtx(sp60, "../z_demo_gt_part4_2.c", 227); + + if (func_800C0D28(globalCtx) == 0) { + func_80981458(this, globalCtx); + } + + Matrix_Pull(); + + func_80093D18(gfxCtx); + gSPMatrix(POLY_OPA_DISP++, sp60, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06009610); + gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 241); +} + +void func_809818A4_Init7(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + + func_8097EE44(this, globalCtx, 5, 6, NULL); +} + +void func_809818FC(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + + if (frames == 845) { + func_80078914(&this->dyna.actor.projectedPos, 0x20DE); + } +} +void func_80981930(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 6)) { + this->updateMode = 13; + } else if (func_8097E704(globalCtx, 3, 6)) { + this->updateMode = 18; + } +} +void DemoGt_Update5(DemoGt* this, GlobalContext* globalCtx) { + func_8097E824(this, 6); + func_809818FC(this, globalCtx); + func_80981930(this, globalCtx); +} + +void DemoGt_Update13(DemoGt* this, GlobalContext* globalCtx) { + func_8097ED64(this, globalCtx, 6); + func_809818FC(this, globalCtx); +} + +void DemoGt_Update18(DemoGt* this, GlobalContext* globalCtx) { + f32 temp = this->unk_172; + + this->unk_174 = (temp * ((kREG(68) * 0.001f) + 0.005f)) + (kREG(69) + 50.0f); + this->unk_172 += this->unk_174; + + if (this->unk_172 > 0x4000) { + this->unk_172 = 0x4000; + } +} + +void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { + DemoGt* this2 = this; + s16 sp78 = this2->unk_172; + f32 sp74; + f32 sp70; + s16 sp6E; + s16 sp6C; + GraphicsContext* gfxCtx; + Mtx* sp64; + Vec3f sp58; + Vec3f sp4C; + f32 sp48; + + sp74 = fabsf(sp78 * (M_PI / 0x8000)); + sp70 = kREG(63); + sp6E = kREG(60) + 0x4000; + sp6C = kREG(60) + 0x4000; + sp6C += 0x4000; + gfxCtx = globalCtx->state.gfxCtx; + sp64 = Graph_Alloc(gfxCtx, sizeof(Mtx)); + sp48 = 1.0f - Math_Coss(sp78); + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 276); + + sp58.x = Math_Coss(sp6C); + sp58.y = 0.0f; + sp58.z = Math_Sins(sp6C); + + sp4C.x = Math_Coss(sp6E) * sp70 * sp48; + sp4C.y = Math_Sins(sp78) * sp70; + sp4C.z = Math_Sins(sp6E) * sp70 * sp48; + + Matrix_Push(); + + func_800D23FC(sp74, &sp58, 1); + Matrix_Translate(sp4C.x, sp4C.y, sp4C.z, MTXMODE_APPLY); + Matrix_ToMtx(sp64, "../z_demo_gt_part4_3.c", 291); + + Matrix_Pull(); + + func_80093D18(gfxCtx); + gSPMatrix(POLY_OPA_DISP++, sp64, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06009610); + gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 307); +} + +void func_80981C94_Init23(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + func_8097EE44(this, globalCtx, 6, 7, NULL); +} + +void func_80981CEC(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + + if (frames == 183) { + func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); + } +} + +void func_80981D20(DemoGt* this) { + f32 temp = this->unk_172; + + this->unk_174 = temp * ((kREG(64) * 0.001f) + 0.048f) + (kREG(76) + 100.0f); + this->unk_172 += this->unk_174; + + if (this->unk_172 > (s16)(kREG(80) + 0x4000)) { + this->unk_172 = kREG(80) + 0x4000; + } +} + +void func_80981DC8(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 7)) { + this->updateMode = 0xE; + } +} + +void DemoGt_Update6(DemoGt* this, GlobalContext* globalCtx) { + func_8097E824(this, 7); + func_80981CEC(this, globalCtx); + func_80981DC8(this, globalCtx); +} + +void DemoGt_Update14(DemoGt* this, GlobalContext* globalCtx) { + func_80981D20(this); + func_8097ED64(this, globalCtx, 7); + func_80981CEC(this, globalCtx); +} + +void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { + DemoGt* this2 = this; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s16 sp6E; + f32 sp68; + f32 sp64; + s16 sp62; + s16 sp60; + Mtx* sp5C; + Vec3f sp50; + Vec3f sp44; + f32 sp40; + + sp6E = this2->unk_172; + sp68 = fabsf(sp6E * (M_PI / 0x8000)); + sp64 = kREG(75); + sp62 = kREG(74) + 0x7FEC; + sp60 = kREG(74) + 0x7FEC; + sp60 = sp60 + 0x4000; + sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); + sp40 = 1.0f - Math_Coss(sp6E); + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part5.c", 136); + + sp50.x = Math_Coss(sp60); + sp50.y = 0.0f; + sp50.z = Math_Sins(sp60); + + sp44.x = (Math_Coss(sp62) * sp64) * sp40; + sp44.y = Math_Sins(sp6E) * sp64; + sp44.z = (Math_Sins(sp62) * sp64) * sp40; + + Matrix_Push(); + + func_800D23FC(sp68, &sp50, MTXMODE_APPLY); + Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY); + Matrix_ToMtx(sp5C, "../z_demo_gt_part5.c", 152); + + Matrix_Pull(); + + func_80093D18(gfxCtx); + gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06009970); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part5.c", 160); +} + +void func_80982054_Init24(DemoGt* this, GlobalContext* globalCtx) { + this->dyna.actor.scale.x *= 10.0f; + this->dyna.actor.scale.y *= 10.0f; + this->dyna.actor.scale.z *= 10.0f; + func_8097EE44(this, globalCtx, 7, 8, NULL); +} + +void func_809820AC(DemoGt* this, GlobalContext* globalCtx) { + u16 frames = globalCtx->csCtx.frames; + + if (frames == 154) { + func_80078914(&this->dyna.actor.projectedPos, 0x20DE); + } +} + +void func_809820E0(DemoGt* this) { + f32 temp = this->unk_172; + + this->unk_174 = (temp * ((kREG(64) * 0.001f) + 0.048f)) + (kREG(79) + 100.0f); + this->unk_172 += this->unk_174; + + if (this->unk_172 > (s16)(kREG(81) + 0x4000)) { + this->unk_172 = kREG(81) + 0x4000; + } +} + +void func_80982188(DemoGt* this, GlobalContext* globalCtx) { + if (func_8097E704(globalCtx, 2, 9) != 0) { + this->updateMode = 15; + } +} + +void DemoGt_Update7(DemoGt* this, GlobalContext* globalCtx) { + func_8097E824(this, 9); + func_809820AC(this, globalCtx); + func_80982188(this, globalCtx); +} + +void DemoGt_Update15(DemoGt* this, GlobalContext* globalCtx) { + func_809820E0(this); + func_8097ED64(this, globalCtx, 9); + func_809820AC(this, globalCtx); +} + +void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { + DemoGt* this2 = this; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s16 sp6E; + f32 sp68; + f32 sp64; + s16 sp62; + s16 sp60; + Mtx* sp5C; + Vec3f sp50; + Vec3f sp44; + f32 sp40; + + sp6E = this2->unk_172; + sp68 = fabsf(sp6E * (M_PI / 0x8000)); + sp64 = kREG(78); + sp62 = kREG(77) + 0xBE80; + sp60 = kREG(77) + 0xBE80; + sp60 += 0x4000; + sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); + sp40 = 1.0f - Math_Coss(sp6E); + + OPEN_DISPS(gfxCtx, "../z_demo_gt_part6.c", 137); + + sp50.x = Math_Coss(sp60); + sp50.y = 0.0f; + sp50.z = Math_Sins(sp60); + + sp44.x = Math_Coss(sp62) * sp64 * sp40; + sp44.y = Math_Sins(sp6E) * sp64; + sp44.z = Math_Sins(sp62) * sp64 * sp40; + + Matrix_Push(); + + func_800D23FC(sp68, &sp50, 1); + Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY); + Matrix_ToMtx(sp5C, "../z_demo_gt_part6.c", 153); + + Matrix_Pull(); + + func_80093D18(gfxCtx); + gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06009B08); + + CLOSE_DISPS(gfxCtx, "../z_demo_gt_part6.c", 163); +} + +static DemoGtUpdateFunc sUpdateFuncs[] = { + DemoGt_Update0, DemoGt_Update1, DemoGt_Update2, DemoGt_Update3, DemoGt_Update4, + DemoGt_Update5, DemoGt_Update6, DemoGt_Update7, DemoGt_Update8, DemoGt_Update9, + DemoGt_Update10, DemoGt_Update11, DemoGt_Update12, DemoGt_Update13, DemoGt_Update14, + DemoGt_Update15, DemoGt_Update16, DemoGt_Update17, DemoGt_Update18, +}; + +void DemoGt_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoGt* this = THIS; + DemoGtUpdateFunc updateFunc; + + if ((this->updateMode < 0) || (this->updateMode >= 19) || (updateFunc = sUpdateFuncs[this->updateMode]) == NULL) { + // The main mode is strange! + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + + updateFunc(this, globalCtx); +} + +void DemoGt_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoGt* this = THIS; + + switch (this->dyna.actor.params) { + case 0: + func_8097EEA8_Init0(this, globalCtx); + break; + case 1: + func_8097F904_Init1(this, globalCtx); + break; + case 2: + func_80980110_Init2(this, globalCtx); + break; + case 5: + func_80980F00_Init5(this, globalCtx); + break; + case 6: + func_809813CC_Init6(this, globalCtx); + break; + case 7: + func_809818A4_Init7(this, globalCtx); + break; + case 23: + func_80981C94_Init23(this, globalCtx); + break; + case 24: + func_80982054_Init24(this, globalCtx); + break; + default: + // Demo_Gt_Actor_ct There is no such argument ! + osSyncPrintf("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + Actor_Kill(&this->dyna.actor); + } +} + +void DemoGt_Draw0(DemoGt* this, GlobalContext* globalCtx) { +} + +static DemoGtDrawFunc sDrawFuncs[] = { + DemoGt_Draw0, DemoGt_Draw1, DemoGt_Draw2, DemoGt_Draw3, DemoGt_Draw4, + DemoGt_Draw5, DemoGt_Draw6, DemoGt_Draw7, DemoGt_Draw8, +}; + +void DemoGt_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoGt* this = THIS; + DemoGtDrawFunc drawFunc; + + if ((this->drawConfig < 0) || (this->drawConfig >= 9) || (drawFunc = sDrawFuncs[this->drawConfig]) == NULL) { + // The drawing mode is strange !!!!!!!!!!!!!!!!!!!!!!!!! + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + + drawFunc(this, globalCtx); +} + const ActorInit Demo_Gt_InitVars = { ACTOR_DEMO_GT, ACTORTYPE_PROP, @@ -21,227 +1806,3 @@ const ActorInit Demo_Gt_InitVars = { (ActorFunc)DemoGt_Update, (ActorFunc)DemoGt_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D6F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D71C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D74C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D7D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D964.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E454.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E69C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E6BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E824.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097ED94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EDD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EE44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EEA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097EF40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F0AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F19C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F1D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F280.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F3EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F428.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F498.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F904.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F960.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F96C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FA1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FAFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FC1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FCE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FD70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FDDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FED8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980110.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098016C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980178.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980184.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980218.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809802AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098036C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980430.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980504.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809805D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809806B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098078C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098085C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809809C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980AD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980B68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980BFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980C90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980D74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980DF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980F8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098103C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809810E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981114.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809813CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981424.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981458.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981524.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981588.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809815FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809818FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981930.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981994.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809819D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981A08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981C94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981CEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981D20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981DC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982054.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809820E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982188.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809821C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982204.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8098254C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gt/DemoGt_Draw.s") diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h index cdd124404e..8ab99d8ebf 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h @@ -6,9 +6,19 @@ struct DemoGt; +typedef void (*DemoGtUpdateFunc)(struct DemoGt*, GlobalContext*); +typedef void (*DemoGtDrawFunc)(struct DemoGt*, GlobalContext*); + typedef struct DemoGt { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x5C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ s32 updateMode; + /* 0x0168 */ s32 drawConfig; + /* 0x016C */ Vec3s unk_16C; + /* 0x0172 */ s16 unk_172; + /* 0x0174 */ s16 unk_174; + /* 0x0178 */ s32 unk_178[4]; + /* 0x0188 */ s32 unk_188[4]; + /* 0x0198 */ s32 unk_198[4]; } DemoGt; // size = 0x01A8 extern const ActorInit Demo_Gt_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 1c7a447349..df850c671d 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -653,6 +653,18 @@ D_06004930 = 0x06004930; D_0600E680 = 0x0600E680; D_0600FEF0 = 0x0600FEF0; +// z_demo_gt +D_06005CB8 = 0x06005CB8; +D_060091E4 = 0x060091E4; +D_06009970 = 0x06009970; +D_06007630 = 0x06007630; +D_06004F90 = 0x06004F90; +D_06000EA0 = 0x06000EA0; +D_06009610 = 0x06009610; +D_06002910 = 0x06002910; +D_060041A0 = 0x060041A0; +D_06009B08 = 0x06009B80; + // z_demo_im D_02002524 = 0x02002524; D_06000710 = 0x06000710;