From 5fd2a88a3f8ce72fe1b6f1c66414f4b0757a4959 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Tue, 25 Jan 2022 02:56:31 -0700 Subject: [PATCH] decomped some of 800431B0.c (#148) * Decomped some funcs in code_800431B0.c * Split a few ununused funcs --- .../code_80040E50/func_80042E00.s | 47 --- .../code_80040E50/func_80042EB8.s | 47 +++ .../code_800431B0/func_800431B0.s | 29 -- .../code_800431B0/func_80043220.s | 68 ---- .../code_800431B0/func_80043328.s | 122 ------- .../code_800431B0/func_80043500.s | 41 --- .../code_800431B0/func_800435A0.s | 257 ------------- .../code_800431B0/func_80043668.s | 27 ++ .../code_800431B0/func_800436D0.s | 38 ++ .../code_800431B0/func_80043764.s | 38 ++ .../code_800431B0/func_800437F8.s | 52 +++ .../code_800431B0/func_800438C4.s | 51 +++ .../code_800431B0/func_8004398C.s | 51 +++ .../code_800431B0/func_80043A54.s | 15 - src/code_80040E50.c | 17 + src/code_800431B0.c | 341 ++++++++++++------ 16 files changed, 547 insertions(+), 694 deletions(-) create mode 100644 asm/non_matchings/code_80040E50/func_80042EB8.s delete mode 100644 asm/non_matchings/code_800431B0/func_800431B0.s delete mode 100644 asm/non_matchings/code_800431B0/func_80043220.s delete mode 100644 asm/non_matchings/code_800431B0/func_80043328.s delete mode 100644 asm/non_matchings/code_800431B0/func_80043500.s create mode 100644 asm/non_matchings/code_800431B0/func_80043668.s create mode 100644 asm/non_matchings/code_800431B0/func_800436D0.s create mode 100644 asm/non_matchings/code_800431B0/func_80043764.s create mode 100644 asm/non_matchings/code_800431B0/func_800437F8.s create mode 100644 asm/non_matchings/code_800431B0/func_800438C4.s create mode 100644 asm/non_matchings/code_800431B0/func_8004398C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80043A54.s diff --git a/asm/non_matchings/code_80040E50/func_80042E00.s b/asm/non_matchings/code_80040E50/func_80042E00.s index 90ae4ddc5..445a30f4c 100644 --- a/asm/non_matchings/code_80040E50/func_80042E00.s +++ b/asm/non_matchings/code_80040E50/func_80042E00.s @@ -45,50 +45,3 @@ glabel func_80042E00 /* 043AAC 80042EAC 25D80001 */ addiu $t8, $t6, 1 /* 043AB0 80042EB0 03E00008 */ jr $ra /* 043AB4 80042EB4 ACD80000 */ sw $t8, ($a2) - -/* 043AB8 80042EB8 44866000 */ mtc1 $a2, $f12 -/* 043ABC 80042EBC 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 043AC0 80042EC0 AFA50064 */ sw $a1, 0x64($sp) -/* 043AC4 80042EC4 00802825 */ move $a1, $a0 -/* 043AC8 80042EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* 043ACC 80042ECC AFA40060 */ sw $a0, 0x60($sp) -/* 043AD0 80042ED0 44076000 */ mfc1 $a3, $f12 -/* 043AD4 80042ED4 8FA60064 */ lw $a2, 0x64($sp) -/* 043AD8 80042ED8 0C0109D8 */ jal func_80042760 -/* 043ADC 80042EDC 27A40020 */ addiu $a0, $sp, 0x20 -/* 043AE0 80042EE0 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043AE4 80042EE4 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043AE8 80042EE8 8CCF0000 */ lw $t7, ($a2) -/* 043AEC 80042EEC 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 043AF0 80042EF0 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 043AF4 80042EF4 000FC180 */ sll $t8, $t7, 6 -/* 043AF8 80042EF8 27A50020 */ addiu $a1, $sp, 0x20 -/* 043AFC 80042EFC 01D82021 */ addu $a0, $t6, $t8 -/* 043B00 80042F00 0C008860 */ jal func_80022180 -/* 043B04 80042F04 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 043B08 80042F08 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 043B0C 80042F0C 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 043B10 80042F10 8C830000 */ lw $v1, ($a0) -/* 043B14 80042F14 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 043B18 80042F18 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043B1C 80042F1C 24790008 */ addiu $t9, $v1, 8 -/* 043B20 80042F20 AC990000 */ sw $t9, ($a0) -/* 043B24 80042F24 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 043B28 80042F28 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043B2C 80042F2C AC680000 */ sw $t0, ($v1) -/* 043B30 80042F30 8CCA0000 */ lw $t2, ($a2) -/* 043B34 80042F34 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 043B38 80042F38 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 043B3C 80042F3C 000A5980 */ sll $t3, $t2, 6 -/* 043B40 80042F40 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 043B44 80042F44 012B6021 */ addu $t4, $t1, $t3 -/* 043B48 80042F48 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 043B4C 80042F4C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 043B50 80042F50 01A17824 */ and $t7, $t5, $at -/* 043B54 80042F54 AC6F0004 */ sw $t7, 4($v1) -/* 043B58 80042F58 8CCE0000 */ lw $t6, ($a2) -/* 043B5C 80042F5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 043B60 80042F60 27BD0060 */ addiu $sp, $sp, 0x60 -/* 043B64 80042F64 25D80001 */ addiu $t8, $t6, 1 -/* 043B68 80042F68 03E00008 */ jr $ra -/* 043B6C 80042F6C ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_80042EB8.s b/asm/non_matchings/code_80040E50/func_80042EB8.s new file mode 100644 index 000000000..c602578f4 --- /dev/null +++ b/asm/non_matchings/code_80040E50/func_80042EB8.s @@ -0,0 +1,47 @@ +glabel func_80042EB8 +/* 043AB8 80042EB8 44866000 */ mtc1 $a2, $f12 +/* 043ABC 80042EBC 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 043AC0 80042EC0 AFA50064 */ sw $a1, 0x64($sp) +/* 043AC4 80042EC4 00802825 */ move $a1, $a0 +/* 043AC8 80042EC8 AFBF0014 */ sw $ra, 0x14($sp) +/* 043ACC 80042ECC AFA40060 */ sw $a0, 0x60($sp) +/* 043AD0 80042ED0 44076000 */ mfc1 $a3, $f12 +/* 043AD4 80042ED4 8FA60064 */ lw $a2, 0x64($sp) +/* 043AD8 80042ED8 0C0109D8 */ jal func_80042760 +/* 043ADC 80042EDC 27A40020 */ addiu $a0, $sp, 0x20 +/* 043AE0 80042EE0 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 +/* 043AE4 80042EE4 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 +/* 043AE8 80042EE8 8CCF0000 */ lw $t7, ($a2) +/* 043AEC 80042EEC 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 +/* 043AF0 80042EF0 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) +/* 043AF4 80042EF4 000FC180 */ sll $t8, $t7, 6 +/* 043AF8 80042EF8 27A50020 */ addiu $a1, $sp, 0x20 +/* 043AFC 80042EFC 01D82021 */ addu $a0, $t6, $t8 +/* 043B00 80042F00 0C008860 */ jal func_80022180 +/* 043B04 80042F04 248402C0 */ addiu $a0, $a0, 0x2c0 +/* 043B08 80042F08 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 +/* 043B0C 80042F0C 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 +/* 043B10 80042F10 8C830000 */ lw $v1, ($a0) +/* 043B14 80042F14 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 +/* 043B18 80042F18 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 +/* 043B1C 80042F1C 24790008 */ addiu $t9, $v1, 8 +/* 043B20 80042F20 AC990000 */ sw $t9, ($a0) +/* 043B24 80042F24 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 +/* 043B28 80042F28 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 +/* 043B2C 80042F2C AC680000 */ sw $t0, ($v1) +/* 043B30 80042F30 8CCA0000 */ lw $t2, ($a2) +/* 043B34 80042F34 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 +/* 043B38 80042F38 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) +/* 043B3C 80042F3C 000A5980 */ sll $t3, $t2, 6 +/* 043B40 80042F40 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff +/* 043B44 80042F44 012B6021 */ addu $t4, $t1, $t3 +/* 043B48 80042F48 258D02C0 */ addiu $t5, $t4, 0x2c0 +/* 043B4C 80042F4C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff +/* 043B50 80042F50 01A17824 */ and $t7, $t5, $at +/* 043B54 80042F54 AC6F0004 */ sw $t7, 4($v1) +/* 043B58 80042F58 8CCE0000 */ lw $t6, ($a2) +/* 043B5C 80042F5C 8FBF0014 */ lw $ra, 0x14($sp) +/* 043B60 80042F60 27BD0060 */ addiu $sp, $sp, 0x60 +/* 043B64 80042F64 25D80001 */ addiu $t8, $t6, 1 +/* 043B68 80042F68 03E00008 */ jr $ra +/* 043B6C 80042F6C ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_800431B0/func_800431B0.s b/asm/non_matchings/code_800431B0/func_800431B0.s deleted file mode 100644 index ed2c3ea8c..000000000 --- a/asm/non_matchings/code_800431B0/func_800431B0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_800431B0 -/* 043DB0 800431B0 44866000 */ mtc1 $a2, $f12 -/* 043DB4 800431B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 043DB8 800431B8 AFBF0014 */ sw $ra, 0x14($sp) -/* 043DBC 800431BC 44066000 */ mfc1 $a2, $f12 -/* 043DC0 800431C0 0C010B80 */ jal func_80042E00 -/* 043DC4 800431C4 AFA70024 */ sw $a3, 0x24($sp) -/* 043DC8 800431C8 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 043DCC 800431CC 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 043DD0 800431D0 8CA20000 */ lw $v0, ($a1) -/* 043DD4 800431D4 3C0F0400 */ lui $t7, (0x0400103F >> 16) # lui $t7, 0x400 -/* 043DD8 800431D8 35EF103F */ ori $t7, (0x0400103F & 0xFFFF) # ori $t7, $t7, 0x103f -/* 043DDC 800431DC 244E0008 */ addiu $t6, $v0, 8 -/* 043DE0 800431E0 ACAE0000 */ sw $t6, ($a1) -/* 043DE4 800431E4 AC4F0000 */ sw $t7, ($v0) -/* 043DE8 800431E8 8FB80024 */ lw $t8, 0x24($sp) -/* 043DEC 800431EC 3C090D00 */ lui $t1, %hi(D_0D006940) # $t1, 0xd00 -/* 043DF0 800431F0 25296940 */ addiu $t1, %lo(D_0D006940) # addiu $t1, $t1, 0x6940 -/* 043DF4 800431F4 AC580004 */ sw $t8, 4($v0) -/* 043DF8 800431F8 8CA20000 */ lw $v0, ($a1) -/* 043DFC 800431FC 3C080600 */ lui $t0, 0x600 -/* 043E00 80043200 24590008 */ addiu $t9, $v0, 8 -/* 043E04 80043204 ACB90000 */ sw $t9, ($a1) -/* 043E08 80043208 AC490004 */ sw $t1, 4($v0) -/* 043E0C 8004320C AC480000 */ sw $t0, ($v0) -/* 043E10 80043210 8FBF0014 */ lw $ra, 0x14($sp) -/* 043E14 80043214 27BD0018 */ addiu $sp, $sp, 0x18 -/* 043E18 80043218 03E00008 */ jr $ra -/* 043E1C 8004321C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80043220.s b/asm/non_matchings/code_800431B0/func_80043220.s deleted file mode 100644 index 009631e3c..000000000 --- a/asm/non_matchings/code_800431B0/func_80043220.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80043220 -/* 043E20 80043220 44866000 */ mtc1 $a2, $f12 -/* 043E24 80043224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 043E28 80043228 AFBF0014 */ sw $ra, 0x14($sp) -/* 043E2C 8004322C 44066000 */ mfc1 $a2, $f12 -/* 043E30 80043230 0C010B80 */ jal func_80042E00 -/* 043E34 80043234 AFA70024 */ sw $a3, 0x24($sp) -/* 043E38 80043238 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 043E3C 8004323C 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 043E40 80043240 8CA20000 */ lw $v0, ($a1) -/* 043E44 80043244 3C0F0D00 */ lui $t7, %hi(D_0D0077A0) # $t7, 0xd00 -/* 043E48 80043248 3C060600 */ lui $a2, 0x600 -/* 043E4C 8004324C 244E0008 */ addiu $t6, $v0, 8 -/* 043E50 80043250 ACAE0000 */ sw $t6, ($a1) -/* 043E54 80043254 25EF77A0 */ addiu $t7, %lo(D_0D0077A0) # addiu $t7, $t7, 0x77a0 -/* 043E58 80043258 AC4F0004 */ sw $t7, 4($v0) -/* 043E5C 8004325C AC460000 */ sw $a2, ($v0) -/* 043E60 80043260 8CA20000 */ lw $v0, ($a1) -/* 043E64 80043264 24580008 */ addiu $t8, $v0, 8 -/* 043E68 80043268 ACB80000 */ sw $t8, ($a1) -/* 043E6C 8004326C AC460000 */ sw $a2, ($v0) -/* 043E70 80043270 8FB90024 */ lw $t9, 0x24($sp) -/* 043E74 80043274 AC590004 */ sw $t9, 4($v0) -/* 043E78 80043278 8FBF0014 */ lw $ra, 0x14($sp) -/* 043E7C 8004327C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 043E80 80043280 03E00008 */ jr $ra -/* 043E84 80043284 00000000 */ nop - -/* 043E88 80043288 44866000 */ mtc1 $a2, $f12 -/* 043E8C 8004328C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 043E90 80043290 AFBF0014 */ sw $ra, 0x14($sp) -/* 043E94 80043294 44066000 */ mfc1 $a2, $f12 -/* 043E98 80043298 0C010B80 */ jal func_80042E00 -/* 043E9C 8004329C AFA70024 */ sw $a3, 0x24($sp) -/* 043EA0 800432A0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 043EA4 800432A4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 043EA8 800432A8 8C620000 */ lw $v0, ($v1) -/* 043EAC 800432AC 3C0F0D00 */ lui $t7, %hi(D_0D0077A0) # $t7, 0xd00 -/* 043EB0 800432B0 3C080600 */ lui $t0, 0x600 -/* 043EB4 800432B4 244E0008 */ addiu $t6, $v0, 8 -/* 043EB8 800432B8 AC6E0000 */ sw $t6, ($v1) -/* 043EBC 800432BC 25EF77A0 */ addiu $t7, %lo(D_0D0077A0) # addiu $t7, $t7, 0x77a0 -/* 043EC0 800432C0 AC4F0004 */ sw $t7, 4($v0) -/* 043EC4 800432C4 AC480000 */ sw $t0, ($v0) -/* 043EC8 800432C8 8C620000 */ lw $v0, ($v1) -/* 043ECC 800432CC 3C19B600 */ lui $t9, 0xb600 -/* 043ED0 800432D0 24093000 */ li $t1, 12288 -/* 043ED4 800432D4 24580008 */ addiu $t8, $v0, 8 -/* 043ED8 800432D8 AC780000 */ sw $t8, ($v1) -/* 043EDC 800432DC AC490004 */ sw $t1, 4($v0) -/* 043EE0 800432E0 AC590000 */ sw $t9, ($v0) -/* 043EE4 800432E4 8C620000 */ lw $v0, ($v1) -/* 043EE8 800432E8 240E2000 */ li $t6, 8192 -/* 043EEC 800432EC 3C0DB700 */ lui $t5, 0xb700 -/* 043EF0 800432F0 244A0008 */ addiu $t2, $v0, 8 -/* 043EF4 800432F4 AC6A0000 */ sw $t2, ($v1) -/* 043EF8 800432F8 AC480000 */ sw $t0, ($v0) -/* 043EFC 800432FC 8FAB0024 */ lw $t3, 0x24($sp) -/* 043F00 80043300 AC4B0004 */ sw $t3, 4($v0) -/* 043F04 80043304 8C620000 */ lw $v0, ($v1) -/* 043F08 80043308 244C0008 */ addiu $t4, $v0, 8 -/* 043F0C 8004330C AC6C0000 */ sw $t4, ($v1) -/* 043F10 80043310 AC4E0004 */ sw $t6, 4($v0) -/* 043F14 80043314 AC4D0000 */ sw $t5, ($v0) -/* 043F18 80043318 8FBF0014 */ lw $ra, 0x14($sp) -/* 043F1C 8004331C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 043F20 80043320 03E00008 */ jr $ra -/* 043F24 80043324 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80043328.s b/asm/non_matchings/code_800431B0/func_80043328.s deleted file mode 100644 index deacd2f16..000000000 --- a/asm/non_matchings/code_800431B0/func_80043328.s +++ /dev/null @@ -1,122 +0,0 @@ -glabel func_80043328 -/* 043F28 80043328 44866000 */ mtc1 $a2, $f12 -/* 043F2C 8004332C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 043F30 80043330 AFBF0014 */ sw $ra, 0x14($sp) -/* 043F34 80043334 44066000 */ mfc1 $a2, $f12 -/* 043F38 80043338 0C010B80 */ jal func_80042E00 -/* 043F3C 8004333C AFA70024 */ sw $a3, 0x24($sp) -/* 043F40 80043340 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 043F44 80043344 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 043F48 80043348 8CA20000 */ lw $v0, ($a1) -/* 043F4C 8004334C 3C0F0D00 */ lui $t7, %hi(D_0D0077D0) # $t7, 0xd00 -/* 043F50 80043350 3C060600 */ lui $a2, 0x600 -/* 043F54 80043354 244E0008 */ addiu $t6, $v0, 8 -/* 043F58 80043358 ACAE0000 */ sw $t6, ($a1) -/* 043F5C 8004335C 25EF77D0 */ addiu $t7, %lo(D_0D0077D0) # addiu $t7, $t7, 0x77d0 -/* 043F60 80043360 AC4F0004 */ sw $t7, 4($v0) -/* 043F64 80043364 AC460000 */ sw $a2, ($v0) -/* 043F68 80043368 8CA20000 */ lw $v0, ($a1) -/* 043F6C 8004336C 24580008 */ addiu $t8, $v0, 8 -/* 043F70 80043370 ACB80000 */ sw $t8, ($a1) -/* 043F74 80043374 AC460000 */ sw $a2, ($v0) -/* 043F78 80043378 8FB90024 */ lw $t9, 0x24($sp) -/* 043F7C 8004337C AC590004 */ sw $t9, 4($v0) -/* 043F80 80043380 8FBF0014 */ lw $ra, 0x14($sp) -/* 043F84 80043384 27BD0018 */ addiu $sp, $sp, 0x18 -/* 043F88 80043388 03E00008 */ jr $ra -/* 043F8C 8004338C 00000000 */ nop - -/* 043F90 80043390 44866000 */ mtc1 $a2, $f12 -/* 043F94 80043394 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 043F98 80043398 AFBF0014 */ sw $ra, 0x14($sp) -/* 043F9C 8004339C 44066000 */ mfc1 $a2, $f12 -/* 043FA0 800433A0 0C010B80 */ jal func_80042E00 -/* 043FA4 800433A4 AFA70024 */ sw $a3, 0x24($sp) -/* 043FA8 800433A8 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 043FAC 800433AC 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 043FB0 800433B0 8CA20000 */ lw $v0, ($a1) -/* 043FB4 800433B4 3C0F0D00 */ lui $t7, %hi(D_0D0077F8) # $t7, 0xd00 -/* 043FB8 800433B8 3C060600 */ lui $a2, 0x600 -/* 043FBC 800433BC 244E0008 */ addiu $t6, $v0, 8 -/* 043FC0 800433C0 ACAE0000 */ sw $t6, ($a1) -/* 043FC4 800433C4 25EF77F8 */ addiu $t7, %lo(D_0D0077F8) # addiu $t7, $t7, 0x77f8 -/* 043FC8 800433C8 AC4F0004 */ sw $t7, 4($v0) -/* 043FCC 800433CC AC460000 */ sw $a2, ($v0) -/* 043FD0 800433D0 8CA20000 */ lw $v0, ($a1) -/* 043FD4 800433D4 24580008 */ addiu $t8, $v0, 8 -/* 043FD8 800433D8 ACB80000 */ sw $t8, ($a1) -/* 043FDC 800433DC AC460000 */ sw $a2, ($v0) -/* 043FE0 800433E0 8FB90024 */ lw $t9, 0x24($sp) -/* 043FE4 800433E4 AC590004 */ sw $t9, 4($v0) -/* 043FE8 800433E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 043FEC 800433EC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 043FF0 800433F0 03E00008 */ jr $ra -/* 043FF4 800433F4 00000000 */ nop - -/* 043FF8 800433F8 44866000 */ mtc1 $a2, $f12 -/* 043FFC 800433FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 044000 80043400 AFBF0014 */ sw $ra, 0x14($sp) -/* 044004 80043404 44066000 */ mfc1 $a2, $f12 -/* 044008 80043408 0C010B80 */ jal func_80042E00 -/* 04400C 8004340C AFA70024 */ sw $a3, 0x24($sp) -/* 044010 80043410 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 044014 80043414 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 044018 80043418 8CA20000 */ lw $v0, ($a1) -/* 04401C 8004341C 3C0F0D00 */ lui $t7, %hi(D_0D007828) # $t7, 0xd00 -/* 044020 80043420 3C060600 */ lui $a2, 0x600 -/* 044024 80043424 244E0008 */ addiu $t6, $v0, 8 -/* 044028 80043428 ACAE0000 */ sw $t6, ($a1) -/* 04402C 8004342C 25EF7828 */ addiu $t7, %lo(D_0D007828) # addiu $t7, $t7, 0x7828 -/* 044030 80043430 AC4F0004 */ sw $t7, 4($v0) -/* 044034 80043434 AC460000 */ sw $a2, ($v0) -/* 044038 80043438 8CA20000 */ lw $v0, ($a1) -/* 04403C 8004343C 24580008 */ addiu $t8, $v0, 8 -/* 044040 80043440 ACB80000 */ sw $t8, ($a1) -/* 044044 80043444 AC460000 */ sw $a2, ($v0) -/* 044048 80043448 8FB90024 */ lw $t9, 0x24($sp) -/* 04404C 8004344C AC590004 */ sw $t9, 4($v0) -/* 044050 80043450 8FBF0014 */ lw $ra, 0x14($sp) -/* 044054 80043454 27BD0018 */ addiu $sp, $sp, 0x18 -/* 044058 80043458 03E00008 */ jr $ra -/* 04405C 8004345C 00000000 */ nop - -/* 044060 80043460 44866000 */ mtc1 $a2, $f12 -/* 044064 80043464 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 044068 80043468 AFBF0014 */ sw $ra, 0x14($sp) -/* 04406C 8004346C 44066000 */ mfc1 $a2, $f12 -/* 044070 80043470 0C010B80 */ jal func_80042E00 -/* 044074 80043474 AFA70024 */ sw $a3, 0x24($sp) -/* 044078 80043478 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04407C 8004347C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 044080 80043480 8C620000 */ lw $v0, ($v1) -/* 044084 80043484 3C0F0D00 */ lui $t7, %hi(D_0D007828) # $t7, 0xd00 -/* 044088 80043488 3C080600 */ lui $t0, 0x600 -/* 04408C 8004348C 244E0008 */ addiu $t6, $v0, 8 -/* 044090 80043490 AC6E0000 */ sw $t6, ($v1) -/* 044094 80043494 25EF7828 */ addiu $t7, %lo(D_0D007828) # addiu $t7, $t7, 0x7828 -/* 044098 80043498 AC4F0004 */ sw $t7, 4($v0) -/* 04409C 8004349C AC480000 */ sw $t0, ($v0) -/* 0440A0 800434A0 8C620000 */ lw $v0, ($v1) -/* 0440A4 800434A4 3C19B600 */ lui $t9, 0xb600 -/* 0440A8 800434A8 24093000 */ li $t1, 12288 -/* 0440AC 800434AC 24580008 */ addiu $t8, $v0, 8 -/* 0440B0 800434B0 AC780000 */ sw $t8, ($v1) -/* 0440B4 800434B4 AC490004 */ sw $t1, 4($v0) -/* 0440B8 800434B8 AC590000 */ sw $t9, ($v0) -/* 0440BC 800434BC 8C620000 */ lw $v0, ($v1) -/* 0440C0 800434C0 240E2000 */ li $t6, 8192 -/* 0440C4 800434C4 3C0DB700 */ lui $t5, 0xb700 -/* 0440C8 800434C8 244A0008 */ addiu $t2, $v0, 8 -/* 0440CC 800434CC AC6A0000 */ sw $t2, ($v1) -/* 0440D0 800434D0 AC480000 */ sw $t0, ($v0) -/* 0440D4 800434D4 8FAB0024 */ lw $t3, 0x24($sp) -/* 0440D8 800434D8 AC4B0004 */ sw $t3, 4($v0) -/* 0440DC 800434DC 8C620000 */ lw $v0, ($v1) -/* 0440E0 800434E0 244C0008 */ addiu $t4, $v0, 8 -/* 0440E4 800434E4 AC6C0000 */ sw $t4, ($v1) -/* 0440E8 800434E8 AC4E0004 */ sw $t6, 4($v0) -/* 0440EC 800434EC AC4D0000 */ sw $t5, ($v0) -/* 0440F0 800434F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0440F4 800434F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0440F8 800434F8 03E00008 */ jr $ra -/* 0440FC 800434FC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80043500.s b/asm/non_matchings/code_800431B0/func_80043500.s deleted file mode 100644 index 3a8c46ab4..000000000 --- a/asm/non_matchings/code_800431B0/func_80043500.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80043500 -/* 044100 80043500 44866000 */ mtc1 $a2, $f12 -/* 044104 80043504 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 044108 80043508 AFBF0014 */ sw $ra, 0x14($sp) -/* 04410C 8004350C 44066000 */ mfc1 $a2, $f12 -/* 044110 80043510 0C010B80 */ jal func_80042E00 -/* 044114 80043514 AFA70024 */ sw $a3, 0x24($sp) -/* 044118 80043518 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04411C 8004351C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 044120 80043520 8C620000 */ lw $v0, ($v1) -/* 044124 80043524 3C0F0D00 */ lui $t7, %hi(D_0D007850) # $t7, 0xd00 -/* 044128 80043528 3C080600 */ lui $t0, 0x600 -/* 04412C 8004352C 244E0008 */ addiu $t6, $v0, 8 -/* 044130 80043530 AC6E0000 */ sw $t6, ($v1) -/* 044134 80043534 25EF7850 */ addiu $t7, %lo(D_0D007850) # addiu $t7, $t7, 0x7850 -/* 044138 80043538 AC4F0004 */ sw $t7, 4($v0) -/* 04413C 8004353C AC480000 */ sw $t0, ($v0) -/* 044140 80043540 8C620000 */ lw $v0, ($v1) -/* 044144 80043544 3C19B600 */ lui $t9, 0xb600 -/* 044148 80043548 24093000 */ li $t1, 12288 -/* 04414C 8004354C 24580008 */ addiu $t8, $v0, 8 -/* 044150 80043550 AC780000 */ sw $t8, ($v1) -/* 044154 80043554 AC490004 */ sw $t1, 4($v0) -/* 044158 80043558 AC590000 */ sw $t9, ($v0) -/* 04415C 8004355C 8C620000 */ lw $v0, ($v1) -/* 044160 80043560 240E2000 */ li $t6, 8192 -/* 044164 80043564 3C0DB700 */ lui $t5, 0xb700 -/* 044168 80043568 244A0008 */ addiu $t2, $v0, 8 -/* 04416C 8004356C AC6A0000 */ sw $t2, ($v1) -/* 044170 80043570 AC480000 */ sw $t0, ($v0) -/* 044174 80043574 8FAB0024 */ lw $t3, 0x24($sp) -/* 044178 80043578 AC4B0004 */ sw $t3, 4($v0) -/* 04417C 8004357C 8C620000 */ lw $v0, ($v1) -/* 044180 80043580 244C0008 */ addiu $t4, $v0, 8 -/* 044184 80043584 AC6C0000 */ sw $t4, ($v1) -/* 044188 80043588 AC4E0004 */ sw $t6, 4($v0) -/* 04418C 8004358C AC4D0000 */ sw $t5, ($v0) -/* 044190 80043590 8FBF0014 */ lw $ra, 0x14($sp) -/* 044194 80043594 27BD0018 */ addiu $sp, $sp, 0x18 -/* 044198 80043598 03E00008 */ jr $ra -/* 04419C 8004359C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800435A0.s b/asm/non_matchings/code_800431B0/func_800435A0.s index 40ba8f996..fb2db981c 100644 --- a/asm/non_matchings/code_800431B0/func_800435A0.s +++ b/asm/non_matchings/code_800431B0/func_800435A0.s @@ -49,260 +49,3 @@ glabel func_800435A0 /* 04425C 8004365C 27BD0018 */ addiu $sp, $sp, 0x18 /* 044260 80043660 03E00008 */ jr $ra /* 044264 80043664 00000000 */ nop - -/* 044268 80043668 44866000 */ mtc1 $a2, $f12 -/* 04426C 8004366C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 044270 80043670 AFBF0014 */ sw $ra, 0x14($sp) -/* 044274 80043674 44066000 */ mfc1 $a2, $f12 -/* 044278 80043678 0C010B80 */ jal func_80042E00 -/* 04427C 8004367C AFA70024 */ sw $a3, 0x24($sp) -/* 044280 80043680 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 044284 80043684 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 044288 80043688 8CA20000 */ lw $v0, ($a1) -/* 04428C 8004368C 3C0F0D00 */ lui $t7, %hi(D_0D0078A0) # $t7, 0xd00 -/* 044290 80043690 3C060600 */ lui $a2, 0x600 -/* 044294 80043694 244E0008 */ addiu $t6, $v0, 8 -/* 044298 80043698 ACAE0000 */ sw $t6, ($a1) -/* 04429C 8004369C 25EF78A0 */ addiu $t7, %lo(D_0D0078A0) # addiu $t7, $t7, 0x78a0 -/* 0442A0 800436A0 AC4F0004 */ sw $t7, 4($v0) -/* 0442A4 800436A4 AC460000 */ sw $a2, ($v0) -/* 0442A8 800436A8 8CA20000 */ lw $v0, ($a1) -/* 0442AC 800436AC 24580008 */ addiu $t8, $v0, 8 -/* 0442B0 800436B0 ACB80000 */ sw $t8, ($a1) -/* 0442B4 800436B4 AC460000 */ sw $a2, ($v0) -/* 0442B8 800436B8 8FB90024 */ lw $t9, 0x24($sp) -/* 0442BC 800436BC AC590004 */ sw $t9, 4($v0) -/* 0442C0 800436C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0442C4 800436C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0442C8 800436C8 03E00008 */ jr $ra -/* 0442CC 800436CC 00000000 */ nop - -/* 0442D0 800436D0 44876000 */ mtc1 $a3, $f12 -/* 0442D4 800436D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0442D8 800436D8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0442DC 800436DC AFA60020 */ sw $a2, 0x20($sp) -/* 0442E0 800436E0 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0442E4 800436E4 44076000 */ mfc1 $a3, $f12 -/* 0442E8 800436E8 0C0108CC */ jal func_80042330 -/* 0442EC 800436EC 01C03025 */ move $a2, $t6 -/* 0442F0 800436F0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0442F4 800436F4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0442F8 800436F8 8C620000 */ lw $v0, ($v1) -/* 0442FC 800436FC 3C180D00 */ lui $t8, %hi(D_0D0078A0) # $t8, 0xd00 -/* 044300 80043700 3C070600 */ lui $a3, 0x600 -/* 044304 80043704 244F0008 */ addiu $t7, $v0, 8 -/* 044308 80043708 AC6F0000 */ sw $t7, ($v1) -/* 04430C 8004370C 271878A0 */ addiu $t8, %lo(D_0D0078A0) # addiu $t8, $t8, 0x78a0 -/* 044310 80043710 AC580004 */ sw $t8, 4($v0) -/* 044314 80043714 AC470000 */ sw $a3, ($v0) -/* 044318 80043718 8C620000 */ lw $v0, ($v1) -/* 04431C 8004371C 3C080400 */ lui $t0, (0x04000C2F >> 16) # lui $t0, 0x400 -/* 044320 80043720 35080C2F */ ori $t0, (0x04000C2F & 0xFFFF) # ori $t0, $t0, 0xc2f -/* 044324 80043724 24590008 */ addiu $t9, $v0, 8 -/* 044328 80043728 AC790000 */ sw $t9, ($v1) -/* 04432C 8004372C AC480000 */ sw $t0, ($v0) -/* 044330 80043730 8FA90028 */ lw $t1, 0x28($sp) -/* 044334 80043734 3C0B0D00 */ lui $t3, %hi(D_0D006930) # $t3, 0xd00 -/* 044338 80043738 256B6930 */ addiu $t3, %lo(D_0D006930) # addiu $t3, $t3, 0x6930 -/* 04433C 8004373C AC490004 */ sw $t1, 4($v0) -/* 044340 80043740 8C620000 */ lw $v0, ($v1) -/* 044344 80043744 244A0008 */ addiu $t2, $v0, 8 -/* 044348 80043748 AC6A0000 */ sw $t2, ($v1) -/* 04434C 8004374C AC4B0004 */ sw $t3, 4($v0) -/* 044350 80043750 AC470000 */ sw $a3, ($v0) -/* 044354 80043754 8FBF0014 */ lw $ra, 0x14($sp) -/* 044358 80043758 27BD0018 */ addiu $sp, $sp, 0x18 -/* 04435C 8004375C 03E00008 */ jr $ra -/* 044360 80043760 00000000 */ nop - -/* 044364 80043764 44876000 */ mtc1 $a3, $f12 -/* 044368 80043768 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 04436C 8004376C AFBF0014 */ sw $ra, 0x14($sp) -/* 044370 80043770 AFA60020 */ sw $a2, 0x20($sp) -/* 044374 80043774 30CEFFFF */ andi $t6, $a2, 0xffff -/* 044378 80043778 44076000 */ mfc1 $a3, $f12 -/* 04437C 8004377C 0C0108CC */ jal func_80042330 -/* 044380 80043780 01C03025 */ move $a2, $t6 -/* 044384 80043784 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 044388 80043788 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 04438C 8004378C 8C620000 */ lw $v0, ($v1) -/* 044390 80043790 3C180D00 */ lui $t8, %hi(D_0D0078A0) # $t8, 0xd00 -/* 044394 80043794 3C070600 */ lui $a3, 0x600 -/* 044398 80043798 244F0008 */ addiu $t7, $v0, 8 -/* 04439C 8004379C AC6F0000 */ sw $t7, ($v1) -/* 0443A0 800437A0 271878A0 */ addiu $t8, %lo(D_0D0078A0) # addiu $t8, $t8, 0x78a0 -/* 0443A4 800437A4 AC580004 */ sw $t8, 4($v0) -/* 0443A8 800437A8 AC470000 */ sw $a3, ($v0) -/* 0443AC 800437AC 8C620000 */ lw $v0, ($v1) -/* 0443B0 800437B0 3C080400 */ lui $t0, (0x0400103F >> 16) # lui $t0, 0x400 -/* 0443B4 800437B4 3508103F */ ori $t0, (0x0400103F & 0xFFFF) # ori $t0, $t0, 0x103f -/* 0443B8 800437B8 24590008 */ addiu $t9, $v0, 8 -/* 0443BC 800437BC AC790000 */ sw $t9, ($v1) -/* 0443C0 800437C0 AC480000 */ sw $t0, ($v0) -/* 0443C4 800437C4 8FA90028 */ lw $t1, 0x28($sp) -/* 0443C8 800437C8 3C0B0D00 */ lui $t3, %hi(D_0D006940) # $t3, 0xd00 -/* 0443CC 800437CC 256B6940 */ addiu $t3, %lo(D_0D006940) # addiu $t3, $t3, 0x6940 -/* 0443D0 800437D0 AC490004 */ sw $t1, 4($v0) -/* 0443D4 800437D4 8C620000 */ lw $v0, ($v1) -/* 0443D8 800437D8 244A0008 */ addiu $t2, $v0, 8 -/* 0443DC 800437DC AC6A0000 */ sw $t2, ($v1) -/* 0443E0 800437E0 AC4B0004 */ sw $t3, 4($v0) -/* 0443E4 800437E4 AC470000 */ sw $a3, ($v0) -/* 0443E8 800437E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0443EC 800437EC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0443F0 800437F0 03E00008 */ jr $ra -/* 0443F4 800437F4 00000000 */ nop - -/* 0443F8 800437F8 44876000 */ mtc1 $a3, $f12 -/* 0443FC 800437FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 044400 80043800 AFBF0014 */ sw $ra, 0x14($sp) -/* 044404 80043804 AFA60020 */ sw $a2, 0x20($sp) -/* 044408 80043808 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04440C 8004380C 44076000 */ mfc1 $a3, $f12 -/* 044410 80043810 0C0108CC */ jal func_80042330 -/* 044414 80043814 01C03025 */ move $a2, $t6 -/* 044418 80043818 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04441C 8004381C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 044420 80043820 8C620000 */ lw $v0, ($v1) -/* 044424 80043824 8FA40028 */ lw $a0, 0x28($sp) -/* 044428 80043828 8FA7002C */ lw $a3, 0x2c($sp) -/* 04442C 8004382C 244F0008 */ addiu $t7, $v0, 8 -/* 044430 80043830 AC6F0000 */ sw $t7, ($v1) -/* 044434 80043834 3C180D00 */ lui $t8, %hi(D_0D0078A0) # $t8, 0xd00 -/* 044438 80043838 3C0A0600 */ lui $t2, 0x600 -/* 04443C 8004383C 271878A0 */ addiu $t8, %lo(D_0D0078A0) # addiu $t8, $t8, 0x78a0 -/* 044440 80043840 AC580004 */ sw $t8, 4($v0) -/* 044444 80043844 AC4A0000 */ sw $t2, ($v0) -/* 044448 80043848 8C620000 */ lw $v0, ($v1) -/* 04444C 8004384C 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 -/* 044450 80043850 3C0C0050 */ lui $t4, (0x00504340 >> 16) # lui $t4, 0x50 -/* 044454 80043854 24590008 */ addiu $t9, $v0, 8 -/* 044458 80043858 AC790000 */ sw $t9, ($v1) -/* 04445C 8004385C 358C4340 */ ori $t4, (0x00504340 & 0xFFFF) # ori $t4, $t4, 0x4340 -/* 044460 80043860 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d -/* 044464 80043864 AC4B0000 */ sw $t3, ($v0) -/* 044468 80043868 AC4C0004 */ sw $t4, 4($v0) -/* 04446C 8004386C A087000F */ sb $a3, 0xf($a0) -/* 044470 80043870 A087001F */ sb $a3, 0x1f($a0) -/* 044474 80043874 A087002F */ sb $a3, 0x2f($a0) -/* 044478 80043878 A087003F */ sb $a3, 0x3f($a0) -/* 04447C 8004387C 8C620000 */ lw $v0, ($v1) -/* 044480 80043880 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 -/* 044484 80043884 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f -/* 044488 80043888 244D0008 */ addiu $t5, $v0, 8 -/* 04448C 8004388C AC6D0000 */ sw $t5, ($v1) -/* 044490 80043890 AC440004 */ sw $a0, 4($v0) -/* 044494 80043894 AC4E0000 */ sw $t6, ($v0) -/* 044498 80043898 8C620000 */ lw $v0, ($v1) -/* 04449C 8004389C 3C180D00 */ lui $t8, %hi(D_0D006940) # $t8, 0xd00 -/* 0444A0 800438A0 27186940 */ addiu $t8, %lo(D_0D006940) # addiu $t8, $t8, 0x6940 -/* 0444A4 800438A4 244F0008 */ addiu $t7, $v0, 8 -/* 0444A8 800438A8 AC6F0000 */ sw $t7, ($v1) -/* 0444AC 800438AC AC580004 */ sw $t8, 4($v0) -/* 0444B0 800438B0 AC4A0000 */ sw $t2, ($v0) -/* 0444B4 800438B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0444B8 800438B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0444BC 800438BC 03E00008 */ jr $ra -/* 0444C0 800438C0 00000000 */ nop - -/* 0444C4 800438C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0444C8 800438C8 44876000 */ mtc1 $a3, $f12 -/* 0444CC 800438CC 8FAF002C */ lw $t7, 0x2c($sp) -/* 0444D0 800438D0 8FB80028 */ lw $t8, 0x28($sp) -/* 0444D4 800438D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0444D8 800438D8 AFA60020 */ sw $a2, 0x20($sp) -/* 0444DC 800438DC 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0444E0 800438E0 44076000 */ mfc1 $a3, $f12 -/* 0444E4 800438E4 01C03025 */ move $a2, $t6 -/* 0444E8 800438E8 A70F0010 */ sh $t7, 0x10($t8) -/* 0444EC 800438EC 0C0108CC */ jal func_80042330 -/* 0444F0 800438F0 A70F0020 */ sh $t7, 0x20($t8) -/* 0444F4 800438F4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0444F8 800438F8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0444FC 800438FC 8C620000 */ lw $v0, ($v1) -/* 044500 80043900 3C090D00 */ lui $t1, %hi(D_0D0078A0) # $t1, 0xd00 -/* 044504 80043904 3C080600 */ lui $t0, 0x600 -/* 044508 80043908 24590008 */ addiu $t9, $v0, 8 -/* 04450C 8004390C AC790000 */ sw $t9, ($v1) -/* 044510 80043910 252978A0 */ addiu $t1, %lo(D_0D0078A0) # addiu $t1, $t1, 0x78a0 -/* 044514 80043914 AC490004 */ sw $t1, 4($v0) -/* 044518 80043918 AC480000 */ sw $t0, ($v0) -/* 04451C 8004391C 8C620000 */ lw $v0, ($v1) -/* 044520 80043920 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 -/* 044524 80043924 3C0C0050 */ lui $t4, (0x00504340 >> 16) # lui $t4, 0x50 -/* 044528 80043928 244A0008 */ addiu $t2, $v0, 8 -/* 04452C 8004392C AC6A0000 */ sw $t2, ($v1) -/* 044530 80043930 358C4340 */ ori $t4, (0x00504340 & 0xFFFF) # ori $t4, $t4, 0x4340 -/* 044534 80043934 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d -/* 044538 80043938 AC4B0000 */ sw $t3, ($v0) -/* 04453C 8004393C AC4C0004 */ sw $t4, 4($v0) -/* 044540 80043940 8C620000 */ lw $v0, ($v1) -/* 044544 80043944 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 -/* 044548 80043948 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f -/* 04454C 8004394C 244D0008 */ addiu $t5, $v0, 8 -/* 044550 80043950 AC6D0000 */ sw $t5, ($v1) -/* 044554 80043954 AC4E0000 */ sw $t6, ($v0) -/* 044558 80043958 8FAF0028 */ lw $t7, 0x28($sp) -/* 04455C 8004395C 3C190D00 */ lui $t9, %hi(D_0D006940) # $t9, 0xd00 -/* 044560 80043960 27396940 */ addiu $t9, %lo(D_0D006940) # addiu $t9, $t9, 0x6940 -/* 044564 80043964 AC4F0004 */ sw $t7, 4($v0) -/* 044568 80043968 8C620000 */ lw $v0, ($v1) -/* 04456C 8004396C 24580008 */ addiu $t8, $v0, 8 -/* 044570 80043970 AC780000 */ sw $t8, ($v1) -/* 044574 80043974 AC590004 */ sw $t9, 4($v0) -/* 044578 80043978 AC480000 */ sw $t0, ($v0) -/* 04457C 8004397C 8FBF0014 */ lw $ra, 0x14($sp) -/* 044580 80043980 27BD0018 */ addiu $sp, $sp, 0x18 -/* 044584 80043984 03E00008 */ jr $ra -/* 044588 80043988 00000000 */ nop - -/* 04458C 8004398C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 044590 80043990 44876000 */ mtc1 $a3, $f12 -/* 044594 80043994 8FAF002C */ lw $t7, 0x2c($sp) -/* 044598 80043998 8FB80028 */ lw $t8, 0x28($sp) -/* 04459C 8004399C AFBF0014 */ sw $ra, 0x14($sp) -/* 0445A0 800439A0 AFA60020 */ sw $a2, 0x20($sp) -/* 0445A4 800439A4 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0445A8 800439A8 44076000 */ mfc1 $a3, $f12 -/* 0445AC 800439AC 01C03025 */ move $a2, $t6 -/* 0445B0 800439B0 A70F0000 */ sh $t7, ($t8) -/* 0445B4 800439B4 0C0108CC */ jal func_80042330 -/* 0445B8 800439B8 A70F0030 */ sh $t7, 0x30($t8) -/* 0445BC 800439BC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0445C0 800439C0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0445C4 800439C4 8C620000 */ lw $v0, ($v1) -/* 0445C8 800439C8 3C090D00 */ lui $t1, %hi(D_0D0078A0) # $t1, 0xd00 -/* 0445CC 800439CC 3C080600 */ lui $t0, 0x600 -/* 0445D0 800439D0 24590008 */ addiu $t9, $v0, 8 -/* 0445D4 800439D4 AC790000 */ sw $t9, ($v1) -/* 0445D8 800439D8 252978A0 */ addiu $t1, %lo(D_0D0078A0) # addiu $t1, $t1, 0x78a0 -/* 0445DC 800439DC AC490004 */ sw $t1, 4($v0) -/* 0445E0 800439E0 AC480000 */ sw $t0, ($v0) -/* 0445E4 800439E4 8C620000 */ lw $v0, ($v1) -/* 0445E8 800439E8 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 -/* 0445EC 800439EC 3C0C0050 */ lui $t4, (0x00504340 >> 16) # lui $t4, 0x50 -/* 0445F0 800439F0 244A0008 */ addiu $t2, $v0, 8 -/* 0445F4 800439F4 AC6A0000 */ sw $t2, ($v1) -/* 0445F8 800439F8 358C4340 */ ori $t4, (0x00504340 & 0xFFFF) # ori $t4, $t4, 0x4340 -/* 0445FC 800439FC 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d -/* 044600 80043A00 AC4B0000 */ sw $t3, ($v0) -/* 044604 80043A04 AC4C0004 */ sw $t4, 4($v0) -/* 044608 80043A08 8C620000 */ lw $v0, ($v1) -/* 04460C 80043A0C 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 -/* 044610 80043A10 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f -/* 044614 80043A14 244D0008 */ addiu $t5, $v0, 8 -/* 044618 80043A18 AC6D0000 */ sw $t5, ($v1) -/* 04461C 80043A1C AC4E0000 */ sw $t6, ($v0) -/* 044620 80043A20 8FAF0028 */ lw $t7, 0x28($sp) -/* 044624 80043A24 3C190D00 */ lui $t9, %hi(D_0D006940) # $t9, 0xd00 -/* 044628 80043A28 27396940 */ addiu $t9, %lo(D_0D006940) # addiu $t9, $t9, 0x6940 -/* 04462C 80043A2C AC4F0004 */ sw $t7, 4($v0) -/* 044630 80043A30 8C620000 */ lw $v0, ($v1) -/* 044634 80043A34 24580008 */ addiu $t8, $v0, 8 -/* 044638 80043A38 AC780000 */ sw $t8, ($v1) -/* 04463C 80043A3C AC590004 */ sw $t9, 4($v0) -/* 044640 80043A40 AC480000 */ sw $t0, ($v0) -/* 044644 80043A44 8FBF0014 */ lw $ra, 0x14($sp) -/* 044648 80043A48 27BD0018 */ addiu $sp, $sp, 0x18 -/* 04464C 80043A4C 03E00008 */ jr $ra -/* 044650 80043A50 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80043668.s b/asm/non_matchings/code_800431B0/func_80043668.s new file mode 100644 index 000000000..620a5bcfe --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_80043668.s @@ -0,0 +1,27 @@ +glabel func_80043668 +/* 044268 80043668 44866000 */ mtc1 $a2, $f12 +/* 04426C 8004366C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 044270 80043670 AFBF0014 */ sw $ra, 0x14($sp) +/* 044274 80043674 44066000 */ mfc1 $a2, $f12 +/* 044278 80043678 0C010B80 */ jal func_80042E00 +/* 04427C 8004367C AFA70024 */ sw $a3, 0x24($sp) +/* 044280 80043680 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 +/* 044284 80043684 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 +/* 044288 80043688 8CA20000 */ lw $v0, ($a1) +/* 04428C 8004368C 3C0F0D00 */ lui $t7, %hi(D_0D0078A0) # $t7, 0xd00 +/* 044290 80043690 3C060600 */ lui $a2, 0x600 +/* 044294 80043694 244E0008 */ addiu $t6, $v0, 8 +/* 044298 80043698 ACAE0000 */ sw $t6, ($a1) +/* 04429C 8004369C 25EF78A0 */ addiu $t7, %lo(D_0D0078A0) # addiu $t7, $t7, 0x78a0 +/* 0442A0 800436A0 AC4F0004 */ sw $t7, 4($v0) +/* 0442A4 800436A4 AC460000 */ sw $a2, ($v0) +/* 0442A8 800436A8 8CA20000 */ lw $v0, ($a1) +/* 0442AC 800436AC 24580008 */ addiu $t8, $v0, 8 +/* 0442B0 800436B0 ACB80000 */ sw $t8, ($a1) +/* 0442B4 800436B4 AC460000 */ sw $a2, ($v0) +/* 0442B8 800436B8 8FB90024 */ lw $t9, 0x24($sp) +/* 0442BC 800436BC AC590004 */ sw $t9, 4($v0) +/* 0442C0 800436C0 8FBF0014 */ lw $ra, 0x14($sp) +/* 0442C4 800436C4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 0442C8 800436C8 03E00008 */ jr $ra +/* 0442CC 800436CC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800436D0.s b/asm/non_matchings/code_800431B0/func_800436D0.s new file mode 100644 index 000000000..987f4440f --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_800436D0.s @@ -0,0 +1,38 @@ +glabel func_800436D0 +/* 0442D0 800436D0 44876000 */ mtc1 $a3, $f12 +/* 0442D4 800436D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 0442D8 800436D8 AFBF0014 */ sw $ra, 0x14($sp) +/* 0442DC 800436DC AFA60020 */ sw $a2, 0x20($sp) +/* 0442E0 800436E0 30CEFFFF */ andi $t6, $a2, 0xffff +/* 0442E4 800436E4 44076000 */ mfc1 $a3, $f12 +/* 0442E8 800436E8 0C0108CC */ jal func_80042330 +/* 0442EC 800436EC 01C03025 */ move $a2, $t6 +/* 0442F0 800436F0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 +/* 0442F4 800436F4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 +/* 0442F8 800436F8 8C620000 */ lw $v0, ($v1) +/* 0442FC 800436FC 3C180D00 */ lui $t8, %hi(D_0D0078A0) # $t8, 0xd00 +/* 044300 80043700 3C070600 */ lui $a3, 0x600 +/* 044304 80043704 244F0008 */ addiu $t7, $v0, 8 +/* 044308 80043708 AC6F0000 */ sw $t7, ($v1) +/* 04430C 8004370C 271878A0 */ addiu $t8, %lo(D_0D0078A0) # addiu $t8, $t8, 0x78a0 +/* 044310 80043710 AC580004 */ sw $t8, 4($v0) +/* 044314 80043714 AC470000 */ sw $a3, ($v0) +/* 044318 80043718 8C620000 */ lw $v0, ($v1) +/* 04431C 8004371C 3C080400 */ lui $t0, (0x04000C2F >> 16) # lui $t0, 0x400 +/* 044320 80043720 35080C2F */ ori $t0, (0x04000C2F & 0xFFFF) # ori $t0, $t0, 0xc2f +/* 044324 80043724 24590008 */ addiu $t9, $v0, 8 +/* 044328 80043728 AC790000 */ sw $t9, ($v1) +/* 04432C 8004372C AC480000 */ sw $t0, ($v0) +/* 044330 80043730 8FA90028 */ lw $t1, 0x28($sp) +/* 044334 80043734 3C0B0D00 */ lui $t3, %hi(D_0D006930) # $t3, 0xd00 +/* 044338 80043738 256B6930 */ addiu $t3, %lo(D_0D006930) # addiu $t3, $t3, 0x6930 +/* 04433C 8004373C AC490004 */ sw $t1, 4($v0) +/* 044340 80043740 8C620000 */ lw $v0, ($v1) +/* 044344 80043744 244A0008 */ addiu $t2, $v0, 8 +/* 044348 80043748 AC6A0000 */ sw $t2, ($v1) +/* 04434C 8004374C AC4B0004 */ sw $t3, 4($v0) +/* 044350 80043750 AC470000 */ sw $a3, ($v0) +/* 044354 80043754 8FBF0014 */ lw $ra, 0x14($sp) +/* 044358 80043758 27BD0018 */ addiu $sp, $sp, 0x18 +/* 04435C 8004375C 03E00008 */ jr $ra +/* 044360 80043760 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80043764.s b/asm/non_matchings/code_800431B0/func_80043764.s new file mode 100644 index 000000000..9bee4ae10 --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_80043764.s @@ -0,0 +1,38 @@ +glabel func_80043764 +/* 044364 80043764 44876000 */ mtc1 $a3, $f12 +/* 044368 80043768 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 04436C 8004376C AFBF0014 */ sw $ra, 0x14($sp) +/* 044370 80043770 AFA60020 */ sw $a2, 0x20($sp) +/* 044374 80043774 30CEFFFF */ andi $t6, $a2, 0xffff +/* 044378 80043778 44076000 */ mfc1 $a3, $f12 +/* 04437C 8004377C 0C0108CC */ jal func_80042330 +/* 044380 80043780 01C03025 */ move $a2, $t6 +/* 044384 80043784 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 +/* 044388 80043788 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 +/* 04438C 8004378C 8C620000 */ lw $v0, ($v1) +/* 044390 80043790 3C180D00 */ lui $t8, %hi(D_0D0078A0) # $t8, 0xd00 +/* 044394 80043794 3C070600 */ lui $a3, 0x600 +/* 044398 80043798 244F0008 */ addiu $t7, $v0, 8 +/* 04439C 8004379C AC6F0000 */ sw $t7, ($v1) +/* 0443A0 800437A0 271878A0 */ addiu $t8, %lo(D_0D0078A0) # addiu $t8, $t8, 0x78a0 +/* 0443A4 800437A4 AC580004 */ sw $t8, 4($v0) +/* 0443A8 800437A8 AC470000 */ sw $a3, ($v0) +/* 0443AC 800437AC 8C620000 */ lw $v0, ($v1) +/* 0443B0 800437B0 3C080400 */ lui $t0, (0x0400103F >> 16) # lui $t0, 0x400 +/* 0443B4 800437B4 3508103F */ ori $t0, (0x0400103F & 0xFFFF) # ori $t0, $t0, 0x103f +/* 0443B8 800437B8 24590008 */ addiu $t9, $v0, 8 +/* 0443BC 800437BC AC790000 */ sw $t9, ($v1) +/* 0443C0 800437C0 AC480000 */ sw $t0, ($v0) +/* 0443C4 800437C4 8FA90028 */ lw $t1, 0x28($sp) +/* 0443C8 800437C8 3C0B0D00 */ lui $t3, %hi(D_0D006940) # $t3, 0xd00 +/* 0443CC 800437CC 256B6940 */ addiu $t3, %lo(D_0D006940) # addiu $t3, $t3, 0x6940 +/* 0443D0 800437D0 AC490004 */ sw $t1, 4($v0) +/* 0443D4 800437D4 8C620000 */ lw $v0, ($v1) +/* 0443D8 800437D8 244A0008 */ addiu $t2, $v0, 8 +/* 0443DC 800437DC AC6A0000 */ sw $t2, ($v1) +/* 0443E0 800437E0 AC4B0004 */ sw $t3, 4($v0) +/* 0443E4 800437E4 AC470000 */ sw $a3, ($v0) +/* 0443E8 800437E8 8FBF0014 */ lw $ra, 0x14($sp) +/* 0443EC 800437EC 27BD0018 */ addiu $sp, $sp, 0x18 +/* 0443F0 800437F0 03E00008 */ jr $ra +/* 0443F4 800437F4 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800437F8.s b/asm/non_matchings/code_800431B0/func_800437F8.s new file mode 100644 index 000000000..c1ed4fea8 --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_800437F8.s @@ -0,0 +1,52 @@ +glabel func_800437F8 +/* 0443F8 800437F8 44876000 */ mtc1 $a3, $f12 +/* 0443FC 800437FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 044400 80043800 AFBF0014 */ sw $ra, 0x14($sp) +/* 044404 80043804 AFA60020 */ sw $a2, 0x20($sp) +/* 044408 80043808 30CEFFFF */ andi $t6, $a2, 0xffff +/* 04440C 8004380C 44076000 */ mfc1 $a3, $f12 +/* 044410 80043810 0C0108CC */ jal func_80042330 +/* 044414 80043814 01C03025 */ move $a2, $t6 +/* 044418 80043818 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 +/* 04441C 8004381C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 +/* 044420 80043820 8C620000 */ lw $v0, ($v1) +/* 044424 80043824 8FA40028 */ lw $a0, 0x28($sp) +/* 044428 80043828 8FA7002C */ lw $a3, 0x2c($sp) +/* 04442C 8004382C 244F0008 */ addiu $t7, $v0, 8 +/* 044430 80043830 AC6F0000 */ sw $t7, ($v1) +/* 044434 80043834 3C180D00 */ lui $t8, %hi(D_0D0078A0) # $t8, 0xd00 +/* 044438 80043838 3C0A0600 */ lui $t2, 0x600 +/* 04443C 8004383C 271878A0 */ addiu $t8, %lo(D_0D0078A0) # addiu $t8, $t8, 0x78a0 +/* 044440 80043840 AC580004 */ sw $t8, 4($v0) +/* 044444 80043844 AC4A0000 */ sw $t2, ($v0) +/* 044448 80043848 8C620000 */ lw $v0, ($v1) +/* 04444C 8004384C 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 +/* 044450 80043850 3C0C0050 */ lui $t4, (0x00504340 >> 16) # lui $t4, 0x50 +/* 044454 80043854 24590008 */ addiu $t9, $v0, 8 +/* 044458 80043858 AC790000 */ sw $t9, ($v1) +/* 04445C 8004385C 358C4340 */ ori $t4, (0x00504340 & 0xFFFF) # ori $t4, $t4, 0x4340 +/* 044460 80043860 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d +/* 044464 80043864 AC4B0000 */ sw $t3, ($v0) +/* 044468 80043868 AC4C0004 */ sw $t4, 4($v0) +/* 04446C 8004386C A087000F */ sb $a3, 0xf($a0) +/* 044470 80043870 A087001F */ sb $a3, 0x1f($a0) +/* 044474 80043874 A087002F */ sb $a3, 0x2f($a0) +/* 044478 80043878 A087003F */ sb $a3, 0x3f($a0) +/* 04447C 8004387C 8C620000 */ lw $v0, ($v1) +/* 044480 80043880 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 +/* 044484 80043884 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f +/* 044488 80043888 244D0008 */ addiu $t5, $v0, 8 +/* 04448C 8004388C AC6D0000 */ sw $t5, ($v1) +/* 044490 80043890 AC440004 */ sw $a0, 4($v0) +/* 044494 80043894 AC4E0000 */ sw $t6, ($v0) +/* 044498 80043898 8C620000 */ lw $v0, ($v1) +/* 04449C 8004389C 3C180D00 */ lui $t8, %hi(D_0D006940) # $t8, 0xd00 +/* 0444A0 800438A0 27186940 */ addiu $t8, %lo(D_0D006940) # addiu $t8, $t8, 0x6940 +/* 0444A4 800438A4 244F0008 */ addiu $t7, $v0, 8 +/* 0444A8 800438A8 AC6F0000 */ sw $t7, ($v1) +/* 0444AC 800438AC AC580004 */ sw $t8, 4($v0) +/* 0444B0 800438B0 AC4A0000 */ sw $t2, ($v0) +/* 0444B4 800438B4 8FBF0014 */ lw $ra, 0x14($sp) +/* 0444B8 800438B8 27BD0018 */ addiu $sp, $sp, 0x18 +/* 0444BC 800438BC 03E00008 */ jr $ra +/* 0444C0 800438C0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800438C4.s b/asm/non_matchings/code_800431B0/func_800438C4.s new file mode 100644 index 000000000..519881079 --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_800438C4.s @@ -0,0 +1,51 @@ +glabel func_800438C4 +/* 0444C4 800438C4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 0444C8 800438C8 44876000 */ mtc1 $a3, $f12 +/* 0444CC 800438CC 8FAF002C */ lw $t7, 0x2c($sp) +/* 0444D0 800438D0 8FB80028 */ lw $t8, 0x28($sp) +/* 0444D4 800438D4 AFBF0014 */ sw $ra, 0x14($sp) +/* 0444D8 800438D8 AFA60020 */ sw $a2, 0x20($sp) +/* 0444DC 800438DC 30CEFFFF */ andi $t6, $a2, 0xffff +/* 0444E0 800438E0 44076000 */ mfc1 $a3, $f12 +/* 0444E4 800438E4 01C03025 */ move $a2, $t6 +/* 0444E8 800438E8 A70F0010 */ sh $t7, 0x10($t8) +/* 0444EC 800438EC 0C0108CC */ jal func_80042330 +/* 0444F0 800438F0 A70F0020 */ sh $t7, 0x20($t8) +/* 0444F4 800438F4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 +/* 0444F8 800438F8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 +/* 0444FC 800438FC 8C620000 */ lw $v0, ($v1) +/* 044500 80043900 3C090D00 */ lui $t1, %hi(D_0D0078A0) # $t1, 0xd00 +/* 044504 80043904 3C080600 */ lui $t0, 0x600 +/* 044508 80043908 24590008 */ addiu $t9, $v0, 8 +/* 04450C 8004390C AC790000 */ sw $t9, ($v1) +/* 044510 80043910 252978A0 */ addiu $t1, %lo(D_0D0078A0) # addiu $t1, $t1, 0x78a0 +/* 044514 80043914 AC490004 */ sw $t1, 4($v0) +/* 044518 80043918 AC480000 */ sw $t0, ($v0) +/* 04451C 8004391C 8C620000 */ lw $v0, ($v1) +/* 044520 80043920 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 +/* 044524 80043924 3C0C0050 */ lui $t4, (0x00504340 >> 16) # lui $t4, 0x50 +/* 044528 80043928 244A0008 */ addiu $t2, $v0, 8 +/* 04452C 8004392C AC6A0000 */ sw $t2, ($v1) +/* 044530 80043930 358C4340 */ ori $t4, (0x00504340 & 0xFFFF) # ori $t4, $t4, 0x4340 +/* 044534 80043934 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d +/* 044538 80043938 AC4B0000 */ sw $t3, ($v0) +/* 04453C 8004393C AC4C0004 */ sw $t4, 4($v0) +/* 044540 80043940 8C620000 */ lw $v0, ($v1) +/* 044544 80043944 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 +/* 044548 80043948 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f +/* 04454C 8004394C 244D0008 */ addiu $t5, $v0, 8 +/* 044550 80043950 AC6D0000 */ sw $t5, ($v1) +/* 044554 80043954 AC4E0000 */ sw $t6, ($v0) +/* 044558 80043958 8FAF0028 */ lw $t7, 0x28($sp) +/* 04455C 8004395C 3C190D00 */ lui $t9, %hi(D_0D006940) # $t9, 0xd00 +/* 044560 80043960 27396940 */ addiu $t9, %lo(D_0D006940) # addiu $t9, $t9, 0x6940 +/* 044564 80043964 AC4F0004 */ sw $t7, 4($v0) +/* 044568 80043968 8C620000 */ lw $v0, ($v1) +/* 04456C 8004396C 24580008 */ addiu $t8, $v0, 8 +/* 044570 80043970 AC780000 */ sw $t8, ($v1) +/* 044574 80043974 AC590004 */ sw $t9, 4($v0) +/* 044578 80043978 AC480000 */ sw $t0, ($v0) +/* 04457C 8004397C 8FBF0014 */ lw $ra, 0x14($sp) +/* 044580 80043980 27BD0018 */ addiu $sp, $sp, 0x18 +/* 044584 80043984 03E00008 */ jr $ra +/* 044588 80043988 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004398C.s b/asm/non_matchings/code_800431B0/func_8004398C.s new file mode 100644 index 000000000..637d36d7f --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_8004398C.s @@ -0,0 +1,51 @@ +glabel func_8004398C +/* 04458C 8004398C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 044590 80043990 44876000 */ mtc1 $a3, $f12 +/* 044594 80043994 8FAF002C */ lw $t7, 0x2c($sp) +/* 044598 80043998 8FB80028 */ lw $t8, 0x28($sp) +/* 04459C 8004399C AFBF0014 */ sw $ra, 0x14($sp) +/* 0445A0 800439A0 AFA60020 */ sw $a2, 0x20($sp) +/* 0445A4 800439A4 30CEFFFF */ andi $t6, $a2, 0xffff +/* 0445A8 800439A8 44076000 */ mfc1 $a3, $f12 +/* 0445AC 800439AC 01C03025 */ move $a2, $t6 +/* 0445B0 800439B0 A70F0000 */ sh $t7, ($t8) +/* 0445B4 800439B4 0C0108CC */ jal func_80042330 +/* 0445B8 800439B8 A70F0030 */ sh $t7, 0x30($t8) +/* 0445BC 800439BC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 +/* 0445C0 800439C0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 +/* 0445C4 800439C4 8C620000 */ lw $v0, ($v1) +/* 0445C8 800439C8 3C090D00 */ lui $t1, %hi(D_0D0078A0) # $t1, 0xd00 +/* 0445CC 800439CC 3C080600 */ lui $t0, 0x600 +/* 0445D0 800439D0 24590008 */ addiu $t9, $v0, 8 +/* 0445D4 800439D4 AC790000 */ sw $t9, ($v1) +/* 0445D8 800439D8 252978A0 */ addiu $t1, %lo(D_0D0078A0) # addiu $t1, $t1, 0x78a0 +/* 0445DC 800439DC AC490004 */ sw $t1, 4($v0) +/* 0445E0 800439E0 AC480000 */ sw $t0, ($v0) +/* 0445E4 800439E4 8C620000 */ lw $v0, ($v1) +/* 0445E8 800439E8 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 +/* 0445EC 800439EC 3C0C0050 */ lui $t4, (0x00504340 >> 16) # lui $t4, 0x50 +/* 0445F0 800439F0 244A0008 */ addiu $t2, $v0, 8 +/* 0445F4 800439F4 AC6A0000 */ sw $t2, ($v1) +/* 0445F8 800439F8 358C4340 */ ori $t4, (0x00504340 & 0xFFFF) # ori $t4, $t4, 0x4340 +/* 0445FC 800439FC 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d +/* 044600 80043A00 AC4B0000 */ sw $t3, ($v0) +/* 044604 80043A04 AC4C0004 */ sw $t4, 4($v0) +/* 044608 80043A08 8C620000 */ lw $v0, ($v1) +/* 04460C 80043A0C 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 +/* 044610 80043A10 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f +/* 044614 80043A14 244D0008 */ addiu $t5, $v0, 8 +/* 044618 80043A18 AC6D0000 */ sw $t5, ($v1) +/* 04461C 80043A1C AC4E0000 */ sw $t6, ($v0) +/* 044620 80043A20 8FAF0028 */ lw $t7, 0x28($sp) +/* 044624 80043A24 3C190D00 */ lui $t9, %hi(D_0D006940) # $t9, 0xd00 +/* 044628 80043A28 27396940 */ addiu $t9, %lo(D_0D006940) # addiu $t9, $t9, 0x6940 +/* 04462C 80043A2C AC4F0004 */ sw $t7, 4($v0) +/* 044630 80043A30 8C620000 */ lw $v0, ($v1) +/* 044634 80043A34 24580008 */ addiu $t8, $v0, 8 +/* 044638 80043A38 AC780000 */ sw $t8, ($v1) +/* 04463C 80043A3C AC590004 */ sw $t9, 4($v0) +/* 044640 80043A40 AC480000 */ sw $t0, ($v0) +/* 044644 80043A44 8FBF0014 */ lw $ra, 0x14($sp) +/* 044648 80043A48 27BD0018 */ addiu $sp, $sp, 0x18 +/* 04464C 80043A4C 03E00008 */ jr $ra +/* 044650 80043A50 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80043A54.s b/asm/non_matchings/code_800431B0/func_80043A54.s deleted file mode 100644 index 67e83bdb4..000000000 --- a/asm/non_matchings/code_800431B0/func_80043A54.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80043A54 -/* 044654 80043A54 00001825 */ move $v1, $zero -/* 044658 80043A58 00801025 */ move $v0, $a0 -/* 04465C 80043A5C 24060001 */ li $a2, 1 -.L80043A60: -/* 044660 80043A60 24630001 */ addiu $v1, $v1, 1 -/* 044664 80043A64 04410003 */ bgez $v0, .L80043A74 -/* 044668 80043A68 00022843 */ sra $a1, $v0, 1 -/* 04466C 80043A6C 24410001 */ addiu $at, $v0, 1 -/* 044670 80043A70 00012843 */ sra $a1, $at, 1 -.L80043A74: -/* 044674 80043A74 14A6FFFA */ bne $a1, $a2, .L80043A60 -/* 044678 80043A78 00A01025 */ move $v0, $a1 -/* 04467C 80043A7C 03E00008 */ jr $ra -/* 044680 80043A80 00601025 */ move $v0, $v1 diff --git a/src/code_80040E50.c b/src/code_80040E50.c index 507686cc7..21e66c210 100644 --- a/src/code_80040E50.c +++ b/src/code_80040E50.c @@ -1098,6 +1098,23 @@ void func_80042E00(s32 arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042E00.s") #endif +#ifdef MIPS_TO_C +UNUSED void func_80042EB8(s32 arg0, s32 arg1, ? arg2) { + ? sp20; + void* temp_v1; + + func_80042760(arg2, &sp20, arg0, arg1, arg2); + func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); + temp_v1 = gDisplayListHead; + gDisplayListHead = temp_v1 + 8; + temp_v1->unk0 = 0x01020040; + temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + D_8018D120 += 1; +} +#else +GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042EB8.s") +#endif + #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80022180(void *, ? *, s32 *); // extern diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 94aafa6ef..f63a742ee 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -2,116 +2,73 @@ #include #include -#ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void func_80042E00(); // extern -extern s32 D_0D006940; +extern void func_80042E00(s32, s32, f32); // extern +extern s8 D_0D006940[]; extern Gfx *gDisplayListHead; -void func_800431B0(UNUSED f32 arg0, Vtx *arg2, s8 arg3) { - //void *temp_v0; - //void *temp_v0_2; - - func_80042E00(arg0, arg2); - //temp_v0 = gDisplayListHead; - //gDisplayListHead = temp_v0 + 8; - - gSPVertex(gDisplayListHead++, arg2, 4, 0); - gSPDisplayList(gDisplayListHead++, PHYSICAL_TO_VIRTUAL(&D_0D006940)); - - - /*temp_v0->unk0 = 0x400103F; - temp_v0->unk4 = arg3; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = &D_0D006940; - temp_v0_2->unk0 = 0x6000000;*/ +void func_800431B0(s32 arg0, Vtx *arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPVertex(gDisplayListHead++, arg3, 4, 0); + gSPDisplayList(gDisplayListHead++, &D_0D006940); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800431B0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -extern ? D_0D0077A0; -extern void *gDisplayListHead; - -void func_80043220(? arg2, s32 arg3) { - void *temp_v0; - void *temp_v0_2; - - func_80042E00(arg2, arg2); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = &D_0D0077A0; - temp_v0->unk0 = 0x6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x6000000; - temp_v0_2->unk4 = arg3; +extern s8 D_0D0077A0[]; +void func_80043220(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, &D_0D0077A0); + gSPDisplayList(gDisplayListHead++, arg3); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043220.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -extern ? D_0D0077D0; -extern void *gDisplayListHead; - -void func_80043328(? arg2, s32 arg3) { - void *temp_v0; - void *temp_v0_2; - - func_80042E00(arg2, arg2); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = &D_0D0077D0; - temp_v0->unk0 = 0x6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x6000000; - temp_v0_2->unk4 = arg3; +UNUSED void func_800433288(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, &D_0D0077A0); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); + gSPDisplayList(gDisplayListHead++, arg3); + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043328.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -extern ? D_0D007850; -extern void *gDisplayListHead; +extern s8 D_0D0077D0[]; -void func_80043500(? arg2, s32 arg3) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - - func_80042E00(arg2, arg2); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = &D_0D007850; - temp_v0->unk0 = 0x6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0x3000; - temp_v0_2->unk0 = 0xB6000000; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x6000000; - temp_v0_3->unk4 = arg3; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0x2000; - temp_v0_4->unk0 = 0xB7000000; +void func_80043328(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D0077D0); + gSPDisplayList(gDisplayListHead++, arg3); +} + +extern s8 D_0D0077F8[]; +extern s8 D_0D007828[]; + +UNUSED void *func_80043390(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, &D_0D0077F8); + gSPDisplayList(gDisplayListHead++, arg3); +} + +UNUSED void func_800433F8(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, &D_0D007828); + gSPDisplayList(gDisplayListHead++, arg3); +} + +UNUSED void func_80043460(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, &D_0D007828); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); + gSPDisplayList(gDisplayListHead++, arg3); + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); +} + +extern s8 D_0D007850[]; + +void func_80043500(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { + + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, &D_0D007850); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); + gSPDisplayList(gDisplayListHead++, arg3); + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043500.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -153,27 +110,181 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800435A0.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80043A54(s32 arg0) { - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - s32 phi_v1; +UNUSED void func_80043668(? arg2, s32 arg3) { + void* temp_v0; + void* temp_v0_2; - phi_v0 = arg0; - phi_v1 = 0; - do { - temp_v1 = phi_v1 + 1; - temp_a1 = phi_v0 / 2; - phi_v0 = temp_a1; - phi_v1 = temp_v1; - } while (temp_a1 != 1); - return temp_v1; + func_80042E00(arg2, arg2); + temp_v0 = gDisplayListHead; + gDisplayListHead = temp_v0 + 8; + temp_v0->unk4 = &D_0D0078A0; + temp_v0->unk0 = 0x06000000; + temp_v0_2 = gDisplayListHead; + gDisplayListHead = temp_v0_2 + 8; + temp_v0_2->unk0 = 0x06000000; + temp_v0_2->unk4 = arg3; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043A54.s") +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043668.s") #endif +#ifdef MIPS_TO_C +UNUSED void func_800436D0(s32 arg2, ? arg3, s32 arg4) { + void* temp_v0; + void* temp_v0_2; + void* temp_v0_3; + + func_80042330(arg3, arg2 & 0xFFFF, arg3); + temp_v0 = gDisplayListHead; + gDisplayListHead = temp_v0 + 8; + temp_v0->unk4 = &D_0D0078A0; + temp_v0->unk0 = 0x06000000; + temp_v0_2 = gDisplayListHead; + gDisplayListHead = temp_v0_2 + 8; + temp_v0_2->unk0 = 0x04000C2F; + temp_v0_2->unk4 = arg4; + temp_v0_3 = gDisplayListHead; + gDisplayListHead = temp_v0_3 + 8; + temp_v0_3->unk4 = &D_0D006930; + temp_v0_3->unk0 = 0x06000000; +} +#else +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800436D0.s") +#endif + +#ifdef MIPS_TO_C +UNUSED void func_80043764(s32 arg2, ? arg3, s32 arg4) { + void* temp_v0; + void* temp_v0_2; + void* temp_v0_3; + + func_80042330(arg3, arg2 & 0xFFFF, arg3); + temp_v0 = gDisplayListHead; + gDisplayListHead = temp_v0 + 8; + temp_v0->unk4 = &D_0D0078A0; + temp_v0->unk0 = 0x06000000; + temp_v0_2 = gDisplayListHead; + gDisplayListHead = temp_v0_2 + 8; + temp_v0_2->unk0 = 0x0400103F; + temp_v0_2->unk4 = arg4; + temp_v0_3 = gDisplayListHead; + gDisplayListHead = temp_v0_3 + 8; + temp_v0_3->unk4 = &D_0D006940; + temp_v0_3->unk0 = 0x06000000; +} +#else +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043764.s") +#endif + +#ifdef MIPS_TO_C +UNUSED void func_800437F8(s32 arg2, ? arg3, void* arg4, s32 arg5) { + void* temp_v0; + void* temp_v0_2; + void* temp_v0_3; + void* temp_v0_4; + + func_80042330(arg3, arg2 & 0xFFFF, arg3); + temp_v0 = gDisplayListHead; + gDisplayListHead = temp_v0 + 8; + temp_v0->unk4 = &D_0D0078A0; + temp_v0->unk0 = 0x06000000; + temp_v0_2 = gDisplayListHead; + gDisplayListHead = temp_v0_2 + 8; + temp_v0_2->unk0 = 0xB900031D; + temp_v0_2->unk4 = 0x504340; + arg4->unkF = (s8) arg5; + arg4->unk1F = (s8) arg5; + arg4->unk2F = (s8) arg5; + arg4->unk3F = (s8) arg5; + temp_v0_3 = gDisplayListHead; + gDisplayListHead = temp_v0_3 + 8; + temp_v0_3->unk4 = arg4; + temp_v0_3->unk0 = 0x0400103F; + temp_v0_4 = gDisplayListHead; + gDisplayListHead = temp_v0_4 + 8; + temp_v0_4->unk4 = &D_0D006940; + temp_v0_4->unk0 = 0x06000000; +} +#else +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800437F8.s") +#endif + +#ifdef MIPS_TO_C +UNUSED void func_800438C4(s32 arg2, ? arg3, void* arg4, s32 arg5) { + void* temp_v0; + void* temp_v0_2; + void* temp_v0_3; + void* temp_v0_4; + + arg4->unk10 = (s16) arg5; + arg4->unk20 = (s16) arg5; + func_80042330(arg3, arg2 & 0xFFFF, arg3); + temp_v0 = gDisplayListHead; + gDisplayListHead = temp_v0 + 8; + temp_v0->unk4 = &D_0D0078A0; + temp_v0->unk0 = 0x06000000; + temp_v0_2 = gDisplayListHead; + gDisplayListHead = temp_v0_2 + 8; + temp_v0_2->unk0 = 0xB900031D; + temp_v0_2->unk4 = 0x504340; + temp_v0_3 = gDisplayListHead; + gDisplayListHead = temp_v0_3 + 8; + temp_v0_3->unk0 = 0x0400103F; + temp_v0_3->unk4 = arg4; + temp_v0_4 = gDisplayListHead; + gDisplayListHead = temp_v0_4 + 8; + temp_v0_4->unk4 = &D_0D006940; + temp_v0_4->unk0 = 0x06000000; +} +#else +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800438C4.s") +#endif + +#ifdef MIPS_TO_C +UNUSED void func_8004398C(s32 arg2, ? arg3, void* arg4, s32 arg5) { + void* temp_v0; + void* temp_v0_2; + void* temp_v0_3; + void* temp_v0_4; + + arg4->unk0 = (s16) arg5; + arg4->unk30 = (s16) arg5; + func_80042330(arg3, arg2 & 0xFFFF, arg3); + temp_v0 = gDisplayListHead; + gDisplayListHead = temp_v0 + 8; + temp_v0->unk4 = &D_0D0078A0; + temp_v0->unk0 = 0x06000000; + temp_v0_2 = gDisplayListHead; + gDisplayListHead = temp_v0_2 + 8; + temp_v0_2->unk0 = 0xB900031D; + temp_v0_2->unk4 = 0x504340; + temp_v0_3 = gDisplayListHead; + gDisplayListHead = temp_v0_3 + 8; + temp_v0_3->unk0 = 0x0400103F; + temp_v0_3->unk4 = arg4; + temp_v0_4 = gDisplayListHead; + gDisplayListHead = temp_v0_4 + 8; + temp_v0_4->unk4 = &D_0D006940; + temp_v0_4->unk0 = 0x06000000; +} +#else +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004398C.s") +#endif + +s32 func_80043A54(s32 arg0) { + s32 temp_a1; + s32 phi_v0; + s32 phi_v1 = 0; + + phi_v0 = arg0; + do { + phi_v1++; + temp_a1 = phi_v0 / 2; + phi_v0 = temp_a1; + } while (temp_a1 != 1); + return phi_v1; +} + #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern void *gDisplayListHead;