diff --git a/asm/nonmatchings/code_16F740/func_80246B2C_16C8E0.s b/asm/nonmatchings/code_16F740/func_80246B2C_16C8E0.s deleted file mode 100644 index 66860a6696..0000000000 --- a/asm/nonmatchings/code_16F740/func_80246B2C_16C8E0.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80246B2C_16C8E0 -/* 17540C 80246B2C 03E00008 */ jr $ra -/* 175410 80246B30 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/pause_cleanup_16C8E0.s b/asm/nonmatchings/code_16F740/pause_cleanup_16C8E0.s deleted file mode 100644 index f7312b06bb..0000000000 --- a/asm/nonmatchings/code_16F740/pause_cleanup_16C8E0.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_cleanup_16C8E0 -/* 172FE8 80244708 03E00008 */ jr $ra -/* 172FEC 8024470C 00000000 */ nop diff --git a/asm/nonmatchings/code_E21870/func_802B7000_E21870.s b/asm/nonmatchings/code_E21870/func_802B7000_E21870.s deleted file mode 100644 index bd248070da..0000000000 --- a/asm/nonmatchings/code_E21870/func_802B7000_E21870.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802B7000_E21870 -/* E21870 802B7000 3C048011 */ lui $a0, %hi(D_8010EBB0) -/* E21874 802B7004 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) -/* E21878 802B7008 3C038011 */ lui $v1, %hi(gPlayerActionState) -/* E2187C 802B700C 8063F07C */ lb $v1, %lo(gPlayerActionState)($v1) -/* E21880 802B7010 2402001F */ addiu $v0, $zero, 0x1f -/* E21884 802B7014 1062000B */ beq $v1, $v0, .L802B7044 -/* E21888 802B7018 24020001 */ addiu $v0, $zero, 1 -/* E2188C 802B701C 80830000 */ lb $v1, ($a0) -/* E21890 802B7020 14620006 */ bne $v1, $v0, .L802B703C -/* E21894 802B7024 24020009 */ addiu $v0, $zero, 9 -/* E21898 802B7028 80830003 */ lb $v1, 3($a0) -/* E2189C 802B702C 10620005 */ beq $v1, $v0, .L802B7044 -/* E218A0 802B7030 24020004 */ addiu $v0, $zero, 4 -/* E218A4 802B7034 10620003 */ beq $v1, $v0, .L802B7044 -/* E218A8 802B7038 00000000 */ nop -.L802B703C: -/* E218AC 802B703C 03E00008 */ jr $ra -/* E218B0 802B7040 0000102D */ daddu $v0, $zero, $zero -.L802B7044: -/* E218B4 802B7044 03E00008 */ jr $ra -/* E218B8 802B7048 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s deleted file mode 100644 index c1209db8fe..0000000000 --- a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contRmbControl -/* 3AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3AD24 8005F924 AFB20018 */ sw $s2, 0x18($sp) -/* 3AD28 8005F928 0080902D */ daddu $s2, $a0, $zero -/* 3AD2C 8005F92C 00A0302D */ daddu $a2, $a1, $zero -/* 3AD30 8005F930 AFB00010 */ sw $s0, 0x10($sp) -/* 3AD34 8005F934 AFBF0020 */ sw $ra, 0x20($sp) -/* 3AD38 8005F938 AFB3001C */ sw $s3, 0x1c($sp) -/* 3AD3C 8005F93C AFB10014 */ sw $s1, 0x14($sp) -/* 3AD40 8005F940 92430006 */ lbu $v1, 6($s2) -/* 3AD44 8005F944 24130002 */ addiu $s3, $zero, 2 -/* 3AD48 8005F948 10730069 */ beq $v1, $s3, .L8005FAF0 -/* 3AD4C 8005F94C 0000802D */ daddu $s0, $zero, $zero -/* 3AD50 8005F950 28620003 */ slti $v0, $v1, 3 -/* 3AD54 8005F954 10400005 */ beqz $v0, .L8005F96C -/* 3AD58 8005F958 24020001 */ addiu $v0, $zero, 1 -/* 3AD5C 8005F95C 1062000A */ beq $v1, $v0, .L8005F988 -/* 3AD60 8005F960 0200102D */ daddu $v0, $s0, $zero -/* 3AD64 8005F964 08017EBD */ j .L8005FAF4 -/* 3AD68 8005F968 00000000 */ nop -.L8005F96C: -/* 3AD6C 8005F96C 24020003 */ addiu $v0, $zero, 3 -/* 3AD70 8005F970 10620018 */ beq $v1, $v0, .L8005F9D4 -/* 3AD74 8005F974 24020004 */ addiu $v0, $zero, 4 -/* 3AD78 8005F978 10620048 */ beq $v1, $v0, .L8005FA9C -/* 3AD7C 8005F97C 0200102D */ daddu $v0, $s0, $zero -/* 3AD80 8005F980 08017EBD */ j .L8005FAF4 -/* 3AD84 8005F984 00000000 */ nop -.L8005F988: -/* 3AD88 8005F988 96420004 */ lhu $v0, 4($s2) -/* 3AD8C 8005F98C 1040000C */ beqz $v0, .L8005F9C0 -/* 3AD90 8005F990 00062040 */ sll $a0, $a2, 1 -/* 3AD94 8005F994 00862021 */ addu $a0, $a0, $a2 -/* 3AD98 8005F998 00042080 */ sll $a0, $a0, 2 -/* 3AD9C 8005F99C 00862021 */ addu $a0, $a0, $a2 -/* 3ADA0 8005F9A0 000420C0 */ sll $a0, $a0, 3 -/* 3ADA4 8005F9A4 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3ADA8 8005F9A8 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3ADAC 8005F9AC 00822021 */ addu $a0, $a0, $v0 -/* 3ADB0 8005F9B0 0C019F80 */ jal __osMotorAccess -/* 3ADB4 8005F9B4 0000282D */ daddu $a1, $zero, $zero -/* 3ADB8 8005F9B8 08017E71 */ j .L8005F9C4 -/* 3ADBC 8005F9BC 0040802D */ daddu $s0, $v0, $zero -.L8005F9C0: -/* 3ADC0 8005F9C0 A2530006 */ sb $s3, 6($s2) -.L8005F9C4: -/* 3ADC4 8005F9C4 96420004 */ lhu $v0, 4($s2) -/* 3ADC8 8005F9C8 2442FFFF */ addiu $v0, $v0, -1 -/* 3ADCC 8005F9CC 08017EBC */ j .L8005FAF0 -/* 3ADD0 8005F9D0 A6420004 */ sh $v0, 4($s2) -.L8005F9D4: -/* 3ADD4 8005F9D4 96420002 */ lhu $v0, 2($s2) -/* 3ADD8 8005F9D8 1040001F */ beqz $v0, .L8005FA58 -/* 3ADDC 8005F9DC 00062040 */ sll $a0, $a2, 1 -/* 3ADE0 8005F9E0 96420004 */ lhu $v0, 4($s2) -/* 3ADE4 8005F9E4 96430000 */ lhu $v1, ($s2) -/* 3ADE8 8005F9E8 00431021 */ addu $v0, $v0, $v1 -/* 3ADEC 8005F9EC 304300FF */ andi $v1, $v0, 0xff -/* 3ADF0 8005F9F0 3042FFFF */ andi $v0, $v0, 0xffff -/* 3ADF4 8005F9F4 00021202 */ srl $v0, $v0, 8 -/* 3ADF8 8005F9F8 1040000B */ beqz $v0, .L8005FA28 -/* 3ADFC 8005F9FC A6430004 */ sh $v1, 4($s2) -/* 3AE00 8005FA00 00062040 */ sll $a0, $a2, 1 -/* 3AE04 8005FA04 00862021 */ addu $a0, $a0, $a2 -/* 3AE08 8005FA08 00042080 */ sll $a0, $a0, 2 -/* 3AE0C 8005FA0C 00862021 */ addu $a0, $a0, $a2 -/* 3AE10 8005FA10 000420C0 */ sll $a0, $a0, 3 -/* 3AE14 8005FA14 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE18 8005FA18 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE1C 8005FA1C 00822021 */ addu $a0, $a0, $v0 -/* 3AE20 8005FA20 08017E92 */ j .L8005FA48 -/* 3AE24 8005FA24 24050001 */ addiu $a1, $zero, 1 -.L8005FA28: -/* 3AE28 8005FA28 00862021 */ addu $a0, $a0, $a2 -/* 3AE2C 8005FA2C 00042080 */ sll $a0, $a0, 2 -/* 3AE30 8005FA30 00862021 */ addu $a0, $a0, $a2 -/* 3AE34 8005FA34 000420C0 */ sll $a0, $a0, 3 -/* 3AE38 8005FA38 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE3C 8005FA3C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE40 8005FA40 00822021 */ addu $a0, $a0, $v0 -/* 3AE44 8005FA44 0000282D */ daddu $a1, $zero, $zero -.L8005FA48: -/* 3AE48 8005FA48 0C019F80 */ jal __osMotorAccess -/* 3AE4C 8005FA4C 00000000 */ nop -/* 3AE50 8005FA50 08017EA3 */ j .L8005FA8C -/* 3AE54 8005FA54 0040802D */ daddu $s0, $v0, $zero -.L8005FA58: -/* 3AE58 8005FA58 00862021 */ addu $a0, $a0, $a2 -/* 3AE5C 8005FA5C 00042080 */ sll $a0, $a0, 2 -/* 3AE60 8005FA60 00862021 */ addu $a0, $a0, $a2 -/* 3AE64 8005FA64 000420C0 */ sll $a0, $a0, 3 -/* 3AE68 8005FA68 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE6C 8005FA6C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE70 8005FA70 00822021 */ addu $a0, $a0, $v0 -/* 3AE74 8005FA74 0C019F80 */ jal __osMotorAccess -/* 3AE78 8005FA78 0000282D */ daddu $a1, $zero, $zero -/* 3AE7C 8005FA7C 0040802D */ daddu $s0, $v0, $zero -/* 3AE80 8005FA80 24020001 */ addiu $v0, $zero, 1 -/* 3AE84 8005FA84 A2420006 */ sb $v0, 6($s2) -/* 3AE88 8005FA88 A6530004 */ sh $s3, 4($s2) -.L8005FA8C: -/* 3AE8C 8005FA8C 96420002 */ lhu $v0, 2($s2) -/* 3AE90 8005FA90 2442FFFF */ addiu $v0, $v0, -1 -/* 3AE94 8005FA94 08017EBC */ j .L8005FAF0 -/* 3AE98 8005FA98 A6420002 */ sh $v0, 2($s2) -.L8005FA9C: -/* 3AE9C 8005FA9C 3C04800E */ lui $a0, %hi(nuSiMesgQ) -/* 3AEA0 8005FAA0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) -/* 3AEA4 8005FAA4 00061040 */ sll $v0, $a2, 1 -/* 3AEA8 8005FAA8 00461021 */ addu $v0, $v0, $a2 -/* 3AEAC 8005FAAC 00021080 */ sll $v0, $v0, 2 -/* 3AEB0 8005FAB0 00461021 */ addu $v0, $v0, $a2 -/* 3AEB4 8005FAB4 000210C0 */ sll $v0, $v0, 3 -/* 3AEB8 8005FAB8 3C03800E */ lui $v1, %hi(nuContPfs) -/* 3AEBC 8005FABC 2463AAD8 */ addiu $v1, $v1, %lo(nuContPfs) -/* 3AEC0 8005FAC0 00438821 */ addu $s1, $v0, $v1 -/* 3AEC4 8005FAC4 0C019FD1 */ jal osMotorInit -/* 3AEC8 8005FAC8 0220282D */ daddu $a1, $s1, $zero -/* 3AECC 8005FACC 0040802D */ daddu $s0, $v0, $zero -/* 3AED0 8005FAD0 16000005 */ bnez $s0, .L8005FAE8 -/* 3AED4 8005FAD4 24020001 */ addiu $v0, $zero, 1 -/* 3AED8 8005FAD8 0220202D */ daddu $a0, $s1, $zero -/* 3AEDC 8005FADC 0C019F80 */ jal __osMotorAccess -/* 3AEE0 8005FAE0 0000282D */ daddu $a1, $zero, $zero -/* 3AEE4 8005FAE4 24020001 */ addiu $v0, $zero, 1 -.L8005FAE8: -/* 3AEE8 8005FAE8 A2420006 */ sb $v0, 6($s2) -/* 3AEEC 8005FAEC A6530004 */ sh $s3, 4($s2) -.L8005FAF0: -/* 3AEF0 8005FAF0 0200102D */ daddu $v0, $s0, $zero -.L8005FAF4: -/* 3AEF4 8005FAF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 3AEF8 8005FAF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 3AEFC 8005FAFC 8FB20018 */ lw $s2, 0x18($sp) -/* 3AF00 8005FB00 8FB10014 */ lw $s1, 0x14($sp) -/* 3AF04 8005FB04 8FB00010 */ lw $s0, 0x10($sp) -/* 3AF08 8005FB08 03E00008 */ jr $ra -/* 3AF0C 8005FB0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s b/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s deleted file mode 100644 index e071375137..0000000000 --- a/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005FB10 -/* 3AF10 8005FB10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 3AF14 8005FB14 AFB10014 */ sw $s1, 0x14($sp) -/* 3AF18 8005FB18 0000882D */ daddu $s1, $zero, $zero -/* 3AF1C 8005FB1C AFB40020 */ sw $s4, 0x20($sp) -/* 3AF20 8005FB20 24140002 */ addiu $s4, $zero, 2 -/* 3AF24 8005FB24 AFB50024 */ sw $s5, 0x24($sp) -/* 3AF28 8005FB28 24150001 */ addiu $s5, $zero, 1 -/* 3AF2C 8005FB2C AFB3001C */ sw $s3, 0x1c($sp) -/* 3AF30 8005FB30 0220982D */ daddu $s3, $s1, $zero -/* 3AF34 8005FB34 AFB20018 */ sw $s2, 0x18($sp) -/* 3AF38 8005FB38 0220902D */ daddu $s2, $s1, $zero -/* 3AF3C 8005FB3C AFBF0028 */ sw $ra, 0x28($sp) -/* 3AF40 8005FB40 AFB00010 */ sw $s0, 0x10($sp) -.L8005FB44: -/* 3AF44 8005FB44 3C02800B */ lui $v0, %hi(nuContRmbCtl) -/* 3AF48 8005FB48 24421D40 */ addiu $v0, $v0, %lo(nuContRmbCtl) -/* 3AF4C 8005FB4C 02428021 */ addu $s0, $s2, $v0 -/* 3AF50 8005FB50 92030007 */ lbu $v1, 7($s0) -/* 3AF54 8005FB54 10740015 */ beq $v1, $s4, .L8005FBAC -/* 3AF58 8005FB58 28620003 */ slti $v0, $v1, 3 -/* 3AF5C 8005FB5C 50400007 */ beql $v0, $zero, .L8005FB7C -/* 3AF60 8005FB60 28620083 */ slti $v0, $v1, 0x83 -/* 3AF64 8005FB64 5060003B */ beql $v1, $zero, .L8005FC54 -/* 3AF68 8005FB68 26730068 */ addiu $s3, $s3, 0x68 -/* 3AF6C 8005FB6C 10750009 */ beq $v1, $s5, .L8005FB94 -/* 3AF70 8005FB70 0200202D */ daddu $a0, $s0, $zero -/* 3AF74 8005FB74 08017F15 */ j .L8005FC54 -/* 3AF78 8005FB78 26730068 */ addiu $s3, $s3, 0x68 -.L8005FB7C: -/* 3AF7C 8005FB7C 10400034 */ beqz $v0, .L8005FC50 -/* 3AF80 8005FB80 28620081 */ slti $v0, $v1, 0x81 -/* 3AF84 8005FB84 54400033 */ bnel $v0, $zero, .L8005FC54 -/* 3AF88 8005FB88 26730068 */ addiu $s3, $s3, 0x68 -/* 3AF8C 8005FB8C 08017F0E */ j .L8005FC38 -/* 3AF90 8005FB90 00000000 */ nop -.L8005FB94: -/* 3AF94 8005FB94 0C017E48 */ jal contRmbControl -/* 3AF98 8005FB98 0220282D */ daddu $a1, $s1, $zero -/* 3AF9C 8005FB9C 5440002C */ bnel $v0, $zero, .L8005FC50 -/* 3AFA0 8005FBA0 A2000007 */ sb $zero, 7($s0) -/* 3AFA4 8005FBA4 08017F15 */ j .L8005FC54 -/* 3AFA8 8005FBA8 26730068 */ addiu $s3, $s3, 0x68 -.L8005FBAC: -/* 3AFAC 8005FBAC 92020008 */ lbu $v0, 8($s0) -/* 3AFB0 8005FBB0 14400019 */ bnez $v0, .L8005FC18 -/* 3AFB4 8005FBB4 0200202D */ daddu $a0, $s0, $zero -/* 3AFB8 8005FBB8 96030004 */ lhu $v1, 4($s0) -/* 3AFBC 8005FBBC 3C028009 */ lui $v0, %hi(nuContRmbSearchTime) -/* 3AFC0 8005FBC0 8C423CE0 */ lw $v0, %lo(nuContRmbSearchTime)($v0) -/* 3AFC4 8005FBC4 14400002 */ bnez $v0, .L8005FBD0 -/* 3AFC8 8005FBC8 0062001B */ divu $zero, $v1, $v0 -/* 3AFCC 8005FBCC 0007000D */ break 7 -.L8005FBD0: -/* 3AFD0 8005FBD0 00001010 */ mfhi $v0 -/* 3AFD4 8005FBD4 1440000C */ bnez $v0, .L8005FC08 -/* 3AFD8 8005FBD8 00000000 */ nop -/* 3AFDC 8005FBDC 3C04800E */ lui $a0, %hi(nuSiMesgQ) -/* 3AFE0 8005FBE0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) -/* 3AFE4 8005FBE4 3C05800E */ lui $a1, %hi(nuContPfs) -/* 3AFE8 8005FBE8 24A5AAD8 */ addiu $a1, $a1, %lo(nuContPfs) -/* 3AFEC 8005FBEC 02652821 */ addu $a1, $s3, $a1 -/* 3AFF0 8005FBF0 0C019FD1 */ jal osMotorInit -/* 3AFF4 8005FBF4 0220302D */ daddu $a2, $s1, $zero -/* 3AFF8 8005FBF8 14400003 */ bnez $v0, .L8005FC08 -/* 3AFFC 8005FBFC 00000000 */ nop -/* 3B000 8005FC00 A2150008 */ sb $s5, 8($s0) -/* 3B004 8005FC04 A2140009 */ sb $s4, 9($s0) -.L8005FC08: -/* 3B008 8005FC08 96020004 */ lhu $v0, 4($s0) -/* 3B00C 8005FC0C 24420001 */ addiu $v0, $v0, 1 -/* 3B010 8005FC10 08017F14 */ j .L8005FC50 -/* 3B014 8005FC14 A6020004 */ sh $v0, 4($s0) -.L8005FC18: -/* 3B018 8005FC18 0C017E48 */ jal contRmbControl -/* 3B01C 8005FC1C 0220282D */ daddu $a1, $s1, $zero -/* 3B020 8005FC20 5040000C */ beql $v0, $zero, .L8005FC54 -/* 3B024 8005FC24 26730068 */ addiu $s3, $s3, 0x68 -/* 3B028 8005FC28 A6110004 */ sh $s1, 4($s0) -/* 3B02C 8005FC2C A2000008 */ sb $zero, 8($s0) -/* 3B030 8005FC30 08017F14 */ j .L8005FC50 -/* 3B034 8005FC34 A2000009 */ sb $zero, 9($s0) -.L8005FC38: -/* 3B038 8005FC38 92020009 */ lbu $v0, 9($s0) -/* 3B03C 8005FC3C 54540005 */ bnel $v0, $s4, .L8005FC54 -/* 3B040 8005FC40 26730068 */ addiu $s3, $s3, 0x68 -/* 3B044 8005FC44 0200202D */ daddu $a0, $s0, $zero -/* 3B048 8005FC48 0C017E48 */ jal contRmbControl -/* 3B04C 8005FC4C 0220282D */ daddu $a1, $s1, $zero -.L8005FC50: -/* 3B050 8005FC50 26730068 */ addiu $s3, $s3, 0x68 -.L8005FC54: -/* 3B054 8005FC54 26310001 */ addiu $s1, $s1, 1 -/* 3B058 8005FC58 2E220004 */ sltiu $v0, $s1, 4 -/* 3B05C 8005FC5C 1440FFB9 */ bnez $v0, .L8005FB44 -/* 3B060 8005FC60 2652000A */ addiu $s2, $s2, 0xa -/* 3B064 8005FC64 8FBF0028 */ lw $ra, 0x28($sp) -/* 3B068 8005FC68 8FB50024 */ lw $s5, 0x24($sp) -/* 3B06C 8005FC6C 8FB40020 */ lw $s4, 0x20($sp) -/* 3B070 8005FC70 8FB3001C */ lw $s3, 0x1c($sp) -/* 3B074 8005FC74 8FB20018 */ lw $s2, 0x18($sp) -/* 3B078 8005FC78 8FB10014 */ lw $s1, 0x14($sp) -/* 3B07C 8005FC7C 8FB00010 */ lw $s0, 0x10($sp) -/* 3B080 8005FC80 0000102D */ daddu $v0, $zero, $zero -/* 3B084 8005FC84 03E00008 */ jr $ra -/* 3B088 8005FC88 27BD0030 */ addiu $sp, $sp, 0x30