diff --git a/asm/non_matchings/unknown_080500/func_800813C0.s b/asm/non_matchings/unknown_080500/func_800813C0.s deleted file mode 100644 index 241a70a8..00000000 --- a/asm/non_matchings/unknown_080500/func_800813C0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_800813C0 -/* 081FC0 800813C0 240E0001 */ li $t6, 1 -/* 081FC4 800813C4 3C01800E */ lui $at, 0x800e -/* 081FC8 800813C8 03E00008 */ jr $ra -/* 081FCC 800813CC AC2EF458 */ sw $t6, -0xba8($at) - diff --git a/asm/non_matchings/unknown_080500/func_80084118.s b/asm/non_matchings/unknown_080500/func_80084118.s deleted file mode 100644 index 861394f9..00000000 --- a/asm/non_matchings/unknown_080500/func_80084118.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80084118 -/* 084D18 80084118 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 084D1C 8008411C AFBF0014 */ sw $ra, 0x14($sp) -/* 084D20 80084120 3C04800E */ lui $a0, %hi(D_800DF7C4) # $a0, 0x800e -/* 084D24 80084124 0C02712A */ jal func_8009C4A8 -/* 084D28 80084128 2484F7C4 */ addiu $a0, %lo(D_800DF7C4) # addiu $a0, $a0, -0x83c -/* 084D2C 8008412C 0C0002F8 */ jal func_80000BE0 -/* 084D30 80084130 24040010 */ li $a0, 16 -/* 084D34 80084134 0C019834 */ jal func_800660D0 -/* 084D38 80084138 00000000 */ nop -/* 084D3C 8008413C 0C03108B */ jal func_800C422C -/* 084D40 80084140 24040002 */ li $a0, 2 -/* 084D44 80084144 0C000224 */ jal func_80000890 -/* 084D48 80084148 24040001 */ li $a0, 1 -/* 084D4C 8008414C 8FBF0014 */ lw $ra, 0x14($sp) -/* 084D50 80084150 27BD0018 */ addiu $sp, $sp, 0x18 -/* 084D54 80084154 03E00008 */ jr $ra -/* 084D58 80084158 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_80084734.s b/asm/non_matchings/unknown_080500/func_80084734.s deleted file mode 100644 index f96e9a0b..00000000 --- a/asm/non_matchings/unknown_080500/func_80084734.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80084734 -/* 085334 80084734 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 085338 80084738 AFBF0014 */ sw $ra, 0x14($sp) -/* 08533C 8008473C 0C03108B */ jal func_800C422C -/* 085340 80084740 24040002 */ li $a0, 2 -/* 085344 80084744 8FBF0014 */ lw $ra, 0x14($sp) -/* 085348 80084748 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08534C 8008474C 03E00008 */ jr $ra -/* 085350 80084750 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800851FC.s b/asm/non_matchings/unknown_080500/func_800851FC.s deleted file mode 100644 index d85faa7c..00000000 --- a/asm/non_matchings/unknown_080500/func_800851FC.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800851FC -/* 085DFC 800851FC 3C048012 */ lui $a0, %hi(D_801269FC) # $a0, 0x8012 -/* 085E00 80085200 8C8469FC */ lw $a0, %lo(D_801269FC)($a0) -/* 085E04 80085204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 085E08 80085208 10800003 */ beqz $a0, .L80085218 -/* 085E0C 8008520C AFBF0014 */ sw $ra, 0x14($sp) -/* 085E10 80085210 0C001223 */ jal func_8000488C -/* 085E14 80085214 00000000 */ nop -.L80085218: -/* 085E18 80085218 3C0E8012 */ lui $t6, %hi(D_801263D8) # $t6, 0x8012 -/* 085E1C 8008521C 8DCE63D8 */ lw $t6, %lo(D_801263D8)($t6) -/* 085E20 80085220 00000000 */ nop -/* 085E24 80085224 05C00009 */ bltz $t6, .L8008524C -/* 085E28 80085228 00000000 */ nop -/* 085E2C 8008522C 0C0002F8 */ jal func_80000BE0 -/* 085E30 80085230 24040018 */ li $a0, 24 -/* 085E34 80085234 0C0002CD */ jal func_80000B34 -/* 085E38 80085238 24040018 */ li $a0, 24 -/* 085E3C 8008523C 0C000326 */ jal func_80000C98 -/* 085E40 80085240 24040100 */ li $a0, 256 -/* 085E44 80085244 0C0002C6 */ jal func_80000B18 -/* 085E48 80085248 00000000 */ nop -.L8008524C: -/* 085E4C 8008524C 3C04800E */ lui $a0, %hi(D_800DFA2C) # $a0, 0x800e -/* 085E50 80085250 0C02712A */ jal func_8009C4A8 -/* 085E54 80085254 2484FA2C */ addiu $a0, %lo(D_800DFA2C) # addiu $a0, $a0, -0x5d4 -/* 085E58 80085258 0C03108B */ jal func_800C422C -/* 085E5C 8008525C 24040002 */ li $a0, 2 -/* 085E60 80085260 8FBF0014 */ lw $ra, 0x14($sp) -/* 085E64 80085264 27BD0018 */ addiu $sp, $sp, 0x18 -/* 085E68 80085268 03E00008 */ jr $ra -/* 085E6C 8008526C 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800887C4.s b/asm/non_matchings/unknown_080500/func_800887C4.s deleted file mode 100644 index f71aba35..00000000 --- a/asm/non_matchings/unknown_080500/func_800887C4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800887C4 -/* 0893C4 800887C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0893C8 800887C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0893CC 800887CC 3C04800E */ lui $a0, %hi(D_800DF7C4) # $a0, 0x800e -/* 0893D0 800887D0 0C02712A */ jal func_8009C4A8 -/* 0893D4 800887D4 2484F7C4 */ addiu $a0, %lo(D_800DF7C4) # addiu $a0, $a0, -0x83c -/* 0893D8 800887D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0893DC 800887DC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0893E0 800887E0 03E00008 */ jr $ra -/* 0893E4 800887E4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800895A4.s b/asm/non_matchings/unknown_080500/func_800895A4.s deleted file mode 100644 index 12b81908..00000000 --- a/asm/non_matchings/unknown_080500/func_800895A4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800895A4 -/* 08A1A4 800895A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08A1A8 800895A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 08A1AC 800895AC 0C027142 */ jal func_8009C508 -/* 08A1B0 800895B0 2404003F */ li $a0, 63 -/* 08A1B4 800895B4 3C048012 */ lui $a0, %hi(D_80126AA0) # $a0, 0x8012 -/* 08A1B8 800895B8 8C846AA0 */ lw $a0, %lo(D_80126AA0)($a0) -/* 08A1BC 800895BC 0C01C450 */ jal func_80071140 -/* 08A1C0 800895C0 00000000 */ nop -/* 08A1C4 800895C4 0C03108B */ jal func_800C422C -/* 08A1C8 800895C8 24040002 */ li $a0, 2 -/* 08A1CC 800895CC 8FBF0014 */ lw $ra, 0x14($sp) -/* 08A1D0 800895D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08A1D4 800895D4 03E00008 */ jr $ra -/* 08A1D8 800895D8 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8008A4C8.s b/asm/non_matchings/unknown_080500/func_8008A4C8.s deleted file mode 100644 index f2b47328..00000000 --- a/asm/non_matchings/unknown_080500/func_8008A4C8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8008A4C8 -/* 08B0C8 8008A4C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08B0CC 8008A4CC AFBF0014 */ sw $ra, 0x14($sp) -/* 08B0D0 8008A4D0 0C03108B */ jal func_800C422C -/* 08B0D4 8008A4D4 24040002 */ li $a0, 2 -/* 08B0D8 8008A4D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 08B0DC 8008A4DC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08B0E0 8008A4E0 03E00008 */ jr $ra -/* 08B0E4 8008A4E4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8008AD1C.s b/asm/non_matchings/unknown_080500/func_8008AD1C.s deleted file mode 100644 index 75c658e9..00000000 --- a/asm/non_matchings/unknown_080500/func_8008AD1C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8008AD1C -/* 08B91C 8008AD1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08B920 8008AD20 AFBF0014 */ sw $ra, 0x14($sp) -/* 08B924 8008AD24 0C027142 */ jal func_8009C508 -/* 08B928 8008AD28 2404003F */ li $a0, 63 -/* 08B92C 8008AD2C 0C03108B */ jal func_800C422C -/* 08B930 8008AD30 24040002 */ li $a0, 2 -/* 08B934 8008AD34 8FBF0014 */ lw $ra, 0x14($sp) -/* 08B938 8008AD38 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08B93C 8008AD3C 03E00008 */ jr $ra -/* 08B940 8008AD40 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8008C128.s b/asm/non_matchings/unknown_080500/func_8008C128.s deleted file mode 100644 index 0be18292..00000000 --- a/asm/non_matchings/unknown_080500/func_8008C128.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8008C128 -/* 08CD28 8008C128 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08CD2C 8008C12C AFBF0014 */ sw $ra, 0x14($sp) -/* 08CD30 8008C130 3C04800E */ lui $a0, %hi(D_800DFDC8) # $a0, 0x800e -/* 08CD34 8008C134 0C02712A */ jal func_8009C4A8 -/* 08CD38 8008C138 2484FDC8 */ addiu $a0, %lo(D_800DFDC8) # addiu $a0, $a0, -0x238 -/* 08CD3C 8008C13C 0C01C42C */ jal func_800710B0 -/* 08CD40 8008C140 00002025 */ move $a0, $zero -/* 08CD44 8008C144 0C03108B */ jal func_800C422C -/* 08CD48 8008C148 24040002 */ li $a0, 2 -/* 08CD4C 8008C14C 0C01C42C */ jal func_800710B0 -/* 08CD50 8008C150 24040002 */ li $a0, 2 -/* 08CD54 8008C154 8FBF0014 */ lw $ra, 0x14($sp) -/* 08CD58 8008C158 3C01800E */ lui $at, %hi(D_800DFFD0) # $at, 0x800e -/* 08CD5C 8008C15C AC20FFD0 */ sw $zero, %lo(D_800DFFD0)($at) -/* 08CD60 8008C160 03E00008 */ jr $ra -/* 08CD64 8008C164 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/unknown_080500/func_8008C4E8.s b/asm/non_matchings/unknown_080500/func_8008C4E8.s deleted file mode 100644 index 7ba731e2..00000000 --- a/asm/non_matchings/unknown_080500/func_8008C4E8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8008C4E8 -/* 08D0E8 8008C4E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08D0EC 8008C4EC AFBF0014 */ sw $ra, 0x14($sp) -/* 08D0F0 8008C4F0 0C03108B */ jal func_800C422C -/* 08D0F4 8008C4F4 24040002 */ li $a0, 2 -/* 08D0F8 8008C4F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 08D0FC 8008C4FC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08D100 8008C500 03E00008 */ jr $ra -/* 08D104 8008C504 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8008CACC.s b/asm/non_matchings/unknown_080500/func_8008CACC.s deleted file mode 100644 index 328eecc8..00000000 --- a/asm/non_matchings/unknown_080500/func_8008CACC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8008CACC -/* 08D6CC 8008CACC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08D6D0 8008CAD0 AFBF0014 */ sw $ra, 0x14($sp) -/* 08D6D4 8008CAD4 0C03108B */ jal func_800C422C -/* 08D6D8 8008CAD8 24040002 */ li $a0, 2 -/* 08D6DC 8008CADC 0C01FFE2 */ jal func_8007FF88 -/* 08D6E0 8008CAE0 00000000 */ nop -/* 08D6E4 8008CAE4 0C027142 */ jal func_8009C508 -/* 08D6E8 8008CAE8 24040043 */ li $a0, 67 -/* 08D6EC 8008CAEC 8FBF0014 */ lw $ra, 0x14($sp) -/* 08D6F0 8008CAF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08D6F4 8008CAF4 03E00008 */ jr $ra -/* 08D6F8 8008CAF8 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8008E428.s b/asm/non_matchings/unknown_080500/func_8008E428.s deleted file mode 100644 index 5a3cc7d7..00000000 --- a/asm/non_matchings/unknown_080500/func_8008E428.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8008E428 -/* 08F028 8008E428 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 08F02C 8008E42C AFBF0014 */ sw $ra, 0x14($sp) -/* 08F030 8008E430 3C04800E */ lui $a0, %hi(D_800E0398) # $a0, 0x800e -/* 08F034 8008E434 0C02712A */ jal func_8009C4A8 -/* 08F038 8008E438 24840398 */ addiu $a0, %lo(D_800E0398) # addiu $a0, $a0, 0x398 -/* 08F03C 8008E43C 0C01FFE2 */ jal func_8007FF88 -/* 08F040 8008E440 00000000 */ nop -/* 08F044 8008E444 0C03108B */ jal func_800C422C -/* 08F048 8008E448 24040002 */ li $a0, 2 -/* 08F04C 8008E44C 8FBF0014 */ lw $ra, 0x14($sp) -/* 08F050 8008E450 27BD0018 */ addiu $sp, $sp, 0x18 -/* 08F054 8008E454 03E00008 */ jr $ra -/* 08F058 8008E458 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_80093A0C.s b/asm/non_matchings/unknown_080500/func_80093A0C.s deleted file mode 100644 index cc0c48f4..00000000 --- a/asm/non_matchings/unknown_080500/func_80093A0C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80093A0C -/* 09460C 80093A0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 094610 80093A10 AFBF0014 */ sw $ra, 0x14($sp) -/* 094614 80093A14 3C04800E */ lui $a0, %hi(D_800E0FB4) # $a0, 0x800e -/* 094618 80093A18 0C02712A */ jal func_8009C4A8 -/* 09461C 80093A1C 24840FB4 */ addiu $a0, %lo(D_800E0FB4) # addiu $a0, $a0, 0xfb4 -/* 094620 80093A20 0C03108B */ jal func_800C422C -/* 094624 80093A24 24040002 */ li $a0, 2 -/* 094628 80093A28 0C0002CA */ jal func_80000B28 -/* 09462C 80093A2C 00000000 */ nop -/* 094630 80093A30 8FBF0014 */ lw $ra, 0x14($sp) -/* 094634 80093A34 27BD0018 */ addiu $sp, $sp, 0x18 -/* 094638 80093A38 03E00008 */ jr $ra -/* 09463C 80093A3C 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800945B0.s b/asm/non_matchings/unknown_080500/func_800945B0.s deleted file mode 100644 index b1ed2594..00000000 --- a/asm/non_matchings/unknown_080500/func_800945B0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800945B0 -/* 0951B0 800945B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0951B4 800945B4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0951B8 800945B8 0C01C8A6 */ jal func_80072298 -/* 0951BC 800945BC 24040001 */ li $a0, 1 -/* 0951C0 800945C0 0C031588 */ jal func_800C5620 -/* 0951C4 800945C4 24040007 */ li $a0, 7 -/* 0951C8 800945C8 0C031525 */ jal func_800C5494 -/* 0951CC 800945CC 24040007 */ li $a0, 7 -/* 0951D0 800945D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0951D4 800945D4 3C01800E */ lui $at, %hi(D_800E0984) # $at, 0x800e -/* 0951D8 800945D8 AC200984 */ sw $zero, %lo(D_800E0984)($at) -/* 0951DC 800945DC 03E00008 */ jr $ra -/* 0951E0 800945E0 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/unknown_080500/func_800945E4.s b/asm/non_matchings/unknown_080500/func_800945E4.s deleted file mode 100644 index 28713b2b..00000000 --- a/asm/non_matchings/unknown_080500/func_800945E4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800945E4 -/* 0951E4 800945E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0951E8 800945E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0951EC 800945EC 0C02516C */ jal func_800945B0 -/* 0951F0 800945F0 00000000 */ nop -/* 0951F4 800945F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0951F8 800945F8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0951FC 800945FC 03E00008 */ jr $ra -/* 095200 80094600 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800976CC.s b/asm/non_matchings/unknown_080500/func_800976CC.s deleted file mode 100644 index d776a7d3..00000000 --- a/asm/non_matchings/unknown_080500/func_800976CC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800976CC -/* 0982CC 800976CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0982D0 800976D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 0982D4 800976D4 3C04800E */ lui $a0, %hi(D_800E0A24) # $a0, 0x800e -/* 0982D8 800976D8 0C02712A */ jal func_8009C4A8 -/* 0982DC 800976DC 24840A24 */ addiu $a0, %lo(D_800E0A24) # addiu $a0, $a0, 0xa24 -/* 0982E0 800976E0 0C03108B */ jal func_800C422C -/* 0982E4 800976E4 24040002 */ li $a0, 2 -/* 0982E8 800976E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0982EC 800976EC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0982F0 800976F0 03E00008 */ jr $ra -/* 0982F4 800976F4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800981E8.s b/asm/non_matchings/unknown_080500/func_800981E8.s deleted file mode 100644 index d07b4642..00000000 --- a/asm/non_matchings/unknown_080500/func_800981E8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800981E8 -/* 098DE8 800981E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 098DEC 800981EC AFBF0014 */ sw $ra, 0x14($sp) -/* 098DF0 800981F0 0C03108B */ jal func_800C422C -/* 098DF4 800981F4 24040002 */ li $a0, 2 -/* 098DF8 800981F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 098DFC 800981FC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 098E00 80098200 03E00008 */ jr $ra -/* 098E04 80098204 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_80098754.s b/asm/non_matchings/unknown_080500/func_80098754.s deleted file mode 100644 index 22e3298e..00000000 --- a/asm/non_matchings/unknown_080500/func_80098754.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80098754 -/* 099354 80098754 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 099358 80098758 AFBF0014 */ sw $ra, 0x14($sp) -/* 09935C 8009875C 0C03108B */ jal func_800C422C -/* 099360 80098760 24040002 */ li $a0, 2 -/* 099364 80098764 8FBF0014 */ lw $ra, 0x14($sp) -/* 099368 80098768 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09936C 8009876C 03E00008 */ jr $ra -/* 099370 80098770 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_80099600.s b/asm/non_matchings/unknown_080500/func_80099600.s deleted file mode 100644 index 14776433..00000000 --- a/asm/non_matchings/unknown_080500/func_80099600.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80099600 -/* 09A200 80099600 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09A204 80099604 AFBF0014 */ sw $ra, 0x14($sp) -/* 09A208 80099608 3C04800E */ lui $a0, %hi(D_800E1024) # $a0, 0x800e -/* 09A20C 8009960C 0C02712A */ jal func_8009C4A8 -/* 09A210 80099610 24841024 */ addiu $a0, %lo(D_800E1024) # addiu $a0, $a0, 0x1024 -/* 09A214 80099614 0C03108B */ jal func_800C422C -/* 09A218 80099618 24040002 */ li $a0, 2 -/* 09A21C 8009961C 8FBF0014 */ lw $ra, 0x14($sp) -/* 09A220 80099620 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09A224 80099624 03E00008 */ jr $ra -/* 09A228 80099628 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009962C.s b/asm/non_matchings/unknown_080500/func_8009962C.s deleted file mode 100644 index 7da75b4a..00000000 --- a/asm/non_matchings/unknown_080500/func_8009962C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8009962C -/* 09A22C 8009962C 3C02800E */ lui $v0, %hi(D_800E0FE8) # $v0, 0x800e -/* 09A230 80099630 8C420FE8 */ lw $v0, %lo(D_800E0FE8)($v0) -/* 09A234 80099634 03E00008 */ jr $ra -/* 09A238 80099638 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009ABAC.s b/asm/non_matchings/unknown_080500/func_8009ABAC.s deleted file mode 100644 index b6ef0a7b..00000000 --- a/asm/non_matchings/unknown_080500/func_8009ABAC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8009ABAC -/* 09B7AC 8009ABAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09B7B0 8009ABB0 AFBF0014 */ sw $ra, 0x14($sp) -/* 09B7B4 8009ABB4 3C04800E */ lui $a0, %hi(D_800E1708) # $a0, 0x800e -/* 09B7B8 8009ABB8 0C02712A */ jal func_8009C4A8 -/* 09B7BC 8009ABBC 24841708 */ addiu $a0, %lo(D_800E1708) # addiu $a0, $a0, 0x1708 -/* 09B7C0 8009ABC0 0C03108B */ jal func_800C422C -/* 09B7C4 8009ABC4 24040002 */ li $a0, 2 -/* 09B7C8 8009ABC8 8FBF0014 */ lw $ra, 0x14($sp) -/* 09B7CC 8009ABCC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09B7D0 8009ABD0 03E00008 */ jr $ra -/* 09B7D4 8009ABD4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009AF18.s b/asm/non_matchings/unknown_080500/func_8009AF18.s deleted file mode 100644 index e48337ba..00000000 --- a/asm/non_matchings/unknown_080500/func_8009AF18.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8009AF18 -/* 09BB18 8009AF18 3C0E8012 */ lui $t6, %hi(D_80126804) # $t6, 0x8012 -/* 09BB1C 8009AF1C 8DCE6804 */ lw $t6, %lo(D_80126804)($t6) -/* 09BB20 8009AF20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09BB24 8009AF24 11C00004 */ beqz $t6, .L8009AF38 -/* 09BB28 8009AF28 AFBF0014 */ sw $ra, 0x14($sp) -/* 09BB2C 8009AF2C 3C04800E */ lui $a0, %hi(D_800E1768) # $a0, 0x800e -/* 09BB30 8009AF30 0C02712A */ jal func_8009C4A8 -/* 09BB34 8009AF34 24841768 */ addiu $a0, %lo(D_800E1768) # addiu $a0, $a0, 0x1768 -.L8009AF38: -/* 09BB38 8009AF38 8FBF0014 */ lw $ra, 0x14($sp) -/* 09BB3C 8009AF3C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 09BB40 8009AF40 03E00008 */ jr $ra -/* 09BB44 8009AF44 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009BCF0.s b/asm/non_matchings/unknown_080500/func_8009BCF0.s deleted file mode 100644 index f037db41..00000000 --- a/asm/non_matchings/unknown_080500/func_8009BCF0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8009BCF0 -/* 09C8F0 8009BCF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 09C8F4 8009BCF4 AFBF001C */ sw $ra, 0x1c($sp) -/* 09C8F8 8009BCF8 0C0002F8 */ jal func_80000BE0 -/* 09C8FC 8009BCFC 24040012 */ li $a0, 18 -/* 09C900 8009BD00 0C030060 */ jal func_800C0180 -/* 09C904 8009BD04 00000000 */ nop -/* 09C908 8009BD08 00002025 */ move $a0, $zero -/* 09C90C 8009BD0C 0C019A25 */ jal func_80066894 -/* 09C910 8009BD10 00002825 */ move $a1, $zero -/* 09C914 8009BD14 340E8000 */ li $t6, 32768 -/* 09C918 8009BD18 AFAE0010 */ sw $t6, 0x10($sp) -/* 09C91C 8009BD1C 00002025 */ move $a0, $zero -/* 09C920 8009BD20 34058000 */ li $a1, 32768 -/* 09C924 8009BD24 34068000 */ li $a2, 32768 -/* 09C928 8009BD28 0C019AAA */ jal func_80066AA8 -/* 09C92C 8009BD2C 34078000 */ li $a3, 32768 -/* 09C930 8009BD30 3C04800E */ lui $a0, %hi(D_800E17D8) # $a0, 0x800e -/* 09C934 8009BD34 0C02712A */ jal func_8009C4A8 -/* 09C938 8009BD38 248417D8 */ addiu $a0, %lo(D_800E17D8) # addiu $a0, $a0, 0x17d8 -/* 09C93C 8009BD3C 0C03108B */ jal func_800C422C -/* 09C940 8009BD40 24040002 */ li $a0, 2 -/* 09C944 8009BD44 0C01BD59 */ jal func_8006F564 -/* 09C948 8009BD48 00002025 */ move $a0, $zero -/* 09C94C 8009BD4C 8FBF001C */ lw $ra, 0x1c($sp) -/* 09C950 8009BD50 27BD0020 */ addiu $sp, $sp, 0x20 -/* 09C954 8009BD54 03E00008 */ jr $ra -/* 09C958 8009BD58 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009BE5C.s b/asm/non_matchings/unknown_080500/func_8009BE5C.s deleted file mode 100644 index 8edb053c..00000000 --- a/asm/non_matchings/unknown_080500/func_8009BE5C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_8009BE5C -/* 09CA5C 8009BE5C 3C018012 */ lui $at, %hi(D_8012645C) # $at, 0x8012 -/* 09CA60 8009BE60 A020645C */ sb $zero, %lo(D_8012645C)($at) -/* 09CA64 8009BE64 3C018012 */ lui $at, %hi(D_80126464) # $at, 0x8012 -/* 09CA68 8009BE68 A0206464 */ sb $zero, %lo(D_80126464)($at) -/* 09CA6C 8009BE6C 3C018012 */ lui $at, %hi(D_80126454) # $at, 0x8012 -/* 09CA70 8009BE70 A0206454 */ sb $zero, %lo(D_80126454)($at) -/* 09CA74 8009BE74 3C018012 */ lui $at, %hi(D_80126458) # $at, 0x8012 -/* 09CA78 8009BE78 A0206458 */ sb $zero, %lo(D_80126458)($at) -/* 09CA7C 8009BE7C 3C018012 */ lui $at, %hi(D_80126468) # $at, 0x8012 -/* 09CA80 8009BE80 A0206468 */ sb $zero, %lo(D_80126468)($at) -/* 09CA84 8009BE84 3C018012 */ lui $at, %hi(D_8012646C) # $at, 0x8012 -/* 09CA88 8009BE88 A020646C */ sb $zero, %lo(D_8012646C)($at) -/* 09CA8C 8009BE8C 3C018012 */ lui $at, %hi(D_8012645D) # $at, 0x8012 -/* 09CA90 8009BE90 A020645D */ sb $zero, %lo(D_8012645D)($at) -/* 09CA94 8009BE94 3C018012 */ lui $at, %hi(D_80126465) # $at, 0x8012 -/* 09CA98 8009BE98 A0206465 */ sb $zero, %lo(D_80126465)($at) -/* 09CA9C 8009BE9C 3C018012 */ lui $at, %hi(D_80126455) # $at, 0x8012 -/* 09CAA0 8009BEA0 A0206455 */ sb $zero, %lo(D_80126455)($at) -/* 09CAA4 8009BEA4 3C018012 */ lui $at, %hi(D_80126459) # $at, 0x8012 -/* 09CAA8 8009BEA8 A0206459 */ sb $zero, %lo(D_80126459)($at) -/* 09CAAC 8009BEAC 3C018012 */ lui $at, %hi(D_80126469) # $at, 0x8012 -/* 09CAB0 8009BEB0 A0206469 */ sb $zero, %lo(D_80126469)($at) -/* 09CAB4 8009BEB4 3C018012 */ lui $at, %hi(D_8012646D) # $at, 0x8012 -/* 09CAB8 8009BEB8 A020646D */ sb $zero, %lo(D_8012646D)($at) -/* 09CABC 8009BEBC 3C018012 */ lui $at, %hi(D_8012645E) # $at, 0x8012 -/* 09CAC0 8009BEC0 A020645E */ sb $zero, %lo(D_8012645E)($at) -/* 09CAC4 8009BEC4 3C018012 */ lui $at, %hi(D_80126466) # $at, 0x8012 -/* 09CAC8 8009BEC8 A0206466 */ sb $zero, %lo(D_80126466)($at) -/* 09CACC 8009BECC 3C018012 */ lui $at, %hi(D_80126456) # $at, 0x8012 -/* 09CAD0 8009BED0 A0206456 */ sb $zero, %lo(D_80126456)($at) -/* 09CAD4 8009BED4 3C018012 */ lui $at, %hi(D_8012645A) # $at, 0x8012 -/* 09CAD8 8009BED8 A020645A */ sb $zero, %lo(D_8012645A)($at) -/* 09CADC 8009BEDC 3C018012 */ lui $at, %hi(D_8012646A) # $at, 0x8012 -/* 09CAE0 8009BEE0 A020646A */ sb $zero, %lo(D_8012646A)($at) -/* 09CAE4 8009BEE4 3C018012 */ lui $at, %hi(D_8012646E) # $at, 0x8012 -/* 09CAE8 8009BEE8 A020646E */ sb $zero, %lo(D_8012646E)($at) -/* 09CAEC 8009BEEC 3C018012 */ lui $at, %hi(D_8012645F) # $at, 0x8012 -/* 09CAF0 8009BEF0 A020645F */ sb $zero, %lo(D_8012645F)($at) -/* 09CAF4 8009BEF4 3C018012 */ lui $at, %hi(D_80126467) # $at, 0x8012 -/* 09CAF8 8009BEF8 A0206467 */ sb $zero, %lo(D_80126467)($at) -/* 09CAFC 8009BEFC 3C018012 */ lui $at, %hi(D_80126457) # $at, 0x8012 -/* 09CB00 8009BF00 A0206457 */ sb $zero, %lo(D_80126457)($at) -/* 09CB04 8009BF04 3C018012 */ lui $at, %hi(D_8012645B) # $at, 0x8012 -/* 09CB08 8009BF08 A020645B */ sb $zero, %lo(D_8012645B)($at) -/* 09CB0C 8009BF0C 3C018012 */ lui $at, %hi(D_8012646B) # $at, 0x8012 -/* 09CB10 8009BF10 A020646B */ sb $zero, %lo(D_8012646B)($at) -/* 09CB14 8009BF14 3C018012 */ lui $at, 0x8012 -/* 09CB18 8009BF18 03E00008 */ jr $ra -/* 09CB1C 8009BF1C A020646F */ sb $zero, 0x646f($at) - diff --git a/asm/non_matchings/unknown_080500/func_8009C1A0.s b/asm/non_matchings/unknown_080500/func_8009C1A0.s deleted file mode 100644 index 7dcaafb1..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C1A0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8009C1A0 -/* 09CDA0 8009C1A0 3C02800E */ lui $v0, %hi(D_800DF4CC) # $v0, 0x800e -/* 09CDA4 8009C1A4 8C42F4CC */ lw $v0, %lo(D_800DF4CC)($v0) -/* 09CDA8 8009C1A8 03E00008 */ jr $ra -/* 09CDAC 8009C1AC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009C2D0.s b/asm/non_matchings/unknown_080500/func_8009C2D0.s deleted file mode 100644 index f8eaddc6..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C2D0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8009C2D0 -/* 09CED0 8009C2D0 3C02800E */ lui $v0, %hi(D_800DF4B8) # $v0, 0x800e -/* 09CED4 8009C2D4 8C42F4B8 */ lw $v0, %lo(D_800DF4B8)($v0) -/* 09CED8 8009C2D8 03E00008 */ jr $ra -/* 09CEDC 8009C2DC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009C3C8.s b/asm/non_matchings/unknown_080500/func_8009C3C8.s deleted file mode 100644 index 9c4ee2b9..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C3C8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8009C3C8 -/* 09CFC8 8009C3C8 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 09CFCC 8009C3CC 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) -/* 09CFD0 8009C3D0 03E00008 */ jr $ra -/* 09CFD4 8009C3D4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009E9A0.s b/asm/non_matchings/unknown_080500/func_8009E9A0.s deleted file mode 100644 index 7d23fb32..00000000 --- a/asm/non_matchings/unknown_080500/func_8009E9A0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8009E9A0 -/* 09F5A0 8009E9A0 03E00008 */ jr $ra -/* 09F5A4 8009E9A4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009E9A8.s b/asm/non_matchings/unknown_080500/func_8009E9A8.s deleted file mode 100644 index 91304694..00000000 --- a/asm/non_matchings/unknown_080500/func_8009E9A8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8009E9A8 -/* 09F5A8 8009E9A8 03E00008 */ jr $ra -/* 09F5AC 8009E9AC 00000000 */ nop - diff --git a/src/mips1/unknown_080500.c b/src/mips1/unknown_080500.c index a175d87e..3af4f88b 100644 --- a/src/mips1/unknown_080500.c +++ b/src/mips1/unknown_080500.c @@ -4,9 +4,55 @@ #include "types.h" #include "macros.h" +extern u8 D_80126454; +extern u8 D_80126455; +extern u8 D_80126456; +extern u8 D_80126457; +extern u8 D_80126458; +extern u8 D_80126459; +extern u8 D_8012645A; +extern u8 D_8012645B; +extern u8 D_8012645C; +extern u8 D_8012645D; +extern u8 D_8012645E; +extern u8 D_8012645F; +extern u8 D_80126464; +extern u8 D_80126465; +extern u8 D_80126466; +extern u8 D_80126467; +extern u8 D_80126468; +extern u8 D_80126469; +extern u8 D_8012646A; +extern u8 D_8012646B; +extern u8 D_8012646C; +extern u8 D_8012646D; +extern u8 D_8012646E; +extern u8 D_8012646F; + +extern s32 D_800DF458; extern s32 D_800DF494; extern s32 gActiveMagicCodes; +extern s32 D_800DF4B8; +extern s32 D_800DF4BC; extern s32 D_800DF4C0; +extern s32 D_800DF4CC; +extern s32 D_800DF7C4; +extern s32 D_800DFA2C; +extern s32 D_800DFDC8; +extern s32 D_800DFFD0; +extern s32 D_800E0398; +extern s32 D_800E0984; +extern s32 D_800E0A24; +extern s32 D_800E0FB4; +extern s32 D_800E0FE8; +extern s32 D_800E1024; +extern s32 D_800E1708; +extern s32 D_800E1768; +extern s32 D_800E17D8; +extern s32 D_801263D8; +extern s32 D_80126804; +extern s32 D_801269FC; +extern s32 D_80126AA0; GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007F900.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007FF88.s") @@ -16,7 +62,11 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80080BC8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80080E6C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80080E90.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80081218.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800813C0.s") + +void func_800813C0(void) { + D_800DF458 = 1; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLoop.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80081800.s") @@ -33,15 +83,41 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80083098.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTitleScreenInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008377C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80084118.s") + +void func_80084118(void) { + func_8009C4A8(&D_800DF7C4); + func_80000BE0(0x10); + func_800660D0(); + func_800C422C(2); + func_80000890(1); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800841B8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80084734.s") + +void func_80084734(void) { + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuAudioOptionsInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80084854.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuAudioOptionsLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800851FC.s") + +void func_800851FC(void) { + if (D_801269FC != 0) { + func_8000488C(D_801269FC); + } + if (D_801263D8 >= 0) { + func_80000BE0(0x18); + func_80000B34(0x18); + func_80000C98(0x100); + func_80000B18(); + } + func_8009C4A8(&D_800DFA2C); + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuSaveOptionsInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800853D0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80085B9C.s") @@ -62,20 +138,39 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80087F14.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008832C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuBootInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuBootLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800887C4.s") + +void func_800887C4(void) { + func_8009C4A8(&D_800DF7C4); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800887E8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80088938.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800890AC.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800895A4.s") + +void func_800895A4(void) { + func_8009C508(0x3F); + func_80071140(D_80126AA0); + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuMagicCodesInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800896A4.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008A4C8.s") + +void func_8008A4C8(void) { + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuMagicCodesListInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008A56C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008A8F8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuMagicCodesListLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008AD1C.s") + +void func_8008AD1C(void) { + func_8009C508(0x3F); + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008AD44.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008AEB4.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008AF00.s") @@ -87,15 +182,33 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008B758.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008BB3C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008BFE8.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008C128.s") + +void func_8008C128(void) { + func_8009C4A8(&D_800DFDC8); + func_800710B0(0); + func_800C422C(2); + func_800710B0(2); + D_800DFFD0 = 0; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008C168.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCautionInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCautionLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008C4E8.s") + +void func_8008C4E8(void) { + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGameSelectInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008C698.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuFileSelectLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008CACC.s") + +void func_8008CACC(void) { + func_800C422C(2); + func_8007FF88(); + func_8009C508(0x43); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuFileSelectInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008CC28.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008CD74.s") @@ -103,7 +216,13 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008D5F8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008D8BC.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008DC7C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGameSelectLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E428.s") + +void func_8008E428(void) { + func_8009C4A8(&D_800E0398); + func_8007FF88(); + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E45C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E4B0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008E4EC.s") @@ -123,12 +242,28 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80092BE0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80092E94.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80093A0C.s") + +void func_80093A0C(void) { + func_8009C4A8(&D_800E0FB4); + func_800C422C(2); + func_80000B28(); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80093A40.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80093D40.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094170.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800945B0.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800945E4.s") + +void func_800945B0(void) { + func_80072298(1); + func_800C5620(7); + func_800C5494(7); + D_800E0984 = 0; +} + +void func_800945E4(void) { + func_800945B0(); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094604.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094688.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80094A5C.s") @@ -140,53 +275,133 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80096790.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Init.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80096978.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Loop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800976CC.s") + +void func_800976CC(void) { + func_8009C4A8(&D_800E0A24); + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800976F8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097744.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800977D0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097874.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097918.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80097D10.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800981E8.s") + +void func_800981E8(void) { + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80098208.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800983C0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80098754.s") + +void func_80098754(void) { + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80098774.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80098EBC.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80099600.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009962C.s") + +void func_80099600(void) { + func_8009C4A8(&D_800E1024); + func_800C422C(2); +} + +s32 func_8009962C(void) { + return D_800E0FE8; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009963C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800998E0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGhostDataInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80099E8C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGhostDataLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009ABAC.s") + +void func_8009ABAC(void) { + func_8009C4A8(&D_800E1708); + func_800C422C(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009ABD8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu17Init.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu17Loop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009AF18.s") + +void func_8009AF18(void) { + if (D_80126804 != 0) { + func_8009C4A8(&D_800E1768); + } +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCreditsInit.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009B1E4.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCreditsLoop.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009BCF0.s") + +void func_8009BCF0(void) { + func_80000BE0(0x12); + func_800C0180(); + func_80066894(0, 0); + func_80066AA8(0, 0x8000, 0x8000, 0x8000, 0x8000); + func_8009C4A8(&D_800E17D8); + func_800C422C(2); + func_8006F564(0); +} GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009BD5C.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009BE5C.s") + +void func_8009BE5C(void) { + D_8012645C = 0; + D_80126464 = 0; + D_80126454 = 0; + D_80126458 = 0; + D_80126468 = 0; + D_8012646C = 0; + D_8012645D = 0; + D_80126465 = 0; + D_80126455 = 0; + D_80126459 = 0; + D_80126469 = 0; + D_8012646D = 0; + D_8012645E = 0; + D_80126466 = 0; + D_80126456 = 0; + D_8012645A = 0; + D_8012646A = 0; + D_8012646E = 0; + D_8012645F = 0; + D_80126467 = 0; + D_80126457 = 0; + D_8012645B = 0; + D_8012646B = 0; + D_8012646F = 0; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009BF20.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C154.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C1A0.s") + +s32 func_8009C1A0(void) { + return D_800DF4CC; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C1B0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C228.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C250.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C274.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C280.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C2D0.s") + +s32 func_8009C2D0(void) { + return D_800DF4B8; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C2E0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C30C.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C3C8.s") + +s32 func_8009C3C8(void) { + return D_800DF4BC; +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C3D8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C440.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C490.s") @@ -211,8 +426,15 @@ GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D9F4.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009DB3C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009E3D0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009E7E8.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009E9A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009E9A8.s") + +void func_8009E9A0(void) { + +} + +void func_8009E9A8(void) { + +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009E9B0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009EA6C.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009EA78.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index 1b4bcf15..c5578c0a 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2366,6 +2366,7 @@ D_8012646B = 0x8012646B; D_8012646C = 0x8012646C; D_8012646D = 0x8012646D; D_8012646E = 0x8012646E; +D_8012646F = 0x8012646F; D_80126470 = 0x80126470; D_80126474 = 0x80126474; D_80126478 = 0x80126478;