diff --git a/asm/non_matchings/unknown_066AA0/func_8006B224.s b/asm/non_matchings/unknown_066AA0/func_8006B224.s deleted file mode 100644 index 0d4f4318..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006B224.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006B224 -/* 06BE24 8006B224 3C0E8012 */ lui $t6, %hi(D_80121170) # $t6, 0x8012 -/* 06BE28 8006B228 8DCE1170 */ lw $t6, %lo(D_80121170)($t6) -/* 06BE2C 8006B22C 3C0F8012 */ lui $t7, %hi(D_80121174) # $t7, 0x8012 -/* 06BE30 8006B230 AC8E0000 */ sw $t6, ($a0) -/* 06BE34 8006B234 8DEF1174 */ lw $t7, %lo(D_80121174)($t7) -/* 06BE38 8006B238 03E00008 */ jr $ra -/* 06BE3C 8006B23C ACAF0000 */ sw $t7, ($a1) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006B240.s b/asm/non_matchings/unknown_066AA0/func_8006B240.s deleted file mode 100644 index 1d22cdfb..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006B240.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006B240 -/* 06BE40 8006B240 3C02800E */ lui $v0, %hi(D_800DD31C) # $v0, 0x800e -/* 06BE44 8006B244 8C42D31C */ lw $v0, %lo(D_800DD31C)($v0) -/* 06BE48 8006B248 03E00008 */ jr $ra -/* 06BE4C 8006B24C 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006BD88.s b/asm/non_matchings/unknown_066AA0/func_8006BD88.s deleted file mode 100644 index 276e4143..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006BD88.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006BD88 -/* 06C988 8006BD88 3C028012 */ lui $v0, %hi(D_80121164) # $v0, 0x8012 -/* 06C98C 8006BD8C 8C421164 */ lw $v0, %lo(D_80121164)($v0) -/* 06C990 8006BD90 03E00008 */ jr $ra -/* 06C994 8006BD94 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006BDB0.s b/asm/non_matchings/unknown_066AA0/func_8006BDB0.s deleted file mode 100644 index 80d20eb2..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006BDB0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8006BDB0 -/* 06C9B0 8006BDB0 3C028012 */ lui $v0, %hi(D_80121168) # $v0, 0x8012 -/* 06C9B4 8006BDB4 8C421168 */ lw $v0, %lo(D_80121168)($v0) -/* 06C9B8 8006BDB8 03E00008 */ jr $ra -/* 06C9BC 8006BDBC 00000000 */ nop - -/* 06C9C0 8006BDC0 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 -/* 06C9C4 8006BDC4 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06C9C8 8006BDC8 00000000 */ nop -/* 06C9CC 8006BDCC 2442FFFF */ addiu $v0, $v0, -1 -/* 06C9D0 8006BDD0 304E00FF */ andi $t6, $v0, 0xff -/* 06C9D4 8006BDD4 03E00008 */ jr $ra -/* 06C9D8 8006BDD8 01C01025 */ move $v0, $t6 - diff --git a/asm/non_matchings/unknown_066AA0/func_8006C164.s b/asm/non_matchings/unknown_066AA0/func_8006C164.s deleted file mode 100644 index 28c7fe04..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006C164.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8006C164 -/* 06CD64 8006C164 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06CD68 8006C168 3C048012 */ lui $a0, %hi(D_801211C0) # $a0, 0x8012 -/* 06CD6C 8006C16C AFBF0014 */ sw $ra, 0x14($sp) -/* 06CD70 8006C170 8C8411C0 */ lw $a0, %lo(D_801211C0)($a0) -/* 06CD74 8006C174 0C01C450 */ jal func_80071140 -/* 06CD78 8006C178 00000000 */ nop -/* 06CD7C 8006C17C 8FBF0014 */ lw $ra, 0x14($sp) -/* 06CD80 8006C180 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06CD84 8006C184 03E00008 */ jr $ra -/* 06CD88 8006C188 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006C18C.s b/asm/non_matchings/unknown_066AA0/func_8006C18C.s deleted file mode 100644 index fe01f922..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006C18C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006C18C -/* 06CD8C 8006C18C 3C028012 */ lui $v0, %hi(D_801211C0) # $v0, 0x8012 -/* 06CD90 8006C190 8C4211C0 */ lw $v0, %lo(D_801211C0)($v0) -/* 06CD94 8006C194 03E00008 */ jr $ra -/* 06CD98 8006C198 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006C19C.s b/asm/non_matchings/unknown_066AA0/func_8006C19C.s deleted file mode 100644 index 5a9d89fe..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006C19C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006C19C -/* 06CD9C 8006C19C 3C02800E */ lui $v0, %hi(D_800DD318) # $v0, 0x800e -/* 06CDA0 8006C1A0 8042D318 */ lb $v0, %lo(D_800DD318)($v0) -/* 06CDA4 8006C1A4 03E00008 */ jr $ra -/* 06CDA8 8006C1A8 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006C2E4.s b/asm/non_matchings/unknown_066AA0/func_8006C2E4.s deleted file mode 100644 index 9947d7a0..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006C2E4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8006C2E4 -/* 06CEE4 8006C2E4 3C01800E */ lui $at, 0x800e -/* 06CEE8 8006C2E8 03E00008 */ jr $ra -/* 06CEEC 8006C2EC A420D328 */ sh $zero, -0x2cd8($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006C2F0.s b/asm/non_matchings/unknown_066AA0/func_8006C2F0.s deleted file mode 100644 index bce4dfe4..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006C2F0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006C2F0 -/* 06CEF0 8006C2F0 3C02800E */ lui $v0, %hi(D_800DD328) # $v0, 0x800e -/* 06CEF4 8006C2F4 8442D328 */ lh $v0, %lo(D_800DD328)($v0) -/* 06CEF8 8006C2F8 03E00008 */ jr $ra -/* 06CEFC 8006C2FC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006D8A4.s b/asm/non_matchings/unknown_066AA0/func_8006D8A4.s deleted file mode 100644 index 4897ea48..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006D8A4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8006D8A4 -/* 06E4A4 8006D8A4 240E002C */ li $t6, 44 -/* 06E4A8 8006D8A8 3C01800E */ lui $at, %hi(D_800DD390) # $at, 0x800e -/* 06E4AC 8006D8AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06E4B0 8006D8B0 A02ED390 */ sb $t6, %lo(D_800DD390)($at) -/* 06E4B4 8006D8B4 AFBF0014 */ sw $ra, 0x14($sp) -/* 06E4B8 8006D8B8 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 -/* 06E4BC 8006D8BC 0C025179 */ jal func_800945E4 -/* 06E4C0 8006D8C0 A0203515 */ sb $zero, %lo(D_80123515)($at) -/* 06E4C4 8006D8C4 3C04800E */ lui $a0, %hi(D_800DD408) # $a0, 0x800e -/* 06E4C8 8006D8C8 0C030076 */ jal func_800C01D8 -/* 06E4CC 8006D8CC 2484D408 */ addiu $a0, %lo(D_800DD408) # addiu $a0, $a0, -0x2bf8 -/* 06E4D0 8006D8D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 06E4D4 8006D8D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06E4D8 8006D8D8 03E00008 */ jr $ra -/* 06E4DC 8006D8DC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006D8E0.s b/asm/non_matchings/unknown_066AA0/func_8006D8E0.s deleted file mode 100644 index c4a8c08c..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006D8E0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006D8E0 -/* 06E4E0 8006D8E0 248E0001 */ addiu $t6, $a0, 1 -/* 06E4E4 8006D8E4 3C018012 */ lui $at, 0x8012 -/* 06E4E8 8006D8E8 03E00008 */ jr $ra -/* 06E4EC 8006D8EC A02E3516 */ sb $t6, 0x3516($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006DA0C.s b/asm/non_matchings/unknown_066AA0/func_8006DA0C.s deleted file mode 100644 index 16fdffb3..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006DA0C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8006DA0C -/* 06E60C 8006DA0C 3C028012 */ lui $v0, %hi(D_801234EC) # $v0, 0x8012 -/* 06E610 8006DA10 8C4234EC */ lw $v0, %lo(D_801234EC)($v0) -/* 06E614 8006DA14 03E00008 */ jr $ra -/* 06E618 8006DA18 00000000 */ nop - -/* 06E61C 8006DA1C 3C018012 */ lui $at, 0x8012 -/* 06E620 8006DA20 03E00008 */ jr $ra -/* 06E624 8006DA24 AC2434EC */ sw $a0, 0x34ec($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006DB14.s b/asm/non_matchings/unknown_066AA0/func_8006DB14.s deleted file mode 100644 index a409ea0f..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006DB14.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8006DB14 -/* 06E714 8006DB14 3C018012 */ lui $at, 0x8012 -/* 06E718 8006DB18 03E00008 */ jr $ra -/* 06E71C 8006DB1C AC243518 */ sw $a0, 0x3518($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006DB20.s b/asm/non_matchings/unknown_066AA0/func_8006DB20.s deleted file mode 100644 index 5c7f2089..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006DB20.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8006DB20 -/* 06E720 8006DB20 3C018012 */ lui $at, 0x8012 -/* 06E724 8006DB24 03E00008 */ jr $ra -/* 06E728 8006DB28 AC24351C */ sw $a0, 0x351c($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006DB2C.s b/asm/non_matchings/unknown_066AA0/func_8006DB2C.s deleted file mode 100644 index 406e0482..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006DB2C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006DB2C -/* 06E72C 8006DB2C 3C028012 */ lui $v0, %hi(D_80123518) # $v0, 0x8012 -/* 06E730 8006DB30 8C423518 */ lw $v0, %lo(D_80123518)($v0) -/* 06E734 8006DB34 03E00008 */ jr $ra -/* 06E738 8006DB38 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EA90.s b/asm/non_matchings/unknown_066AA0/func_8006EA90.s deleted file mode 100644 index 2fe8d520..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EA90.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006EA90 -/* 06F690 8006EA90 3C028012 */ lui $v0, %hi(D_80123510) # $v0, 0x8012 -/* 06F694 8006EA94 8C423510 */ lw $v0, %lo(D_80123510)($v0) -/* 06F698 8006EA98 03E00008 */ jr $ra -/* 06F69C 8006EA9C 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EAA0.s b/asm/non_matchings/unknown_066AA0/func_8006EAA0.s deleted file mode 100644 index a81c5f5e..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EAA0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006EAA0 -/* 06F6A0 8006EAA0 3C028012 */ lui $v0, %hi(D_80123515) # $v0, 0x8012 -/* 06F6A4 8006EAA4 80423515 */ lb $v0, %lo(D_80123515)($v0) -/* 06F6A8 8006EAA8 03E00008 */ jr $ra -/* 06F6AC 8006EAAC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EAB0.s b/asm/non_matchings/unknown_066AA0/func_8006EAB0.s deleted file mode 100644 index 9b6f6a22..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EAB0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006EAB0 -/* 06F6B0 8006EAB0 3C028012 */ lui $v0, %hi(D_80123516) # $v0, 0x8012 -/* 06F6B4 8006EAB4 80423516 */ lb $v0, %lo(D_80123516)($v0) -/* 06F6B8 8006EAB8 03E00008 */ jr $ra -/* 06F6BC 8006EABC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EB14.s b/asm/non_matchings/unknown_066AA0/func_8006EB14.s deleted file mode 100644 index 85ecf242..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EB14.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8006EB14 -/* 06F714 8006EB14 3C028012 */ lui $v0, %hi(D_801234F4) # $v0, 0x8012 -/* 06F718 8006EB18 8C4234F4 */ lw $v0, %lo(D_801234F4)($v0) -/* 06F71C 8006EB1C 03E00008 */ jr $ra -/* 06F720 8006EB20 00000000 */ nop - -/* 06F724 8006EB24 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F728 8006EB28 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F72C 8006EB2C 8C4E0000 */ lw $t6, ($v0) -/* 06F730 8006EB30 00000000 */ nop -/* 06F734 8006EB34 35CF0001 */ ori $t7, $t6, 1 -/* 06F738 8006EB38 03E00008 */ jr $ra -/* 06F73C 8006EB3C AC4F0000 */ sw $t7, ($v0) - -/* 06F740 8006EB40 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F744 8006EB44 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F748 8006EB48 8C4E0000 */ lw $t6, ($v0) -/* 06F74C 8006EB4C 00000000 */ nop -/* 06F750 8006EB50 35CF0002 */ ori $t7, $t6, 2 -/* 06F754 8006EB54 03E00008 */ jr $ra -/* 06F758 8006EB58 AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EB5C.s b/asm/non_matchings/unknown_066AA0/func_8006EB5C.s deleted file mode 100644 index 0f886198..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EB5C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006EB5C -/* 06F75C 8006EB5C 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F760 8006EB60 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F764 8006EB64 8C4E0000 */ lw $t6, ($v0) -/* 06F768 8006EB68 00000000 */ nop -/* 06F76C 8006EB6C 35CF0003 */ ori $t7, $t6, 3 -/* 06F770 8006EB70 03E00008 */ jr $ra -/* 06F774 8006EB74 AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EBA8.s b/asm/non_matchings/unknown_066AA0/func_8006EBA8.s deleted file mode 100644 index a5fc081c..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EBA8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006EBA8 -/* 06F7A8 8006EBA8 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F7AC 8006EBAC 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F7B0 8006EBB0 8C4E0000 */ lw $t6, ($v0) -/* 06F7B4 8006EBB4 00000000 */ nop -/* 06F7B8 8006EBB8 35CF0008 */ ori $t7, $t6, 8 -/* 06F7BC 8006EBBC 03E00008 */ jr $ra -/* 06F7C0 8006EBC0 AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EBC4.s b/asm/non_matchings/unknown_066AA0/func_8006EBC4.s deleted file mode 100644 index 76d25c7d..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EBC4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006EBC4 -/* 06F7C4 8006EBC4 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F7C8 8006EBC8 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F7CC 8006EBCC 8C4E0000 */ lw $t6, ($v0) -/* 06F7D0 8006EBD0 00000000 */ nop -/* 06F7D4 8006EBD4 35CF0010 */ ori $t7, $t6, 0x10 -/* 06F7D8 8006EBD8 03E00008 */ jr $ra -/* 06F7DC 8006EBDC AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EBE0.s b/asm/non_matchings/unknown_066AA0/func_8006EBE0.s deleted file mode 100644 index 7d374748..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EBE0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006EBE0 -/* 06F7E0 8006EBE0 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F7E4 8006EBE4 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F7E8 8006EBE8 8C4E0000 */ lw $t6, ($v0) -/* 06F7EC 8006EBEC 00000000 */ nop -/* 06F7F0 8006EBF0 35CF0020 */ ori $t7, $t6, 0x20 -/* 06F7F4 8006EBF4 03E00008 */ jr $ra -/* 06F7F8 8006EBF8 AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006EBFC.s b/asm/non_matchings/unknown_066AA0/func_8006EBFC.s deleted file mode 100644 index 83cf5c2a..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006EBFC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006EBFC -/* 06F7FC 8006EBFC 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F800 8006EC00 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F804 8006EC04 8C4E0000 */ lw $t6, ($v0) -/* 06F808 8006EC08 00000000 */ nop -/* 06F80C 8006EC0C 35CF0030 */ ori $t7, $t6, 0x30 -/* 06F810 8006EC10 03E00008 */ jr $ra -/* 06F814 8006EC14 AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006ECE0.s b/asm/non_matchings/unknown_066AA0/func_8006ECE0.s deleted file mode 100644 index 40aa75b1..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006ECE0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8006ECE0 -/* 06F8E0 8006ECE0 3C02800E */ lui $v0, %hi(D_800DD37C) # $v0, 0x800e -/* 06F8E4 8006ECE4 2442D37C */ addiu $v0, %lo(D_800DD37C) # addiu $v0, $v0, -0x2c84 -/* 06F8E8 8006ECE8 8C4E0000 */ lw $t6, ($v0) -/* 06F8EC 8006ECEC 00000000 */ nop -/* 06F8F0 8006ECF0 35CF0200 */ ori $t7, $t6, 0x200 -/* 06F8F4 8006ECF4 03E00008 */ jr $ra -/* 06F8F8 8006ECF8 AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006F254.s b/asm/non_matchings/unknown_066AA0/func_8006F254.s deleted file mode 100644 index 7a4b5a70..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006F254.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8006F254 -/* 06FE54 8006F254 3C0E800E */ lui $t6, %hi(D_800DD394) # $t6, 0x800e -/* 06FE58 8006F258 85CED394 */ lh $t6, %lo(D_800DD394)($t6) -/* 06FE5C 8006F25C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06FE60 8006F260 15C0000A */ bnez $t6, .L8006F28C -/* 06FE64 8006F264 AFBF0014 */ sw $ra, 0x14($sp) -/* 06FE68 8006F268 3C04800E */ lui $a0, %hi(D_800DD41C) # $a0, 0x800e -/* 06FE6C 8006F26C 0C030076 */ jal func_800C01D8 -/* 06FE70 8006F270 2484D41C */ addiu $a0, %lo(D_800DD41C) # addiu $a0, $a0, -0x2be4 -/* 06FE74 8006F274 240F0028 */ li $t7, 40 -/* 06FE78 8006F278 3C01800E */ lui $at, %hi(D_800DD394) # $at, 0x800e -/* 06FE7C 8006F27C A42FD394 */ sh $t7, %lo(D_800DD394)($at) -/* 06FE80 8006F280 3C018012 */ lui $at, %hi(D_80123524) # $at, 0x8012 -/* 06FE84 8006F284 24180002 */ li $t8, 2 -/* 06FE88 8006F288 A0383524 */ sb $t8, %lo(D_80123524)($at) -.L8006F28C: -/* 06FE8C 8006F28C 8FBF0014 */ lw $ra, 0x14($sp) -/* 06FE90 8006F290 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06FE94 8006F294 03E00008 */ jr $ra -/* 06FE98 8006F298 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006F338.s b/asm/non_matchings/unknown_066AA0/func_8006F338.s deleted file mode 100644 index f9d3fb16..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006F338.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8006F338 -/* 06FF38 8006F338 3C0E800E */ lui $t6, %hi(D_800DD394) # $t6, 0x800e -/* 06FF3C 8006F33C 85CED394 */ lh $t6, %lo(D_800DD394)($t6) -/* 06FF40 8006F340 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06FF44 8006F344 15C0000C */ bnez $t6, .L8006F378 -/* 06FF48 8006F348 AFBF0014 */ sw $ra, 0x14($sp) -/* 06FF4C 8006F34C 3C018012 */ lui $at, %hi(D_80123525) # $at, 0x8012 -/* 06FF50 8006F350 A0243525 */ sb $a0, %lo(D_80123525)($at) -/* 06FF54 8006F354 3C04800E */ lui $a0, %hi(D_800DD41C) # $a0, 0x800e -/* 06FF58 8006F358 0C030076 */ jal func_800C01D8 -/* 06FF5C 8006F35C 2484D41C */ addiu $a0, %lo(D_800DD41C) # addiu $a0, $a0, -0x2be4 -/* 06FF60 8006F360 240F0028 */ li $t7, 40 -/* 06FF64 8006F364 3C01800E */ lui $at, %hi(D_800DD394) # $at, 0x800e -/* 06FF68 8006F368 A42FD394 */ sh $t7, %lo(D_800DD394)($at) -/* 06FF6C 8006F36C 3C018012 */ lui $at, %hi(D_80123524) # $at, 0x8012 -/* 06FF70 8006F370 24180004 */ li $t8, 4 -/* 06FF74 8006F374 A0383524 */ sb $t8, %lo(D_80123524)($at) -.L8006F378: -/* 06FF78 8006F378 8FBF0014 */ lw $ra, 0x14($sp) -/* 06FF7C 8006F37C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06FF80 8006F380 03E00008 */ jr $ra -/* 06FF84 8006F384 00000000 */ nop - diff --git a/asm/non_matchings/unknown_066AA0/func_8006F388.s b/asm/non_matchings/unknown_066AA0/func_8006F388.s deleted file mode 100644 index d664e4fe..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006F388.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006F388 -/* 06FF88 8006F388 3C01800E */ lui $at, 0x800e -/* 06FF8C 8006F38C AFA40000 */ sw $a0, ($sp) -/* 06FF90 8006F390 03E00008 */ jr $ra -/* 06FF94 8006F394 A024D398 */ sb $a0, -0x2c68($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006F42C.s b/asm/non_matchings/unknown_066AA0/func_8006F42C.s deleted file mode 100644 index 5ca0940d..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006F42C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006F42C -/* 07002C 8006F42C 240E0002 */ li $t6, 2 -/* 070030 8006F430 3C01800E */ lui $at, 0x800e -/* 070034 8006F434 03E00008 */ jr $ra -/* 070038 8006F438 A02ED3F0 */ sb $t6, -0x2c10($at) - diff --git a/asm/non_matchings/unknown_066AA0/func_8006F4C8.s b/asm/non_matchings/unknown_066AA0/func_8006F4C8.s deleted file mode 100644 index ee67ffe0..00000000 --- a/asm/non_matchings/unknown_066AA0/func_8006F4C8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8006F4C8 -/* 0700C8 8006F4C8 3C0E800E */ lui $t6, %hi(D_800DD384) # $t6, 0x800e -/* 0700CC 8006F4CC 8DCED384 */ lw $t6, %lo(D_800DD384)($t6) -/* 0700D0 8006F4D0 2401FFFF */ li $at, -1 -/* 0700D4 8006F4D4 15C10003 */ bne $t6, $at, .L8006F4E4 -/* 0700D8 8006F4D8 00001025 */ move $v0, $zero -/* 0700DC 8006F4DC 03E00008 */ jr $ra -/* 0700E0 8006F4E0 24020001 */ li $v0, 1 - -.L8006F4E4: -/* 0700E4 8006F4E4 03E00008 */ jr $ra -/* 0700E8 8006F4E8 00000000 */ nop - diff --git a/src/mips1/unknown_066AA0.c b/src/mips1/unknown_066AA0.c index e8b14785..27761e55 100644 --- a/src/mips1/unknown_066AA0.c +++ b/src/mips1/unknown_066AA0.c @@ -5,6 +5,17 @@ #include "macros.h" extern u32 osTvType; +extern s8 D_800DD318; +extern s32 D_800DD31C; +extern s16 D_800DD328; +extern s32 D_800DD37C; +extern s32 D_800DD384; +extern u8 D_800DD390; +extern s16 D_800DD394; +extern u8 D_800DD398; +extern u8 D_800DD3F0; +extern s32 D_800DD408; +extern s32 D_800DD41C; extern s32 D_80120CE0; extern s32 D_80120CE4; extern f32 D_80120D10; @@ -12,6 +23,20 @@ extern u8 D_80120D14; extern u8 D_80120D15; extern s32 D_80120D18; extern s32 D_801210A0; +extern s32 D_80121164; +extern s32 D_80121168; +extern s32 D_80121170; +extern s32 D_80121174; +extern s32 D_801211C0; +extern s32 D_801234EC; +extern s32 D_801234F4; +extern s32 D_80123510; +extern s8 D_80123515; +extern s8 D_80123516; +extern s32 D_80123518; +extern s32 D_8012351C; +extern u8 D_80123524; +extern u8 D_80123525; GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80065EA0.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066060.s") @@ -138,23 +163,61 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B0F8.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B14C.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B190.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B1D4.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B224.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B240.s") + +void func_8006B224(s32* arg0, s32* arg1) { + *arg0 = D_80121170; + *arg1 = D_80121174; +} + +s32 func_8006B240(void) { + return D_800DD31C; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B250.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BD10.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BD88.s") + +s32 func_8006BD88(void) { + return D_80121164; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BD98.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BDB0.s") + +s32 func_8006BDB0(void) { + return D_80121168; +} + +/* Unused? */ +u8 func_8006BDC0(void) { + return D_80121170 - 1; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BDDC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BEFC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BFC8.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C164.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C18C.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C19C.s") + +void func_8006C164(void) { + func_80071140(D_801211C0); +} + +s32 func_8006C18C(void) { + return D_801211C0; +} + +s8 func_8006C19C(void) { + return D_800DD318; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C1AC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C22C.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C2E4.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C2F0.s") + +void func_8006C2E4(void) { + D_800DD328 = 0; +} + +s16 func_8006C2F0(void) { + return D_800DD328; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C300.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/D_8006C330.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C3E0.s") @@ -163,15 +226,44 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006CAE4.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006CB58.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006CC14.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006CCF0.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006D8A4.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006D8E0.s") + +void func_8006D8A4(void) { + D_800DD390 = 0x2C; + D_80123515 = 0; + func_800945E4(); + func_800C01D8(&D_800DD408); +} + +void func_8006D8E0(s32 arg0) { + D_80123516 = arg0 + 1; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006D8F0.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006D968.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DA0C.s") + +s32 func_8006DA0C(void) { + return D_801234EC; +} + +/* Unused? */ +void func_8006DA1C(s32 arg0) { + D_801234EC = arg0; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DA28.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DB14.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DB20.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DB2C.s") + +void func_8006DB14(s32 arg0) { + D_80123518 = arg0; +} + +void func_8006DB20(s32 arg0) { + D_8012351C = arg0; +} + +s32 func_8006DB2C(void) { + return D_80123518; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DB3C.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DBE4.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006DC58.s") @@ -181,31 +273,107 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E3BC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E5BC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E770.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E994.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EA90.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EAA0.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EAB0.s") + +s32 func_8006EA90(void) { + return D_80123510; +} + +s8 func_8006EAA0(void) { + return D_80123515; +} + +s8 func_8006EAB0(void) { + return D_80123516; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EAC0.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EB14.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EB5C.s") + +s32 func_8006EB14(void) { + return D_801234F4; +} + +/* Unused? */ +void func_8006EB24(void) { + D_800DD37C |= 0x01; +} + +/* Unused? */ +void func_8006EB40(void) { + D_800DD37C |= 0x02; +} + +void func_8006EB5C(void) { + D_800DD37C |= 0x03; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EB78.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EBA8.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EBC4.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EBE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EBFC.s") + +void func_8006EBA8(void) { + D_800DD37C |= 0x08; +} + +void func_8006EBC4(void) { + D_800DD37C |= 0x10; +} + +void func_8006EBE0(void) { + D_800DD37C |= 0x20; +} + +void func_8006EBFC(void) { + D_800DD37C |= 0x30; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EC18.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EC48.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006ECAC.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006ECE0.s") + +void func_8006ECE0(void) { + D_800DD37C |= 0x200; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006ECFC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EFB8.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006EFDC.s") GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F140.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F254.s") + +void func_8006F254(void) { + if (D_800DD394 == 0) { + func_800C01D8(&D_800DD41C); + D_800DD394 = 0x28; + D_80123524 = 2; + } +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F29C.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F338.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F388.s") + +void func_8006F338(s32 arg0) { + if (D_800DD394 == 0) { + D_80123525 = arg0; + func_800C01D8(&D_800DD41C); + D_800DD394 = 0x28; + D_80123524 = 4; + } +} + +void func_8006F388(u8 arg0) { + D_800DD398 = arg0; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F398.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F42C.s") + +void func_8006F42C(void) { + D_800DD3F0 = 2; +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F43C.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F4C8.s") + +s32 func_8006F4C8(void) { + if (D_800DD384 == -1) { + return 1; + } else { + return 0; + } +} + GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006F4EC.s")