From d263b9dabdbaa3f5664cbd8fbb6b3969ad189bfe Mon Sep 17 00:00:00 2001 From: pixel-stuck Date: Sat, 11 Apr 2020 22:39:49 -0400 Subject: [PATCH] add script to find (and optionally delete) old/unused asm files and delete all currently present old/unused asm files. (#65) --- .../code/code_8006EA30/func_8006EE48.s | 4 - .../code/code_800A9F30/func_800AA0B4.s | 16 - .../code/sys_matrix/Matrix_Translate.s | 69 ---- .../code/z_collision_check/func_8005B76C.s | 8 - .../code/z_collision_check/func_8005C328.s | 17 - .../code/z_collision_check/func_8005C540.s | 15 - .../code/z_eff_spark/func_80024F0C.s | 4 - .../code/z_effect_soft_sprite/func_80027DD4.s | 28 -- asm/non_matchings/code/z_view/func_800AA190.s | 28 -- asm/non_matchings/code/z_view/func_800AA1F8.s | 31 -- asm/non_matchings/code/z_view/func_800AA250.s | 18 -- asm/non_matchings/code/z_view/func_800AA278.s | 65 ---- asm/non_matchings/code/z_view/func_800AA358.s | 46 --- asm/non_matchings/code/z_view/func_800AA3F0.s | 21 -- asm/non_matchings/code/z_view/func_800AA43C.s | 8 - asm/non_matchings/code/z_view/func_800AA454.s | 5 - asm/non_matchings/code/z_view/func_800AA460.s | 13 - asm/non_matchings/code/z_view/func_800AA48C.s | 9 - asm/non_matchings/code/z_view/func_800AA4A8.s | 16 - asm/non_matchings/code/z_view/func_800AA4E0.s | 9 - asm/non_matchings/code/z_view/func_800AA4FC.s | 14 - asm/non_matchings/code/z_view/func_800AA52C.s | 11 - asm/non_matchings/code/z_view/func_800AA76C.s | 10 - asm/non_matchings/code/z_view/func_800AA78C.s | 10 - asm/non_matchings/code/z_view/func_800AA7AC.s | 5 - asm/non_matchings/code/z_view/func_800AA7B8.s | 25 -- asm/non_matchings/code/z_view/func_800AA814.s | 13 - asm/non_matchings/code/z_view/func_800AA840.s | 22 -- asm/non_matchings/code/z_view/func_800AA890.s | 124 -------- asm/non_matchings/code/z_view/func_800AAA50.s | 23 -- asm/non_matchings/code/z_view/func_800AB0A8.s | 164 ---------- asm/non_matchings/code/z_view/func_800AB944.s | 54 ---- asm/non_matchings/code/z_view/func_800ABE74.s | 141 --------- .../actors/ovl_Arrow_Fire/ArrowFire_Draw.s | 284 ----------------- .../actors/ovl_Arrow_Ice/ArrowIce_Draw.s | 292 ----------------- .../actors/ovl_Arrow_Light/ArrowLight_Draw.s | 296 ------------------ .../actors/ovl_Bg_Haka_Megane/func_8087DB24.s | 61 ---- .../ovl_Bg_Hidan_Fslift/BgHidanFslift_Init.s | 68 ---- .../ovl_Bg_Hidan_Fslift/func_80886F24.s | 29 -- .../actors/ovl_Bg_Jya_Kanaami/func_80899894.s | 51 --- .../actors/ovl_Bg_Jya_Kanaami/func_80899950.s | 52 --- .../BgMenkuriNisekabe_Destroy.s | 6 - .../BgMenkuriNisekabe_Draw.s | 36 --- .../BgMenkuriNisekabe_Init.s | 14 - .../BgMenkuriNisekabe_Update.s | 18 -- .../actors/ovl_Bg_Spot15_Saku/func_808B4930.s | 23 -- .../actors/ovl_Bg_Spot15_Saku/func_808B4A04.s | 16 - data/guPerspective.rodata.s | 13 - data/overlays/actors/z_en_boom.reloc.s | 3 - tools/find_unused_asm.sh | 31 ++ 50 files changed, 31 insertions(+), 2308 deletions(-) delete mode 100644 asm/non_matchings/code/code_8006EA30/func_8006EE48.s delete mode 100644 asm/non_matchings/code/code_800A9F30/func_800AA0B4.s delete mode 100644 asm/non_matchings/code/sys_matrix/Matrix_Translate.s delete mode 100644 asm/non_matchings/code/z_collision_check/func_8005B76C.s delete mode 100644 asm/non_matchings/code/z_collision_check/func_8005C328.s delete mode 100644 asm/non_matchings/code/z_collision_check/func_8005C540.s delete mode 100644 asm/non_matchings/code/z_eff_spark/func_80024F0C.s delete mode 100644 asm/non_matchings/code/z_effect_soft_sprite/func_80027DD4.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA190.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA1F8.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA250.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA278.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA358.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA3F0.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA43C.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA454.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA460.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA48C.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA4A8.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA4E0.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA4FC.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA52C.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA76C.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA78C.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA7AC.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA7B8.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA814.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA840.s delete mode 100644 asm/non_matchings/code/z_view/func_800AA890.s delete mode 100644 asm/non_matchings/code/z_view/func_800AAA50.s delete mode 100644 asm/non_matchings/code/z_view/func_800AB0A8.s delete mode 100644 asm/non_matchings/code/z_view/func_800AB944.s delete mode 100644 asm/non_matchings/code/z_view/func_800ABE74.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DB24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/BgHidanFslift_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/func_80886F24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899894.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4930.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4A04.s delete mode 100644 data/guPerspective.rodata.s delete mode 100644 data/overlays/actors/z_en_boom.reloc.s create mode 100755 tools/find_unused_asm.sh diff --git a/asm/non_matchings/code/code_8006EA30/func_8006EE48.s b/asm/non_matchings/code/code_8006EA30/func_8006EE48.s deleted file mode 100644 index bdec8402ac..0000000000 --- a/asm/non_matchings/code/code_8006EA30/func_8006EE48.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8006EE48 -/* AE5FE8 8006EE48 03E00008 */ jr $ra -/* AE5FEC 8006EE4C AFA40000 */ sw $a0, ($sp) - diff --git a/asm/non_matchings/code/code_800A9F30/func_800AA0B4.s b/asm/non_matchings/code/code_800A9F30/func_800AA0B4.s deleted file mode 100644 index 9e09a33a74..0000000000 --- a/asm/non_matchings/code/code_800A9F30/func_800AA0B4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800AA0B4 -/* B21254 800AA0B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B21258 800AA0B8 AFBF0014 */ sw $ra, 0x14($sp) -/* B2125C 800AA0BC 3C048016 */ lui $a0, %hi(D_80160FD0) # $a0, 0x8016 -/* B21260 800AA0C0 0C034C50 */ jal func_800D3140 -/* B21264 800AA0C4 24840FD0 */ addiu $a0, %lo(D_80160FD0) # addiu $a0, $a0, 0xfd0 -/* B21268 800AA0C8 3C028016 */ lui $v0, %hi(gPadMgr) # $v0, 0x8016 -/* B2126C 800AA0CC 244268C0 */ addiu $v0, %lo(gPadMgr) # addiu $v0, $v0, 0x68c0 -/* B21270 800AA0D0 3C0E800B */ lui $t6, %hi(func_800A9F30) # $t6, 0x800b -/* B21274 800AA0D4 25CE9F30 */ addiu $t6, %lo(func_800A9F30) # addiu $t6, $t6, -0x60d0 -/* B21278 800AA0D8 AC4E0460 */ sw $t6, 0x460($v0) -/* B2127C 800AA0DC AC400464 */ sw $zero, 0x464($v0) -/* B21280 800AA0E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B21284 800AA0E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B21288 800AA0E8 03E00008 */ jr $ra -/* B2128C 800AA0EC 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/sys_matrix/Matrix_Translate.s b/asm/non_matchings/code/sys_matrix/Matrix_Translate.s deleted file mode 100644 index 668c8ca007..0000000000 --- a/asm/non_matchings/code/sys_matrix/Matrix_Translate.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel Matrix_Translate -/* B47B24 800D0984 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B47B28 800D0988 F7B40010 */ sdc1 $f20, 0x10($sp) -/* B47B2C 800D098C AFA7002C */ sw $a3, 0x2c($sp) -/* B47B30 800D0990 30E700FF */ andi $a3, $a3, 0xff -/* B47B34 800D0994 4486A000 */ mtc1 $a2, $f20 -/* B47B38 800D0998 3C048017 */ lui $a0, %hi(sCurrentMatrix) # $a0, 0x8017 -/* B47B3C 800D099C 24010001 */ li $at, 1 -/* B47B40 800D09A0 AFBF001C */ sw $ra, 0x1c($sp) -/* B47B44 800D09A4 14E1002F */ bne $a3, $at, .L800D0A64 -/* B47B48 800D09A8 8C84A7C4 */ lw $a0, %lo(sCurrentMatrix)($a0) -/* B47B4C 800D09AC C4800000 */ lwc1 $f0, ($a0) -/* B47B50 800D09B0 C4820010 */ lwc1 $f2, 0x10($a0) -/* B47B54 800D09B4 C48A0020 */ lwc1 $f10, 0x20($a0) -/* B47B58 800D09B8 460C0102 */ mul.s $f4, $f0, $f12 -/* B47B5C 800D09BC C4800004 */ lwc1 $f0, 4($a0) -/* B47B60 800D09C0 460E1182 */ mul.s $f6, $f2, $f14 -/* B47B64 800D09C4 C4820014 */ lwc1 $f2, 0x14($a0) -/* B47B68 800D09C8 46145402 */ mul.s $f16, $f10, $f20 -/* B47B6C 800D09CC 00000000 */ nop -/* B47B70 800D09D0 460C0282 */ mul.s $f10, $f0, $f12 -/* B47B74 800D09D4 C4800008 */ lwc1 $f0, 8($a0) -/* B47B78 800D09D8 46062200 */ add.s $f8, $f4, $f6 -/* B47B7C 800D09DC C4840030 */ lwc1 $f4, 0x30($a0) -/* B47B80 800D09E0 46104480 */ add.s $f18, $f8, $f16 -/* B47B84 800D09E4 460E1202 */ mul.s $f8, $f2, $f14 -/* B47B88 800D09E8 C4820018 */ lwc1 $f2, 0x18($a0) -/* B47B8C 800D09EC 46122180 */ add.s $f6, $f4, $f18 -/* B47B90 800D09F0 C4840024 */ lwc1 $f4, 0x24($a0) -/* B47B94 800D09F4 46085400 */ add.s $f16, $f10, $f8 -/* B47B98 800D09F8 46142482 */ mul.s $f18, $f4, $f20 -/* B47B9C 800D09FC E4860030 */ swc1 $f6, 0x30($a0) -/* B47BA0 800D0A00 C48A0034 */ lwc1 $f10, 0x34($a0) -/* B47BA4 800D0A04 460C0102 */ mul.s $f4, $f0, $f12 -/* B47BA8 800D0A08 C480000C */ lwc1 $f0, 0xc($a0) -/* B47BAC 800D0A0C 46128180 */ add.s $f6, $f16, $f18 -/* B47BB0 800D0A10 460E1402 */ mul.s $f16, $f2, $f14 -/* B47BB4 800D0A14 C482001C */ lwc1 $f2, 0x1c($a0) -/* B47BB8 800D0A18 46065200 */ add.s $f8, $f10, $f6 -/* B47BBC 800D0A1C C48A0028 */ lwc1 $f10, 0x28($a0) -/* B47BC0 800D0A20 46102480 */ add.s $f18, $f4, $f16 -/* B47BC4 800D0A24 46145182 */ mul.s $f6, $f10, $f20 -/* B47BC8 800D0A28 E4880034 */ swc1 $f8, 0x34($a0) -/* B47BCC 800D0A2C C4840038 */ lwc1 $f4, 0x38($a0) -/* B47BD0 800D0A30 460C0282 */ mul.s $f10, $f0, $f12 -/* B47BD4 800D0A34 46069200 */ add.s $f8, $f18, $f6 -/* B47BD8 800D0A38 460E1482 */ mul.s $f18, $f2, $f14 -/* B47BDC 800D0A3C 46082400 */ add.s $f16, $f4, $f8 -/* B47BE0 800D0A40 C484002C */ lwc1 $f4, 0x2c($a0) -/* B47BE4 800D0A44 46125180 */ add.s $f6, $f10, $f18 -/* B47BE8 800D0A48 46142202 */ mul.s $f8, $f4, $f20 -/* B47BEC 800D0A4C E4900038 */ swc1 $f16, 0x38($a0) -/* B47BF0 800D0A50 C48A003C */ lwc1 $f10, 0x3c($a0) -/* B47BF4 800D0A54 46083400 */ add.s $f16, $f6, $f8 -/* B47BF8 800D0A58 46105480 */ add.s $f18, $f10, $f16 -/* B47BFC 800D0A5C 10000006 */ b .L800D0A78 -/* B47C00 800D0A60 E492003C */ swc1 $f18, 0x3c($a0) -.L800D0A64: -/* B47C04 800D0A64 44056000 */ mfc1 $a1, $f12 -/* B47C08 800D0A68 44067000 */ mfc1 $a2, $f14 -/* B47C0C 800D0A6C 4407A000 */ mfc1 $a3, $f20 -/* B47C10 800D0A70 0C029E89 */ jal func_800A7A24 -/* B47C14 800D0A74 00000000 */ nop -.L800D0A78: -/* B47C18 800D0A78 8FBF001C */ lw $ra, 0x1c($sp) -/* B47C1C 800D0A7C D7B40010 */ ldc1 $f20, 0x10($sp) -/* B47C20 800D0A80 27BD0020 */ addiu $sp, $sp, 0x20 -/* B47C24 800D0A84 03E00008 */ jr $ra -/* B47C28 800D0A88 00000000 */ nop diff --git a/asm/non_matchings/code/z_collision_check/func_8005B76C.s b/asm/non_matchings/code/z_collision_check/func_8005B76C.s deleted file mode 100644 index a7c7f44e36..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B76C.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_8005B76C -/* AD290C 8005B76C AFA40000 */ sw $a0, ($sp) -/* AD2910 8005B770 90AE0010 */ lbu $t6, 0x10($a1) -/* AD2914 8005B774 ACA00004 */ sw $zero, 4($a1) -/* AD2918 8005B778 31CFFFF9 */ andi $t7, $t6, 0xfff9 -/* AD291C 8005B77C 03E00008 */ jr $ra -/* AD2920 8005B780 A0AF0010 */ sb $t7, 0x10($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C328.s b/asm/non_matchings/code/z_collision_check/func_8005C328.s deleted file mode 100644 index 595f2a8b6f..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C328.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8005C328 -/* AD34C8 8005C328 AFA40000 */ sw $a0, ($sp) -/* AD34CC 8005C32C 88CF0000 */ lwl $t7, ($a2) -/* AD34D0 8005C330 98CF0003 */ lwr $t7, 3($a2) -/* AD34D4 8005C334 24020001 */ li $v0, 1 -/* AD34D8 8005C338 A8AF0000 */ swl $t7, ($a1) -/* AD34DC 8005C33C B8AF0003 */ swr $t7, 3($a1) -/* AD34E0 8005C340 88CE0004 */ lwl $t6, 4($a2) -/* AD34E4 8005C344 98CE0007 */ lwr $t6, 7($a2) -/* AD34E8 8005C348 A8AE0004 */ swl $t6, 4($a1) -/* AD34EC 8005C34C B8AE0007 */ swr $t6, 7($a1) -/* AD34F0 8005C350 88CF0008 */ lwl $t7, 8($a2) -/* AD34F4 8005C354 98CF000B */ lwr $t7, 0xb($a2) -/* AD34F8 8005C358 A8AF0008 */ swl $t7, 8($a1) -/* AD34FC 8005C35C 03E00008 */ jr $ra -/* AD3500 8005C360 B8AF000B */ swr $t7, 0xb($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C540.s b/asm/non_matchings/code/z_collision_check/func_8005C540.s deleted file mode 100644 index 525aef245e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C540.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8005C540 -/* AD36E0 8005C540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD36E4 8005C544 AFBF0014 */ sw $ra, 0x14($sp) -/* AD36E8 8005C548 AFA40018 */ sw $a0, 0x18($sp) -/* AD36EC 8005C54C 0C016DE1 */ jal func_8005B784 -/* AD36F0 8005C550 AFA5001C */ sw $a1, 0x1c($sp) -/* AD36F4 8005C554 8FA5001C */ lw $a1, 0x1c($sp) -/* AD36F8 8005C558 8FA40018 */ lw $a0, 0x18($sp) -/* AD36FC 8005C55C 0C016E7A */ jal func_8005B9E8 -/* AD3700 8005C560 24A50018 */ addiu $a1, $a1, 0x18 -/* AD3704 8005C564 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3708 8005C568 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD370C 8005C56C 24020001 */ li $v0, 1 -/* AD3710 8005C570 03E00008 */ jr $ra -/* AD3714 8005C574 00000000 */ nop diff --git a/asm/non_matchings/code/z_eff_spark/func_80024F0C.s b/asm/non_matchings/code/z_eff_spark/func_80024F0C.s deleted file mode 100644 index 7b0d228530..0000000000 --- a/asm/non_matchings/code/z_eff_spark/func_80024F0C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80024F0C -/* A9C0AC 80024F0C 03E00008 */ jr $ra -/* A9C0B0 80024F10 AFA40000 */ sw $a0, ($sp) - diff --git a/asm/non_matchings/code/z_effect_soft_sprite/func_80027DD4.s b/asm/non_matchings/code/z_effect_soft_sprite/func_80027DD4.s deleted file mode 100644 index 130a36a9fd..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite/func_80027DD4.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80027DD4 -/* A9EF74 80027DD4 AFA40000 */ sw $a0, ($sp) -/* A9EF78 80027DD8 AFA50004 */ sw $a1, 4($sp) -/* A9EF7C 80027DDC 00052C00 */ sll $a1, $a1, 0x10 -/* A9EF80 80027DE0 00042400 */ sll $a0, $a0, 0x10 -/* A9EF84 80027DE4 00042403 */ sra $a0, $a0, 0x10 -/* A9EF88 80027DE8 14C00004 */ bnez $a2, .L80027DFC -/* A9EF8C 80027DEC 00052C03 */ sra $a1, $a1, 0x10 -/* A9EF90 80027DF0 00051C00 */ sll $v1, $a1, 0x10 -/* A9EF94 80027DF4 03E00008 */ jr $ra -/* A9EF98 80027DF8 00031403 */ sra $v0, $v1, 0x10 - -.L80027DFC: -/* A9EF9C 80027DFC 00A47023 */ subu $t6, $a1, $a0 -/* A9EFA0 80027E00 448E2000 */ mtc1 $t6, $f4 -/* A9EFA4 80027E04 44864000 */ mtc1 $a2, $f8 -/* A9EFA8 80027E08 468021A0 */ cvt.s.w $f6, $f4 -/* A9EFAC 80027E0C 468042A0 */ cvt.s.w $f10, $f8 -/* A9EFB0 80027E10 460A3403 */ div.s $f16, $f6, $f10 -/* A9EFB4 80027E14 4600848D */ trunc.w.s $f18, $f16 -/* A9EFB8 80027E18 44189000 */ mfc1 $t8, $f18 -/* A9EFBC 80027E1C 00000000 */ nop -/* A9EFC0 80027E20 00981821 */ addu $v1, $a0, $t8 -/* A9EFC4 80027E24 00031C00 */ sll $v1, $v1, 0x10 -/* A9EFC8 80027E28 00031C03 */ sra $v1, $v1, 0x10 -/* A9EFCC 80027E2C 03E00008 */ jr $ra -/* A9EFD0 80027E30 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/z_view/func_800AA190.s b/asm/non_matchings/code/z_view/func_800AA190.s deleted file mode 100644 index 044ab395cb..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA190.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800AA190 -/* B21330 800AA190 8CAE000C */ lw $t6, 0xc($a1) -/* B21334 800AA194 8CAF0008 */ lw $t7, 8($a1) -/* B21338 800AA198 8CB80004 */ lw $t8, 4($a1) -/* B2133C 800AA19C 8CB90000 */ lw $t9, ($a1) -/* B21340 800AA1A0 01CF1023 */ subu $v0, $t6, $t7 -/* B21344 800AA1A4 240601FF */ li $a2, 511 -/* B21348 800AA1A8 03191823 */ subu $v1, $t8, $t9 -/* B2134C 800AA1AC 00024040 */ sll $t0, $v0, 1 -/* B21350 800AA1B0 00034840 */ sll $t1, $v1, 1 -/* B21354 800AA1B4 A4880000 */ sh $t0, ($a0) -/* B21358 800AA1B8 A4890002 */ sh $t1, 2($a0) -/* B2135C 800AA1BC A4860004 */ sh $a2, 4($a0) -/* B21360 800AA1C0 A4800006 */ sh $zero, 6($a0) -/* B21364 800AA1C4 8CAA0008 */ lw $t2, 8($a1) -/* B21368 800AA1C8 000A5840 */ sll $t3, $t2, 1 -/* B2136C 800AA1CC 01626021 */ addu $t4, $t3, $v0 -/* B21370 800AA1D0 000C6840 */ sll $t5, $t4, 1 -/* B21374 800AA1D4 A48D0008 */ sh $t5, 8($a0) -/* B21378 800AA1D8 8CAE0000 */ lw $t6, ($a1) -/* B2137C 800AA1DC A486000C */ sh $a2, 0xc($a0) -/* B21380 800AA1E0 A480000E */ sh $zero, 0xe($a0) -/* B21384 800AA1E4 000E7840 */ sll $t7, $t6, 1 -/* B21388 800AA1E8 01E3C021 */ addu $t8, $t7, $v1 -/* B2138C 800AA1EC 0018C840 */ sll $t9, $t8, 1 -/* B21390 800AA1F0 03E00008 */ jr $ra -/* B21394 800AA1F4 A499000A */ sh $t9, 0xa($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA1F8.s b/asm/non_matchings/code/z_view/func_800AA1F8.s deleted file mode 100644 index 78dc4c8094..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA1F8.s +++ /dev/null @@ -1,31 +0,0 @@ -.rdata -glabel D_80141070 - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AA1F8 -/* B21398 800AA1F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2139C 800AA1FC AFBF0014 */ sw $ra, 0x14($sp) -/* B213A0 800AA200 AFA40020 */ sw $a0, 0x20($sp) -/* B213A4 800AA204 3C058014 */ lui $a1, %hi(D_80141070) # $a1, 0x8014 -/* B213A8 800AA208 24A51070 */ addiu $a1, %lo(D_80141070) # addiu $a1, $a1, 0x1070 -/* B213AC 800AA20C 24040128 */ li $a0, 296 -/* B213B0 800AA210 0C03F570 */ jal SystemArena_MallocDebug -/* B213B4 800AA214 2406011D */ li $a2, 285 -/* B213B8 800AA218 10400008 */ beqz $v0, .L800AA23C -/* B213BC 800AA21C AFA2001C */ sw $v0, 0x1c($sp) -/* B213C0 800AA220 00402025 */ move $a0, $v0 -/* B213C4 800AA224 00002825 */ move $a1, $zero -/* B213C8 800AA228 0C041A18 */ jal func_80106860 -/* B213CC 800AA22C 24060128 */ li $a2, 296 -/* B213D0 800AA230 8FA4001C */ lw $a0, 0x1c($sp) -/* B213D4 800AA234 0C02A89E */ jal func_800AA278 -/* B213D8 800AA238 8FA50020 */ lw $a1, 0x20($sp) -.L800AA23C: -/* B213DC 800AA23C 8FBF0014 */ lw $ra, 0x14($sp) -/* B213E0 800AA240 8FA2001C */ lw $v0, 0x1c($sp) -/* B213E4 800AA244 27BD0020 */ addiu $sp, $sp, 0x20 -/* B213E8 800AA248 03E00008 */ jr $ra -/* B213EC 800AA24C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AA250.s b/asm/non_matchings/code/z_view/func_800AA250.s deleted file mode 100644 index 21e4afefa9..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA250.s +++ /dev/null @@ -1,18 +0,0 @@ -.rdata -glabel D_8014107C - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AA250 -/* B213F0 800AA250 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B213F4 800AA254 AFBF0014 */ sw $ra, 0x14($sp) -/* B213F8 800AA258 3C058014 */ lui $a1, %hi(D_8014107C) # $a1, 0x8014 -/* B213FC 800AA25C 24A5107C */ addiu $a1, %lo(D_8014107C) # addiu $a1, $a1, 0x107c -/* B21400 800AA260 0C03F5ED */ jal SystemArena_FreeDebug -/* B21404 800AA264 24060129 */ li $a2, 297 -/* B21408 800AA268 8FBF0014 */ lw $ra, 0x14($sp) -/* B2140C 800AA26C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B21410 800AA270 03E00008 */ jr $ra -/* B21414 800AA274 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AA278.s b/asm/non_matchings/code/z_view/func_800AA278.s deleted file mode 100644 index 4dac83793b..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA278.s +++ /dev/null @@ -1,65 +0,0 @@ -.rdata -glabel D_80141088 - .asciz "\nview: initialize ---\n" - .balign 4 - -.text -glabel func_800AA278 -/* B21418 800AA278 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2141C 800AA27C AFBF0014 */ sw $ra, 0x14($sp) -/* B21420 800AA280 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B21424 800AA284 44811000 */ mtc1 $at, $f2 -/* B21428 800AA288 3C014270 */ li $at, 0x42700000 # 0.000000 -/* B2142C 800AA28C 44812000 */ mtc1 $at, $f4 -/* B21430 800AA290 3C014120 */ li $at, 0x41200000 # 0.000000 -/* B21434 800AA294 44800000 */ mtc1 $zero, $f0 -/* B21438 800AA298 44813000 */ mtc1 $at, $f6 -/* B2143C 800AA29C 3C014648 */ li $at, 0x46480000 # 0.000000 -/* B21440 800AA2A0 44814000 */ mtc1 $at, $f8 -/* B21444 800AA2A4 3C01BF80 */ li $at, 0xBF800000 # 0.000000 -/* B21448 800AA2A8 44815000 */ mtc1 $at, $f10 -/* B2144C 800AA2AC 3C185649 */ lui $t8, (0x56494557 >> 16) # lui $t8, 0x5649 -/* B21450 800AA2B0 3C028013 */ lui $v0, %hi(D_8012ABF0) # $v0, 0x8013 -/* B21454 800AA2B4 240E00F0 */ li $t6, 240 -/* B21458 800AA2B8 240F0140 */ li $t7, 320 -/* B2145C 800AA2BC 37184557 */ ori $t8, (0x56494557 & 0xFFFF) # ori $t8, $t8, 0x4557 -/* B21460 800AA2C0 2442ABF0 */ addiu $v0, %lo(D_8012ABF0) # addiu $v0, $v0, -0x5410 -/* B21464 800AA2C4 AC850004 */ sw $a1, 4($a0) -/* B21468 800AA2C8 AC800008 */ sw $zero, 8($a0) -/* B2146C 800AA2CC AC8E000C */ sw $t6, 0xc($a0) -/* B21470 800AA2D0 AC800010 */ sw $zero, 0x10($a0) -/* B21474 800AA2D4 AC8F0014 */ sw $t7, 0x14($a0) -/* B21478 800AA2D8 AC980000 */ sw $t8, ($a0) -/* B2147C 800AA2DC E4820024 */ swc1 $f2, 0x24($a0) -/* B21480 800AA2E0 E4820044 */ swc1 $f2, 0x44($a0) -/* B21484 800AA2E4 E4840018 */ swc1 $f4, 0x18($a0) -/* B21488 800AA2E8 E4800028 */ swc1 $f0, 0x28($a0) -/* B2148C 800AA2EC E480002C */ swc1 $f0, 0x2c($a0) -/* B21490 800AA2F0 E4800034 */ swc1 $f0, 0x34($a0) -/* B21494 800AA2F4 E4800040 */ swc1 $f0, 0x40($a0) -/* B21498 800AA2F8 E4800048 */ swc1 $f0, 0x48($a0) -/* B2149C 800AA2FC E486001C */ swc1 $f6, 0x1c($a0) -/* B214A0 800AA300 E4880020 */ swc1 $f8, 0x20($a0) -/* B214A4 800AA304 E48A0030 */ swc1 $f10, 0x30($a0) -/* B214A8 800AA308 8C590000 */ lw $t9, ($v0) -/* B214AC 800AA30C 00803025 */ move $a2, $a0 -/* B214B0 800AA310 3C048014 */ lui $a0, %hi(D_80141088) # $a0, 0x8014 -/* B214B4 800AA314 13200007 */ beqz $t9, .L800AA334 -/* B214B8 800AA318 24841088 */ addiu $a0, %lo(D_80141088) # addiu $a0, $a0, 0x1088 -/* B214BC 800AA31C 0C00084C */ jal osSyncPrintf -/* B214C0 800AA320 AFA60018 */ sw $a2, 0x18($sp) -/* B214C4 800AA324 3C028013 */ lui $v0, %hi(D_8012ABF0) # $v0, 0x8013 -/* B214C8 800AA328 2442ABF0 */ addiu $v0, %lo(D_8012ABF0) # addiu $v0, $v0, -0x5410 -/* B214CC 800AA32C 8FA60018 */ lw $a2, 0x18($sp) -/* B214D0 800AA330 AC400000 */ sw $zero, ($v0) -.L800AA334: -/* B214D4 800AA334 24080007 */ li $t0, 7 -/* B214D8 800AA338 ACC00124 */ sw $zero, 0x124($a2) -/* B214DC 800AA33C ACC80120 */ sw $t0, 0x120($a2) -/* B214E0 800AA340 0C02A9EE */ jal func_800AA7B8 -/* B214E4 800AA344 00C02025 */ move $a0, $a2 -/* B214E8 800AA348 8FBF0014 */ lw $ra, 0x14($sp) -/* B214EC 800AA34C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B214F0 800AA350 03E00008 */ jr $ra -/* B214F4 800AA354 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AA358.s b/asm/non_matchings/code/z_view/func_800AA358.s deleted file mode 100644 index e1d10e1af3..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA358.s +++ /dev/null @@ -1,46 +0,0 @@ -.late_rodata -glabel D_80141384 - .float 0.1 - -.text -glabel func_800AA358 -/* B214F8 800AA358 C4A00000 */ lwc1 $f0, ($a1) -/* B214FC 800AA35C C4C40000 */ lwc1 $f4, ($a2) -/* B21500 800AA360 46002032 */ c.eq.s $f4, $f0 -/* B21504 800AA364 00000000 */ nop -/* B21508 800AA368 4502000C */ bc1fl .L800AA39C -/* B2150C 800AA36C 8CAF0000 */ lw $t7, ($a1) -/* B21510 800AA370 C4C60008 */ lwc1 $f6, 8($a2) -/* B21514 800AA374 C4A80008 */ lwc1 $f8, 8($a1) -/* B21518 800AA378 3C018014 */ lui $at, %hi(D_80141384) -/* B2151C 800AA37C 46083032 */ c.eq.s $f6, $f8 -/* B21520 800AA380 00000000 */ nop -/* B21524 800AA384 45020005 */ bc1fl .L800AA39C -/* B21528 800AA388 8CAF0000 */ lw $t7, ($a1) -/* B2152C 800AA38C C42A1384 */ lwc1 $f10, %lo(D_80141384)($at) -/* B21530 800AA390 460A0400 */ add.s $f16, $f0, $f10 -/* B21534 800AA394 E4B00000 */ swc1 $f16, ($a1) -/* B21538 800AA398 8CAF0000 */ lw $t7, ($a1) -.L800AA39C: -/* B2153C 800AA39C 8C8A0120 */ lw $t2, 0x120($a0) -/* B21540 800AA3A0 AC8F0028 */ sw $t7, 0x28($a0) -/* B21544 800AA3A4 8CAE0004 */ lw $t6, 4($a1) -/* B21548 800AA3A8 354B0001 */ ori $t3, $t2, 1 -/* B2154C 800AA3AC AC8E002C */ sw $t6, 0x2c($a0) -/* B21550 800AA3B0 8CAF0008 */ lw $t7, 8($a1) -/* B21554 800AA3B4 AC8F0030 */ sw $t7, 0x30($a0) -/* B21558 800AA3B8 8CD90000 */ lw $t9, ($a2) -/* B2155C 800AA3BC AC990034 */ sw $t9, 0x34($a0) -/* B21560 800AA3C0 8CD80004 */ lw $t8, 4($a2) -/* B21564 800AA3C4 AC980038 */ sw $t8, 0x38($a0) -/* B21568 800AA3C8 8CD90008 */ lw $t9, 8($a2) -/* B2156C 800AA3CC AC99003C */ sw $t9, 0x3c($a0) -/* B21570 800AA3D0 8CE90000 */ lw $t1, ($a3) -/* B21574 800AA3D4 AC890040 */ sw $t1, 0x40($a0) -/* B21578 800AA3D8 8CE80004 */ lw $t0, 4($a3) -/* B2157C 800AA3DC AC880044 */ sw $t0, 0x44($a0) -/* B21580 800AA3E0 8CE90008 */ lw $t1, 8($a3) -/* B21584 800AA3E4 AC8B0120 */ sw $t3, 0x120($a0) -/* B21588 800AA3E8 03E00008 */ jr $ra -/* B2158C 800AA3EC AC890048 */ sw $t1, 0x48($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA3F0.s b/asm/non_matchings/code/z_view/func_800AA3F0.s deleted file mode 100644 index ea8b617b1b..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA3F0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800AA3F0 -/* B21590 800AA3F0 8CAF0000 */ lw $t7, ($a1) -/* B21594 800AA3F4 AC8F0028 */ sw $t7, 0x28($a0) -/* B21598 800AA3F8 8CAE0004 */ lw $t6, 4($a1) -/* B2159C 800AA3FC AC8E002C */ sw $t6, 0x2c($a0) -/* B215A0 800AA400 8CAF0008 */ lw $t7, 8($a1) -/* B215A4 800AA404 AC8F0030 */ sw $t7, 0x30($a0) -/* B215A8 800AA408 8CD90000 */ lw $t9, ($a2) -/* B215AC 800AA40C AC990034 */ sw $t9, 0x34($a0) -/* B215B0 800AA410 8CD80004 */ lw $t8, 4($a2) -/* B215B4 800AA414 AC980038 */ sw $t8, 0x38($a0) -/* B215B8 800AA418 8CD90008 */ lw $t9, 8($a2) -/* B215BC 800AA41C AC99003C */ sw $t9, 0x3c($a0) -/* B215C0 800AA420 8CE90000 */ lw $t1, ($a3) -/* B215C4 800AA424 AC890040 */ sw $t1, 0x40($a0) -/* B215C8 800AA428 8CE80004 */ lw $t0, 4($a3) -/* B215CC 800AA42C AC880044 */ sw $t0, 0x44($a0) -/* B215D0 800AA430 8CE90008 */ lw $t1, 8($a3) -/* B215D4 800AA434 03E00008 */ jr $ra -/* B215D8 800AA438 AC890048 */ sw $t1, 0x48($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA43C.s b/asm/non_matchings/code/z_view/func_800AA43C.s deleted file mode 100644 index b0989c77f4..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA43C.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_800AA43C -/* B215DC 800AA43C 8C8E0120 */ lw $t6, 0x120($a0) -/* B215E0 800AA440 44856000 */ mtc1 $a1, $f12 -/* B215E4 800AA444 35CF0004 */ ori $t7, $t6, 4 -/* B215E8 800AA448 AC8F0120 */ sw $t7, 0x120($a0) -/* B215EC 800AA44C 03E00008 */ jr $ra -/* B215F0 800AA450 E48C0024 */ swc1 $f12, 0x24($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA454.s b/asm/non_matchings/code/z_view/func_800AA454.s deleted file mode 100644 index c59701e632..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA454.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800AA454 -/* B215F4 800AA454 C4840024 */ lwc1 $f4, 0x24($a0) -/* B215F8 800AA458 03E00008 */ jr $ra -/* B215FC 800AA45C E4A40000 */ swc1 $f4, ($a1) - diff --git a/asm/non_matchings/code/z_view/func_800AA460.s b/asm/non_matchings/code/z_view/func_800AA460.s deleted file mode 100644 index a223638059..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA460.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800AA460 -/* B21600 800AA460 44856000 */ mtc1 $a1, $f12 -/* B21604 800AA464 44867000 */ mtc1 $a2, $f14 -/* B21608 800AA468 AFA7000C */ sw $a3, 0xc($sp) -/* B2160C 800AA46C 8C8E0120 */ lw $t6, 0x120($a0) -/* B21610 800AA470 E48C0018 */ swc1 $f12, 0x18($a0) -/* B21614 800AA474 E48E001C */ swc1 $f14, 0x1c($a0) -/* B21618 800AA478 C7A4000C */ lwc1 $f4, 0xc($sp) -/* B2161C 800AA47C 35CF0004 */ ori $t7, $t6, 4 -/* B21620 800AA480 AC8F0120 */ sw $t7, 0x120($a0) -/* B21624 800AA484 03E00008 */ jr $ra -/* B21628 800AA488 E4840020 */ swc1 $f4, 0x20($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA48C.s b/asm/non_matchings/code/z_view/func_800AA48C.s deleted file mode 100644 index c30fa42b47..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA48C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800AA48C -/* B2162C 800AA48C C4840018 */ lwc1 $f4, 0x18($a0) -/* B21630 800AA490 E4A40000 */ swc1 $f4, ($a1) -/* B21634 800AA494 C486001C */ lwc1 $f6, 0x1c($a0) -/* B21638 800AA498 E4C60000 */ swc1 $f6, ($a2) -/* B2163C 800AA49C C4880020 */ lwc1 $f8, 0x20($a0) -/* B21640 800AA4A0 03E00008 */ jr $ra -/* B21644 800AA4A4 E4E80000 */ swc1 $f8, ($a3) - diff --git a/asm/non_matchings/code/z_view/func_800AA4A8.s b/asm/non_matchings/code/z_view/func_800AA4A8.s deleted file mode 100644 index b2e42dd917..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA4A8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800AA4A8 -/* B21648 800AA4A8 44856000 */ mtc1 $a1, $f12 -/* B2164C 800AA4AC 44867000 */ mtc1 $a2, $f14 -/* B21650 800AA4B0 AFA7000C */ sw $a3, 0xc($sp) -/* B21654 800AA4B4 8C8E0120 */ lw $t6, 0x120($a0) -/* B21658 800AA4B8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B2165C 800AA4BC E48C0018 */ swc1 $f12, 0x18($a0) -/* B21660 800AA4C0 E48E001C */ swc1 $f14, 0x1c($a0) -/* B21664 800AA4C4 C7A4000C */ lwc1 $f4, 0xc($sp) -/* B21668 800AA4C8 44813000 */ mtc1 $at, $f6 -/* B2166C 800AA4CC 35CF0008 */ ori $t7, $t6, 8 -/* B21670 800AA4D0 AC8F0120 */ sw $t7, 0x120($a0) -/* B21674 800AA4D4 E4840020 */ swc1 $f4, 0x20($a0) -/* B21678 800AA4D8 03E00008 */ jr $ra -/* B2167C 800AA4DC E4860024 */ swc1 $f6, 0x24($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA4E0.s b/asm/non_matchings/code/z_view/func_800AA4E0.s deleted file mode 100644 index 41bd3542ab..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA4E0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800AA4E0 -/* B21680 800AA4E0 C4840018 */ lwc1 $f4, 0x18($a0) -/* B21684 800AA4E4 E4A40000 */ swc1 $f4, ($a1) -/* B21688 800AA4E8 C486001C */ lwc1 $f6, 0x1c($a0) -/* B2168C 800AA4EC E4C60000 */ swc1 $f6, ($a2) -/* B21690 800AA4F0 C4880020 */ lwc1 $f8, 0x20($a0) -/* B21694 800AA4F4 03E00008 */ jr $ra -/* B21698 800AA4F8 E4E80000 */ swc1 $f8, ($a3) - diff --git a/asm/non_matchings/code/z_view/func_800AA4FC.s b/asm/non_matchings/code/z_view/func_800AA4FC.s deleted file mode 100644 index 63b5adc0fe..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA4FC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800AA4FC -/* B2169C 800AA4FC 8CAF0000 */ lw $t7, ($a1) -/* B216A0 800AA500 8C980120 */ lw $t8, 0x120($a0) -/* B216A4 800AA504 AC8F0008 */ sw $t7, 8($a0) -/* B216A8 800AA508 8CAE0004 */ lw $t6, 4($a1) -/* B216AC 800AA50C 37190002 */ ori $t9, $t8, 2 -/* B216B0 800AA510 AC8E000C */ sw $t6, 0xc($a0) -/* B216B4 800AA514 8CAF0008 */ lw $t7, 8($a1) -/* B216B8 800AA518 AC8F0010 */ sw $t7, 0x10($a0) -/* B216BC 800AA51C 8CAE000C */ lw $t6, 0xc($a1) -/* B216C0 800AA520 AC990120 */ sw $t9, 0x120($a0) -/* B216C4 800AA524 03E00008 */ jr $ra -/* B216C8 800AA528 AC8E0014 */ sw $t6, 0x14($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA52C.s b/asm/non_matchings/code/z_view/func_800AA52C.s deleted file mode 100644 index c2f8723302..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA52C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800AA52C -/* B216CC 800AA52C 8C8F0008 */ lw $t7, 8($a0) -/* B216D0 800AA530 ACAF0000 */ sw $t7, ($a1) -/* B216D4 800AA534 8C8E000C */ lw $t6, 0xc($a0) -/* B216D8 800AA538 ACAE0004 */ sw $t6, 4($a1) -/* B216DC 800AA53C 8C8F0010 */ lw $t7, 0x10($a0) -/* B216E0 800AA540 ACAF0008 */ sw $t7, 8($a1) -/* B216E4 800AA544 8C8E0014 */ lw $t6, 0x14($a0) -/* B216E8 800AA548 03E00008 */ jr $ra -/* B216EC 800AA54C ACAE000C */ sw $t6, 0xc($a1) - diff --git a/asm/non_matchings/code/z_view/func_800AA76C.s b/asm/non_matchings/code/z_view/func_800AA76C.s deleted file mode 100644 index 6fa927fd6b..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA76C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800AA76C -/* B2190C 800AA76C 44856000 */ mtc1 $a1, $f12 -/* B21910 800AA770 44867000 */ mtc1 $a2, $f14 -/* B21914 800AA774 AFA7000C */ sw $a3, 0xc($sp) -/* B21918 800AA778 E48C00E8 */ swc1 $f12, 0xe8($a0) -/* B2191C 800AA77C E48E00EC */ swc1 $f14, 0xec($a0) -/* B21920 800AA780 C7A4000C */ lwc1 $f4, 0xc($sp) -/* B21924 800AA784 03E00008 */ jr $ra -/* B21928 800AA788 E48400F0 */ swc1 $f4, 0xf0($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA78C.s b/asm/non_matchings/code/z_view/func_800AA78C.s deleted file mode 100644 index 6cfefafd20..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA78C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800AA78C -/* B2192C 800AA78C 44856000 */ mtc1 $a1, $f12 -/* B21930 800AA790 44867000 */ mtc1 $a2, $f14 -/* B21934 800AA794 AFA7000C */ sw $a3, 0xc($sp) -/* B21938 800AA798 E48C00F4 */ swc1 $f12, 0xf4($a0) -/* B2193C 800AA79C E48E00F8 */ swc1 $f14, 0xf8($a0) -/* B21940 800AA7A0 C7A4000C */ lwc1 $f4, 0xc($sp) -/* B21944 800AA7A4 03E00008 */ jr $ra -/* B21948 800AA7A8 E48400FC */ swc1 $f4, 0xfc($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA7AC.s b/asm/non_matchings/code/z_view/func_800AA7AC.s deleted file mode 100644 index 781395a3d8..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA7AC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_800AA7AC -/* B2194C 800AA7AC 44856000 */ mtc1 $a1, $f12 -/* B21950 800AA7B0 03E00008 */ jr $ra -/* B21954 800AA7B4 E48C0100 */ swc1 $f12, 0x100($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA7B8.s b/asm/non_matchings/code/z_view/func_800AA7B8.s deleted file mode 100644 index a5b70b6792..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA7B8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800AA7B8 -/* B21958 800AA7B8 44809000 */ mtc1 $zero, $f18 -/* B2195C 800AA7BC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B21960 800AA7C0 44818000 */ mtc1 $at, $f16 -/* B21964 800AA7C4 E49200E8 */ swc1 $f18, 0xe8($a0) -/* B21968 800AA7C8 8C8F00E8 */ lw $t7, 0xe8($a0) -/* B2196C 800AA7CC E49000F4 */ swc1 $f16, 0xf4($a0) -/* B21970 800AA7D0 8C9900F4 */ lw $t9, 0xf4($a0) -/* B21974 800AA7D4 E49200EC */ swc1 $f18, 0xec($a0) -/* B21978 800AA7D8 8C8E00EC */ lw $t6, 0xec($a0) -/* B2197C 800AA7DC E49200F0 */ swc1 $f18, 0xf0($a0) -/* B21980 800AA7E0 E49000F8 */ swc1 $f16, 0xf8($a0) -/* B21984 800AA7E4 8C9800F8 */ lw $t8, 0xf8($a0) -/* B21988 800AA7E8 E49000FC */ swc1 $f16, 0xfc($a0) -/* B2198C 800AA7EC AC8F0104 */ sw $t7, 0x104($a0) -/* B21990 800AA7F0 8C8F00F0 */ lw $t7, 0xf0($a0) -/* B21994 800AA7F4 AC990110 */ sw $t9, 0x110($a0) -/* B21998 800AA7F8 8C9900FC */ lw $t9, 0xfc($a0) -/* B2199C 800AA7FC AC8E0108 */ sw $t6, 0x108($a0) -/* B219A0 800AA800 AC8F010C */ sw $t7, 0x10c($a0) -/* B219A4 800AA804 AC980114 */ sw $t8, 0x114($a0) -/* B219A8 800AA808 AC990118 */ sw $t9, 0x118($a0) -/* B219AC 800AA80C 03E00008 */ jr $ra -/* B219B0 800AA810 E4920100 */ swc1 $f18, 0x100($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA814.s b/asm/non_matchings/code/z_view/func_800AA814.s deleted file mode 100644 index eefc21b854..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA814.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800AA814 -/* B219B4 800AA814 44809000 */ mtc1 $zero, $f18 -/* B219B8 800AA818 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B219BC 800AA81C 44818000 */ mtc1 $at, $f16 -/* B219C0 800AA820 E49200E8 */ swc1 $f18, 0xe8($a0) -/* B219C4 800AA824 E49200EC */ swc1 $f18, 0xec($a0) -/* B219C8 800AA828 E49200F0 */ swc1 $f18, 0xf0($a0) -/* B219CC 800AA82C E49000F4 */ swc1 $f16, 0xf4($a0) -/* B219D0 800AA830 E49000F8 */ swc1 $f16, 0xf8($a0) -/* B219D4 800AA834 E49000FC */ swc1 $f16, 0xfc($a0) -/* B219D8 800AA838 03E00008 */ jr $ra -/* B219DC 800AA83C E4900100 */ swc1 $f16, 0x100($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA840.s b/asm/non_matchings/code/z_view/func_800AA840.s deleted file mode 100644 index a1f416e643..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA840.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800AA840 -/* B219E0 800AA840 AFA50004 */ sw $a1, 4($sp) -/* B219E4 800AA844 AFA60008 */ sw $a2, 8($sp) -/* B219E8 800AA848 AFA7000C */ sw $a3, 0xc($sp) -/* B219EC 800AA84C 27AE0004 */ addiu $t6, $sp, 4 -/* B219F0 800AA850 8DD80000 */ lw $t8, ($t6) -/* B219F4 800AA854 27B90010 */ addiu $t9, $sp, 0x10 -/* B219F8 800AA858 AC9800E8 */ sw $t8, 0xe8($a0) -/* B219FC 800AA85C 8DCF0004 */ lw $t7, 4($t6) -/* B21A00 800AA860 AC8F00EC */ sw $t7, 0xec($a0) -/* B21A04 800AA864 8DD80008 */ lw $t8, 8($t6) -/* B21A08 800AA868 AC9800F0 */ sw $t8, 0xf0($a0) -/* B21A0C 800AA86C 8F290000 */ lw $t1, ($t9) -/* B21A10 800AA870 AC8900F4 */ sw $t1, 0xf4($a0) -/* B21A14 800AA874 8F280004 */ lw $t0, 4($t9) -/* B21A18 800AA878 AC8800F8 */ sw $t0, 0xf8($a0) -/* B21A1C 800AA87C 8F290008 */ lw $t1, 8($t9) -/* B21A20 800AA880 AC8900FC */ sw $t1, 0xfc($a0) -/* B21A24 800AA884 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B21A28 800AA888 03E00008 */ jr $ra -/* B21A2C 800AA88C E4840100 */ swc1 $f4, 0x100($a0) - diff --git a/asm/non_matchings/code/z_view/func_800AA890.s b/asm/non_matchings/code/z_view/func_800AA890.s deleted file mode 100644 index 5591929710..0000000000 --- a/asm/non_matchings/code/z_view/func_800AA890.s +++ /dev/null @@ -1,124 +0,0 @@ -.rdata -glabel D_80141128 - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AA890 -/* B21A30 800AA890 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B21A34 800AA894 AFBF001C */ sw $ra, 0x1c($sp) -/* B21A38 800AA898 AFB00018 */ sw $s0, 0x18($sp) -/* B21A3C 800AA89C AFA5006C */ sw $a1, 0x6c($sp) -/* B21A40 800AA8A0 44801000 */ mtc1 $zero, $f2 -/* B21A44 800AA8A4 C4800100 */ lwc1 $f0, 0x100($a0) -/* B21A48 800AA8A8 00808025 */ move $s0, $a0 -/* B21A4C 800AA8AC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B21A50 800AA8B0 46001032 */ c.eq.s $f2, $f0 -/* B21A54 800AA8B4 27A50028 */ addiu $a1, $sp, 0x28 -/* B21A58 800AA8B8 45020004 */ bc1fl .L800AA8CC -/* B21A5C 800AA8BC 44812000 */ mtc1 $at, $f4 -/* B21A60 800AA8C0 1000005E */ b .L800AAA3C -/* B21A64 800AA8C4 00001025 */ move $v0, $zero -/* B21A68 800AA8C8 44812000 */ mtc1 $at, $f4 -.L800AA8CC: -/* B21A6C 800AA8CC 00000000 */ nop -/* B21A70 800AA8D0 46002032 */ c.eq.s $f4, $f0 -/* B21A74 800AA8D4 00000000 */ nop -/* B21A78 800AA8D8 45020010 */ bc1fl .L800AA91C -/* B21A7C 800AA8DC C6020104 */ lwc1 $f2, 0x104($s0) -/* B21A80 800AA8E0 8E0F00E8 */ lw $t7, 0xe8($s0) -/* B21A84 800AA8E4 8E1900F4 */ lw $t9, 0xf4($s0) -/* B21A88 800AA8E8 8E0E00EC */ lw $t6, 0xec($s0) -/* B21A8C 800AA8EC AE0F0104 */ sw $t7, 0x104($s0) -/* B21A90 800AA8F0 AE190110 */ sw $t9, 0x110($s0) -/* B21A94 800AA8F4 8E0F00F0 */ lw $t7, 0xf0($s0) -/* B21A98 800AA8F8 8E1900FC */ lw $t9, 0xfc($s0) -/* B21A9C 800AA8FC 8E1800F8 */ lw $t8, 0xf8($s0) -/* B21AA0 800AA900 E6020100 */ swc1 $f2, 0x100($s0) -/* B21AA4 800AA904 AE0E0108 */ sw $t6, 0x108($s0) -/* B21AA8 800AA908 AE0F010C */ sw $t7, 0x10c($s0) -/* B21AAC 800AA90C AE190118 */ sw $t9, 0x118($s0) -/* B21AB0 800AA910 10000026 */ b .L800AA9AC -/* B21AB4 800AA914 AE180114 */ sw $t8, 0x114($s0) -/* B21AB8 800AA918 C6020104 */ lwc1 $f2, 0x104($s0) -.L800AA91C: -/* B21ABC 800AA91C C60600E8 */ lwc1 $f6, 0xe8($s0) -/* B21AC0 800AA920 C60C0108 */ lwc1 $f12, 0x108($s0) -/* B21AC4 800AA924 C60400EC */ lwc1 $f4, 0xec($s0) -/* B21AC8 800AA928 46023201 */ sub.s $f8, $f6, $f2 -/* B21ACC 800AA92C C60E010C */ lwc1 $f14, 0x10c($s0) -/* B21AD0 800AA930 C6100110 */ lwc1 $f16, 0x110($s0) -/* B21AD4 800AA934 460C2181 */ sub.s $f6, $f4, $f12 -/* B21AD8 800AA938 46004282 */ mul.s $f10, $f8, $f0 -/* B21ADC 800AA93C 460A1480 */ add.s $f18, $f2, $f10 -/* B21AE0 800AA940 46003202 */ mul.s $f8, $f6, $f0 -/* B21AE4 800AA944 C6020114 */ lwc1 $f2, 0x114($s0) -/* B21AE8 800AA948 E6120104 */ swc1 $f18, 0x104($s0) -/* B21AEC 800AA94C C61200F0 */ lwc1 $f18, 0xf0($s0) -/* B21AF0 800AA950 46086280 */ add.s $f10, $f12, $f8 -/* B21AF4 800AA954 C60C0118 */ lwc1 $f12, 0x118($s0) -/* B21AF8 800AA958 460E9101 */ sub.s $f4, $f18, $f14 -/* B21AFC 800AA95C E60A0108 */ swc1 $f10, 0x108($s0) -/* B21B00 800AA960 C60A00F4 */ lwc1 $f10, 0xf4($s0) -/* B21B04 800AA964 46002182 */ mul.s $f6, $f4, $f0 -/* B21B08 800AA968 46105481 */ sub.s $f18, $f10, $f16 -/* B21B0C 800AA96C 46009102 */ mul.s $f4, $f18, $f0 -/* B21B10 800AA970 46067200 */ add.s $f8, $f14, $f6 -/* B21B14 800AA974 E608010C */ swc1 $f8, 0x10c($s0) -/* B21B18 800AA978 46048180 */ add.s $f6, $f16, $f4 -/* B21B1C 800AA97C C60800F8 */ lwc1 $f8, 0xf8($s0) -/* B21B20 800AA980 E6060110 */ swc1 $f6, 0x110($s0) -/* B21B24 800AA984 46024281 */ sub.s $f10, $f8, $f2 -/* B21B28 800AA988 C60600FC */ lwc1 $f6, 0xfc($s0) -/* B21B2C 800AA98C 460C3201 */ sub.s $f8, $f6, $f12 -/* B21B30 800AA990 46005482 */ mul.s $f18, $f10, $f0 -/* B21B34 800AA994 00000000 */ nop -/* B21B38 800AA998 46004282 */ mul.s $f10, $f8, $f0 -/* B21B3C 800AA99C 46121100 */ add.s $f4, $f2, $f18 -/* B21B40 800AA9A0 460A6480 */ add.s $f18, $f12, $f10 -/* B21B44 800AA9A4 E6040114 */ swc1 $f4, 0x114($s0) -/* B21B48 800AA9A8 E6120118 */ swc1 $f18, 0x118($s0) -.L800AA9AC: -/* B21B4C 800AA9AC 0C03472B */ jal Matrix_MtxToMtxF -/* B21B50 800AA9B0 8FA4006C */ lw $a0, 0x6c($sp) -/* B21B54 800AA9B4 0C03423F */ jal Matrix_Put -/* B21B58 800AA9B8 27A40028 */ addiu $a0, $sp, 0x28 -/* B21B5C 800AA9BC C60C0104 */ lwc1 $f12, 0x104($s0) -/* B21B60 800AA9C0 0C0342DC */ jal Matrix_RotateX -/* B21B64 800AA9C4 24050001 */ li $a1, 1 -/* B21B68 800AA9C8 C60C0108 */ lwc1 $f12, 0x108($s0) -/* B21B6C 800AA9CC 0C034348 */ jal Matrix_RotateY -/* B21B70 800AA9D0 24050001 */ li $a1, 1 -/* B21B74 800AA9D4 C60C010C */ lwc1 $f12, 0x10c($s0) -/* B21B78 800AA9D8 0C0343B5 */ jal Matrix_RotateZ -/* B21B7C 800AA9DC 24050001 */ li $a1, 1 -/* B21B80 800AA9E0 C60C0110 */ lwc1 $f12, 0x110($s0) -/* B21B84 800AA9E4 C60E0114 */ lwc1 $f14, 0x114($s0) -/* B21B88 800AA9E8 8E060118 */ lw $a2, 0x118($s0) -/* B21B8C 800AA9EC 0C0342A3 */ jal Matrix_Scale -/* B21B90 800AA9F0 24070001 */ li $a3, 1 -/* B21B94 800AA9F4 C60C010C */ lwc1 $f12, 0x10c($s0) -/* B21B98 800AA9F8 24050001 */ li $a1, 1 -/* B21B9C 800AA9FC 0C0343B5 */ jal Matrix_RotateZ -/* B21BA0 800AAA00 46006307 */ neg.s $f12, $f12 -/* B21BA4 800AAA04 C60C0108 */ lwc1 $f12, 0x108($s0) -/* B21BA8 800AAA08 24050001 */ li $a1, 1 -/* B21BAC 800AAA0C 0C034348 */ jal Matrix_RotateY -/* B21BB0 800AAA10 46006307 */ neg.s $f12, $f12 -/* B21BB4 800AAA14 C60C0104 */ lwc1 $f12, 0x104($s0) -/* B21BB8 800AAA18 24050001 */ li $a1, 1 -/* B21BBC 800AAA1C 0C0342DC */ jal Matrix_RotateX -/* B21BC0 800AAA20 46006307 */ neg.s $f12, $f12 -/* B21BC4 800AAA24 3C058014 */ lui $a1, %hi(D_80141128) # $a1, 0x8014 -/* B21BC8 800AAA28 24A51128 */ addiu $a1, %lo(D_80141128) # addiu $a1, $a1, 0x1128 -/* B21BCC 800AAA2C 8FA4006C */ lw $a0, 0x6c($sp) -/* B21BD0 800AAA30 0C034695 */ jal Matrix_ToMtx -/* B21BD4 800AAA34 24060236 */ li $a2, 566 -/* B21BD8 800AAA38 24020001 */ li $v0, 1 -.L800AAA3C: -/* B21BDC 800AAA3C 8FBF001C */ lw $ra, 0x1c($sp) -/* B21BE0 800AAA40 8FB00018 */ lw $s0, 0x18($sp) -/* B21BE4 800AAA44 27BD0068 */ addiu $sp, $sp, 0x68 -/* B21BE8 800AAA48 03E00008 */ jr $ra -/* B21BEC 800AAA4C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AAA50.s b/asm/non_matchings/code/z_view/func_800AAA50.s deleted file mode 100644 index 86747cf4b9..0000000000 --- a/asm/non_matchings/code/z_view/func_800AAA50.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800AAA50 -/* B21BF0 800AAA50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B21BF4 800AAA54 AFBF0014 */ sw $ra, 0x14($sp) -/* B21BF8 800AAA58 8C8E0120 */ lw $t6, 0x120($a0) -/* B21BFC 800AAA5C 0005C103 */ sra $t8, $a1, 4 -/* B21C00 800AAA60 01C57824 */ and $t7, $t6, $a1 -/* B21C04 800AAA64 01F82825 */ or $a1, $t7, $t8 -/* B21C08 800AAA68 30B90008 */ andi $t9, $a1, 8 -/* B21C0C 800AAA6C 13200005 */ beqz $t9, .L800AAA84 -/* B21C10 800AAA70 00000000 */ nop -/* B21C14 800AAA74 0C02AC2A */ jal func_800AB0A8 -/* B21C18 800AAA78 00000000 */ nop -/* B21C1C 800AAA7C 10000004 */ b .L800AAA90 -/* B21C20 800AAA80 8FBF0014 */ lw $ra, 0x14($sp) -.L800AAA84: -/* B21C24 800AAA84 0C02AAA7 */ jal func_800AAA9C -/* B21C28 800AAA88 00000000 */ nop -/* B21C2C 800AAA8C 8FBF0014 */ lw $ra, 0x14($sp) -.L800AAA90: -/* B21C30 800AAA90 27BD0018 */ addiu $sp, $sp, 0x18 -/* B21C34 800AAA94 03E00008 */ jr $ra -/* B21C38 800AAA98 00000000 */ nop - diff --git a/asm/non_matchings/code/z_view/func_800AB0A8.s b/asm/non_matchings/code/z_view/func_800AB0A8.s deleted file mode 100644 index 7ce8e60621..0000000000 --- a/asm/non_matchings/code/z_view/func_800AB0A8.s +++ /dev/null @@ -1,164 +0,0 @@ -.rdata -glabel D_80141200 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014120C - .asciz "vp" - .balign 4 - -glabel D_80141210 - .asciz "../z_view.c" - .balign 4 - -glabel D_8014121C - .asciz "projection" - .balign 4 - -glabel D_80141228 - .asciz "../z_view.c" - .balign 4 - -glabel D_80141234 - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AB0A8 -/* B22248 800AB0A8 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B2224C 800AB0AC AFBF0034 */ sw $ra, 0x34($sp) -/* B22250 800AB0B0 AFB20030 */ sw $s2, 0x30($sp) -/* B22254 800AB0B4 AFB1002C */ sw $s1, 0x2c($sp) -/* B22258 800AB0B8 AFB00028 */ sw $s0, 0x28($sp) -/* B2225C 800AB0BC 8C900004 */ lw $s0, 4($a0) -/* B22260 800AB0C0 00809025 */ move $s2, $a0 -/* B22264 800AB0C4 3C068014 */ lui $a2, %hi(D_80141200) # $a2, 0x8014 -/* B22268 800AB0C8 24C61200 */ addiu $a2, %lo(D_80141200) # addiu $a2, $a2, 0x1200 -/* B2226C 800AB0CC 27A40050 */ addiu $a0, $sp, 0x50 -/* B22270 800AB0D0 240702D6 */ li $a3, 726 -/* B22274 800AB0D4 0C031AB1 */ jal Graph_OpenDisps -/* B22278 800AB0D8 02002825 */ move $a1, $s0 -/* B2227C 800AB0DC 02002025 */ move $a0, $s0 -/* B22280 800AB0E0 0C031A73 */ jal Graph_Alloc -/* B22284 800AB0E4 24050010 */ li $a1, 16 -/* B22288 800AB0E8 3C048014 */ lui $a0, %hi(D_8014120C) # $a0, 0x8014 -/* B2228C 800AB0EC 3C068014 */ lui $a2, %hi(D_80141210) # $a2, 0x8014 -/* B22290 800AB0F0 00408825 */ move $s1, $v0 -/* B22294 800AB0F4 24C61210 */ addiu $a2, %lo(D_80141210) # addiu $a2, $a2, 0x1210 -/* B22298 800AB0F8 2484120C */ addiu $a0, %lo(D_8014120C) # addiu $a0, $a0, 0x120c -/* B2229C 800AB0FC 00402825 */ move $a1, $v0 -/* B222A0 800AB100 0C000B58 */ jal LogUtils_CheckNullPointer -/* B222A4 800AB104 240702DA */ li $a3, 730 -/* B222A8 800AB108 02202025 */ move $a0, $s1 -/* B222AC 800AB10C 0C02A864 */ jal func_800AA190 -/* B222B0 800AB110 26450008 */ addiu $a1, $s2, 8 -/* B222B4 800AB114 8E2F0000 */ lw $t7, ($s1) -/* B222B8 800AB118 02402025 */ move $a0, $s2 -/* B222BC 800AB11C AE4F0050 */ sw $t7, 0x50($s2) -/* B222C0 800AB120 8E2E0004 */ lw $t6, 4($s1) -/* B222C4 800AB124 AE4E0054 */ sw $t6, 0x54($s2) -/* B222C8 800AB128 8E2F0008 */ lw $t7, 8($s1) -/* B222CC 800AB12C AE4F0058 */ sw $t7, 0x58($s2) -/* B222D0 800AB130 8E2E000C */ lw $t6, 0xc($s1) -/* B222D4 800AB134 0C02A954 */ jal func_800AA550 -/* B222D8 800AB138 AE4E005C */ sw $t6, 0x5c($s2) -/* B222DC 800AB13C 8E0302C0 */ lw $v1, 0x2c0($s0) -/* B222E0 800AB140 3C04DC08 */ lui $a0, (0xDC080008 >> 16) # lui $a0, 0xdc08 -/* B222E4 800AB144 34840008 */ ori $a0, (0xDC080008 & 0xFFFF) # ori $a0, $a0, 8 -/* B222E8 800AB148 24780008 */ addiu $t8, $v1, 8 -/* B222EC 800AB14C AE1802C0 */ sw $t8, 0x2c0($s0) -/* B222F0 800AB150 AC710004 */ sw $s1, 4($v1) -/* B222F4 800AB154 AC640000 */ sw $a0, ($v1) -/* B222F8 800AB158 8E0302D0 */ lw $v1, 0x2d0($s0) -/* B222FC 800AB15C 24050040 */ li $a1, 64 -/* B22300 800AB160 24790008 */ addiu $t9, $v1, 8 -/* B22304 800AB164 AE1902D0 */ sw $t9, 0x2d0($s0) -/* B22308 800AB168 AC710004 */ sw $s1, 4($v1) -/* B2230C 800AB16C AC640000 */ sw $a0, ($v1) -/* B22310 800AB170 8E0302B0 */ lw $v1, 0x2b0($s0) -/* B22314 800AB174 24680008 */ addiu $t0, $v1, 8 -/* B22318 800AB178 AE0802B0 */ sw $t0, 0x2b0($s0) -/* B2231C 800AB17C AC640000 */ sw $a0, ($v1) -/* B22320 800AB180 02002025 */ move $a0, $s0 -/* B22324 800AB184 0C031A73 */ jal Graph_Alloc -/* B22328 800AB188 AC710004 */ sw $s1, 4($v1) -/* B2232C 800AB18C 3C048014 */ lui $a0, %hi(D_8014121C) # $a0, 0x8014 -/* B22330 800AB190 3C068014 */ lui $a2, %hi(D_80141228) # $a2, 0x8014 -/* B22334 800AB194 00408825 */ move $s1, $v0 -/* B22338 800AB198 24C61228 */ addiu $a2, %lo(D_80141228) # addiu $a2, $a2, 0x1228 -/* B2233C 800AB19C 2484121C */ addiu $a0, %lo(D_8014121C) # addiu $a0, $a0, 0x121c -/* B22340 800AB1A0 00402825 */ move $a1, $v0 -/* B22344 800AB1A4 0C000B58 */ jal LogUtils_CheckNullPointer -/* B22348 800AB1A8 240702E8 */ li $a3, 744 -/* B2234C 800AB1AC AE5100E0 */ sw $s1, 0xe0($s2) -/* B22350 800AB1B0 3C098013 */ lui $t1, %hi(gScreenWidth) -/* B22354 800AB1B4 8D29D270 */ lw $t1, %lo(gScreenWidth)($t1) -/* B22358 800AB1B8 3C0A8013 */ lui $t2, %hi(gScreenHeight) -/* B2235C 800AB1BC 8D4AD274 */ lw $t2, %lo(gScreenHeight)($t2) -/* B22360 800AB1C0 44892000 */ mtc1 $t1, $f4 -/* B22364 800AB1C4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B22368 800AB1C8 448A8000 */ mtc1 $t2, $f16 -/* B2236C 800AB1CC 46802020 */ cvt.s.w $f0, $f4 -/* B22370 800AB1D0 44816000 */ mtc1 $at, $f12 -/* B22374 800AB1D4 02202025 */ move $a0, $s1 -/* B22378 800AB1D8 468080A0 */ cvt.s.w $f2, $f16 -/* B2237C 800AB1DC 46000187 */ neg.s $f6, $f0 -/* B22380 800AB1E0 46001487 */ neg.s $f18, $f2 -/* B22384 800AB1E4 460C3202 */ mul.s $f8, $f6, $f12 -/* B22388 800AB1E8 00000000 */ nop -/* B2238C 800AB1EC 460C0282 */ mul.s $f10, $f0, $f12 -/* B22390 800AB1F0 00000000 */ nop -/* B22394 800AB1F4 460C9102 */ mul.s $f4, $f18, $f12 -/* B22398 800AB1F8 44054000 */ mfc1 $a1, $f8 -/* B2239C 800AB1FC 460C1182 */ mul.s $f6, $f2, $f12 -/* B223A0 800AB200 44065000 */ mfc1 $a2, $f10 -/* B223A4 800AB204 44072000 */ mfc1 $a3, $f4 -/* B223A8 800AB208 E7A60010 */ swc1 $f6, 0x10($sp) -/* B223AC 800AB20C C648001C */ lwc1 $f8, 0x1c($s2) -/* B223B0 800AB210 E7A80014 */ swc1 $f8, 0x14($sp) -/* B223B4 800AB214 C64A0020 */ lwc1 $f10, 0x20($s2) -/* B223B8 800AB218 E7AA0018 */ swc1 $f10, 0x18($sp) -/* B223BC 800AB21C C6500024 */ lwc1 $f16, 0x24($s2) -/* B223C0 800AB220 0C041169 */ jal func_801045A4 -/* B223C4 800AB224 E7B0001C */ swc1 $f16, 0x1c($sp) -/* B223C8 800AB228 02206825 */ move $t5, $s1 -/* B223CC 800AB22C 02407025 */ move $t6, $s2 -/* B223D0 800AB230 262F003C */ addiu $t7, $s1, 0x3c -.L800AB234: -/* B223D4 800AB234 8DAC0000 */ lw $t4, ($t5) -/* B223D8 800AB238 25AD000C */ addiu $t5, $t5, 0xc -/* B223DC 800AB23C 25CE000C */ addiu $t6, $t6, 0xc -/* B223E0 800AB240 ADCC0054 */ sw $t4, 0x54($t6) -/* B223E4 800AB244 8DABFFF8 */ lw $t3, -8($t5) -/* B223E8 800AB248 ADCB0058 */ sw $t3, 0x58($t6) -/* B223EC 800AB24C 8DACFFFC */ lw $t4, -4($t5) -/* B223F0 800AB250 15AFFFF8 */ bne $t5, $t7, .L800AB234 -/* B223F4 800AB254 ADCC005C */ sw $t4, 0x5c($t6) -/* B223F8 800AB258 8DAC0000 */ lw $t4, ($t5) -/* B223FC 800AB25C 3C04DA38 */ lui $a0, (0xDA380007 >> 16) # lui $a0, 0xda38 -/* B22400 800AB260 34840007 */ ori $a0, (0xDA380007 & 0xFFFF) # ori $a0, $a0, 7 -/* B22404 800AB264 ADCC0060 */ sw $t4, 0x60($t6) -/* B22408 800AB268 8E0302C0 */ lw $v1, 0x2c0($s0) -/* B2240C 800AB26C 3C068014 */ lui $a2, %hi(D_80141234) # $a2, 0x8014 -/* B22410 800AB270 24C61234 */ addiu $a2, %lo(D_80141234) # addiu $a2, $a2, 0x1234 -/* B22414 800AB274 24780008 */ addiu $t8, $v1, 8 -/* B22418 800AB278 AE1802C0 */ sw $t8, 0x2c0($s0) -/* B2241C 800AB27C AC710004 */ sw $s1, 4($v1) -/* B22420 800AB280 AC640000 */ sw $a0, ($v1) -/* B22424 800AB284 8E0302D0 */ lw $v1, 0x2d0($s0) -/* B22428 800AB288 02002825 */ move $a1, $s0 -/* B2242C 800AB28C 240702FA */ li $a3, 762 -/* B22430 800AB290 24790008 */ addiu $t9, $v1, 8 -/* B22434 800AB294 AE1902D0 */ sw $t9, 0x2d0($s0) -/* B22438 800AB298 AC640000 */ sw $a0, ($v1) -/* B2243C 800AB29C 27A40050 */ addiu $a0, $sp, 0x50 -/* B22440 800AB2A0 0C031AD5 */ jal Graph_CloseDisps -/* B22444 800AB2A4 AC710004 */ sw $s1, 4($v1) -/* B22448 800AB2A8 8FBF0034 */ lw $ra, 0x34($sp) -/* B2244C 800AB2AC 8FB00028 */ lw $s0, 0x28($sp) -/* B22450 800AB2B0 8FB1002C */ lw $s1, 0x2c($sp) -/* B22454 800AB2B4 8FB20030 */ lw $s2, 0x30($sp) -/* B22458 800AB2B8 27BD0070 */ addiu $sp, $sp, 0x70 -/* B2245C 800AB2BC 03E00008 */ jr $ra -/* B22460 800AB2C0 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_view/func_800AB944.s b/asm/non_matchings/code/z_view/func_800AB944.s deleted file mode 100644 index 0be78263ca..0000000000 --- a/asm/non_matchings/code/z_view/func_800AB944.s +++ /dev/null @@ -1,54 +0,0 @@ -.rdata -glabel D_801412D4 - .asciz "../z_view.c" - .balign 4 - -glabel D_801412E0 - .asciz "../z_view.c" - .balign 4 - -.text -glabel func_800AB944 -/* B22AE4 800AB944 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B22AE8 800AB948 AFB00030 */ sw $s0, 0x30($sp) -/* B22AEC 800AB94C 00808025 */ move $s0, $a0 -/* B22AF0 800AB950 AFBF0034 */ sw $ra, 0x34($sp) -/* B22AF4 800AB954 3C068014 */ lui $a2, %hi(D_801412D4) # $a2, 0x8014 -/* B22AF8 800AB958 24C612D4 */ addiu $a2, %lo(D_801412D4) # addiu $a2, $a2, 0x12d4 -/* B22AFC 800AB95C 8E050004 */ lw $a1, 4($s0) -/* B22B00 800AB960 27A4003C */ addiu $a0, $sp, 0x3c -/* B22B04 800AB964 0C031AB1 */ jal Graph_OpenDisps -/* B22B08 800AB968 2407036E */ li $a3, 878 -/* B22B0C 800AB96C C60C0028 */ lwc1 $f12, 0x28($s0) -/* B22B10 800AB970 C60E002C */ lwc1 $f14, 0x2c($s0) -/* B22B14 800AB974 0C02AF9D */ jal func_800ABE74 -/* B22B18 800AB978 8E060030 */ lw $a2, 0x30($s0) -/* B22B1C 800AB97C C6040034 */ lwc1 $f4, 0x34($s0) -/* B22B20 800AB980 8E0400E4 */ lw $a0, 0xe4($s0) -/* B22B24 800AB984 8E050028 */ lw $a1, 0x28($s0) -/* B22B28 800AB988 8E06002C */ lw $a2, 0x2c($s0) -/* B22B2C 800AB98C 8E070030 */ lw $a3, 0x30($s0) -/* B22B30 800AB990 E7A40010 */ swc1 $f4, 0x10($sp) -/* B22B34 800AB994 C6060038 */ lwc1 $f6, 0x38($s0) -/* B22B38 800AB998 E7A60014 */ swc1 $f6, 0x14($sp) -/* B22B3C 800AB99C C608003C */ lwc1 $f8, 0x3c($s0) -/* B22B40 800AB9A0 E7A80018 */ swc1 $f8, 0x18($sp) -/* B22B44 800AB9A4 C60A0040 */ lwc1 $f10, 0x40($s0) -/* B22B48 800AB9A8 E7AA001C */ swc1 $f10, 0x1c($sp) -/* B22B4C 800AB9AC C6100044 */ lwc1 $f16, 0x44($s0) -/* B22B50 800AB9B0 E7B00020 */ swc1 $f16, 0x20($sp) -/* B22B54 800AB9B4 C6120048 */ lwc1 $f18, 0x48($s0) -/* B22B58 800AB9B8 0C04078D */ jal func_80101E34 -/* B22B5C 800AB9BC E7B20024 */ swc1 $f18, 0x24($sp) -/* B22B60 800AB9C0 3C068014 */ lui $a2, %hi(D_801412E0) # $a2, 0x8014 -/* B22B64 800AB9C4 24C612E0 */ addiu $a2, %lo(D_801412E0) # addiu $a2, $a2, 0x12e0 -/* B22B68 800AB9C8 27A4003C */ addiu $a0, $sp, 0x3c -/* B22B6C 800AB9CC 8E050004 */ lw $a1, 4($s0) -/* B22B70 800AB9D0 0C031AD5 */ jal Graph_CloseDisps -/* B22B74 800AB9D4 24070376 */ li $a3, 886 -/* B22B78 800AB9D8 8FBF0034 */ lw $ra, 0x34($sp) -/* B22B7C 800AB9DC 8FB00030 */ lw $s0, 0x30($sp) -/* B22B80 800AB9E0 27BD0050 */ addiu $sp, $sp, 0x50 -/* B22B84 800AB9E4 03E00008 */ jr $ra -/* B22B88 800AB9E8 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_view/func_800ABE74.s b/asm/non_matchings/code/z_view/func_800ABE74.s deleted file mode 100644 index 5237456949..0000000000 --- a/asm/non_matchings/code/z_view/func_800ABE74.s +++ /dev/null @@ -1,141 +0,0 @@ -.rdata -glabel D_80141340 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80141348 - .asciz "eye が大きすぎます eye=[%8.3f %8.3f %8.3f] error=%d\n" - # EUC-JP: が大きすぎます | Is too large - .balign 4 - -glabel D_80141380 - .asciz "\x1b[m" - .balign 4 - -.late_rodata -glabel D_8014138C - .float 1073676288 - -glabel D_80141390 - .float 18900 - -.text -glabel func_800ABE74 -/* B23014 800ABE74 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B23018 800ABE78 E7AC0038 */ swc1 $f12, 0x38($sp) -/* B2301C 800ABE7C C7A60038 */ lwc1 $f6, 0x38($sp) -/* B23020 800ABE80 E7AE003C */ swc1 $f14, 0x3c($sp) -/* B23024 800ABE84 C7AA003C */ lwc1 $f10, 0x3c($sp) -/* B23028 800ABE88 46063202 */ mul.s $f8, $f6, $f6 -/* B2302C 800ABE8C AFA60040 */ sw $a2, 0x40($sp) -/* B23030 800ABE90 C7A60040 */ lwc1 $f6, 0x40($sp) -/* B23034 800ABE94 460A5402 */ mul.s $f16, $f10, $f10 -/* B23038 800ABE98 3C018014 */ lui $at, %hi(D_8014138C) -/* B2303C 800ABE9C C424138C */ lwc1 $f4, %lo(D_8014138C)($at) -/* B23040 800ABEA0 46063282 */ mul.s $f10, $f6, $f6 -/* B23044 800ABEA4 3C048014 */ lui $a0, %hi(D_80141340) -/* B23048 800ABEA8 AFBF002C */ sw $ra, 0x2c($sp) -/* B2304C 800ABEAC 00001825 */ move $v1, $zero -/* B23050 800ABEB0 C7A6003C */ lwc1 $f6, 0x3c($sp) -/* B23054 800ABEB4 46104480 */ add.s $f18, $f8, $f16 -/* B23058 800ABEB8 C7B00038 */ lwc1 $f16, 0x38($sp) -/* B2305C 800ABEBC 3C018014 */ lui $at, %hi(D_80141390) -/* B23060 800ABEC0 24841340 */ addiu $a0, %lo(D_80141340) # addiu $a0, $a0, 0x1340 -/* B23064 800ABEC4 460A9200 */ add.s $f8, $f18, $f10 -/* B23068 800ABEC8 C7B20040 */ lwc1 $f18, 0x40($sp) -/* B2306C 800ABECC 4608203C */ c.lt.s $f4, $f8 -/* B23070 800ABED0 00000000 */ nop -/* B23074 800ABED4 45020004 */ bc1fl .L800ABEE8 -/* B23078 800ABED8 44800000 */ mtc1 $zero, $f0 -/* B2307C 800ABEDC 10000037 */ b .L800ABFBC -/* B23080 800ABEE0 24030003 */ li $v1, 3 -/* B23084 800ABEE4 44800000 */ mtc1 $zero, $f0 -.L800ABEE8: -/* B23088 800ABEE8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B2308C 800ABEEC C7AC003C */ lwc1 $f12, 0x3c($sp) -/* B23090 800ABEF0 4610003E */ c.le.s $f0, $f16 -/* B23094 800ABEF4 00000000 */ nop -/* B23098 800ABEF8 45020004 */ bc1fl .L800ABF0C -/* B2309C 800ABEFC 46001087 */ neg.s $f2, $f2 -/* B230A0 800ABF00 10000002 */ b .L800ABF0C -/* B230A4 800ABF04 46008086 */ mov.s $f2, $f16 -/* B230A8 800ABF08 46001087 */ neg.s $f2, $f2 -.L800ABF0C: -/* B230AC 800ABF0C 4606003E */ c.le.s $f0, $f6 -/* B230B0 800ABF10 00000000 */ nop -/* B230B4 800ABF14 45020004 */ bc1fl .L800ABF28 -/* B230B8 800ABF18 46006307 */ neg.s $f12, $f12 -/* B230BC 800ABF1C 10000002 */ b .L800ABF28 -/* B230C0 800ABF20 46003306 */ mov.s $f12, $f6 -/* B230C4 800ABF24 46006307 */ neg.s $f12, $f12 -.L800ABF28: -/* B230C8 800ABF28 4612003E */ c.le.s $f0, $f18 -/* B230CC 800ABF2C C7A00040 */ lwc1 $f0, 0x40($sp) -/* B230D0 800ABF30 45020004 */ bc1fl .L800ABF44 -/* B230D4 800ABF34 46000007 */ neg.s $f0, $f0 -/* B230D8 800ABF38 10000002 */ b .L800ABF44 -/* B230DC 800ABF3C 46009006 */ mov.s $f0, $f18 -/* B230E0 800ABF40 46000007 */ neg.s $f0, $f0 -.L800ABF44: -/* B230E4 800ABF44 C42E1390 */ lwc1 $f14, %lo(D_80141390)($at) -/* B230E8 800ABF48 4602703C */ c.lt.s $f14, $f2 -/* B230EC 800ABF4C 00000000 */ nop -/* B230F0 800ABF50 45010009 */ bc1t .L800ABF78 -/* B230F4 800ABF54 00000000 */ nop -/* B230F8 800ABF58 460C703C */ c.lt.s $f14, $f12 -/* B230FC 800ABF5C 00000000 */ nop -/* B23100 800ABF60 45010005 */ bc1t .L800ABF78 -/* B23104 800ABF64 00000000 */ nop -/* B23108 800ABF68 4600703C */ c.lt.s $f14, $f0 -/* B2310C 800ABF6C 3C01467A */ li $at, 0x467A0000 # 0.000000 -/* B23110 800ABF70 45020004 */ bc1fl .L800ABF84 -/* B23114 800ABF74 44817000 */ mtc1 $at, $f14 -.L800ABF78: -/* B23118 800ABF78 10000010 */ b .L800ABFBC -/* B2311C 800ABF7C 24030002 */ li $v1, 2 -/* B23120 800ABF80 44817000 */ mtc1 $at, $f14 -.L800ABF84: -/* B23124 800ABF84 00000000 */ nop -/* B23128 800ABF88 4602703C */ c.lt.s $f14, $f2 -/* B2312C 800ABF8C 00000000 */ nop -/* B23130 800ABF90 4503000A */ bc1tl .L800ABFBC -/* B23134 800ABF94 24030001 */ li $v1, 1 -/* B23138 800ABF98 460C703C */ c.lt.s $f14, $f12 -/* B2313C 800ABF9C 00000000 */ nop -/* B23140 800ABFA0 45030006 */ bc1tl .L800ABFBC -/* B23144 800ABFA4 24030001 */ li $v1, 1 -/* B23148 800ABFA8 4600703C */ c.lt.s $f14, $f0 -/* B2314C 800ABFAC 00000000 */ nop -/* B23150 800ABFB0 45000002 */ bc1f .L800ABFBC -/* B23154 800ABFB4 00000000 */ nop -/* B23158 800ABFB8 24030001 */ li $v1, 1 -.L800ABFBC: -/* B2315C 800ABFBC 50600017 */ beql $v1, $zero, .L800AC01C -/* B23160 800ABFC0 8FBF002C */ lw $ra, 0x2c($sp) -/* B23164 800ABFC4 0C00084C */ jal osSyncPrintf -/* B23168 800ABFC8 AFA30034 */ sw $v1, 0x34($sp) -/* B2316C 800ABFCC C7AA0038 */ lwc1 $f10, 0x38($sp) -/* B23170 800ABFD0 C7A8003C */ lwc1 $f8, 0x3c($sp) -/* B23174 800ABFD4 C7A60040 */ lwc1 $f6, 0x40($sp) -/* B23178 800ABFD8 46005121 */ cvt.d.s $f4, $f10 -/* B2317C 800ABFDC 8FA30034 */ lw $v1, 0x34($sp) -/* B23180 800ABFE0 46004421 */ cvt.d.s $f16, $f8 -/* B23184 800ABFE4 460034A1 */ cvt.d.s $f18, $f6 -/* B23188 800ABFE8 44072000 */ mfc1 $a3, $f4 -/* B2318C 800ABFEC 44062800 */ mfc1 $a2, $f5 -/* B23190 800ABFF0 3C048014 */ lui $a0, %hi(D_80141348) # $a0, 0x8014 -/* B23194 800ABFF4 24841348 */ addiu $a0, %lo(D_80141348) # addiu $a0, $a0, 0x1348 -/* B23198 800ABFF8 F7B20018 */ sdc1 $f18, 0x18($sp) -/* B2319C 800ABFFC F7B00010 */ sdc1 $f16, 0x10($sp) -/* B231A0 800AC000 0C00084C */ jal osSyncPrintf -/* B231A4 800AC004 AFA30020 */ sw $v1, 0x20($sp) -/* B231A8 800AC008 3C048014 */ lui $a0, %hi(D_80141380) # $a0, 0x8014 -/* B231AC 800AC00C 0C00084C */ jal osSyncPrintf -/* B231B0 800AC010 24841380 */ addiu $a0, %lo(D_80141380) # addiu $a0, $a0, 0x1380 -/* B231B4 800AC014 8FA30034 */ lw $v1, 0x34($sp) -/* B231B8 800AC018 8FBF002C */ lw $ra, 0x2c($sp) -.L800AC01C: -/* B231BC 800AC01C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B231C0 800AC020 00601025 */ move $v0, $v1 -/* B231C4 800AC024 03E00008 */ jr $ra -/* B231C8 800AC028 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s deleted file mode 100644 index a374291d7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s +++ /dev/null @@ -1,284 +0,0 @@ -glabel ArrowFire_Draw -/* 00580 80866290 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 80866294 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 80866298 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086629C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 808662A0 AFA5009C */ sw $a1, 0x009C($sp) -/* 00594 808662A4 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 808662A8 AFAF008C */ sw $t7, 0x008C($sp) -/* 0059C 808662AC 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 808662B0 50600106 */ beql $v1, $zero, .L808666CC -/* 005A4 808662B4 8FBF003C */ lw $ra, 0x003C($sp) -/* 005A8 808662B8 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 808662BC 53200103 */ beql $t9, $zero, .L808666CC -/* 005B0 808662C0 8FBF003C */ lw $ra, 0x003C($sp) -/* 005B4 808662C4 948C0166 */ lhu $t4, 0x0166($a0) ## 00000166 -/* 005B8 808662C8 3C068086 */ lui $a2, %hi(D_80867B5C) ## $a2 = 80860000 -/* 005BC 808662CC 24C67B5C */ addiu $a2, $a2, %lo(D_80867B5C) ## $a2 = 80867B5C -/* 005C0 808662D0 298100FF */ slti $at, $t4, 0x00FF -/* 005C4 808662D4 102000FC */ beq $at, $zero, .L808666C8 -/* 005C8 808662D8 8FAF009C */ lw $t7, 0x009C($sp) -/* 005CC 808662DC 906D0249 */ lbu $t5, 0x0249($v1) ## 00000249 -/* 005D0 808662E0 2407026A */ addiu $a3, $zero, 0x026A ## $a3 = 0000026A -/* 005D4 808662E4 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 005D8 808662E8 51C00004 */ beql $t6, $zero, .L808662FC -/* 005DC 808662EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 808662F0 10000002 */ beq $zero, $zero, .L808662FC -/* 005E4 808662F4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 005E8 808662F8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L808662FC: -/* 005EC 808662FC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 005F0 80866300 AFA20084 */ sw $v0, 0x0084($sp) -/* 005F4 80866304 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 80866308 0C031AB1 */ jal Graph_OpenDisps -/* 005FC 8086630C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 80866310 8FA20084 */ lw $v0, 0x0084($sp) -/* 00604 80866314 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00608 80866318 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 -/* 0060C 8086631C C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 80866320 0C034261 */ jal Matrix_Translate -/* 00614 80866324 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 80866328 8FA20084 */ lw $v0, 0x0084($sp) -/* 0061C 8086632C 3C018086 */ lui $at, %hi(D_80867BAC) ## $at = 80860000 -/* 00620 80866330 C4287BAC */ lwc1 $f8, %lo(D_80867BAC)($at) -/* 00624 80866334 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 -/* 00628 80866338 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0062C 8086633C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00630 80866340 00000000 */ nop -/* 00634 80866344 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 80866348 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086634C 0C034348 */ jal Matrix_RotateY -/* 00640 80866350 00000000 */ nop -/* 00644 80866354 8FA20084 */ lw $v0, 0x0084($sp) -/* 00648 80866358 3C018086 */ lui $at, %hi(D_80867BB0) ## $at = 80860000 -/* 0064C 8086635C C4327BB0 */ lwc1 $f18, %lo(D_80867BB0)($at) -/* 00650 80866360 845900B4 */ lh $t9, 0x00B4($v0) ## 000000B4 -/* 00654 80866364 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00658 80866368 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0065C 8086636C 00000000 */ nop -/* 00660 80866370 46805420 */ cvt.s.w $f16, $f10 -/* 00664 80866374 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 80866378 0C0342DC */ jal Matrix_RotateX -/* 0066C 8086637C 00000000 */ nop -/* 00670 80866380 8FA20084 */ lw $v0, 0x0084($sp) -/* 00674 80866384 3C018086 */ lui $at, %hi(D_80867BB4) ## $at = 80860000 -/* 00678 80866388 C4287BB4 */ lwc1 $f8, %lo(D_80867BB4)($at) -/* 0067C 8086638C 844B00B8 */ lh $t3, 0x00B8($v0) ## 000000B8 -/* 00680 80866390 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00684 80866394 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00688 80866398 00000000 */ nop -/* 0068C 8086639C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 808663A0 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 808663A4 0C0343B5 */ jal Matrix_RotateZ -/* 00698 808663A8 00000000 */ nop -/* 0069C 808663AC 3C018086 */ lui $at, %hi(D_80867BB8) ## $at = 80860000 -/* 006A0 808663B0 C42C7BB8 */ lwc1 $f12, %lo(D_80867BB8)($at) -/* 006A4 808663B4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 808663B8 44066000 */ mfc1 $a2, $f12 -/* 006AC 808663BC 0C0342A3 */ jal Matrix_Scale -/* 006B0 808663C0 46006386 */ mov.s $f14, $f12 -/* 006B4 808663C4 8FAC0098 */ lw $t4, 0x0098($sp) -/* 006B8 808663C8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 006BC 808663CC C590015C */ lwc1 $f16, 0x015C($t4) ## 0000015C -/* 006C0 808663D0 4610503C */ c.lt.s $f10, $f16 -/* 006C4 808663D4 00000000 */ nop -/* 006C8 808663D8 45020030 */ bc1fl .L8086649C -/* 006CC 808663DC 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 808663E0 0C024DF0 */ jal func_800937C0 -/* 006D4 808663E4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 006D8 808663E8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 006DC 808663EC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 006E0 808663F0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 006E4 808663F4 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 006E8 808663F8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006EC 808663FC 8FAF0098 */ lw $t7, 0x0098($sp) -/* 006F0 80866400 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 006F4 80866404 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 006F8 80866408 C5E0015C */ lwc1 $f0, 0x015C($t7) ## 0000015C -/* 006FC 8086640C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00700 80866410 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 00704 80866414 46120102 */ mul.s $f4, $f0, $f18 -/* 00708 80866418 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 -/* 0070C 8086641C 35CE1A01 */ ori $t6, $t6, 0x1A01 ## $t6 = E3001A01 -/* 00710 80866420 46004282 */ mul.s $f10, $f8, $f0 -/* 00714 80866424 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 00718 80866428 4600218D */ trunc.w.s $f6, $f4 -/* 0071C 8086642C 4600540D */ trunc.w.s $f16, $f10 -/* 00720 80866430 440C3000 */ mfc1 $t4, $f6 -/* 00724 80866434 44188000 */ mfc1 $t8, $f16 -/* 00728 80866438 000C6E00 */ sll $t5, $t4, 24 -/* 0072C 8086643C 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00730 80866440 01B95825 */ or $t3, $t5, $t9 ## $t3 = 00000008 -/* 00734 80866444 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00738 80866448 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0073C 8086644C 3C0DE300 */ lui $t5, 0xE300 ## $t5 = E3000000 -/* 00740 80866450 35AD1801 */ ori $t5, $t5, 0x1801 ## $t5 = E3001801 -/* 00744 80866454 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00748 80866458 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 0074C 8086645C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00750 80866460 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00754 80866464 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00758 80866468 241900C0 */ addiu $t9, $zero, 0x00C0 ## $t9 = 000000C0 -/* 0075C 8086646C 3C0CF64F */ lui $t4, 0xF64F ## $t4 = F64F0000 -/* 00760 80866470 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00764 80866474 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00768 80866478 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0076C 8086647C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00770 80866480 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00774 80866484 358CC3BC */ ori $t4, $t4, 0xC3BC ## $t4 = F64FC3BC -/* 00778 80866488 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0077C 8086648C AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00780 80866490 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00784 80866494 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00788 80866498 8FAE009C */ lw $t6, 0x009C($sp) -.L8086649C: -/* 0078C 8086649C 0C024F61 */ jal func_80093D84 -/* 00790 808664A0 8DC40000 */ lw $a0, 0x0000($t6) ## E3001A01 -/* 00794 808664A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00798 808664A8 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 0079C 808664AC 37188080 */ ori $t8, $t8, 0x8080 ## $t8 = FA008080 -/* 007A0 808664B0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 007A4 808664B4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 007A8 808664B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007AC 808664BC 8FAD0098 */ lw $t5, 0x0098($sp) -/* 007B0 808664C0 3C01FFC8 */ lui $at, 0xFFC8 ## $at = FFC80000 -/* 007B4 808664C4 3C18FF00 */ lui $t8, 0xFF00 ## $t8 = FF000000 -/* 007B8 808664C8 91AB0168 */ lbu $t3, 0x0168($t5) ## 00000168 -/* 007BC 808664CC 37180080 */ ori $t8, $t8, 0x0080 ## $t8 = FF000080 -/* 007C0 808664D0 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 007C4 808664D4 01616025 */ or $t4, $t3, $at ## $t4 = FFC80000 -/* 007C8 808664D8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 007CC 808664DC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 007D0 808664E0 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 007D4 808664E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007D8 808664E8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 007DC 808664EC AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 007E0 808664F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 007E4 808664F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 007E8 808664F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 007EC 808664FC 0C034421 */ jal Matrix_RotateZYX -/* 007F0 80866500 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 007F4 80866504 8FAD0098 */ lw $t5, 0x0098($sp) -/* 007F8 80866508 3C018086 */ lui $at, %hi(D_80867BBC) ## $at = 80860000 -/* 007FC 8086650C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00800 80866510 95B90166 */ lhu $t9, 0x0166($t5) ## 00000166 -/* 00804 80866514 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00808 80866518 53200009 */ beql $t9, $zero, .L80866540 -/* 0080C 8086651C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00810 80866520 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00814 80866524 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00818 80866528 44066000 */ mfc1 $a2, $f12 -/* 0081C 8086652C 0C034261 */ jal Matrix_Translate -/* 00820 80866530 46006386 */ mov.s $f14, $f12 -/* 00824 80866534 10000005 */ beq $zero, $zero, .L8086654C -/* 00828 80866538 8FAB0098 */ lw $t3, 0x0098($sp) -/* 0082C 8086653C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -.L80866540: -/* 00830 80866540 0C034261 */ jal Matrix_Translate -/* 00834 80866544 C42E7BBC */ lwc1 $f14, %lo(D_80867BBC)($at) -/* 00838 80866548 8FAB0098 */ lw $t3, 0x0098($sp) -.L8086654C: -/* 0083C 8086654C 3C018086 */ lui $at, %hi(D_80867BC0) ## $at = 80860000 -/* 00840 80866550 C4267BC0 */ lwc1 $f6, %lo(D_80867BC0)($at) -/* 00844 80866554 856C0164 */ lh $t4, 0x0164($t3) ## 00000164 -/* 00848 80866558 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0084C 8086655C 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 00850 80866560 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 00854 80866564 C5680158 */ lwc1 $f8, 0x0158($t3) ## 00000158 -/* 00858 80866568 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0085C 8086656C 46809120 */ cvt.s.w $f4, $f18 -/* 00860 80866570 46062302 */ mul.s $f12, $f4, $f6 -/* 00864 80866574 44066000 */ mfc1 $a2, $f12 -/* 00868 80866578 460A4382 */ mul.s $f14, $f8, $f10 -/* 0086C 8086657C 0C0342A3 */ jal Matrix_Scale -/* 00870 80866580 00000000 */ nop -/* 00874 80866584 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00878 80866588 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 -/* 0087C 8086658C 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 00880 80866590 44066000 */ mfc1 $a2, $f12 -/* 00884 80866594 0C034261 */ jal Matrix_Translate -/* 00888 80866598 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0088C 8086659C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00890 808665A0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 00894 808665A4 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 00898 808665A8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0089C 808665AC AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 008A0 808665B0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008A4 808665B4 8FB8009C */ lw $t8, 0x009C($sp) -/* 008A8 808665B8 3C058086 */ lui $a1, %hi(D_80867B70) ## $a1 = 80860000 -/* 008AC 808665BC 24A57B70 */ addiu $a1, $a1, %lo(D_80867B70) ## $a1 = 80867B70 -/* 008B0 808665C0 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 008B4 808665C4 2406029A */ addiu $a2, $zero, 0x029A ## $a2 = 0000029A -/* 008B8 808665C8 0C0346A2 */ jal Matrix_NewMtx -/* 008BC 808665CC AFA20054 */ sw $v0, 0x0054($sp) -/* 008C0 808665D0 8FA30054 */ lw $v1, 0x0054($sp) -/* 008C4 808665D4 3C198086 */ lui $t9, %hi(D_80867990) ## $t9 = 80860000 -/* 008C8 808665D8 27397990 */ addiu $t9, $t9, %lo(D_80867990) ## $t9 = 80867990 -/* 008CC 808665DC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 008D0 808665E0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008D4 808665E4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 008D8 808665E8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 008DC 808665EC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 008E0 808665F0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 008E4 808665F4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 008E8 808665F8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 008EC 808665FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008F0 80866600 8FAA008C */ lw $t2, 0x008C($sp) -/* 008F4 80866604 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 008F8 80866608 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 008FC 8086660C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00900 80866610 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00904 80866614 8FAB009C */ lw $t3, 0x009C($sp) -/* 00908 80866618 000A7040 */ sll $t6, $t2, 1 -/* 0090C 8086661C 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00910 80866620 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 00914 80866624 000A7080 */ sll $t6, $t2, 2 -/* 00918 80866628 01CA7021 */ addu $t6, $t6, $t2 -/* 0091C 8086662C 000E7040 */ sll $t6, $t6, 1 -/* 00920 80866630 AFB80010 */ sw $t8, 0x0010($sp) -/* 00924 80866634 010F3023 */ subu $a2, $t0, $t7 -/* 00928 80866638 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0092C 8086663C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 00930 80866640 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 00934 80866644 010C5823 */ subu $t3, $t0, $t4 -/* 00938 80866648 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0093C 8086664C AFB90018 */ sw $t9, 0x0018($sp) -/* 00940 80866650 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 -/* 00944 80866654 241801FF */ addiu $t8, $zero, 0x01FF ## $t8 = 000001FF -/* 00948 80866658 030F6823 */ subu $t5, $t8, $t7 -/* 0094C 8086665C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 00950 80866660 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 00954 80866664 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00958 80866668 AFB90024 */ sw $t9, 0x0024($sp) -/* 0095C 8086666C AFAD0020 */ sw $t5, 0x0020($sp) -/* 00960 80866670 AFAB001C */ sw $t3, 0x001C($sp) -/* 00964 80866674 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00968 80866678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0096C 8086667C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00970 80866680 AFA2004C */ sw $v0, 0x004C($sp) -/* 00974 80866684 8FA3004C */ lw $v1, 0x004C($sp) -/* 00978 80866688 3C188086 */ lui $t8, %hi(D_80867A40) ## $t8 = 80860000 -/* 0097C 8086668C 27187A40 */ addiu $t8, $t8, %lo(D_80867A40) ## $t8 = 80867A40 -/* 00980 80866690 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00984 80866694 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00988 80866698 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 0098C 8086669C 3C068086 */ lui $a2, %hi(D_80867B84) ## $a2 = 80860000 -/* 00990 808666A0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00994 808666A4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00998 808666A8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0099C 808666AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009A0 808666B0 8FAF009C */ lw $t7, 0x009C($sp) -/* 009A4 808666B4 24C67B84 */ addiu $a2, $a2, %lo(D_80867B84) ## $a2 = 80867B84 -/* 009A8 808666B8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 009AC 808666BC 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA -/* 009B0 808666C0 0C031AD5 */ jal Graph_CloseDisps -/* 009B4 808666C4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -.L808666C8: -/* 009B8 808666C8 8FBF003C */ lw $ra, 0x003C($sp) -.L808666CC: -/* 009BC 808666CC 8FB00038 */ lw $s0, 0x0038($sp) -/* 009C0 808666D0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009C4 808666D4 03E00008 */ jr $ra -/* 009C8 808666D8 00000000 */ nop -/* 009CC 808666DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s deleted file mode 100644 index 1f420aa367..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s +++ /dev/null @@ -1,292 +0,0 @@ -glabel ArrowIce_Draw -/* 00580 80868250 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 80868254 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 80868258 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086825C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 80868260 AFA5009C */ sw $a1, 0x009C($sp) -/* 00594 80868264 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 80868268 AFAF0088 */ sw $t7, 0x0088($sp) -/* 0059C 8086826C 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 80868270 5060010E */ beql $v1, $zero, .L808686AC -/* 005A4 80868274 8FBF003C */ lw $ra, 0x003C($sp) -/* 005A8 80868278 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 8086827C 5320010B */ beql $t9, $zero, .L808686AC -/* 005B0 80868280 8FBF003C */ lw $ra, 0x003C($sp) -/* 005B4 80868284 948D014E */ lhu $t5, 0x014E($a0) ## 0000014E -/* 005B8 80868288 3C068087 */ lui $a2, %hi(D_80869B3C) ## $a2 = 80870000 -/* 005BC 8086828C 24C69B3C */ addiu $a2, $a2, %lo(D_80869B3C) ## $a2 = 80869B3C -/* 005C0 80868290 29A100FF */ slti $at, $t5, 0x00FF -/* 005C4 80868294 10200104 */ beq $at, $zero, .L808686A8 -/* 005C8 80868298 8FB8009C */ lw $t8, 0x009C($sp) -/* 005CC 8086829C 906E0249 */ lbu $t6, 0x0249($v1) ## 00000249 -/* 005D0 808682A0 24070262 */ addiu $a3, $zero, 0x0262 ## $a3 = 00000262 -/* 005D4 808682A4 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 005D8 808682A8 51E00004 */ beql $t7, $zero, .L808682BC -/* 005DC 808682AC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 808682B0 10000002 */ beq $zero, $zero, .L808682BC -/* 005E4 808682B4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 005E8 808682B8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L808682BC: -/* 005EC 808682BC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 005F0 808682C0 AFA2008C */ sw $v0, 0x008C($sp) -/* 005F4 808682C4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 808682C8 0C031AB1 */ jal Graph_OpenDisps -/* 005FC 808682CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 808682D0 8FA2008C */ lw $v0, 0x008C($sp) -/* 00604 808682D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00608 808682D8 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 -/* 0060C 808682DC C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 808682E0 0C034261 */ jal Matrix_Translate -/* 00614 808682E4 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 808682E8 8FA2008C */ lw $v0, 0x008C($sp) -/* 0061C 808682EC 3C018087 */ lui $at, %hi(D_80869B8C) ## $at = 80870000 -/* 00620 808682F0 C4289B8C */ lwc1 $f8, %lo(D_80869B8C)($at) -/* 00624 808682F4 845900B6 */ lh $t9, 0x00B6($v0) ## 000000B6 -/* 00628 808682F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0062C 808682FC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00630 80868300 00000000 */ nop -/* 00634 80868304 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 80868308 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086830C 0C034348 */ jal Matrix_RotateY -/* 00640 80868310 00000000 */ nop -/* 00644 80868314 8FA2008C */ lw $v0, 0x008C($sp) -/* 00648 80868318 3C018087 */ lui $at, %hi(D_80869B90) ## $at = 80870000 -/* 0064C 8086831C C4329B90 */ lwc1 $f18, %lo(D_80869B90)($at) -/* 00650 80868320 844C00B4 */ lh $t4, 0x00B4($v0) ## 000000B4 -/* 00654 80868324 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00658 80868328 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 0065C 8086832C 00000000 */ nop -/* 00660 80868330 46805420 */ cvt.s.w $f16, $f10 -/* 00664 80868334 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 80868338 0C0342DC */ jal Matrix_RotateX -/* 0066C 8086833C 00000000 */ nop -/* 00670 80868340 8FA2008C */ lw $v0, 0x008C($sp) -/* 00674 80868344 3C018087 */ lui $at, %hi(D_80869B94) ## $at = 80870000 -/* 00678 80868348 C4289B94 */ lwc1 $f8, %lo(D_80869B94)($at) -/* 0067C 8086834C 844D00B8 */ lh $t5, 0x00B8($v0) ## 000000B8 -/* 00680 80868350 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00684 80868354 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 00688 80868358 00000000 */ nop -/* 0068C 8086835C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 80868360 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 80868364 0C0343B5 */ jal Matrix_RotateZ -/* 00698 80868368 00000000 */ nop -/* 0069C 8086836C 3C018087 */ lui $at, %hi(D_80869B98) ## $at = 80870000 -/* 006A0 80868370 C42C9B98 */ lwc1 $f12, %lo(D_80869B98)($at) -/* 006A4 80868374 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 80868378 44066000 */ mfc1 $a2, $f12 -/* 006AC 8086837C 0C0342A3 */ jal Matrix_Scale -/* 006B0 80868380 46006386 */ mov.s $f14, $f12 -/* 006B4 80868384 8FAE0098 */ lw $t6, 0x0098($sp) -/* 006B8 80868388 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 006BC 8086838C C5D00164 */ lwc1 $f16, 0x0164($t6) ## 00000164 -/* 006C0 80868390 4610503C */ c.lt.s $f10, $f16 -/* 006C4 80868394 00000000 */ nop -/* 006C8 80868398 4502003A */ bc1fl .L80868484 -/* 006CC 8086839C 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 808683A0 0C024DF0 */ jal func_800937C0 -/* 006D4 808683A4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 006D8 808683A8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 006DC 808683AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 006E0 808683B0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 006E4 808683B4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 006E8 808683B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 006EC 808683BC 8FB90098 */ lw $t9, 0x0098($sp) -/* 006F0 808683C0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006F4 808683C4 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 006F8 808683C8 C7200164 */ lwc1 $f0, 0x0164($t9) ## 00000164 -/* 006FC 808683CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00700 808683D0 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 00704 808683D4 46120102 */ mul.s $f4, $f0, $f18 -/* 00708 808683D8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 0070C 808683DC 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00710 808683E0 46004282 */ mul.s $f10, $f8, $f0 -/* 00714 808683E4 4600218D */ trunc.w.s $f6, $f4 -/* 00718 808683E8 46009102 */ mul.s $f4, $f18, $f0 -/* 0071C 808683EC 440E3000 */ mfc1 $t6, $f6 -/* 00720 808683F0 4600540D */ trunc.w.s $f16, $f10 -/* 00724 808683F4 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00728 808683F8 000FC400 */ sll $t8, $t7, 16 -/* 0072C 808683FC 4600218D */ trunc.w.s $f6, $f4 -/* 00730 80868400 440D8000 */ mfc1 $t5, $f16 -/* 00734 80868404 00000000 */ nop -/* 00738 80868408 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 0073C 8086840C 000E7A00 */ sll $t7, $t6, 8 -/* 00740 80868410 440E3000 */ mfc1 $t6, $f6 -/* 00744 80868414 030FC825 */ or $t9, $t8, $t7 ## $t9 = FA000000 -/* 00748 80868418 3C0DE300 */ lui $t5, 0xE300 ## $t5 = E3000000 -/* 0074C 8086841C 31D800FF */ andi $t8, $t6, 0x00FF ## $t8 = 00000000 -/* 00750 80868420 03387825 */ or $t7, $t9, $t8 ## $t7 = FA000000 -/* 00754 80868424 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00758 80868428 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0075C 8086842C 240E0030 */ addiu $t6, $zero, 0x0030 ## $t6 = 00000030 -/* 00760 80868430 35AD1A01 */ ori $t5, $t5, 0x1A01 ## $t5 = E3001A01 -/* 00764 80868434 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00768 80868438 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 0076C 8086843C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00770 80868440 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00774 80868444 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00778 80868448 3C18E300 */ lui $t8, 0xE300 ## $t8 = E3000000 -/* 0077C 8086844C 37181801 */ ori $t8, $t8, 0x1801 ## $t8 = E3001801 -/* 00780 80868450 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00784 80868454 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00788 80868458 240F00C0 */ addiu $t7, $zero, 0x00C0 ## $t7 = 000000C0 -/* 0078C 8086845C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00790 80868460 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00794 80868464 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00798 80868468 3C0DF64F */ lui $t5, 0xF64F ## $t5 = F64F0000 -/* 0079C 8086846C 35ADC3BC */ ori $t5, $t5, 0xC3BC ## $t5 = F64FC3BC -/* 007A0 80868470 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 007A4 80868474 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 007A8 80868478 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 007AC 8086847C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 007B0 80868480 8FAE009C */ lw $t6, 0x009C($sp) -.L80868484: -/* 007B4 80868484 0C024F61 */ jal func_80093D84 -/* 007B8 80868488 8DC40000 */ lw $a0, 0x0000($t6) ## 00000030 -/* 007BC 8086848C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 007C0 80868490 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 007C4 80868494 37188080 */ ori $t8, $t8, 0x8080 ## $t8 = FA008080 -/* 007C8 80868498 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 007CC 8086849C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 007D0 808684A0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007D4 808684A4 8FAF0098 */ lw $t7, 0x0098($sp) -/* 007D8 808684A8 3C01AAFF */ lui $at, 0xAAFF ## $at = AAFF0000 -/* 007DC 808684AC 3421FF00 */ ori $at, $at, 0xFF00 ## $at = AAFFFF00 -/* 007E0 808684B0 91ED0150 */ lbu $t5, 0x0150($t7) ## 00000150 -/* 007E4 808684B4 340FFF80 */ ori $t7, $zero, 0xFF80 ## $t7 = 0000FF80 -/* 007E8 808684B8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 007EC 808684BC 01A17025 */ or $t6, $t5, $at ## $t6 = AAFFFF00 -/* 007F0 808684C0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 007F4 808684C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 007F8 808684C8 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 007FC 808684CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00800 808684D0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00804 808684D4 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00808 808684D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0080C 808684DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00810 808684E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00814 808684E4 0C034421 */ jal Matrix_RotateZYX -/* 00818 808684E8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0081C 808684EC 8FAC0098 */ lw $t4, 0x0098($sp) -/* 00820 808684F0 3C018087 */ lui $at, %hi(D_80869B9C) ## $at = 80870000 -/* 00824 808684F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00828 808684F8 958D014E */ lhu $t5, 0x014E($t4) ## 0000014E -/* 0082C 808684FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00830 80868500 51A00009 */ beql $t5, $zero, .L80868528 -/* 00834 80868504 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00838 80868508 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0083C 8086850C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00840 80868510 44066000 */ mfc1 $a2, $f12 -/* 00844 80868514 0C034261 */ jal Matrix_Translate -/* 00848 80868518 46006386 */ mov.s $f14, $f12 -/* 0084C 8086851C 10000005 */ beq $zero, $zero, .L80868534 -/* 00850 80868520 8FAE0098 */ lw $t6, 0x0098($sp) -/* 00854 80868524 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -.L80868528: -/* 00858 80868528 0C034261 */ jal Matrix_Translate -/* 0085C 8086852C C42E9B9C */ lwc1 $f14, %lo(D_80869B9C)($at) -/* 00860 80868530 8FAE0098 */ lw $t6, 0x0098($sp) -.L80868534: -/* 00864 80868534 3C018087 */ lui $at, %hi(D_80869BA0) ## $at = 80870000 -/* 00868 80868538 C4309BA0 */ lwc1 $f16, %lo(D_80869BA0)($at) -/* 0086C 8086853C 85D9014C */ lh $t9, 0x014C($t6) ## 0000014C -/* 00870 80868540 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00874 80868544 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 00878 80868548 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 0087C 8086854C C5D20160 */ lwc1 $f18, 0x0160($t6) ## 00000160 -/* 00880 80868550 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00884 80868554 468042A0 */ cvt.s.w $f10, $f8 -/* 00888 80868558 46105302 */ mul.s $f12, $f10, $f16 -/* 0088C 8086855C 44066000 */ mfc1 $a2, $f12 -/* 00890 80868560 46049382 */ mul.s $f14, $f18, $f4 -/* 00894 80868564 0C0342A3 */ jal Matrix_Scale -/* 00898 80868568 00000000 */ nop -/* 0089C 8086856C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 008A0 80868570 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 -/* 008A4 80868574 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 008A8 80868578 44066000 */ mfc1 $a2, $f12 -/* 008AC 8086857C 0C034261 */ jal Matrix_Translate -/* 008B0 80868580 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 008B4 80868584 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008B8 80868588 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 008BC 8086858C 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 008C0 80868590 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 008C4 80868594 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 008C8 80868598 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008CC 8086859C 8FAC009C */ lw $t4, 0x009C($sp) -/* 008D0 808685A0 3C058087 */ lui $a1, %hi(D_80869B50) ## $a1 = 80870000 -/* 008D4 808685A4 24A59B50 */ addiu $a1, $a1, %lo(D_80869B50) ## $a1 = 80869B50 -/* 008D8 808685A8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 008DC 808685AC 24060294 */ addiu $a2, $zero, 0x0294 ## $a2 = 00000294 -/* 008E0 808685B0 0C0346A2 */ jal Matrix_NewMtx -/* 008E4 808685B4 AFA20054 */ sw $v0, 0x0054($sp) -/* 008E8 808685B8 8FA30054 */ lw $v1, 0x0054($sp) -/* 008EC 808685BC 3C198087 */ lui $t9, %hi(D_80869970) ## $t9 = 80870000 -/* 008F0 808685C0 27399970 */ addiu $t9, $t9, %lo(D_80869970) ## $t9 = 80869970 -/* 008F4 808685C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 008F8 808685C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008FC 808685CC 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00900 808685D0 240901FF */ addiu $t1, $zero, 0x01FF ## $t1 = 000001FF -/* 00904 808685D4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00908 808685D8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 0090C 808685DC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00910 808685E0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00914 808685E4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00918 808685E8 8FAB0088 */ lw $t3, 0x0088($sp) -/* 0091C 808685EC 240D0080 */ addiu $t5, $zero, 0x0080 ## $t5 = 00000080 -/* 00920 808685F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00924 808685F4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00928 808685F8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0092C 808685FC 8FB8009C */ lw $t8, 0x009C($sp) -/* 00930 80868600 000B7880 */ sll $t7, $t3, 2 -/* 00934 80868604 01EB7821 */ addu $t7, $t7, $t3 -/* 00938 80868608 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 0093C 8086860C 000BC080 */ sll $t8, $t3, 2 -/* 00940 80868610 31EC01FF */ andi $t4, $t7, 0x01FF ## $t4 = 00000000 -/* 00944 80868614 030BC021 */ addu $t8, $t8, $t3 -/* 00948 80868618 0018C040 */ sll $t8, $t8, 1 -/* 0094C 8086861C 330F01FF */ andi $t7, $t8, 0x01FF ## $t7 = 00000000 -/* 00950 80868620 012C3023 */ subu $a2, $t1, $t4 -/* 00954 80868624 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00958 80868628 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 0095C 8086862C 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00960 80868630 012F1823 */ subu $v1, $t1, $t7 -/* 00964 80868634 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00968 80868638 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 0096C 8086863C AFB90014 */ sw $t9, 0x0014($sp) -/* 00970 80868640 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00974 80868644 AFA3001C */ sw $v1, 0x001C($sp) -/* 00978 80868648 AFA30020 */ sw $v1, 0x0020($sp) -/* 0097C 8086864C AFAC0024 */ sw $t4, 0x0024($sp) -/* 00980 80868650 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00984 80868654 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00988 80868658 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0098C 8086865C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00990 80868660 AFA2004C */ sw $v0, 0x004C($sp) -/* 00994 80868664 8FA8004C */ lw $t0, 0x004C($sp) -/* 00998 80868668 3C188087 */ lui $t8, %hi(D_80869A20) ## $t8 = 80870000 -/* 0099C 8086866C 27189A20 */ addiu $t8, $t8, %lo(D_80869A20) ## $t8 = 80869A20 -/* 009A0 80868670 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 009A4 80868674 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 009A8 80868678 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 009AC 8086867C 3C068087 */ lui $a2, %hi(D_80869B64) ## $a2 = 80870000 -/* 009B0 80868680 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 009B4 80868684 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 009B8 80868688 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 009BC 8086868C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009C0 80868690 8FAF009C */ lw $t7, 0x009C($sp) -/* 009C4 80868694 24C69B64 */ addiu $a2, $a2, %lo(D_80869B64) ## $a2 = 80869B64 -/* 009C8 80868698 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 009CC 8086869C 240702A4 */ addiu $a3, $zero, 0x02A4 ## $a3 = 000002A4 -/* 009D0 808686A0 0C031AD5 */ jal Graph_CloseDisps -/* 009D4 808686A4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -.L808686A8: -/* 009D8 808686A8 8FBF003C */ lw $ra, 0x003C($sp) -.L808686AC: -/* 009DC 808686AC 8FB00038 */ lw $s0, 0x0038($sp) -/* 009E0 808686B0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009E4 808686B4 03E00008 */ jr $ra -/* 009E8 808686B8 00000000 */ nop -/* 009EC 808686BC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s deleted file mode 100644 index 318be74c72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s +++ /dev/null @@ -1,296 +0,0 @@ -glabel ArrowLight_Draw -/* 00580 8086A230 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 8086A234 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 8086A238 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086A23C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 8086A240 AFA5009C */ sw $a1, 0x009C($sp) -/* 00594 8086A244 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 8086A248 AFAF008C */ sw $t7, 0x008C($sp) -/* 0059C 8086A24C 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 8086A250 50600112 */ beql $v1, $zero, .L8086A69C -/* 005A4 8086A254 8FBF003C */ lw $ra, 0x003C($sp) -/* 005A8 8086A258 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 8086A25C 5320010F */ beql $t9, $zero, .L8086A69C -/* 005B0 8086A260 8FBF003C */ lw $ra, 0x003C($sp) -/* 005B4 8086A264 948C014E */ lhu $t4, 0x014E($a0) ## 0000014E -/* 005B8 8086A268 3C068087 */ lui $a2, %hi(D_8086BB2C) ## $a2 = 80870000 -/* 005BC 8086A26C 24C6BB2C */ addiu $a2, $a2, %lo(D_8086BB2C) ## $a2 = 8086BB2C -/* 005C0 8086A270 298100FF */ slti $at, $t4, 0x00FF -/* 005C4 8086A274 10200108 */ beq $at, $zero, .L8086A698 -/* 005C8 8086A278 8FAF009C */ lw $t7, 0x009C($sp) -/* 005CC 8086A27C 906D0249 */ lbu $t5, 0x0249($v1) ## 00000249 -/* 005D0 8086A280 24070256 */ addiu $a3, $zero, 0x0256 ## $a3 = 00000256 -/* 005D4 8086A284 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 005D8 8086A288 51C00004 */ beql $t6, $zero, .L8086A29C -/* 005DC 8086A28C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 8086A290 10000002 */ beq $zero, $zero, .L8086A29C -/* 005E4 8086A294 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 005E8 8086A298 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8086A29C: -/* 005EC 8086A29C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 005F0 8086A2A0 AFA20084 */ sw $v0, 0x0084($sp) -/* 005F4 8086A2A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 8086A2A8 0C031AB1 */ jal Graph_OpenDisps -/* 005FC 8086A2AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 8086A2B0 8FA20084 */ lw $v0, 0x0084($sp) -/* 00604 8086A2B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00608 8086A2B8 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 -/* 0060C 8086A2BC C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 8086A2C0 0C034261 */ jal Matrix_Translate -/* 00614 8086A2C4 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 8086A2C8 8FA20084 */ lw $v0, 0x0084($sp) -/* 0061C 8086A2CC 3C018087 */ lui $at, %hi(D_8086BB7C) ## $at = 80870000 -/* 00620 8086A2D0 C428BB7C */ lwc1 $f8, %lo(D_8086BB7C)($at) -/* 00624 8086A2D4 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 -/* 00628 8086A2D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0062C 8086A2DC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00630 8086A2E0 00000000 */ nop -/* 00634 8086A2E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 8086A2E8 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086A2EC 0C034348 */ jal Matrix_RotateY -/* 00640 8086A2F0 00000000 */ nop -/* 00644 8086A2F4 8FA20084 */ lw $v0, 0x0084($sp) -/* 00648 8086A2F8 3C018087 */ lui $at, %hi(D_8086BB80) ## $at = 80870000 -/* 0064C 8086A2FC C432BB80 */ lwc1 $f18, %lo(D_8086BB80)($at) -/* 00650 8086A300 845900B4 */ lh $t9, 0x00B4($v0) ## 000000B4 -/* 00654 8086A304 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00658 8086A308 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0065C 8086A30C 00000000 */ nop -/* 00660 8086A310 46805420 */ cvt.s.w $f16, $f10 -/* 00664 8086A314 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 8086A318 0C0342DC */ jal Matrix_RotateX -/* 0066C 8086A31C 00000000 */ nop -/* 00670 8086A320 8FA20084 */ lw $v0, 0x0084($sp) -/* 00674 8086A324 3C018087 */ lui $at, %hi(D_8086BB84) ## $at = 80870000 -/* 00678 8086A328 C428BB84 */ lwc1 $f8, %lo(D_8086BB84)($at) -/* 0067C 8086A32C 844B00B8 */ lh $t3, 0x00B8($v0) ## 000000B8 -/* 00680 8086A330 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00684 8086A334 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00688 8086A338 00000000 */ nop -/* 0068C 8086A33C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 8086A340 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 8086A344 0C0343B5 */ jal Matrix_RotateZ -/* 00698 8086A348 00000000 */ nop -/* 0069C 8086A34C 3C018087 */ lui $at, %hi(D_8086BB88) ## $at = 80870000 -/* 006A0 8086A350 C42CBB88 */ lwc1 $f12, %lo(D_8086BB88)($at) -/* 006A4 8086A354 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 8086A358 44066000 */ mfc1 $a2, $f12 -/* 006AC 8086A35C 0C0342A3 */ jal Matrix_Scale -/* 006B0 8086A360 46006386 */ mov.s $f14, $f12 -/* 006B4 8086A364 8FAC0098 */ lw $t4, 0x0098($sp) -/* 006B8 8086A368 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 006BC 8086A36C C5900164 */ lwc1 $f16, 0x0164($t4) ## 00000164 -/* 006C0 8086A370 4610503C */ c.lt.s $f10, $f16 -/* 006C4 8086A374 00000000 */ nop -/* 006C8 8086A378 45020039 */ bc1fl .L8086A460 -/* 006CC 8086A37C 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 8086A380 0C024DF0 */ jal func_800937C0 -/* 006D4 8086A384 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 006D8 8086A388 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 006DC 8086A38C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 006E0 8086A390 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 006E4 8086A394 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 006E8 8086A398 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006EC 8086A39C 8FAF0098 */ lw $t7, 0x0098($sp) -/* 006F0 8086A3A0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 006F4 8086A3A4 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 006F8 8086A3A8 C5E00164 */ lwc1 $f0, 0x0164($t7) ## 00000164 -/* 006FC 8086A3AC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00700 8086A3B0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00704 8086A3B4 46120102 */ mul.s $f4, $f0, $f18 -/* 00708 8086A3B8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 0070C 8086A3BC 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00710 8086A3C0 46004282 */ mul.s $f10, $f8, $f0 -/* 00714 8086A3C4 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 -/* 00718 8086A3C8 35CE1A01 */ ori $t6, $t6, 0x1A01 ## $t6 = E3001A01 -/* 0071C 8086A3CC 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 00720 8086A3D0 4600218D */ trunc.w.s $f6, $f4 -/* 00724 8086A3D4 46009102 */ mul.s $f4, $f18, $f0 -/* 00728 8086A3D8 440C3000 */ mfc1 $t4, $f6 -/* 0072C 8086A3DC 4600540D */ trunc.w.s $f16, $f10 -/* 00730 8086A3E0 000C6E00 */ sll $t5, $t4, 24 -/* 00734 8086A3E4 4600218D */ trunc.w.s $f6, $f4 -/* 00738 8086A3E8 44188000 */ mfc1 $t8, $f16 -/* 0073C 8086A3EC 00000000 */ nop -/* 00740 8086A3F0 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00744 8086A3F4 44183000 */ mfc1 $t8, $f6 -/* 00748 8086A3F8 00195C00 */ sll $t3, $t9, 16 -/* 0074C 8086A3FC 01AB6025 */ or $t4, $t5, $t3 ## $t4 = 00000008 -/* 00750 8086A400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00754 8086A404 01996825 */ or $t5, $t4, $t9 ## $t5 = 00000008 -/* 00758 8086A408 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 0075C 8086A40C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00760 8086A410 3C0CE300 */ lui $t4, 0xE300 ## $t4 = E3000000 -/* 00764 8086A414 358C1801 */ ori $t4, $t4, 0x1801 ## $t4 = E3001801 -/* 00768 8086A418 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0076C 8086A41C AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00770 8086A420 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00774 8086A424 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00778 8086A428 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0077C 8086A42C 241900C0 */ addiu $t9, $zero, 0x00C0 ## $t9 = 000000C0 -/* 00780 8086A430 3C0BF64F */ lui $t3, 0xF64F ## $t3 = F64F0000 -/* 00784 8086A434 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00788 8086A438 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 0078C 8086A43C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00790 8086A440 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00794 8086A444 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00798 8086A448 356BC3BC */ ori $t3, $t3, 0xC3BC ## $t3 = F64FC3BC -/* 0079C 8086A44C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 007A0 8086A450 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 007A4 8086A454 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 007A8 8086A458 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 007AC 8086A45C 8FAE009C */ lw $t6, 0x009C($sp) -.L8086A460: -/* 007B0 8086A460 0C024F61 */ jal func_80093D84 -/* 007B4 8086A464 8DC40000 */ lw $a0, 0x0000($t6) ## E3001A01 -/* 007B8 8086A468 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 007BC 8086A46C 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 007C0 8086A470 37188080 */ ori $t8, $t8, 0x8080 ## $t8 = FA008080 -/* 007C4 8086A474 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 007C8 8086A478 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 007CC 8086A47C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007D0 8086A480 8FAC0098 */ lw $t4, 0x0098($sp) -/* 007D4 8086A484 2401AA00 */ addiu $at, $zero, 0xAA00 ## $at = FFFFAA00 -/* 007D8 8086A488 3C18FFFF */ lui $t8, 0xFFFF ## $t8 = FFFF0000 -/* 007DC 8086A48C 918D0150 */ lbu $t5, 0x0150($t4) ## 00000150 -/* 007E0 8086A490 37180080 */ ori $t8, $t8, 0x0080 ## $t8 = FFFF0080 -/* 007E4 8086A494 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 007E8 8086A498 01A15825 */ or $t3, $t5, $at ## $t3 = FFFFAA00 -/* 007EC 8086A49C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 007F0 8086A4A0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 007F4 8086A4A4 24044000 */ addiu $a0, $zero, 0x4000 ## $a0 = 00004000 -/* 007F8 8086A4A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007FC 8086A4AC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00800 8086A4B0 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00804 8086A4B4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00808 8086A4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0080C 8086A4BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00810 8086A4C0 0C034421 */ jal Matrix_RotateZYX -/* 00814 8086A4C4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00818 8086A4C8 8FAC0098 */ lw $t4, 0x0098($sp) -/* 0081C 8086A4CC 3C018087 */ lui $at, %hi(D_8086BB8C) ## $at = 80870000 -/* 00820 8086A4D0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00824 8086A4D4 9599014E */ lhu $t9, 0x014E($t4) ## 0000014E -/* 00828 8086A4D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0082C 8086A4DC 53200009 */ beql $t9, $zero, .L8086A504 -/* 00830 8086A4E0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00834 8086A4E4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00838 8086A4E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0083C 8086A4EC 44066000 */ mfc1 $a2, $f12 -/* 00840 8086A4F0 0C034261 */ jal Matrix_Translate -/* 00844 8086A4F4 46006386 */ mov.s $f14, $f12 -/* 00848 8086A4F8 10000005 */ beq $zero, $zero, .L8086A510 -/* 0084C 8086A4FC 8FAD0098 */ lw $t5, 0x0098($sp) -/* 00850 8086A500 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -.L8086A504: -/* 00854 8086A504 0C034261 */ jal Matrix_Translate -/* 00858 8086A508 C42EBB8C */ lwc1 $f14, %lo(D_8086BB8C)($at) -/* 0085C 8086A50C 8FAD0098 */ lw $t5, 0x0098($sp) -.L8086A510: -/* 00860 8086A510 3C018087 */ lui $at, %hi(D_8086BB90) ## $at = 80870000 -/* 00864 8086A514 C430BB90 */ lwc1 $f16, %lo(D_8086BB90)($at) -/* 00868 8086A518 85AB014C */ lh $t3, 0x014C($t5) ## 0000014C -/* 0086C 8086A51C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00870 8086A520 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 00874 8086A524 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 00878 8086A528 C5B20160 */ lwc1 $f18, 0x0160($t5) ## 00000160 -/* 0087C 8086A52C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00880 8086A530 468042A0 */ cvt.s.w $f10, $f8 -/* 00884 8086A534 46105302 */ mul.s $f12, $f10, $f16 -/* 00888 8086A538 44066000 */ mfc1 $a2, $f12 -/* 0088C 8086A53C 46049382 */ mul.s $f14, $f18, $f4 -/* 00890 8086A540 0C0342A3 */ jal Matrix_Scale -/* 00894 8086A544 00000000 */ nop -/* 00898 8086A548 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0089C 8086A54C 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 -/* 008A0 8086A550 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 008A4 8086A554 44066000 */ mfc1 $a2, $f12 -/* 008A8 8086A558 0C034261 */ jal Matrix_Translate -/* 008AC 8086A55C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 008B0 8086A560 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008B4 8086A564 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 008B8 8086A568 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 008BC 8086A56C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 008C0 8086A570 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 008C4 8086A574 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008C8 8086A578 8FB8009C */ lw $t8, 0x009C($sp) -/* 008CC 8086A57C 3C058087 */ lui $a1, %hi(D_8086BB40) ## $a1 = 80870000 -/* 008D0 8086A580 24A5BB40 */ addiu $a1, $a1, %lo(D_8086BB40) ## $a1 = 8086BB40 -/* 008D4 8086A584 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 008D8 8086A588 24060288 */ addiu $a2, $zero, 0x0288 ## $a2 = 00000288 -/* 008DC 8086A58C 0C0346A2 */ jal Matrix_NewMtx -/* 008E0 8086A590 AFA20054 */ sw $v0, 0x0054($sp) -/* 008E4 8086A594 8FA30054 */ lw $v1, 0x0054($sp) -/* 008E8 8086A598 3C198087 */ lui $t9, %hi(D_8086B960) ## $t9 = 80870000 -/* 008EC 8086A59C 2739B960 */ addiu $t9, $t9, %lo(D_8086B960) ## $t9 = 8086B960 -/* 008F0 8086A5A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 008F4 8086A5A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008F8 8086A5A8 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 008FC 8086A5AC 240301FF */ addiu $v1, $zero, 0x01FF ## $v1 = 000001FF -/* 00900 8086A5B0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00904 8086A5B4 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00908 8086A5B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0090C 8086A5BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00910 8086A5C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00914 8086A5C4 8FAA008C */ lw $t2, 0x008C($sp) -/* 00918 8086A5C8 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 0091C 8086A5CC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00920 8086A5D0 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00924 8086A5D4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00928 8086A5D8 8FAD009C */ lw $t5, 0x009C($sp) -/* 0092C 8086A5DC 000A7080 */ sll $t6, $t2, 2 -/* 00930 8086A5E0 01CA7021 */ addu $t6, $t6, $t2 -/* 00934 8086A5E4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 00938 8086A5E8 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 -/* 0093C 8086A5EC 006F3023 */ subu $a2, $v1, $t7 -/* 00940 8086A5F0 000A5880 */ sll $t3, $t2, 2 -/* 00944 8086A5F4 016A5821 */ addu $t3, $t3, $t2 -/* 00948 8086A5F8 000A7900 */ sll $t7, $t2, 4 -/* 0094C 8086A5FC 000B5840 */ sll $t3, $t3, 1 -/* 00950 8086A600 01EA7823 */ subu $t7, $t7, $t2 -/* 00954 8086A604 000F7840 */ sll $t7, $t7, 1 -/* 00958 8086A608 316D01FF */ andi $t5, $t3, 0x01FF ## $t5 = 00000008 -/* 0095C 8086A60C AFB80010 */ sw $t8, 0x0010($sp) -/* 00960 8086A610 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00964 8086A614 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 00968 8086A618 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0096C 8086A61C AFB90018 */ sw $t9, 0x0018($sp) -/* 00970 8086A620 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 00974 8086A624 00786023 */ subu $t4, $v1, $t8 -/* 00978 8086A628 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 0097C 8086A62C 006D7023 */ subu $t6, $v1, $t5 -/* 00980 8086A630 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 00984 8086A634 AFAB0028 */ sw $t3, 0x0028($sp) -/* 00988 8086A638 AFAE001C */ sw $t6, 0x001C($sp) -/* 0098C 8086A63C AFB90024 */ sw $t9, 0x0024($sp) -/* 00990 8086A640 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00994 8086A644 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00998 8086A648 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0099C 8086A64C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 009A0 8086A650 AFA2004C */ sw $v0, 0x004C($sp) -/* 009A4 8086A654 8FA8004C */ lw $t0, 0x004C($sp) -/* 009A8 8086A658 3C0F8087 */ lui $t7, %hi(D_8086BA10) ## $t7 = 80870000 -/* 009AC 8086A65C 25EFBA10 */ addiu $t7, $t7, %lo(D_8086BA10) ## $t7 = 8086BA10 -/* 009B0 8086A660 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 009B4 8086A664 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 009B8 8086A668 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 009BC 8086A66C 3C068087 */ lui $a2, %hi(D_8086BB54) ## $a2 = 80870000 -/* 009C0 8086A670 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 009C4 8086A674 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 009C8 8086A678 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 009CC 8086A67C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009D0 8086A680 8FB8009C */ lw $t8, 0x009C($sp) -/* 009D4 8086A684 24C6BB54 */ addiu $a2, $a2, %lo(D_8086BB54) ## $a2 = 8086BB54 -/* 009D8 8086A688 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 009DC 8086A68C 24070298 */ addiu $a3, $zero, 0x0298 ## $a3 = 00000298 -/* 009E0 8086A690 0C031AD5 */ jal Graph_CloseDisps -/* 009E4 8086A694 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -.L8086A698: -/* 009E8 8086A698 8FBF003C */ lw $ra, 0x003C($sp) -.L8086A69C: -/* 009EC 8086A69C 8FB00038 */ lw $s0, 0x0038($sp) -/* 009F0 8086A6A0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009F4 8086A6A4 03E00008 */ jr $ra -/* 009F8 8086A6A8 00000000 */ nop -/* 009FC 8086A6AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DB24.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DB24.s deleted file mode 100644 index 09fbdd7cae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DB24.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_8087DB24 -/* 000E4 8087DB24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 000E8 8087DB28 AFB00014 */ sw $s0, 0x0014($sp) -/* 000EC 8087DB2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000F0 8087DB30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000F4 8087DB34 AFB10018 */ sw $s1, 0x0018($sp) -/* 000F8 8087DB38 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 000FC 8087DB3C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00100 8087DB40 AFBF001C */ sw $ra, 0x001C($sp) -/* 00104 8087DB44 00A12021 */ addu $a0, $a1, $at -/* 00108 8087DB48 0C026062 */ jal Object_IsLoaded - -/* 0010C 8087DB4C 82050169 */ lb $a1, 0x0169($s0) ## 00000169 -/* 00110 8087DB50 10400022 */ beq $v0, $zero, .L8087DBDC -/* 00114 8087DB54 3C0F8088 */ lui $t7, %hi(func_8087DC94) ## $t7 = 80880000 -/* 00118 8087DB58 820E0169 */ lb $t6, 0x0169($s0) ## 00000169 -/* 0011C 8087DB5C 25EFDC94 */ addiu $t7, $t7, %lo(func_8087DC94) ## $t7 = 8087DC94 -/* 00120 8087DB60 AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 -/* 00124 8087DB64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 8087DB68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0012C 8087DB6C 0C00B591 */ jal Actor_SetObjectDependency - -/* 00130 8087DB70 A20E001E */ sb $t6, 0x001E($s0) ## 0000001E -/* 00134 8087DB74 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00138 8087DB78 0311C021 */ addu $t8, $t8, $s1 -/* 0013C 8087DB7C 93181CC1 */ lbu $t8, 0x1CC1($t8) ## 00011CC1 -/* 00140 8087DB80 3C0A8088 */ lui $t2, %hi(func_8087DC64) ## $t2 = 80880000 -/* 00144 8087DB84 3C198088 */ lui $t9, %hi(func_8087DBF0) ## $t9 = 80880000 -/* 00148 8087DB88 13000013 */ beq $t8, $zero, .L8087DBD8 -/* 0014C 8087DB8C 254ADC64 */ addiu $t2, $t2, %lo(func_8087DC64) ## $t2 = 8087DC64 -/* 00150 8087DB90 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00154 8087DB94 2739DBF0 */ addiu $t9, $t9, %lo(func_8087DBF0) ## $t9 = 8087DBF0 -/* 00158 8087DB98 3C048088 */ lui $a0, %hi(D_8087DD54) ## $a0 = 80880000 -/* 0015C 8087DB9C 00084880 */ sll $t1, $t0, 2 -/* 00160 8087DBA0 AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -/* 00164 8087DBA4 00892021 */ addu $a0, $a0, $t1 -/* 00168 8087DBA8 8C84DD54 */ lw $a0, %lo(D_8087DD54)($a0) -/* 0016C 8087DBAC 5080000C */ beql $a0, $zero, .L8087DBE0 -/* 00170 8087DBB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00174 8087DBB4 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00178 8087DBB8 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFFC -/* 0017C 8087DBBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00180 8087DBC0 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 00184 8087DBC4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00188 8087DBC8 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 0018C 8087DBCC 8FA70024 */ lw $a3, 0x0024($sp) -/* 00190 8087DBD0 10000002 */ beq $zero, $zero, .L8087DBDC -/* 00194 8087DBD4 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -.L8087DBD8: -/* 00198 8087DBD8 AE0A0164 */ sw $t2, 0x0164($s0) ## 00000164 -.L8087DBDC: -/* 0019C 8087DBDC 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DBE0: -/* 001A0 8087DBE0 8FB00014 */ lw $s0, 0x0014($sp) -/* 001A4 8087DBE4 8FB10018 */ lw $s1, 0x0018($sp) -/* 001A8 8087DBE8 03E00008 */ jr $ra -/* 001AC 8087DBEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/BgHidanFslift_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/BgHidanFslift_Init.s deleted file mode 100644 index 387c04b3f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/BgHidanFslift_Init.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel BgHidanFslift_Init -/* 00000 80886E40 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80886E44 AFA50054 */ sw $a1, 0x0054($sp) -/* 00008 80886E48 AFBF003C */ sw $ra, 0x003C($sp) -/* 0000C 80886E4C AFB00038 */ sw $s0, 0x0038($sp) -/* 00010 80886E50 3C058088 */ lui $a1, %hi(D_80887260) ## $a1 = 80880000 -/* 00014 80886E54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 80886E58 AFA00044 */ sw $zero, 0x0044($sp) -/* 0001C 80886E5C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80886E60 24A57260 */ addiu $a1, $a1, %lo(D_80887260) ## $a1 = 80887260 -/* 00024 80886E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00028 80886E68 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0002C 80886E6C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00030 80886E70 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00034 80886E74 2484E1E8 */ addiu $a0, $a0, 0xE1E8 ## $a0 = 0600E1E8 -/* 00038 80886E78 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0003C 80886E7C 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 00040 80886E80 8FA40054 */ lw $a0, 0x0054($sp) -/* 00044 80886E84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00048 80886E88 8FA70044 */ lw $a3, 0x0044($sp) -/* 0004C 80886E8C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00050 80886E90 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00054 80886E94 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00058 80886E98 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0005C 80886E9C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00060 80886EA0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00064 80886EA4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00068 80886EA8 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 0006C 80886EAC 3C01C1E0 */ lui $at, 0xC1E0 ## $at = C1E00000 -/* 00070 80886EB0 44819000 */ mtc1 $at, $f18 ## $f18 = -28.00 -/* 00074 80886EB4 46083280 */ add.s $f10, $f6, $f8 -/* 00078 80886EB8 8FA60054 */ lw $a2, 0x0054($sp) -/* 0007C 80886EBC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00080 80886EC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00084 80886EC4 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00088 80886EC8 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 0008C 80886ECC AFAF0028 */ sw $t7, 0x0028($sp) -/* 00090 80886ED0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00094 80886ED4 46128100 */ add.s $f4, $f16, $f18 -/* 00098 80886ED8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0009C 80886EDC AFA0001C */ sw $zero, 0x001C($sp) -/* 000A0 80886EE0 2407012D */ addiu $a3, $zero, 0x012D ## $a3 = 0000012D -/* 000A4 80886EE4 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 000A8 80886EE8 0C00C916 */ jal Actor_SpawnAttached - -/* 000AC 80886EEC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 000B0 80886EF0 14400005 */ bne $v0, $zero, .L80886F08 -/* 000B4 80886EF4 3C188088 */ lui $t8, %hi(func_80886FCC) ## $t8 = 80880000 -/* 000B8 80886EF8 0C00B55C */ jal Actor_Kill - -/* 000BC 80886EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C0 80886F00 10000004 */ beq $zero, $zero, .L80886F14 -/* 000C4 80886F04 8FBF003C */ lw $ra, 0x003C($sp) -.L80886F08: -/* 000C8 80886F08 27186FCC */ addiu $t8, $t8, %lo(func_80886FCC) ## $t8 = 00006FCC -/* 000CC 80886F0C AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 000D0 80886F10 8FBF003C */ lw $ra, 0x003C($sp) -.L80886F14: -/* 000D4 80886F14 8FB00038 */ lw $s0, 0x0038($sp) -/* 000D8 80886F18 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 000DC 80886F1C 03E00008 */ jr $ra -/* 000E0 80886F20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/func_80886F24.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/func_80886F24.s deleted file mode 100644 index 31c86e9c29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fslift/func_80886F24.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80886F24 -/* 000E4 80886F24 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 000E8 80886F28 50400014 */ beql $v0, $zero, .L80886F7C -/* 000EC 80886F2C AC80011C */ sw $zero, 0x011C($a0) ## 0000011C -/* 000F0 80886F30 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 000F4 80886F34 51C00011 */ beql $t6, $zero, .L80886F7C -/* 000F8 80886F38 AC80011C */ sw $zero, 0x011C($a0) ## 0000011C -/* 000FC 80886F3C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00100 80886F40 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00104 80886F44 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00108 80886F48 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 0010C 80886F4C C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00110 80886F50 8C8F011C */ lw $t7, 0x011C($a0) ## 0000011C -/* 00114 80886F54 3C01C1E0 */ lui $at, 0xC1E0 ## $at = C1E00000 -/* 00118 80886F58 46083280 */ add.s $f10, $f6, $f8 -/* 0011C 80886F5C 44819000 */ mtc1 $at, $f18 ## $f18 = -28.00 -/* 00120 80886F60 E5EA0028 */ swc1 $f10, 0x0028($t7) ## 00000028 -/* 00124 80886F64 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00128 80886F68 8C98011C */ lw $t8, 0x011C($a0) ## 0000011C -/* 0012C 80886F6C 46128100 */ add.s $f4, $f16, $f18 -/* 00130 80886F70 03E00008 */ jr $ra -/* 00134 80886F74 E704002C */ swc1 $f4, 0x002C($t8) ## 0000002C -.L80886F78: -/* 00138 80886F78 AC80011C */ sw $zero, 0x011C($a0) ## 0000011C -.L80886F7C: -/* 0013C 80886F7C 03E00008 */ jr $ra -/* 00140 80886F80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899894.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899894.s deleted file mode 100644 index afad0396b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899894.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80899894 -/* 00154 80899894 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00158 80899898 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0015C 8089989C AFBF001C */ sw $ra, 0x001C($sp) -/* 00160 808998A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00164 808998A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00168 808998A8 84E5001C */ lh $a1, 0x001C($a3) ## 0000001C -/* 0016C 808998AC AFA70020 */ sw $a3, 0x0020($sp) -/* 00170 808998B0 0C00B2D0 */ jal Flags_GetSwitch - -/* 00174 808998B4 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00178 808998B8 14400003 */ bne $v0, $zero, .L808998C8 -/* 0017C 808998BC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00180 808998C0 84EE016A */ lh $t6, 0x016A($a3) ## 0000016A -/* 00184 808998C4 19C00019 */ blez $t6, .L8089992C -.L808998C8: -/* 00188 808998C8 3C01C47A */ lui $at, 0xC47A ## $at = C47A0000 -/* 0018C 808998CC 44812000 */ mtc1 $at, $f4 ## $f4 = -1000.00 -/* 00190 808998D0 C4E60024 */ lwc1 $f6, 0x0024($a3) ## 00000024 -/* 00194 808998D4 84E3016A */ lh $v1, 0x016A($a3) ## 0000016A -/* 00198 808998D8 4606203C */ c.lt.s $f4, $f6 -/* 0019C 808998DC 00000000 */ nop -/* 001A0 808998E0 4502000B */ bc1fl .L80899910 -/* 001A4 808998E4 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 001A8 808998E8 14600008 */ bne $v1, $zero, .L8089990C -/* 001AC 808998EC 8FA40024 */ lw $a0, 0x0024($sp) -/* 001B0 808998F0 24050D7A */ addiu $a1, $zero, 0x0D7A ## $a1 = 00000D7A -/* 001B4 808998F4 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 001B8 808998F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 001BC 808998FC 0C02003E */ jal func_800800F8 -/* 001C0 80899900 AFA70020 */ sw $a3, 0x0020($sp) -/* 001C4 80899904 8FA70020 */ lw $a3, 0x0020($sp) -/* 001C8 80899908 84E3016A */ lh $v1, 0x016A($a3) ## 0000016A -.L8089990C: -/* 001CC 8089990C 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -.L80899910: -/* 001D0 80899910 A4EF016A */ sh $t7, 0x016A($a3) ## 0000016A -/* 001D4 80899914 84F8016A */ lh $t8, 0x016A($a3) ## 0000016A -/* 001D8 80899918 2B01000A */ slti $at, $t8, 0x000A -/* 001DC 8089991C 54200004 */ bnel $at, $zero, .L80899930 -/* 001E0 80899920 8FBF001C */ lw $ra, 0x001C($sp) -/* 001E4 80899924 0C22664F */ jal func_8089993C -/* 001E8 80899928 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L8089992C: -/* 001EC 8089992C 8FBF001C */ lw $ra, 0x001C($sp) -.L80899930: -/* 001F0 80899930 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001F4 80899934 03E00008 */ jr $ra -/* 001F8 80899938 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s deleted file mode 100644 index c6d547e333..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80899950 -/* 00210 80899950 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00214 80899954 AFBF001C */ sw $ra, 0x001C($sp) -/* 00218 80899958 AFA50034 */ sw $a1, 0x0034($sp) -/* 0021C 8089995C 848E0168 */ lh $t6, 0x0168($a0) ## 00000168 -/* 00220 80899960 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00224 80899964 24840030 */ addiu $a0, $a0, 0x0030 ## $a0 = 00000030 -/* 00228 80899968 25CF0020 */ addiu $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 0022C 8089996C A48F0138 */ sh $t7, 0x0138($a0) ## 00000168 -/* 00230 80899970 84E60168 */ lh $a2, 0x0168($a3) ## 00000168 -/* 00234 80899974 AFA70030 */ sw $a3, 0x0030($sp) -/* 00238 80899978 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0023C 8089997C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00240 80899980 1040001D */ beq $v0, $zero, .L808999F8 -/* 00244 80899984 8FA70030 */ lw $a3, 0x0030($sp) -/* 00248 80899988 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0024C 8089998C 0C226682 */ jal func_80899A08 -/* 00250 80899990 AFA70030 */ sw $a3, 0x0030($sp) -/* 00254 80899994 8FA40030 */ lw $a0, 0x0030($sp) -/* 00258 80899998 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0025C 8089999C 24052851 */ addiu $a1, $zero, 0x2851 ## $a1 = 00002851 -/* 00260 808999A0 8FA20034 */ lw $v0, 0x0034($sp) -/* 00264 808999A4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00268 808999A8 845807A0 */ lh $t8, 0x07A0($v0) ## 000007A0 -/* 0026C 808999AC 0018C880 */ sll $t9, $t8, 2 -/* 00270 808999B0 00594021 */ addu $t0, $v0, $t9 -/* 00274 808999B4 0C024BE2 */ jal Quake_Add -/* 00278 808999B8 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 0027C 808999BC 00022400 */ sll $a0, $v0, 16 -/* 00280 808999C0 AFA20024 */ sw $v0, 0x0024($sp) -/* 00284 808999C4 00042403 */ sra $a0, $a0, 16 -/* 00288 808999C8 0C024B6B */ jal Quake_SetSpeed -/* 0028C 808999CC 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 -/* 00290 808999D0 87A40026 */ lh $a0, 0x0026($sp) -/* 00294 808999D4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00298 808999D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0029C 808999DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002A0 808999E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 002A4 808999E4 0C024B9C */ jal Quake_SetQuakeValues -/* 002A8 808999E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 002AC 808999EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 002B0 808999F0 0C024B7C */ jal Quake_SetCountdown -/* 002B4 808999F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -.L808999F8: -/* 002B8 808999F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 002BC 808999FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002C0 80899A00 03E00008 */ jr $ra -/* 002C4 80899A04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Destroy.s deleted file mode 100644 index 8840b8c07b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Destroy.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel BgMenkuriNisekabe_Destroy -/* 00028 8089C358 AFA40000 */ sw $a0, 0x0000($sp) -/* 0002C 8089C35C 03E00008 */ jr $ra -/* 00030 8089C360 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s deleted file mode 100644 index 67a4e3aef1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel BgMenkuriNisekabe_Draw -/* 00068 8089C398 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0006C 8089C39C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00070 8089C3A0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00074 8089C3A4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00078 8089C3A8 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 0007C 8089C3AC 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 00080 8089C3B0 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00084 8089C3B4 15E10009 */ bne $t7, $at, .L8089C3DC -/* 00088 8089C3B8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 0008C 8089C3BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00090 8089C3C0 3C05808A */ lui $a1, %hi(D_8089C430) ## $a1 = 808A0000 -/* 00094 8089C3C4 0002C080 */ sll $t8, $v0, 2 -/* 00098 8089C3C8 00B82821 */ addu $a1, $a1, $t8 -/* 0009C 8089C3CC 0C00D4C9 */ jal Gfx_DrawDListXlu - -/* 000A0 8089C3D0 8CA5C430 */ lw $a1, %lo(D_8089C430)($a1) -/* 000A4 8089C3D4 10000008 */ beq $zero, $zero, .L8089C3F8 -/* 000A8 8089C3D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8089C3DC: -/* 000AC 8089C3DC 0002C880 */ sll $t9, $v0, 2 -/* 000B0 8089C3E0 3C05808A */ lui $a1, %hi(D_8089C430) ## $a1 = 808A0000 -/* 000B4 8089C3E4 00B92821 */ addu $a1, $a1, $t9 -/* 000B8 8089C3E8 8CA5C430 */ lw $a1, %lo(D_8089C430)($a1) -/* 000BC 8089C3EC 0C00D498 */ jal Gfx_DrawDListOpa - -/* 000C0 8089C3F0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 000C4 8089C3F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L8089C3F8: -/* 000C8 8089C3F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000CC 8089C3FC 03E00008 */ jr $ra -/* 000D0 8089C400 00000000 */ nop -/* 000D4 8089C404 00000000 */ nop -/* 000D8 8089C408 00000000 */ nop -/* 000DC 8089C40C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Init.s deleted file mode 100644 index 92801fb1f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Init.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgMenkuriNisekabe_Init -/* 00000 8089C330 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8089C334 AFA5001C */ sw $a1, 0x001C($sp) -/* 00008 8089C338 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 8089C33C 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00010 8089C340 0C00B58B */ jal Actor_SetScale - -/* 00014 8089C344 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00018 8089C348 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0001C 8089C34C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00020 8089C350 03E00008 */ jr $ra -/* 00024 8089C354 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Update.s deleted file mode 100644 index f1b13a2039..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Update.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel BgMenkuriNisekabe_Update -/* 00034 8089C364 90AE1C27 */ lbu $t6, 0x1C27($a1) ## 00001C27 -/* 00038 8089C368 51C00006 */ beql $t6, $zero, .L8089C384 -/* 0003C 8089C36C 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 00040 8089C370 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 00044 8089C374 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 -/* 00048 8089C378 03E00008 */ jr $ra -/* 0004C 8089C37C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -.L8089C380: -/* 00050 8089C380 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -.L8089C384: -/* 00054 8089C384 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 00058 8089C388 03214024 */ and $t0, $t9, $at -/* 0005C 8089C38C AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 00060 8089C390 03E00008 */ jr $ra -/* 00064 8089C394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4930.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4930.s deleted file mode 100644 index a8ad7609cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4930.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_808B4930 -/* 000E0 808B4930 AFA50004 */ sw $a1, 0x0004($sp) -/* 000E4 808B4934 8C8E0168 */ lw $t6, 0x0168($a0) ## 00000168 -/* 000E8 808B4938 8C8F016C */ lw $t7, 0x016C($a0) ## 0000016C -/* 000EC 808B493C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 000F0 808B4940 15C00003 */ bne $t6, $zero, .L808B4950 -/* 000F4 808B4944 00000000 */ nop -/* 000F8 808B4948 11E00009 */ beq $t7, $zero, .L808B4970 -/* 000FC 808B494C 00000000 */ nop -.L808B4950: -/* 00100 808B4950 9718F566 */ lhu $t8, -0x0A9A($t8) ## 8015F566 -/* 00104 808B4954 3C09808B */ lui $t1, %hi(func_808B4978) ## $t1 = 808B0000 -/* 00108 808B4958 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0010C 808B495C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 00110 808B4960 17200003 */ bne $t9, $zero, .L808B4970 -/* 00114 808B4964 25294978 */ addiu $t1, $t1, %lo(func_808B4978) ## $t1 = 808B4978 -/* 00118 808B4968 A488017C */ sh $t0, 0x017C($a0) ## 0000017C -/* 0011C 808B496C AC890164 */ sw $t1, 0x0164($a0) ## 00000164 -.L808B4970: -/* 00120 808B4970 03E00008 */ jr $ra -/* 00124 808B4974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4A04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4A04.s deleted file mode 100644 index d23fc1cc8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4A04.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_808B4A04 -/* 001B4 808B4A04 AFA50004 */ sw $a1, 0x0004($sp) -/* 001B8 808B4A08 848E017C */ lh $t6, 0x017C($a0) ## 0000017C -/* 001BC 808B4A0C 24180000 */ addiu $t8, $zero, 0x0000 ## $t8 = 00000000 -/* 001C0 808B4A10 24190000 */ addiu $t9, $zero, 0x0000 ## $t9 = 00000000 -/* 001C4 808B4A14 15C00005 */ bne $t6, $zero, .L808B4A2C -/* 001C8 808B4A18 3C0F808B */ lui $t7, %hi(func_808B4930) ## $t7 = 808B0000 -/* 001CC 808B4A1C 25EF4930 */ addiu $t7, $t7, %lo(func_808B4930) ## $t7 = 808B4930 -/* 001D0 808B4A20 AC980168 */ sw $t8, 0x0168($a0) ## 00000168 -/* 001D4 808B4A24 AC99016C */ sw $t9, 0x016C($a0) ## 0000016C -/* 001D8 808B4A28 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 -.L808B4A2C: -/* 001DC 808B4A2C 03E00008 */ jr $ra -/* 001E0 808B4A30 00000000 */ nop - - diff --git a/data/guPerspective.rodata.s b/data/guPerspective.rodata.s deleted file mode 100644 index 4ae7ed49a2..0000000000 --- a/data/guPerspective.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -.align 4 - -glabel D_8014B260 - .double 0.017453292222222222 diff --git a/data/overlays/actors/z_en_boom.reloc.s b/data/overlays/actors/z_en_boom.reloc.s deleted file mode 100644 index b7bf0b00a3..0000000000 --- a/data/overlays/actors/z_en_boom.reloc.s +++ /dev/null @@ -1,3 +0,0 @@ -.section .rodata -D_809C8D10: -.incbin "baserom/ovl_En_Boom", 0x890, 0x000000B0 diff --git a/tools/find_unused_asm.sh b/tools/find_unused_asm.sh new file mode 100755 index 0000000000..23e480e3bf --- /dev/null +++ b/tools/find_unused_asm.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +shopt -s globstar + +ls asm/non_matchings/**/*.s > old_list.txt +grep GLOBAL_ASM -r src | cut -d '"' -f2 - > cur_list.txt + +grep -F "build/data" spec | cut -d '"' -f2 - > data_list.txt +grep -F "build/asm" spec | grep -v -E 'overlays' | cut -d '"' -f2 - >> data_list.txt + +ls data/**/*.s > old_data_list.txt +ls asm/*.s >> old_data_list.txt + +while read p; do + tmp=${p%.o}.s + echo ${tmp#build/} >> list.txt +done < data_list.txt + +comm -3 <(sort old_list.txt) <(sort cur_list.txt) > diff.txt +comm -3 <(sort old_data_list.txt) <(sort list.txt) >> diff.txt + +if [ "$1" = "-d" ] +then + if [ -s diff.txt ] + then + git rm $(cat diff.txt) + fi + rm diff.txt +fi + +rm old_list.txt cur_list.txt old_data_list.txt data_list.txt list.txt