From dcd24d2166e5e4c7f8256981359a650d77fa53e0 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Wed, 29 Jun 2022 05:30:14 -0600 Subject: [PATCH] More 800431B0 decomp (#235) * Matched funcs in code_800431B0.c --- .../code_800431B0/func_80049B20.s | 64 -- .../code_800431B0/func_80049C18.s | 32 - .../code_800431B0/func_80049C94.s | 32 - .../code_800431B0/func_80049D10.s | 32 - .../code_800431B0/func_80049D8C.s | 207 ---- .../code_800431B0/func_8004A0B0.s | 109 -- .../code_800431B0/func_8004A258.s | 40 - .../code_800431B0/func_8004A2F4.s | 37 - .../code_800431B0/func_8004A384.s | 37 - .../code_800431B0/func_8004A414.s | 140 --- .../code_800431B0/func_8004A9B8.s | 25 +- .../code_800431B0/func_8004B05C.s | 56 -- .../code_800431B0/func_8004B138.s | 38 - .../code_800431B0/func_8004B1C8.s | 63 -- .../code_800431B0/func_8004B2BC.s | 22 - .../code_800431B0/func_8004B35C.s | 28 - .../code_800431B0/func_8004B3C8.s | 20 - .../code_800431B0/func_8004B414.s | 28 - .../code_800431B0/func_8004B480.s | 105 -- .../code_800431B0/func_8004B5A8.s | 28 + .../code_800431B0/func_8004B950.s | 12 - .../code_800431B0/func_8004C8D4.s | 19 - .../code_800431B0/func_8004C91C.s | 48 - .../code_800431B0/func_8004C9D8.s | 33 - .../code_800431B0/func_8004CA58.s | 31 - .../code_800431B0/func_8004CAD0.s | 39 - .../code_800431B0/func_8004CB90.s | 119 --- .../code_800431B0/func_8004EB30.s | 3 - .../code_800431B0/func_8004F950.s | 32 - .../code_800431B0/func_8004F9CC.s | 44 - .../code_800431B0/func_8004FC78.s | 80 -- asm/non_matchings/code_800431B0/print_timer.s | 55 -- .../code_80057C60/func_800594F0.s | 3 - asm/non_matchings/memory/func_802A7D1C.s | 8 - src/code_800431B0.c | 930 ++++++------------ src/math_util_2.c | 2 +- 36 files changed, 314 insertions(+), 2287 deletions(-) delete mode 100644 asm/non_matchings/code_800431B0/func_80049B20.s delete mode 100644 asm/non_matchings/code_800431B0/func_80049C18.s delete mode 100644 asm/non_matchings/code_800431B0/func_80049C94.s delete mode 100644 asm/non_matchings/code_800431B0/func_80049D10.s delete mode 100644 asm/non_matchings/code_800431B0/func_80049D8C.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004A0B0.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004A258.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004A2F4.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004A384.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004A414.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B05C.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B138.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B1C8.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B2BC.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B35C.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B3C8.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B414.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B480.s create mode 100644 asm/non_matchings/code_800431B0/func_8004B5A8.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004B950.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004C8D4.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004C91C.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004C9D8.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004CA58.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004CAD0.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004CB90.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004EB30.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004F950.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004F9CC.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004FC78.s delete mode 100644 asm/non_matchings/code_800431B0/print_timer.s delete mode 100644 asm/non_matchings/code_80057C60/func_800594F0.s delete mode 100644 asm/non_matchings/memory/func_802A7D1C.s diff --git a/asm/non_matchings/code_800431B0/func_80049B20.s b/asm/non_matchings/code_800431B0/func_80049B20.s deleted file mode 100644 index f51c43049..000000000 --- a/asm/non_matchings/code_800431B0/func_80049B20.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80049B20 -/* 04A720 80049B20 44876000 */ mtc1 $a3, $f12 -/* 04A724 80049B24 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04A728 80049B28 AFBF001C */ sw $ra, 0x1c($sp) -/* 04A72C 80049B2C AFA60028 */ sw $a2, 0x28($sp) -/* 04A730 80049B30 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04A734 80049B34 44076000 */ mfc1 $a3, $f12 -/* 04A738 80049B38 0C0108CC */ jal func_80042330 -/* 04A73C 80049B3C 01C03025 */ move $a2, $t6 -/* 04A740 80049B40 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04A744 80049B44 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04A748 80049B48 8D030000 */ lw $v1, ($t0) -/* 04A74C 80049B4C 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04A750 80049B50 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04A754 80049B54 246F0008 */ addiu $t7, $v1, 8 -/* 04A758 80049B58 AD0F0000 */ sw $t7, ($t0) -/* 04A75C 80049B5C 3C180600 */ lui $t8, 0x600 -/* 04A760 80049B60 AC780000 */ sw $t8, ($v1) -/* 04A764 80049B64 AC790004 */ sw $t9, 4($v1) -/* 04A768 80049B68 8FAA0044 */ lw $t2, 0x44($sp) -/* 04A76C 80049B6C 8FA90040 */ lw $t1, 0x40($sp) -/* 04A770 80049B70 8FA7003C */ lw $a3, 0x3c($sp) -/* 04A774 80049B74 8FA60038 */ lw $a2, 0x38($sp) -/* 04A778 80049B78 8FA50034 */ lw $a1, 0x34($sp) -/* 04A77C 80049B7C 8FA40030 */ lw $a0, 0x30($sp) -/* 04A780 80049B80 AFAA0014 */ sw $t2, 0x14($sp) -/* 04A784 80049B84 0C0123E3 */ jal func_80048F8C -/* 04A788 80049B88 AFA90010 */ sw $t1, 0x10($sp) -/* 04A78C 80049B8C 8FBF001C */ lw $ra, 0x1c($sp) -/* 04A790 80049B90 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04A794 80049B94 03E00008 */ jr $ra -/* 04A798 80049B98 00000000 */ nop - -/* 04A79C 80049B9C 44876000 */ mtc1 $a3, $f12 -/* 04A7A0 80049BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04A7A4 80049BA4 AFBF001C */ sw $ra, 0x1c($sp) -/* 04A7A8 80049BA8 AFA60028 */ sw $a2, 0x28($sp) -/* 04A7AC 80049BAC 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04A7B0 80049BB0 44076000 */ mfc1 $a3, $f12 -/* 04A7B4 80049BB4 0C0108CC */ jal func_80042330 -/* 04A7B8 80049BB8 01C03025 */ move $a2, $t6 -/* 04A7BC 80049BBC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04A7C0 80049BC0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04A7C4 80049BC4 8D030000 */ lw $v1, ($t0) -/* 04A7C8 80049BC8 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04A7CC 80049BCC 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04A7D0 80049BD0 246F0008 */ addiu $t7, $v1, 8 -/* 04A7D4 80049BD4 AD0F0000 */ sw $t7, ($t0) -/* 04A7D8 80049BD8 3C180600 */ lui $t8, 0x600 -/* 04A7DC 80049BDC AC780000 */ sw $t8, ($v1) -/* 04A7E0 80049BE0 AC790004 */ sw $t9, 4($v1) -/* 04A7E4 80049BE4 8FAA0044 */ lw $t2, 0x44($sp) -/* 04A7E8 80049BE8 8FA90040 */ lw $t1, 0x40($sp) -/* 04A7EC 80049BEC 8FA7003C */ lw $a3, 0x3c($sp) -/* 04A7F0 80049BF0 8FA60038 */ lw $a2, 0x38($sp) -/* 04A7F4 80049BF4 8FA50034 */ lw $a1, 0x34($sp) -/* 04A7F8 80049BF8 8FA40030 */ lw $a0, 0x30($sp) -/* 04A7FC 80049BFC AFAA0014 */ sw $t2, 0x14($sp) -/* 04A800 80049C00 0C01244C */ jal func_80049130 -/* 04A804 80049C04 AFA90010 */ sw $t1, 0x10($sp) -/* 04A808 80049C08 8FBF001C */ lw $ra, 0x1c($sp) -/* 04A80C 80049C0C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04A810 80049C10 03E00008 */ jr $ra -/* 04A814 80049C14 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80049C18.s b/asm/non_matchings/code_800431B0/func_80049C18.s deleted file mode 100644 index 1e013106b..000000000 --- a/asm/non_matchings/code_800431B0/func_80049C18.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80049C18 -/* 04A818 80049C18 44876000 */ mtc1 $a3, $f12 -/* 04A81C 80049C1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04A820 80049C20 AFBF001C */ sw $ra, 0x1c($sp) -/* 04A824 80049C24 AFA60028 */ sw $a2, 0x28($sp) -/* 04A828 80049C28 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04A82C 80049C2C 44076000 */ mfc1 $a3, $f12 -/* 04A830 80049C30 0C0108CC */ jal func_80042330 -/* 04A834 80049C34 01C03025 */ move $a2, $t6 -/* 04A838 80049C38 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04A83C 80049C3C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04A840 80049C40 8D030000 */ lw $v1, ($t0) -/* 04A844 80049C44 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04A848 80049C48 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04A84C 80049C4C 246F0008 */ addiu $t7, $v1, 8 -/* 04A850 80049C50 AD0F0000 */ sw $t7, ($t0) -/* 04A854 80049C54 3C180600 */ lui $t8, 0x600 -/* 04A858 80049C58 AC780000 */ sw $t8, ($v1) -/* 04A85C 80049C5C AC790004 */ sw $t9, 4($v1) -/* 04A860 80049C60 8FAA0044 */ lw $t2, 0x44($sp) -/* 04A864 80049C64 8FA90040 */ lw $t1, 0x40($sp) -/* 04A868 80049C68 8FA7003C */ lw $a3, 0x3c($sp) -/* 04A86C 80049C6C 8FA60038 */ lw $a2, 0x38($sp) -/* 04A870 80049C70 8FA50034 */ lw $a1, 0x34($sp) -/* 04A874 80049C74 8FA40030 */ lw $a0, 0x30($sp) -/* 04A878 80049C78 AFAA0014 */ sw $t2, 0x14($sp) -/* 04A87C 80049C7C 0C0124B5 */ jal func_800492D4 -/* 04A880 80049C80 AFA90010 */ sw $t1, 0x10($sp) -/* 04A884 80049C84 8FBF001C */ lw $ra, 0x1c($sp) -/* 04A888 80049C88 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04A88C 80049C8C 03E00008 */ jr $ra -/* 04A890 80049C90 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80049C94.s b/asm/non_matchings/code_800431B0/func_80049C94.s deleted file mode 100644 index 89d26424b..000000000 --- a/asm/non_matchings/code_800431B0/func_80049C94.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80049C94 -/* 04A894 80049C94 44876000 */ mtc1 $a3, $f12 -/* 04A898 80049C98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04A89C 80049C9C AFBF001C */ sw $ra, 0x1c($sp) -/* 04A8A0 80049CA0 AFA60028 */ sw $a2, 0x28($sp) -/* 04A8A4 80049CA4 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04A8A8 80049CA8 44076000 */ mfc1 $a3, $f12 -/* 04A8AC 80049CAC 0C0108CC */ jal func_80042330 -/* 04A8B0 80049CB0 01C03025 */ move $a2, $t6 -/* 04A8B4 80049CB4 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04A8B8 80049CB8 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04A8BC 80049CBC 8D030000 */ lw $v1, ($t0) -/* 04A8C0 80049CC0 3C190D00 */ lui $t9, %hi(D_0D007A60) # $t9, 0xd00 -/* 04A8C4 80049CC4 27397A60 */ addiu $t9, %lo(D_0D007A60) # addiu $t9, $t9, 0x7a60 -/* 04A8C8 80049CC8 246F0008 */ addiu $t7, $v1, 8 -/* 04A8CC 80049CCC AD0F0000 */ sw $t7, ($t0) -/* 04A8D0 80049CD0 3C180600 */ lui $t8, 0x600 -/* 04A8D4 80049CD4 AC780000 */ sw $t8, ($v1) -/* 04A8D8 80049CD8 AC790004 */ sw $t9, 4($v1) -/* 04A8DC 80049CDC 8FAA0044 */ lw $t2, 0x44($sp) -/* 04A8E0 80049CE0 8FA90040 */ lw $t1, 0x40($sp) -/* 04A8E4 80049CE4 8FA7003C */ lw $a3, 0x3c($sp) -/* 04A8E8 80049CE8 8FA60038 */ lw $a2, 0x38($sp) -/* 04A8EC 80049CEC 8FA50034 */ lw $a1, 0x34($sp) -/* 04A8F0 80049CF0 8FA40030 */ lw $a0, 0x30($sp) -/* 04A8F4 80049CF4 AFAA0014 */ sw $t2, 0x14($sp) -/* 04A8F8 80049CF8 0C0124B5 */ jal func_800492D4 -/* 04A8FC 80049CFC AFA90010 */ sw $t1, 0x10($sp) -/* 04A900 80049D00 8FBF001C */ lw $ra, 0x1c($sp) -/* 04A904 80049D04 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04A908 80049D08 03E00008 */ jr $ra -/* 04A90C 80049D0C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80049D10.s b/asm/non_matchings/code_800431B0/func_80049D10.s deleted file mode 100644 index 42f350e00..000000000 --- a/asm/non_matchings/code_800431B0/func_80049D10.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80049D10 -/* 04A910 80049D10 44876000 */ mtc1 $a3, $f12 -/* 04A914 80049D14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04A918 80049D18 AFBF001C */ sw $ra, 0x1c($sp) -/* 04A91C 80049D1C AFA60028 */ sw $a2, 0x28($sp) -/* 04A920 80049D20 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04A924 80049D24 44076000 */ mfc1 $a3, $f12 -/* 04A928 80049D28 0C0108CC */ jal func_80042330 -/* 04A92C 80049D2C 01C03025 */ move $a2, $t6 -/* 04A930 80049D30 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04A934 80049D34 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04A938 80049D38 8D030000 */ lw $v1, ($t0) -/* 04A93C 80049D3C 3C190D00 */ lui $t9, %hi(D_0D007A80) # $t9, 0xd00 -/* 04A940 80049D40 27397A80 */ addiu $t9, %lo(D_0D007A80) # addiu $t9, $t9, 0x7a80 -/* 04A944 80049D44 246F0008 */ addiu $t7, $v1, 8 -/* 04A948 80049D48 AD0F0000 */ sw $t7, ($t0) -/* 04A94C 80049D4C 3C180600 */ lui $t8, 0x600 -/* 04A950 80049D50 AC780000 */ sw $t8, ($v1) -/* 04A954 80049D54 AC790004 */ sw $t9, 4($v1) -/* 04A958 80049D58 8FAA0044 */ lw $t2, 0x44($sp) -/* 04A95C 80049D5C 8FA90040 */ lw $t1, 0x40($sp) -/* 04A960 80049D60 8FA7003C */ lw $a3, 0x3c($sp) -/* 04A964 80049D64 8FA60038 */ lw $a2, 0x38($sp) -/* 04A968 80049D68 8FA50034 */ lw $a1, 0x34($sp) -/* 04A96C 80049D6C 8FA40030 */ lw $a0, 0x30($sp) -/* 04A970 80049D70 AFAA0014 */ sw $t2, 0x14($sp) -/* 04A974 80049D74 0C0124B5 */ jal func_800492D4 -/* 04A978 80049D78 AFA90010 */ sw $t1, 0x10($sp) -/* 04A97C 80049D7C 8FBF001C */ lw $ra, 0x1c($sp) -/* 04A980 80049D80 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04A984 80049D84 03E00008 */ jr $ra -/* 04A988 80049D88 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80049D8C.s b/asm/non_matchings/code_800431B0/func_80049D8C.s deleted file mode 100644 index d34015e78..000000000 --- a/asm/non_matchings/code_800431B0/func_80049D8C.s +++ /dev/null @@ -1,207 +0,0 @@ -glabel func_80049D8C -/* 04A98C 80049D8C 44876000 */ mtc1 $a3, $f12 -/* 04A990 80049D90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04A994 80049D94 AFBF001C */ sw $ra, 0x1c($sp) -/* 04A998 80049D98 AFA60028 */ sw $a2, 0x28($sp) -/* 04A99C 80049D9C 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04A9A0 80049DA0 44076000 */ mfc1 $a3, $f12 -/* 04A9A4 80049DA4 0C0108CC */ jal func_80042330 -/* 04A9A8 80049DA8 01C03025 */ move $a2, $t6 -/* 04A9AC 80049DAC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04A9B0 80049DB0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04A9B4 80049DB4 8D030000 */ lw $v1, ($t0) -/* 04A9B8 80049DB8 3C190D00 */ lui $t9, %hi(D_0D007AA0) # $t9, 0xd00 -/* 04A9BC 80049DBC 27397AA0 */ addiu $t9, %lo(D_0D007AA0) # addiu $t9, $t9, 0x7aa0 -/* 04A9C0 80049DC0 246F0008 */ addiu $t7, $v1, 8 -/* 04A9C4 80049DC4 AD0F0000 */ sw $t7, ($t0) -/* 04A9C8 80049DC8 3C180600 */ lui $t8, 0x600 -/* 04A9CC 80049DCC AC780000 */ sw $t8, ($v1) -/* 04A9D0 80049DD0 AC790004 */ sw $t9, 4($v1) -/* 04A9D4 80049DD4 8FAA0044 */ lw $t2, 0x44($sp) -/* 04A9D8 80049DD8 8FA90040 */ lw $t1, 0x40($sp) -/* 04A9DC 80049DDC 8FA7003C */ lw $a3, 0x3c($sp) -/* 04A9E0 80049DE0 8FA60038 */ lw $a2, 0x38($sp) -/* 04A9E4 80049DE4 8FA50034 */ lw $a1, 0x34($sp) -/* 04A9E8 80049DE8 8FA40030 */ lw $a0, 0x30($sp) -/* 04A9EC 80049DEC AFAA0014 */ sw $t2, 0x14($sp) -/* 04A9F0 80049DF0 0C0124B5 */ jal func_800492D4 -/* 04A9F4 80049DF4 AFA90010 */ sw $t1, 0x10($sp) -/* 04A9F8 80049DF8 8FBF001C */ lw $ra, 0x1c($sp) -/* 04A9FC 80049DFC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AA00 80049E00 03E00008 */ jr $ra -/* 04AA04 80049E04 00000000 */ nop - -/* 04AA08 80049E08 44876000 */ mtc1 $a3, $f12 -/* 04AA0C 80049E0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AA10 80049E10 AFBF001C */ sw $ra, 0x1c($sp) -/* 04AA14 80049E14 AFA60028 */ sw $a2, 0x28($sp) -/* 04AA18 80049E18 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AA1C 80049E1C 44076000 */ mfc1 $a3, $f12 -/* 04AA20 80049E20 0C0108CC */ jal func_80042330 -/* 04AA24 80049E24 01C03025 */ move $a2, $t6 -/* 04AA28 80049E28 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AA2C 80049E2C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AA30 80049E30 8D030000 */ lw $v1, ($t0) -/* 04AA34 80049E34 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04AA38 80049E38 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04AA3C 80049E3C 246F0008 */ addiu $t7, $v1, 8 -/* 04AA40 80049E40 AD0F0000 */ sw $t7, ($t0) -/* 04AA44 80049E44 3C180600 */ lui $t8, 0x600 -/* 04AA48 80049E48 AC780000 */ sw $t8, ($v1) -/* 04AA4C 80049E4C AC790004 */ sw $t9, 4($v1) -/* 04AA50 80049E50 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AA54 80049E54 8FA60038 */ lw $a2, 0x38($sp) -/* 04AA58 80049E58 8FA50034 */ lw $a1, 0x34($sp) -/* 04AA5C 80049E5C 0C012CD7 */ jal func_8004B35C -/* 04AA60 80049E60 8FA40030 */ lw $a0, 0x30($sp) -/* 04AA64 80049E64 8FA90050 */ lw $t1, 0x50($sp) -/* 04AA68 80049E68 8FAA0054 */ lw $t2, 0x54($sp) -/* 04AA6C 80049E6C 8FA40040 */ lw $a0, 0x40($sp) -/* 04AA70 80049E70 8FA50044 */ lw $a1, 0x44($sp) -/* 04AA74 80049E74 8FA60048 */ lw $a2, 0x48($sp) -/* 04AA78 80049E78 8FA7004C */ lw $a3, 0x4c($sp) -/* 04AA7C 80049E7C AFA90010 */ sw $t1, 0x10($sp) -/* 04AA80 80049E80 0C0124B5 */ jal func_800492D4 -/* 04AA84 80049E84 AFAA0014 */ sw $t2, 0x14($sp) -/* 04AA88 80049E88 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AA8C 80049E8C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AA90 80049E90 03E00008 */ jr $ra -/* 04AA94 80049E94 00000000 */ nop - -/* 04AA98 80049E98 44876000 */ mtc1 $a3, $f12 -/* 04AA9C 80049E9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AAA0 80049EA0 AFBF001C */ sw $ra, 0x1c($sp) -/* 04AAA4 80049EA4 AFA60028 */ sw $a2, 0x28($sp) -/* 04AAA8 80049EA8 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AAAC 80049EAC 44076000 */ mfc1 $a3, $f12 -/* 04AAB0 80049EB0 0C0108CC */ jal func_80042330 -/* 04AAB4 80049EB4 01C03025 */ move $a2, $t6 -/* 04AAB8 80049EB8 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AABC 80049EBC 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AAC0 80049EC0 8D030000 */ lw $v1, ($t0) -/* 04AAC4 80049EC4 3C190D00 */ lui $t9, %hi(D_0D007A60) # $t9, 0xd00 -/* 04AAC8 80049EC8 27397A60 */ addiu $t9, %lo(D_0D007A60) # addiu $t9, $t9, 0x7a60 -/* 04AACC 80049ECC 246F0008 */ addiu $t7, $v1, 8 -/* 04AAD0 80049ED0 AD0F0000 */ sw $t7, ($t0) -/* 04AAD4 80049ED4 3C180600 */ lui $t8, 0x600 -/* 04AAD8 80049ED8 AC780000 */ sw $t8, ($v1) -/* 04AADC 80049EDC AC790004 */ sw $t9, 4($v1) -/* 04AAE0 80049EE0 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AAE4 80049EE4 8FA60038 */ lw $a2, 0x38($sp) -/* 04AAE8 80049EE8 8FA50034 */ lw $a1, 0x34($sp) -/* 04AAEC 80049EEC 0C012CD7 */ jal func_8004B35C -/* 04AAF0 80049EF0 8FA40030 */ lw $a0, 0x30($sp) -/* 04AAF4 80049EF4 8FA90050 */ lw $t1, 0x50($sp) -/* 04AAF8 80049EF8 8FAA0054 */ lw $t2, 0x54($sp) -/* 04AAFC 80049EFC 8FA40040 */ lw $a0, 0x40($sp) -/* 04AB00 80049F00 8FA50044 */ lw $a1, 0x44($sp) -/* 04AB04 80049F04 8FA60048 */ lw $a2, 0x48($sp) -/* 04AB08 80049F08 8FA7004C */ lw $a3, 0x4c($sp) -/* 04AB0C 80049F0C AFA90010 */ sw $t1, 0x10($sp) -/* 04AB10 80049F10 0C0124B5 */ jal func_800492D4 -/* 04AB14 80049F14 AFAA0014 */ sw $t2, 0x14($sp) -/* 04AB18 80049F18 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AB1C 80049F1C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AB20 80049F20 03E00008 */ jr $ra -/* 04AB24 80049F24 00000000 */ nop - -/* 04AB28 80049F28 44876000 */ mtc1 $a3, $f12 -/* 04AB2C 80049F2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AB30 80049F30 AFBF001C */ sw $ra, 0x1c($sp) -/* 04AB34 80049F34 AFA60028 */ sw $a2, 0x28($sp) -/* 04AB38 80049F38 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AB3C 80049F3C 44076000 */ mfc1 $a3, $f12 -/* 04AB40 80049F40 0C0108CC */ jal func_80042330 -/* 04AB44 80049F44 01C03025 */ move $a2, $t6 -/* 04AB48 80049F48 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AB4C 80049F4C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AB50 80049F50 8D030000 */ lw $v1, ($t0) -/* 04AB54 80049F54 3C190D00 */ lui $t9, %hi(D_0D007B00) # $t9, 0xd00 -/* 04AB58 80049F58 27397B00 */ addiu $t9, %lo(D_0D007B00) # addiu $t9, $t9, 0x7b00 -/* 04AB5C 80049F5C 246F0008 */ addiu $t7, $v1, 8 -/* 04AB60 80049F60 AD0F0000 */ sw $t7, ($t0) -/* 04AB64 80049F64 3C180600 */ lui $t8, 0x600 -/* 04AB68 80049F68 AC780000 */ sw $t8, ($v1) -/* 04AB6C 80049F6C AC790004 */ sw $t9, 4($v1) -/* 04AB70 80049F70 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AB74 80049F74 8FA60038 */ lw $a2, 0x38($sp) -/* 04AB78 80049F78 8FA50034 */ lw $a1, 0x34($sp) -/* 04AB7C 80049F7C 0C012CD7 */ jal func_8004B35C -/* 04AB80 80049F80 8FA40030 */ lw $a0, 0x30($sp) -/* 04AB84 80049F84 8FA90050 */ lw $t1, 0x50($sp) -/* 04AB88 80049F88 8FAA0054 */ lw $t2, 0x54($sp) -/* 04AB8C 80049F8C 8FA40040 */ lw $a0, 0x40($sp) -/* 04AB90 80049F90 8FA50044 */ lw $a1, 0x44($sp) -/* 04AB94 80049F94 8FA60048 */ lw $a2, 0x48($sp) -/* 04AB98 80049F98 8FA7004C */ lw $a3, 0x4c($sp) -/* 04AB9C 80049F9C AFA90010 */ sw $t1, 0x10($sp) -/* 04ABA0 80049FA0 0C0124B5 */ jal func_800492D4 -/* 04ABA4 80049FA4 AFAA0014 */ sw $t2, 0x14($sp) -/* 04ABA8 80049FA8 8FBF001C */ lw $ra, 0x1c($sp) -/* 04ABAC 80049FAC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04ABB0 80049FB0 03E00008 */ jr $ra -/* 04ABB4 80049FB4 00000000 */ nop - -/* 04ABB8 80049FB8 44876000 */ mtc1 $a3, $f12 -/* 04ABBC 80049FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04ABC0 80049FC0 AFBF001C */ sw $ra, 0x1c($sp) -/* 04ABC4 80049FC4 AFA60028 */ sw $a2, 0x28($sp) -/* 04ABC8 80049FC8 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04ABCC 80049FCC 44076000 */ mfc1 $a3, $f12 -/* 04ABD0 80049FD0 0C0108CC */ jal func_80042330 -/* 04ABD4 80049FD4 01C03025 */ move $a2, $t6 -/* 04ABD8 80049FD8 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04ABDC 80049FDC 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04ABE0 80049FE0 8D030000 */ lw $v1, ($t0) -/* 04ABE4 80049FE4 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04ABE8 80049FE8 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04ABEC 80049FEC 246F0008 */ addiu $t7, $v1, 8 -/* 04ABF0 80049FF0 AD0F0000 */ sw $t7, ($t0) -/* 04ABF4 80049FF4 3C180600 */ lui $t8, 0x600 -/* 04ABF8 80049FF8 AC780000 */ sw $t8, ($v1) -/* 04ABFC 80049FFC AC790004 */ sw $t9, 4($v1) -/* 04AC00 8004A000 8FAA0044 */ lw $t2, 0x44($sp) -/* 04AC04 8004A004 8FA90040 */ lw $t1, 0x40($sp) -/* 04AC08 8004A008 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AC0C 8004A00C 8FA60038 */ lw $a2, 0x38($sp) -/* 04AC10 8004A010 8FA50034 */ lw $a1, 0x34($sp) -/* 04AC14 8004A014 8FA40030 */ lw $a0, 0x30($sp) -/* 04AC18 8004A018 AFAA0014 */ sw $t2, 0x14($sp) -/* 04AC1C 8004A01C 0C01251E */ jal func_80049478 -/* 04AC20 8004A020 AFA90010 */ sw $t1, 0x10($sp) -/* 04AC24 8004A024 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AC28 8004A028 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AC2C 8004A02C 03E00008 */ jr $ra -/* 04AC30 8004A030 00000000 */ nop - -/* 04AC34 8004A034 44876000 */ mtc1 $a3, $f12 -/* 04AC38 8004A038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AC3C 8004A03C AFBF001C */ sw $ra, 0x1c($sp) -/* 04AC40 8004A040 AFA60028 */ sw $a2, 0x28($sp) -/* 04AC44 8004A044 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AC48 8004A048 44076000 */ mfc1 $a3, $f12 -/* 04AC4C 8004A04C 0C0108CC */ jal func_80042330 -/* 04AC50 8004A050 01C03025 */ move $a2, $t6 -/* 04AC54 8004A054 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AC58 8004A058 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AC5C 8004A05C 8D030000 */ lw $v1, ($t0) -/* 04AC60 8004A060 3C190D00 */ lui $t9, %hi(D_0D007A60) # $t9, 0xd00 -/* 04AC64 8004A064 27397A60 */ addiu $t9, %lo(D_0D007A60) # addiu $t9, $t9, 0x7a60 -/* 04AC68 8004A068 246F0008 */ addiu $t7, $v1, 8 -/* 04AC6C 8004A06C AD0F0000 */ sw $t7, ($t0) -/* 04AC70 8004A070 3C180600 */ lui $t8, 0x600 -/* 04AC74 8004A074 AC780000 */ sw $t8, ($v1) -/* 04AC78 8004A078 AC790004 */ sw $t9, 4($v1) -/* 04AC7C 8004A07C 8FAA0044 */ lw $t2, 0x44($sp) -/* 04AC80 8004A080 8FA90040 */ lw $t1, 0x40($sp) -/* 04AC84 8004A084 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AC88 8004A088 8FA60038 */ lw $a2, 0x38($sp) -/* 04AC8C 8004A08C 8FA50034 */ lw $a1, 0x34($sp) -/* 04AC90 8004A090 8FA40030 */ lw $a0, 0x30($sp) -/* 04AC94 8004A094 AFAA0014 */ sw $t2, 0x14($sp) -/* 04AC98 8004A098 0C01251E */ jal func_80049478 -/* 04AC9C 8004A09C AFA90010 */ sw $t1, 0x10($sp) -/* 04ACA0 8004A0A0 8FBF001C */ lw $ra, 0x1c($sp) -/* 04ACA4 8004A0A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04ACA8 8004A0A8 03E00008 */ jr $ra -/* 04ACAC 8004A0AC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004A0B0.s b/asm/non_matchings/code_800431B0/func_8004A0B0.s deleted file mode 100644 index c5914987c..000000000 --- a/asm/non_matchings/code_800431B0/func_8004A0B0.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_8004A0B0 -/* 04ACB0 8004A0B0 44876000 */ mtc1 $a3, $f12 -/* 04ACB4 8004A0B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04ACB8 8004A0B8 AFBF001C */ sw $ra, 0x1c($sp) -/* 04ACBC 8004A0BC AFA60028 */ sw $a2, 0x28($sp) -/* 04ACC0 8004A0C0 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04ACC4 8004A0C4 44076000 */ mfc1 $a3, $f12 -/* 04ACC8 8004A0C8 0C0108CC */ jal func_80042330 -/* 04ACCC 8004A0CC 01C03025 */ move $a2, $t6 -/* 04ACD0 8004A0D0 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04ACD4 8004A0D4 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04ACD8 8004A0D8 8D030000 */ lw $v1, ($t0) -/* 04ACDC 8004A0DC 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04ACE0 8004A0E0 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04ACE4 8004A0E4 246F0008 */ addiu $t7, $v1, 8 -/* 04ACE8 8004A0E8 AD0F0000 */ sw $t7, ($t0) -/* 04ACEC 8004A0EC 3C180600 */ lui $t8, 0x600 -/* 04ACF0 8004A0F0 AC780000 */ sw $t8, ($v1) -/* 04ACF4 8004A0F4 AC790004 */ sw $t9, 4($v1) -/* 04ACF8 8004A0F8 8FAA0044 */ lw $t2, 0x44($sp) -/* 04ACFC 8004A0FC 8FA90040 */ lw $t1, 0x40($sp) -/* 04AD00 8004A100 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AD04 8004A104 8FA60038 */ lw $a2, 0x38($sp) -/* 04AD08 8004A108 8FA50034 */ lw $a1, 0x34($sp) -/* 04AD0C 8004A10C 8FA40030 */ lw $a0, 0x30($sp) -/* 04AD10 8004A110 AFAA0014 */ sw $t2, 0x14($sp) -/* 04AD14 8004A114 0C012587 */ jal func_8004961C -/* 04AD18 8004A118 AFA90010 */ sw $t1, 0x10($sp) -/* 04AD1C 8004A11C 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AD20 8004A120 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AD24 8004A124 03E00008 */ jr $ra -/* 04AD28 8004A128 00000000 */ nop - -/* 04AD2C 8004A12C 44876000 */ mtc1 $a3, $f12 -/* 04AD30 8004A130 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AD34 8004A134 AFBF001C */ sw $ra, 0x1c($sp) -/* 04AD38 8004A138 AFA60028 */ sw $a2, 0x28($sp) -/* 04AD3C 8004A13C 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AD40 8004A140 44076000 */ mfc1 $a3, $f12 -/* 04AD44 8004A144 0C0108CC */ jal func_80042330 -/* 04AD48 8004A148 01C03025 */ move $a2, $t6 -/* 04AD4C 8004A14C 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AD50 8004A150 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AD54 8004A154 8D030000 */ lw $v1, ($t0) -/* 04AD58 8004A158 3C190D00 */ lui $t9, %hi(D_0D007A60) # $t9, 0xd00 -/* 04AD5C 8004A15C 27397A60 */ addiu $t9, %lo(D_0D007A60) # addiu $t9, $t9, 0x7a60 -/* 04AD60 8004A160 246F0008 */ addiu $t7, $v1, 8 -/* 04AD64 8004A164 AD0F0000 */ sw $t7, ($t0) -/* 04AD68 8004A168 3C180600 */ lui $t8, 0x600 -/* 04AD6C 8004A16C AC780000 */ sw $t8, ($v1) -/* 04AD70 8004A170 AC790004 */ sw $t9, 4($v1) -/* 04AD74 8004A174 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AD78 8004A178 8FA60038 */ lw $a2, 0x38($sp) -/* 04AD7C 8004A17C 8FA50034 */ lw $a1, 0x34($sp) -/* 04AD80 8004A180 0C012CD7 */ jal func_8004B35C -/* 04AD84 8004A184 8FA40030 */ lw $a0, 0x30($sp) -/* 04AD88 8004A188 8FA90050 */ lw $t1, 0x50($sp) -/* 04AD8C 8004A18C 8FAA0054 */ lw $t2, 0x54($sp) -/* 04AD90 8004A190 8FA40040 */ lw $a0, 0x40($sp) -/* 04AD94 8004A194 8FA50044 */ lw $a1, 0x44($sp) -/* 04AD98 8004A198 8FA60048 */ lw $a2, 0x48($sp) -/* 04AD9C 8004A19C 8FA7004C */ lw $a3, 0x4c($sp) -/* 04ADA0 8004A1A0 AFA90010 */ sw $t1, 0x10($sp) -/* 04ADA4 8004A1A4 0C012587 */ jal func_8004961C -/* 04ADA8 8004A1A8 AFAA0014 */ sw $t2, 0x14($sp) -/* 04ADAC 8004A1AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 04ADB0 8004A1B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04ADB4 8004A1B4 03E00008 */ jr $ra -/* 04ADB8 8004A1B8 00000000 */ nop - -/* 04ADBC 8004A1BC 44876000 */ mtc1 $a3, $f12 -/* 04ADC0 8004A1C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04ADC4 8004A1C4 AFBF001C */ sw $ra, 0x1c($sp) -/* 04ADC8 8004A1C8 AFA60028 */ sw $a2, 0x28($sp) -/* 04ADCC 8004A1CC 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04ADD0 8004A1D0 44076000 */ mfc1 $a3, $f12 -/* 04ADD4 8004A1D4 0C0108CC */ jal func_80042330 -/* 04ADD8 8004A1D8 01C03025 */ move $a2, $t6 -/* 04ADDC 8004A1DC 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04ADE0 8004A1E0 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04ADE4 8004A1E4 8D220000 */ lw $v0, ($t1) -/* 04ADE8 8004A1E8 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04ADEC 8004A1EC 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04ADF0 8004A1F0 244F0008 */ addiu $t7, $v0, 8 -/* 04ADF4 8004A1F4 AD2F0000 */ sw $t7, ($t1) -/* 04ADF8 8004A1F8 3C180600 */ lui $t8, 0x600 -/* 04ADFC 8004A1FC AC580000 */ sw $t8, ($v0) -/* 04AE00 8004A200 AC590004 */ sw $t9, 4($v0) -/* 04AE04 8004A204 8D220000 */ lw $v0, ($t1) -/* 04AE08 8004A208 3C0BFC62 */ lui $t3, (0xFC627EC4 >> 16) # lui $t3, 0xfc62 -/* 04AE0C 8004A20C 356B7EC4 */ ori $t3, (0xFC627EC4 & 0xFFFF) # ori $t3, $t3, 0x7ec4 -/* 04AE10 8004A210 244A0008 */ addiu $t2, $v0, 8 -/* 04AE14 8004A214 AD2A0000 */ sw $t2, ($t1) -/* 04AE18 8004A218 240CF3F9 */ li $t4, -3079 -/* 04AE1C 8004A21C AC4C0004 */ sw $t4, 4($v0) -/* 04AE20 8004A220 AC4B0000 */ sw $t3, ($v0) -/* 04AE24 8004A224 8FAE0044 */ lw $t6, 0x44($sp) -/* 04AE28 8004A228 8FAD0040 */ lw $t5, 0x40($sp) -/* 04AE2C 8004A22C 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AE30 8004A230 8FA60038 */ lw $a2, 0x38($sp) -/* 04AE34 8004A234 8FA50034 */ lw $a1, 0x34($sp) -/* 04AE38 8004A238 8FA40030 */ lw $a0, 0x30($sp) -/* 04AE3C 8004A23C AFAE0014 */ sw $t6, 0x14($sp) -/* 04AE40 8004A240 0C01265C */ jal func_80049970 -/* 04AE44 8004A244 AFAD0010 */ sw $t5, 0x10($sp) -/* 04AE48 8004A248 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AE4C 8004A24C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AE50 8004A250 03E00008 */ jr $ra -/* 04AE54 8004A254 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004A258.s b/asm/non_matchings/code_800431B0/func_8004A258.s deleted file mode 100644 index 0f4bf0c1f..000000000 --- a/asm/non_matchings/code_800431B0/func_8004A258.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8004A258 -/* 04AE58 8004A258 44876000 */ mtc1 $a3, $f12 -/* 04AE5C 8004A25C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AE60 8004A260 AFBF001C */ sw $ra, 0x1c($sp) -/* 04AE64 8004A264 AFA60028 */ sw $a2, 0x28($sp) -/* 04AE68 8004A268 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AE6C 8004A26C 44076000 */ mfc1 $a3, $f12 -/* 04AE70 8004A270 0C0108CC */ jal func_80042330 -/* 04AE74 8004A274 01C03025 */ move $a2, $t6 -/* 04AE78 8004A278 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04AE7C 8004A27C 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04AE80 8004A280 8D220000 */ lw $v0, ($t1) -/* 04AE84 8004A284 3C190D00 */ lui $t9, %hi(D_0D007A60) # $t9, 0xd00 -/* 04AE88 8004A288 27397A60 */ addiu $t9, %lo(D_0D007A60) # addiu $t9, $t9, 0x7a60 -/* 04AE8C 8004A28C 244F0008 */ addiu $t7, $v0, 8 -/* 04AE90 8004A290 AD2F0000 */ sw $t7, ($t1) -/* 04AE94 8004A294 3C180600 */ lui $t8, 0x600 -/* 04AE98 8004A298 AC580000 */ sw $t8, ($v0) -/* 04AE9C 8004A29C AC590004 */ sw $t9, 4($v0) -/* 04AEA0 8004A2A0 8D220000 */ lw $v0, ($t1) -/* 04AEA4 8004A2A4 3C0BFC62 */ lui $t3, (0xFC627EC4 >> 16) # lui $t3, 0xfc62 -/* 04AEA8 8004A2A8 356B7EC4 */ ori $t3, (0xFC627EC4 & 0xFFFF) # ori $t3, $t3, 0x7ec4 -/* 04AEAC 8004A2AC 244A0008 */ addiu $t2, $v0, 8 -/* 04AEB0 8004A2B0 AD2A0000 */ sw $t2, ($t1) -/* 04AEB4 8004A2B4 240CF3F9 */ li $t4, -3079 -/* 04AEB8 8004A2B8 AC4C0004 */ sw $t4, 4($v0) -/* 04AEBC 8004A2BC AC4B0000 */ sw $t3, ($v0) -/* 04AEC0 8004A2C0 8FAE0044 */ lw $t6, 0x44($sp) -/* 04AEC4 8004A2C4 8FAD0040 */ lw $t5, 0x40($sp) -/* 04AEC8 8004A2C8 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AECC 8004A2CC 8FA60038 */ lw $a2, 0x38($sp) -/* 04AED0 8004A2D0 8FA50034 */ lw $a1, 0x34($sp) -/* 04AED4 8004A2D4 8FA40030 */ lw $a0, 0x30($sp) -/* 04AED8 8004A2D8 AFAE0014 */ sw $t6, 0x14($sp) -/* 04AEDC 8004A2DC 0C01265C */ jal func_80049970 -/* 04AEE0 8004A2E0 AFAD0010 */ sw $t5, 0x10($sp) -/* 04AEE4 8004A2E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AEE8 8004A2E8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AEEC 8004A2EC 03E00008 */ jr $ra -/* 04AEF0 8004A2F0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004A2F4.s b/asm/non_matchings/code_800431B0/func_8004A2F4.s deleted file mode 100644 index 41f24802a..000000000 --- a/asm/non_matchings/code_800431B0/func_8004A2F4.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8004A2F4 -/* 04AEF4 8004A2F4 44876000 */ mtc1 $a3, $f12 -/* 04AEF8 8004A2F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AEFC 8004A2FC AFBF001C */ sw $ra, 0x1c($sp) -/* 04AF00 8004A300 AFA60028 */ sw $a2, 0x28($sp) -/* 04AF04 8004A304 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AF08 8004A308 44076000 */ mfc1 $a3, $f12 -/* 04AF0C 8004A30C 0C0108CC */ jal func_80042330 -/* 04AF10 8004A310 01C03025 */ move $a2, $t6 -/* 04AF14 8004A314 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AF18 8004A318 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AF1C 8004A31C 8D030000 */ lw $v1, ($t0) -/* 04AF20 8004A320 3C190D00 */ lui $t9, %hi(D_0D007A40) # $t9, 0xd00 -/* 04AF24 8004A324 27397A40 */ addiu $t9, %lo(D_0D007A40) # addiu $t9, $t9, 0x7a40 -/* 04AF28 8004A328 246F0008 */ addiu $t7, $v1, 8 -/* 04AF2C 8004A32C AD0F0000 */ sw $t7, ($t0) -/* 04AF30 8004A330 3C180600 */ lui $t8, 0x600 -/* 04AF34 8004A334 AC780000 */ sw $t8, ($v1) -/* 04AF38 8004A338 AC790004 */ sw $t9, 4($v1) -/* 04AF3C 8004A33C 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AF40 8004A340 8FA60038 */ lw $a2, 0x38($sp) -/* 04AF44 8004A344 8FA50034 */ lw $a1, 0x34($sp) -/* 04AF48 8004A348 0C012D05 */ jal func_8004B414 -/* 04AF4C 8004A34C 8FA40030 */ lw $a0, 0x30($sp) -/* 04AF50 8004A350 8FA90050 */ lw $t1, 0x50($sp) -/* 04AF54 8004A354 8FAA0054 */ lw $t2, 0x54($sp) -/* 04AF58 8004A358 8FA40040 */ lw $a0, 0x40($sp) -/* 04AF5C 8004A35C 8FA50044 */ lw $a1, 0x44($sp) -/* 04AF60 8004A360 8FA60048 */ lw $a2, 0x48($sp) -/* 04AF64 8004A364 8FA7004C */ lw $a3, 0x4c($sp) -/* 04AF68 8004A368 AFA90010 */ sw $t1, 0x10($sp) -/* 04AF6C 8004A36C 0C01265C */ jal func_80049970 -/* 04AF70 8004A370 AFAA0014 */ sw $t2, 0x14($sp) -/* 04AF74 8004A374 8FBF001C */ lw $ra, 0x1c($sp) -/* 04AF78 8004A378 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04AF7C 8004A37C 03E00008 */ jr $ra -/* 04AF80 8004A380 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004A384.s b/asm/non_matchings/code_800431B0/func_8004A384.s deleted file mode 100644 index cbe563d5a..000000000 --- a/asm/non_matchings/code_800431B0/func_8004A384.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8004A384 -/* 04AF84 8004A384 44876000 */ mtc1 $a3, $f12 -/* 04AF88 8004A388 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04AF8C 8004A38C AFBF001C */ sw $ra, 0x1c($sp) -/* 04AF90 8004A390 AFA60028 */ sw $a2, 0x28($sp) -/* 04AF94 8004A394 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04AF98 8004A398 44076000 */ mfc1 $a3, $f12 -/* 04AF9C 8004A39C 0C0108CC */ jal func_80042330 -/* 04AFA0 8004A3A0 01C03025 */ move $a2, $t6 -/* 04AFA4 8004A3A4 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04AFA8 8004A3A8 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04AFAC 8004A3AC 8D030000 */ lw $v1, ($t0) -/* 04AFB0 8004A3B0 3C190D00 */ lui $t9, %hi(D_0D007A60) # $t9, 0xd00 -/* 04AFB4 8004A3B4 27397A60 */ addiu $t9, %lo(D_0D007A60) # addiu $t9, $t9, 0x7a60 -/* 04AFB8 8004A3B8 246F0008 */ addiu $t7, $v1, 8 -/* 04AFBC 8004A3BC AD0F0000 */ sw $t7, ($t0) -/* 04AFC0 8004A3C0 3C180600 */ lui $t8, 0x600 -/* 04AFC4 8004A3C4 AC780000 */ sw $t8, ($v1) -/* 04AFC8 8004A3C8 AC790004 */ sw $t9, 4($v1) -/* 04AFCC 8004A3CC 8FA7003C */ lw $a3, 0x3c($sp) -/* 04AFD0 8004A3D0 8FA60038 */ lw $a2, 0x38($sp) -/* 04AFD4 8004A3D4 8FA50034 */ lw $a1, 0x34($sp) -/* 04AFD8 8004A3D8 0C012D05 */ jal func_8004B414 -/* 04AFDC 8004A3DC 8FA40030 */ lw $a0, 0x30($sp) -/* 04AFE0 8004A3E0 8FA90050 */ lw $t1, 0x50($sp) -/* 04AFE4 8004A3E4 8FAA0054 */ lw $t2, 0x54($sp) -/* 04AFE8 8004A3E8 8FA40040 */ lw $a0, 0x40($sp) -/* 04AFEC 8004A3EC 8FA50044 */ lw $a1, 0x44($sp) -/* 04AFF0 8004A3F0 8FA60048 */ lw $a2, 0x48($sp) -/* 04AFF4 8004A3F4 8FA7004C */ lw $a3, 0x4c($sp) -/* 04AFF8 8004A3F8 AFA90010 */ sw $t1, 0x10($sp) -/* 04AFFC 8004A3FC 0C01265C */ jal func_80049970 -/* 04B000 8004A400 AFAA0014 */ sw $t2, 0x14($sp) -/* 04B004 8004A404 8FBF001C */ lw $ra, 0x1c($sp) -/* 04B008 8004A408 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04B00C 8004A40C 03E00008 */ jr $ra -/* 04B010 8004A410 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004A414.s b/asm/non_matchings/code_800431B0/func_8004A414.s deleted file mode 100644 index cfa9243bc..000000000 --- a/asm/non_matchings/code_800431B0/func_8004A414.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel func_8004A414 -/* 04B014 8004A414 44866000 */ mtc1 $a2, $f12 -/* 04B018 8004A418 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04B01C 8004A41C AFBF001C */ sw $ra, 0x1c($sp) -/* 04B020 8004A420 44066000 */ mfc1 $a2, $f12 -/* 04B024 8004A424 0C010B80 */ jal func_80042E00 -/* 04B028 8004A428 AFA7002C */ sw $a3, 0x2c($sp) -/* 04B02C 8004A42C 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04B030 8004A430 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04B034 8004A434 8D030000 */ lw $v1, ($t0) -/* 04B038 8004A438 3C180D00 */ lui $t8, %hi(D_0D007A40) # $t8, 0xd00 -/* 04B03C 8004A43C 27187A40 */ addiu $t8, %lo(D_0D007A40) # addiu $t8, $t8, 0x7a40 -/* 04B040 8004A440 246E0008 */ addiu $t6, $v1, 8 -/* 04B044 8004A444 AD0E0000 */ sw $t6, ($t0) -/* 04B048 8004A448 3C0F0600 */ lui $t7, 0x600 -/* 04B04C 8004A44C AC6F0000 */ sw $t7, ($v1) -/* 04B050 8004A450 AC780004 */ sw $t8, 4($v1) -/* 04B054 8004A454 8FA90040 */ lw $t1, 0x40($sp) -/* 04B058 8004A458 8FB9003C */ lw $t9, 0x3c($sp) -/* 04B05C 8004A45C 8FA70038 */ lw $a3, 0x38($sp) -/* 04B060 8004A460 8FA60034 */ lw $a2, 0x34($sp) -/* 04B064 8004A464 8FA50030 */ lw $a1, 0x30($sp) -/* 04B068 8004A468 8FA4002C */ lw $a0, 0x2c($sp) -/* 04B06C 8004A46C AFA90014 */ sw $t1, 0x14($sp) -/* 04B070 8004A470 0C0124B5 */ jal func_800492D4 -/* 04B074 8004A474 AFB90010 */ sw $t9, 0x10($sp) -/* 04B078 8004A478 8FBF001C */ lw $ra, 0x1c($sp) -/* 04B07C 8004A47C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04B080 8004A480 03E00008 */ jr $ra -/* 04B084 8004A484 00000000 */ nop - -/* 04B088 8004A488 44866000 */ mtc1 $a2, $f12 -/* 04B08C 8004A48C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04B090 8004A490 AFBF001C */ sw $ra, 0x1c($sp) -/* 04B094 8004A494 44066000 */ mfc1 $a2, $f12 -/* 04B098 8004A498 0C010B80 */ jal func_80042E00 -/* 04B09C 8004A49C AFA7002C */ sw $a3, 0x2c($sp) -/* 04B0A0 8004A4A0 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04B0A4 8004A4A4 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04B0A8 8004A4A8 8D030000 */ lw $v1, ($t0) -/* 04B0AC 8004A4AC 3C180D00 */ lui $t8, %hi(D_0D007A60) # $t8, 0xd00 -/* 04B0B0 8004A4B0 27187A60 */ addiu $t8, %lo(D_0D007A60) # addiu $t8, $t8, 0x7a60 -/* 04B0B4 8004A4B4 246E0008 */ addiu $t6, $v1, 8 -/* 04B0B8 8004A4B8 AD0E0000 */ sw $t6, ($t0) -/* 04B0BC 8004A4BC 3C0F0600 */ lui $t7, 0x600 -/* 04B0C0 8004A4C0 AC6F0000 */ sw $t7, ($v1) -/* 04B0C4 8004A4C4 AC780004 */ sw $t8, 4($v1) -/* 04B0C8 8004A4C8 8FA90040 */ lw $t1, 0x40($sp) -/* 04B0CC 8004A4CC 8FB9003C */ lw $t9, 0x3c($sp) -/* 04B0D0 8004A4D0 8FA70038 */ lw $a3, 0x38($sp) -/* 04B0D4 8004A4D4 8FA60034 */ lw $a2, 0x34($sp) -/* 04B0D8 8004A4D8 8FA50030 */ lw $a1, 0x30($sp) -/* 04B0DC 8004A4DC 8FA4002C */ lw $a0, 0x2c($sp) -/* 04B0E0 8004A4E0 AFA90014 */ sw $t1, 0x14($sp) -/* 04B0E4 8004A4E4 0C0124B5 */ jal func_800492D4 -/* 04B0E8 8004A4E8 AFB90010 */ sw $t9, 0x10($sp) -/* 04B0EC 8004A4EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 04B0F0 8004A4F0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04B0F4 8004A4F4 03E00008 */ jr $ra -/* 04B0F8 8004A4F8 00000000 */ nop - -/* 04B0FC 8004A4FC 44866000 */ mtc1 $a2, $f12 -/* 04B100 8004A500 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04B104 8004A504 AFBF001C */ sw $ra, 0x1c($sp) -/* 04B108 8004A508 44066000 */ mfc1 $a2, $f12 -/* 04B10C 8004A50C 0C010B80 */ jal func_80042E00 -/* 04B110 8004A510 AFA7002C */ sw $a3, 0x2c($sp) -/* 04B114 8004A514 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04B118 8004A518 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04B11C 8004A51C 8D030000 */ lw $v1, ($t0) -/* 04B120 8004A520 3C180D00 */ lui $t8, %hi(D_0D007AC0) # $t8, 0xd00 -/* 04B124 8004A524 27187AC0 */ addiu $t8, %lo(D_0D007AC0) # addiu $t8, $t8, 0x7ac0 -/* 04B128 8004A528 246E0008 */ addiu $t6, $v1, 8 -/* 04B12C 8004A52C AD0E0000 */ sw $t6, ($t0) -/* 04B130 8004A530 3C0F0600 */ lui $t7, 0x600 -/* 04B134 8004A534 AC6F0000 */ sw $t7, ($v1) -/* 04B138 8004A538 AC780004 */ sw $t8, 4($v1) -/* 04B13C 8004A53C 8FA90040 */ lw $t1, 0x40($sp) -/* 04B140 8004A540 8FB9003C */ lw $t9, 0x3c($sp) -/* 04B144 8004A544 8FA70038 */ lw $a3, 0x38($sp) -/* 04B148 8004A548 8FA60034 */ lw $a2, 0x34($sp) -/* 04B14C 8004A54C 8FA50030 */ lw $a1, 0x30($sp) -/* 04B150 8004A550 8FA4002C */ lw $a0, 0x2c($sp) -/* 04B154 8004A554 AFA90014 */ sw $t1, 0x14($sp) -/* 04B158 8004A558 0C0124B5 */ jal func_800492D4 -/* 04B15C 8004A55C AFB90010 */ sw $t9, 0x10($sp) -/* 04B160 8004A560 8FBF001C */ lw $ra, 0x1c($sp) -/* 04B164 8004A564 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04B168 8004A568 03E00008 */ jr $ra -/* 04B16C 8004A56C 00000000 */ nop - -/* 04B170 8004A570 44866000 */ mtc1 $a2, $f12 -/* 04B174 8004A574 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04B178 8004A578 AFBF001C */ sw $ra, 0x1c($sp) -/* 04B17C 8004A57C 44066000 */ mfc1 $a2, $f12 -/* 04B180 8004A580 0C010B80 */ jal func_80042E00 -/* 04B184 8004A584 AFA7002C */ sw $a3, 0x2c($sp) -/* 04B188 8004A588 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04B18C 8004A58C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04B190 8004A590 8D030000 */ lw $v1, ($t0) -/* 04B194 8004A594 3C180D00 */ lui $t8, %hi(D_0D007AE0) # $t8, 0xd00 -/* 04B198 8004A598 27187AE0 */ addiu $t8, %lo(D_0D007AE0) # addiu $t8, $t8, 0x7ae0 -/* 04B19C 8004A59C 246E0008 */ addiu $t6, $v1, 8 -/* 04B1A0 8004A5A0 AD0E0000 */ sw $t6, ($t0) -/* 04B1A4 8004A5A4 3C0F0600 */ lui $t7, 0x600 -/* 04B1A8 8004A5A8 AC6F0000 */ sw $t7, ($v1) -/* 04B1AC 8004A5AC AC780004 */ sw $t8, 4($v1) -/* 04B1B0 8004A5B0 8FA90040 */ lw $t1, 0x40($sp) -/* 04B1B4 8004A5B4 8FB9003C */ lw $t9, 0x3c($sp) -/* 04B1B8 8004A5B8 8FA70038 */ lw $a3, 0x38($sp) -/* 04B1BC 8004A5BC 8FA60034 */ lw $a2, 0x34($sp) -/* 04B1C0 8004A5C0 8FA50030 */ lw $a1, 0x30($sp) -/* 04B1C4 8004A5C4 8FA4002C */ lw $a0, 0x2c($sp) -/* 04B1C8 8004A5C8 AFA90014 */ sw $t1, 0x14($sp) -/* 04B1CC 8004A5CC 0C0124B5 */ jal func_800492D4 -/* 04B1D0 8004A5D0 AFB90010 */ sw $t9, 0x10($sp) -/* 04B1D4 8004A5D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 04B1D8 8004A5D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04B1DC 8004A5DC 03E00008 */ jr $ra -/* 04B1E0 8004A5E0 00000000 */ nop - -/* 04B1E4 8004A5E4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 04B1E8 8004A5E8 44866000 */ mtc1 $a2, $f12 -/* 04B1EC 8004A5EC 8FAE0040 */ lw $t6, 0x40($sp) -/* 04B1F0 8004A5F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 04B1F4 8004A5F4 240F0010 */ li $t7, 16 -/* 04B1F8 8004A5F8 24180010 */ li $t8, 16 -/* 04B1FC 8004A5FC 24190010 */ li $t9, 16 -/* 04B200 8004A600 24080010 */ li $t0, 16 -/* 04B204 8004A604 44066000 */ mfc1 $a2, $f12 -/* 04B208 8004A608 AFA80020 */ sw $t0, 0x20($sp) -/* 04B20C 8004A60C AFB9001C */ sw $t9, 0x1c($sp) -/* 04B210 8004A610 AFB80018 */ sw $t8, 0x18($sp) -/* 04B214 8004A614 AFAF0014 */ sw $t7, 0x14($sp) -/* 04B218 8004A618 0C012905 */ jal func_8004A414 -/* 04B21C 8004A61C AFAE0010 */ sw $t6, 0x10($sp) -/* 04B220 8004A620 8FBF002C */ lw $ra, 0x2c($sp) -/* 04B224 8004A624 27BD0030 */ addiu $sp, $sp, 0x30 -/* 04B228 8004A628 03E00008 */ jr $ra -/* 04B22C 8004A62C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004A9B8.s b/asm/non_matchings/code_800431B0/func_8004A9B8.s index ca4723fe9..2121ba490 100644 --- a/asm/non_matchings/code_800431B0/func_8004A9B8.s +++ b/asm/non_matchings/code_800431B0/func_8004A9B8.s @@ -1,27 +1,4 @@ -glabel func_8004A9B8 -/* 04B5B8 8004A9B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 04B5BC 8004A9BC AFBF0014 */ sw $ra, 0x14($sp) -/* 04B5C0 8004A9C0 3C048018 */ lui $a0, %hi(D_80183E50) # $a0, 0x8018 -/* 04B5C4 8004A9C4 3C058018 */ lui $a1, %hi(D_80183E70) # $a1, 0x8018 -/* 04B5C8 8004A9C8 44066000 */ mfc1 $a2, $f12 -/* 04B5CC 8004A9CC 24A53E70 */ addiu $a1, %lo(D_80183E70) # addiu $a1, $a1, 0x3e70 -/* 04B5D0 8004A9D0 0C010C14 */ jal func_80043050 -/* 04B5D4 8004A9D4 24843E50 */ addiu $a0, %lo(D_80183E50) # addiu $a0, $a0, 0x3e50 -/* 04B5D8 8004A9D8 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 04B5DC 8004A9DC 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 04B5E0 8004A9E0 8C830000 */ lw $v1, ($a0) -/* 04B5E4 8004A9E4 3C180D00 */ lui $t8, %hi(D_0D007C10) # $t8, 0xd00 -/* 04B5E8 8004A9E8 27187C10 */ addiu $t8, %lo(D_0D007C10) # addiu $t8, $t8, 0x7c10 -/* 04B5EC 8004A9EC 246E0008 */ addiu $t6, $v1, 8 -/* 04B5F0 8004A9F0 AC8E0000 */ sw $t6, ($a0) -/* 04B5F4 8004A9F4 3C0F0600 */ lui $t7, 0x600 -/* 04B5F8 8004A9F8 AC6F0000 */ sw $t7, ($v1) -/* 04B5FC 8004A9FC AC780004 */ sw $t8, 4($v1) -/* 04B600 8004AA00 8FBF0014 */ lw $ra, 0x14($sp) -/* 04B604 8004AA04 27BD0018 */ addiu $sp, $sp, 0x18 -/* 04B608 8004AA08 03E00008 */ jr $ra -/* 04B60C 8004AA0C 00000000 */ nop - +glabel func_8004AA10 /* 04B610 8004AA10 44866000 */ mtc1 $a2, $f12 /* 04B614 8004AA14 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 04B618 8004AA18 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_800431B0/func_8004B05C.s b/asm/non_matchings/code_800431B0/func_8004B05C.s deleted file mode 100644 index d00fda550..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B05C.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_8004B05C -/* 04BC5C 8004B05C 3C0C8015 */ lui $t4, %hi(gDisplayListHead) # $t4, 0x8015 -/* 04BC60 8004B060 258C0298 */ addiu $t4, %lo(gDisplayListHead) # addiu $t4, $t4, 0x298 -/* 04BC64 8004B064 8D830000 */ lw $v1, ($t4) -/* 04BC68 8004B068 3C0FFD10 */ lui $t7, 0xfd10 -/* 04BC6C 8004B06C 3C19E800 */ lui $t9, 0xe800 -/* 04BC70 8004B070 246E0008 */ addiu $t6, $v1, 8 -/* 04BC74 8004B074 AD8E0000 */ sw $t6, ($t4) -/* 04BC78 8004B078 AC640004 */ sw $a0, 4($v1) -/* 04BC7C 8004B07C AC6F0000 */ sw $t7, ($v1) -/* 04BC80 8004B080 8D830000 */ lw $v1, ($t4) -/* 04BC84 8004B084 3C0FF500 */ lui $t7, (0xF5000100 >> 16) # lui $t7, 0xf500 -/* 04BC88 8004B088 35EF0100 */ ori $t7, (0xF5000100 & 0xFFFF) # ori $t7, $t7, 0x100 -/* 04BC8C 8004B08C 24780008 */ addiu $t8, $v1, 8 -/* 04BC90 8004B090 AD980000 */ sw $t8, ($t4) -/* 04BC94 8004B094 AC600004 */ sw $zero, 4($v1) -/* 04BC98 8004B098 AC790000 */ sw $t9, ($v1) -/* 04BC9C 8004B09C 8D830000 */ lw $v1, ($t4) -/* 04BCA0 8004B0A0 3C180700 */ lui $t8, 0x700 -/* 04BCA4 8004B0A4 3C0DE600 */ lui $t5, 0xe600 -/* 04BCA8 8004B0A8 246E0008 */ addiu $t6, $v1, 8 -/* 04BCAC 8004B0AC AD8E0000 */ sw $t6, ($t4) -/* 04BCB0 8004B0B0 AC780004 */ sw $t8, 4($v1) -/* 04BCB4 8004B0B4 AC6F0000 */ sw $t7, ($v1) -/* 04BCB8 8004B0B8 8D830000 */ lw $v1, ($t4) -/* 04BCBC 8004B0BC 3C18073F */ lui $t8, (0x073FC000 >> 16) # lui $t8, 0x73f -/* 04BCC0 8004B0C0 3718C000 */ ori $t8, (0x073FC000 & 0xFFFF) # ori $t8, $t8, 0xc000 -/* 04BCC4 8004B0C4 24790008 */ addiu $t9, $v1, 8 -/* 04BCC8 8004B0C8 AD990000 */ sw $t9, ($t4) -/* 04BCCC 8004B0CC AC600004 */ sw $zero, 4($v1) -/* 04BCD0 8004B0D0 AC6D0000 */ sw $t5, ($v1) -/* 04BCD4 8004B0D4 8D830000 */ lw $v1, ($t4) -/* 04BCD8 8004B0D8 3C0FF000 */ lui $t7, 0xf000 -/* 04BCDC 8004B0DC 246E0008 */ addiu $t6, $v1, 8 -/* 04BCE0 8004B0E0 AD8E0000 */ sw $t6, ($t4) -/* 04BCE4 8004B0E4 AC780004 */ sw $t8, 4($v1) -/* 04BCE8 8004B0E8 AC6F0000 */ sw $t7, ($v1) -/* 04BCEC 8004B0EC 8D830000 */ lw $v1, ($t4) -/* 04BCF0 8004B0F0 3C0EE700 */ lui $t6, 0xe700 -/* 04BCF4 8004B0F4 24790008 */ addiu $t9, $v1, 8 -/* 04BCF8 8004B0F8 AD990000 */ sw $t9, ($t4) -/* 04BCFC 8004B0FC AC600004 */ sw $zero, 4($v1) -/* 04BD00 8004B100 AC6E0000 */ sw $t6, ($v1) -/* 04BD04 8004B104 8D830000 */ lw $v1, ($t4) -/* 04BD08 8004B108 3C19BA00 */ lui $t9, (0xBA001301 >> 16) # lui $t9, 0xba00 -/* 04BD0C 8004B10C 37391301 */ ori $t9, (0xBA001301 & 0xFFFF) # ori $t9, $t9, 0x1301 -/* 04BD10 8004B110 246F0008 */ addiu $t7, $v1, 8 -/* 04BD14 8004B114 AD8F0000 */ sw $t7, ($t4) -/* 04BD18 8004B118 AC600004 */ sw $zero, 4($v1) -/* 04BD1C 8004B11C AC6D0000 */ sw $t5, ($v1) -/* 04BD20 8004B120 8D830000 */ lw $v1, ($t4) -/* 04BD24 8004B124 24780008 */ addiu $t8, $v1, 8 -/* 04BD28 8004B128 AD980000 */ sw $t8, ($t4) -/* 04BD2C 8004B12C AC600004 */ sw $zero, 4($v1) -/* 04BD30 8004B130 03E00008 */ jr $ra -/* 04BD34 8004B134 AC790000 */ sw $t9, ($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B138.s b/asm/non_matchings/code_800431B0/func_8004B138.s deleted file mode 100644 index b6d675314..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B138.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8004B138 -/* 04BD38 8004B138 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04BD3C 8004B13C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04BD40 8004B140 8D030000 */ lw $v1, ($t0) -/* 04BD44 8004B144 30A900FF */ andi $t1, $a1, 0xff -/* 04BD48 8004B148 00095400 */ sll $t2, $t1, 0x10 -/* 04BD4C 8004B14C 246E0008 */ addiu $t6, $v1, 8 -/* 04BD50 8004B150 AD0E0000 */ sw $t6, ($t0) -/* 04BD54 8004B154 3C0FFA00 */ lui $t7, 0xfa00 -/* 04BD58 8004B158 0004CE00 */ sll $t9, $a0, 0x18 -/* 04BD5C 8004B15C 30CC00FF */ andi $t4, $a2, 0xff -/* 04BD60 8004B160 000C6A00 */ sll $t5, $t4, 8 -/* 04BD64 8004B164 032A5825 */ or $t3, $t9, $t2 -/* 04BD68 8004B168 AC6F0000 */ sw $t7, ($v1) -/* 04BD6C 8004B16C 30EF00FF */ andi $t7, $a3, 0xff -/* 04BD70 8004B170 016D7025 */ or $t6, $t3, $t5 -/* 04BD74 8004B174 01CFC025 */ or $t8, $t6, $t7 -/* 04BD78 8004B178 03E00008 */ jr $ra -/* 04BD7C 8004B17C AC780004 */ sw $t8, 4($v1) - -/* 04BD80 8004B180 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04BD84 8004B184 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04BD88 8004B188 8D030000 */ lw $v1, ($t0) -/* 04BD8C 8004B18C 30A900FF */ andi $t1, $a1, 0xff -/* 04BD90 8004B190 00095400 */ sll $t2, $t1, 0x10 -/* 04BD94 8004B194 246E0008 */ addiu $t6, $v1, 8 -/* 04BD98 8004B198 AD0E0000 */ sw $t6, ($t0) -/* 04BD9C 8004B19C 3C0FFB00 */ lui $t7, 0xfb00 -/* 04BDA0 8004B1A0 0004CE00 */ sll $t9, $a0, 0x18 -/* 04BDA4 8004B1A4 30CC00FF */ andi $t4, $a2, 0xff -/* 04BDA8 8004B1A8 000C6A00 */ sll $t5, $t4, 8 -/* 04BDAC 8004B1AC 032A5825 */ or $t3, $t9, $t2 -/* 04BDB0 8004B1B0 AC6F0000 */ sw $t7, ($v1) -/* 04BDB4 8004B1B4 30EF00FF */ andi $t7, $a3, 0xff -/* 04BDB8 8004B1B8 016D7025 */ or $t6, $t3, $t5 -/* 04BDBC 8004B1BC 01CFC025 */ or $t8, $t6, $t7 -/* 04BDC0 8004B1C0 03E00008 */ jr $ra -/* 04BDC4 8004B1C4 AC780004 */ sw $t8, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B1C8.s b/asm/non_matchings/code_800431B0/func_8004B1C8.s deleted file mode 100644 index dadc9d6dd..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B1C8.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8004B1C8 -/* 04BDC8 8004B1C8 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04BDCC 8004B1CC 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04BDD0 8004B1D0 8D230000 */ lw $v1, ($t1) -/* 04BDD4 8004B1D4 3C0FFA00 */ lui $t7, 0xfa00 -/* 04BDD8 8004B1D8 30AA00FF */ andi $t2, $a1, 0xff -/* 04BDDC 8004B1DC 246E0008 */ addiu $t6, $v1, 8 -/* 04BDE0 8004B1E0 AD2E0000 */ sw $t6, ($t1) -/* 04BDE4 8004B1E4 AC6F0000 */ sw $t7, ($v1) -/* 04BDE8 8004B1E8 8FB80018 */ lw $t8, 0x18($sp) -/* 04BDEC 8004B1EC 000A5C00 */ sll $t3, $t2, 0x10 -/* 04BDF0 8004B1F0 0004CE00 */ sll $t9, $a0, 0x18 -/* 04BDF4 8004B1F4 30CD00FF */ andi $t5, $a2, 0xff -/* 04BDF8 8004B1F8 000D7200 */ sll $t6, $t5, 8 -/* 04BDFC 8004B1FC 032B6025 */ or $t4, $t9, $t3 -/* 04BE00 8004B200 018E7825 */ or $t7, $t4, $t6 -/* 04BE04 8004B204 330A00FF */ andi $t2, $t8, 0xff -/* 04BE08 8004B208 01EAC825 */ or $t9, $t7, $t2 -/* 04BE0C 8004B20C AC790004 */ sw $t9, 4($v1) -/* 04BE10 8004B210 8D230000 */ lw $v1, ($t1) -/* 04BE14 8004B214 3C0DFB00 */ lui $t5, 0xfb00 -/* 04BE18 8004B218 00077600 */ sll $t6, $a3, 0x18 -/* 04BE1C 8004B21C 246B0008 */ addiu $t3, $v1, 8 -/* 04BE20 8004B220 AD2B0000 */ sw $t3, ($t1) -/* 04BE24 8004B224 AC6D0000 */ sw $t5, ($v1) -/* 04BE28 8004B228 8FB80010 */ lw $t8, 0x10($sp) -/* 04BE2C 8004B22C 8FAB0014 */ lw $t3, 0x14($sp) -/* 04BE30 8004B230 330F00FF */ andi $t7, $t8, 0xff -/* 04BE34 8004B234 000F5400 */ sll $t2, $t7, 0x10 -/* 04BE38 8004B238 316D00FF */ andi $t5, $t3, 0xff -/* 04BE3C 8004B23C 000D6200 */ sll $t4, $t5, 8 -/* 04BE40 8004B240 01CAC825 */ or $t9, $t6, $t2 -/* 04BE44 8004B244 032CC025 */ or $t8, $t9, $t4 -/* 04BE48 8004B248 370F00FF */ ori $t7, $t8, 0xff -/* 04BE4C 8004B24C 03E00008 */ jr $ra -/* 04BE50 8004B250 AC6F0004 */ sw $t7, 4($v1) - -/* 04BE54 8004B254 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04BE58 8004B258 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04BE5C 8004B25C 8D030000 */ lw $v1, ($t0) -/* 04BE60 8004B260 3C0FFC11 */ lui $t7, (0xFC119623 >> 16) # lui $t7, 0xfc11 -/* 04BE64 8004B264 3C18FF2F */ lui $t8, (0xFF2FFFFF >> 16) # lui $t8, 0xff2f -/* 04BE68 8004B268 246E0008 */ addiu $t6, $v1, 8 -/* 04BE6C 8004B26C AD0E0000 */ sw $t6, ($t0) -/* 04BE70 8004B270 3718FFFF */ ori $t8, (0xFF2FFFFF & 0xFFFF) # ori $t8, $t8, 0xffff -/* 04BE74 8004B274 35EF9623 */ ori $t7, (0xFC119623 & 0xFFFF) # ori $t7, $t7, 0x9623 -/* 04BE78 8004B278 AC6F0000 */ sw $t7, ($v1) -/* 04BE7C 8004B27C AC780004 */ sw $t8, 4($v1) -/* 04BE80 8004B280 8D030000 */ lw $v1, ($t0) -/* 04BE84 8004B284 30AC00FF */ andi $t4, $a1, 0xff -/* 04BE88 8004B288 000C6C00 */ sll $t5, $t4, 0x10 -/* 04BE8C 8004B28C 24790008 */ addiu $t9, $v1, 8 -/* 04BE90 8004B290 AD190000 */ sw $t9, ($t0) -/* 04BE94 8004B294 30CF00FF */ andi $t7, $a2, 0xff -/* 04BE98 8004B298 00045E00 */ sll $t3, $a0, 0x18 -/* 04BE9C 8004B29C 016D7025 */ or $t6, $t3, $t5 -/* 04BEA0 8004B2A0 000FC200 */ sll $t8, $t7, 8 -/* 04BEA4 8004B2A4 3C09FA00 */ lui $t1, 0xfa00 -/* 04BEA8 8004B2A8 01D8C825 */ or $t9, $t6, $t8 -/* 04BEAC 8004B2AC AC690000 */ sw $t1, ($v1) -/* 04BEB0 8004B2B0 372900FF */ ori $t1, $t9, 0xff -/* 04BEB4 8004B2B4 03E00008 */ jr $ra -/* 04BEB8 8004B2B8 AC690004 */ sw $t1, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B2BC.s b/asm/non_matchings/code_800431B0/func_8004B2BC.s deleted file mode 100644 index ddf0dfd4d..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B2BC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8004B2BC -/* 04BEBC 8004B2BC 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 04BEC0 8004B2C0 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 04BEC4 8004B2C4 8CC30000 */ lw $v1, ($a2) -/* 04BEC8 8004B2C8 3C0FFC11 */ lui $t7, (0xFC119623 >> 16) # lui $t7, 0xfc11 -/* 04BECC 8004B2CC 3C18FF2F */ lui $t8, (0xFF2FFFFF >> 16) # lui $t8, 0xff2f -/* 04BED0 8004B2D0 246E0008 */ addiu $t6, $v1, 8 -/* 04BED4 8004B2D4 ACCE0000 */ sw $t6, ($a2) -/* 04BED8 8004B2D8 3718FFFF */ ori $t8, (0xFF2FFFFF & 0xFFFF) # ori $t8, $t8, 0xffff -/* 04BEDC 8004B2DC 35EF9623 */ ori $t7, (0xFC119623 & 0xFFFF) # ori $t7, $t7, 0x9623 -/* 04BEE0 8004B2E0 AC6F0000 */ sw $t7, ($v1) -/* 04BEE4 8004B2E4 AC780004 */ sw $t8, 4($v1) -/* 04BEE8 8004B2E8 8CC30000 */ lw $v1, ($a2) -/* 04BEEC 8004B2EC 308900FF */ andi $t1, $a0, 0xff -/* 04BEF0 8004B2F0 2401FF00 */ li $at, -256 -/* 04BEF4 8004B2F4 24790008 */ addiu $t9, $v1, 8 -/* 04BEF8 8004B2F8 ACD90000 */ sw $t9, ($a2) -/* 04BEFC 8004B2FC 01215025 */ or $t2, $t1, $at -/* 04BF00 8004B300 3C08FA00 */ lui $t0, 0xfa00 -/* 04BF04 8004B304 AC680000 */ sw $t0, ($v1) -/* 04BF08 8004B308 03E00008 */ jr $ra -/* 04BF0C 8004B30C AC6A0004 */ sw $t2, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B35C.s b/asm/non_matchings/code_800431B0/func_8004B35C.s deleted file mode 100644 index a4266a9e7..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B35C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8004B35C -/* 04BF5C 8004B35C 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04BF60 8004B360 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04BF64 8004B364 8D230000 */ lw $v1, ($t1) -/* 04BF68 8004B368 3C0FFC11 */ lui $t7, (0xFC119623 >> 16) # lui $t7, 0xfc11 -/* 04BF6C 8004B36C 3C18FF2F */ lui $t8, (0xFF2FFFFF >> 16) # lui $t8, 0xff2f -/* 04BF70 8004B370 246E0008 */ addiu $t6, $v1, 8 -/* 04BF74 8004B374 AD2E0000 */ sw $t6, ($t1) -/* 04BF78 8004B378 3718FFFF */ ori $t8, (0xFF2FFFFF & 0xFFFF) # ori $t8, $t8, 0xffff -/* 04BF7C 8004B37C 35EF9623 */ ori $t7, (0xFC119623 & 0xFFFF) # ori $t7, $t7, 0x9623 -/* 04BF80 8004B380 AC6F0000 */ sw $t7, ($v1) -/* 04BF84 8004B384 AC780004 */ sw $t8, 4($v1) -/* 04BF88 8004B388 8D230000 */ lw $v1, ($t1) -/* 04BF8C 8004B38C 30AD00FF */ andi $t5, $a1, 0xff -/* 04BF90 8004B390 000D7400 */ sll $t6, $t5, 0x10 -/* 04BF94 8004B394 24790008 */ addiu $t9, $v1, 8 -/* 04BF98 8004B398 AD390000 */ sw $t9, ($t1) -/* 04BF9C 8004B39C 30D800FF */ andi $t8, $a2, 0xff -/* 04BFA0 8004B3A0 3C0AFA00 */ lui $t2, 0xfa00 -/* 04BFA4 8004B3A4 00046600 */ sll $t4, $a0, 0x18 -/* 04BFA8 8004B3A8 018E7825 */ or $t7, $t4, $t6 -/* 04BFAC 8004B3AC 0018CA00 */ sll $t9, $t8, 8 -/* 04BFB0 8004B3B0 AC6A0000 */ sw $t2, ($v1) -/* 04BFB4 8004B3B4 01F95025 */ or $t2, $t7, $t9 -/* 04BFB8 8004B3B8 30EB00FF */ andi $t3, $a3, 0xff -/* 04BFBC 8004B3BC 014B6825 */ or $t5, $t2, $t3 -/* 04BFC0 8004B3C0 03E00008 */ jr $ra -/* 04BFC4 8004B3C4 AC6D0004 */ sw $t5, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B3C8.s b/asm/non_matchings/code_800431B0/func_8004B3C8.s deleted file mode 100644 index c273b9bd7..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B3C8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8004B3C8 -/* 04BFC8 8004B3C8 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 04BFCC 8004B3CC 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 04BFD0 8004B3D0 8CC30000 */ lw $v1, ($a2) -/* 04BFD4 8004B3D4 3C0FFCFF */ lui $t7, (0xFCFF97FF >> 16) # lui $t7, 0xfcff -/* 04BFD8 8004B3D8 3C18FF2F */ lui $t8, (0xFF2F7FBF >> 16) # lui $t8, 0xff2f -/* 04BFDC 8004B3DC 246E0008 */ addiu $t6, $v1, 8 -/* 04BFE0 8004B3E0 ACCE0000 */ sw $t6, ($a2) -/* 04BFE4 8004B3E4 37187FBF */ ori $t8, (0xFF2F7FBF & 0xFFFF) # ori $t8, $t8, 0x7fbf -/* 04BFE8 8004B3E8 35EF97FF */ ori $t7, (0xFCFF97FF & 0xFFFF) # ori $t7, $t7, 0x97ff -/* 04BFEC 8004B3EC AC6F0000 */ sw $t7, ($v1) -/* 04BFF0 8004B3F0 AC780004 */ sw $t8, 4($v1) -/* 04BFF4 8004B3F4 8CC30000 */ lw $v1, ($a2) -/* 04BFF8 8004B3F8 3C08FA00 */ lui $t0, 0xfa00 -/* 04BFFC 8004B3FC 308900FF */ andi $t1, $a0, 0xff -/* 04C000 8004B400 24790008 */ addiu $t9, $v1, 8 -/* 04C004 8004B404 ACD90000 */ sw $t9, ($a2) -/* 04C008 8004B408 AC690004 */ sw $t1, 4($v1) -/* 04C00C 8004B40C 03E00008 */ jr $ra -/* 04C010 8004B410 AC680000 */ sw $t0, ($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B414.s b/asm/non_matchings/code_800431B0/func_8004B414.s deleted file mode 100644 index 7a75c45f8..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B414.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8004B414 -/* 04C014 8004B414 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04C018 8004B418 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04C01C 8004B41C 8D230000 */ lw $v1, ($t1) -/* 04C020 8004B420 3C0FFCFF */ lui $t7, (0xFCFF97FF >> 16) # lui $t7, 0xfcff -/* 04C024 8004B424 3C18FF2D */ lui $t8, (0xFF2DFEFF >> 16) # lui $t8, 0xff2d -/* 04C028 8004B428 246E0008 */ addiu $t6, $v1, 8 -/* 04C02C 8004B42C AD2E0000 */ sw $t6, ($t1) -/* 04C030 8004B430 3718FEFF */ ori $t8, (0xFF2DFEFF & 0xFFFF) # ori $t8, $t8, 0xfeff -/* 04C034 8004B434 35EF97FF */ ori $t7, (0xFCFF97FF & 0xFFFF) # ori $t7, $t7, 0x97ff -/* 04C038 8004B438 AC6F0000 */ sw $t7, ($v1) -/* 04C03C 8004B43C AC780004 */ sw $t8, 4($v1) -/* 04C040 8004B440 8D230000 */ lw $v1, ($t1) -/* 04C044 8004B444 30AD00FF */ andi $t5, $a1, 0xff -/* 04C048 8004B448 000D7400 */ sll $t6, $t5, 0x10 -/* 04C04C 8004B44C 24790008 */ addiu $t9, $v1, 8 -/* 04C050 8004B450 AD390000 */ sw $t9, ($t1) -/* 04C054 8004B454 30D800FF */ andi $t8, $a2, 0xff -/* 04C058 8004B458 3C0AFA00 */ lui $t2, 0xfa00 -/* 04C05C 8004B45C 00046600 */ sll $t4, $a0, 0x18 -/* 04C060 8004B460 018E7825 */ or $t7, $t4, $t6 -/* 04C064 8004B464 0018CA00 */ sll $t9, $t8, 8 -/* 04C068 8004B468 AC6A0000 */ sw $t2, ($v1) -/* 04C06C 8004B46C 01F95025 */ or $t2, $t7, $t9 -/* 04C070 8004B470 30EB00FF */ andi $t3, $a3, 0xff -/* 04C074 8004B474 014B6825 */ or $t5, $t2, $t3 -/* 04C078 8004B478 03E00008 */ jr $ra -/* 04C07C 8004B47C AC6D0004 */ sw $t5, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B480.s b/asm/non_matchings/code_800431B0/func_8004B480.s deleted file mode 100644 index 8d03e231d..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B480.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_8004B480 -/* 04C080 8004B480 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04C084 8004B484 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04C088 8004B488 8D030000 */ lw $v1, ($t0) -/* 04C08C 8004B48C 3C0FFCFF */ lui $t7, (0xFCFFFFFF >> 16) # lui $t7, 0xfcff -/* 04C090 8004B490 3C18FFFD */ lui $t8, (0xFFFDF2F9 >> 16) # lui $t8, 0xfffd -/* 04C094 8004B494 246E0008 */ addiu $t6, $v1, 8 -/* 04C098 8004B498 AD0E0000 */ sw $t6, ($t0) -/* 04C09C 8004B49C 3718F2F9 */ ori $t8, (0xFFFDF2F9 & 0xFFFF) # ori $t8, $t8, 0xf2f9 -/* 04C0A0 8004B4A0 35EFFFFF */ ori $t7, (0xFCFFFFFF & 0xFFFF) # ori $t7, $t7, 0xffff -/* 04C0A4 8004B4A4 AC6F0000 */ sw $t7, ($v1) -/* 04C0A8 8004B4A8 AC780004 */ sw $t8, 4($v1) -/* 04C0AC 8004B4AC 8D030000 */ lw $v1, ($t0) -/* 04C0B0 8004B4B0 30AC00FF */ andi $t4, $a1, 0xff -/* 04C0B4 8004B4B4 000C6C00 */ sll $t5, $t4, 0x10 -/* 04C0B8 8004B4B8 24790008 */ addiu $t9, $v1, 8 -/* 04C0BC 8004B4BC AD190000 */ sw $t9, ($t0) -/* 04C0C0 8004B4C0 30CF00FF */ andi $t7, $a2, 0xff -/* 04C0C4 8004B4C4 00045E00 */ sll $t3, $a0, 0x18 -/* 04C0C8 8004B4C8 016D7025 */ or $t6, $t3, $t5 -/* 04C0CC 8004B4CC 000FC200 */ sll $t8, $t7, 8 -/* 04C0D0 8004B4D0 3C09FA00 */ lui $t1, 0xfa00 -/* 04C0D4 8004B4D4 01D8C825 */ or $t9, $t6, $t8 -/* 04C0D8 8004B4D8 AC690000 */ sw $t1, ($v1) -/* 04C0DC 8004B4DC 372900FF */ ori $t1, $t9, 0xff -/* 04C0E0 8004B4E0 03E00008 */ jr $ra -/* 04C0E4 8004B4E4 AC690004 */ sw $t1, 4($v1) - -/* 04C0E8 8004B4E8 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04C0EC 8004B4EC 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04C0F0 8004B4F0 8D230000 */ lw $v1, ($t1) -/* 04C0F4 8004B4F4 3C0FFC62 */ lui $t7, (0xFC627EC4 >> 16) # lui $t7, 0xfc62 -/* 04C0F8 8004B4F8 3C18FFFD */ lui $t8, (0xFFFDF2F9 >> 16) # lui $t8, 0xfffd -/* 04C0FC 8004B4FC 246E0008 */ addiu $t6, $v1, 8 -/* 04C100 8004B500 AD2E0000 */ sw $t6, ($t1) -/* 04C104 8004B504 3718F2F9 */ ori $t8, (0xFFFDF2F9 & 0xFFFF) # ori $t8, $t8, 0xf2f9 -/* 04C108 8004B508 35EF7EC4 */ ori $t7, (0xFC627EC4 & 0xFFFF) # ori $t7, $t7, 0x7ec4 -/* 04C10C 8004B50C AC6F0000 */ sw $t7, ($v1) -/* 04C110 8004B510 AC780004 */ sw $t8, 4($v1) -/* 04C114 8004B514 8D230000 */ lw $v1, ($t1) -/* 04C118 8004B518 30AD00FF */ andi $t5, $a1, 0xff -/* 04C11C 8004B51C 000D7400 */ sll $t6, $t5, 0x10 -/* 04C120 8004B520 24790008 */ addiu $t9, $v1, 8 -/* 04C124 8004B524 AD390000 */ sw $t9, ($t1) -/* 04C128 8004B528 30D800FF */ andi $t8, $a2, 0xff -/* 04C12C 8004B52C 3C0AFA00 */ lui $t2, 0xfa00 -/* 04C130 8004B530 00046600 */ sll $t4, $a0, 0x18 -/* 04C134 8004B534 018E7825 */ or $t7, $t4, $t6 -/* 04C138 8004B538 0018CA00 */ sll $t9, $t8, 8 -/* 04C13C 8004B53C AC6A0000 */ sw $t2, ($v1) -/* 04C140 8004B540 01F95025 */ or $t2, $t7, $t9 -/* 04C144 8004B544 30EB00FF */ andi $t3, $a3, 0xff -/* 04C148 8004B548 014B6825 */ or $t5, $t2, $t3 -/* 04C14C 8004B54C 03E00008 */ jr $ra -/* 04C150 8004B550 AC6D0004 */ sw $t5, 4($v1) - -/* 04C154 8004B554 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 04C158 8004B558 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 04C15C 8004B55C 8CC30000 */ lw $v1, ($a2) -/* 04C160 8004B560 3C0FFCFF */ lui $t7, (0xFCFF97FF >> 16) # lui $t7, 0xfcff -/* 04C164 8004B564 3C18FF2E */ lui $t8, (0xFF2E7F3F >> 16) # lui $t8, 0xff2e -/* 04C168 8004B568 246E0008 */ addiu $t6, $v1, 8 -/* 04C16C 8004B56C ACCE0000 */ sw $t6, ($a2) -/* 04C170 8004B570 37187F3F */ ori $t8, (0xFF2E7F3F & 0xFFFF) # ori $t8, $t8, 0x7f3f -/* 04C174 8004B574 35EF97FF */ ori $t7, (0xFCFF97FF & 0xFFFF) # ori $t7, $t7, 0x97ff -/* 04C178 8004B578 AC6F0000 */ sw $t7, ($v1) -/* 04C17C 8004B57C AC780004 */ sw $t8, 4($v1) -/* 04C180 8004B580 8CC30000 */ lw $v1, ($a2) -/* 04C184 8004B584 308900FF */ andi $t1, $a0, 0xff -/* 04C188 8004B588 2401FF00 */ li $at, -256 -/* 04C18C 8004B58C 24790008 */ addiu $t9, $v1, 8 -/* 04C190 8004B590 ACD90000 */ sw $t9, ($a2) -/* 04C194 8004B594 01215025 */ or $t2, $t1, $at -/* 04C198 8004B598 3C08FA00 */ lui $t0, 0xfa00 -/* 04C19C 8004B59C AC680000 */ sw $t0, ($v1) -/* 04C1A0 8004B5A0 03E00008 */ jr $ra -/* 04C1A4 8004B5A4 AC6A0004 */ sw $t2, 4($v1) - -/* 04C1A8 8004B5A8 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04C1AC 8004B5AC 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04C1B0 8004B5B0 8D230000 */ lw $v1, ($t1) -/* 04C1B4 8004B5B4 30AA00FF */ andi $t2, $a1, 0xff -/* 04C1B8 8004B5B8 000A5C00 */ sll $t3, $t2, 0x10 -/* 04C1BC 8004B5BC 246E0008 */ addiu $t6, $v1, 8 -/* 04C1C0 8004B5C0 AD2E0000 */ sw $t6, ($t1) -/* 04C1C4 8004B5C4 3C0FFA00 */ lui $t7, 0xfa00 -/* 04C1C8 8004B5C8 0004CE00 */ sll $t9, $a0, 0x18 -/* 04C1CC 8004B5CC 30CD00FF */ andi $t5, $a2, 0xff -/* 04C1D0 8004B5D0 000D7200 */ sll $t6, $t5, 8 -/* 04C1D4 8004B5D4 032B6025 */ or $t4, $t9, $t3 -/* 04C1D8 8004B5D8 AC6F0000 */ sw $t7, ($v1) -/* 04C1DC 8004B5DC 018E7825 */ or $t7, $t4, $t6 -/* 04C1E0 8004B5E0 30F800FF */ andi $t8, $a3, 0xff -/* 04C1E4 8004B5E4 01F85025 */ or $t2, $t7, $t8 -/* 04C1E8 8004B5E8 AC6A0004 */ sw $t2, 4($v1) -/* 04C1EC 8004B5EC 8D230000 */ lw $v1, ($t1) -/* 04C1F0 8004B5F0 3C0BFC60 */ lui $t3, (0xFC60FEC1 >> 16) # lui $t3, 0xfc60 -/* 04C1F4 8004B5F4 3C0DAAFD */ lui $t5, (0xAAFDF2F9 >> 16) # lui $t5, 0xaafd -/* 04C1F8 8004B5F8 24790008 */ addiu $t9, $v1, 8 -/* 04C1FC 8004B5FC AD390000 */ sw $t9, ($t1) -/* 04C200 8004B600 35ADF2F9 */ ori $t5, (0xAAFDF2F9 & 0xFFFF) # ori $t5, $t5, 0xf2f9 -/* 04C204 8004B604 356BFEC1 */ ori $t3, (0xFC60FEC1 & 0xFFFF) # ori $t3, $t3, 0xfec1 -/* 04C208 8004B608 AC6B0000 */ sw $t3, ($v1) -/* 04C20C 8004B60C 03E00008 */ jr $ra -/* 04C210 8004B610 AC6D0004 */ sw $t5, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B5A8.s b/asm/non_matchings/code_800431B0/func_8004B5A8.s new file mode 100644 index 000000000..ebd27f734 --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_8004B5A8.s @@ -0,0 +1,28 @@ +glabel func_8004B5A8 +/* 04C1A8 8004B5A8 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 +/* 04C1AC 8004B5AC 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 +/* 04C1B0 8004B5B0 8D230000 */ lw $v1, ($t1) +/* 04C1B4 8004B5B4 30AA00FF */ andi $t2, $a1, 0xff +/* 04C1B8 8004B5B8 000A5C00 */ sll $t3, $t2, 0x10 +/* 04C1BC 8004B5BC 246E0008 */ addiu $t6, $v1, 8 +/* 04C1C0 8004B5C0 AD2E0000 */ sw $t6, ($t1) +/* 04C1C4 8004B5C4 3C0FFA00 */ lui $t7, 0xfa00 +/* 04C1C8 8004B5C8 0004CE00 */ sll $t9, $a0, 0x18 +/* 04C1CC 8004B5CC 30CD00FF */ andi $t5, $a2, 0xff +/* 04C1D0 8004B5D0 000D7200 */ sll $t6, $t5, 8 +/* 04C1D4 8004B5D4 032B6025 */ or $t4, $t9, $t3 +/* 04C1D8 8004B5D8 AC6F0000 */ sw $t7, ($v1) +/* 04C1DC 8004B5DC 018E7825 */ or $t7, $t4, $t6 +/* 04C1E0 8004B5E0 30F800FF */ andi $t8, $a3, 0xff +/* 04C1E4 8004B5E4 01F85025 */ or $t2, $t7, $t8 +/* 04C1E8 8004B5E8 AC6A0004 */ sw $t2, 4($v1) +/* 04C1EC 8004B5EC 8D230000 */ lw $v1, ($t1) +/* 04C1F0 8004B5F0 3C0BFC60 */ lui $t3, (0xFC60FEC1 >> 16) # lui $t3, 0xfc60 +/* 04C1F4 8004B5F4 3C0DAAFD */ lui $t5, (0xAAFDF2F9 >> 16) # lui $t5, 0xaafd +/* 04C1F8 8004B5F8 24790008 */ addiu $t9, $v1, 8 +/* 04C1FC 8004B5FC AD390000 */ sw $t9, ($t1) +/* 04C200 8004B600 35ADF2F9 */ ori $t5, (0xAAFDF2F9 & 0xFFFF) # ori $t5, $t5, 0xf2f9 +/* 04C204 8004B604 356BFEC1 */ ori $t3, (0xFC60FEC1 & 0xFFFF) # ori $t3, $t3, 0xfec1 +/* 04C208 8004B608 AC6B0000 */ sw $t3, ($v1) +/* 04C20C 8004B60C 03E00008 */ jr $ra +/* 04C210 8004B610 AC6D0004 */ sw $t5, 4($v1) diff --git a/asm/non_matchings/code_800431B0/func_8004B950.s b/asm/non_matchings/code_800431B0/func_8004B950.s deleted file mode 100644 index 3976af3e7..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B950.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8004B950 -/* 04C550 8004B950 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04C554 8004B954 8FAE0038 */ lw $t6, 0x38($sp) -/* 04C558 8004B958 AFBF0024 */ sw $ra, 0x24($sp) -/* 04C55C 8004B95C AFA00010 */ sw $zero, 0x10($sp) -/* 04C560 8004B960 AFA00014 */ sw $zero, 0x14($sp) -/* 04C564 8004B964 0C012DF7 */ jal func_8004B7DC -/* 04C568 8004B968 AFAE0018 */ sw $t6, 0x18($sp) -/* 04C56C 8004B96C 8FBF0024 */ lw $ra, 0x24($sp) -/* 04C570 8004B970 27BD0028 */ addiu $sp, $sp, 0x28 -/* 04C574 8004B974 03E00008 */ jr $ra -/* 04C578 8004B978 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004C8D4.s b/asm/non_matchings/code_800431B0/func_8004C8D4.s deleted file mode 100644 index f2e3704c6..000000000 --- a/asm/non_matchings/code_800431B0/func_8004C8D4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8004C8D4 -/* 04D4D4 8004C8D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D4D8 8004C8D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D4DC 8004C8DC AFA40020 */ sw $a0, 0x20($sp) -/* 04D4E0 8004C8E0 AFA50024 */ sw $a1, 0x24($sp) -/* 04D4E4 8004C8E4 00047400 */ sll $t6, $a0, 0x10 -/* 04D4E8 8004C8E8 0005C400 */ sll $t8, $a1, 0x10 -/* 04D4EC 8004C8EC 3C068019 */ lui $a2, %hi(D_8018D1E0) # $a2, 0x8019 -/* 04D4F0 8004C8F0 24080080 */ li $t0, 128 -/* 04D4F4 8004C8F4 00182C03 */ sra $a1, $t8, 0x10 -/* 04D4F8 8004C8F8 000E2403 */ sra $a0, $t6, 0x10 -/* 04D4FC 8004C8FC AFA80010 */ sw $t0, 0x10($sp) -/* 04D500 8004C900 8CC6D1E0 */ lw $a2, %lo(D_8018D1E0)($a2) -/* 04D504 8004C904 0C0131BF */ jal func_8004C6FC -/* 04D508 8004C908 24070100 */ li $a3, 256 -/* 04D50C 8004C90C 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D510 8004C910 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D514 8004C914 03E00008 */ jr $ra -/* 04D518 8004C918 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004C91C.s b/asm/non_matchings/code_800431B0/func_8004C91C.s deleted file mode 100644 index de3053a7f..000000000 --- a/asm/non_matchings/code_800431B0/func_8004C91C.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_8004C91C -/* 04D51C 8004C91C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04D520 8004C920 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 04D524 8004C924 8C620000 */ lw $v0, ($v1) -/* 04D528 8004C928 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04D52C 8004C92C AFBF0024 */ sw $ra, 0x24($sp) -/* 04D530 8004C930 244E0008 */ addiu $t6, $v0, 8 -/* 04D534 8004C934 AC6E0000 */ sw $t6, ($v1) -/* 04D538 8004C938 3C0F0D01 */ lui $t7, %hi(D_0D008108) # $t7, 0xd01 -/* 04D53C 8004C93C 3C0B0600 */ lui $t3, 0x600 -/* 04D540 8004C940 25EF8108 */ addiu $t7, %lo(D_0D008108) # addiu $t7, $t7, -0x7ef8 -/* 04D544 8004C944 AC4F0004 */ sw $t7, 4($v0) -/* 04D548 8004C948 AC4B0000 */ sw $t3, ($v0) -/* 04D54C 8004C94C 8C620000 */ lw $v0, ($v1) -/* 04D550 8004C950 3C190D00 */ lui $t9, %hi(D_0D007EF8) # $t9, 0xd00 -/* 04D554 8004C954 27397EF8 */ addiu $t9, %lo(D_0D007EF8) # addiu $t9, $t9, 0x7ef8 -/* 04D558 8004C958 24580008 */ addiu $t8, $v0, 8 -/* 04D55C 8004C95C AC780000 */ sw $t8, ($v1) -/* 04D560 8004C960 AC590004 */ sw $t9, 4($v0) -/* 04D564 8004C964 AC4B0000 */ sw $t3, ($v0) -/* 04D568 8004C968 8C620000 */ lw $v0, ($v1) -/* 04D56C 8004C96C 3C0DB900 */ lui $t5, (0xB9000002 >> 16) # lui $t5, 0xb900 -/* 04D570 8004C970 35AD0002 */ ori $t5, (0xB9000002 & 0xFFFF) # ori $t5, $t5, 2 -/* 04D574 8004C974 244C0008 */ addiu $t4, $v0, 8 -/* 04D578 8004C978 AC6C0000 */ sw $t4, ($v1) -/* 04D57C 8004C97C 240E0001 */ li $t6, 1 -/* 04D580 8004C980 AC4E0004 */ sw $t6, 4($v0) -/* 04D584 8004C984 AC4D0000 */ sw $t5, ($v0) -/* 04D588 8004C988 8FB8003C */ lw $t8, 0x3c($sp) -/* 04D58C 8004C98C 8FAF0038 */ lw $t7, 0x38($sp) -/* 04D590 8004C990 AFA00018 */ sw $zero, 0x18($sp) -/* 04D594 8004C994 AFB80014 */ sw $t8, 0x14($sp) -/* 04D598 8004C998 0C01309A */ jal func_8004C268 -/* 04D59C 8004C99C AFAF0010 */ sw $t7, 0x10($sp) -/* 04D5A0 8004C9A0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04D5A4 8004C9A4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 04D5A8 8004C9A8 8C620000 */ lw $v0, ($v1) -/* 04D5AC 8004C9AC 3C0D0D00 */ lui $t5, %hi(D_0D007EB8) # $t5, 0xd00 -/* 04D5B0 8004C9B0 25AD7EB8 */ addiu $t5, %lo(D_0D007EB8) # addiu $t5, $t5, 0x7eb8 -/* 04D5B4 8004C9B4 24590008 */ addiu $t9, $v0, 8 -/* 04D5B8 8004C9B8 AC790000 */ sw $t9, ($v1) -/* 04D5BC 8004C9BC 3C0C0600 */ lui $t4, 0x600 -/* 04D5C0 8004C9C0 AC4C0000 */ sw $t4, ($v0) -/* 04D5C4 8004C9C4 AC4D0004 */ sw $t5, 4($v0) -/* 04D5C8 8004C9C8 8FBF0024 */ lw $ra, 0x24($sp) -/* 04D5CC 8004C9CC 27BD0028 */ addiu $sp, $sp, 0x28 -/* 04D5D0 8004C9D0 03E00008 */ jr $ra -/* 04D5D4 8004C9D4 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004C9D8.s b/asm/non_matchings/code_800431B0/func_8004C9D8.s deleted file mode 100644 index 5346ba517..000000000 --- a/asm/non_matchings/code_800431B0/func_8004C9D8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8004C9D8 -/* 04D5D8 8004C9D8 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04D5DC 8004C9DC 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04D5E0 8004C9E0 8D030000 */ lw $v1, ($t0) -/* 04D5E4 8004C9E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04D5E8 8004C9E8 AFBF0024 */ sw $ra, 0x24($sp) -/* 04D5EC 8004C9EC AFA40028 */ sw $a0, 0x28($sp) -/* 04D5F0 8004C9F0 3C180D00 */ lui $t8, %hi(D_0D007F38) # $t8, 0xd00 -/* 04D5F4 8004C9F4 246E0008 */ addiu $t6, $v1, 8 -/* 04D5F8 8004C9F8 AFA5002C */ sw $a1, 0x2c($sp) -/* 04D5FC 8004C9FC AFA70034 */ sw $a3, 0x34($sp) -/* 04D600 8004CA00 AD0E0000 */ sw $t6, ($t0) -/* 04D604 8004CA04 27187F38 */ addiu $t8, %lo(D_0D007F38) # addiu $t8, $t8, 0x7f38 -/* 04D608 8004CA08 3C0F0600 */ lui $t7, 0x600 -/* 04D60C 8004CA0C 00C02025 */ move $a0, $a2 -/* 04D610 8004CA10 AC6F0000 */ sw $t7, ($v1) -/* 04D614 8004CA14 0C012CAF */ jal func_8004B2BC -/* 04D618 8004CA18 AC780004 */ sw $t8, 4($v1) -/* 04D61C 8004CA1C 8FB9003C */ lw $t9, 0x3c($sp) -/* 04D620 8004CA20 8FA90044 */ lw $t1, 0x44($sp) -/* 04D624 8004CA24 240A0001 */ li $t2, 1 -/* 04D628 8004CA28 AFAA0018 */ sw $t2, 0x18($sp) -/* 04D62C 8004CA2C 8FA40028 */ lw $a0, 0x28($sp) -/* 04D630 8004CA30 8FA5002C */ lw $a1, 0x2c($sp) -/* 04D634 8004CA34 8FA60034 */ lw $a2, 0x34($sp) -/* 04D638 8004CA38 8FA70038 */ lw $a3, 0x38($sp) -/* 04D63C 8004CA3C AFB90010 */ sw $t9, 0x10($sp) -/* 04D640 8004CA40 0C01309A */ jal func_8004C268 -/* 04D644 8004CA44 AFA90014 */ sw $t1, 0x14($sp) -/* 04D648 8004CA48 8FBF0024 */ lw $ra, 0x24($sp) -/* 04D64C 8004CA4C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 04D650 8004CA50 03E00008 */ jr $ra -/* 04D654 8004CA54 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004CA58.s b/asm/non_matchings/code_800431B0/func_8004CA58.s deleted file mode 100644 index d45df71df..000000000 --- a/asm/non_matchings/code_800431B0/func_8004CA58.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8004CA58 -/* 04D658 8004CA58 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04D65C 8004CA5C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04D660 8004CA60 8D030000 */ lw $v1, ($t0) -/* 04D664 8004CA64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D668 8004CA68 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D66C 8004CA6C 246E0008 */ addiu $t6, $v1, 8 -/* 04D670 8004CA70 AFA40020 */ sw $a0, 0x20($sp) -/* 04D674 8004CA74 AFA50024 */ sw $a1, 0x24($sp) -/* 04D678 8004CA78 AFA60028 */ sw $a2, 0x28($sp) -/* 04D67C 8004CA7C AD0E0000 */ sw $t6, ($t0) -/* 04D680 8004CA80 3C180D00 */ lui $t8, %hi(D_0D007F78) # $t8, 0xd00 -/* 04D684 8004CA84 27187F78 */ addiu $t8, %lo(D_0D007F78) # addiu $t8, $t8, 0x7f78 -/* 04D688 8004CA88 3C0F0600 */ lui $t7, 0x600 -/* 04D68C 8004CA8C AC6F0000 */ sw $t7, ($v1) -/* 04D690 8004CA90 AC780004 */ sw $t8, 4($v1) -/* 04D694 8004CA94 8FA60034 */ lw $a2, 0x34($sp) -/* 04D698 8004CA98 8FA50030 */ lw $a1, 0x30($sp) -/* 04D69C 8004CA9C 0C010F54 */ jal func_80043D50 -/* 04D6A0 8004CAA0 00E02025 */ move $a0, $a3 -/* 04D6A4 8004CAA4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* 04D6A8 8004CAA8 8FA40020 */ lw $a0, 0x20($sp) -/* 04D6AC 8004CAAC 8FA50024 */ lw $a1, 0x24($sp) -/* 04D6B0 8004CAB0 8FA60030 */ lw $a2, 0x30($sp) -/* 04D6B4 8004CAB4 8FA70034 */ lw $a3, 0x34($sp) -/* 04D6B8 8004CAB8 0C012ECF */ jal func_8004BB3C -/* 04D6BC 8004CABC E7A40010 */ swc1 $f4, 0x10($sp) -/* 04D6C0 8004CAC0 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D6C4 8004CAC4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D6C8 8004CAC8 03E00008 */ jr $ra -/* 04D6CC 8004CACC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004CAD0.s b/asm/non_matchings/code_800431B0/func_8004CAD0.s deleted file mode 100644 index 592e4800c..000000000 --- a/asm/non_matchings/code_800431B0/func_8004CAD0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8004CAD0 -/* 04D6D0 8004CAD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D6D4 8004CAD4 AFA60028 */ sw $a2, 0x28($sp) -/* 04D6D8 8004CAD8 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D6DC 8004CADC AFBF001C */ sw $ra, 0x1c($sp) -/* 04D6E0 8004CAE0 24060008 */ li $a2, 8 -/* 04D6E4 8004CAE4 24070008 */ li $a3, 8 -/* 04D6E8 8004CAE8 0C0130D9 */ jal func_8004C364 -/* 04D6EC 8004CAEC AFAE0010 */ sw $t6, 0x10($sp) -/* 04D6F0 8004CAF0 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D6F4 8004CAF4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D6F8 8004CAF8 03E00008 */ jr $ra -/* 04D6FC 8004CAFC 00000000 */ nop - -/* 04D700 8004CB00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D704 8004CB04 AFA60028 */ sw $a2, 0x28($sp) -/* 04D708 8004CB08 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D70C 8004CB0C AFBF001C */ sw $ra, 0x1c($sp) -/* 04D710 8004CB10 24060008 */ li $a2, 8 -/* 04D714 8004CB14 24070010 */ li $a3, 16 -/* 04D718 8004CB18 0C0130D9 */ jal func_8004C364 -/* 04D71C 8004CB1C AFAE0010 */ sw $t6, 0x10($sp) -/* 04D720 8004CB20 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D724 8004CB24 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D728 8004CB28 03E00008 */ jr $ra -/* 04D72C 8004CB2C 00000000 */ nop - -/* 04D730 8004CB30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D734 8004CB34 AFA60028 */ sw $a2, 0x28($sp) -/* 04D738 8004CB38 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D73C 8004CB3C AFBF001C */ sw $ra, 0x1c($sp) -/* 04D740 8004CB40 24060010 */ li $a2, 16 -/* 04D744 8004CB44 24070010 */ li $a3, 16 -/* 04D748 8004CB48 0C0130D9 */ jal func_8004C364 -/* 04D74C 8004CB4C AFAE0010 */ sw $t6, 0x10($sp) -/* 04D750 8004CB50 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D754 8004CB54 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D758 8004CB58 03E00008 */ jr $ra -/* 04D75C 8004CB5C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004CB90.s b/asm/non_matchings/code_800431B0/func_8004CB90.s deleted file mode 100644 index a310bfcb4..000000000 --- a/asm/non_matchings/code_800431B0/func_8004CB90.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8004CB90 -/* 04D790 8004CB90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D794 8004CB94 AFA60028 */ sw $a2, 0x28($sp) -/* 04D798 8004CB98 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D79C 8004CB9C AFBF001C */ sw $ra, 0x1c($sp) -/* 04D7A0 8004CBA0 24060020 */ li $a2, 32 -/* 04D7A4 8004CBA4 24070010 */ li $a3, 16 -/* 04D7A8 8004CBA8 0C0130D9 */ jal func_8004C364 -/* 04D7AC 8004CBAC AFAE0010 */ sw $t6, 0x10($sp) -/* 04D7B0 8004CBB0 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D7B4 8004CBB4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D7B8 8004CBB8 03E00008 */ jr $ra -/* 04D7BC 8004CBBC 00000000 */ nop - -/* 04D7C0 8004CBC0 44866000 */ mtc1 $a2, $f12 -/* 04D7C4 8004CBC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D7C8 8004CBC8 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D7CC 8004CBCC 240E0020 */ li $t6, 32 -/* 04D7D0 8004CBD0 240F0010 */ li $t7, 16 -/* 04D7D4 8004CBD4 44066000 */ mfc1 $a2, $f12 -/* 04D7D8 8004CBD8 AFAF0014 */ sw $t7, 0x14($sp) -/* 04D7DC 8004CBDC 0C013296 */ jal func_8004CA58 -/* 04D7E0 8004CBE0 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D7E4 8004CBE4 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D7E8 8004CBE8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D7EC 8004CBEC 03E00008 */ jr $ra -/* 04D7F0 8004CBF0 00000000 */ nop - -/* 04D7F4 8004CBF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D7F8 8004CBF8 AFA60028 */ sw $a2, 0x28($sp) -/* 04D7FC 8004CBFC 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D800 8004CC00 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D804 8004CC04 24060020 */ li $a2, 32 -/* 04D808 8004CC08 24070020 */ li $a3, 32 -/* 04D80C 8004CC0C 0C0130D9 */ jal func_8004C364 -/* 04D810 8004CC10 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D814 8004CC14 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D818 8004CC18 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D81C 8004CC1C 03E00008 */ jr $ra -/* 04D820 8004CC20 00000000 */ nop - -/* 04D824 8004CC24 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D828 8004CC28 AFA60028 */ sw $a2, 0x28($sp) -/* 04D82C 8004CC2C 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D830 8004CC30 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D834 8004CC34 24060020 */ li $a2, 32 -/* 04D838 8004CC38 24070020 */ li $a3, 32 -/* 04D83C 8004CC3C 0C01318A */ jal func_8004C628 -/* 04D840 8004CC40 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D844 8004CC44 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D848 8004CC48 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D84C 8004CC4C 03E00008 */ jr $ra -/* 04D850 8004CC50 00000000 */ nop - -/* 04D854 8004CC54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D858 8004CC58 AFA60028 */ sw $a2, 0x28($sp) -/* 04D85C 8004CC5C 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D860 8004CC60 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D864 8004CC64 24060028 */ li $a2, 40 -/* 04D868 8004CC68 24070020 */ li $a3, 32 -/* 04D86C 8004CC6C 0C0130D9 */ jal func_8004C364 -/* 04D870 8004CC70 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D874 8004CC74 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D878 8004CC78 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D87C 8004CC7C 03E00008 */ jr $ra -/* 04D880 8004CC80 00000000 */ nop - -/* 04D884 8004CC84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D888 8004CC88 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D88C 8004CC8C 240E0030 */ li $t6, 48 -/* 04D890 8004CC90 240F0018 */ li $t7, 24 -/* 04D894 8004CC94 AFAF0014 */ sw $t7, 0x14($sp) -/* 04D898 8004CC98 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D89C 8004CC9C 0C013247 */ jal func_8004C91C -/* 04D8A0 8004CCA0 24070030 */ li $a3, 48 -/* 04D8A4 8004CCA4 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D8A8 8004CCA8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D8AC 8004CCAC 03E00008 */ jr $ra -/* 04D8B0 8004CCB0 00000000 */ nop - -/* 04D8B4 8004CCB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D8B8 8004CCB8 AFA60028 */ sw $a2, 0x28($sp) -/* 04D8BC 8004CCBC 8FAE0028 */ lw $t6, 0x28($sp) -/* 04D8C0 8004CCC0 AFBF001C */ sw $ra, 0x1c($sp) -/* 04D8C4 8004CCC4 24060040 */ li $a2, 64 -/* 04D8C8 8004CCC8 24070020 */ li $a3, 32 -/* 04D8CC 8004CCCC 0C0130D9 */ jal func_8004C364 -/* 04D8D0 8004CCD0 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D8D4 8004CCD4 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D8D8 8004CCD8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D8DC 8004CCDC 03E00008 */ jr $ra -/* 04D8E0 8004CCE0 00000000 */ nop - -/* 04D8E4 8004CCE4 44866000 */ mtc1 $a2, $f12 -/* 04D8E8 8004CCE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D8EC 8004CCEC AFBF001C */ sw $ra, 0x1c($sp) -/* 04D8F0 8004CCF0 240E0040 */ li $t6, 64 -/* 04D8F4 8004CCF4 240F0020 */ li $t7, 32 -/* 04D8F8 8004CCF8 44066000 */ mfc1 $a2, $f12 -/* 04D8FC 8004CCFC AFAF0014 */ sw $t7, 0x14($sp) -/* 04D900 8004CD00 0C013296 */ jal func_8004CA58 -/* 04D904 8004CD04 AFAE0010 */ sw $t6, 0x10($sp) -/* 04D908 8004CD08 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D90C 8004CD0C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D910 8004CD10 03E00008 */ jr $ra -/* 04D914 8004CD14 00000000 */ nop - -/* 04D918 8004CD18 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04D91C 8004CD1C AFBF001C */ sw $ra, 0x1c($sp) -/* 04D920 8004CD20 240E0040 */ li $t6, 64 -/* 04D924 8004CD24 240F0020 */ li $t7, 32 -/* 04D928 8004CD28 AFAF0014 */ sw $t7, 0x14($sp) -/* 04D92C 8004CD2C AFAE0010 */ sw $t6, 0x10($sp) -/* 04D930 8004CD30 0C013247 */ jal func_8004C91C -/* 04D934 8004CD34 24070040 */ li $a3, 64 -/* 04D938 8004CD38 8FBF001C */ lw $ra, 0x1c($sp) -/* 04D93C 8004CD3C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04D940 8004CD40 03E00008 */ jr $ra -/* 04D944 8004CD44 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004EB30.s b/asm/non_matchings/code_800431B0/func_8004EB30.s deleted file mode 100644 index 3fdb4d48b..000000000 --- a/asm/non_matchings/code_800431B0/func_8004EB30.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_8004EB30 -/* 04F730 8004EB30 03E00008 */ jr $ra -/* 04F734 8004EB34 AFA40000 */ sw $a0, ($sp) diff --git a/asm/non_matchings/code_800431B0/func_8004F950.s b/asm/non_matchings/code_800431B0/func_8004F950.s deleted file mode 100644 index bba3f273e..000000000 --- a/asm/non_matchings/code_800431B0/func_8004F950.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8004F950 -/* 050550 8004F950 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 050554 8004F954 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 050558 8004F958 8D030000 */ lw $v1, ($t0) -/* 05055C 8004F95C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 050560 8004F960 AFBF0014 */ sw $ra, 0x14($sp) -/* 050564 8004F964 AFA40018 */ sw $a0, 0x18($sp) -/* 050568 8004F968 3C180D00 */ lui $t8, %hi(D_0D007F38) # $t8, 0xd00 -/* 05056C 8004F96C 246E0008 */ addiu $t6, $v1, 8 -/* 050570 8004F970 AFA5001C */ sw $a1, 0x1c($sp) -/* 050574 8004F974 AFA70024 */ sw $a3, 0x24($sp) -/* 050578 8004F978 AD0E0000 */ sw $t6, ($t0) -/* 05057C 8004F97C 27187F38 */ addiu $t8, %lo(D_0D007F38) # addiu $t8, $t8, 0x7f38 -/* 050580 8004F980 3C0F0600 */ lui $t7, 0x600 -/* 050584 8004F984 00C02025 */ move $a0, $a2 -/* 050588 8004F988 AC6F0000 */ sw $t7, ($v1) -/* 05058C 8004F98C 0C012CAF */ jal func_8004B2BC -/* 050590 8004F990 AC780004 */ sw $t8, 4($v1) -/* 050594 8004F994 3C040D01 */ lui $a0, %hi(D_0D00C558) # $a0, 0xd01 -/* 050598 8004F998 2484C558 */ addiu $a0, %lo(D_0D00C558) # addiu $a0, $a0, -0x3aa8 -/* 05059C 8004F99C 24050068 */ li $a1, 104 -/* 0505A0 8004F9A0 0C010F54 */ jal func_80043D50 -/* 0505A4 8004F9A4 24060010 */ li $a2, 16 -/* 0505A8 8004F9A8 0C013DB4 */ jal func_8004F6D0 -/* 0505AC 8004F9AC 8FA40024 */ lw $a0, 0x24($sp) -/* 0505B0 8004F9B0 8FA40018 */ lw $a0, 0x18($sp) -/* 0505B4 8004F9B4 0C013E33 */ jal func_8004F8CC -/* 0505B8 8004F9B8 8FA5001C */ lw $a1, 0x1c($sp) -/* 0505BC 8004F9BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0505C0 8004F9C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0505C4 8004F9C4 03E00008 */ jr $ra -/* 0505C8 8004F9C8 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004F9CC.s b/asm/non_matchings/code_800431B0/func_8004F9CC.s deleted file mode 100644 index d85e2bc51..000000000 --- a/asm/non_matchings/code_800431B0/func_8004F9CC.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8004F9CC -/* 0505CC 8004F9CC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0505D0 8004F9D0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0505D4 8004F9D4 8D030000 */ lw $v1, ($t0) -/* 0505D8 8004F9D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0505DC 8004F9DC AFBF0024 */ sw $ra, 0x24($sp) -/* 0505E0 8004F9E0 246E0008 */ addiu $t6, $v1, 8 -/* 0505E4 8004F9E4 AFA40028 */ sw $a0, 0x28($sp) -/* 0505E8 8004F9E8 AFA5002C */ sw $a1, 0x2c($sp) -/* 0505EC 8004F9EC AFA60030 */ sw $a2, 0x30($sp) -/* 0505F0 8004F9F0 AD0E0000 */ sw $t6, ($t0) -/* 0505F4 8004F9F4 3C180D00 */ lui $t8, %hi(D_0D007F38) # $t8, 0xd00 -/* 0505F8 8004F9F8 27187F38 */ addiu $t8, %lo(D_0D007F38) # addiu $t8, $t8, 0x7f38 -/* 0505FC 8004F9FC 3C0F0600 */ lui $t7, 0x600 -/* 050600 8004FA00 AC6F0000 */ sw $t7, ($v1) -/* 050604 8004FA04 AC780004 */ sw $t8, 4($v1) -/* 050608 8004FA08 3C068016 */ lui $a2, %hi(D_801656E0) # $a2, 0x8016 -/* 05060C 8004FA0C 3C058016 */ lui $a1, %hi(D_801656D0) # $a1, 0x8016 -/* 050610 8004FA10 3C048016 */ lui $a0, %hi(D_801656C0) # $a0, 0x8016 -/* 050614 8004FA14 24190080 */ li $t9, 128 -/* 050618 8004FA18 24090080 */ li $t1, 128 -/* 05061C 8004FA1C 240A00FF */ li $t2, 255 -/* 050620 8004FA20 AFAA0018 */ sw $t2, 0x18($sp) -/* 050624 8004FA24 AFA90014 */ sw $t1, 0x14($sp) -/* 050628 8004FA28 AFB90010 */ sw $t9, 0x10($sp) -/* 05062C 8004FA2C 948456C0 */ lhu $a0, %lo(D_801656C0)($a0) -/* 050630 8004FA30 94A556D0 */ lhu $a1, %lo(D_801656D0)($a1) -/* 050634 8004FA34 94C656E0 */ lhu $a2, %lo(D_801656E0)($a2) -/* 050638 8004FA38 0C012D85 */ jal func_8004B614 -/* 05063C 8004FA3C 24070080 */ li $a3, 128 -/* 050640 8004FA40 3C040D01 */ lui $a0, %hi(D_0D00C558) # $a0, 0xd01 -/* 050644 8004FA44 2484C558 */ addiu $a0, %lo(D_0D00C558) # addiu $a0, $a0, -0x3aa8 -/* 050648 8004FA48 24050068 */ li $a1, 104 -/* 05064C 8004FA4C 0C010F54 */ jal func_80043D50 -/* 050650 8004FA50 24060010 */ li $a2, 16 -/* 050654 8004FA54 0C013DB4 */ jal func_8004F6D0 -/* 050658 8004FA58 8FA40030 */ lw $a0, 0x30($sp) -/* 05065C 8004FA5C 8FA40028 */ lw $a0, 0x28($sp) -/* 050660 8004FA60 0C013E33 */ jal func_8004F8CC -/* 050664 8004FA64 8FA5002C */ lw $a1, 0x2c($sp) -/* 050668 8004FA68 8FBF0024 */ lw $ra, 0x24($sp) -/* 05066C 8004FA6C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 050670 8004FA70 03E00008 */ jr $ra -/* 050674 8004FA74 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004FC78.s b/asm/non_matchings/code_800431B0/func_8004FC78.s deleted file mode 100644 index 49803f830..000000000 --- a/asm/non_matchings/code_800431B0/func_8004FC78.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_8004FC78 -/* 050878 8004FC78 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 05087C 8004FC7C AFB00028 */ sw $s0, 0x28($sp) -/* 050880 8004FC80 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 050884 8004FC84 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 050888 8004FC88 8E020000 */ lw $v0, ($s0) -/* 05088C 8004FC8C AFBF002C */ sw $ra, 0x2c($sp) -/* 050890 8004FC90 AFA40030 */ sw $a0, 0x30($sp) -/* 050894 8004FC94 244E0008 */ addiu $t6, $v0, 8 -/* 050898 8004FC98 AFA50034 */ sw $a1, 0x34($sp) -/* 05089C 8004FC9C AFA60038 */ sw $a2, 0x38($sp) -/* 0508A0 8004FCA0 AE0E0000 */ sw $t6, ($s0) -/* 0508A4 8004FCA4 3C0F0D01 */ lui $t7, %hi(D_0D008108) # $t7, 0xd01 -/* 0508A8 8004FCA8 3C090600 */ lui $t1, 0x600 -/* 0508AC 8004FCAC 25EF8108 */ addiu $t7, %lo(D_0D008108) # addiu $t7, $t7, -0x7ef8 -/* 0508B0 8004FCB0 AC4F0004 */ sw $t7, 4($v0) -/* 0508B4 8004FCB4 AC490000 */ sw $t1, ($v0) -/* 0508B8 8004FCB8 8E020000 */ lw $v0, ($s0) -/* 0508BC 8004FCBC 3C190D00 */ lui $t9, %hi(D_0D007EF8) # $t9, 0xd00 -/* 0508C0 8004FCC0 27397EF8 */ addiu $t9, %lo(D_0D007EF8) # addiu $t9, $t9, 0x7ef8 -/* 0508C4 8004FCC4 24580008 */ addiu $t8, $v0, 8 -/* 0508C8 8004FCC8 AE180000 */ sw $t8, ($s0) -/* 0508CC 8004FCCC AC590004 */ sw $t9, 4($v0) -/* 0508D0 8004FCD0 AC490000 */ sw $t1, ($v0) -/* 0508D4 8004FCD4 8E020000 */ lw $v0, ($s0) -/* 0508D8 8004FCD8 3C0BB900 */ lui $t3, (0xB9000002 >> 16) # lui $t3, 0xb900 -/* 0508DC 8004FCDC 356B0002 */ ori $t3, (0xB9000002 & 0xFFFF) # ori $t3, $t3, 2 -/* 0508E0 8004FCE0 244A0008 */ addiu $t2, $v0, 8 -/* 0508E4 8004FCE4 AE0A0000 */ sw $t2, ($s0) -/* 0508E8 8004FCE8 240C0001 */ li $t4, 1 -/* 0508EC 8004FCEC 3C040D01 */ lui $a0, %hi(D_0D00AB58) # $a0, 0xd01 -/* 0508F0 8004FCF0 2484AB58 */ addiu $a0, %lo(D_0D00AB58) # addiu $a0, $a0, -0x54a8 -/* 0508F4 8004FCF4 24060008 */ li $a2, 8 -/* 0508F8 8004FCF8 24050020 */ li $a1, 32 -/* 0508FC 8004FCFC AC4C0004 */ sw $t4, 4($v0) -/* 050900 8004FD00 0C010F54 */ jal func_80043D50 -/* 050904 8004FD04 AC4B0000 */ sw $t3, ($v0) -/* 050908 8004FD08 83AD003B */ lb $t5, 0x3b($sp) -/* 05090C 8004FD0C 87A40032 */ lh $a0, 0x32($sp) -/* 050910 8004FD10 87A50036 */ lh $a1, 0x36($sp) -/* 050914 8004FD14 000D70C0 */ sll $t6, $t5, 3 -/* 050918 8004FD18 AFAE0010 */ sw $t6, 0x10($sp) -/* 05091C 8004FD1C 24060008 */ li $a2, 8 -/* 050920 8004FD20 24070008 */ li $a3, 8 -/* 050924 8004FD24 AFA00014 */ sw $zero, 0x14($sp) -/* 050928 8004FD28 0C012EA6 */ jal func_8004BA98 -/* 05092C 8004FD2C AFA00018 */ sw $zero, 0x18($sp) -/* 050930 8004FD30 87A40032 */ lh $a0, 0x32($sp) -/* 050934 8004FD34 240F0018 */ li $t7, 24 -/* 050938 8004FD38 AFAF0010 */ sw $t7, 0x10($sp) -/* 05093C 8004FD3C 87A50036 */ lh $a1, 0x36($sp) -/* 050940 8004FD40 24060008 */ li $a2, 8 -/* 050944 8004FD44 24070008 */ li $a3, 8 -/* 050948 8004FD48 AFA00014 */ sw $zero, 0x14($sp) -/* 05094C 8004FD4C AFA00018 */ sw $zero, 0x18($sp) -/* 050950 8004FD50 0C012EA6 */ jal func_8004BA98 -/* 050954 8004FD54 24840008 */ addiu $a0, $a0, 8 -/* 050958 8004FD58 87A40032 */ lh $a0, 0x32($sp) -/* 05095C 8004FD5C 24180010 */ li $t8, 16 -/* 050960 8004FD60 AFB80010 */ sw $t8, 0x10($sp) -/* 050964 8004FD64 87A50036 */ lh $a1, 0x36($sp) -/* 050968 8004FD68 24060008 */ li $a2, 8 -/* 05096C 8004FD6C 24070008 */ li $a3, 8 -/* 050970 8004FD70 AFA00014 */ sw $zero, 0x14($sp) -/* 050974 8004FD74 AFA00018 */ sw $zero, 0x18($sp) -/* 050978 8004FD78 0C012EA6 */ jal func_8004BA98 -/* 05097C 8004FD7C 24840010 */ addiu $a0, $a0, 0x10 -/* 050980 8004FD80 8E020000 */ lw $v0, ($s0) -/* 050984 8004FD84 3C0B0D00 */ lui $t3, %hi(D_0D007EB8) # $t3, 0xd00 -/* 050988 8004FD88 256B7EB8 */ addiu $t3, %lo(D_0D007EB8) # addiu $t3, $t3, 0x7eb8 -/* 05098C 8004FD8C 24590008 */ addiu $t9, $v0, 8 -/* 050990 8004FD90 AE190000 */ sw $t9, ($s0) -/* 050994 8004FD94 3C0A0600 */ lui $t2, 0x600 -/* 050998 8004FD98 AC4A0000 */ sw $t2, ($v0) -/* 05099C 8004FD9C AC4B0004 */ sw $t3, 4($v0) -/* 0509A0 8004FDA0 8FBF002C */ lw $ra, 0x2c($sp) -/* 0509A4 8004FDA4 8FB00028 */ lw $s0, 0x28($sp) -/* 0509A8 8004FDA8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0509AC 8004FDAC 03E00008 */ jr $ra -/* 0509B0 8004FDB0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/print_timer.s b/asm/non_matchings/code_800431B0/print_timer.s deleted file mode 100644 index 9d3505f52..000000000 --- a/asm/non_matchings/code_800431B0/print_timer.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel print_timer -/* 0503F4 8004F7F4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0503F8 8004F7F8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0503FC 8004F7FC 8C620000 */ lw $v0, ($v1) -/* 050400 8004F800 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 050404 8004F804 AFBF0014 */ sw $ra, 0x14($sp) -/* 050408 8004F808 244E0008 */ addiu $t6, $v0, 8 -/* 05040C 8004F80C AFA40018 */ sw $a0, 0x18($sp) -/* 050410 8004F810 AFA5001C */ sw $a1, 0x1c($sp) -/* 050414 8004F814 AFA60020 */ sw $a2, 0x20($sp) -/* 050418 8004F818 AC6E0000 */ sw $t6, ($v1) -/* 05041C 8004F81C 3C0F0D01 */ lui $t7, %hi(D_0D008108) # $t7, 0xd01 -/* 050420 8004F820 3C0A0600 */ lui $t2, 0x600 -/* 050424 8004F824 25EF8108 */ addiu $t7, %lo(D_0D008108) # addiu $t7, $t7, -0x7ef8 -/* 050428 8004F828 AC4F0004 */ sw $t7, 4($v0) -/* 05042C 8004F82C AC4A0000 */ sw $t2, ($v0) -/* 050430 8004F830 8C620000 */ lw $v0, ($v1) -/* 050434 8004F834 3C190D00 */ lui $t9, %hi(D_0D007EF8) # $t9, 0xd00 -/* 050438 8004F838 27397EF8 */ addiu $t9, %lo(D_0D007EF8) # addiu $t9, $t9, 0x7ef8 -/* 05043C 8004F83C 24580008 */ addiu $t8, $v0, 8 -/* 050440 8004F840 AC780000 */ sw $t8, ($v1) -/* 050444 8004F844 AC590004 */ sw $t9, 4($v0) -/* 050448 8004F848 AC4A0000 */ sw $t2, ($v0) -/* 05044C 8004F84C 8C620000 */ lw $v0, ($v1) -/* 050450 8004F850 3C0CB900 */ lui $t4, (0xB9000002 >> 16) # lui $t4, 0xb900 -/* 050454 8004F854 358C0002 */ ori $t4, (0xB9000002 & 0xFFFF) # ori $t4, $t4, 2 -/* 050458 8004F858 244B0008 */ addiu $t3, $v0, 8 -/* 05045C 8004F85C AC6B0000 */ sw $t3, ($v1) -/* 050460 8004F860 240D0001 */ li $t5, 1 -/* 050464 8004F864 3C040D01 */ lui $a0, %hi(D_0D00C558) # $a0, 0xd01 -/* 050468 8004F868 2484C558 */ addiu $a0, %lo(D_0D00C558) # addiu $a0, $a0, -0x3aa8 -/* 05046C 8004F86C 24060010 */ li $a2, 16 -/* 050470 8004F870 24050068 */ li $a1, 104 -/* 050474 8004F874 AC4D0004 */ sw $t5, 4($v0) -/* 050478 8004F878 0C010F54 */ jal func_80043D50 -/* 05047C 8004F87C AC4C0000 */ sw $t4, ($v0) -/* 050480 8004F880 0C013DB4 */ jal func_8004F6D0 -/* 050484 8004F884 8FA40020 */ lw $a0, 0x20($sp) -/* 050488 8004F888 8FA40018 */ lw $a0, 0x18($sp) -/* 05048C 8004F88C 0C013DDD */ jal func_8004F774 -/* 050490 8004F890 8FA5001C */ lw $a1, 0x1c($sp) -/* 050494 8004F894 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 050498 8004F898 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 05049C 8004F89C 8C620000 */ lw $v0, ($v1) -/* 0504A0 8004F8A0 3C180D00 */ lui $t8, %hi(D_0D007EB8) # $t8, 0xd00 -/* 0504A4 8004F8A4 27187EB8 */ addiu $t8, %lo(D_0D007EB8) # addiu $t8, $t8, 0x7eb8 -/* 0504A8 8004F8A8 244E0008 */ addiu $t6, $v0, 8 -/* 0504AC 8004F8AC AC6E0000 */ sw $t6, ($v1) -/* 0504B0 8004F8B0 3C0F0600 */ lui $t7, 0x600 -/* 0504B4 8004F8B4 AC4F0000 */ sw $t7, ($v0) -/* 0504B8 8004F8B8 AC580004 */ sw $t8, 4($v0) -/* 0504BC 8004F8BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0504C0 8004F8C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0504C4 8004F8C4 03E00008 */ jr $ra -/* 0504C8 8004F8C8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800594F0.s b/asm/non_matchings/code_80057C60/func_800594F0.s deleted file mode 100644 index 05024b361..000000000 --- a/asm/non_matchings/code_80057C60/func_800594F0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_800594F0 -/* 05A0F0 800594F0 03E00008 */ jr $ra -/* 05A0F4 800594F4 00000000 */ nop diff --git a/asm/non_matchings/memory/func_802A7D1C.s b/asm/non_matchings/memory/func_802A7D1C.s deleted file mode 100644 index c42efeeed..000000000 --- a/asm/non_matchings/memory/func_802A7D1C.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_802A7D54 -/* 111364 802A7D54 3C0F8015 */ lui $t7, %hi(D_80150158) # $t7, 0x8015 -/* 111368 802A7D58 25EF0158 */ addiu $t7, %lo(D_80150158) # addiu $t7, $t7, 0x158 -/* 11136C 802A7D5C 00047100 */ sll $t6, $a0, 4 -/* 111370 802A7D60 01CF1021 */ addu $v0, $t6, $t7 -/* 111374 802A7D64 A4440000 */ sh $a0, ($v0) -/* 111378 802A7D68 03E00008 */ jr $ra -/* 11137C 802A7D6C AC450008 */ sw $a1, 8($v0) diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 72d3abe65..619a74b8a 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -631,28 +631,26 @@ void func_8004477C(s32 arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004477C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -// +#ifdef NON_MATCHING void func_80044924(s8 *image, s32 width, s32 arg2) { - s32 a; + // s32 a; s32 temp_t3; - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, width, image); + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, image); gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); gDPLoadSync(gDisplayListHead++); - - temp_t3 = (((width * arg2) + 3) >> 2) - 1; - + //temp_t3 = (((width * arg2) + 3) >> 2) - 1; +/* if (temp_t3 < 0x7FF) { a = temp_t3; } else { a = 0x7FF; } - - gDPLoadBlock(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, a, ((width / 16) + 0x7FF) / (width / 16)); +*/ + temp_t3 = (((width * arg2) + 3) >> 2) - 1; + gDPLoadBlock(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, MIN(temp_t3, 0x7FF), ((width / 16) + 0x7FF) / (width / 16)); gDPPipeSync(gDisplayListHead++); gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_4b, ((((width * 2) + 7) >> 3) << 9), 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (width - 1) << 0x2, (arg2 - 1) << 0x2); @@ -663,7 +661,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044924.s") //gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, 0x00000000); //gDPLoadTile(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, 0, 0); -/* +#ifdef NON_MATCHING UNUSED void func_80044AB8(s8 *image, s32 width, s32 arg2) { gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, width, image); gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, (((width >> 1) + 7) >> 3), 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); @@ -673,9 +671,10 @@ UNUSED void func_80044AB8(s8 *image, s32 width, s32 arg2) { gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_4b, (((width >> 1) + 7) >> 3), 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, ((width - 1) * 2) << 0x2, (arg2 - 1) << 0x2); } -*/ +#else //gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_4b, 0, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044AB8.s") +#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -1517,12 +1516,12 @@ UNUSED void func_80046544(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 } extern Gfx D_0D0079E8[]; - +void func_8004B2BC(s32); void func_800465B8(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042330(arg0, arg1, arg2, arg3); gSPDisplayList(gDisplayListHead++, D_0D0079E8); - func_8004B2BC(arg4, &gDisplayListHead); + func_8004B2BC(arg4); func_80045E10(arg5, arg6, arg7, arg8, argA); } extern Gfx D_0D007948[]; @@ -2016,7 +2015,7 @@ extern Gfx D_0D007DB8[]; void func_80047B9C(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB) { func_80042330(arg0, arg1, arg2, arg3); gSPDisplayList(gDisplayListHead++, D_0D007DB8); - func_8004B2BC(arg4, &gDisplayListHead); + func_8004B2BC(arg4); func_80047068(arg5, arg6, arg7, arg8, arg9, argA, argB); } extern Gfx D_0D007DD8[]; @@ -2024,7 +2023,7 @@ extern Gfx D_0D007DD8[]; UNUSED func_80047C28(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB) { func_80042330(arg0, arg1, arg2, arg3); gSPDisplayList(gDisplayListHead++, D_0D007DD8); - func_8004B2BC(arg4, &gDisplayListHead); + func_8004B2BC(arg4); func_80047270(arg5, arg6, arg7, arg8, arg9, argA, argB); } @@ -2033,7 +2032,7 @@ extern Gfx D_0D007E38[]; void func_80047CB4(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB) { func_80042330(arg0, arg1, arg2, arg3); gSPDisplayList(gDisplayListHead++, D_0D007E38); - func_8004B2BC(arg4, &gDisplayListHead); + func_8004B2BC(arg4); func_80047068(arg5, arg6, arg7, arg8, arg9, argA, argB); } @@ -2042,7 +2041,7 @@ extern Gfx D_0D007E58[]; UNUSED void func_80047D40(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB) { func_80042330(arg0, arg1, arg2, arg3); gSPDisplayList(gDisplayListHead++, D_0D007E58); - func_8004B2BC(arg4, &gDisplayListHead); + func_8004B2BC(arg4); func_80047270(arg5, arg6, arg7, arg8, arg9, argA, argB); } @@ -2066,10 +2065,6 @@ UNUSED void func_80047EC4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 func_80047068(arg3, arg4, arg5, arg6, arg7, arg8, arg9); } -//#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80042E00(?, ?); // extern -//? func_80047270(s32, s32, s32, s32, s32, s32, s32); // extern extern Gfx D_0D007D38[]; @@ -2100,11 +2095,6 @@ void func_800480B4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s func_80047270(arg3, arg4, arg5, arg6, arg7, arg8, arg9); } -//#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80042E00(?, ?); // extern -//? func_8004747C(s32, s32, s32, s32, s32, s32, s32, s32); // extern - void func_80048130(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007D78); @@ -2120,36 +2110,30 @@ UNUSED void func_800481B4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 UNUSED void func_80048228(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007DB8); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); } void func_800482AC(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007DD8); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } UNUSED void func_80048330(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007E38); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -//#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80042E00(?, ?); // extern -//? func_80047270(s32, s32, s32, s32, s32, s32, s32); // extern -//? func_8004B2BC(s32, void **); // extern extern Gfx D_0D007E58[]; - void func_800483B4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007E58); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } @@ -2157,7 +2141,7 @@ extern Gfx D_0D007DF8[]; void func_80048438(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007DF8); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); } @@ -2166,7 +2150,7 @@ extern Gfx D_0D007E18[]; void func_800484BC(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007E18); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } @@ -2176,7 +2160,7 @@ extern Gfx D_0D007E98[]; void func_80048540(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007E98); - func_8004B2BC(arg3, &gDisplayListHead); + func_8004B2BC(arg3); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } @@ -2712,224 +2696,167 @@ void func_80049970(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049970.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80048F8C(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A40; +extern Gfx D_0D007A40[]; -void func_80049B20(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A40; +void func_80049B20(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); func_80048F8C(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049B20.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_800492D4(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A40; +UNUSED func_80049B9C(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); + func_80049130(arg4, arg5, arg6, arg7, arg8, arg9); +} - -void func_80049C18(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A40; +void func_80049C18(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); func_800492D4(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049C18.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_800492D4(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A60; +extern Gfx D_0D007A60[]; - -void func_80049C94(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A60; +void func_80049C94(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A60); func_800492D4(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049C94.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_800492D4(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A80; +extern Gfx D_0D007A80[]; - -void func_80049D10(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A80; +void func_80049D10(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A80); func_800492D4(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049D10.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_800492D4(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007AA0; +extern Gfx D_0D007AA0[]; - -void func_80049D8C(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007AA0; +void func_80049D8C(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007AA0); func_800492D4(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049D8C.s") -#endif +void func_8004B35C(s32,s32,s32,s32); +UNUSED void func_80049E08(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); + func_8004B35C(arg4, arg5, arg6, arg7); + func_800492D4(arg8, arg9, argA, argB, argC, argD); +} -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_8004961C(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A40; +UNUSED void func_80049E98(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A60); + func_8004B35C(arg4, arg5, arg6, arg7); + func_800492D4(arg8, arg9, argA, argB, argC, argD); +} +extern Gfx D_0D007B00[]; -void func_8004A0B0(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; +UNUSED void func_80049F28(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007B00); + func_8004B35C(arg4, arg5, arg6, arg7); + func_800492D4(arg8, arg9, argA, argB, argC, argD); +} - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A40; +UNUSED void func_80049FB8(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); + func_80049478(arg4, arg5, arg6, arg7, arg8, arg9); +} + +UNUSED void func_8004A034(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A60); + func_80049478(arg4, arg5, arg6, arg7, arg8, arg9); +} + +extern Gfx D_0D007A40[]; + +void func_8004A0B0(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); func_8004961C(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A0B0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80049970(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A60; +UNUSED void func_8004A12C(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A60); + func_8004B35C(arg4, arg5, arg6, arg7); + func_8004961C(arg8, arg9, argA, argB, argC, argD); +} +UNUSED void func_8004A1BC(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - -void func_8004A258(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v0; - void *temp_v0_2; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0x6000000; - temp_v0->unk4 = &D_0D007A60; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = -0xC07; - temp_v0_2->unk0 = 0xFC627EC4; + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); + gDPSetCombineLERP(gDisplayListHead++, 1, 0, SHADE, 0, 0, 0, 0, TEXEL0, 1, 0, SHADE, 0, 0, 0, 0, TEXEL0); func_80049970(arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A258.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80049970(s32, s32, s32, s32, s32, s32); // extern -? func_8004B414(s32, s32, s32, s32); // extern -extern ? D_0D007A40; +extern Gfx D_0D007A60[]; +void func_8004A258(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A60); + gDPSetCombineLERP(gDisplayListHead++, 1, 0, SHADE, 0, 0, 0, 0, TEXEL0, 1, 0, SHADE, 0, 0, 0, 0, TEXEL0); + func_80049970(arg4, arg5, arg6, arg7, arg8, arg9); +} -void func_8004A2F4(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A40; +extern Gfx D_0D007A40[]; +void func_8004B414(s32,s32,s32,s32); +void func_8004A2F4(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A40); func_8004B414(arg4, arg5, arg6, arg7); func_80049970(arg8, arg9, argA, argB, argC, argD); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A2F4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80049970(s32, s32, s32, s32, s32, s32); // extern -? func_8004B414(s32, s32, s32, s32); // extern -extern ? D_0D007A60; +extern Gfx D_0D007A60[]; - -void func_8004A384(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A60; +void func_8004A384(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, s32 argC, s32 argD) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007A60); func_8004B414(arg4, arg5, arg6, arg7); func_80049970(arg8, arg9, argA, argB, argC, argD); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A384.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -? func_800492D4(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007A40; +extern Gfx D_0D007A40[]; - -void func_8004A414(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { - void *temp_v1; - - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007A40; +void func_8004A414(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007A40); func_800492D4(arg3, arg4, arg5, arg6, arg7, arg8); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A414.s") -#endif + +UNUSED void func_8004A488(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007A60); + func_800492D4(arg3, arg4, arg5, arg6, arg7, arg8); +} + +extern Gfx D_0D007AC0[]; +UNUSED void func_8004A4FC(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007AC0); + func_800492D4(arg3, arg4, arg5, arg6, arg7, arg8); +} + +extern Gfx D_0D007AE0[]; + +UNUSED void func_8004A570(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007AE0); + func_800492D4(arg3, arg4, arg5, arg6, arg7, arg8); +} + +UNUSED void func_8004A5E4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4) { + func_8004A414(arg0, arg1, arg2, arg3, arg4, 16, 16, 16, 16); +} #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -2939,12 +2866,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A414.s") //extern ? D_0D007B98; //extern f64 D_800EE030; //extern ? D_80183E50; -// -extern s8 D_0D007B98[]; + +extern Gfx D_0D007B98[]; extern f64 D_800EE030; extern Vec3f D_80183E50; -s32 func_80041924(UnkActorInner*, Vec3f, s32); +s32 func_80041924(UnkActorInner*, f32); f32 func_802ABE30(f32, f32, f32, u16); @@ -2955,15 +2882,14 @@ struct UnknownStruct8004A630 { f32 unk4; }; -void func_8004A630(struct UnknownStruct8004A630 *arg0, Vec3f arg1, f32 arg2) { - //void *temp_v1; +void func_8004A630(UnkActorInner *arg0, Vec3f arg1, f32 arg2) { - if (func_80041924((UnkActorInner *) &arg0->unk0, arg1, arg2) == 0) { return; } + if (func_80041924(arg0, arg2) == 0) { return; } + D_80183E50[1] = (f32)func_802ABE30(arg2, 0.0f, D_80183E50[0], arg0->unk3A) + D_800EE030; D_80183E50[0] = arg1[0]; - D_80183E50[1] = func_802ABE30(arg1[0], 0.0f, D_80183E50[0], arg0->unk4) + D_800EE030; D_80183E50[2] = arg1[2]; - func_80043050(D_80183E50, arg0->unk0, arg2); + func_80043050(D_80183E50, arg0->unk60, arg2); gSPDisplayList(gDisplayListHead++, D_0D007B98); /* @@ -3081,239 +3007,94 @@ void func_8004A870(s32 arg0, f32 arg1) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A870.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043050(? *, ? *, f32); // extern -extern ? D_0D007C10; -extern ? D_80183E50; -extern ? D_80183E70; - +extern Gfx D_0D007C10[]; +extern Vec3f D_80183E50; +extern Vec3f D_80183E70; +void func_80043050(Vec3f, Vec3f, f32); void func_8004A9B8(f32 arg0) { - void *temp_v1; - - func_80043050(&D_80183E50, &D_80183E70, arg0); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007C10; + func_80043050(D_80183E50, D_80183E70, arg0); + gSPDisplayList(gDisplayListHead++, D_0D007C10); } -#else + +// unused GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A9B8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - - -void func_8004B05C(s32 arg0) { - void *temp_v1; - void *temp_v1_2; - void *temp_v1_3; - void *temp_v1_4; - void *temp_v1_5; - void *temp_v1_6; - void *temp_v1_7; - void *temp_v1_8; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk4 = arg0; - temp_v1->unk0 = 0xFD100000; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk4 = 0; - temp_v1_2->unk0 = 0xE8000000; - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->unk4 = 0x7000000; - temp_v1_3->unk0 = 0xF5000100; - temp_v1_4 = gDisplayListHead; - gDisplayListHead = temp_v1_4 + 8; - temp_v1_4->unk4 = 0; - temp_v1_4->unk0 = 0xE6000000; - temp_v1_5 = gDisplayListHead; - gDisplayListHead = temp_v1_5 + 8; - temp_v1_5->unk4 = 0x73FC000; - temp_v1_5->unk0 = 0xF0000000; - temp_v1_6 = gDisplayListHead; - gDisplayListHead = temp_v1_6 + 8; - temp_v1_6->unk4 = 0; - temp_v1_6->unk0 = 0xE7000000; - temp_v1_7 = gDisplayListHead; - gDisplayListHead = temp_v1_7 + 8; - temp_v1_7->unk4 = 0; - temp_v1_7->unk0 = 0xE6000000; - temp_v1_8 = gDisplayListHead; - gDisplayListHead = temp_v1_8 + 8; - temp_v1_8->unk4 = 0; - temp_v1_8->unk0 = 0xBA001301; +void func_8004B05C(u8 *texture) { + gDPLoadTLUT_pal256(gDisplayListHead++, texture); + gDPLoadSync(gDisplayListHead++); + gDPSetTexturePersp(gDisplayListHead++, G_TP_NONE); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B05C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - void func_8004B138(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - void *temp_v1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFA000000; - temp_v1->unk4 = (arg0 << 0x18) | ((arg1 & 0xFF) << 0x10) | ((arg2 & 0xFF) << 8) | (arg3 & 0xFF); + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, arg3); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B138.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +UNUSED void func_8004B180(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { + gDPSetEnvColor(gDisplayListHead++, arg0, arg1, arg2, arg3); +} void func_8004B1C8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { - void *temp_v1; - void *temp_v1_2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFA000000; - temp_v1->unk4 = (arg0 << 0x18) | ((arg1 & 0xFF) << 0x10) | ((arg2 & 0xFF) << 8) | (arg6 & 0xFF); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = 0xFB000000; - temp_v1_2->unk4 = (arg3 << 0x18) | ((arg4 & 0xFF) << 0x10) | ((arg5 & 0xFF) << 8) | 0xFF; + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, arg6); + gDPSetEnvColor(gDisplayListHead++, arg3, arg4, arg5, 0xFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B1C8.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +UNUSED void func_8004B254(s32 arg0, s32 arg1, s32 arg2) { + gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, 0xFF); +} void func_8004B2BC(s32 arg0) { - void *temp_v1; - void *temp_v1_2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFC119623; - temp_v1->unk4 = 0xFF2FFFFF; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = 0xFA000000; - temp_v1_2->unk4 = (arg0 & 0xFF) | ~0xFF; + gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gDisplayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B2BC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - void func_8004B310(s32 arg0) { - void *temp_v1; - void *temp_v1_2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFCFF97FF; - temp_v1->unk4 = 0xFF2CFE7F; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk4 = arg0 & 0xFF; - temp_v1_2->unk0 = 0xFA000000; + gDPSetCombineLERP(gDisplayListHead++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B310.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - void func_8004B35C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - void *temp_v1; - void *temp_v1_2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFC119623; - temp_v1->unk4 = 0xFF2FFFFF; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = 0xFA000000; - temp_v1_2->unk4 = (arg0 << 0x18) | ((arg1 & 0xFF) << 0x10) | ((arg2 & 0xFF) << 8) | (arg3 & 0xFF); + gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, arg3); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B35C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - void func_8004B3C8(s32 arg0) { - void *temp_v1; - void *temp_v1_2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFCFF97FF; - temp_v1->unk4 = 0xFF2F7FBF; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk4 = arg0 & 0xFF; - temp_v1_2->unk0 = 0xFA000000; + gDPSetCombineLERP(gDisplayListHead++, 0, 0, 0, 1, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, 1, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B3C8.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - void func_8004B414(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - void *temp_v1; - void *temp_v1_2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFCFF97FF; - temp_v1->unk4 = 0xFF2DFEFF; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = 0xFA000000; - temp_v1_2->unk4 = (arg0 << 0x18) | ((arg1 & 0xFF) << 0x10) | ((arg2 & 0xFF) << 8) | (arg3 & 0xFF); + gDPSetCombineLERP(gDisplayListHead++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, arg3); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B414.s") -#endif -#ifdef MIPS_TO_C +//#ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void func_8004B480(s32 arg0, s32 arg1, s32 arg2) { - void *temp_v1; - void *temp_v1_2; + gDPSetCombineLERP(gDisplayListHead++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0); + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, 0xFF); +} - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0xFCFFFFFF; - temp_v1->unk4 = 0xFFFDF2F9; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = 0xFA000000; - temp_v1_2->unk4 = (arg0 << 0x18) | ((arg1 & 0xFF) << 0x10) | ((arg2 & 0xFF) << 8) | 0xFF; +UNUSED void func_8004B4E8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { + gDPSetCombineLERP(gDisplayListHead++, 1, 0, SHADE, PRIMITIVE, 0, 0, 0, TEXEL0, 1, 0, SHADE, PRIMITIVE, 0, 0, 0, TEXEL0); + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, arg3); +} + +UNUSED void func_8004B554(s32 arg0) { + gDPSetCombineLERP(gDisplayListHead++, 0, 0, 0, SHADE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, SHADE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gDisplayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, arg0); +} + +#ifdef NON_MATCHING +UNUSED void func_8004B5A8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { + gDPSetPrimColor(gDisplayListHead++, 0, 0, arg0, arg1, arg2, arg3); + gDPSetCombineLERP(gDisplayListHead++, 1, 0, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0, 1, 0, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B480.s") +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B5A8.s") #endif #ifdef MIPS_TO_C @@ -3433,16 +3214,9 @@ void func_8004B7DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B7DC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B7DC(s32, s32, s32); // extern - -void func_8004B950(s32 arg4) { - func_8004B7DC(0, 0, arg4); +void func_8004B950(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + func_8004B7DC(arg0, arg1, arg2, arg3, 0, 0, arg4); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B950.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -3780,128 +3554,93 @@ void func_8004C6FC(s16 arg0, s16 arg1, s32 arg2, u32 arg3, u32 arg4) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C6FC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004C6FC(s16, s16, s32, ?, s32); // extern extern s32 D_8018D1E0; void func_8004C8D4(s16 arg0, s16 arg1) { func_8004C6FC(arg0, arg1, D_8018D1E0, 0x100, 0x80); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C8D4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004C268(s32, s32, s32); // extern -extern ? D_0D007EB8; -extern ? D_0D007EF8; -extern ? D_0D008108; +extern Gfx D_0D007EB8[]; +extern Gfx D_0D007EF8[]; +extern Gfx D_0D008108[]; -void func_8004C91C(s32 arg4, s32 arg5) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = &D_0D008108; - temp_v0->unk0 = 0x6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = &D_0D007EF8; - temp_v0_2->unk0 = 0x6000000; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 1; - temp_v0_3->unk0 = 0xB9000002; - func_8004C268(arg4, arg5, 0); - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x6000000; - temp_v0_4->unk4 = &D_0D007EB8; +void func_8004C268(s32 arg0, s32 arg1, s32 arg2, u32 arg3, u32 arg4, u32 arg5, s32 arg6); +void func_8004C91C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { + gSPDisplayList(gDisplayListHead++, D_0D008108); + gSPDisplayList(gDisplayListHead++, D_0D007EF8); + gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); + func_8004C268(arg0, arg1, arg2, arg3, arg4, arg5, 0); + gSPDisplayList(gDisplayListHead++, D_0D007EB8); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C91C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B2BC(?); // extern -? func_8004C268(s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007F38; +extern Gfx D_0D007F38[]; - -void func_8004C9D8(s32 arg0, s32 arg1, ? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg7) { - void *temp_v1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007F38; +void func_8004C9D8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { + gSPDisplayList(gDisplayListHead++, D_0D007F38); func_8004B2BC(arg2); func_8004C268(arg0, arg1, arg3, arg4, arg5, arg7, 1); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C9D8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(?, s32, s32); // extern -? func_8004BB3C(s32, s32, s32, s32, f32); // extern -extern ? D_0D007F78; - - -void func_8004CA58(s32 arg0, s32 arg1, f32 arg2, ? arg3, s32 arg4, s32 arg5) { - void *temp_v1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007F78; +extern Gfx D_0D007F78[]; +void func_8004BB3C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg4); +void func_8004CA58(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5) { + gSPDisplayList(gDisplayListHead++, D_0D007F78); func_80043D50(arg3, arg4, arg5); func_8004BB3C(arg0, arg1, arg4, arg5, arg2); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CA58.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004C364(?, ?, s32); // extern - -void func_8004CAD0(s32 arg2) { - func_8004C364(8, 8, arg2); +void func_8004CAD0(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 8, 8, arg2); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CAD0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004C364(?, ?, s32); // extern - -void func_8004CB60(s32 arg2) { - func_8004C364(0x20, 8, arg2); +UNUSED void func_8004CB00(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 8, 16, arg2); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CB60.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004C364(?, ?, s32); // extern - -void func_8004CB90(s32 arg2) { - func_8004C364(0x20, 0x10, arg2); +UNUSED void func_8004CB30(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 16, 16, arg2); +} + +void func_8004CB60(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 32, 8, arg2); +} + +void func_8004CB90(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 32, 16, arg2); +} + +UNUSED void func_8004CBC0(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_8004CA58(arg0, arg1, arg2, arg3, 32, 16); +} + +UNUSED void func_8004CBF4(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 32, 32, arg2); +} + +UNUSED void func_8004CC24(s32 arg0, s32 arg1, s32 arg2) { + func_8004C628(arg0, arg1, 32, 32, arg2); +} + +UNUSED void func_8004CC54(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 40, 32, arg2); +} + +UNUSED void func_8004CC84(s32 arg0, s32 arg1, s32 arg2) { + func_8004C91C(arg0, arg1, arg2, 48, 48, 24); +} + +UNUSED void func_8004CCB4(s32 arg0, s32 arg1, s32 arg2) { + func_8004C364(arg0, arg1, 64, 32, arg2); +} + +UNUSED void func_8004CCE4(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_8004CA58(arg0, arg1, arg2, arg3, 64, 32); +} + +UNUSED void func_8004CD18(s32 arg0, s32 arg1, s32 arg2) { + func_8004C91C(arg0, arg1, arg2, 64, 64, 32); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CB90.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -4559,14 +4298,9 @@ void func_8004E998(s32 playerId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E998.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void func_8004EB30(s32 arg0) { } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EB30.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 @@ -4977,46 +4711,17 @@ void func_8004F774(s32 arg0, ? arg1) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F774.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(? *, ?, ?); // extern -? func_8004F6D0(s32); // extern -? func_8004F774(s32, s32); // extern -extern ? D_0D007EB8; -extern ? D_0D007EF8; -extern ? D_0D008108; -extern ? D_0D00C558; - +extern Gfx D_0D00C558[]; void print_timer(s32 arg0, s32 arg1, s32 arg2) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = &D_0D008108; - temp_v0->unk0 = 0x6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = &D_0D007EF8; - temp_v0_2->unk0 = 0x6000000; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 1; - temp_v0_3->unk0 = 0xB9000002; - func_80043D50(&D_0D00C558, 0x68, 0x10); + gSPDisplayList(gDisplayListHead++, D_0D008108); + gSPDisplayList(gDisplayListHead++, D_0D007EF8); + gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); + func_80043D50(D_0D00C558, 104, 16); func_8004F6D0(arg2); func_8004F774(arg0, arg1); - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x6000000; - temp_v0_4->unk4 = &D_0D007EB8; + gSPDisplayList(gDisplayListHead++, D_0D007EB8); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/print_timer.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -5042,60 +4747,21 @@ void func_8004F8CC(s32 arg0, ? arg1) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F8CC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(? *, ?, ?); // extern -? func_8004B2BC(?); // extern -? func_8004F6D0(s32); // extern -? func_8004F8CC(s32, s32); // extern -extern ? D_0D007F38; -extern ? D_0D00C558; - - -void func_8004F950(s32 arg0, s32 arg1, ? arg2, s32 arg3) { - void *temp_v1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007F38; +void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { + gSPDisplayList(gDisplayListHead++, D_0D007F38); func_8004B2BC(arg2); - func_80043D50(&D_0D00C558, 0x68, 0x10); + func_80043D50(D_0D00C558, 104, 16); func_8004F6D0(arg3); func_8004F8CC(arg0, arg1); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F950.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(? *, ?, ?); // extern -? func_8004B614(u16, u16, u16, ?, s32, s32, s32); // extern -? func_8004F6D0(s32); // extern -? func_8004F8CC(s32, s32); // extern -extern ? D_0D007F38; -extern ? D_0D00C558; -extern u16 D_801656C0; -extern u16 D_801656D0; -extern u16 D_801656E0; - void func_8004F9CC(s32 arg0, s32 arg1, s32 arg2) { - void *temp_v1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007F38; - func_8004B614(D_801656C0, D_801656D0, D_801656E0, 0x80, 0x80, 0x80, 0xFF); - func_80043D50(&D_0D00C558, 0x68, 0x10); + gSPDisplayList(gDisplayListHead++, D_0D007F38); + func_8004B614(D_801656C0, D_801656D0, D_801656E0, 128, 128, 128, 255); + func_80043D50(&D_0D00C558, 104, 16); func_8004F6D0(arg2); func_8004F8CC(arg0, arg1); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F9CC.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 @@ -5167,46 +4833,18 @@ void func_8004FA78(s32 playerId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004FA78.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(? *, ?, ?); // extern -? func_8004BA98(s16, s16, ?, ?, s32, s32, s32); // extern -extern ? D_0D007EB8; -extern ? D_0D007EF8; -extern ? D_0D008108; -extern ? D_0D00AB58; - +extern Gfx D_0D00AB58[]; void func_8004FC78(s16 arg0, s16 arg1, s8 arg2) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = &D_0D008108; - temp_v0->unk0 = 0x6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = &D_0D007EF8; - temp_v0_2->unk0 = 0x6000000; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 1; - temp_v0_3->unk0 = 0xB9000002; - func_80043D50(&D_0D00AB58, 0x20, 8); + gSPDisplayList(gDisplayListHead++, D_0D008108); + gSPDisplayList(gDisplayListHead++, D_0D007EF8); + gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); + func_80043D50(D_0D00AB58, 32, 8); func_8004BA98(arg0, arg1, 8, 8, arg2 * 8, 0, 0); - func_8004BA98(arg0 + 8, arg1, 8, 8, 0x18, 0, 0); - func_8004BA98(arg0 + 0x10, arg1, 8, 8, 0x10, 0, 0); - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x6000000; - temp_v0_4->unk4 = &D_0D007EB8; + func_8004BA98(arg0 + 8, arg1, 8, 8, 24, 0, 0); + func_8004BA98(arg0 + 16, arg1, 8, 8, 16, 0, 0); + gSPDisplayList(gDisplayListHead++, D_0D007EB8); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004FC78.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -5894,7 +5532,7 @@ void func_80050E34(s32 arg0, s32 arg1) { } else { temp_s1_4 = (temp_t5 * 0xE0) + &D_80165C18; sp3C = temp_t2; - func_8004B2BC(temp_s1_4->unkA0, &D_801656D0, &D_801656E0, 0x80); + func_8004B2BC(temp_s1_4->unkA0, &D_801656D0, &D_801656E0, 0x80); // 1 arg only! phi_s1 = temp_s1_4; } func_800452A4(*(&D_800E459C + sp3C), 0x20, 0x20); diff --git a/src/math_util_2.c b/src/math_util_2.c index 084c8ce06..21427de52 100644 --- a/src/math_util_2.c +++ b/src/math_util_2.c @@ -436,7 +436,7 @@ s32 func_800418E8(f32 arg0, f32 arg1, Vec3f arg2) { return atan2s(arg0 - arg2[1], arg1 - arg2[2]); } -s32 func_80041924(UnkActorInner *arg0, f32 *arg1) { +s32 func_80041924(UnkActorInner *arg0, Vec3f arg1) { s32 ret = 0; func_802ADDC8(arg0, 10.0f, arg1[0], arg1[1], arg1[2]);