From a561011fa22afdb68ba88253a466872fd2536839 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Mon, 27 Jun 2022 22:42:42 -0600 Subject: [PATCH] Matched funcs in code_800431B0.c (#231) * Matched funcs in code_800431B0.c --- .../code_800431B0/func_800435A0.s | 51 - .../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_80043C28.s | 75 - .../code_800431B0/func_800440B8.s | 75 - .../code_800431B0/func_80044388.s | 75 - .../code_800431B0/func_80044658.s | 74 - .../code_800431B0/func_80044924.s | 81 - .../code_800431B0/func_80044AB8.s | 82 + .../code_800431B0/func_800463B0.s | 30 - .../code_800431B0/func_80046424.s | 44 - .../code_800431B0/func_800464D0.s | 60 - .../code_800431B0/func_800465B8.s | 64 - .../code_800431B0/func_800466B0.s | 89 - .../code_800431B0/func_80046808.s | 56 - .../code_800431B0/func_800468E0.s | 74 - .../code_800431B0/func_80046A00.s | 292 --- .../code_800431B0/func_80046E60.s | 65 - .../code_800431B0/func_80046F60.s | 67 - .../code_800431B0/func_8004788C.s | 34 - .../code_800431B0/func_80047910.s | 34 - .../code_800431B0/func_80047994.s | 34 - .../code_800431B0/func_80047A18.s | 34 - .../code_800431B0/func_80047A9C.s | 66 - .../code_800431B0/func_80047B9C.s | 72 - .../code_800431B0/func_80047CB4.s | 104 -- .../code_800431B0/func_80047E48.s | 64 - .../code_800431B0/func_80047F40.s | 96 - .../code_800431B0/func_800480B4.s | 32 - .../code_800431B0/func_80048130.s | 98 - .../code_800431B0/func_800482AC.s | 68 - .../code_800431B0/func_800483B4.s | 68 - .../code_800431B0/func_800484BC.s | 34 - .../code_800431B0/func_80048540.s | 34 - .../{func_800485C4.s => func_800486B0.s} | 62 +- src/code_800431B0.c | 1599 ++++++----------- 39 files changed, 603 insertions(+), 3514 deletions(-) delete mode 100644 asm/non_matchings/code_800431B0/func_800435A0.s delete mode 100644 asm/non_matchings/code_800431B0/func_800436D0.s delete mode 100644 asm/non_matchings/code_800431B0/func_80043764.s delete mode 100644 asm/non_matchings/code_800431B0/func_800437F8.s delete mode 100644 asm/non_matchings/code_800431B0/func_800438C4.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004398C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80043C28.s delete mode 100644 asm/non_matchings/code_800431B0/func_800440B8.s delete mode 100644 asm/non_matchings/code_800431B0/func_80044388.s delete mode 100644 asm/non_matchings/code_800431B0/func_80044658.s create mode 100644 asm/non_matchings/code_800431B0/func_80044AB8.s delete mode 100644 asm/non_matchings/code_800431B0/func_800463B0.s delete mode 100644 asm/non_matchings/code_800431B0/func_80046424.s delete mode 100644 asm/non_matchings/code_800431B0/func_800464D0.s delete mode 100644 asm/non_matchings/code_800431B0/func_800465B8.s delete mode 100644 asm/non_matchings/code_800431B0/func_800466B0.s delete mode 100644 asm/non_matchings/code_800431B0/func_80046808.s delete mode 100644 asm/non_matchings/code_800431B0/func_800468E0.s delete mode 100644 asm/non_matchings/code_800431B0/func_80046A00.s delete mode 100644 asm/non_matchings/code_800431B0/func_80046E60.s delete mode 100644 asm/non_matchings/code_800431B0/func_80046F60.s delete mode 100644 asm/non_matchings/code_800431B0/func_8004788C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047910.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047994.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047A18.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047A9C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047B9C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047CB4.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047E48.s delete mode 100644 asm/non_matchings/code_800431B0/func_80047F40.s delete mode 100644 asm/non_matchings/code_800431B0/func_800480B4.s delete mode 100644 asm/non_matchings/code_800431B0/func_80048130.s delete mode 100644 asm/non_matchings/code_800431B0/func_800482AC.s delete mode 100644 asm/non_matchings/code_800431B0/func_800483B4.s delete mode 100644 asm/non_matchings/code_800431B0/func_800484BC.s delete mode 100644 asm/non_matchings/code_800431B0/func_80048540.s rename asm/non_matchings/code_800431B0/{func_800485C4.s => func_800486B0.s} (89%) diff --git a/asm/non_matchings/code_800431B0/func_800435A0.s b/asm/non_matchings/code_800431B0/func_800435A0.s deleted file mode 100644 index fb2db981c..000000000 --- a/asm/non_matchings/code_800431B0/func_800435A0.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800435A0 -/* 0441A0 800435A0 44866000 */ mtc1 $a2, $f12 -/* 0441A4 800435A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0441A8 800435A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0441AC 800435AC 44066000 */ mfc1 $a2, $f12 -/* 0441B0 800435B0 0C010BDC */ jal func_80042F70 -/* 0441B4 800435B4 AFA70024 */ sw $a3, 0x24($sp) -/* 0441B8 800435B8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0441BC 800435BC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0441C0 800435C0 8C620000 */ lw $v0, ($v1) -/* 0441C4 800435C4 3C0F0D00 */ lui $t7, %hi(D_0D007878) # $t7, 0xd00 -/* 0441C8 800435C8 3C090600 */ lui $t1, 0x600 -/* 0441CC 800435CC 244E0008 */ addiu $t6, $v0, 8 -/* 0441D0 800435D0 AC6E0000 */ sw $t6, ($v1) -/* 0441D4 800435D4 25EF7878 */ addiu $t7, %lo(D_0D007878) # addiu $t7, $t7, 0x7878 -/* 0441D8 800435D8 AC4F0004 */ sw $t7, 4($v0) -/* 0441DC 800435DC AC490000 */ sw $t1, ($v0) -/* 0441E0 800435E0 8C620000 */ lw $v0, ($v1) -/* 0441E4 800435E4 3C19FA00 */ lui $t9, 0xfa00 -/* 0441E8 800435E8 2401FF00 */ li $at, -256 -/* 0441EC 800435EC 24580008 */ addiu $t8, $v0, 8 -/* 0441F0 800435F0 AC780000 */ sw $t8, ($v1) -/* 0441F4 800435F4 AC590000 */ sw $t9, ($v0) -/* 0441F8 800435F8 8FAA0028 */ lw $t2, 0x28($sp) -/* 0441FC 800435FC 240F3000 */ li $t7, 12288 -/* 044200 80043600 3C0EB600 */ lui $t6, 0xb600 -/* 044204 80043604 314B00FF */ andi $t3, $t2, 0xff -/* 044208 80043608 01616025 */ or $t4, $t3, $at -/* 04420C 8004360C AC4C0004 */ sw $t4, 4($v0) -/* 044210 80043610 8C620000 */ lw $v0, ($v1) -/* 044214 80043614 240C2000 */ li $t4, 8192 -/* 044218 80043618 3C0BB700 */ lui $t3, 0xb700 -/* 04421C 8004361C 244D0008 */ addiu $t5, $v0, 8 -/* 044220 80043620 AC6D0000 */ sw $t5, ($v1) -/* 044224 80043624 AC4F0004 */ sw $t7, 4($v0) -/* 044228 80043628 AC4E0000 */ sw $t6, ($v0) -/* 04422C 8004362C 8C620000 */ lw $v0, ($v1) -/* 044230 80043630 24580008 */ addiu $t8, $v0, 8 -/* 044234 80043634 AC780000 */ sw $t8, ($v1) -/* 044238 80043638 AC490000 */ sw $t1, ($v0) -/* 04423C 8004363C 8FB90024 */ lw $t9, 0x24($sp) -/* 044240 80043640 AC590004 */ sw $t9, 4($v0) -/* 044244 80043644 8C620000 */ lw $v0, ($v1) -/* 044248 80043648 244A0008 */ addiu $t2, $v0, 8 -/* 04424C 8004364C AC6A0000 */ sw $t2, ($v1) -/* 044250 80043650 AC4C0004 */ sw $t4, 4($v0) -/* 044254 80043654 AC4B0000 */ sw $t3, ($v0) -/* 044258 80043658 8FBF0014 */ lw $ra, 0x14($sp) -/* 04425C 8004365C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 044260 80043660 03E00008 */ jr $ra -/* 044264 80043664 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800436D0.s b/asm/non_matchings/code_800431B0/func_800436D0.s deleted file mode 100644 index 987f4440f..000000000 --- a/asm/non_matchings/code_800431B0/func_800436D0.s +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 9bee4ae10..000000000 --- a/asm/non_matchings/code_800431B0/func_80043764.s +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index c1ed4fea8..000000000 --- a/asm/non_matchings/code_800431B0/func_800437F8.s +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index 519881079..000000000 --- a/asm/non_matchings/code_800431B0/func_800438C4.s +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index 637d36d7f..000000000 --- a/asm/non_matchings/code_800431B0/func_8004398C.s +++ /dev/null @@ -1,51 +0,0 @@ -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_80043C28.s b/asm/non_matchings/code_800431B0/func_80043C28.s deleted file mode 100644 index 1cdb36526..000000000 --- a/asm/non_matchings/code_800431B0/func_80043C28.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80043C28 -/* 044828 80043C28 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04482C 80043C2C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 044830 80043C30 8C620000 */ lw $v0, ($v1) -/* 044834 80043C34 24A8FFFF */ addiu $t0, $a1, -1 -/* 044838 80043C38 310F0FFF */ andi $t7, $t0, 0xfff -/* 04483C 80043C3C 244E0008 */ addiu $t6, $v0, 8 -/* 044840 80043C40 AC6E0000 */ sw $t6, ($v1) -/* 044844 80043C44 3C01FD18 */ lui $at, 0xfd18 -/* 044848 80043C48 01E1C025 */ or $t8, $t7, $at -/* 04484C 80043C4C 00055040 */ sll $t2, $a1, 1 -/* 044850 80043C50 AC580000 */ sw $t8, ($v0) -/* 044854 80043C54 AC440004 */ sw $a0, 4($v0) -/* 044858 80043C58 8C620000 */ lw $v0, ($v1) -/* 04485C 80043C5C 254A0007 */ addiu $t2, $t2, 7 -/* 044860 80043C60 000A70C3 */ sra $t6, $t2, 3 -/* 044864 80043C64 31CF01FF */ andi $t7, $t6, 0x1ff -/* 044868 80043C68 24590008 */ addiu $t9, $v0, 8 -/* 04486C 80043C6C AC790000 */ sw $t9, ($v1) -/* 044870 80043C70 000FC240 */ sll $t8, $t7, 9 -/* 044874 80043C74 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 044878 80043C78 3C01F518 */ lui $at, 0xf518 -/* 04487C 80043C7C 03015025 */ or $t2, $t8, $at -/* 044880 80043C80 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 044884 80043C84 AC4E0004 */ sw $t6, 4($v0) -/* 044888 80043C88 AC4A0000 */ sw $t2, ($v0) -/* 04488C 80043C8C 8C620000 */ lw $v0, ($v1) -/* 044890 80043C90 3C18E600 */ lui $t8, 0xe600 -/* 044894 80043C94 3C0EF400 */ lui $t6, 0xf400 -/* 044898 80043C98 244F0008 */ addiu $t7, $v0, 8 -/* 04489C 80043C9C AC6F0000 */ sw $t7, ($v1) -/* 0448A0 80043CA0 AC400004 */ sw $zero, 4($v0) -/* 0448A4 80043CA4 AC580000 */ sw $t8, ($v0) -/* 0448A8 80043CA8 8C620000 */ lw $v0, ($v1) -/* 0448AC 80043CAC 00086880 */ sll $t5, $t0, 2 -/* 0448B0 80043CB0 31AF0FFF */ andi $t7, $t5, 0xfff -/* 0448B4 80043CB4 24590008 */ addiu $t9, $v0, 8 -/* 0448B8 80043CB8 AC790000 */ sw $t9, ($v1) -/* 0448BC 80043CBC 24D9FFFF */ addiu $t9, $a2, -1 -/* 0448C0 80043CC0 AC4E0000 */ sw $t6, ($v0) -/* 0448C4 80043CC4 00197080 */ sll $t6, $t9, 2 -/* 0448C8 80043CC8 000F6B00 */ sll $t5, $t7, 0xc -/* 0448CC 80043CCC 31CF0FFF */ andi $t7, $t6, 0xfff -/* 0448D0 80043CD0 3C010700 */ lui $at, 0x700 -/* 0448D4 80043CD4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0448D8 80043CD8 01A1C025 */ or $t8, $t5, $at -/* 0448DC 80043CDC 030FC825 */ or $t9, $t8, $t7 -/* 0448E0 80043CE0 AFAF0000 */ sw $t7, ($sp) -/* 0448E4 80043CE4 AC590004 */ sw $t9, 4($v0) -/* 0448E8 80043CE8 8C620000 */ lw $v0, ($v1) -/* 0448EC 80043CEC 3C18E700 */ lui $t8, 0xe700 -/* 0448F0 80043CF0 244E0008 */ addiu $t6, $v0, 8 -/* 0448F4 80043CF4 AC6E0000 */ sw $t6, ($v1) -/* 0448F8 80043CF8 AFA20014 */ sw $v0, 0x14($sp) -/* 0448FC 80043CFC AC400004 */ sw $zero, 4($v0) -/* 044900 80043D00 AC580000 */ sw $t8, ($v0) -/* 044904 80043D04 8C620000 */ lw $v0, ($v1) -/* 044908 80043D08 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 04490C 80043D0C 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 044910 80043D10 24590008 */ addiu $t9, $v0, 8 -/* 044914 80043D14 AC790000 */ sw $t9, ($v1) -/* 044918 80043D18 AFA20010 */ sw $v0, 0x10($sp) -/* 04491C 80043D1C AC580004 */ sw $t8, 4($v0) -/* 044920 80043D20 AC4A0000 */ sw $t2, ($v0) -/* 044924 80043D24 8C620000 */ lw $v0, ($v1) -/* 044928 80043D28 3C19F200 */ lui $t9, 0xf200 -/* 04492C 80043D2C 244F0008 */ addiu $t7, $v0, 8 -/* 044930 80043D30 AC6F0000 */ sw $t7, ($v1) -/* 044934 80043D34 AFA2000C */ sw $v0, 0xc($sp) -/* 044938 80043D38 AC590000 */ sw $t9, ($v0) -/* 04493C 80043D3C 8FAE0000 */ lw $t6, ($sp) -/* 044940 80043D40 27BD0028 */ addiu $sp, $sp, 0x28 -/* 044944 80043D44 01AE7825 */ or $t7, $t5, $t6 -/* 044948 80043D48 03E00008 */ jr $ra -/* 04494C 80043D4C AC4F0004 */ sw $t7, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_800440B8.s b/asm/non_matchings/code_800431B0/func_800440B8.s deleted file mode 100644 index 4f02139c1..000000000 --- a/asm/non_matchings/code_800431B0/func_800440B8.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_800440B8 -/* 044CB8 800440B8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 044CBC 800440BC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 044CC0 800440C0 8C620000 */ lw $v0, ($v1) -/* 044CC4 800440C4 24A8FFFF */ addiu $t0, $a1, -1 -/* 044CC8 800440C8 310F0FFF */ andi $t7, $t0, 0xfff -/* 044CCC 800440CC 244E0008 */ addiu $t6, $v0, 8 -/* 044CD0 800440D0 AC6E0000 */ sw $t6, ($v1) -/* 044CD4 800440D4 3C01FD10 */ lui $at, 0xfd10 -/* 044CD8 800440D8 01E1C025 */ or $t8, $t7, $at -/* 044CDC 800440DC 00055040 */ sll $t2, $a1, 1 -/* 044CE0 800440E0 AC580000 */ sw $t8, ($v0) -/* 044CE4 800440E4 AC440004 */ sw $a0, 4($v0) -/* 044CE8 800440E8 8C620000 */ lw $v0, ($v1) -/* 044CEC 800440EC 254A0007 */ addiu $t2, $t2, 7 -/* 044CF0 800440F0 000A70C3 */ sra $t6, $t2, 3 -/* 044CF4 800440F4 31CF01FF */ andi $t7, $t6, 0x1ff -/* 044CF8 800440F8 24590008 */ addiu $t9, $v0, 8 -/* 044CFC 800440FC AC790000 */ sw $t9, ($v1) -/* 044D00 80044100 000FC240 */ sll $t8, $t7, 9 -/* 044D04 80044104 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 044D08 80044108 3C01F510 */ lui $at, 0xf510 -/* 044D0C 8004410C 03015025 */ or $t2, $t8, $at -/* 044D10 80044110 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 044D14 80044114 AC4E0004 */ sw $t6, 4($v0) -/* 044D18 80044118 AC4A0000 */ sw $t2, ($v0) -/* 044D1C 8004411C 8C620000 */ lw $v0, ($v1) -/* 044D20 80044120 3C18E600 */ lui $t8, 0xe600 -/* 044D24 80044124 3C0EF400 */ lui $t6, 0xf400 -/* 044D28 80044128 244F0008 */ addiu $t7, $v0, 8 -/* 044D2C 8004412C AC6F0000 */ sw $t7, ($v1) -/* 044D30 80044130 AC400004 */ sw $zero, 4($v0) -/* 044D34 80044134 AC580000 */ sw $t8, ($v0) -/* 044D38 80044138 8C620000 */ lw $v0, ($v1) -/* 044D3C 8004413C 00086880 */ sll $t5, $t0, 2 -/* 044D40 80044140 31AF0FFF */ andi $t7, $t5, 0xfff -/* 044D44 80044144 24590008 */ addiu $t9, $v0, 8 -/* 044D48 80044148 AC790000 */ sw $t9, ($v1) -/* 044D4C 8004414C 24D9FFFF */ addiu $t9, $a2, -1 -/* 044D50 80044150 AC4E0000 */ sw $t6, ($v0) -/* 044D54 80044154 00197080 */ sll $t6, $t9, 2 -/* 044D58 80044158 000F6B00 */ sll $t5, $t7, 0xc -/* 044D5C 8004415C 31CF0FFF */ andi $t7, $t6, 0xfff -/* 044D60 80044160 3C010700 */ lui $at, 0x700 -/* 044D64 80044164 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 044D68 80044168 01A1C025 */ or $t8, $t5, $at -/* 044D6C 8004416C 030FC825 */ or $t9, $t8, $t7 -/* 044D70 80044170 AFAF0000 */ sw $t7, ($sp) -/* 044D74 80044174 AC590004 */ sw $t9, 4($v0) -/* 044D78 80044178 8C620000 */ lw $v0, ($v1) -/* 044D7C 8004417C 3C18E700 */ lui $t8, 0xe700 -/* 044D80 80044180 244E0008 */ addiu $t6, $v0, 8 -/* 044D84 80044184 AC6E0000 */ sw $t6, ($v1) -/* 044D88 80044188 AFA20014 */ sw $v0, 0x14($sp) -/* 044D8C 8004418C AC400004 */ sw $zero, 4($v0) -/* 044D90 80044190 AC580000 */ sw $t8, ($v0) -/* 044D94 80044194 8C620000 */ lw $v0, ($v1) -/* 044D98 80044198 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 044D9C 8004419C 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 044DA0 800441A0 24590008 */ addiu $t9, $v0, 8 -/* 044DA4 800441A4 AC790000 */ sw $t9, ($v1) -/* 044DA8 800441A8 AFA20010 */ sw $v0, 0x10($sp) -/* 044DAC 800441AC AC580004 */ sw $t8, 4($v0) -/* 044DB0 800441B0 AC4A0000 */ sw $t2, ($v0) -/* 044DB4 800441B4 8C620000 */ lw $v0, ($v1) -/* 044DB8 800441B8 3C19F200 */ lui $t9, 0xf200 -/* 044DBC 800441BC 244F0008 */ addiu $t7, $v0, 8 -/* 044DC0 800441C0 AC6F0000 */ sw $t7, ($v1) -/* 044DC4 800441C4 AFA2000C */ sw $v0, 0xc($sp) -/* 044DC8 800441C8 AC590000 */ sw $t9, ($v0) -/* 044DCC 800441CC 8FAE0000 */ lw $t6, ($sp) -/* 044DD0 800441D0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 044DD4 800441D4 01AE7825 */ or $t7, $t5, $t6 -/* 044DD8 800441D8 03E00008 */ jr $ra -/* 044DDC 800441DC AC4F0004 */ sw $t7, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_80044388.s b/asm/non_matchings/code_800431B0/func_80044388.s deleted file mode 100644 index 1c18a415d..000000000 --- a/asm/non_matchings/code_800431B0/func_80044388.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80044388 -/* 044F88 80044388 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 044F8C 8004438C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 044F90 80044390 8C620000 */ lw $v0, ($v1) -/* 044F94 80044394 24A8FFFF */ addiu $t0, $a1, -1 -/* 044F98 80044398 310F0FFF */ andi $t7, $t0, 0xfff -/* 044F9C 8004439C 244E0008 */ addiu $t6, $v0, 8 -/* 044FA0 800443A0 AC6E0000 */ sw $t6, ($v1) -/* 044FA4 800443A4 3C01FD70 */ lui $at, 0xfd70 -/* 044FA8 800443A8 01E1C025 */ or $t8, $t7, $at -/* 044FAC 800443AC 00055040 */ sll $t2, $a1, 1 -/* 044FB0 800443B0 AC580000 */ sw $t8, ($v0) -/* 044FB4 800443B4 AC440004 */ sw $a0, 4($v0) -/* 044FB8 800443B8 8C620000 */ lw $v0, ($v1) -/* 044FBC 800443BC 254A0007 */ addiu $t2, $t2, 7 -/* 044FC0 800443C0 000A70C3 */ sra $t6, $t2, 3 -/* 044FC4 800443C4 31CF01FF */ andi $t7, $t6, 0x1ff -/* 044FC8 800443C8 24590008 */ addiu $t9, $v0, 8 -/* 044FCC 800443CC AC790000 */ sw $t9, ($v1) -/* 044FD0 800443D0 000FC240 */ sll $t8, $t7, 9 -/* 044FD4 800443D4 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 044FD8 800443D8 3C01F570 */ lui $at, 0xf570 -/* 044FDC 800443DC 03015025 */ or $t2, $t8, $at -/* 044FE0 800443E0 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 044FE4 800443E4 AC4E0004 */ sw $t6, 4($v0) -/* 044FE8 800443E8 AC4A0000 */ sw $t2, ($v0) -/* 044FEC 800443EC 8C620000 */ lw $v0, ($v1) -/* 044FF0 800443F0 3C18E600 */ lui $t8, 0xe600 -/* 044FF4 800443F4 3C0EF400 */ lui $t6, 0xf400 -/* 044FF8 800443F8 244F0008 */ addiu $t7, $v0, 8 -/* 044FFC 800443FC AC6F0000 */ sw $t7, ($v1) -/* 045000 80044400 AC400004 */ sw $zero, 4($v0) -/* 045004 80044404 AC580000 */ sw $t8, ($v0) -/* 045008 80044408 8C620000 */ lw $v0, ($v1) -/* 04500C 8004440C 00086880 */ sll $t5, $t0, 2 -/* 045010 80044410 31AF0FFF */ andi $t7, $t5, 0xfff -/* 045014 80044414 24590008 */ addiu $t9, $v0, 8 -/* 045018 80044418 AC790000 */ sw $t9, ($v1) -/* 04501C 8004441C 24D9FFFF */ addiu $t9, $a2, -1 -/* 045020 80044420 AC4E0000 */ sw $t6, ($v0) -/* 045024 80044424 00197080 */ sll $t6, $t9, 2 -/* 045028 80044428 000F6B00 */ sll $t5, $t7, 0xc -/* 04502C 8004442C 31CF0FFF */ andi $t7, $t6, 0xfff -/* 045030 80044430 3C010700 */ lui $at, 0x700 -/* 045034 80044434 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 045038 80044438 01A1C025 */ or $t8, $t5, $at -/* 04503C 8004443C 030FC825 */ or $t9, $t8, $t7 -/* 045040 80044440 AFAF0000 */ sw $t7, ($sp) -/* 045044 80044444 AC590004 */ sw $t9, 4($v0) -/* 045048 80044448 8C620000 */ lw $v0, ($v1) -/* 04504C 8004444C 3C18E700 */ lui $t8, 0xe700 -/* 045050 80044450 244E0008 */ addiu $t6, $v0, 8 -/* 045054 80044454 AC6E0000 */ sw $t6, ($v1) -/* 045058 80044458 AFA20014 */ sw $v0, 0x14($sp) -/* 04505C 8004445C AC400004 */ sw $zero, 4($v0) -/* 045060 80044460 AC580000 */ sw $t8, ($v0) -/* 045064 80044464 8C620000 */ lw $v0, ($v1) -/* 045068 80044468 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 04506C 8004446C 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 045070 80044470 24590008 */ addiu $t9, $v0, 8 -/* 045074 80044474 AC790000 */ sw $t9, ($v1) -/* 045078 80044478 AFA20010 */ sw $v0, 0x10($sp) -/* 04507C 8004447C AC580004 */ sw $t8, 4($v0) -/* 045080 80044480 AC4A0000 */ sw $t2, ($v0) -/* 045084 80044484 8C620000 */ lw $v0, ($v1) -/* 045088 80044488 3C19F200 */ lui $t9, 0xf200 -/* 04508C 8004448C 244F0008 */ addiu $t7, $v0, 8 -/* 045090 80044490 AC6F0000 */ sw $t7, ($v1) -/* 045094 80044494 AFA2000C */ sw $v0, 0xc($sp) -/* 045098 80044498 AC590000 */ sw $t9, ($v0) -/* 04509C 8004449C 8FAE0000 */ lw $t6, ($sp) -/* 0450A0 800444A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0450A4 800444A4 01AE7825 */ or $t7, $t5, $t6 -/* 0450A8 800444A8 03E00008 */ jr $ra -/* 0450AC 800444AC AC4F0004 */ sw $t7, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_80044658.s b/asm/non_matchings/code_800431B0/func_80044658.s deleted file mode 100644 index c028cc567..000000000 --- a/asm/non_matchings/code_800431B0/func_80044658.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80044658 -/* 045258 80044658 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04525C 8004465C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 045260 80044660 8C620000 */ lw $v0, ($v1) -/* 045264 80044664 24A8FFFF */ addiu $t0, $a1, -1 -/* 045268 80044668 310F0FFF */ andi $t7, $t0, 0xfff -/* 04526C 8004466C 244E0008 */ addiu $t6, $v0, 8 -/* 045270 80044670 AC6E0000 */ sw $t6, ($v1) -/* 045274 80044674 3C01FD68 */ lui $at, 0xfd68 -/* 045278 80044678 01E1C025 */ or $t8, $t7, $at -/* 04527C 8004467C AC580000 */ sw $t8, ($v0) -/* 045280 80044680 AC440004 */ sw $a0, 4($v0) -/* 045284 80044684 8C620000 */ lw $v0, ($v1) -/* 045288 80044688 24AA0007 */ addiu $t2, $a1, 7 -/* 04528C 8004468C 000A70C3 */ sra $t6, $t2, 3 -/* 045290 80044690 31CF01FF */ andi $t7, $t6, 0x1ff -/* 045294 80044694 24590008 */ addiu $t9, $v0, 8 -/* 045298 80044698 AC790000 */ sw $t9, ($v1) -/* 04529C 8004469C 000FC240 */ sll $t8, $t7, 9 -/* 0452A0 800446A0 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 0452A4 800446A4 3C01F568 */ lui $at, 0xf568 -/* 0452A8 800446A8 03015025 */ or $t2, $t8, $at -/* 0452AC 800446AC 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 0452B0 800446B0 AC4E0004 */ sw $t6, 4($v0) -/* 0452B4 800446B4 AC4A0000 */ sw $t2, ($v0) -/* 0452B8 800446B8 8C620000 */ lw $v0, ($v1) -/* 0452BC 800446BC 3C18E600 */ lui $t8, 0xe600 -/* 0452C0 800446C0 3C0EF400 */ lui $t6, 0xf400 -/* 0452C4 800446C4 244F0008 */ addiu $t7, $v0, 8 -/* 0452C8 800446C8 AC6F0000 */ sw $t7, ($v1) -/* 0452CC 800446CC AC400004 */ sw $zero, 4($v0) -/* 0452D0 800446D0 AC580000 */ sw $t8, ($v0) -/* 0452D4 800446D4 8C620000 */ lw $v0, ($v1) -/* 0452D8 800446D8 00086880 */ sll $t5, $t0, 2 -/* 0452DC 800446DC 31AF0FFF */ andi $t7, $t5, 0xfff -/* 0452E0 800446E0 24590008 */ addiu $t9, $v0, 8 -/* 0452E4 800446E4 AC790000 */ sw $t9, ($v1) -/* 0452E8 800446E8 24D9FFFF */ addiu $t9, $a2, -1 -/* 0452EC 800446EC AC4E0000 */ sw $t6, ($v0) -/* 0452F0 800446F0 00197080 */ sll $t6, $t9, 2 -/* 0452F4 800446F4 000F6B00 */ sll $t5, $t7, 0xc -/* 0452F8 800446F8 31CF0FFF */ andi $t7, $t6, 0xfff -/* 0452FC 800446FC 3C010700 */ lui $at, 0x700 -/* 045300 80044700 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 045304 80044704 01A1C025 */ or $t8, $t5, $at -/* 045308 80044708 030FC825 */ or $t9, $t8, $t7 -/* 04530C 8004470C AFAF0000 */ sw $t7, ($sp) -/* 045310 80044710 AC590004 */ sw $t9, 4($v0) -/* 045314 80044714 8C620000 */ lw $v0, ($v1) -/* 045318 80044718 3C18E700 */ lui $t8, 0xe700 -/* 04531C 8004471C 244E0008 */ addiu $t6, $v0, 8 -/* 045320 80044720 AC6E0000 */ sw $t6, ($v1) -/* 045324 80044724 AFA20014 */ sw $v0, 0x14($sp) -/* 045328 80044728 AC400004 */ sw $zero, 4($v0) -/* 04532C 8004472C AC580000 */ sw $t8, ($v0) -/* 045330 80044730 8C620000 */ lw $v0, ($v1) -/* 045334 80044734 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 045338 80044738 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 04533C 8004473C 24590008 */ addiu $t9, $v0, 8 -/* 045340 80044740 AC790000 */ sw $t9, ($v1) -/* 045344 80044744 AFA20010 */ sw $v0, 0x10($sp) -/* 045348 80044748 AC580004 */ sw $t8, 4($v0) -/* 04534C 8004474C AC4A0000 */ sw $t2, ($v0) -/* 045350 80044750 8C620000 */ lw $v0, ($v1) -/* 045354 80044754 3C19F200 */ lui $t9, 0xf200 -/* 045358 80044758 244F0008 */ addiu $t7, $v0, 8 -/* 04535C 8004475C AC6F0000 */ sw $t7, ($v1) -/* 045360 80044760 AFA2000C */ sw $v0, 0xc($sp) -/* 045364 80044764 AC590000 */ sw $t9, ($v0) -/* 045368 80044768 8FAE0000 */ lw $t6, ($sp) -/* 04536C 8004476C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 045370 80044770 01AE7825 */ or $t7, $t5, $t6 -/* 045374 80044774 03E00008 */ jr $ra -/* 045378 80044778 AC4F0004 */ sw $t7, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_80044924.s b/asm/non_matchings/code_800431B0/func_80044924.s index 222b1fca0..9b5d4417a 100644 --- a/asm/non_matchings/code_800431B0/func_80044924.s +++ b/asm/non_matchings/code_800431B0/func_80044924.s @@ -105,84 +105,3 @@ glabel func_80044924 /* 0456AC 80044AAC AC4F0004 */ sw $t7, 4($v0) /* 0456B0 80044AB0 03E00008 */ jr $ra /* 0456B4 80044AB4 00405825 */ move $t3, $v0 - -/* 0456B8 80044AB8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0456BC 80044ABC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0456C0 80044AC0 8C620000 */ lw $v0, ($v1) -/* 0456C4 80044AC4 00054043 */ sra $t0, $a1, 1 -/* 0456C8 80044AC8 250FFFFF */ addiu $t7, $t0, -1 -/* 0456CC 80044ACC 244E0008 */ addiu $t6, $v0, 8 -/* 0456D0 80044AD0 AC6E0000 */ sw $t6, ($v1) -/* 0456D4 80044AD4 31F80FFF */ andi $t8, $t7, 0xfff -/* 0456D8 80044AD8 3C01FD68 */ lui $at, 0xfd68 -/* 0456DC 80044ADC 0301C825 */ or $t9, $t8, $at -/* 0456E0 80044AE0 AC590000 */ sw $t9, ($v0) -/* 0456E4 80044AE4 AC440004 */ sw $a0, 4($v0) -/* 0456E8 80044AE8 8C620000 */ lw $v0, ($v1) -/* 0456EC 80044AEC 250A0007 */ addiu $t2, $t0, 7 -/* 0456F0 80044AF0 000A78C3 */ sra $t7, $t2, 3 -/* 0456F4 80044AF4 31F801FF */ andi $t8, $t7, 0x1ff -/* 0456F8 80044AF8 244E0008 */ addiu $t6, $v0, 8 -/* 0456FC 80044AFC AC6E0000 */ sw $t6, ($v1) -/* 045700 80044B00 00185240 */ sll $t2, $t8, 9 -/* 045704 80044B04 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 -/* 045708 80044B08 3C01F568 */ lui $at, 0xf568 -/* 04570C 80044B0C 01417025 */ or $t6, $t2, $at -/* 045710 80044B10 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 045714 80044B14 AC4F0004 */ sw $t7, 4($v0) -/* 045718 80044B18 AC4E0000 */ sw $t6, ($v0) -/* 04571C 80044B1C 8C620000 */ lw $v0, ($v1) -/* 045720 80044B20 3C19E600 */ lui $t9, 0xe600 -/* 045724 80044B24 3C0FF400 */ lui $t7, 0xf400 -/* 045728 80044B28 24580008 */ addiu $t8, $v0, 8 -/* 04572C 80044B2C AC780000 */ sw $t8, ($v1) -/* 045730 80044B30 AC400004 */ sw $zero, 4($v0) -/* 045734 80044B34 AC590000 */ sw $t9, ($v0) -/* 045738 80044B38 8C620000 */ lw $v0, ($v1) -/* 04573C 80044B3C 24D8FFFF */ addiu $t8, $a2, -1 -/* 045740 80044B40 0018C880 */ sll $t9, $t8, 2 -/* 045744 80044B44 244E0008 */ addiu $t6, $v0, 8 -/* 045748 80044B48 AC6E0000 */ sw $t6, ($v1) -/* 04574C 80044B4C 24ADFFFF */ addiu $t5, $a1, -1 -/* 045750 80044B50 AC4F0000 */ sw $t7, ($v0) -/* 045754 80044B54 000D7840 */ sll $t7, $t5, 1 -/* 045758 80044B58 31F80FFF */ andi $t8, $t7, 0xfff -/* 04575C 80044B5C 332E0FFF */ andi $t6, $t9, 0xfff -/* 045760 80044B60 0018CB00 */ sll $t9, $t8, 0xc -/* 045764 80044B64 3C010700 */ lui $at, 0x700 -/* 045768 80044B68 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04576C 80044B6C 03217825 */ or $t7, $t9, $at -/* 045770 80044B70 01EEC025 */ or $t8, $t7, $t6 -/* 045774 80044B74 AFAE0000 */ sw $t6, ($sp) -/* 045778 80044B78 AC580004 */ sw $t8, 4($v0) -/* 04577C 80044B7C 8C620000 */ lw $v0, ($v1) -/* 045780 80044B80 3C0FE700 */ lui $t7, 0xe700 -/* 045784 80044B84 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 045788 80044B88 24590008 */ addiu $t9, $v0, 8 -/* 04578C 80044B8C AC790000 */ sw $t9, ($v1) -/* 045790 80044B90 AFA20014 */ sw $v0, 0x14($sp) -/* 045794 80044B94 AC400004 */ sw $zero, 4($v0) -/* 045798 80044B98 AC4F0000 */ sw $t7, ($v0) -/* 04579C 80044B9C 8C620000 */ lw $v0, ($v1) -/* 0457A0 80044BA0 3C01F560 */ lui $at, 0xf560 -/* 0457A4 80044BA4 0141C825 */ or $t9, $t2, $at -/* 0457A8 80044BA8 24580008 */ addiu $t8, $v0, 8 -/* 0457AC 80044BAC AC780000 */ sw $t8, ($v1) -/* 0457B0 80044BB0 AFA20010 */ sw $v0, 0x10($sp) -/* 0457B4 80044BB4 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 0457B8 80044BB8 AC4E0004 */ sw $t6, 4($v0) -/* 0457BC 80044BBC AC590000 */ sw $t9, ($v0) -/* 0457C0 80044BC0 8C620000 */ lw $v0, ($v1) -/* 0457C4 80044BC4 3C19F200 */ lui $t9, 0xf200 -/* 0457C8 80044BC8 000D7880 */ sll $t7, $t5, 2 -/* 0457CC 80044BCC 24580008 */ addiu $t8, $v0, 8 -/* 0457D0 80044BD0 AC780000 */ sw $t8, ($v1) -/* 0457D4 80044BD4 AFA2000C */ sw $v0, 0xc($sp) -/* 0457D8 80044BD8 31F80FFF */ andi $t8, $t7, 0xfff -/* 0457DC 80044BDC AC590000 */ sw $t9, ($v0) -/* 0457E0 80044BE0 8FAF0000 */ lw $t7, ($sp) -/* 0457E4 80044BE4 0018CB00 */ sll $t9, $t8, 0xc -/* 0457E8 80044BE8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0457EC 80044BEC 032FC025 */ or $t8, $t9, $t7 -/* 0457F0 80044BF0 03E00008 */ jr $ra -/* 0457F4 80044BF4 AC580004 */ sw $t8, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_80044AB8.s b/asm/non_matchings/code_800431B0/func_80044AB8.s new file mode 100644 index 000000000..6a11d52d6 --- /dev/null +++ b/asm/non_matchings/code_800431B0/func_80044AB8.s @@ -0,0 +1,82 @@ + +glabel func_80044AB8 +/* 0456B8 80044AB8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 +/* 0456BC 80044ABC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 +/* 0456C0 80044AC0 8C620000 */ lw $v0, ($v1) +/* 0456C4 80044AC4 00054043 */ sra $t0, $a1, 1 +/* 0456C8 80044AC8 250FFFFF */ addiu $t7, $t0, -1 +/* 0456CC 80044ACC 244E0008 */ addiu $t6, $v0, 8 +/* 0456D0 80044AD0 AC6E0000 */ sw $t6, ($v1) +/* 0456D4 80044AD4 31F80FFF */ andi $t8, $t7, 0xfff +/* 0456D8 80044AD8 3C01FD68 */ lui $at, 0xfd68 +/* 0456DC 80044ADC 0301C825 */ or $t9, $t8, $at +/* 0456E0 80044AE0 AC590000 */ sw $t9, ($v0) +/* 0456E4 80044AE4 AC440004 */ sw $a0, 4($v0) +/* 0456E8 80044AE8 8C620000 */ lw $v0, ($v1) +/* 0456EC 80044AEC 250A0007 */ addiu $t2, $t0, 7 +/* 0456F0 80044AF0 000A78C3 */ sra $t7, $t2, 3 +/* 0456F4 80044AF4 31F801FF */ andi $t8, $t7, 0x1ff +/* 0456F8 80044AF8 244E0008 */ addiu $t6, $v0, 8 +/* 0456FC 80044AFC AC6E0000 */ sw $t6, ($v1) +/* 045700 80044B00 00185240 */ sll $t2, $t8, 9 +/* 045704 80044B04 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 +/* 045708 80044B08 3C01F568 */ lui $at, 0xf568 +/* 04570C 80044B0C 01417025 */ or $t6, $t2, $at +/* 045710 80044B10 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 +/* 045714 80044B14 AC4F0004 */ sw $t7, 4($v0) +/* 045718 80044B18 AC4E0000 */ sw $t6, ($v0) +/* 04571C 80044B1C 8C620000 */ lw $v0, ($v1) +/* 045720 80044B20 3C19E600 */ lui $t9, 0xe600 +/* 045724 80044B24 3C0FF400 */ lui $t7, 0xf400 +/* 045728 80044B28 24580008 */ addiu $t8, $v0, 8 +/* 04572C 80044B2C AC780000 */ sw $t8, ($v1) +/* 045730 80044B30 AC400004 */ sw $zero, 4($v0) +/* 045734 80044B34 AC590000 */ sw $t9, ($v0) +/* 045738 80044B38 8C620000 */ lw $v0, ($v1) +/* 04573C 80044B3C 24D8FFFF */ addiu $t8, $a2, -1 +/* 045740 80044B40 0018C880 */ sll $t9, $t8, 2 +/* 045744 80044B44 244E0008 */ addiu $t6, $v0, 8 +/* 045748 80044B48 AC6E0000 */ sw $t6, ($v1) +/* 04574C 80044B4C 24ADFFFF */ addiu $t5, $a1, -1 +/* 045750 80044B50 AC4F0000 */ sw $t7, ($v0) +/* 045754 80044B54 000D7840 */ sll $t7, $t5, 1 +/* 045758 80044B58 31F80FFF */ andi $t8, $t7, 0xfff +/* 04575C 80044B5C 332E0FFF */ andi $t6, $t9, 0xfff +/* 045760 80044B60 0018CB00 */ sll $t9, $t8, 0xc +/* 045764 80044B64 3C010700 */ lui $at, 0x700 +/* 045768 80044B68 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 04576C 80044B6C 03217825 */ or $t7, $t9, $at +/* 045770 80044B70 01EEC025 */ or $t8, $t7, $t6 +/* 045774 80044B74 AFAE0000 */ sw $t6, ($sp) +/* 045778 80044B78 AC580004 */ sw $t8, 4($v0) +/* 04577C 80044B7C 8C620000 */ lw $v0, ($v1) +/* 045780 80044B80 3C0FE700 */ lui $t7, 0xe700 +/* 045784 80044B84 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 +/* 045788 80044B88 24590008 */ addiu $t9, $v0, 8 +/* 04578C 80044B8C AC790000 */ sw $t9, ($v1) +/* 045790 80044B90 AFA20014 */ sw $v0, 0x14($sp) +/* 045794 80044B94 AC400004 */ sw $zero, 4($v0) +/* 045798 80044B98 AC4F0000 */ sw $t7, ($v0) +/* 04579C 80044B9C 8C620000 */ lw $v0, ($v1) +/* 0457A0 80044BA0 3C01F560 */ lui $at, 0xf560 +/* 0457A4 80044BA4 0141C825 */ or $t9, $t2, $at +/* 0457A8 80044BA8 24580008 */ addiu $t8, $v0, 8 +/* 0457AC 80044BAC AC780000 */ sw $t8, ($v1) +/* 0457B0 80044BB0 AFA20010 */ sw $v0, 0x10($sp) +/* 0457B4 80044BB4 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 +/* 0457B8 80044BB8 AC4E0004 */ sw $t6, 4($v0) +/* 0457BC 80044BBC AC590000 */ sw $t9, ($v0) +/* 0457C0 80044BC0 8C620000 */ lw $v0, ($v1) +/* 0457C4 80044BC4 3C19F200 */ lui $t9, 0xf200 +/* 0457C8 80044BC8 000D7880 */ sll $t7, $t5, 2 +/* 0457CC 80044BCC 24580008 */ addiu $t8, $v0, 8 +/* 0457D0 80044BD0 AC780000 */ sw $t8, ($v1) +/* 0457D4 80044BD4 AFA2000C */ sw $v0, 0xc($sp) +/* 0457D8 80044BD8 31F80FFF */ andi $t8, $t7, 0xfff +/* 0457DC 80044BDC AC590000 */ sw $t9, ($v0) +/* 0457E0 80044BE0 8FAF0000 */ lw $t7, ($sp) +/* 0457E4 80044BE4 0018CB00 */ sll $t9, $t8, 0xc +/* 0457E8 80044BE8 27BD0028 */ addiu $sp, $sp, 0x28 +/* 0457EC 80044BEC 032FC025 */ or $t8, $t9, $t7 +/* 0457F0 80044BF0 03E00008 */ jr $ra +/* 0457F4 80044BF4 AC580004 */ sw $t8, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_800463B0.s b/asm/non_matchings/code_800431B0/func_800463B0.s deleted file mode 100644 index c47c5baf8..000000000 --- a/asm/non_matchings/code_800431B0/func_800463B0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800463B0 -/* 046FB0 800463B0 44876000 */ mtc1 $a3, $f12 -/* 046FB4 800463B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 046FB8 800463B8 AFBF001C */ sw $ra, 0x1c($sp) -/* 046FBC 800463BC AFA60028 */ sw $a2, 0x28($sp) -/* 046FC0 800463C0 30CEFFFF */ andi $t6, $a2, 0xffff -/* 046FC4 800463C4 44076000 */ mfc1 $a3, $f12 -/* 046FC8 800463C8 0C0108CC */ jal func_80042330 -/* 046FCC 800463CC 01C03025 */ move $a2, $t6 -/* 046FD0 800463D0 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 046FD4 800463D4 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 046FD8 800463D8 8D030000 */ lw $v1, ($t0) -/* 046FDC 800463DC 3C190D00 */ lui $t9, %hi(D_0D007928) # $t9, 0xd00 -/* 046FE0 800463E0 27397928 */ addiu $t9, %lo(D_0D007928) # addiu $t9, $t9, 0x7928 -/* 046FE4 800463E4 246F0008 */ addiu $t7, $v1, 8 -/* 046FE8 800463E8 AD0F0000 */ sw $t7, ($t0) -/* 046FEC 800463EC 3C180600 */ lui $t8, 0x600 -/* 046FF0 800463F0 AC780000 */ sw $t8, ($v1) -/* 046FF4 800463F4 AC790004 */ sw $t9, 4($v1) -/* 046FF8 800463F8 8FA90044 */ lw $t1, 0x44($sp) -/* 046FFC 800463FC 8FA7003C */ lw $a3, 0x3c($sp) -/* 047000 80046400 8FA60038 */ lw $a2, 0x38($sp) -/* 047004 80046404 8FA50034 */ lw $a1, 0x34($sp) -/* 047008 80046408 8FA40030 */ lw $a0, 0x30($sp) -/* 04700C 8004640C 0C011743 */ jal func_80045D0C -/* 047010 80046410 AFA90010 */ sw $t1, 0x10($sp) -/* 047014 80046414 8FBF001C */ lw $ra, 0x1c($sp) -/* 047018 80046418 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04701C 8004641C 03E00008 */ jr $ra -/* 047020 80046420 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80046424.s b/asm/non_matchings/code_800431B0/func_80046424.s deleted file mode 100644 index 04ebf63b2..000000000 --- a/asm/non_matchings/code_800431B0/func_80046424.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80046424 -/* 047024 80046424 44876000 */ mtc1 $a3, $f12 -/* 047028 80046428 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04702C 8004642C AFBF0024 */ sw $ra, 0x24($sp) -/* 047030 80046430 AFA60030 */ sw $a2, 0x30($sp) -/* 047034 80046434 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047038 80046438 44076000 */ mfc1 $a3, $f12 -/* 04703C 8004643C 0C0108CC */ jal func_80042330 -/* 047040 80046440 01C03025 */ move $a2, $t6 -/* 047044 80046444 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047048 80046448 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04704C 8004644C 8D030000 */ lw $v1, ($t0) -/* 047050 80046450 3C190D00 */ lui $t9, %hi(D_0D007968) # $t9, 0xd00 -/* 047054 80046454 27397968 */ addiu $t9, %lo(D_0D007968) # addiu $t9, $t9, 0x7968 -/* 047058 80046458 246F0008 */ addiu $t7, $v1, 8 -/* 04705C 8004645C AD0F0000 */ sw $t7, ($t0) -/* 047060 80046460 3C180600 */ lui $t8, 0x600 -/* 047064 80046464 AC780000 */ sw $t8, ($v1) -/* 047068 80046468 AC790004 */ sw $t9, 4($v1) -/* 04706C 8004646C 3C048016 */ lui $a0, %hi(D_801656C0) # $a0, 0x8016 -/* 047070 80046470 3C058016 */ lui $a1, %hi(D_801656D0) # $a1, 0x8016 -/* 047074 80046474 3C068016 */ lui $a2, %hi(D_801656E0) # $a2, 0x8016 -/* 047078 80046478 24090080 */ li $t1, 128 -/* 04707C 8004647C 240A0080 */ li $t2, 128 -/* 047080 80046480 240B00FF */ li $t3, 255 -/* 047084 80046484 AFAB0018 */ sw $t3, 0x18($sp) -/* 047088 80046488 AFAA0014 */ sw $t2, 0x14($sp) -/* 04708C 8004648C AFA90010 */ sw $t1, 0x10($sp) -/* 047090 80046490 94C656E0 */ lhu $a2, %lo(D_801656E0)($a2) -/* 047094 80046494 94A556D0 */ lhu $a1, %lo(D_801656D0)($a1) -/* 047098 80046498 948456C0 */ lhu $a0, %lo(D_801656C0)($a0) -/* 04709C 8004649C 0C012D85 */ jal func_8004B614 -/* 0470A0 800464A0 24070080 */ li $a3, 128 -/* 0470A4 800464A4 8FAC004C */ lw $t4, 0x4c($sp) -/* 0470A8 800464A8 8FA40038 */ lw $a0, 0x38($sp) -/* 0470AC 800464AC 8FA5003C */ lw $a1, 0x3c($sp) -/* 0470B0 800464B0 8FA60040 */ lw $a2, 0x40($sp) -/* 0470B4 800464B4 8FA70044 */ lw $a3, 0x44($sp) -/* 0470B8 800464B8 0C011743 */ jal func_80045D0C -/* 0470BC 800464BC AFAC0010 */ sw $t4, 0x10($sp) -/* 0470C0 800464C0 8FBF0024 */ lw $ra, 0x24($sp) -/* 0470C4 800464C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0470C8 800464C8 03E00008 */ jr $ra -/* 0470CC 800464CC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800464D0.s b/asm/non_matchings/code_800431B0/func_800464D0.s deleted file mode 100644 index df8c4ce73..000000000 --- a/asm/non_matchings/code_800431B0/func_800464D0.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_800464D0 -/* 0470D0 800464D0 44876000 */ mtc1 $a3, $f12 -/* 0470D4 800464D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0470D8 800464D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0470DC 800464DC AFA60028 */ sw $a2, 0x28($sp) -/* 0470E0 800464E0 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0470E4 800464E4 44076000 */ mfc1 $a3, $f12 -/* 0470E8 800464E8 0C0108CC */ jal func_80042330 -/* 0470EC 800464EC 01C03025 */ move $a2, $t6 -/* 0470F0 800464F0 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0470F4 800464F4 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0470F8 800464F8 8D030000 */ lw $v1, ($t0) -/* 0470FC 800464FC 3C190D00 */ lui $t9, %hi(D_0D007948) # $t9, 0xd00 -/* 047100 80046500 27397948 */ addiu $t9, %lo(D_0D007948) # addiu $t9, $t9, 0x7948 -/* 047104 80046504 246F0008 */ addiu $t7, $v1, 8 -/* 047108 80046508 AD0F0000 */ sw $t7, ($t0) -/* 04710C 8004650C 3C180600 */ lui $t8, 0x600 -/* 047110 80046510 AC780000 */ sw $t8, ($v1) -/* 047114 80046514 AC790004 */ sw $t9, 4($v1) -/* 047118 80046518 8FA90044 */ lw $t1, 0x44($sp) -/* 04711C 8004651C 8FA7003C */ lw $a3, 0x3c($sp) -/* 047120 80046520 8FA60038 */ lw $a2, 0x38($sp) -/* 047124 80046524 8FA50034 */ lw $a1, 0x34($sp) -/* 047128 80046528 8FA40030 */ lw $a0, 0x30($sp) -/* 04712C 8004652C 0C011784 */ jal func_80045E10 -/* 047130 80046530 AFA90010 */ sw $t1, 0x10($sp) -/* 047134 80046534 8FBF001C */ lw $ra, 0x1c($sp) -/* 047138 80046538 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04713C 8004653C 03E00008 */ jr $ra -/* 047140 80046540 00000000 */ nop - -/* 047144 80046544 44876000 */ mtc1 $a3, $f12 -/* 047148 80046548 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04714C 8004654C AFBF001C */ sw $ra, 0x1c($sp) -/* 047150 80046550 AFA60028 */ sw $a2, 0x28($sp) -/* 047154 80046554 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047158 80046558 44076000 */ mfc1 $a3, $f12 -/* 04715C 8004655C 0C0108CC */ jal func_80042330 -/* 047160 80046560 01C03025 */ move $a2, $t6 -/* 047164 80046564 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047168 80046568 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04716C 8004656C 8D030000 */ lw $v1, ($t0) -/* 047170 80046570 3C190D00 */ lui $t9, %hi(D_0D0079A8) # $t9, 0xd00 -/* 047174 80046574 273979A8 */ addiu $t9, %lo(D_0D0079A8) # addiu $t9, $t9, 0x79a8 -/* 047178 80046578 246F0008 */ addiu $t7, $v1, 8 -/* 04717C 8004657C AD0F0000 */ sw $t7, ($t0) -/* 047180 80046580 3C180600 */ lui $t8, 0x600 -/* 047184 80046584 AC780000 */ sw $t8, ($v1) -/* 047188 80046588 AC790004 */ sw $t9, 4($v1) -/* 04718C 8004658C 8FA90044 */ lw $t1, 0x44($sp) -/* 047190 80046590 8FA7003C */ lw $a3, 0x3c($sp) -/* 047194 80046594 8FA60038 */ lw $a2, 0x38($sp) -/* 047198 80046598 8FA50034 */ lw $a1, 0x34($sp) -/* 04719C 8004659C 8FA40030 */ lw $a0, 0x30($sp) -/* 0471A0 800465A0 0C011784 */ jal func_80045E10 -/* 0471A4 800465A4 AFA90010 */ sw $t1, 0x10($sp) -/* 0471A8 800465A8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0471AC 800465AC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0471B0 800465B0 03E00008 */ jr $ra -/* 0471B4 800465B4 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800465B8.s b/asm/non_matchings/code_800431B0/func_800465B8.s deleted file mode 100644 index f8dd673a3..000000000 --- a/asm/non_matchings/code_800431B0/func_800465B8.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_800465B8 -/* 0471B8 800465B8 44876000 */ mtc1 $a3, $f12 -/* 0471BC 800465BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0471C0 800465C0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0471C4 800465C4 AFA60028 */ sw $a2, 0x28($sp) -/* 0471C8 800465C8 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0471CC 800465CC 44076000 */ mfc1 $a3, $f12 -/* 0471D0 800465D0 0C0108CC */ jal func_80042330 -/* 0471D4 800465D4 01C03025 */ move $a2, $t6 -/* 0471D8 800465D8 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 0471DC 800465DC 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 0471E0 800465E0 8CA30000 */ lw $v1, ($a1) -/* 0471E4 800465E4 3C190D00 */ lui $t9, %hi(D_0D0079E8) # $t9, 0xd00 -/* 0471E8 800465E8 273979E8 */ addiu $t9, %lo(D_0D0079E8) # addiu $t9, $t9, 0x79e8 -/* 0471EC 800465EC 246F0008 */ addiu $t7, $v1, 8 -/* 0471F0 800465F0 ACAF0000 */ sw $t7, ($a1) -/* 0471F4 800465F4 3C180600 */ lui $t8, 0x600 -/* 0471F8 800465F8 AC780000 */ sw $t8, ($v1) -/* 0471FC 800465FC AC790004 */ sw $t9, 4($v1) -/* 047200 80046600 0C012CAF */ jal func_8004B2BC -/* 047204 80046604 8FA40030 */ lw $a0, 0x30($sp) -/* 047208 80046608 8FA80048 */ lw $t0, 0x48($sp) -/* 04720C 8004660C 8FA40034 */ lw $a0, 0x34($sp) -/* 047210 80046610 8FA50038 */ lw $a1, 0x38($sp) -/* 047214 80046614 8FA6003C */ lw $a2, 0x3c($sp) -/* 047218 80046618 8FA70040 */ lw $a3, 0x40($sp) -/* 04721C 8004661C 0C011784 */ jal func_80045E10 -/* 047220 80046620 AFA80010 */ sw $t0, 0x10($sp) -/* 047224 80046624 8FBF001C */ lw $ra, 0x1c($sp) -/* 047228 80046628 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04722C 8004662C 03E00008 */ jr $ra -/* 047230 80046630 00000000 */ nop - -/* 047234 80046634 44876000 */ mtc1 $a3, $f12 -/* 047238 80046638 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04723C 8004663C AFBF001C */ sw $ra, 0x1c($sp) -/* 047240 80046640 AFA60028 */ sw $a2, 0x28($sp) -/* 047244 80046644 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047248 80046648 44076000 */ mfc1 $a3, $f12 -/* 04724C 8004664C 0C0108CC */ jal func_80042330 -/* 047250 80046650 01C03025 */ move $a2, $t6 -/* 047254 80046654 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047258 80046658 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04725C 8004665C 8D030000 */ lw $v1, ($t0) -/* 047260 80046660 3C190D00 */ lui $t9, %hi(D_0D007948) # $t9, 0xd00 -/* 047264 80046664 27397948 */ addiu $t9, %lo(D_0D007948) # addiu $t9, $t9, 0x7948 -/* 047268 80046668 246F0008 */ addiu $t7, $v1, 8 -/* 04726C 8004666C AD0F0000 */ sw $t7, ($t0) -/* 047270 80046670 3C180600 */ lui $t8, 0x600 -/* 047274 80046674 AC780000 */ sw $t8, ($v1) -/* 047278 80046678 AC790004 */ sw $t9, 4($v1) -/* 04727C 8004667C 8FAA0048 */ lw $t2, 0x48($sp) -/* 047280 80046680 8FA90040 */ lw $t1, 0x40($sp) -/* 047284 80046684 8FA7003C */ lw $a3, 0x3c($sp) -/* 047288 80046688 8FA60038 */ lw $a2, 0x38($sp) -/* 04728C 8004668C 8FA50034 */ lw $a1, 0x34($sp) -/* 047290 80046690 8FA40030 */ lw $a0, 0x30($sp) -/* 047294 80046694 AFAA0014 */ sw $t2, 0x14($sp) -/* 047298 80046698 0C01180C */ jal func_80046030 -/* 04729C 8004669C AFA90010 */ sw $t1, 0x10($sp) -/* 0472A0 800466A0 8FBF001C */ lw $ra, 0x1c($sp) -/* 0472A4 800466A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0472A8 800466A8 03E00008 */ jr $ra -/* 0472AC 800466AC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800466B0.s b/asm/non_matchings/code_800431B0/func_800466B0.s deleted file mode 100644 index 4ae769156..000000000 --- a/asm/non_matchings/code_800431B0/func_800466B0.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_800466B0 -/* 0472B0 800466B0 44876000 */ mtc1 $a3, $f12 -/* 0472B4 800466B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0472B8 800466B8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0472BC 800466BC AFA60020 */ sw $a2, 0x20($sp) -/* 0472C0 800466C0 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0472C4 800466C4 44076000 */ mfc1 $a3, $f12 -/* 0472C8 800466C8 0C0108CC */ jal func_80042330 -/* 0472CC 800466CC 01C03025 */ move $a2, $t6 -/* 0472D0 800466D0 3C078015 */ lui $a3, %hi(gDisplayListHead) # $a3, 0x8015 -/* 0472D4 800466D4 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 -/* 0472D8 800466D8 8CE30000 */ lw $v1, ($a3) -/* 0472DC 800466DC 3C190D00 */ lui $t9, %hi(D_0D007948) # $t9, 0xd00 -/* 0472E0 800466E0 27397948 */ addiu $t9, %lo(D_0D007948) # addiu $t9, $t9, 0x7948 -/* 0472E4 800466E4 246F0008 */ addiu $t7, $v1, 8 -/* 0472E8 800466E8 ACEF0000 */ sw $t7, ($a3) -/* 0472EC 800466EC 3C180600 */ lui $t8, 0x600 -/* 0472F0 800466F0 AC780000 */ sw $t8, ($v1) -/* 0472F4 800466F4 AC790004 */ sw $t9, 4($v1) -/* 0472F8 800466F8 8FA60034 */ lw $a2, 0x34($sp) -/* 0472FC 800466FC 8FA50030 */ lw $a1, 0x30($sp) -/* 047300 80046700 0C010F54 */ jal func_80043D50 -/* 047304 80046704 8FA40028 */ lw $a0, 0x28($sp) -/* 047308 80046708 0C0116DD */ jal func_80045B74 -/* 04730C 8004670C 8FA4002C */ lw $a0, 0x2c($sp) -/* 047310 80046710 8FBF0014 */ lw $ra, 0x14($sp) -/* 047314 80046714 27BD0018 */ addiu $sp, $sp, 0x18 -/* 047318 80046718 03E00008 */ jr $ra -/* 04731C 8004671C 00000000 */ nop - -/* 047320 80046720 44876000 */ mtc1 $a3, $f12 -/* 047324 80046724 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 047328 80046728 AFBF001C */ sw $ra, 0x1c($sp) -/* 04732C 8004672C AFA60028 */ sw $a2, 0x28($sp) -/* 047330 80046730 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047334 80046734 44076000 */ mfc1 $a3, $f12 -/* 047338 80046738 0C0108CC */ jal func_80042330 -/* 04733C 8004673C 01C03025 */ move $a2, $t6 -/* 047340 80046740 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047344 80046744 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 047348 80046748 8D030000 */ lw $v1, ($t0) -/* 04734C 8004674C 3C190D00 */ lui $t9, %hi(D_0D007928) # $t9, 0xd00 -/* 047350 80046750 27397928 */ addiu $t9, %lo(D_0D007928) # addiu $t9, $t9, 0x7928 -/* 047354 80046754 246F0008 */ addiu $t7, $v1, 8 -/* 047358 80046758 AD0F0000 */ sw $t7, ($t0) -/* 04735C 8004675C 3C180600 */ lui $t8, 0x600 -/* 047360 80046760 AC780000 */ sw $t8, ($v1) -/* 047364 80046764 AC790004 */ sw $t9, 4($v1) -/* 047368 80046768 8FA90044 */ lw $t1, 0x44($sp) -/* 04736C 8004676C 8FA7003C */ lw $a3, 0x3c($sp) -/* 047370 80046770 8FA60038 */ lw $a2, 0x38($sp) -/* 047374 80046774 8FA50034 */ lw $a1, 0x34($sp) -/* 047378 80046778 8FA40030 */ lw $a0, 0x30($sp) -/* 04737C 8004677C 0C011869 */ jal func_800461A4 -/* 047380 80046780 AFA90010 */ sw $t1, 0x10($sp) -/* 047384 80046784 8FBF001C */ lw $ra, 0x1c($sp) -/* 047388 80046788 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04738C 8004678C 03E00008 */ jr $ra -/* 047390 80046790 00000000 */ nop - -/* 047394 80046794 44876000 */ mtc1 $a3, $f12 -/* 047398 80046798 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04739C 8004679C AFBF001C */ sw $ra, 0x1c($sp) -/* 0473A0 800467A0 AFA60028 */ sw $a2, 0x28($sp) -/* 0473A4 800467A4 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0473A8 800467A8 44076000 */ mfc1 $a3, $f12 -/* 0473AC 800467AC 0C0108CC */ jal func_80042330 -/* 0473B0 800467B0 01C03025 */ move $a2, $t6 -/* 0473B4 800467B4 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0473B8 800467B8 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0473BC 800467BC 8D030000 */ lw $v1, ($t0) -/* 0473C0 800467C0 3C190D00 */ lui $t9, %hi(D_0D007948) # $t9, 0xd00 -/* 0473C4 800467C4 27397948 */ addiu $t9, %lo(D_0D007948) # addiu $t9, $t9, 0x7948 -/* 0473C8 800467C8 246F0008 */ addiu $t7, $v1, 8 -/* 0473CC 800467CC AD0F0000 */ sw $t7, ($t0) -/* 0473D0 800467D0 3C180600 */ lui $t8, 0x600 -/* 0473D4 800467D4 AC780000 */ sw $t8, ($v1) -/* 0473D8 800467D8 AC790004 */ sw $t9, 4($v1) -/* 0473DC 800467DC 8FA90044 */ lw $t1, 0x44($sp) -/* 0473E0 800467E0 8FA7003C */ lw $a3, 0x3c($sp) -/* 0473E4 800467E4 8FA60038 */ lw $a2, 0x38($sp) -/* 0473E8 800467E8 8FA50034 */ lw $a1, 0x34($sp) -/* 0473EC 800467EC 8FA40030 */ lw $a0, 0x30($sp) -/* 0473F0 800467F0 0C0118AA */ jal func_800462A8 -/* 0473F4 800467F4 AFA90010 */ sw $t1, 0x10($sp) -/* 0473F8 800467F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0473FC 800467FC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 047400 80046800 03E00008 */ jr $ra -/* 047404 80046804 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80046808.s b/asm/non_matchings/code_800431B0/func_80046808.s deleted file mode 100644 index 77c38e432..000000000 --- a/asm/non_matchings/code_800431B0/func_80046808.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80046808 -/* 047408 80046808 44866000 */ mtc1 $a2, $f12 -/* 04740C 8004680C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 047410 80046810 AFBF001C */ sw $ra, 0x1c($sp) -/* 047414 80046814 44066000 */ mfc1 $a2, $f12 -/* 047418 80046818 0C010B80 */ jal func_80042E00 -/* 04741C 8004681C AFA7002C */ sw $a3, 0x2c($sp) -/* 047420 80046820 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047424 80046824 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 047428 80046828 8D030000 */ lw $v1, ($t0) -/* 04742C 8004682C 3C180D00 */ lui $t8, %hi(D_0D007948) # $t8, 0xd00 -/* 047430 80046830 27187948 */ addiu $t8, %lo(D_0D007948) # addiu $t8, $t8, 0x7948 -/* 047434 80046834 246E0008 */ addiu $t6, $v1, 8 -/* 047438 80046838 AD0E0000 */ sw $t6, ($t0) -/* 04743C 8004683C 3C0F0600 */ lui $t7, 0x600 -/* 047440 80046840 AC6F0000 */ sw $t7, ($v1) -/* 047444 80046844 AC780004 */ sw $t8, 4($v1) -/* 047448 80046848 8FB90040 */ lw $t9, 0x40($sp) -/* 04744C 8004684C 8FA70038 */ lw $a3, 0x38($sp) -/* 047450 80046850 8FA60034 */ lw $a2, 0x34($sp) -/* 047454 80046854 8FA50030 */ lw $a1, 0x30($sp) -/* 047458 80046858 8FA4002C */ lw $a0, 0x2c($sp) -/* 04745C 8004685C 0C011784 */ jal func_80045E10 -/* 047460 80046860 AFB90010 */ sw $t9, 0x10($sp) -/* 047464 80046864 8FBF001C */ lw $ra, 0x1c($sp) -/* 047468 80046868 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04746C 8004686C 03E00008 */ jr $ra -/* 047470 80046870 00000000 */ nop - -/* 047474 80046874 44866000 */ mtc1 $a2, $f12 -/* 047478 80046878 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04747C 8004687C AFBF001C */ sw $ra, 0x1c($sp) -/* 047480 80046880 44066000 */ mfc1 $a2, $f12 -/* 047484 80046884 0C010B80 */ jal func_80042E00 -/* 047488 80046888 AFA7002C */ sw $a3, 0x2c($sp) -/* 04748C 8004688C 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047490 80046890 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 047494 80046894 8D030000 */ lw $v1, ($t0) -/* 047498 80046898 3C180D00 */ lui $t8, %hi(D_0D0079C8) # $t8, 0xd00 -/* 04749C 8004689C 271879C8 */ addiu $t8, %lo(D_0D0079C8) # addiu $t8, $t8, 0x79c8 -/* 0474A0 800468A0 246E0008 */ addiu $t6, $v1, 8 -/* 0474A4 800468A4 AD0E0000 */ sw $t6, ($t0) -/* 0474A8 800468A8 3C0F0600 */ lui $t7, 0x600 -/* 0474AC 800468AC AC6F0000 */ sw $t7, ($v1) -/* 0474B0 800468B0 AC780004 */ sw $t8, 4($v1) -/* 0474B4 800468B4 8FB90040 */ lw $t9, 0x40($sp) -/* 0474B8 800468B8 8FA70038 */ lw $a3, 0x38($sp) -/* 0474BC 800468BC 8FA60034 */ lw $a2, 0x34($sp) -/* 0474C0 800468C0 8FA50030 */ lw $a1, 0x30($sp) -/* 0474C4 800468C4 8FA4002C */ lw $a0, 0x2c($sp) -/* 0474C8 800468C8 0C011784 */ jal func_80045E10 -/* 0474CC 800468CC AFB90010 */ sw $t9, 0x10($sp) -/* 0474D0 800468D0 8FBF001C */ lw $ra, 0x1c($sp) -/* 0474D4 800468D4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0474D8 800468D8 03E00008 */ jr $ra -/* 0474DC 800468DC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800468E0.s b/asm/non_matchings/code_800431B0/func_800468E0.s deleted file mode 100644 index 4ded3cd98..000000000 --- a/asm/non_matchings/code_800431B0/func_800468E0.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_800468E0 -/* 0474E0 800468E0 44866000 */ mtc1 $a2, $f12 -/* 0474E4 800468E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0474E8 800468E8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0474EC 800468EC 44066000 */ mfc1 $a2, $f12 -/* 0474F0 800468F0 0C010B80 */ jal func_80042E00 -/* 0474F4 800468F4 AFA7002C */ sw $a3, 0x2c($sp) -/* 0474F8 800468F8 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0474FC 800468FC 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 047500 80046900 8D030000 */ lw $v1, ($t0) -/* 047504 80046904 3C180D00 */ lui $t8, %hi(D_0D0079C8) # $t8, 0xd00 -/* 047508 80046908 271879C8 */ addiu $t8, %lo(D_0D0079C8) # addiu $t8, $t8, 0x79c8 -/* 04750C 8004690C 246E0008 */ addiu $t6, $v1, 8 -/* 047510 80046910 AD0E0000 */ sw $t6, ($t0) -/* 047514 80046914 3C0F0600 */ lui $t7, 0x600 -/* 047518 80046918 AC6F0000 */ sw $t7, ($v1) -/* 04751C 8004691C AC780004 */ sw $t8, 4($v1) -/* 047520 80046920 8FA90044 */ lw $t1, 0x44($sp) -/* 047524 80046924 8FB90040 */ lw $t9, 0x40($sp) -/* 047528 80046928 8FA70038 */ lw $a3, 0x38($sp) -/* 04752C 8004692C 8FA60034 */ lw $a2, 0x34($sp) -/* 047530 80046930 8FA50030 */ lw $a1, 0x30($sp) -/* 047534 80046934 8FA4002C */ lw $a0, 0x2c($sp) -/* 047538 80046938 AFA90014 */ sw $t1, 0x14($sp) -/* 04753C 8004693C 0C0117C6 */ jal func_80045F18 -/* 047540 80046940 AFB90010 */ sw $t9, 0x10($sp) -/* 047544 80046944 8FBF001C */ lw $ra, 0x1c($sp) -/* 047548 80046948 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04754C 8004694C 03E00008 */ jr $ra -/* 047550 80046950 00000000 */ nop - -/* 047554 80046954 44866000 */ mtc1 $a2, $f12 -/* 047558 80046958 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04755C 8004695C AFBF001C */ sw $ra, 0x1c($sp) -/* 047560 80046960 44066000 */ mfc1 $a2, $f12 -/* 047564 80046964 0C010B80 */ jal func_80042E00 -/* 047568 80046968 AFA7002C */ sw $a3, 0x2c($sp) -/* 04756C 8004696C 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 047570 80046970 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 047574 80046974 8D220000 */ lw $v0, ($t1) -/* 047578 80046978 3C180D00 */ lui $t8, %hi(D_0D0079C8) # $t8, 0xd00 -/* 04757C 8004697C 271879C8 */ addiu $t8, %lo(D_0D0079C8) # addiu $t8, $t8, 0x79c8 -/* 047580 80046980 244E0008 */ addiu $t6, $v0, 8 -/* 047584 80046984 AD2E0000 */ sw $t6, ($t1) -/* 047588 80046988 3C0F0600 */ lui $t7, 0x600 -/* 04758C 8004698C AC4F0000 */ sw $t7, ($v0) -/* 047590 80046990 AC580004 */ sw $t8, 4($v0) -/* 047594 80046994 8D220000 */ lw $v0, ($t1) -/* 047598 80046998 3C0AB600 */ lui $t2, 0xb600 -/* 04759C 8004699C 240B3000 */ li $t3, 12288 -/* 0475A0 800469A0 24590008 */ addiu $t9, $v0, 8 -/* 0475A4 800469A4 AD390000 */ sw $t9, ($t1) -/* 0475A8 800469A8 AC4B0004 */ sw $t3, 4($v0) -/* 0475AC 800469AC AC4A0000 */ sw $t2, ($v0) -/* 0475B0 800469B0 8FAC0040 */ lw $t4, 0x40($sp) -/* 0475B4 800469B4 8FA70038 */ lw $a3, 0x38($sp) -/* 0475B8 800469B8 8FA60034 */ lw $a2, 0x34($sp) -/* 0475BC 800469BC 8FA50030 */ lw $a1, 0x30($sp) -/* 0475C0 800469C0 8FA4002C */ lw $a0, 0x2c($sp) -/* 0475C4 800469C4 0C011784 */ jal func_80045E10 -/* 0475C8 800469C8 AFAC0010 */ sw $t4, 0x10($sp) -/* 0475CC 800469CC 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 0475D0 800469D0 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 0475D4 800469D4 8D220000 */ lw $v0, ($t1) -/* 0475D8 800469D8 3C0EB700 */ lui $t6, 0xb700 -/* 0475DC 800469DC 240F2000 */ li $t7, 8192 -/* 0475E0 800469E0 244D0008 */ addiu $t5, $v0, 8 -/* 0475E4 800469E4 AD2D0000 */ sw $t5, ($t1) -/* 0475E8 800469E8 AC4F0004 */ sw $t7, 4($v0) -/* 0475EC 800469EC AC4E0000 */ sw $t6, ($v0) -/* 0475F0 800469F0 8FBF001C */ lw $ra, 0x1c($sp) -/* 0475F4 800469F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0475F8 800469F8 03E00008 */ jr $ra -/* 0475FC 800469FC 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80046A00.s b/asm/non_matchings/code_800431B0/func_80046A00.s deleted file mode 100644 index a0fa29836..000000000 --- a/asm/non_matchings/code_800431B0/func_80046A00.s +++ /dev/null @@ -1,292 +0,0 @@ -glabel func_80046A00 -/* 047600 80046A00 44866000 */ mtc1 $a2, $f12 -/* 047604 80046A04 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 047608 80046A08 AFBF0014 */ sw $ra, 0x14($sp) -/* 04760C 80046A0C 44066000 */ mfc1 $a2, $f12 -/* 047610 80046A10 0C010B80 */ jal func_80042E00 -/* 047614 80046A14 AFA70024 */ sw $a3, 0x24($sp) -/* 047618 80046A18 3C078015 */ lui $a3, %hi(gDisplayListHead) # $a3, 0x8015 -/* 04761C 80046A1C 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 -/* 047620 80046A20 8CE30000 */ lw $v1, ($a3) -/* 047624 80046A24 3C180D00 */ lui $t8, %hi(D_0D007948) # $t8, 0xd00 -/* 047628 80046A28 27187948 */ addiu $t8, %lo(D_0D007948) # addiu $t8, $t8, 0x7948 -/* 04762C 80046A2C 246E0008 */ addiu $t6, $v1, 8 -/* 047630 80046A30 ACEE0000 */ sw $t6, ($a3) -/* 047634 80046A34 3C0F0600 */ lui $t7, 0x600 -/* 047638 80046A38 AC6F0000 */ sw $t7, ($v1) -/* 04763C 80046A3C AC780004 */ sw $t8, 4($v1) -/* 047640 80046A40 8FA60030 */ lw $a2, 0x30($sp) -/* 047644 80046A44 8FA5002C */ lw $a1, 0x2c($sp) -/* 047648 80046A48 0C010F54 */ jal func_80043D50 -/* 04764C 80046A4C 8FA40024 */ lw $a0, 0x24($sp) -/* 047650 80046A50 0C0116DD */ jal func_80045B74 -/* 047654 80046A54 8FA40028 */ lw $a0, 0x28($sp) -/* 047658 80046A58 8FBF0014 */ lw $ra, 0x14($sp) -/* 04765C 80046A5C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 047660 80046A60 03E00008 */ jr $ra -/* 047664 80046A64 00000000 */ nop - -/* 047668 80046A68 44866000 */ mtc1 $a2, $f12 -/* 04766C 80046A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 047670 80046A70 AFBF001C */ sw $ra, 0x1c($sp) -/* 047674 80046A74 44066000 */ mfc1 $a2, $f12 -/* 047678 80046A78 0C010B80 */ jal func_80042E00 -/* 04767C 80046A7C AFA7002C */ sw $a3, 0x2c($sp) -/* 047680 80046A80 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 047684 80046A84 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 047688 80046A88 8D030000 */ lw $v1, ($t0) -/* 04768C 80046A8C 3C180D00 */ lui $t8, %hi(D_0D0079C8) # $t8, 0xd00 -/* 047690 80046A90 271879C8 */ addiu $t8, %lo(D_0D0079C8) # addiu $t8, $t8, 0x79c8 -/* 047694 80046A94 246E0008 */ addiu $t6, $v1, 8 -/* 047698 80046A98 AD0E0000 */ sw $t6, ($t0) -/* 04769C 80046A9C 3C0F0600 */ lui $t7, 0x600 -/* 0476A0 80046AA0 AC6F0000 */ sw $t7, ($v1) -/* 0476A4 80046AA4 AC780004 */ sw $t8, 4($v1) -/* 0476A8 80046AA8 8FB90040 */ lw $t9, 0x40($sp) -/* 0476AC 80046AAC 8FA70038 */ lw $a3, 0x38($sp) -/* 0476B0 80046AB0 8FA60034 */ lw $a2, 0x34($sp) -/* 0476B4 80046AB4 8FA50030 */ lw $a1, 0x30($sp) -/* 0476B8 80046AB8 8FA4002C */ lw $a0, 0x2c($sp) -/* 0476BC 80046ABC 0C0118AA */ jal func_800462A8 -/* 0476C0 80046AC0 AFB90010 */ sw $t9, 0x10($sp) -/* 0476C4 80046AC4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0476C8 80046AC8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0476CC 80046ACC 03E00008 */ jr $ra -/* 0476D0 80046AD0 00000000 */ nop - -/* 0476D4 80046AD4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0476D8 80046AD8 44876000 */ mtc1 $a3, $f12 -/* 0476DC 80046ADC 8FAF0040 */ lw $t7, 0x40($sp) -/* 0476E0 80046AE0 3C180D00 */ lui $t8, %hi(D_0D005470) # $t8, 0xd00 -/* 0476E4 80046AE4 AFBF002C */ sw $ra, 0x2c($sp) -/* 0476E8 80046AE8 AFA60038 */ sw $a2, 0x38($sp) -/* 0476EC 80046AEC 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0476F0 80046AF0 27185470 */ addiu $t8, %lo(D_0D005470) # addiu $t8, $t8, 0x5470 -/* 0476F4 80046AF4 24190008 */ li $t9, 8 -/* 0476F8 80046AF8 24080008 */ li $t0, 8 -/* 0476FC 80046AFC 24090008 */ li $t1, 8 -/* 047700 80046B00 240A0008 */ li $t2, 8 -/* 047704 80046B04 44076000 */ mfc1 $a3, $f12 -/* 047708 80046B08 01C03025 */ move $a2, $t6 -/* 04770C 80046B0C AFAA0024 */ sw $t2, 0x24($sp) -/* 047710 80046B10 AFA90020 */ sw $t1, 0x20($sp) -/* 047714 80046B14 AFA8001C */ sw $t0, 0x1c($sp) -/* 047718 80046B18 AFB90018 */ sw $t9, 0x18($sp) -/* 04771C 80046B1C AFB80014 */ sw $t8, 0x14($sp) -/* 047720 80046B20 0C011934 */ jal func_800464D0 -/* 047724 80046B24 AFAF0010 */ sw $t7, 0x10($sp) -/* 047728 80046B28 8FBF002C */ lw $ra, 0x2c($sp) -/* 04772C 80046B2C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 047730 80046B30 03E00008 */ jr $ra -/* 047734 80046B34 00000000 */ nop - -/* 047738 80046B38 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 04773C 80046B3C 44876000 */ mtc1 $a3, $f12 -/* 047740 80046B40 8FAF0040 */ lw $t7, 0x40($sp) -/* 047744 80046B44 3C180D00 */ lui $t8, %hi(D_0D005770) # $t8, 0xd00 -/* 047748 80046B48 AFBF002C */ sw $ra, 0x2c($sp) -/* 04774C 80046B4C AFA60038 */ sw $a2, 0x38($sp) -/* 047750 80046B50 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047754 80046B54 27185770 */ addiu $t8, %lo(D_0D005770) # addiu $t8, $t8, 0x5770 -/* 047758 80046B58 24190010 */ li $t9, 16 -/* 04775C 80046B5C 24080010 */ li $t0, 16 -/* 047760 80046B60 24090010 */ li $t1, 16 -/* 047764 80046B64 240A0010 */ li $t2, 16 -/* 047768 80046B68 44076000 */ mfc1 $a3, $f12 -/* 04776C 80046B6C 01C03025 */ move $a2, $t6 -/* 047770 80046B70 AFAA0024 */ sw $t2, 0x24($sp) -/* 047774 80046B74 AFA90020 */ sw $t1, 0x20($sp) -/* 047778 80046B78 AFA8001C */ sw $t0, 0x1c($sp) -/* 04777C 80046B7C AFB90018 */ sw $t9, 0x18($sp) -/* 047780 80046B80 AFB80014 */ sw $t8, 0x14($sp) -/* 047784 80046B84 0C011934 */ jal func_800464D0 -/* 047788 80046B88 AFAF0010 */ sw $t7, 0x10($sp) -/* 04778C 80046B8C 8FBF002C */ lw $ra, 0x2c($sp) -/* 047790 80046B90 27BD0030 */ addiu $sp, $sp, 0x30 -/* 047794 80046B94 03E00008 */ jr $ra -/* 047798 80046B98 00000000 */ nop - -/* 04779C 80046B9C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0477A0 80046BA0 44866000 */ mtc1 $a2, $f12 -/* 0477A4 80046BA4 3C0E0D00 */ lui $t6, %hi(D_0D005770) # $t6, 0xd00 -/* 0477A8 80046BA8 AFBF002C */ sw $ra, 0x2c($sp) -/* 0477AC 80046BAC 25CE5770 */ addiu $t6, %lo(D_0D005770) # addiu $t6, $t6, 0x5770 -/* 0477B0 80046BB0 240F0010 */ li $t7, 16 -/* 0477B4 80046BB4 24180010 */ li $t8, 16 -/* 0477B8 80046BB8 24190010 */ li $t9, 16 -/* 0477BC 80046BBC 24080010 */ li $t0, 16 -/* 0477C0 80046BC0 44066000 */ mfc1 $a2, $f12 -/* 0477C4 80046BC4 AFA80020 */ sw $t0, 0x20($sp) -/* 0477C8 80046BC8 AFB9001C */ sw $t9, 0x1c($sp) -/* 0477CC 80046BCC AFB80018 */ sw $t8, 0x18($sp) -/* 0477D0 80046BD0 AFAF0014 */ sw $t7, 0x14($sp) -/* 0477D4 80046BD4 0C011A02 */ jal func_80046808 -/* 0477D8 80046BD8 AFAE0010 */ sw $t6, 0x10($sp) -/* 0477DC 80046BDC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0477E0 80046BE0 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0477E4 80046BE4 03E00008 */ jr $ra -/* 0477E8 80046BE8 00000000 */ nop - -/* 0477EC 80046BEC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0477F0 80046BF0 44876000 */ mtc1 $a3, $f12 -/* 0477F4 80046BF4 8FAF0038 */ lw $t7, 0x38($sp) -/* 0477F8 80046BF8 8FB8003C */ lw $t8, 0x3c($sp) -/* 0477FC 80046BFC AFBF0024 */ sw $ra, 0x24($sp) -/* 047800 80046C00 AFA60030 */ sw $a2, 0x30($sp) -/* 047804 80046C04 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047808 80046C08 24190010 */ li $t9, 16 -/* 04780C 80046C0C 24080010 */ li $t0, 16 -/* 047810 80046C10 44076000 */ mfc1 $a3, $f12 -/* 047814 80046C14 01C03025 */ move $a2, $t6 -/* 047818 80046C18 AFA8001C */ sw $t0, 0x1c($sp) -/* 04781C 80046C1C AFB90018 */ sw $t9, 0x18($sp) -/* 047820 80046C20 AFAF0010 */ sw $t7, 0x10($sp) -/* 047824 80046C24 0C0119AC */ jal func_800466B0 -/* 047828 80046C28 AFB80014 */ sw $t8, 0x14($sp) -/* 04782C 80046C2C 8FBF0024 */ lw $ra, 0x24($sp) -/* 047830 80046C30 27BD0028 */ addiu $sp, $sp, 0x28 -/* 047834 80046C34 03E00008 */ jr $ra -/* 047838 80046C38 00000000 */ nop - -/* 04783C 80046C3C 44866000 */ mtc1 $a2, $f12 -/* 047840 80046C40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 047844 80046C44 8FAE0038 */ lw $t6, 0x38($sp) -/* 047848 80046C48 AFBF0024 */ sw $ra, 0x24($sp) -/* 04784C 80046C4C 240F0010 */ li $t7, 16 -/* 047850 80046C50 24180010 */ li $t8, 16 -/* 047854 80046C54 44066000 */ mfc1 $a2, $f12 -/* 047858 80046C58 AFB80018 */ sw $t8, 0x18($sp) -/* 04785C 80046C5C AFAF0014 */ sw $t7, 0x14($sp) -/* 047860 80046C60 0C011A80 */ jal func_80046A00 -/* 047864 80046C64 AFAE0010 */ sw $t6, 0x10($sp) -/* 047868 80046C68 8FBF0024 */ lw $ra, 0x24($sp) -/* 04786C 80046C6C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 047870 80046C70 03E00008 */ jr $ra -/* 047874 80046C74 00000000 */ nop - -/* 047878 80046C78 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 04787C 80046C7C 44876000 */ mtc1 $a3, $f12 -/* 047880 80046C80 8FAF0040 */ lw $t7, 0x40($sp) -/* 047884 80046C84 3C180D00 */ lui $t8, %hi(D_0D005AE0) # $t8, 0xd00 -/* 047888 80046C88 AFBF002C */ sw $ra, 0x2c($sp) -/* 04788C 80046C8C AFA60038 */ sw $a2, 0x38($sp) -/* 047890 80046C90 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047894 80046C94 27185AE0 */ addiu $t8, %lo(D_0D005AE0) # addiu $t8, $t8, 0x5ae0 -/* 047898 80046C98 24190020 */ li $t9, 32 -/* 04789C 80046C9C 24080020 */ li $t0, 32 -/* 0478A0 80046CA0 24090020 */ li $t1, 32 -/* 0478A4 80046CA4 240A0020 */ li $t2, 32 -/* 0478A8 80046CA8 44076000 */ mfc1 $a3, $f12 -/* 0478AC 80046CAC 01C03025 */ move $a2, $t6 -/* 0478B0 80046CB0 AFAA0024 */ sw $t2, 0x24($sp) -/* 0478B4 80046CB4 AFA90020 */ sw $t1, 0x20($sp) -/* 0478B8 80046CB8 AFA8001C */ sw $t0, 0x1c($sp) -/* 0478BC 80046CBC AFB90018 */ sw $t9, 0x18($sp) -/* 0478C0 80046CC0 AFB80014 */ sw $t8, 0x14($sp) -/* 0478C4 80046CC4 0C011934 */ jal func_800464D0 -/* 0478C8 80046CC8 AFAF0010 */ sw $t7, 0x10($sp) -/* 0478CC 80046CCC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0478D0 80046CD0 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0478D4 80046CD4 03E00008 */ jr $ra -/* 0478D8 80046CD8 00000000 */ nop - -/* 0478DC 80046CDC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0478E0 80046CE0 44876000 */ mtc1 $a3, $f12 -/* 0478E4 80046CE4 8FAF0040 */ lw $t7, 0x40($sp) -/* 0478E8 80046CE8 3C180D00 */ lui $t8, %hi(D_0D005FB0) # $t8, 0xd00 -/* 0478EC 80046CEC AFBF002C */ sw $ra, 0x2c($sp) -/* 0478F0 80046CF0 AFA60038 */ sw $a2, 0x38($sp) -/* 0478F4 80046CF4 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0478F8 80046CF8 27185FB0 */ addiu $t8, %lo(D_0D005FB0) # addiu $t8, $t8, 0x5fb0 -/* 0478FC 80046CFC 24190040 */ li $t9, 64 -/* 047900 80046D00 24080020 */ li $t0, 32 -/* 047904 80046D04 24090040 */ li $t1, 64 -/* 047908 80046D08 240A0020 */ li $t2, 32 -/* 04790C 80046D0C 44076000 */ mfc1 $a3, $f12 -/* 047910 80046D10 01C03025 */ move $a2, $t6 -/* 047914 80046D14 AFAA0024 */ sw $t2, 0x24($sp) -/* 047918 80046D18 AFA90020 */ sw $t1, 0x20($sp) -/* 04791C 80046D1C AFA8001C */ sw $t0, 0x1c($sp) -/* 047920 80046D20 AFB90018 */ sw $t9, 0x18($sp) -/* 047924 80046D24 AFB80014 */ sw $t8, 0x14($sp) -/* 047928 80046D28 0C011934 */ jal func_800464D0 -/* 04792C 80046D2C AFAF0010 */ sw $t7, 0x10($sp) -/* 047930 80046D30 8FBF002C */ lw $ra, 0x2c($sp) -/* 047934 80046D34 27BD0030 */ addiu $sp, $sp, 0x30 -/* 047938 80046D38 03E00008 */ jr $ra -/* 04793C 80046D3C 00000000 */ nop - -/* 047940 80046D40 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 047944 80046D44 44866000 */ mtc1 $a2, $f12 -/* 047948 80046D48 3C0E0D00 */ lui $t6, %hi(D_0D005FB0) # $t6, 0xd00 -/* 04794C 80046D4C AFBF002C */ sw $ra, 0x2c($sp) -/* 047950 80046D50 25CE5FB0 */ addiu $t6, %lo(D_0D005FB0) # addiu $t6, $t6, 0x5fb0 -/* 047954 80046D54 240F0040 */ li $t7, 64 -/* 047958 80046D58 24180020 */ li $t8, 32 -/* 04795C 80046D5C 24190040 */ li $t9, 64 -/* 047960 80046D60 24080020 */ li $t0, 32 -/* 047964 80046D64 44066000 */ mfc1 $a2, $f12 -/* 047968 80046D68 AFA80020 */ sw $t0, 0x20($sp) -/* 04796C 80046D6C AFB9001C */ sw $t9, 0x1c($sp) -/* 047970 80046D70 AFB80018 */ sw $t8, 0x18($sp) -/* 047974 80046D74 AFAF0014 */ sw $t7, 0x14($sp) -/* 047978 80046D78 0C011A02 */ jal func_80046808 -/* 04797C 80046D7C AFAE0010 */ sw $t6, 0x10($sp) -/* 047980 80046D80 8FBF002C */ lw $ra, 0x2c($sp) -/* 047984 80046D84 27BD0030 */ addiu $sp, $sp, 0x30 -/* 047988 80046D88 03E00008 */ jr $ra -/* 04798C 80046D8C 00000000 */ nop - -/* 047990 80046D90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 047994 80046D94 44876000 */ mtc1 $a3, $f12 -/* 047998 80046D98 8FAF0040 */ lw $t7, 0x40($sp) -/* 04799C 80046D9C 3C180D00 */ lui $t8, %hi(D_0D0060B0) # $t8, 0xd00 -/* 0479A0 80046DA0 AFBF002C */ sw $ra, 0x2c($sp) -/* 0479A4 80046DA4 AFA60038 */ sw $a2, 0x38($sp) -/* 0479A8 80046DA8 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0479AC 80046DAC 271860B0 */ addiu $t8, %lo(D_0D0060B0) # addiu $t8, $t8, 0x60b0 -/* 0479B0 80046DB0 24190040 */ li $t9, 64 -/* 0479B4 80046DB4 24080040 */ li $t0, 64 -/* 0479B8 80046DB8 24090040 */ li $t1, 64 -/* 0479BC 80046DBC 240A0020 */ li $t2, 32 -/* 0479C0 80046DC0 44076000 */ mfc1 $a3, $f12 -/* 0479C4 80046DC4 01C03025 */ move $a2, $t6 -/* 0479C8 80046DC8 AFAA0024 */ sw $t2, 0x24($sp) -/* 0479CC 80046DCC AFA90020 */ sw $t1, 0x20($sp) -/* 0479D0 80046DD0 AFA8001C */ sw $t0, 0x1c($sp) -/* 0479D4 80046DD4 AFB90018 */ sw $t9, 0x18($sp) -/* 0479D8 80046DD8 AFB80014 */ sw $t8, 0x14($sp) -/* 0479DC 80046DDC 0C011934 */ jal func_800464D0 -/* 0479E0 80046DE0 AFAF0010 */ sw $t7, 0x10($sp) -/* 0479E4 80046DE4 8FBF002C */ lw $ra, 0x2c($sp) -/* 0479E8 80046DE8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0479EC 80046DEC 03E00008 */ jr $ra -/* 0479F0 80046DF0 00000000 */ nop - -/* 0479F4 80046DF4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0479F8 80046DF8 44876000 */ mtc1 $a3, $f12 -/* 0479FC 80046DFC 8FAF0048 */ lw $t7, 0x48($sp) -/* 047A00 80046E00 8FB8004C */ lw $t8, 0x4c($sp) -/* 047A04 80046E04 3C190D00 */ lui $t9, %hi(D_0D0060B0) # $t9, 0xd00 -/* 047A08 80046E08 AFBF0034 */ sw $ra, 0x34($sp) -/* 047A0C 80046E0C AFA60040 */ sw $a2, 0x40($sp) -/* 047A10 80046E10 30CEFFFF */ andi $t6, $a2, 0xffff -/* 047A14 80046E14 273960B0 */ addiu $t9, %lo(D_0D0060B0) # addiu $t9, $t9, 0x60b0 -/* 047A18 80046E18 24080040 */ li $t0, 64 -/* 047A1C 80046E1C 24090040 */ li $t1, 64 -/* 047A20 80046E20 240A0040 */ li $t2, 64 -/* 047A24 80046E24 240B0020 */ li $t3, 32 -/* 047A28 80046E28 44076000 */ mfc1 $a3, $f12 -/* 047A2C 80046E2C 01C03025 */ move $a2, $t6 -/* 047A30 80046E30 AFAB0028 */ sw $t3, 0x28($sp) -/* 047A34 80046E34 AFAA0024 */ sw $t2, 0x24($sp) -/* 047A38 80046E38 AFA90020 */ sw $t1, 0x20($sp) -/* 047A3C 80046E3C AFA8001C */ sw $t0, 0x1c($sp) -/* 047A40 80046E40 AFB90018 */ sw $t9, 0x18($sp) -/* 047A44 80046E44 AFAF0010 */ sw $t7, 0x10($sp) -/* 047A48 80046E48 0C01196E */ jal func_800465B8 -/* 047A4C 80046E4C AFB80014 */ sw $t8, 0x14($sp) -/* 047A50 80046E50 8FBF0034 */ lw $ra, 0x34($sp) -/* 047A54 80046E54 27BD0038 */ addiu $sp, $sp, 0x38 -/* 047A58 80046E58 03E00008 */ jr $ra -/* 047A5C 80046E5C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80046E60.s b/asm/non_matchings/code_800431B0/func_80046E60.s deleted file mode 100644 index 042d8e85e..000000000 --- a/asm/non_matchings/code_800431B0/func_80046E60.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80046E60 -/* 047A60 80046E60 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 047A64 80046E64 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 047A68 80046E68 8C620000 */ lw $v0, ($v1) -/* 047A6C 80046E6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 047A70 80046E70 AFBF0014 */ sw $ra, 0x14($sp) -/* 047A74 80046E74 244E0008 */ addiu $t6, $v0, 8 -/* 047A78 80046E78 AFA40018 */ sw $a0, 0x18($sp) -/* 047A7C 80046E7C AFA5001C */ sw $a1, 0x1c($sp) -/* 047A80 80046E80 AFA60020 */ sw $a2, 0x20($sp) -/* 047A84 80046E84 AC6E0000 */ sw $t6, ($v1) -/* 047A88 80046E88 3C180D00 */ lui $t8, %hi(D_0D007D78) # $t8, 0xd00 -/* 047A8C 80046E8C 27187D78 */ addiu $t8, %lo(D_0D007D78) # addiu $t8, $t8, 0x7d78 -/* 047A90 80046E90 3C0F0600 */ lui $t7, 0x600 -/* 047A94 80046E94 AC4F0000 */ sw $t7, ($v0) -/* 047A98 80046E98 AC580004 */ sw $t8, 4($v0) -/* 047A9C 80046E9C 8C620000 */ lw $v0, ($v1) -/* 047AA0 80046EA0 3C0EFD10 */ lui $t6, 0xfd10 -/* 047AA4 80046EA4 00E03025 */ move $a2, $a3 -/* 047AA8 80046EA8 24590008 */ addiu $t9, $v0, 8 -/* 047AAC 80046EAC AC790000 */ sw $t9, ($v1) -/* 047AB0 80046EB0 AC4E0000 */ sw $t6, ($v0) -/* 047AB4 80046EB4 8FAF0018 */ lw $t7, 0x18($sp) -/* 047AB8 80046EB8 3C19E800 */ lui $t9, 0xe800 -/* 047ABC 80046EBC AC4F0004 */ sw $t7, 4($v0) -/* 047AC0 80046EC0 8C620000 */ lw $v0, ($v1) -/* 047AC4 80046EC4 3C0FF500 */ lui $t7, (0xF5000100 >> 16) # lui $t7, 0xf500 -/* 047AC8 80046EC8 35EF0100 */ ori $t7, (0xF5000100 & 0xFFFF) # ori $t7, $t7, 0x100 -/* 047ACC 80046ECC 24580008 */ addiu $t8, $v0, 8 -/* 047AD0 80046ED0 AC780000 */ sw $t8, ($v1) -/* 047AD4 80046ED4 AC400004 */ sw $zero, 4($v0) -/* 047AD8 80046ED8 AC590000 */ sw $t9, ($v0) -/* 047ADC 80046EDC 8C620000 */ lw $v0, ($v1) -/* 047AE0 80046EE0 3C180700 */ lui $t8, 0x700 -/* 047AE4 80046EE4 244E0008 */ addiu $t6, $v0, 8 -/* 047AE8 80046EE8 AC6E0000 */ sw $t6, ($v1) -/* 047AEC 80046EEC AC580004 */ sw $t8, 4($v0) -/* 047AF0 80046EF0 AC4F0000 */ sw $t7, ($v0) -/* 047AF4 80046EF4 8C620000 */ lw $v0, ($v1) -/* 047AF8 80046EF8 3C0EE600 */ lui $t6, 0xe600 -/* 047AFC 80046EFC 3C18F000 */ lui $t8, 0xf000 -/* 047B00 80046F00 24590008 */ addiu $t9, $v0, 8 -/* 047B04 80046F04 AC790000 */ sw $t9, ($v1) -/* 047B08 80046F08 AC400004 */ sw $zero, 4($v0) -/* 047B0C 80046F0C AC4E0000 */ sw $t6, ($v0) -/* 047B10 80046F10 8C620000 */ lw $v0, ($v1) -/* 047B14 80046F14 3C19073F */ lui $t9, (0x073FC000 >> 16) # lui $t9, 0x73f -/* 047B18 80046F18 3739C000 */ ori $t9, (0x073FC000 & 0xFFFF) # ori $t9, $t9, 0xc000 -/* 047B1C 80046F1C 244F0008 */ addiu $t7, $v0, 8 -/* 047B20 80046F20 AC6F0000 */ sw $t7, ($v1) -/* 047B24 80046F24 AC590004 */ sw $t9, 4($v0) -/* 047B28 80046F28 AC580000 */ sw $t8, ($v0) -/* 047B2C 80046F2C 8C620000 */ lw $v0, ($v1) -/* 047B30 80046F30 3C0FE700 */ lui $t7, 0xe700 -/* 047B34 80046F34 244E0008 */ addiu $t6, $v0, 8 -/* 047B38 80046F38 AC6E0000 */ sw $t6, ($v1) -/* 047B3C 80046F3C AC400004 */ sw $zero, 4($v0) -/* 047B40 80046F40 AC4F0000 */ sw $t7, ($v0) -/* 047B44 80046F44 8FA50020 */ lw $a1, 0x20($sp) -/* 047B48 80046F48 0C0114A9 */ jal func_800452A4 -/* 047B4C 80046F4C 8FA4001C */ lw $a0, 0x1c($sp) -/* 047B50 80046F50 8FBF0014 */ lw $ra, 0x14($sp) -/* 047B54 80046F54 27BD0018 */ addiu $sp, $sp, 0x18 -/* 047B58 80046F58 03E00008 */ jr $ra -/* 047B5C 80046F5C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80046F60.s b/asm/non_matchings/code_800431B0/func_80046F60.s deleted file mode 100644 index eb7f28b65..000000000 --- a/asm/non_matchings/code_800431B0/func_80046F60.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80046F60 -/* 047B60 80046F60 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 047B64 80046F64 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 047B68 80046F68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 047B6C 80046F6C 8C620000 */ lw $v0, ($v1) -/* 047B70 80046F70 AFBF0014 */ sw $ra, 0x14($sp) -/* 047B74 80046F74 AFA40018 */ sw $a0, 0x18($sp) -/* 047B78 80046F78 244E0008 */ addiu $t6, $v0, 8 -/* 047B7C 80046F7C AFA5001C */ sw $a1, 0x1c($sp) -/* 047B80 80046F80 AFA60020 */ sw $a2, 0x20($sp) -/* 047B84 80046F84 AFA70024 */ sw $a3, 0x24($sp) -/* 047B88 80046F88 AC6E0000 */ sw $t6, ($v1) -/* 047B8C 80046F8C 3C180D00 */ lui $t8, %hi(D_0D007D78) # $t8, 0xd00 -/* 047B90 80046F90 27187D78 */ addiu $t8, %lo(D_0D007D78) # addiu $t8, $t8, 0x7d78 -/* 047B94 80046F94 3C0F0600 */ lui $t7, 0x600 -/* 047B98 80046F98 AC4F0000 */ sw $t7, ($v0) -/* 047B9C 80046F9C AC580004 */ sw $t8, 4($v0) -/* 047BA0 80046FA0 8C620000 */ lw $v0, ($v1) -/* 047BA4 80046FA4 3C0EFD10 */ lui $t6, 0xfd10 -/* 047BA8 80046FA8 24590008 */ addiu $t9, $v0, 8 -/* 047BAC 80046FAC AC790000 */ sw $t9, ($v1) -/* 047BB0 80046FB0 AC4E0000 */ sw $t6, ($v0) -/* 047BB4 80046FB4 8FAF0018 */ lw $t7, 0x18($sp) -/* 047BB8 80046FB8 3C19E800 */ lui $t9, 0xe800 -/* 047BBC 80046FBC AC4F0004 */ sw $t7, 4($v0) -/* 047BC0 80046FC0 8C620000 */ lw $v0, ($v1) -/* 047BC4 80046FC4 3C0FF500 */ lui $t7, (0xF5000100 >> 16) # lui $t7, 0xf500 -/* 047BC8 80046FC8 35EF0100 */ ori $t7, (0xF5000100 & 0xFFFF) # ori $t7, $t7, 0x100 -/* 047BCC 80046FCC 24580008 */ addiu $t8, $v0, 8 -/* 047BD0 80046FD0 AC780000 */ sw $t8, ($v1) -/* 047BD4 80046FD4 AC400004 */ sw $zero, 4($v0) -/* 047BD8 80046FD8 AC590000 */ sw $t9, ($v0) -/* 047BDC 80046FDC 8C620000 */ lw $v0, ($v1) -/* 047BE0 80046FE0 3C180700 */ lui $t8, 0x700 -/* 047BE4 80046FE4 244E0008 */ addiu $t6, $v0, 8 -/* 047BE8 80046FE8 AC6E0000 */ sw $t6, ($v1) -/* 047BEC 80046FEC AC580004 */ sw $t8, 4($v0) -/* 047BF0 80046FF0 AC4F0000 */ sw $t7, ($v0) -/* 047BF4 80046FF4 8C620000 */ lw $v0, ($v1) -/* 047BF8 80046FF8 3C0EE600 */ lui $t6, 0xe600 -/* 047BFC 80046FFC 3C18F000 */ lui $t8, 0xf000 -/* 047C00 80047000 24590008 */ addiu $t9, $v0, 8 -/* 047C04 80047004 AC790000 */ sw $t9, ($v1) -/* 047C08 80047008 AC400004 */ sw $zero, 4($v0) -/* 047C0C 8004700C AC4E0000 */ sw $t6, ($v0) -/* 047C10 80047010 8C620000 */ lw $v0, ($v1) -/* 047C14 80047014 3C19073F */ lui $t9, (0x073FC000 >> 16) # lui $t9, 0x73f -/* 047C18 80047018 3739C000 */ ori $t9, (0x073FC000 & 0xFFFF) # ori $t9, $t9, 0xc000 -/* 047C1C 8004701C 244F0008 */ addiu $t7, $v0, 8 -/* 047C20 80047020 AC6F0000 */ sw $t7, ($v1) -/* 047C24 80047024 AC590004 */ sw $t9, 4($v0) -/* 047C28 80047028 AC580000 */ sw $t8, ($v0) -/* 047C2C 8004702C 8C620000 */ lw $v0, ($v1) -/* 047C30 80047030 3C0FE700 */ lui $t7, 0xe700 -/* 047C34 80047034 244E0008 */ addiu $t6, $v0, 8 -/* 047C38 80047038 AC6E0000 */ sw $t6, ($v1) -/* 047C3C 8004703C AC400004 */ sw $zero, 4($v0) -/* 047C40 80047040 AC4F0000 */ sw $t7, ($v0) -/* 047C44 80047044 8FA70028 */ lw $a3, 0x28($sp) -/* 047C48 80047048 8FA60024 */ lw $a2, 0x24($sp) -/* 047C4C 8004704C 8FA50020 */ lw $a1, 0x20($sp) -/* 047C50 80047050 0C011513 */ jal func_8004544C -/* 047C54 80047054 8FA4001C */ lw $a0, 0x1c($sp) -/* 047C58 80047058 8FBF0014 */ lw $ra, 0x14($sp) -/* 047C5C 8004705C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 047C60 80047060 03E00008 */ jr $ra -/* 047C64 80047064 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004788C.s b/asm/non_matchings/code_800431B0/func_8004788C.s deleted file mode 100644 index a9ea9b05d..000000000 --- a/asm/non_matchings/code_800431B0/func_8004788C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8004788C -/* 04848C 8004788C 44876000 */ mtc1 $a3, $f12 -/* 048490 80047890 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048494 80047894 AFBF0024 */ sw $ra, 0x24($sp) -/* 048498 80047898 AFA60030 */ sw $a2, 0x30($sp) -/* 04849C 8004789C 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0484A0 800478A0 44076000 */ mfc1 $a3, $f12 -/* 0484A4 800478A4 0C0108CC */ jal func_80042330 -/* 0484A8 800478A8 01C03025 */ move $a2, $t6 -/* 0484AC 800478AC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0484B0 800478B0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0484B4 800478B4 8D030000 */ lw $v1, ($t0) -/* 0484B8 800478B8 3C190D00 */ lui $t9, %hi(D_0D007CB8) # $t9, 0xd00 -/* 0484BC 800478BC 27397CB8 */ addiu $t9, %lo(D_0D007CB8) # addiu $t9, $t9, 0x7cb8 -/* 0484C0 800478C0 246F0008 */ addiu $t7, $v1, 8 -/* 0484C4 800478C4 AD0F0000 */ sw $t7, ($t0) -/* 0484C8 800478C8 3C180600 */ lui $t8, 0x600 -/* 0484CC 800478CC AC780000 */ sw $t8, ($v1) -/* 0484D0 800478D0 AC790004 */ sw $t9, 4($v1) -/* 0484D4 800478D4 8FAB0050 */ lw $t3, 0x50($sp) -/* 0484D8 800478D8 8FAA004C */ lw $t2, 0x4c($sp) -/* 0484DC 800478DC 8FA90048 */ lw $t1, 0x48($sp) -/* 0484E0 800478E0 8FA70044 */ lw $a3, 0x44($sp) -/* 0484E4 800478E4 8FA60040 */ lw $a2, 0x40($sp) -/* 0484E8 800478E8 8FA5003C */ lw $a1, 0x3c($sp) -/* 0484EC 800478EC 8FA40038 */ lw $a0, 0x38($sp) -/* 0484F0 800478F0 AFAB0018 */ sw $t3, 0x18($sp) -/* 0484F4 800478F4 AFAA0014 */ sw $t2, 0x14($sp) -/* 0484F8 800478F8 0C011C1A */ jal func_80047068 -/* 0484FC 800478FC AFA90010 */ sw $t1, 0x10($sp) -/* 048500 80047900 8FBF0024 */ lw $ra, 0x24($sp) -/* 048504 80047904 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048508 80047908 03E00008 */ jr $ra -/* 04850C 8004790C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047910.s b/asm/non_matchings/code_800431B0/func_80047910.s deleted file mode 100644 index 04947e228..000000000 --- a/asm/non_matchings/code_800431B0/func_80047910.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80047910 -/* 048510 80047910 44876000 */ mtc1 $a3, $f12 -/* 048514 80047914 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048518 80047918 AFBF0024 */ sw $ra, 0x24($sp) -/* 04851C 8004791C AFA60030 */ sw $a2, 0x30($sp) -/* 048520 80047920 30CEFFFF */ andi $t6, $a2, 0xffff -/* 048524 80047924 44076000 */ mfc1 $a3, $f12 -/* 048528 80047928 0C0108CC */ jal func_80042330 -/* 04852C 8004792C 01C03025 */ move $a2, $t6 -/* 048530 80047930 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048534 80047934 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048538 80047938 8D030000 */ lw $v1, ($t0) -/* 04853C 8004793C 3C190D00 */ lui $t9, %hi(D_0D007CD8) # $t9, 0xd00 -/* 048540 80047940 27397CD8 */ addiu $t9, %lo(D_0D007CD8) # addiu $t9, $t9, 0x7cd8 -/* 048544 80047944 246F0008 */ addiu $t7, $v1, 8 -/* 048548 80047948 AD0F0000 */ sw $t7, ($t0) -/* 04854C 8004794C 3C180600 */ lui $t8, 0x600 -/* 048550 80047950 AC780000 */ sw $t8, ($v1) -/* 048554 80047954 AC790004 */ sw $t9, 4($v1) -/* 048558 80047958 8FAB0050 */ lw $t3, 0x50($sp) -/* 04855C 8004795C 8FAA004C */ lw $t2, 0x4c($sp) -/* 048560 80047960 8FA90048 */ lw $t1, 0x48($sp) -/* 048564 80047964 8FA70044 */ lw $a3, 0x44($sp) -/* 048568 80047968 8FA60040 */ lw $a2, 0x40($sp) -/* 04856C 8004796C 8FA5003C */ lw $a1, 0x3c($sp) -/* 048570 80047970 8FA40038 */ lw $a0, 0x38($sp) -/* 048574 80047974 AFAB0018 */ sw $t3, 0x18($sp) -/* 048578 80047978 AFAA0014 */ sw $t2, 0x14($sp) -/* 04857C 8004797C 0C011C9C */ jal func_80047270 -/* 048580 80047980 AFA90010 */ sw $t1, 0x10($sp) -/* 048584 80047984 8FBF0024 */ lw $ra, 0x24($sp) -/* 048588 80047988 27BD0028 */ addiu $sp, $sp, 0x28 -/* 04858C 8004798C 03E00008 */ jr $ra -/* 048590 80047990 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047994.s b/asm/non_matchings/code_800431B0/func_80047994.s deleted file mode 100644 index 0dfc84b9f..000000000 --- a/asm/non_matchings/code_800431B0/func_80047994.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80047994 -/* 048594 80047994 44876000 */ mtc1 $a3, $f12 -/* 048598 80047998 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04859C 8004799C AFBF0024 */ sw $ra, 0x24($sp) -/* 0485A0 800479A0 AFA60030 */ sw $a2, 0x30($sp) -/* 0485A4 800479A4 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0485A8 800479A8 44076000 */ mfc1 $a3, $f12 -/* 0485AC 800479AC 0C0108CC */ jal func_80042330 -/* 0485B0 800479B0 01C03025 */ move $a2, $t6 -/* 0485B4 800479B4 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0485B8 800479B8 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0485BC 800479BC 8D030000 */ lw $v1, ($t0) -/* 0485C0 800479C0 3C190D00 */ lui $t9, %hi(D_0D007CF8) # $t9, 0xd00 -/* 0485C4 800479C4 27397CF8 */ addiu $t9, %lo(D_0D007CF8) # addiu $t9, $t9, 0x7cf8 -/* 0485C8 800479C8 246F0008 */ addiu $t7, $v1, 8 -/* 0485CC 800479CC AD0F0000 */ sw $t7, ($t0) -/* 0485D0 800479D0 3C180600 */ lui $t8, 0x600 -/* 0485D4 800479D4 AC780000 */ sw $t8, ($v1) -/* 0485D8 800479D8 AC790004 */ sw $t9, 4($v1) -/* 0485DC 800479DC 8FAB0050 */ lw $t3, 0x50($sp) -/* 0485E0 800479E0 8FAA004C */ lw $t2, 0x4c($sp) -/* 0485E4 800479E4 8FA90048 */ lw $t1, 0x48($sp) -/* 0485E8 800479E8 8FA70044 */ lw $a3, 0x44($sp) -/* 0485EC 800479EC 8FA60040 */ lw $a2, 0x40($sp) -/* 0485F0 800479F0 8FA5003C */ lw $a1, 0x3c($sp) -/* 0485F4 800479F4 8FA40038 */ lw $a0, 0x38($sp) -/* 0485F8 800479F8 AFAB0018 */ sw $t3, 0x18($sp) -/* 0485FC 800479FC AFAA0014 */ sw $t2, 0x14($sp) -/* 048600 80047A00 0C011C9C */ jal func_80047270 -/* 048604 80047A04 AFA90010 */ sw $t1, 0x10($sp) -/* 048608 80047A08 8FBF0024 */ lw $ra, 0x24($sp) -/* 04860C 80047A0C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048610 80047A10 03E00008 */ jr $ra -/* 048614 80047A14 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047A18.s b/asm/non_matchings/code_800431B0/func_80047A18.s deleted file mode 100644 index 44d2ef6e6..000000000 --- a/asm/non_matchings/code_800431B0/func_80047A18.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80047A18 -/* 048618 80047A18 44876000 */ mtc1 $a3, $f12 -/* 04861C 80047A1C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048620 80047A20 AFBF0024 */ sw $ra, 0x24($sp) -/* 048624 80047A24 AFA60030 */ sw $a2, 0x30($sp) -/* 048628 80047A28 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04862C 80047A2C 44076000 */ mfc1 $a3, $f12 -/* 048630 80047A30 0C0108CC */ jal func_80042330 -/* 048634 80047A34 01C03025 */ move $a2, $t6 -/* 048638 80047A38 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04863C 80047A3C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048640 80047A40 8D030000 */ lw $v1, ($t0) -/* 048644 80047A44 3C190D00 */ lui $t9, %hi(D_0D007D18) # $t9, 0xd00 -/* 048648 80047A48 27397D18 */ addiu $t9, %lo(D_0D007D18) # addiu $t9, $t9, 0x7d18 -/* 04864C 80047A4C 246F0008 */ addiu $t7, $v1, 8 -/* 048650 80047A50 AD0F0000 */ sw $t7, ($t0) -/* 048654 80047A54 3C180600 */ lui $t8, 0x600 -/* 048658 80047A58 AC780000 */ sw $t8, ($v1) -/* 04865C 80047A5C AC790004 */ sw $t9, 4($v1) -/* 048660 80047A60 8FAB0050 */ lw $t3, 0x50($sp) -/* 048664 80047A64 8FAA004C */ lw $t2, 0x4c($sp) -/* 048668 80047A68 8FA90048 */ lw $t1, 0x48($sp) -/* 04866C 80047A6C 8FA70044 */ lw $a3, 0x44($sp) -/* 048670 80047A70 8FA60040 */ lw $a2, 0x40($sp) -/* 048674 80047A74 8FA5003C */ lw $a1, 0x3c($sp) -/* 048678 80047A78 8FA40038 */ lw $a0, 0x38($sp) -/* 04867C 80047A7C AFAB0018 */ sw $t3, 0x18($sp) -/* 048680 80047A80 AFAA0014 */ sw $t2, 0x14($sp) -/* 048684 80047A84 0C011C1A */ jal func_80047068 -/* 048688 80047A88 AFA90010 */ sw $t1, 0x10($sp) -/* 04868C 80047A8C 8FBF0024 */ lw $ra, 0x24($sp) -/* 048690 80047A90 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048694 80047A94 03E00008 */ jr $ra -/* 048698 80047A98 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047A9C.s b/asm/non_matchings/code_800431B0/func_80047A9C.s deleted file mode 100644 index daa7490fc..000000000 --- a/asm/non_matchings/code_800431B0/func_80047A9C.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80047A9C -/* 04869C 80047A9C 44876000 */ mtc1 $a3, $f12 -/* 0486A0 80047AA0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0486A4 80047AA4 AFBF0024 */ sw $ra, 0x24($sp) -/* 0486A8 80047AA8 AFA60030 */ sw $a2, 0x30($sp) -/* 0486AC 80047AAC 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0486B0 80047AB0 44076000 */ mfc1 $a3, $f12 -/* 0486B4 80047AB4 0C0108CC */ jal func_80042330 -/* 0486B8 80047AB8 01C03025 */ move $a2, $t6 -/* 0486BC 80047ABC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0486C0 80047AC0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0486C4 80047AC4 8D030000 */ lw $v1, ($t0) -/* 0486C8 80047AC8 3C190D00 */ lui $t9, %hi(D_0D007D38) # $t9, 0xd00 -/* 0486CC 80047ACC 27397D38 */ addiu $t9, %lo(D_0D007D38) # addiu $t9, $t9, 0x7d38 -/* 0486D0 80047AD0 246F0008 */ addiu $t7, $v1, 8 -/* 0486D4 80047AD4 AD0F0000 */ sw $t7, ($t0) -/* 0486D8 80047AD8 3C180600 */ lui $t8, 0x600 -/* 0486DC 80047ADC AC780000 */ sw $t8, ($v1) -/* 0486E0 80047AE0 AC790004 */ sw $t9, 4($v1) -/* 0486E4 80047AE4 8FAB0050 */ lw $t3, 0x50($sp) -/* 0486E8 80047AE8 8FAA004C */ lw $t2, 0x4c($sp) -/* 0486EC 80047AEC 8FA90048 */ lw $t1, 0x48($sp) -/* 0486F0 80047AF0 8FA70044 */ lw $a3, 0x44($sp) -/* 0486F4 80047AF4 8FA60040 */ lw $a2, 0x40($sp) -/* 0486F8 80047AF8 8FA5003C */ lw $a1, 0x3c($sp) -/* 0486FC 80047AFC 8FA40038 */ lw $a0, 0x38($sp) -/* 048700 80047B00 AFAB0018 */ sw $t3, 0x18($sp) -/* 048704 80047B04 AFAA0014 */ sw $t2, 0x14($sp) -/* 048708 80047B08 0C011C9C */ jal func_80047270 -/* 04870C 80047B0C AFA90010 */ sw $t1, 0x10($sp) -/* 048710 80047B10 8FBF0024 */ lw $ra, 0x24($sp) -/* 048714 80047B14 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048718 80047B18 03E00008 */ jr $ra -/* 04871C 80047B1C 00000000 */ nop - -/* 048720 80047B20 44876000 */ mtc1 $a3, $f12 -/* 048724 80047B24 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 048728 80047B28 AFBF001C */ sw $ra, 0x1c($sp) -/* 04872C 80047B2C AFA60028 */ sw $a2, 0x28($sp) -/* 048730 80047B30 30CEFFFF */ andi $t6, $a2, 0xffff -/* 048734 80047B34 44076000 */ mfc1 $a3, $f12 -/* 048738 80047B38 0C0108CC */ jal func_80042330 -/* 04873C 80047B3C 01C03025 */ move $a2, $t6 -/* 048740 80047B40 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048744 80047B44 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048748 80047B48 8D030000 */ lw $v1, ($t0) -/* 04874C 80047B4C 3C190D00 */ lui $t9, %hi(D_0D007D38) # $t9, 0xd00 -/* 048750 80047B50 27397D38 */ addiu $t9, %lo(D_0D007D38) # addiu $t9, $t9, 0x7d38 -/* 048754 80047B54 246F0008 */ addiu $t7, $v1, 8 -/* 048758 80047B58 AD0F0000 */ sw $t7, ($t0) -/* 04875C 80047B5C 3C180600 */ lui $t8, 0x600 -/* 048760 80047B60 AC780000 */ sw $t8, ($v1) -/* 048764 80047B64 AC790004 */ sw $t9, 4($v1) -/* 048768 80047B68 8FAA0044 */ lw $t2, 0x44($sp) -/* 04876C 80047B6C 8FA90040 */ lw $t1, 0x40($sp) -/* 048770 80047B70 8FA7003C */ lw $a3, 0x3c($sp) -/* 048774 80047B74 8FA60038 */ lw $a2, 0x38($sp) -/* 048778 80047B78 8FA50034 */ lw $a1, 0x34($sp) -/* 04877C 80047B7C 8FA40030 */ lw $a0, 0x30($sp) -/* 048780 80047B80 AFAA0014 */ sw $t2, 0x14($sp) -/* 048784 80047B84 0C011DA3 */ jal func_8004768C -/* 048788 80047B88 AFA90010 */ sw $t1, 0x10($sp) -/* 04878C 80047B8C 8FBF001C */ lw $ra, 0x1c($sp) -/* 048790 80047B90 27BD0020 */ addiu $sp, $sp, 0x20 -/* 048794 80047B94 03E00008 */ jr $ra -/* 048798 80047B98 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047B9C.s b/asm/non_matchings/code_800431B0/func_80047B9C.s deleted file mode 100644 index 437372ee4..000000000 --- a/asm/non_matchings/code_800431B0/func_80047B9C.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80047B9C -/* 04879C 80047B9C 44876000 */ mtc1 $a3, $f12 -/* 0487A0 80047BA0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0487A4 80047BA4 AFBF0024 */ sw $ra, 0x24($sp) -/* 0487A8 80047BA8 AFA60030 */ sw $a2, 0x30($sp) -/* 0487AC 80047BAC 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0487B0 80047BB0 44076000 */ mfc1 $a3, $f12 -/* 0487B4 80047BB4 0C0108CC */ jal func_80042330 -/* 0487B8 80047BB8 01C03025 */ move $a2, $t6 -/* 0487BC 80047BBC 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 0487C0 80047BC0 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 0487C4 80047BC4 8CA30000 */ lw $v1, ($a1) -/* 0487C8 80047BC8 3C190D00 */ lui $t9, %hi(D_0D007DB8) # $t9, 0xd00 -/* 0487CC 80047BCC 27397DB8 */ addiu $t9, %lo(D_0D007DB8) # addiu $t9, $t9, 0x7db8 -/* 0487D0 80047BD0 246F0008 */ addiu $t7, $v1, 8 -/* 0487D4 80047BD4 ACAF0000 */ sw $t7, ($a1) -/* 0487D8 80047BD8 3C180600 */ lui $t8, 0x600 -/* 0487DC 80047BDC AC780000 */ sw $t8, ($v1) -/* 0487E0 80047BE0 AC790004 */ sw $t9, 4($v1) -/* 0487E4 80047BE4 0C012CAF */ jal func_8004B2BC -/* 0487E8 80047BE8 8FA40038 */ lw $a0, 0x38($sp) -/* 0487EC 80047BEC 8FA8004C */ lw $t0, 0x4c($sp) -/* 0487F0 80047BF0 8FA90050 */ lw $t1, 0x50($sp) -/* 0487F4 80047BF4 8FAA0054 */ lw $t2, 0x54($sp) -/* 0487F8 80047BF8 8FA4003C */ lw $a0, 0x3c($sp) -/* 0487FC 80047BFC 8FA50040 */ lw $a1, 0x40($sp) -/* 048800 80047C00 8FA60044 */ lw $a2, 0x44($sp) -/* 048804 80047C04 8FA70048 */ lw $a3, 0x48($sp) -/* 048808 80047C08 AFA80010 */ sw $t0, 0x10($sp) -/* 04880C 80047C0C AFA90014 */ sw $t1, 0x14($sp) -/* 048810 80047C10 0C011C1A */ jal func_80047068 -/* 048814 80047C14 AFAA0018 */ sw $t2, 0x18($sp) -/* 048818 80047C18 8FBF0024 */ lw $ra, 0x24($sp) -/* 04881C 80047C1C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048820 80047C20 03E00008 */ jr $ra -/* 048824 80047C24 00000000 */ nop - -/* 048828 80047C28 44876000 */ mtc1 $a3, $f12 -/* 04882C 80047C2C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048830 80047C30 AFBF0024 */ sw $ra, 0x24($sp) -/* 048834 80047C34 AFA60030 */ sw $a2, 0x30($sp) -/* 048838 80047C38 30CEFFFF */ andi $t6, $a2, 0xffff -/* 04883C 80047C3C 44076000 */ mfc1 $a3, $f12 -/* 048840 80047C40 0C0108CC */ jal func_80042330 -/* 048844 80047C44 01C03025 */ move $a2, $t6 -/* 048848 80047C48 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 04884C 80047C4C 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 048850 80047C50 8CA30000 */ lw $v1, ($a1) -/* 048854 80047C54 3C190D00 */ lui $t9, %hi(D_0D007DD8) # $t9, 0xd00 -/* 048858 80047C58 27397DD8 */ addiu $t9, %lo(D_0D007DD8) # addiu $t9, $t9, 0x7dd8 -/* 04885C 80047C5C 246F0008 */ addiu $t7, $v1, 8 -/* 048860 80047C60 ACAF0000 */ sw $t7, ($a1) -/* 048864 80047C64 3C180600 */ lui $t8, 0x600 -/* 048868 80047C68 AC780000 */ sw $t8, ($v1) -/* 04886C 80047C6C AC790004 */ sw $t9, 4($v1) -/* 048870 80047C70 0C012CAF */ jal func_8004B2BC -/* 048874 80047C74 8FA40038 */ lw $a0, 0x38($sp) -/* 048878 80047C78 8FA8004C */ lw $t0, 0x4c($sp) -/* 04887C 80047C7C 8FA90050 */ lw $t1, 0x50($sp) -/* 048880 80047C80 8FAA0054 */ lw $t2, 0x54($sp) -/* 048884 80047C84 8FA4003C */ lw $a0, 0x3c($sp) -/* 048888 80047C88 8FA50040 */ lw $a1, 0x40($sp) -/* 04888C 80047C8C 8FA60044 */ lw $a2, 0x44($sp) -/* 048890 80047C90 8FA70048 */ lw $a3, 0x48($sp) -/* 048894 80047C94 AFA80010 */ sw $t0, 0x10($sp) -/* 048898 80047C98 AFA90014 */ sw $t1, 0x14($sp) -/* 04889C 80047C9C 0C011C9C */ jal func_80047270 -/* 0488A0 80047CA0 AFAA0018 */ sw $t2, 0x18($sp) -/* 0488A4 80047CA4 8FBF0024 */ lw $ra, 0x24($sp) -/* 0488A8 80047CA8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0488AC 80047CAC 03E00008 */ jr $ra -/* 0488B0 80047CB0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047CB4.s b/asm/non_matchings/code_800431B0/func_80047CB4.s deleted file mode 100644 index 7008e122c..000000000 --- a/asm/non_matchings/code_800431B0/func_80047CB4.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_80047CB4 -/* 0488B4 80047CB4 44876000 */ mtc1 $a3, $f12 -/* 0488B8 80047CB8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0488BC 80047CBC AFBF0024 */ sw $ra, 0x24($sp) -/* 0488C0 80047CC0 AFA60030 */ sw $a2, 0x30($sp) -/* 0488C4 80047CC4 30CEFFFF */ andi $t6, $a2, 0xffff -/* 0488C8 80047CC8 44076000 */ mfc1 $a3, $f12 -/* 0488CC 80047CCC 0C0108CC */ jal func_80042330 -/* 0488D0 80047CD0 01C03025 */ move $a2, $t6 -/* 0488D4 80047CD4 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 0488D8 80047CD8 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 0488DC 80047CDC 8CA30000 */ lw $v1, ($a1) -/* 0488E0 80047CE0 3C190D00 */ lui $t9, %hi(D_0D007E38) # $t9, 0xd00 -/* 0488E4 80047CE4 27397E38 */ addiu $t9, %lo(D_0D007E38) # addiu $t9, $t9, 0x7e38 -/* 0488E8 80047CE8 246F0008 */ addiu $t7, $v1, 8 -/* 0488EC 80047CEC ACAF0000 */ sw $t7, ($a1) -/* 0488F0 80047CF0 3C180600 */ lui $t8, 0x600 -/* 0488F4 80047CF4 AC780000 */ sw $t8, ($v1) -/* 0488F8 80047CF8 AC790004 */ sw $t9, 4($v1) -/* 0488FC 80047CFC 0C012CAF */ jal func_8004B2BC -/* 048900 80047D00 8FA40038 */ lw $a0, 0x38($sp) -/* 048904 80047D04 8FA8004C */ lw $t0, 0x4c($sp) -/* 048908 80047D08 8FA90050 */ lw $t1, 0x50($sp) -/* 04890C 80047D0C 8FAA0054 */ lw $t2, 0x54($sp) -/* 048910 80047D10 8FA4003C */ lw $a0, 0x3c($sp) -/* 048914 80047D14 8FA50040 */ lw $a1, 0x40($sp) -/* 048918 80047D18 8FA60044 */ lw $a2, 0x44($sp) -/* 04891C 80047D1C 8FA70048 */ lw $a3, 0x48($sp) -/* 048920 80047D20 AFA80010 */ sw $t0, 0x10($sp) -/* 048924 80047D24 AFA90014 */ sw $t1, 0x14($sp) -/* 048928 80047D28 0C011C1A */ jal func_80047068 -/* 04892C 80047D2C AFAA0018 */ sw $t2, 0x18($sp) -/* 048930 80047D30 8FBF0024 */ lw $ra, 0x24($sp) -/* 048934 80047D34 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048938 80047D38 03E00008 */ jr $ra -/* 04893C 80047D3C 00000000 */ nop - -/* 048940 80047D40 44876000 */ mtc1 $a3, $f12 -/* 048944 80047D44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048948 80047D48 AFBF0024 */ sw $ra, 0x24($sp) -/* 04894C 80047D4C AFA60030 */ sw $a2, 0x30($sp) -/* 048950 80047D50 30CEFFFF */ andi $t6, $a2, 0xffff -/* 048954 80047D54 44076000 */ mfc1 $a3, $f12 -/* 048958 80047D58 0C0108CC */ jal func_80042330 -/* 04895C 80047D5C 01C03025 */ move $a2, $t6 -/* 048960 80047D60 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 048964 80047D64 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 048968 80047D68 8CA30000 */ lw $v1, ($a1) -/* 04896C 80047D6C 3C190D00 */ lui $t9, %hi(D_0D007E58) # $t9, 0xd00 -/* 048970 80047D70 27397E58 */ addiu $t9, %lo(D_0D007E58) # addiu $t9, $t9, 0x7e58 -/* 048974 80047D74 246F0008 */ addiu $t7, $v1, 8 -/* 048978 80047D78 ACAF0000 */ sw $t7, ($a1) -/* 04897C 80047D7C 3C180600 */ lui $t8, 0x600 -/* 048980 80047D80 AC780000 */ sw $t8, ($v1) -/* 048984 80047D84 AC790004 */ sw $t9, 4($v1) -/* 048988 80047D88 0C012CAF */ jal func_8004B2BC -/* 04898C 80047D8C 8FA40038 */ lw $a0, 0x38($sp) -/* 048990 80047D90 8FA8004C */ lw $t0, 0x4c($sp) -/* 048994 80047D94 8FA90050 */ lw $t1, 0x50($sp) -/* 048998 80047D98 8FAA0054 */ lw $t2, 0x54($sp) -/* 04899C 80047D9C 8FA4003C */ lw $a0, 0x3c($sp) -/* 0489A0 80047DA0 8FA50040 */ lw $a1, 0x40($sp) -/* 0489A4 80047DA4 8FA60044 */ lw $a2, 0x44($sp) -/* 0489A8 80047DA8 8FA70048 */ lw $a3, 0x48($sp) -/* 0489AC 80047DAC AFA80010 */ sw $t0, 0x10($sp) -/* 0489B0 80047DB0 AFA90014 */ sw $t1, 0x14($sp) -/* 0489B4 80047DB4 0C011C9C */ jal func_80047270 -/* 0489B8 80047DB8 AFAA0018 */ sw $t2, 0x18($sp) -/* 0489BC 80047DBC 8FBF0024 */ lw $ra, 0x24($sp) -/* 0489C0 80047DC0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0489C4 80047DC4 03E00008 */ jr $ra -/* 0489C8 80047DC8 00000000 */ nop - -/* 0489CC 80047DCC 44866000 */ mtc1 $a2, $f12 -/* 0489D0 80047DD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0489D4 80047DD4 AFBF0024 */ sw $ra, 0x24($sp) -/* 0489D8 80047DD8 44066000 */ mfc1 $a2, $f12 -/* 0489DC 80047DDC 0C010B80 */ jal func_80042E00 -/* 0489E0 80047DE0 AFA70034 */ sw $a3, 0x34($sp) -/* 0489E4 80047DE4 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0489E8 80047DE8 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0489EC 80047DEC 8D030000 */ lw $v1, ($t0) -/* 0489F0 80047DF0 3C180D00 */ lui $t8, %hi(D_0D007CB8) # $t8, 0xd00 -/* 0489F4 80047DF4 27187CB8 */ addiu $t8, %lo(D_0D007CB8) # addiu $t8, $t8, 0x7cb8 -/* 0489F8 80047DF8 246E0008 */ addiu $t6, $v1, 8 -/* 0489FC 80047DFC AD0E0000 */ sw $t6, ($t0) -/* 048A00 80047E00 3C0F0600 */ lui $t7, 0x600 -/* 048A04 80047E04 AC6F0000 */ sw $t7, ($v1) -/* 048A08 80047E08 AC780004 */ sw $t8, 4($v1) -/* 048A0C 80047E0C 8FAA004C */ lw $t2, 0x4c($sp) -/* 048A10 80047E10 8FA90048 */ lw $t1, 0x48($sp) -/* 048A14 80047E14 8FB90044 */ lw $t9, 0x44($sp) -/* 048A18 80047E18 8FA70040 */ lw $a3, 0x40($sp) -/* 048A1C 80047E1C 8FA6003C */ lw $a2, 0x3c($sp) -/* 048A20 80047E20 8FA50038 */ lw $a1, 0x38($sp) -/* 048A24 80047E24 8FA40034 */ lw $a0, 0x34($sp) -/* 048A28 80047E28 AFAA0018 */ sw $t2, 0x18($sp) -/* 048A2C 80047E2C AFA90014 */ sw $t1, 0x14($sp) -/* 048A30 80047E30 0C011C1A */ jal func_80047068 -/* 048A34 80047E34 AFB90010 */ sw $t9, 0x10($sp) -/* 048A38 80047E38 8FBF0024 */ lw $ra, 0x24($sp) -/* 048A3C 80047E3C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048A40 80047E40 03E00008 */ jr $ra -/* 048A44 80047E44 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047E48.s b/asm/non_matchings/code_800431B0/func_80047E48.s deleted file mode 100644 index a11d822ab..000000000 --- a/asm/non_matchings/code_800431B0/func_80047E48.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80047E48 -/* 048A48 80047E48 44866000 */ mtc1 $a2, $f12 -/* 048A4C 80047E4C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048A50 80047E50 AFBF0024 */ sw $ra, 0x24($sp) -/* 048A54 80047E54 44066000 */ mfc1 $a2, $f12 -/* 048A58 80047E58 0C010B80 */ jal func_80042E00 -/* 048A5C 80047E5C AFA70034 */ sw $a3, 0x34($sp) -/* 048A60 80047E60 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048A64 80047E64 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048A68 80047E68 8D030000 */ lw $v1, ($t0) -/* 048A6C 80047E6C 3C180D00 */ lui $t8, %hi(D_0D007CD8) # $t8, 0xd00 -/* 048A70 80047E70 27187CD8 */ addiu $t8, %lo(D_0D007CD8) # addiu $t8, $t8, 0x7cd8 -/* 048A74 80047E74 246E0008 */ addiu $t6, $v1, 8 -/* 048A78 80047E78 AD0E0000 */ sw $t6, ($t0) -/* 048A7C 80047E7C 3C0F0600 */ lui $t7, 0x600 -/* 048A80 80047E80 AC6F0000 */ sw $t7, ($v1) -/* 048A84 80047E84 AC780004 */ sw $t8, 4($v1) -/* 048A88 80047E88 8FAA004C */ lw $t2, 0x4c($sp) -/* 048A8C 80047E8C 8FA90048 */ lw $t1, 0x48($sp) -/* 048A90 80047E90 8FB90044 */ lw $t9, 0x44($sp) -/* 048A94 80047E94 8FA70040 */ lw $a3, 0x40($sp) -/* 048A98 80047E98 8FA6003C */ lw $a2, 0x3c($sp) -/* 048A9C 80047E9C 8FA50038 */ lw $a1, 0x38($sp) -/* 048AA0 80047EA0 8FA40034 */ lw $a0, 0x34($sp) -/* 048AA4 80047EA4 AFAA0018 */ sw $t2, 0x18($sp) -/* 048AA8 80047EA8 AFA90014 */ sw $t1, 0x14($sp) -/* 048AAC 80047EAC 0C011C9C */ jal func_80047270 -/* 048AB0 80047EB0 AFB90010 */ sw $t9, 0x10($sp) -/* 048AB4 80047EB4 8FBF0024 */ lw $ra, 0x24($sp) -/* 048AB8 80047EB8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048ABC 80047EBC 03E00008 */ jr $ra -/* 048AC0 80047EC0 00000000 */ nop - -/* 048AC4 80047EC4 44866000 */ mtc1 $a2, $f12 -/* 048AC8 80047EC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048ACC 80047ECC AFBF0024 */ sw $ra, 0x24($sp) -/* 048AD0 80047ED0 44066000 */ mfc1 $a2, $f12 -/* 048AD4 80047ED4 0C010B80 */ jal func_80042E00 -/* 048AD8 80047ED8 AFA70034 */ sw $a3, 0x34($sp) -/* 048ADC 80047EDC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048AE0 80047EE0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048AE4 80047EE4 8D030000 */ lw $v1, ($t0) -/* 048AE8 80047EE8 3C180D00 */ lui $t8, %hi(D_0D007D18) # $t8, 0xd00 -/* 048AEC 80047EEC 27187D18 */ addiu $t8, %lo(D_0D007D18) # addiu $t8, $t8, 0x7d18 -/* 048AF0 80047EF0 246E0008 */ addiu $t6, $v1, 8 -/* 048AF4 80047EF4 AD0E0000 */ sw $t6, ($t0) -/* 048AF8 80047EF8 3C0F0600 */ lui $t7, 0x600 -/* 048AFC 80047EFC AC6F0000 */ sw $t7, ($v1) -/* 048B00 80047F00 AC780004 */ sw $t8, 4($v1) -/* 048B04 80047F04 8FAA004C */ lw $t2, 0x4c($sp) -/* 048B08 80047F08 8FA90048 */ lw $t1, 0x48($sp) -/* 048B0C 80047F0C 8FB90044 */ lw $t9, 0x44($sp) -/* 048B10 80047F10 8FA70040 */ lw $a3, 0x40($sp) -/* 048B14 80047F14 8FA6003C */ lw $a2, 0x3c($sp) -/* 048B18 80047F18 8FA50038 */ lw $a1, 0x38($sp) -/* 048B1C 80047F1C 8FA40034 */ lw $a0, 0x34($sp) -/* 048B20 80047F20 AFAA0018 */ sw $t2, 0x18($sp) -/* 048B24 80047F24 AFA90014 */ sw $t1, 0x14($sp) -/* 048B28 80047F28 0C011C1A */ jal func_80047068 -/* 048B2C 80047F2C AFB90010 */ sw $t9, 0x10($sp) -/* 048B30 80047F30 8FBF0024 */ lw $ra, 0x24($sp) -/* 048B34 80047F34 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048B38 80047F38 03E00008 */ jr $ra -/* 048B3C 80047F3C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80047F40.s b/asm/non_matchings/code_800431B0/func_80047F40.s deleted file mode 100644 index 384b50aef..000000000 --- a/asm/non_matchings/code_800431B0/func_80047F40.s +++ /dev/null @@ -1,96 +0,0 @@ -glabel func_80047F40 -/* 048B40 80047F40 44866000 */ mtc1 $a2, $f12 -/* 048B44 80047F44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048B48 80047F48 AFBF0024 */ sw $ra, 0x24($sp) -/* 048B4C 80047F4C 44066000 */ mfc1 $a2, $f12 -/* 048B50 80047F50 0C010B80 */ jal func_80042E00 -/* 048B54 80047F54 AFA70034 */ sw $a3, 0x34($sp) -/* 048B58 80047F58 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048B5C 80047F5C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048B60 80047F60 8D030000 */ lw $v1, ($t0) -/* 048B64 80047F64 3C180D00 */ lui $t8, %hi(D_0D007D38) # $t8, 0xd00 -/* 048B68 80047F68 27187D38 */ addiu $t8, %lo(D_0D007D38) # addiu $t8, $t8, 0x7d38 -/* 048B6C 80047F6C 246E0008 */ addiu $t6, $v1, 8 -/* 048B70 80047F70 AD0E0000 */ sw $t6, ($t0) -/* 048B74 80047F74 3C0F0600 */ lui $t7, 0x600 -/* 048B78 80047F78 AC6F0000 */ sw $t7, ($v1) -/* 048B7C 80047F7C AC780004 */ sw $t8, 4($v1) -/* 048B80 80047F80 8FAA004C */ lw $t2, 0x4c($sp) -/* 048B84 80047F84 8FA90048 */ lw $t1, 0x48($sp) -/* 048B88 80047F88 8FB90044 */ lw $t9, 0x44($sp) -/* 048B8C 80047F8C 8FA70040 */ lw $a3, 0x40($sp) -/* 048B90 80047F90 8FA6003C */ lw $a2, 0x3c($sp) -/* 048B94 80047F94 8FA50038 */ lw $a1, 0x38($sp) -/* 048B98 80047F98 8FA40034 */ lw $a0, 0x34($sp) -/* 048B9C 80047F9C AFAA0018 */ sw $t2, 0x18($sp) -/* 048BA0 80047FA0 AFA90014 */ sw $t1, 0x14($sp) -/* 048BA4 80047FA4 0C011C9C */ jal func_80047270 -/* 048BA8 80047FA8 AFB90010 */ sw $t9, 0x10($sp) -/* 048BAC 80047FAC 8FBF0024 */ lw $ra, 0x24($sp) -/* 048BB0 80047FB0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048BB4 80047FB4 03E00008 */ jr $ra -/* 048BB8 80047FB8 00000000 */ nop - -/* 048BBC 80047FBC 44866000 */ mtc1 $a2, $f12 -/* 048BC0 80047FC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048BC4 80047FC4 AFBF0024 */ sw $ra, 0x24($sp) -/* 048BC8 80047FC8 44066000 */ mfc1 $a2, $f12 -/* 048BCC 80047FCC 0C010B80 */ jal func_80042E00 -/* 048BD0 80047FD0 AFA70034 */ sw $a3, 0x34($sp) -/* 048BD4 80047FD4 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048BD8 80047FD8 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048BDC 80047FDC 8D030000 */ lw $v1, ($t0) -/* 048BE0 80047FE0 3C180D00 */ lui $t8, %hi(D_0D007D58) # $t8, 0xd00 -/* 048BE4 80047FE4 27187D58 */ addiu $t8, %lo(D_0D007D58) # addiu $t8, $t8, 0x7d58 -/* 048BE8 80047FE8 246E0008 */ addiu $t6, $v1, 8 -/* 048BEC 80047FEC AD0E0000 */ sw $t6, ($t0) -/* 048BF0 80047FF0 3C0F0600 */ lui $t7, 0x600 -/* 048BF4 80047FF4 AC6F0000 */ sw $t7, ($v1) -/* 048BF8 80047FF8 AC780004 */ sw $t8, 4($v1) -/* 048BFC 80047FFC 8FAA004C */ lw $t2, 0x4c($sp) -/* 048C00 80048000 8FA90048 */ lw $t1, 0x48($sp) -/* 048C04 80048004 8FB90044 */ lw $t9, 0x44($sp) -/* 048C08 80048008 8FA70040 */ lw $a3, 0x40($sp) -/* 048C0C 8004800C 8FA6003C */ lw $a2, 0x3c($sp) -/* 048C10 80048010 8FA50038 */ lw $a1, 0x38($sp) -/* 048C14 80048014 8FA40034 */ lw $a0, 0x34($sp) -/* 048C18 80048018 AFAA0018 */ sw $t2, 0x18($sp) -/* 048C1C 8004801C AFA90014 */ sw $t1, 0x14($sp) -/* 048C20 80048020 0C011C9C */ jal func_80047270 -/* 048C24 80048024 AFB90010 */ sw $t9, 0x10($sp) -/* 048C28 80048028 8FBF0024 */ lw $ra, 0x24($sp) -/* 048C2C 8004802C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048C30 80048030 03E00008 */ jr $ra -/* 048C34 80048034 00000000 */ nop - -/* 048C38 80048038 44866000 */ mtc1 $a2, $f12 -/* 048C3C 8004803C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048C40 80048040 AFBF0024 */ sw $ra, 0x24($sp) -/* 048C44 80048044 44066000 */ mfc1 $a2, $f12 -/* 048C48 80048048 0C010B80 */ jal func_80042E00 -/* 048C4C 8004804C AFA70034 */ sw $a3, 0x34($sp) -/* 048C50 80048050 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048C54 80048054 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048C58 80048058 8D030000 */ lw $v1, ($t0) -/* 048C5C 8004805C 3C180D00 */ lui $t8, %hi(D_0D007D98) # $t8, 0xd00 -/* 048C60 80048060 27187D98 */ addiu $t8, %lo(D_0D007D98) # addiu $t8, $t8, 0x7d98 -/* 048C64 80048064 246E0008 */ addiu $t6, $v1, 8 -/* 048C68 80048068 AD0E0000 */ sw $t6, ($t0) -/* 048C6C 8004806C 3C0F0600 */ lui $t7, 0x600 -/* 048C70 80048070 AC6F0000 */ sw $t7, ($v1) -/* 048C74 80048074 AC780004 */ sw $t8, 4($v1) -/* 048C78 80048078 8FAA004C */ lw $t2, 0x4c($sp) -/* 048C7C 8004807C 8FA90048 */ lw $t1, 0x48($sp) -/* 048C80 80048080 8FB90044 */ lw $t9, 0x44($sp) -/* 048C84 80048084 8FA70040 */ lw $a3, 0x40($sp) -/* 048C88 80048088 8FA6003C */ lw $a2, 0x3c($sp) -/* 048C8C 8004808C 8FA50038 */ lw $a1, 0x38($sp) -/* 048C90 80048090 8FA40034 */ lw $a0, 0x34($sp) -/* 048C94 80048094 AFAA0018 */ sw $t2, 0x18($sp) -/* 048C98 80048098 AFA90014 */ sw $t1, 0x14($sp) -/* 048C9C 8004809C 0C011C1A */ jal func_80047068 -/* 048CA0 800480A0 AFB90010 */ sw $t9, 0x10($sp) -/* 048CA4 800480A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 048CA8 800480A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048CAC 800480AC 03E00008 */ jr $ra -/* 048CB0 800480B0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800480B4.s b/asm/non_matchings/code_800431B0/func_800480B4.s deleted file mode 100644 index 027b8c889..000000000 --- a/asm/non_matchings/code_800431B0/func_800480B4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800480B4 -/* 048CB4 800480B4 44866000 */ mtc1 $a2, $f12 -/* 048CB8 800480B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048CBC 800480BC AFBF0024 */ sw $ra, 0x24($sp) -/* 048CC0 800480C0 44066000 */ mfc1 $a2, $f12 -/* 048CC4 800480C4 0C010B80 */ jal func_80042E00 -/* 048CC8 800480C8 AFA70034 */ sw $a3, 0x34($sp) -/* 048CCC 800480CC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048CD0 800480D0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048CD4 800480D4 8D030000 */ lw $v1, ($t0) -/* 048CD8 800480D8 3C180D00 */ lui $t8, %hi(D_0D007D78) # $t8, 0xd00 -/* 048CDC 800480DC 27187D78 */ addiu $t8, %lo(D_0D007D78) # addiu $t8, $t8, 0x7d78 -/* 048CE0 800480E0 246E0008 */ addiu $t6, $v1, 8 -/* 048CE4 800480E4 AD0E0000 */ sw $t6, ($t0) -/* 048CE8 800480E8 3C0F0600 */ lui $t7, 0x600 -/* 048CEC 800480EC AC6F0000 */ sw $t7, ($v1) -/* 048CF0 800480F0 AC780004 */ sw $t8, 4($v1) -/* 048CF4 800480F4 8FAA004C */ lw $t2, 0x4c($sp) -/* 048CF8 800480F8 8FA90048 */ lw $t1, 0x48($sp) -/* 048CFC 800480FC 8FB90044 */ lw $t9, 0x44($sp) -/* 048D00 80048100 8FA70040 */ lw $a3, 0x40($sp) -/* 048D04 80048104 8FA6003C */ lw $a2, 0x3c($sp) -/* 048D08 80048108 8FA50038 */ lw $a1, 0x38($sp) -/* 048D0C 8004810C 8FA40034 */ lw $a0, 0x34($sp) -/* 048D10 80048110 AFAA0018 */ sw $t2, 0x18($sp) -/* 048D14 80048114 AFA90014 */ sw $t1, 0x14($sp) -/* 048D18 80048118 0C011C9C */ jal func_80047270 -/* 048D1C 8004811C AFB90010 */ sw $t9, 0x10($sp) -/* 048D20 80048120 8FBF0024 */ lw $ra, 0x24($sp) -/* 048D24 80048124 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048D28 80048128 03E00008 */ jr $ra -/* 048D2C 8004812C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80048130.s b/asm/non_matchings/code_800431B0/func_80048130.s deleted file mode 100644 index 1bbfde59e..000000000 --- a/asm/non_matchings/code_800431B0/func_80048130.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80048130 -/* 048D30 80048130 44866000 */ mtc1 $a2, $f12 -/* 048D34 80048134 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048D38 80048138 AFBF0024 */ sw $ra, 0x24($sp) -/* 048D3C 8004813C 44066000 */ mfc1 $a2, $f12 -/* 048D40 80048140 0C010B80 */ jal func_80042E00 -/* 048D44 80048144 AFA70034 */ sw $a3, 0x34($sp) -/* 048D48 80048148 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048D4C 8004814C 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048D50 80048150 8D030000 */ lw $v1, ($t0) -/* 048D54 80048154 3C180D00 */ lui $t8, %hi(D_0D007D78) # $t8, 0xd00 -/* 048D58 80048158 27187D78 */ addiu $t8, %lo(D_0D007D78) # addiu $t8, $t8, 0x7d78 -/* 048D5C 8004815C 246E0008 */ addiu $t6, $v1, 8 -/* 048D60 80048160 AD0E0000 */ sw $t6, ($t0) -/* 048D64 80048164 3C0F0600 */ lui $t7, 0x600 -/* 048D68 80048168 AC6F0000 */ sw $t7, ($v1) -/* 048D6C 8004816C AC780004 */ sw $t8, 4($v1) -/* 048D70 80048170 8FAB0050 */ lw $t3, 0x50($sp) -/* 048D74 80048174 8FAA004C */ lw $t2, 0x4c($sp) -/* 048D78 80048178 8FA90048 */ lw $t1, 0x48($sp) -/* 048D7C 8004817C 8FB90044 */ lw $t9, 0x44($sp) -/* 048D80 80048180 8FA70040 */ lw $a3, 0x40($sp) -/* 048D84 80048184 8FA6003C */ lw $a2, 0x3c($sp) -/* 048D88 80048188 8FA50038 */ lw $a1, 0x38($sp) -/* 048D8C 8004818C 8FA40034 */ lw $a0, 0x34($sp) -/* 048D90 80048190 AFAB001C */ sw $t3, 0x1c($sp) -/* 048D94 80048194 AFAA0018 */ sw $t2, 0x18($sp) -/* 048D98 80048198 AFA90014 */ sw $t1, 0x14($sp) -/* 048D9C 8004819C 0C011D1F */ jal func_8004747C -/* 048DA0 800481A0 AFB90010 */ sw $t9, 0x10($sp) -/* 048DA4 800481A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 048DA8 800481A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048DAC 800481AC 03E00008 */ jr $ra -/* 048DB0 800481B0 00000000 */ nop - -/* 048DB4 800481B4 44866000 */ mtc1 $a2, $f12 -/* 048DB8 800481B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 048DBC 800481BC AFBF001C */ sw $ra, 0x1c($sp) -/* 048DC0 800481C0 44066000 */ mfc1 $a2, $f12 -/* 048DC4 800481C4 0C010B80 */ jal func_80042E00 -/* 048DC8 800481C8 AFA7002C */ sw $a3, 0x2c($sp) -/* 048DCC 800481CC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 048DD0 800481D0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 048DD4 800481D4 8D030000 */ lw $v1, ($t0) -/* 048DD8 800481D8 3C180D00 */ lui $t8, %hi(D_0D007D78) # $t8, 0xd00 -/* 048DDC 800481DC 27187D78 */ addiu $t8, %lo(D_0D007D78) # addiu $t8, $t8, 0x7d78 -/* 048DE0 800481E0 246E0008 */ addiu $t6, $v1, 8 -/* 048DE4 800481E4 AD0E0000 */ sw $t6, ($t0) -/* 048DE8 800481E8 3C0F0600 */ lui $t7, 0x600 -/* 048DEC 800481EC AC6F0000 */ sw $t7, ($v1) -/* 048DF0 800481F0 AC780004 */ sw $t8, 4($v1) -/* 048DF4 800481F4 8FA90040 */ lw $t1, 0x40($sp) -/* 048DF8 800481F8 8FB9003C */ lw $t9, 0x3c($sp) -/* 048DFC 800481FC 8FA70038 */ lw $a3, 0x38($sp) -/* 048E00 80048200 8FA60034 */ lw $a2, 0x34($sp) -/* 048E04 80048204 8FA50030 */ lw $a1, 0x30($sp) -/* 048E08 80048208 8FA4002C */ lw $a0, 0x2c($sp) -/* 048E0C 8004820C AFA90014 */ sw $t1, 0x14($sp) -/* 048E10 80048210 0C011DA3 */ jal func_8004768C -/* 048E14 80048214 AFB90010 */ sw $t9, 0x10($sp) -/* 048E18 80048218 8FBF001C */ lw $ra, 0x1c($sp) -/* 048E1C 8004821C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 048E20 80048220 03E00008 */ jr $ra -/* 048E24 80048224 00000000 */ nop - -/* 048E28 80048228 44866000 */ mtc1 $a2, $f12 -/* 048E2C 8004822C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048E30 80048230 AFBF0024 */ sw $ra, 0x24($sp) -/* 048E34 80048234 44066000 */ mfc1 $a2, $f12 -/* 048E38 80048238 0C010B80 */ jal func_80042E00 -/* 048E3C 8004823C AFA70034 */ sw $a3, 0x34($sp) -/* 048E40 80048240 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 048E44 80048244 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 048E48 80048248 8CA30000 */ lw $v1, ($a1) -/* 048E4C 8004824C 3C180D00 */ lui $t8, %hi(D_0D007DB8) # $t8, 0xd00 -/* 048E50 80048250 27187DB8 */ addiu $t8, %lo(D_0D007DB8) # addiu $t8, $t8, 0x7db8 -/* 048E54 80048254 246E0008 */ addiu $t6, $v1, 8 -/* 048E58 80048258 ACAE0000 */ sw $t6, ($a1) -/* 048E5C 8004825C 3C0F0600 */ lui $t7, 0x600 -/* 048E60 80048260 AC6F0000 */ sw $t7, ($v1) -/* 048E64 80048264 AC780004 */ sw $t8, 4($v1) -/* 048E68 80048268 0C012CAF */ jal func_8004B2BC -/* 048E6C 8004826C 8FA40034 */ lw $a0, 0x34($sp) -/* 048E70 80048270 8FB90048 */ lw $t9, 0x48($sp) -/* 048E74 80048274 8FA8004C */ lw $t0, 0x4c($sp) -/* 048E78 80048278 8FA90050 */ lw $t1, 0x50($sp) -/* 048E7C 8004827C 8FA40038 */ lw $a0, 0x38($sp) -/* 048E80 80048280 8FA5003C */ lw $a1, 0x3c($sp) -/* 048E84 80048284 8FA60040 */ lw $a2, 0x40($sp) -/* 048E88 80048288 8FA70044 */ lw $a3, 0x44($sp) -/* 048E8C 8004828C AFB90010 */ sw $t9, 0x10($sp) -/* 048E90 80048290 AFA80014 */ sw $t0, 0x14($sp) -/* 048E94 80048294 0C011C1A */ jal func_80047068 -/* 048E98 80048298 AFA90018 */ sw $t1, 0x18($sp) -/* 048E9C 8004829C 8FBF0024 */ lw $ra, 0x24($sp) -/* 048EA0 800482A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048EA4 800482A4 03E00008 */ jr $ra -/* 048EA8 800482A8 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800482AC.s b/asm/non_matchings/code_800431B0/func_800482AC.s deleted file mode 100644 index c675b5432..000000000 --- a/asm/non_matchings/code_800431B0/func_800482AC.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_800482AC -/* 048EAC 800482AC 44866000 */ mtc1 $a2, $f12 -/* 048EB0 800482B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048EB4 800482B4 AFBF0024 */ sw $ra, 0x24($sp) -/* 048EB8 800482B8 44066000 */ mfc1 $a2, $f12 -/* 048EBC 800482BC 0C010B80 */ jal func_80042E00 -/* 048EC0 800482C0 AFA70034 */ sw $a3, 0x34($sp) -/* 048EC4 800482C4 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 048EC8 800482C8 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 048ECC 800482CC 8CA30000 */ lw $v1, ($a1) -/* 048ED0 800482D0 3C180D00 */ lui $t8, %hi(D_0D007DD8) # $t8, 0xd00 -/* 048ED4 800482D4 27187DD8 */ addiu $t8, %lo(D_0D007DD8) # addiu $t8, $t8, 0x7dd8 -/* 048ED8 800482D8 246E0008 */ addiu $t6, $v1, 8 -/* 048EDC 800482DC ACAE0000 */ sw $t6, ($a1) -/* 048EE0 800482E0 3C0F0600 */ lui $t7, 0x600 -/* 048EE4 800482E4 AC6F0000 */ sw $t7, ($v1) -/* 048EE8 800482E8 AC780004 */ sw $t8, 4($v1) -/* 048EEC 800482EC 0C012CAF */ jal func_8004B2BC -/* 048EF0 800482F0 8FA40034 */ lw $a0, 0x34($sp) -/* 048EF4 800482F4 8FB90048 */ lw $t9, 0x48($sp) -/* 048EF8 800482F8 8FA8004C */ lw $t0, 0x4c($sp) -/* 048EFC 800482FC 8FA90050 */ lw $t1, 0x50($sp) -/* 048F00 80048300 8FA40038 */ lw $a0, 0x38($sp) -/* 048F04 80048304 8FA5003C */ lw $a1, 0x3c($sp) -/* 048F08 80048308 8FA60040 */ lw $a2, 0x40($sp) -/* 048F0C 8004830C 8FA70044 */ lw $a3, 0x44($sp) -/* 048F10 80048310 AFB90010 */ sw $t9, 0x10($sp) -/* 048F14 80048314 AFA80014 */ sw $t0, 0x14($sp) -/* 048F18 80048318 0C011C9C */ jal func_80047270 -/* 048F1C 8004831C AFA90018 */ sw $t1, 0x18($sp) -/* 048F20 80048320 8FBF0024 */ lw $ra, 0x24($sp) -/* 048F24 80048324 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048F28 80048328 03E00008 */ jr $ra -/* 048F2C 8004832C 00000000 */ nop - -/* 048F30 80048330 44866000 */ mtc1 $a2, $f12 -/* 048F34 80048334 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048F38 80048338 AFBF0024 */ sw $ra, 0x24($sp) -/* 048F3C 8004833C 44066000 */ mfc1 $a2, $f12 -/* 048F40 80048340 0C010B80 */ jal func_80042E00 -/* 048F44 80048344 AFA70034 */ sw $a3, 0x34($sp) -/* 048F48 80048348 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 048F4C 8004834C 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 048F50 80048350 8CA30000 */ lw $v1, ($a1) -/* 048F54 80048354 3C180D00 */ lui $t8, %hi(D_0D007E38) # $t8, 0xd00 -/* 048F58 80048358 27187E38 */ addiu $t8, %lo(D_0D007E38) # addiu $t8, $t8, 0x7e38 -/* 048F5C 8004835C 246E0008 */ addiu $t6, $v1, 8 -/* 048F60 80048360 ACAE0000 */ sw $t6, ($a1) -/* 048F64 80048364 3C0F0600 */ lui $t7, 0x600 -/* 048F68 80048368 AC6F0000 */ sw $t7, ($v1) -/* 048F6C 8004836C AC780004 */ sw $t8, 4($v1) -/* 048F70 80048370 0C012CAF */ jal func_8004B2BC -/* 048F74 80048374 8FA40034 */ lw $a0, 0x34($sp) -/* 048F78 80048378 8FB90048 */ lw $t9, 0x48($sp) -/* 048F7C 8004837C 8FA8004C */ lw $t0, 0x4c($sp) -/* 048F80 80048380 8FA90050 */ lw $t1, 0x50($sp) -/* 048F84 80048384 8FA40038 */ lw $a0, 0x38($sp) -/* 048F88 80048388 8FA5003C */ lw $a1, 0x3c($sp) -/* 048F8C 8004838C 8FA60040 */ lw $a2, 0x40($sp) -/* 048F90 80048390 8FA70044 */ lw $a3, 0x44($sp) -/* 048F94 80048394 AFB90010 */ sw $t9, 0x10($sp) -/* 048F98 80048398 AFA80014 */ sw $t0, 0x14($sp) -/* 048F9C 8004839C 0C011C1A */ jal func_80047068 -/* 048FA0 800483A0 AFA90018 */ sw $t1, 0x18($sp) -/* 048FA4 800483A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 048FA8 800483A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 048FAC 800483AC 03E00008 */ jr $ra -/* 048FB0 800483B0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800483B4.s b/asm/non_matchings/code_800431B0/func_800483B4.s deleted file mode 100644 index bca1264f7..000000000 --- a/asm/non_matchings/code_800431B0/func_800483B4.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_800483B4 -/* 048FB4 800483B4 44866000 */ mtc1 $a2, $f12 -/* 048FB8 800483B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 048FBC 800483BC AFBF0024 */ sw $ra, 0x24($sp) -/* 048FC0 800483C0 44066000 */ mfc1 $a2, $f12 -/* 048FC4 800483C4 0C010B80 */ jal func_80042E00 -/* 048FC8 800483C8 AFA70034 */ sw $a3, 0x34($sp) -/* 048FCC 800483CC 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 048FD0 800483D0 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 048FD4 800483D4 8CA30000 */ lw $v1, ($a1) -/* 048FD8 800483D8 3C180D00 */ lui $t8, %hi(D_0D007E58) # $t8, 0xd00 -/* 048FDC 800483DC 27187E58 */ addiu $t8, %lo(D_0D007E58) # addiu $t8, $t8, 0x7e58 -/* 048FE0 800483E0 246E0008 */ addiu $t6, $v1, 8 -/* 048FE4 800483E4 ACAE0000 */ sw $t6, ($a1) -/* 048FE8 800483E8 3C0F0600 */ lui $t7, 0x600 -/* 048FEC 800483EC AC6F0000 */ sw $t7, ($v1) -/* 048FF0 800483F0 AC780004 */ sw $t8, 4($v1) -/* 048FF4 800483F4 0C012CAF */ jal func_8004B2BC -/* 048FF8 800483F8 8FA40034 */ lw $a0, 0x34($sp) -/* 048FFC 800483FC 8FB90048 */ lw $t9, 0x48($sp) -/* 049000 80048400 8FA8004C */ lw $t0, 0x4c($sp) -/* 049004 80048404 8FA90050 */ lw $t1, 0x50($sp) -/* 049008 80048408 8FA40038 */ lw $a0, 0x38($sp) -/* 04900C 8004840C 8FA5003C */ lw $a1, 0x3c($sp) -/* 049010 80048410 8FA60040 */ lw $a2, 0x40($sp) -/* 049014 80048414 8FA70044 */ lw $a3, 0x44($sp) -/* 049018 80048418 AFB90010 */ sw $t9, 0x10($sp) -/* 04901C 8004841C AFA80014 */ sw $t0, 0x14($sp) -/* 049020 80048420 0C011C9C */ jal func_80047270 -/* 049024 80048424 AFA90018 */ sw $t1, 0x18($sp) -/* 049028 80048428 8FBF0024 */ lw $ra, 0x24($sp) -/* 04902C 8004842C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 049030 80048430 03E00008 */ jr $ra -/* 049034 80048434 00000000 */ nop - -/* 049038 80048438 44866000 */ mtc1 $a2, $f12 -/* 04903C 8004843C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 049040 80048440 AFBF0024 */ sw $ra, 0x24($sp) -/* 049044 80048444 44066000 */ mfc1 $a2, $f12 -/* 049048 80048448 0C010B80 */ jal func_80042E00 -/* 04904C 8004844C AFA70034 */ sw $a3, 0x34($sp) -/* 049050 80048450 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 049054 80048454 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 049058 80048458 8CA30000 */ lw $v1, ($a1) -/* 04905C 8004845C 3C180D00 */ lui $t8, %hi(D_0D007DF8) # $t8, 0xd00 -/* 049060 80048460 27187DF8 */ addiu $t8, %lo(D_0D007DF8) # addiu $t8, $t8, 0x7df8 -/* 049064 80048464 246E0008 */ addiu $t6, $v1, 8 -/* 049068 80048468 ACAE0000 */ sw $t6, ($a1) -/* 04906C 8004846C 3C0F0600 */ lui $t7, 0x600 -/* 049070 80048470 AC6F0000 */ sw $t7, ($v1) -/* 049074 80048474 AC780004 */ sw $t8, 4($v1) -/* 049078 80048478 0C012CAF */ jal func_8004B2BC -/* 04907C 8004847C 8FA40034 */ lw $a0, 0x34($sp) -/* 049080 80048480 8FB90048 */ lw $t9, 0x48($sp) -/* 049084 80048484 8FA8004C */ lw $t0, 0x4c($sp) -/* 049088 80048488 8FA90050 */ lw $t1, 0x50($sp) -/* 04908C 8004848C 8FA40038 */ lw $a0, 0x38($sp) -/* 049090 80048490 8FA5003C */ lw $a1, 0x3c($sp) -/* 049094 80048494 8FA60040 */ lw $a2, 0x40($sp) -/* 049098 80048498 8FA70044 */ lw $a3, 0x44($sp) -/* 04909C 8004849C AFB90010 */ sw $t9, 0x10($sp) -/* 0490A0 800484A0 AFA80014 */ sw $t0, 0x14($sp) -/* 0490A4 800484A4 0C011C1A */ jal func_80047068 -/* 0490A8 800484A8 AFA90018 */ sw $t1, 0x18($sp) -/* 0490AC 800484AC 8FBF0024 */ lw $ra, 0x24($sp) -/* 0490B0 800484B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0490B4 800484B4 03E00008 */ jr $ra -/* 0490B8 800484B8 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800484BC.s b/asm/non_matchings/code_800431B0/func_800484BC.s deleted file mode 100644 index 953a85798..000000000 --- a/asm/non_matchings/code_800431B0/func_800484BC.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_800484BC -/* 0490BC 800484BC 44866000 */ mtc1 $a2, $f12 -/* 0490C0 800484C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0490C4 800484C4 AFBF0024 */ sw $ra, 0x24($sp) -/* 0490C8 800484C8 44066000 */ mfc1 $a2, $f12 -/* 0490CC 800484CC 0C010B80 */ jal func_80042E00 -/* 0490D0 800484D0 AFA70034 */ sw $a3, 0x34($sp) -/* 0490D4 800484D4 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 0490D8 800484D8 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 0490DC 800484DC 8CA30000 */ lw $v1, ($a1) -/* 0490E0 800484E0 3C180D00 */ lui $t8, %hi(D_0D007E18) # $t8, 0xd00 -/* 0490E4 800484E4 27187E18 */ addiu $t8, %lo(D_0D007E18) # addiu $t8, $t8, 0x7e18 -/* 0490E8 800484E8 246E0008 */ addiu $t6, $v1, 8 -/* 0490EC 800484EC ACAE0000 */ sw $t6, ($a1) -/* 0490F0 800484F0 3C0F0600 */ lui $t7, 0x600 -/* 0490F4 800484F4 AC6F0000 */ sw $t7, ($v1) -/* 0490F8 800484F8 AC780004 */ sw $t8, 4($v1) -/* 0490FC 800484FC 0C012CAF */ jal func_8004B2BC -/* 049100 80048500 8FA40034 */ lw $a0, 0x34($sp) -/* 049104 80048504 8FB90048 */ lw $t9, 0x48($sp) -/* 049108 80048508 8FA8004C */ lw $t0, 0x4c($sp) -/* 04910C 8004850C 8FA90050 */ lw $t1, 0x50($sp) -/* 049110 80048510 8FA40038 */ lw $a0, 0x38($sp) -/* 049114 80048514 8FA5003C */ lw $a1, 0x3c($sp) -/* 049118 80048518 8FA60040 */ lw $a2, 0x40($sp) -/* 04911C 8004851C 8FA70044 */ lw $a3, 0x44($sp) -/* 049120 80048520 AFB90010 */ sw $t9, 0x10($sp) -/* 049124 80048524 AFA80014 */ sw $t0, 0x14($sp) -/* 049128 80048528 0C011C9C */ jal func_80047270 -/* 04912C 8004852C AFA90018 */ sw $t1, 0x18($sp) -/* 049130 80048530 8FBF0024 */ lw $ra, 0x24($sp) -/* 049134 80048534 27BD0028 */ addiu $sp, $sp, 0x28 -/* 049138 80048538 03E00008 */ jr $ra -/* 04913C 8004853C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80048540.s b/asm/non_matchings/code_800431B0/func_80048540.s deleted file mode 100644 index ead1cf832..000000000 --- a/asm/non_matchings/code_800431B0/func_80048540.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80048540 -/* 049140 80048540 44866000 */ mtc1 $a2, $f12 -/* 049144 80048544 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 049148 80048548 AFBF0024 */ sw $ra, 0x24($sp) -/* 04914C 8004854C 44066000 */ mfc1 $a2, $f12 -/* 049150 80048550 0C010B80 */ jal func_80042E00 -/* 049154 80048554 AFA70034 */ sw $a3, 0x34($sp) -/* 049158 80048558 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 04915C 8004855C 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 049160 80048560 8CA30000 */ lw $v1, ($a1) -/* 049164 80048564 3C180D00 */ lui $t8, %hi(D_0D007E98) # $t8, 0xd00 -/* 049168 80048568 27187E98 */ addiu $t8, %lo(D_0D007E98) # addiu $t8, $t8, 0x7e98 -/* 04916C 8004856C 246E0008 */ addiu $t6, $v1, 8 -/* 049170 80048570 ACAE0000 */ sw $t6, ($a1) -/* 049174 80048574 3C0F0600 */ lui $t7, 0x600 -/* 049178 80048578 AC6F0000 */ sw $t7, ($v1) -/* 04917C 8004857C AC780004 */ sw $t8, 4($v1) -/* 049180 80048580 0C012CAF */ jal func_8004B2BC -/* 049184 80048584 8FA40034 */ lw $a0, 0x34($sp) -/* 049188 80048588 8FB90048 */ lw $t9, 0x48($sp) -/* 04918C 8004858C 8FA8004C */ lw $t0, 0x4c($sp) -/* 049190 80048590 8FA90050 */ lw $t1, 0x50($sp) -/* 049194 80048594 8FA40038 */ lw $a0, 0x38($sp) -/* 049198 80048598 8FA5003C */ lw $a1, 0x3c($sp) -/* 04919C 8004859C 8FA60040 */ lw $a2, 0x40($sp) -/* 0491A0 800485A0 8FA70044 */ lw $a3, 0x44($sp) -/* 0491A4 800485A4 AFB90010 */ sw $t9, 0x10($sp) -/* 0491A8 800485A8 AFA80014 */ sw $t0, 0x14($sp) -/* 0491AC 800485AC 0C011C9C */ jal func_80047270 -/* 0491B0 800485B0 AFA90018 */ sw $t1, 0x18($sp) -/* 0491B4 800485B4 8FBF0024 */ lw $ra, 0x24($sp) -/* 0491B8 800485B8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0491BC 800485BC 03E00008 */ jr $ra -/* 0491C0 800485C0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800485C4.s b/asm/non_matchings/code_800431B0/func_800486B0.s similarity index 89% rename from asm/non_matchings/code_800431B0/func_800485C4.s rename to asm/non_matchings/code_800431B0/func_800486B0.s index 6746f8334..f3c2c5feb 100644 --- a/asm/non_matchings/code_800431B0/func_800485C4.s +++ b/asm/non_matchings/code_800431B0/func_800486B0.s @@ -1,64 +1,4 @@ -glabel func_800485C4 -/* 0491C4 800485C4 44866000 */ mtc1 $a2, $f12 -/* 0491C8 800485C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0491CC 800485CC AFBF0024 */ sw $ra, 0x24($sp) -/* 0491D0 800485D0 44066000 */ mfc1 $a2, $f12 -/* 0491D4 800485D4 0C010B80 */ jal func_80042E00 -/* 0491D8 800485D8 AFA70034 */ sw $a3, 0x34($sp) -/* 0491DC 800485DC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0491E0 800485E0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0491E4 800485E4 8C620000 */ lw $v0, ($v1) -/* 0491E8 800485E8 3C180D00 */ lui $t8, %hi(D_0D007E98) # $t8, 0xd00 -/* 0491EC 800485EC 27187E98 */ addiu $t8, %lo(D_0D007E98) # addiu $t8, $t8, 0x7e98 -/* 0491F0 800485F0 244E0008 */ addiu $t6, $v0, 8 -/* 0491F4 800485F4 AC6E0000 */ sw $t6, ($v1) -/* 0491F8 800485F8 3C0F0600 */ lui $t7, 0x600 -/* 0491FC 800485FC AC4F0000 */ sw $t7, ($v0) -/* 049200 80048600 AC580004 */ sw $t8, 4($v0) -/* 049204 80048604 8C620000 */ lw $v0, ($v1) -/* 049208 80048608 3C08B900 */ lui $t0, (0xB9000002 >> 16) # lui $t0, 0xb900 -/* 04920C 8004860C 35080002 */ ori $t0, (0xB9000002 & 0xFFFF) # ori $t0, $t0, 2 -/* 049210 80048610 24590008 */ addiu $t9, $v0, 8 -/* 049214 80048614 AC790000 */ sw $t9, ($v1) -/* 049218 80048618 24090003 */ li $t1, 3 -/* 04921C 8004861C AC490004 */ sw $t1, 4($v0) -/* 049220 80048620 AC480000 */ sw $t0, ($v0) -/* 049224 80048624 8C620000 */ lw $v0, ($v1) -/* 049228 80048628 3C0BB900 */ lui $t3, (0xB900031D >> 16) # lui $t3, 0xb900 -/* 04922C 8004862C 3C0C0050 */ lui $t4, (0x005049D8 >> 16) # lui $t4, 0x50 -/* 049230 80048630 244A0008 */ addiu $t2, $v0, 8 -/* 049234 80048634 AC6A0000 */ sw $t2, ($v1) -/* 049238 80048638 358C49D8 */ ori $t4, (0x005049D8 & 0xFFFF) # ori $t4, $t4, 0x49d8 -/* 04923C 8004863C 356B031D */ ori $t3, (0xB900031D & 0xFFFF) # ori $t3, $t3, 0x31d -/* 049240 80048640 AC4B0000 */ sw $t3, ($v0) -/* 049244 80048644 AC4C0004 */ sw $t4, 4($v0) -/* 049248 80048648 0C012CAF */ jal func_8004B2BC -/* 04924C 8004864C 8FA40034 */ lw $a0, 0x34($sp) -/* 049250 80048650 8FAD0048 */ lw $t5, 0x48($sp) -/* 049254 80048654 8FAE004C */ lw $t6, 0x4c($sp) -/* 049258 80048658 8FAF0050 */ lw $t7, 0x50($sp) -/* 04925C 8004865C 8FA40038 */ lw $a0, 0x38($sp) -/* 049260 80048660 8FA5003C */ lw $a1, 0x3c($sp) -/* 049264 80048664 8FA60040 */ lw $a2, 0x40($sp) -/* 049268 80048668 8FA70044 */ lw $a3, 0x44($sp) -/* 04926C 8004866C AFAD0010 */ sw $t5, 0x10($sp) -/* 049270 80048670 AFAE0014 */ sw $t6, 0x14($sp) -/* 049274 80048674 0C011C9C */ jal func_80047270 -/* 049278 80048678 AFAF0018 */ sw $t7, 0x18($sp) -/* 04927C 8004867C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 049280 80048680 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 049284 80048684 8C620000 */ lw $v0, ($v1) -/* 049288 80048688 3C19B900 */ lui $t9, (0xB9000002 >> 16) # lui $t9, 0xb900 -/* 04928C 8004868C 37390002 */ ori $t9, (0xB9000002 & 0xFFFF) # ori $t9, $t9, 2 -/* 049290 80048690 24580008 */ addiu $t8, $v0, 8 -/* 049294 80048694 AC780000 */ sw $t8, ($v1) -/* 049298 80048698 AC400004 */ sw $zero, 4($v0) -/* 04929C 8004869C AC590000 */ sw $t9, ($v0) -/* 0492A0 800486A0 8FBF0024 */ lw $ra, 0x24($sp) -/* 0492A4 800486A4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0492A8 800486A8 03E00008 */ jr $ra -/* 0492AC 800486AC 00000000 */ nop - +glabel func_800486B0 /* 0492B0 800486B0 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 0492B4 800486B4 44876000 */ mtc1 $a3, $f12 /* 0492B8 800486B8 8FAF0048 */ lw $t7, 0x48($sp) diff --git a/src/code_800431B0.c b/src/code_800431B0.c index e18dc10d5..72d3abe65 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -4,25 +4,27 @@ #include #include +void func_80042330(s32 arg0, s32 arg1, u16 arg2, f32 arg3); // math_util extern + //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void func_80042E00(s32, s32, f32); // extern +void func_80042E00(Vec3f, Vec3s, f32); // extern extern Gfx D_0D006940[]; extern Gfx *gDisplayListHead; -void func_800431B0(s32 arg0, Vtx *arg1, f32 arg2, s32 arg3) { +void func_800431B0(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { func_80042E00(arg0, arg1, arg2); gSPVertex(gDisplayListHead++, arg3, 4, 0); gSPDisplayList(gDisplayListHead++, D_0D006940); } extern Gfx D_0D0077A0[]; -void func_80043220(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { +void func_80043220(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, &D_0D0077A0); gSPDisplayList(gDisplayListHead++, arg3); } -UNUSED void func_800433288(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { +UNUSED void func_800433288(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D0077A0); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); @@ -32,7 +34,7 @@ UNUSED void func_800433288(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { extern Gfx D_0D0077D0[]; -void func_80043328(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { +void func_80043328(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D0077D0); gSPDisplayList(gDisplayListHead++, arg3); @@ -41,19 +43,19 @@ void func_80043328(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { extern Gfx D_0D0077F8[]; extern Gfx D_0D007828[]; -UNUSED void *func_80043390(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { +UNUSED void *func_80043390(Vec3f arg0, Vec3s 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) { +UNUSED void func_800433F8(Vec3f arg0, Vec3s 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) { +UNUSED void func_80043460(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007828); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); @@ -63,7 +65,7 @@ UNUSED void func_80043460(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { extern Gfx D_0D007850[]; -void func_80043500(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { +void func_80043500(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007850); @@ -72,196 +74,84 @@ void func_80043500(s32 arg0, s32 arg1, f32 arg2, s32 arg3) { gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80042F70(?, ?); // extern extern s8 D_0D007878[]; -//extern void *gDisplayListHead; void func_80042F70(s32 arg0, Vec3su arg1, f32 arg2); -void func_800435A0(s32 arg0, Vec3su arg1, f32 arg2, s32 arg3, s32 arg4) { - - arg4 &= 0xFF; +void func_800435A0(s32 arg0, Vec3su arg1, f32 arg2, Gfx *arg3, s32 arg4) { func_80042F70(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D007878); - gDPSetPrimColor(gDisplayListHead++, 0, 0, arg4, 0xFF, 0xFF, 0xFF); + gDPSetPrimColor(gDisplayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, arg4); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); gSPDisplayList(gDisplayListHead++, arg3); - gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING); -/* - - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFA000000; - temp_v0_2->unk4 = (arg4 & 0xFF) | ~0xFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0x3000; - temp_v0_3->unk0 = 0xB6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x6000000; - temp_v0_4->unk4 = arg3; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = 0x2000; - temp_v0_5->unk0 = 0xB7000000; -*/ + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800435A0.s") -#endif extern Gfx D_0D0078A0[]; -UNUSED void func_80043668(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) { +UNUSED void func_80043668(Vec3f arg0, Vec3s arg1, f32 arg2, Vtx *arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D0078A0); gSPDisplayList(gDisplayListHead++, arg3); } -#ifdef MIPS_TO_C -UNUSED void func_800436D0(s32 arg2, ? arg3, s32 arg4) { - void* temp_v0; - void* temp_v0_2; - void* temp_v0_3; +extern Gfx D_0D006930[]; +UNUSED void func_800436D0(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D0078A0); + gSPVertex(gDisplayListHead++, arg4, 3, 0); + gSPDisplayList(gDisplayListHead++, D_0D006930); - 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; +UNUSED void func_80043764(s32 arg0, s32 arg1, u16 arg2, f32 arg3, Vtx *arg4) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D0078A0); + gSPVertex(gDisplayListHead++, arg4, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); } -#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; +struct Vtx4_800431B0 { + Vtx vtx[4]; +}; + +UNUSED void func_800437F8(s32 arg0, s32 arg1, u16 arg2, f32 arg3, struct Vtx4_800431B0 *arg4, s32 arg5) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D0078A0); + + gDPSetRenderMode(gDisplayListHead++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + arg4->vtx[0].v.cn[3] = arg5; + arg4->vtx[1].v.cn[3] = arg5; + arg4->vtx[2].v.cn[3] = arg5; + arg4->vtx[3].v.cn[3] = arg5; + gSPVertex(gDisplayListHead++, arg4, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); } -#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; +struct unused800438C4 { + s16 vtx[24]; +}; + +UNUSED void func_800438C4(s32 arg0, s32 arg1, u16 arg2, f32 arg3, struct Vtx4_800431B0 *arg4, s32 arg5) { + arg4->vtx[1].v.ob[0] = arg5; + arg4->vtx[2].v.ob[0] = arg5; + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D0078A0); + gDPSetRenderMode(gDisplayListHead++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gSPVertex(gDisplayListHead++, arg4, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); - 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; +UNUSED void func_8004398C(s32 arg0, s32 arg1, u16 arg2, f32 arg3, struct Vtx4_800431B0 *arg4, s32 arg5) { + arg4->vtx[0].v.ob[0] = arg5; + arg4->vtx[3].v.ob[0] = arg5; + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D0078A0); + gDPSetRenderMode(gDisplayListHead++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gSPVertex(gDisplayListHead++, arg4, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004398C.s") -#endif s32 func_80043A54(s32 arg0) { s32 temp_a1; @@ -279,7 +169,7 @@ s32 func_80043A54(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_80043A84(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t4; @@ -345,71 +235,20 @@ void func_80043A84(s32 arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043A84.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; - -void func_80043C28(s32 arg0, s32 arg1, s32 arg2) { - void *sp14; - void *sp10; - void *spC; - s32 sp0; - s32 temp_t0; - s32 temp_t2; - s32 temp_t5; - s32 temp_t7; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - - temp_v0 = gDisplayListHead; - temp_t0 = arg1 - 1; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = (temp_t0 & 0xFFF) | 0xFD180000; - temp_v0->unk4 = arg0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_t2 = (((((arg1 * 2) + 7) >> 3) & 0x1FF) << 9) | 0xF5180000; - temp_v0_2->unk4 = 0x7080200; - temp_v0_2->unk0 = temp_t2; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xF4000000; - temp_t5 = ((temp_t0 * 4) & 0xFFF) << 0xC; - temp_t7 = ((arg2 - 1) * 4) & 0xFFF; - sp0 = temp_t7; - temp_v0_4->unk4 = temp_t5 | 0x7000000 | temp_t7; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - sp14 = temp_v0_5; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - sp10 = temp_v0_6; - temp_v0_6->unk4 = 0x80200; - temp_v0_6->unk0 = temp_t2; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - spC = temp_v0_7; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk4 = temp_t5 | sp0; +void func_80043C28(s8 *image, s32 width, s32 arg2) { + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_32b, (((width * 2) + 7) >> 3), 0, 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++); + + gDPLoadTile(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (width - 1) << 0x2, (arg2 - 1) << 0x2); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_32b, (((width * 2) + 7) >> 3), 0, 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); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043C28.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_80043D50(s32 arg0, s32 arg1, s32 arg2) { void *sp4; @@ -480,7 +319,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043D50.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_80043EF8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void *sp18; @@ -555,71 +394,20 @@ void func_80043EF8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043EF8.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; - -void func_800440B8(s32 arg0, s32 arg1, s32 arg2) { - void *sp14; - void *sp10; - void *spC; - s32 sp0; - s32 temp_t0; - s32 temp_t2; - s32 temp_t5; - s32 temp_t7; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - - temp_v0 = gDisplayListHead; - temp_t0 = arg1 - 1; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = (temp_t0 & 0xFFF) | 0xFD100000; - temp_v0->unk4 = arg0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_t2 = (((((arg1 * 2) + 7) >> 3) & 0x1FF) << 9) | 0xF5100000; - temp_v0_2->unk4 = 0x7080200; - temp_v0_2->unk0 = temp_t2; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xF4000000; - temp_t5 = ((temp_t0 * 4) & 0xFFF) << 0xC; - temp_t7 = ((arg2 - 1) * 4) & 0xFFF; - sp0 = temp_t7; - temp_v0_4->unk4 = temp_t5 | 0x7000000 | temp_t7; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - sp14 = temp_v0_5; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - sp10 = temp_v0_6; - temp_v0_6->unk4 = 0x80200; - temp_v0_6->unk0 = temp_t2; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - spC = temp_v0_7; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk4 = temp_t5 | sp0; +void func_800440B8(s8 *image, s32 width, s32 arg2) { + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, (((width * 2) + 7) >> 3), 0, 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++); + + gDPLoadTile(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (width - 1) << 0x2, (arg2 - 1) << 0x2); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, (((width * 2) + 7) >> 3), 0, 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); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800440B8.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_800441E0(s32 arg0, s32 arg1, s32 arg2) { void *sp4; @@ -688,71 +476,20 @@ void func_800441E0(s32 arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800441E0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; +void func_80044388(s8 *image, s32 width, s32 arg2) { -void func_80044388(s32 arg0, s32 arg1, s32 arg2) { - void *sp14; - void *sp10; - void *spC; - s32 sp0; - s32 temp_t0; - s32 temp_t2; - s32 temp_t5; - s32 temp_t7; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - - temp_v0 = gDisplayListHead; - temp_t0 = arg1 - 1; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = (temp_t0 & 0xFFF) | 0xFD700000; - temp_v0->unk4 = arg0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_t2 = (((((arg1 * 2) + 7) >> 3) & 0x1FF) << 9) | 0xF5700000; - temp_v0_2->unk4 = 0x7080200; - temp_v0_2->unk0 = temp_t2; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xF4000000; - temp_t5 = ((temp_t0 * 4) & 0xFFF) << 0xC; - temp_t7 = ((arg2 - 1) * 4) & 0xFFF; - sp0 = temp_t7; - temp_v0_4->unk4 = temp_t5 | 0x7000000 | temp_t7; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - sp14 = temp_v0_5; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - sp10 = temp_v0_6; - temp_v0_6->unk4 = 0x80200; - temp_v0_6->unk0 = temp_t2; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - spC = temp_v0_7; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk4 = temp_t5 | sp0; + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, width, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, (((width * 2) + 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); + gDPLoadSync(gDisplayListHead++); + gDPLoadTile(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (width - 1) << 0x2, (arg2 - 1) << 0x2); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, (((width * 2) + 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) << 0x2, (arg2 - 1) << 0x2); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044388.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_800444B0(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t3; @@ -817,71 +554,19 @@ void func_800444B0(s32 arg0, s32 arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800444B0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; - -void func_80044658(s32 arg0, s32 arg1, s32 arg2) { - void *sp14; - void *sp10; - void *spC; - s32 sp0; - s32 temp_t0; - s32 temp_t2; - s32 temp_t5; - s32 temp_t7; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - - temp_v0 = gDisplayListHead; - temp_t0 = arg1 - 1; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = (temp_t0 & 0xFFF) | 0xFD680000; - temp_v0->unk4 = arg0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_t2 = ((((arg1 + 7) >> 3) & 0x1FF) << 9) | 0xF5680000; - temp_v0_2->unk4 = 0x7080200; - temp_v0_2->unk0 = temp_t2; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xF4000000; - temp_t5 = ((temp_t0 * 4) & 0xFFF) << 0xC; - temp_t7 = ((arg2 - 1) * 4) & 0xFFF; - sp0 = temp_t7; - temp_v0_4->unk4 = temp_t5 | 0x7000000 | temp_t7; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - sp14 = temp_v0_5; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - sp10 = temp_v0_6; - temp_v0_6->unk4 = 0x80200; - temp_v0_6->unk0 = temp_t2; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - spC = temp_v0_7; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk4 = temp_t5 | sp0; +void func_80044658(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) + 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); + gDPLoadSync(gDisplayListHead++); + gDPLoadTile(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (width - 1) << 0x2, (arg2 - 1) << 0x2); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, (((width) + 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) << 0x2, (arg2 - 1) << 0x2); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044658.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004477C(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t3; @@ -948,63 +633,53 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004477C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; +// -void func_80044924(s32 arg0, s32 arg1, s32 arg2) { - s32 temp_t0; +void func_80044924(s8 *image, s32 width, s32 arg2) { + s32 a; s32 temp_t3; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - s32 phi_a0; + + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, width, 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_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xFD700000; - temp_v0->unk4 = arg0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xF5700000; - temp_v0_2->unk4 = 0x7080200; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_3->unk4 = 0; - temp_v0_4 = gDisplayListHead; - temp_t3 = (((arg1 * arg2) + 3) >> 2) - 1; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xF3000000; if (temp_t3 < 0x7FF) { - phi_a0 = temp_t3; + a = temp_t3; } else { - phi_a0 = 0x7FF; + a = 0x7FF; } - temp_t0 = arg1 / 0x10; - temp_v0_4->unk4 = ((phi_a0 & 0xFFF) << 0xC) | 0x7000000 | (((temp_t0 + 0x7FF) / temp_t0) & 0xFFF); - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_5->unk4 = 0; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0x80200; - temp_v0_6->unk0 = (((((arg1 >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5600000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk4 = ((((arg1 - 1) * 4) & 0xFFF) << 0xC) | (((arg2 - 1) * 4) & 0xFFF); + + gDPLoadBlock(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, a, ((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); } #else GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044924.s") #endif +//gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, 0x00000000); +//gDPLoadTile(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, 0, 0); + +/* +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); + gDPLoadSync(gDisplayListHead++); + gDPLoadTile(gDisplayListHead++, G_TX_LOADTILE, 0, 0, ((width - 1) * 2) << 0x2, (arg2 - 1) << 0x2); + gDPPipeSync(gDisplayListHead++); + 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); +} +*/ +//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") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_80044BF8(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t3; @@ -1071,7 +746,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044BF8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_80044DA0(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t0; @@ -1127,7 +802,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044DA0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_80044F34(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t0; @@ -1184,7 +859,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044F34.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80043A54(s32); // extern -extern void *gDisplayListHead; + void func_800450C8(s32 arg0, s32 arg1, s32 arg2) { s32 temp_a1; @@ -1244,7 +919,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800450C8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_800452A4(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t3; @@ -1311,7 +986,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800452A4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004544C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void *sp4; @@ -1551,7 +1226,7 @@ void func_80045B74(Vtx *arg0) { gSPDisplayList(gDisplayListHead++, D_0D006930); } -UNUSED void func_80045BBC(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) { +UNUSED void func_80045BBC(Vec3f arg0, Vec3s arg1, f32 arg2, Vtx *arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D0078A0); gSPVertex(gDisplayListHead++, arg3, 4, 0); @@ -1559,7 +1234,7 @@ UNUSED void func_80045BBC(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) { } extern Gfx D_0D0078D0[]; -UNUSED void func_80045C48(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) { +UNUSED void func_80045C48(Vec3f arg0, Vec3s arg1, f32 arg2, Vtx *arg3) { func_80042E00(arg0, arg1, arg2); gSPDisplayList(gDisplayListHead++, D_0D0078D0); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); @@ -1572,7 +1247,7 @@ UNUSED void func_80045C48(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) { //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80043D50(s32, s32, s32); // extern ? func_80045B2C(s32); // extern -extern void *gDisplayListHead; + void func_80045D0C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 temp_lo; @@ -1604,12 +1279,12 @@ void func_80045D0C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { #else GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045D0C.s") #endif - +void func_80045E10(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80043D50(s32, s32, s32); // extern ? func_80045B2C(s32); // extern -extern void *gDisplayListHead; + void func_80045E10(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 temp_lo; @@ -1646,7 +1321,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045E10.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80043EF8(s32, s32, s32, s32); // extern ? func_80045B2C(s32); // extern -extern void *gDisplayListHead; + void func_80045F18(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 temp_lo; @@ -1685,7 +1360,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045F18.s") ? func_80045B2C(s32); // extern extern ? D_0D008120; extern ? D_0D008138; -extern void *gDisplayListHead; + void func_80046030(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 temp_lo; @@ -1737,7 +1412,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046030.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80043A84(s32, s32, s32); // extern ? func_80045B2C(s32); // extern -extern void *gDisplayListHead; + void func_800461A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 temp_lo; @@ -1774,7 +1449,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800461A4.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80043A84(s32, s32, s32); // extern ? func_80045B2C(s32); // extern -extern void *gDisplayListHead; + void func_800462A8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 temp_lo; @@ -1806,289 +1481,188 @@ void func_800462A8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { #else GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800462A8.s") #endif +extern Gfx D_0D007928[]; -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80045D0C(s32, s32, s32, s32, s32); // extern -extern ? D_0D007928; -extern void *gDisplayListHead; - -void func_800463B0(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, 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_0D007928; +void func_800463B0(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_0D007928); func_80045D0C(arg4, arg5, arg6, arg7, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800463B0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80045D0C(s32, s32, s32, s32, s32); // extern -? func_8004B614(u16, u16, u16, ?, s32, s32, s32); // extern -extern ? D_0D007968; extern u16 D_801656C0; extern u16 D_801656D0; extern u16 D_801656E0; -extern void *gDisplayListHead; +extern Gfx D_0D007968[]; -void func_80046424(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, 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_0D007968; - func_8004B614(D_801656C0, D_801656D0, D_801656E0, 0x80, 0x80, 0x80, 0xFF); +void func_80046424(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_0D007968); + func_8004B614(D_801656C0, D_801656D0, D_801656E0, 128, 128, 128, 255); func_80045D0C(arg4, arg5, arg6, arg7, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046424.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80045E10(s32, s32, s32, s32, s32); // extern -extern ? D_0D007948; -extern void *gDisplayListHead; +extern Gfx D_0D007948[]; -void func_800464D0(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg9) { - void *temp_v1; +void func_800464D0(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007948; + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007948); + func_80045E10(arg4, arg5, arg6, arg7, arg9); +} +extern Gfx D_0D0079A8[]; +UNUSED void func_80046544(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_0D0079A8); func_80045E10(arg4, arg5, arg6, arg7, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800464D0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80045E10(s32, s32, s32, s32, s32); // extern -? func_8004B2BC(s32, void **); // extern -extern ? D_0D0079E8; -extern void *gDisplayListHead; +extern Gfx D_0D0079E8[]; -void func_800465B8(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 argA) { - void *temp_v1; +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_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D0079E8; func_8004B2BC(arg4, &gDisplayListHead); func_80045E10(arg5, arg6, arg7, arg8, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800465B8.s") -#endif +extern Gfx D_0D007948[]; +UNUSED func_80046634(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_0D007948); + func_80046030(arg4, arg5, arg6, arg7, arg8, argA); +} -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80043D50(s32, s32, s32, void **); // extern -? func_80045B74(s32); // extern -extern ? D_0D007948; -extern void *gDisplayListHead; - -void func_800466B0(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007948; +void func_800466B0(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { + func_80042330(arg0, arg1, arg2, arg3); + gSPDisplayList(gDisplayListHead++, D_0D007948); func_80043D50(arg4, arg6, arg7, &gDisplayListHead); func_80045B74(arg5); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800466B0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -? func_80045E10(s32, s32, s32, s32, s32); // extern -extern ? D_0D007948; -extern void *gDisplayListHead; +UNUSED void func_80046720(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_0D007928); + func_800461A4(arg4, arg5, arg6, arg7, arg9); +} -void func_80046808(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg8) { - void *temp_v1; +UNUSED void func_80046794(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_0D007948); + func_800462A8(arg4, arg5, arg6, arg7, arg9); +} - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007948; +extern Gfx D_0D007948[]; + +void func_80046808(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007948); + func_80045E10(arg3, arg4, arg5, arg6, arg8); +} +extern Gfx D_0D0079C8[]; +UNUSED func_80046874(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D0079C8); func_80045E10(arg3, arg4, arg5, arg6, arg8); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046808.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -? func_80045F18(s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D0079C8; -extern void *gDisplayListHead; - -void func_800468E0(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D0079C8; +void func_800468E0(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D0079C8); func_80045F18(arg3, arg4, arg5, arg6, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800468E0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(?, ?); // extern -? func_80043D50(s32, s32, s32, void **); // extern -? func_80045B74(s32); // extern -extern ? D_0D007948; -extern void *gDisplayListHead; +UNUSED void func_80046954(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { -void func_80046A00(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { - void *temp_v1; + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D0079C8); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); + func_80045E10(arg3, arg4, arg5, arg6, arg8); + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); +} - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007948; +extern Gfx D_0D007948[]; + +void func_80046A00(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3, Vtx *arg4, s32 arg5, s32 arg6) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007948); func_80043D50(arg3, arg5, arg6, &gDisplayListHead); func_80045B74(arg4); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046A00.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, s32, ?); // extern -extern ? D_0D007D78; -extern void *gDisplayListHead; +extern Gfx D_0D0079C8[]; +UNUSED void func_80046A68(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D0079C8); + func_800462A8(arg3, arg4, arg5, arg6, arg8); +} -void func_80046E60(s32 arg0, s32 arg1, s32 arg2, ? arg3) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; +extern Gfx D_0D005470[]; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0x6000000; - temp_v0->unk4 = &D_0D007D78; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk4 = arg0; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0; - temp_v0_7->unk0 = 0xE7000000; +UNUSED void func_80046AD4(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4) { + func_800464D0(arg0, arg1, arg2, arg3, arg4, D_0D005470, 8, 8, 8, 8); +} + +extern Gfx D_0D005770[]; +UNUSED void func_80046B38(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4) { + func_800464D0(arg0, arg1, arg2, arg3, arg4, D_0D005770, 16, 16, 16, 16); +} + +UNUSED func_80046B9C(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { + func_80046808(arg0, arg1, arg2, arg3, D_0D005770, 16, 16, 16, 16); +} + +UNUSED func_80046BEC(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5) { + func_800466B0(arg0, arg1, arg2, arg3, arg4, arg5, 16, 16); +} + +UNUSED func_80046C3C(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4) { + func_80046A00(arg0, arg1, arg2, arg3, arg4, 16, 16); +} +extern Gfx D_0D005AE0[]; + +UNUSED func_80046C78(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4) { + func_800464D0(arg0, arg1, arg2, arg3, arg4, D_0D005AE0, 32, 32, 32, 32); +} + +extern Gfx D_0D005FB0[]; +UNUSED func_80046CDC(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4) { + func_800464D0(arg0, arg1, arg2, arg3, arg4, D_0D005FB0, 64, 32, 64, 32); +} + +UNUSED func_80046D40(Vec3f arg0, Vec3s arg1, f32 arg2, s32 arg3) { + func_80046808(arg0, arg1, arg2, arg3, D_0D005FB0, 64, 32, 64, 32); +} +extern Gfx D_0D0060B0[]; +UNUSED func_80046D90(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4) { + func_800464D0(arg0, arg1, arg2, arg3, arg4, D_0D0060B0, 64, 64, 64, 32); +} + +UNUSED func_80046DF4(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, s32 arg5) { + func_800465B8(arg0, arg1, arg2, arg3, arg4, arg5, D_0D0060B0, 64, 64, 64, 32); +} + +extern Gfx D_0D007D78[]; + +void func_80046E60(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { + + gSPDisplayList(gDisplayListHead++, D_0D007D78); + gDPLoadTLUT_pal256(gDisplayListHead++, arg0); func_800452A4(arg1, arg2, arg3); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046E60.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004544C(s32, s32, s32, s32); // extern -extern ? D_0D007D78; -extern void *gDisplayListHead; +extern Gfx D_0D007D78[]; void func_80046F60(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0x6000000; - temp_v0->unk4 = &D_0D007D78; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk4 = arg0; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0; - temp_v0_7->unk0 = 0xE7000000; + gSPDisplayList(gDisplayListHead++, D_0D007D78); + gDPLoadTLUT_pal256(gDisplayListHead++, arg0); func_8004544C(arg1, arg2, arg3, arg4); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046F60.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800452A4(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_80047068(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6) { s32 temp_lo; @@ -2105,6 +1679,7 @@ void func_80047068(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 s32 phi_s2; s32 phi_s1; s32 phi_s3; +gDPLoadTLUT_pal256(gDisplayListHead++, arg0); temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; @@ -2164,7 +1739,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047068.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800452A4(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_80047270(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6) { s32 temp_lo; @@ -2240,7 +1815,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047270.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_8004544C(s32, s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_8004747C(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { s32 temp_lo; @@ -2316,7 +1891,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004747C.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800452A4(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_8004768C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 temp_lo; @@ -2388,376 +1963,242 @@ void func_8004768C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004768C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047068(s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007CB8; -extern void *gDisplayListHead; +extern Gfx D_0D007CB8[]; -void func_8004788C(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007CB8; +void func_80047068(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); +void func_8004788C(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_0D007CB8); func_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004788C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047270(s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007CD8; -extern void *gDisplayListHead; +extern Gfx D_0D007CD8[]; -void func_80047910(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007CD8; +void func_80047910(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_0D007CD8); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047910.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047270(s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007CF8; -extern void *gDisplayListHead; +extern Gfx D_0D007CF8[]; -void func_80047994(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007CF8; +void func_80047994(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_0D007CF8); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047994.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047068(s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007D18; -extern void *gDisplayListHead; +extern Gfx D_0D007D18[]; -void func_80047A18(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007D18; +void func_80047A18(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_0D007D18); func_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047A18.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047270(s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_0D007D38; -extern void *gDisplayListHead; +extern Gfx D_0D007D38[]; -void func_80047A9C(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007D38; +void func_80047A9C(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_0D007D38); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047A9C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047068(s32, s32, s32, s32, s32, s32, s32); // extern -? func_8004B2BC(s32, void **); // extern -extern ? D_0D007DB8; -extern void *gDisplayListHead; +UNUSED void func_80047B20(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_0D007D38); + func_8004768C(arg4, arg5, arg6, arg7, arg8, arg9); +} -void func_80047B9C(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB) { - void *temp_v1; +extern Gfx D_0D007DB8[]; - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &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_80047068(arg5, arg6, arg7, arg8, arg9, argA, argB); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047B9C.s") -#endif +extern Gfx D_0D007DD8[]; -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(?, s32, ?); // extern -? func_80047068(s32, s32, s32, s32, s32, s32, s32); // extern -? func_8004B2BC(s32, void **); // extern -extern ? D_0D007E38; -extern void *gDisplayListHead; +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_80047270(arg5, arg6, arg7, arg8, arg9, argA, argB); +} -void func_80047CB4(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB) { - void *temp_v1; +extern Gfx D_0D007E38[]; - func_80042330(arg3, arg2 & 0xFFFF, arg3); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &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_80047068(arg5, arg6, arg7, arg8, arg9, argA, argB); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047CB4.s") -#endif -#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 ? D_0D007CD8; -extern void *gDisplayListHead; +extern Gfx D_0D007E58[]; -void func_80047E48(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; +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_80047270(arg5, arg6, arg7, arg8, arg9, argA, argB); +} - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007CD8; +UNUSED void func_80047DCC(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007CB8); + func_80047068(arg3, arg4, arg5, arg6, arg7, arg8, arg9); +} + +extern Gfx D_0D007CD8[]; + +void func_80047E48(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007CD8); func_80047270(arg3, arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047E48.s") -#endif -#ifdef MIPS_TO_C +UNUSED void func_80047EC4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007D18); + 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 ? D_0D007D38; -extern void *gDisplayListHead; +//? func_80042E00(?, ?); // extern +//? func_80047270(s32, s32, s32, s32, s32, s32, s32); // extern +extern Gfx D_0D007D38[]; -void func_80047F40(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007D38; +void func_80047F40(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007D38); func_80047270(arg3, arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047F40.s") -#endif -#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 ? D_0D007D78; -extern void *gDisplayListHead; - -void func_800480B4(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - void *temp_v1; - - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007D78; +extern Gfx D_0D007D58[]; +UNUSED void func_80047FBC(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007D58); func_80047270(arg3, arg4, arg5, arg6, arg7, arg8, arg9); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800480B4.s") -#endif +extern Gfx D_0D007D98[]; +UNUSED void func_80048038(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007D98); + func_80047068(arg3, arg4, arg5, arg6, arg7, arg8, arg9); +} -#ifdef MIPS_TO_C +extern Gfx D_0D007D78[]; + +void func_800480B4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007D78); + 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 -extern ? D_0D007D78; -extern void *gDisplayListHead; +//? func_80042E00(?, ?); // extern +//? func_8004747C(s32, s32, s32, s32, s32, s32, s32, s32); // extern -void func_80048130(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007D78; +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); func_8004747C(arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80048130.s") -#endif -#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 ? D_0D007DD8; -extern void *gDisplayListHead; +UNUSED void func_800481B4(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_0D007D78); + func_8004768C(arg3, arg4, arg5, arg6, arg7, arg8); +} -void func_800482AC(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; +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_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); +} - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D007DD8; +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_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800482AC.s") -#endif -#ifdef MIPS_TO_C +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_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 ? D_0D007E58; -extern void *gDisplayListHead; +//? 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(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &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_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800483B4.s") -#endif -#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 ? D_0D007E18; -extern void *gDisplayListHead; +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_80047068(arg4, arg5, arg6, arg7, arg8, arg9, argA); +} -void func_800484BC(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; +extern Gfx D_0D007E18[]; - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &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_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800484BC.s") -#endif -#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 ? D_0D007E98; -extern void *gDisplayListHead; +extern Gfx D_0D007E98[]; -void func_80048540(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v1; - func_80042E00(arg2, arg2); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &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_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80048540.s") -#endif -#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); // extern -extern ? D_0D007E98; -extern void *gDisplayListHead; +void func_800485C4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { -void func_800485C4(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; + func_80042E00(arg0, arg1, arg2); + gSPDisplayList(gDisplayListHead++, D_0D007E98); + gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER); + gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); - func_80042E00(arg2, arg2); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0x6000000; - temp_v0->unk4 = &D_0D007E98; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 3; - temp_v0_2->unk0 = 0xB9000002; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xB900031D; - temp_v0_3->unk4 = 0x5049D8; func_8004B2BC(arg3); func_80047270(arg4, arg5, arg6, arg7, arg8, arg9, argA); - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0; - temp_v0_4->unk0 = 0xB9000002; + + gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800485C4.s") -#endif +GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800486B0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800441E0(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_80048F8C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -2831,7 +2272,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80048F8C.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80044388(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_80049130(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -2905,7 +2346,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049130.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800444B0(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_800492D4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -2979,7 +2420,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800492D4.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80044658(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_80049478(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -3053,7 +2494,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049478.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80044924(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_8004961C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -3127,7 +2568,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004961C.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80044BF8(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_800497CC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -3201,7 +2642,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800497CC.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_80044DA0(s32, s32, s32); // extern extern ? D_0D006940; -extern void *gDisplayListHead; + void func_80049970(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp5C; @@ -3276,7 +2717,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049970.s") ? func_80042330(?, s32, ?); // extern ? func_80048F8C(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A40; -extern void *gDisplayListHead; + void func_80049B20(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v1; @@ -3297,7 +2738,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049B20.s") ? func_80042330(?, s32, ?); // extern ? func_800492D4(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A40; -extern void *gDisplayListHead; + void func_80049C18(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v1; @@ -3318,7 +2759,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049C18.s") ? func_80042330(?, s32, ?); // extern ? func_800492D4(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A60; -extern void *gDisplayListHead; + void func_80049C94(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v1; @@ -3339,7 +2780,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049C94.s") ? func_80042330(?, s32, ?); // extern ? func_800492D4(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A80; -extern void *gDisplayListHead; + void func_80049D10(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v1; @@ -3360,7 +2801,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049D10.s") ? func_80042330(?, s32, ?); // extern ? func_800492D4(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007AA0; -extern void *gDisplayListHead; + void func_80049D8C(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v1; @@ -3381,7 +2822,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049D8C.s") ? func_80042330(?, s32, ?); // extern ? func_8004961C(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A40; -extern void *gDisplayListHead; + void func_8004A0B0(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v1; @@ -3402,7 +2843,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A0B0.s") ? func_80042330(?, s32, ?); // extern ? func_80049970(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A60; -extern void *gDisplayListHead; + void func_8004A258(s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { void *temp_v0; @@ -3429,7 +2870,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A258.s") ? func_80049970(s32, s32, s32, s32, s32, s32); // extern ? func_8004B414(s32, s32, s32, s32); // extern extern ? D_0D007A40; -extern void *gDisplayListHead; + 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; @@ -3452,7 +2893,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A2F4.s") ? func_80049970(s32, s32, s32, s32, s32, s32); // extern ? func_8004B414(s32, s32, s32, s32); // extern extern ? D_0D007A60; -extern void *gDisplayListHead; + 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; @@ -3474,7 +2915,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A384.s") ? func_80042E00(?, ?); // extern ? func_800492D4(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007A40; -extern void *gDisplayListHead; + void func_8004A414(? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) { void *temp_v1; @@ -3498,7 +2939,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A414.s") //extern ? D_0D007B98; //extern f64 D_800EE030; //extern ? D_80183E50; -//extern void *gDisplayListHead; +// extern s8 D_0D007B98[]; extern f64 D_800EE030; extern Vec3f D_80183E50; @@ -3544,7 +2985,7 @@ extern ? D_0D007B20; extern f64 D_800EE038; extern ? D_80165C18; extern ? D_80183E50; -extern void *gDisplayListHead; + void func_8004A6EC(s32 arg0, s32 arg1) { void *temp_v0; @@ -3575,7 +3016,7 @@ extern f64 D_800EE040; extern ? D_80165C18; extern ? D_80183E50; extern ? D_80183E98; -extern void *gDisplayListHead; + void func_8004A7AC(s32 arg0, s32 arg1) { void *temp_v0; @@ -3610,7 +3051,7 @@ extern f64 D_800EE048; extern ? D_80165C18; extern ? D_80183E50; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_8004A870(s32 arg0, f32 arg1) { ? sp30; @@ -3646,7 +3087,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A870.s") extern ? D_0D007C10; extern ? D_80183E50; extern ? D_80183E70; -extern void *gDisplayListHead; + void func_8004A9B8(f32 arg0) { void *temp_v1; @@ -3663,7 +3104,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A9B8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B05C(s32 arg0) { void *temp_v1; @@ -3714,7 +3155,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B05C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B138(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void *temp_v1; @@ -3730,7 +3171,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B138.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B1C8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { void *temp_v1; @@ -3751,7 +3192,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B1C8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B2BC(s32 arg0) { void *temp_v1; @@ -3772,7 +3213,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B2BC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B310(s32 arg0) { void *temp_v1; @@ -3793,7 +3234,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B310.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B35C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void *temp_v1; @@ -3814,7 +3255,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B35C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B3C8(s32 arg0) { void *temp_v1; @@ -3835,7 +3276,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B3C8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B414(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void *temp_v1; @@ -3856,7 +3297,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B414.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B480(s32 arg0, s32 arg1, s32 arg2) { void *temp_v1; @@ -3877,7 +3318,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B480.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B614(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { void *temp_v1; @@ -3903,7 +3344,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B614.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B6C4(s32 arg0, s32 arg1, s32 arg2) { void *temp_v1; @@ -3924,7 +3365,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B6C4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B72C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { void *temp_v1; @@ -3950,7 +3391,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B72C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004B7DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { void *temp_v1; @@ -4105,7 +3546,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004BA98.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; + void func_8004BB3C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg4) { s32 temp_f18; @@ -4273,7 +3714,7 @@ void func_8004C628(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) { ? func_8004B950(s32, s32, u32, u32, s32); // extern extern ? D_0D007EB8; extern ? D_0D007EF8; -extern void *gDisplayListHead; + void func_8004C6FC(s16 arg0, s16 arg1, s32 arg2, u32 arg3, u32 arg4) { s32 temp_s3; @@ -4357,7 +3798,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C8D4.s") extern ? D_0D007EB8; extern ? D_0D007EF8; extern ? D_0D008108; -extern void *gDisplayListHead; + void func_8004C91C(s32 arg4, s32 arg5) { void *temp_v0; @@ -4392,7 +3833,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C91C.s") ? func_8004B2BC(?); // extern ? func_8004C268(s32, s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007F38; -extern void *gDisplayListHead; + void func_8004C9D8(s32 arg0, s32 arg1, ? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg7) { void *temp_v1; @@ -4413,7 +3854,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C9D8.s") ? func_80043D50(?, s32, s32); // extern ? func_8004BB3C(s32, s32, s32, s32, f32); // extern extern ? D_0D007F78; -extern void *gDisplayListHead; + void func_8004CA58(s32 arg0, s32 arg1, f32 arg2, ? arg3, s32 arg4, s32 arg5) { void *temp_v1; @@ -4467,7 +3908,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CB90.s") ? func_800441E0(s32, s32, s32); // extern void *func_8004B97C(s32, s32, s32, s32, s32); // extern extern ? D_0D007FE0; -extern void *gDisplayListHead; + void *func_8004CD48(s32 arg0, s32 arg1, ? arg2, s32 arg3, s32 arg4, s32 arg5) { s32 sp40; @@ -4544,7 +3985,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CE8C.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_8004CE8C(s32, s32); // extern extern ? D_0D007FE0; -extern void *gDisplayListHead; + void func_8004CF9C(s32 arg4, s32 arg6) { void *temp_v1; @@ -4564,7 +4005,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CF9C.s") ? func_80044924(s32, s32, s32); // extern void *func_8004B97C(s32, s32, s32, s32, s32); // extern extern ? D_0D007FE0; -extern void *gDisplayListHead; + void *func_8004D0D4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 temp_lo; @@ -4606,7 +4047,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D0D4.s") ? func_8004B414(?, s32, s32, s32); // extern ? func_8004B97C(s32, s32, s32, s32, s32); // extern extern ? D_0D007FE0; -extern void *gDisplayListHead; + void func_8004D37C(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 argA) { s32 temp_lo; @@ -4646,7 +4087,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D37C.s") ? func_8004B414(?, s32, s32, s32); // extern ? func_8004BA08(s32, s32, s32, s32, s32); // extern extern ? D_0D007FE0; -extern void *gDisplayListHead; + void func_8004D4E8(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 argA) { s32 temp_lo; @@ -4690,7 +4131,7 @@ extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; extern f32 D_8018D00C; -extern void *gDisplayListHead; + void func_8004D7B4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 sp5C; @@ -4746,7 +4187,7 @@ extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; extern f32 D_8018D00C; -extern void *gDisplayListHead; + void func_8004D93C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { f32 temp_f20; @@ -4800,7 +4241,7 @@ extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; extern f32 D_8018D00C; -extern void *gDisplayListHead; + void func_8004DAB8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { f32 temp_f20; @@ -4927,7 +4368,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E06C.s") ? func_8004B05C(?); // extern ? func_8004DF5C(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007CB8; -extern void *gDisplayListHead; + void func_8004E240(s32 arg0, s32 arg1, ? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { void *temp_v1; @@ -4949,7 +4390,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E240.s") ? func_8004B2BC(?); // extern ? func_8004DF5C(s32, s32, s32, s32, s32, s32); // extern extern ? D_0D007DB8; -extern void *gDisplayListHead; + void func_8004E2B8(s32 arg0, s32 arg1, ? arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { void *temp_v1; @@ -4973,7 +4414,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E2B8.s") ? func_8004E06C(s32, s32, s32, s32, s32); // extern extern ? D_0D007DB8; extern s32 D_8016589C; -extern void *gDisplayListHead; + void func_8004E338(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { void *temp_v1; @@ -5545,7 +4986,7 @@ extern ? D_0D007EB8; extern ? D_0D007EF8; extern ? D_0D008108; extern ? D_0D00C558; -extern void *gDisplayListHead; + void print_timer(s32 arg0, s32 arg1, s32 arg2) { void *temp_v0; @@ -5609,7 +5050,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F8CC.s") ? func_8004F8CC(s32, s32); // extern extern ? D_0D007F38; extern ? D_0D00C558; -extern void *gDisplayListHead; + void func_8004F950(s32 arg0, s32 arg1, ? arg2, s32 arg3) { void *temp_v1; @@ -5638,7 +5079,7 @@ extern ? D_0D00C558; extern u16 D_801656C0; extern u16 D_801656D0; extern u16 D_801656E0; -extern void *gDisplayListHead; + void func_8004F9CC(s32 arg0, s32 arg1, s32 arg2) { void *temp_v1; @@ -5734,7 +5175,7 @@ extern ? D_0D007EB8; extern ? D_0D007EF8; extern ? D_0D008108; extern ? D_0D00AB58; -extern void *gDisplayListHead; + void func_8004FC78(s16 arg0, s16 arg1, s8 arg2) { void *temp_v0; @@ -6305,7 +5746,7 @@ extern ? D_8018CE24; extern s32 D_8018D3E4; extern s32 D_8018D3E8; extern s32 D_8018D3EC; -extern void *gDisplayListHead; + extern ? gLapCountByPlayerId; void func_80050E34(s32 arg0, s32 arg1) { @@ -6535,7 +5976,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050E34.s") ? func_80050E34(s16, s32); // extern extern ? D_80164360; extern s32 D_80164408; -extern void *gDisplayListHead; + void func_800514BC(void) { s16 temp_a0; @@ -6595,7 +6036,7 @@ extern ? D_80165C18; extern s32 D_8018C970; extern ? D_8018CA70; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_80051638(s32 arg0) { s32 *temp_s0; @@ -6656,7 +6097,7 @@ extern ? D_0D0293D8; extern ? D_80165C18; extern s32 D_8018C1B0; extern ? D_8018C278; -extern void *gDisplayListHead; + void func_800517C8(void) { s32 *temp_s0; @@ -6705,7 +6146,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800517C8.s") extern ? D_0D006940; extern ? D_80165C18; extern u8 D_8018D228; -extern void *gDisplayListHead; + void func_800518F8(s32 arg0, s16 arg1, s16 arg2) { void *sp18; @@ -6748,7 +6189,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800518F8.s") extern ? D_0D006940; extern ? D_80165C18; extern u8 D_8018D228; -extern void *gDisplayListHead; + void func_800519D4(s32 arg0, s16 arg1, s16 arg2) { u8 temp_v0; @@ -6791,7 +6232,7 @@ extern ? D_8018CC80; extern s32 D_8018D1F0; extern s8 D_8018D228; extern u8 D_8018D230; -extern void *gDisplayListHead; + void func_80051ABC(s16 arg0, s32 arg1) { s32 temp_a0; @@ -6860,7 +6301,7 @@ extern ? D_8018CC80; extern s32 D_8018D1F0; extern s8 D_8018D228; extern u8 D_8018D230; -extern void *gDisplayListHead; + void func_80051C60(s16 arg0, s32 arg1) { s16 temp_v0; @@ -7094,7 +6535,7 @@ extern ? D_800E4608; extern ? D_800E4610; extern ? D_80165C18; extern s32 D_80183F28; -extern void *gDisplayListHead; + void func_8005217C(s32 arg0) { s32 sp50; @@ -7264,7 +6705,7 @@ extern s16 D_8018CFC8; extern s16 D_8018CFE8; extern s16 D_8018D000; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_80052590(s32 arg0) { s32 *temp_s1; @@ -7389,7 +6830,7 @@ extern ? D_80183E80; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_800528EC(s32 arg0) { s32 *temp_s3; @@ -7516,7 +6957,7 @@ extern ? D_800E4620; extern ? D_800E4628; extern ? D_80165840; extern s32 D_80183DB8; -extern void *gDisplayListHead; + void func_80052C60(s32 arg0) { s32 temp_s0; @@ -7590,7 +7031,7 @@ extern ? D_800E4620; extern ? D_800E4628; extern ? D_80165840; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_80052E30(s32 arg0) { s32 temp_s0; @@ -7640,7 +7081,7 @@ extern ? D_0D0069E0; extern ? D_80165C18; extern s32 D_8018C3F0; extern ? D_8018C5F0; -extern void *gDisplayListHead; + void func_80052F20(s32 arg0) { s32 sp44; @@ -7938,7 +7379,7 @@ s32 func_80072354(?); // extern extern ? D_06006F38; extern ? D_0D007828; extern ? D_80165C18; -extern void *gDisplayListHead; + void func_800536C8(s32 arg0) { void *sp20; @@ -8035,7 +7476,7 @@ extern ? D_8018C830; extern ? D_8018CF68; extern s32 D_8018D120; extern s32 D_8018D490; -extern void *gDisplayListHead; + void func_80053870(s32 arg0) { s32 sp94; @@ -8207,7 +7648,7 @@ extern ? D_0D006940; extern ? D_80165C18; extern ? D_80183E80; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_80053D74(s32 arg0, ? arg1, s32 arg2) { void *sp28; @@ -8248,7 +7689,7 @@ extern ? D_80183E80; extern s32 D_8018C630; extern s32 D_8018D4BC; extern s32 D_8018D4C0; -extern void *gDisplayListHead; + void func_80053E6C(s32 arg0) { s16 temp_v0_8; @@ -8390,7 +7831,7 @@ extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018C630; extern ? D_8018C830; -extern void *gDisplayListHead; + void func_800541BC(s32 arg0) { s32 sp3C; @@ -8481,7 +7922,7 @@ extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018C630; extern ? D_8018C830; -extern void *gDisplayListHead; + void func_80054414(s32 arg0) { s32 sp3C; @@ -8564,7 +8005,7 @@ extern ? D_80165C18; extern ? D_80183E80; extern s32 D_8018C1B0; extern ? D_8018C3B0; -extern void *gDisplayListHead; + void func_80054664(s32 arg0) { s32 *temp_s0; @@ -8661,7 +8102,7 @@ extern ? D_80165C18; extern ? D_80183E80; extern s32 D_8018C870; extern ? D_8018C970; -extern void *gDisplayListHead; + void func_80054938(s32 arg0) { s32 sp54; @@ -8714,7 +8155,7 @@ extern ? D_0D005AE0; extern ? D_0D006940; extern ? D_80165C18; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_80054AFC(s32 arg0, s32 arg1) { void *temp_s0; @@ -8751,7 +8192,7 @@ extern s16 D_80183E80; extern s32 D_8018C630; extern ? D_8018C830; extern s32 D_8018D488; -extern void *gDisplayListHead; + void func_80054BE8(s32 arg0) { s32 *temp_s0; @@ -8881,7 +8322,7 @@ extern ? D_80165C18; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_80054F04(s32 arg0) { s32 sp44; @@ -8978,7 +8419,7 @@ s16 func_80004DFC(s32, s32, ?, s16); // extern extern ? D_0D0077A0; extern u16 D_800DC5FC; extern ? D_80165C18; -extern void *gDisplayListHead; + void func_80055164(s32 arg0) { void *sp18; @@ -9041,7 +8482,7 @@ s16 func_80004DFC(s32, s32, ?, s16); // extern extern ? D_0D0077D0; extern u16 D_800DC5FC; extern ? D_80165C18; -extern void *gDisplayListHead; + void func_800552BC(s32 arg0) { void *sp18; @@ -9233,7 +8674,7 @@ s32 func_8007223C(?); // extern s32 func_80072320(s32, ?); // extern extern ? D_0D0077D0; extern ? D_80165C18; -extern void *gDisplayListHead; + void func_800557B4(s32 arg0, u32 arg1, u32 arg2) { f32 sp3C; @@ -9356,7 +8797,7 @@ extern ? D_0D0077D0; extern ? D_80165C18; extern ? D_80183E40; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_80055AB8(s32 arg0, s32 arg1) { s32 sp3C; @@ -9439,7 +8880,7 @@ extern ? D_0600FA20; extern ? D_0600FBE0; extern ? D_80165C18; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_80055CCC(s32 arg0, s32 arg1) { s32 sp24; @@ -9646,7 +9087,7 @@ extern s32 D_8016586C; extern s32 D_80165878; extern ? D_80183E40; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_800562E4(s32 arg0, s32 arg1, ? arg2) { s32 temp_a0; @@ -9697,7 +9138,7 @@ extern ? D_80165C18; extern ? D_80183E40; extern ? D_80183E80; extern s32 D_8018D400; -extern void *gDisplayListHead; + void func_800563DC(s32 arg0, s32 arg1, ? arg2) { f32 temp_f12; @@ -9763,7 +9204,7 @@ extern ? D_0D02AA58; extern ? D_80165C18; extern ? D_80183E40; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_8005669C(s32 arg0, ? arg1, ? arg2) { void *temp_s1; @@ -9808,7 +9249,7 @@ extern f64 D_800EE088; extern ? D_80165C18; extern ? D_80183E50; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_800568A0(s32 arg0, s32 arg1) { ? sp30; @@ -9938,7 +9379,7 @@ extern ? D_0D0079C8; extern ? D_0D02AA58; extern ? D_80163DE8; extern ? D_80183E80; -extern void *gDisplayListHead; + void func_80056E24(s32 arg0, s32 arg1) { f32 sp5C; @@ -9999,7 +9440,7 @@ extern ? D_80163DE8; extern ? D_80164038; extern ? D_80183E50; extern s32 D_8018D120; -extern void *gDisplayListHead; + void func_80056FCC(s32 arg0) { ? sp30;