diff --git a/asm/non_matchings/unknown_080500/Menu11Init.s b/asm/non_matchings/unknown_080500/Menu11Init.s deleted file mode 100644 index 3edd8d30..00000000 --- a/asm/non_matchings/unknown_080500/Menu11Init.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel Menu11Init -/* 097448 80096848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 09744C 8009684C AFBF0014 */ sw $ra, 0x14($sp) -/* 097450 80096850 0C01BAA4 */ jal get_settings -/* 097454 80096854 00000000 */ nop -/* 097458 80096858 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 09745C 8009685C 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 097460 80096860 3C048012 */ lui $a0, %hi(D_80126BF0) # $a0, 0x8012 -/* 097464 80096864 8C6E0060 */ lw $t6, 0x60($v1) -/* 097468 80096868 24846BF0 */ addiu $a0, %lo(D_80126BF0) # addiu $a0, $a0, 0x6bf0 -/* 09746C 8009686C AC8E0000 */ sw $t6, ($a0) -/* 097470 80096870 8C6F005C */ lw $t7, 0x5c($v1) -/* 097474 80096874 3C07800E */ lui $a3, %hi(D_800DF4BC) # $a3, 0x800e -/* 097478 80096878 AC8F0004 */ sw $t7, 4($a0) -/* 09747C 8009687C 8C780070 */ lw $t8, 0x70($v1) -/* 097480 80096880 24190003 */ li $t9, 3 -/* 097484 80096884 AC980008 */ sw $t8, 8($a0) -/* 097488 80096888 8CE7F4BC */ lw $a3, %lo(D_800DF4BC)($a3) -/* 09748C 8009688C 3C018012 */ lui $at, %hi(D_80126C14) # $at, 0x8012 -/* 097490 80096890 AC396C14 */ sw $t9, %lo(D_80126C14)($at) -/* 097494 80096894 18E00011 */ blez $a3, .L800968DC -/* 097498 80096898 00002825 */ move $a1, $zero -/* 09749C 8009689C 00402025 */ move $a0, $v0 -.L800968A0: -/* 0974A0 800968A0 8086005A */ lb $a2, 0x5a($a0) -/* 0974A4 800968A4 24A50001 */ addiu $a1, $a1, 1 -/* 0974A8 800968A8 28C10004 */ slti $at, $a2, 4 -/* 0974AC 800968AC 10200008 */ beqz $at, .L800968D0 -/* 0974B0 800968B0 00064040 */ sll $t0, $a2, 1 -/* 0974B4 800968B4 00881821 */ addu $v1, $a0, $t0 -/* 0974B8 800968B8 9469005C */ lhu $t1, 0x5c($v1) -/* 0974BC 800968BC 3C07800E */ lui $a3, %hi(D_800DF4BC) # $a3, 0x800e -/* 0974C0 800968C0 252A0001 */ addiu $t2, $t1, 1 -/* 0974C4 800968C4 A46A005C */ sh $t2, 0x5c($v1) -/* 0974C8 800968C8 8CE7F4BC */ lw $a3, %lo(D_800DF4BC)($a3) -/* 0974CC 800968CC 00000000 */ nop -.L800968D0: -/* 0974D0 800968D0 00A7082A */ slt $at, $a1, $a3 -/* 0974D4 800968D4 1420FFF2 */ bnez $at, .L800968A0 -/* 0974D8 800968D8 24840018 */ addiu $a0, $a0, 0x18 -.L800968DC: -/* 0974DC 800968DC 240BFFFF */ li $t3, -1 -/* 0974E0 800968E0 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 0974E4 800968E4 AC2B63E0 */ sw $t3, %lo(D_801263E0)($at) -/* 0974E8 800968E8 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 -/* 0974EC 800968EC AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 0974F0 800968F0 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 -/* 0974F4 800968F4 AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -/* 0974F8 800968F8 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0974FC 800968FC AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 097500 80096900 3C018012 */ lui $at, %hi(D_80126A68) # $at, 0x8012 -/* 097504 80096904 AC206A68 */ sw $zero, %lo(D_80126A68)($at) -/* 097508 80096908 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 09750C 8009690C 240C0001 */ li $t4, 1 -/* 097510 80096910 AC2C63C4 */ sw $t4, %lo(D_801263C4)($at) -/* 097514 80096914 3C01800E */ lui $at, %hi(D_800E0988) # $at, 0x800e -/* 097518 80096918 3C04800E */ lui $a0, %hi(D_800E0A24) # $a0, 0x800e -/* 09751C 8009691C AC200988 */ sw $zero, %lo(D_800E0988)($at) -/* 097520 80096920 0C02719D */ jal func_8009C674 -/* 097524 80096924 24840A24 */ addiu $a0, %lo(D_800E0A24) # addiu $a0, $a0, 0xa24 -/* 097528 80096928 3C04800E */ lui $a0, %hi(D_800E0A40) # $a0, 0x800e -/* 09752C 8009692C 0C027229 */ jal func_8009C8A4 -/* 097530 80096930 24840A40 */ addiu $a0, %lo(D_800E0A40) # addiu $a0, $a0, 0xa40 -/* 097534 80096934 0C025181 */ jal func_80094604 -/* 097538 80096938 00000000 */ nop -/* 09753C 8009693C 0C03105C */ jal func_800C4170 -/* 097540 80096940 24040002 */ li $a0, 2 -/* 097544 80096944 3C04800E */ lui $a0, %hi(D_800DF77C) # $a0, 0x800e -/* 097548 80096948 0C030076 */ jal func_800C01D8 -/* 09754C 8009694C 2484F77C */ addiu $a0, %lo(D_800DF77C) # addiu $a0, $a0, -0x884 -/* 097550 80096950 0C0002F8 */ jal func_80000BE0 -/* 097554 80096954 24040018 */ li $a0, 24 -/* 097558 80096958 0C0002CD */ jal func_80000B34 -/* 09755C 8009695C 24040018 */ li $a0, 24 -/* 097560 80096960 0C000326 */ jal func_80000C98 -/* 097564 80096964 24040080 */ li $a0, 128 -/* 097568 80096968 8FBF0014 */ lw $ra, 0x14($sp) -/* 09756C 8009696C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 097570 80096970 03E00008 */ jr $ra -/* 097574 80096974 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/MenuCreditsInit.s b/asm/non_matchings/unknown_080500/MenuCreditsInit.s deleted file mode 100644 index 175c046e..00000000 --- a/asm/non_matchings/unknown_080500/MenuCreditsInit.s +++ /dev/null @@ -1,177 +0,0 @@ -glabel MenuCreditsInit -/* 09BB48 8009AF48 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 09BB4C 8009AF4C AFBF001C */ sw $ra, 0x1c($sp) -/* 09BB50 8009AF50 0C01BAA4 */ jal get_settings -/* 09BB54 8009AF54 00000000 */ nop -/* 09BB58 8009AF58 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 09BB5C 8009AF5C AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 09BB60 8009AF60 3C018012 */ lui $at, %hi(D_80126BC4) # $at, 0x8012 -/* 09BB64 8009AF64 AC206BC4 */ sw $zero, %lo(D_80126BC4)($at) -/* 09BB68 8009AF68 3C018012 */ lui $at, %hi(D_80126BCC) # $at, 0x8012 -/* 09BB6C 8009AF6C AC206BCC */ sw $zero, %lo(D_80126BCC)($at) -/* 09BB70 8009AF70 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 09BB74 8009AF74 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 09BB78 8009AF78 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 -/* 09BB7C 8009AF7C 240E0028 */ li $t6, 40 -/* 09BB80 8009AF80 AC2E63D8 */ sw $t6, %lo(D_801263D8)($at) -/* 09BB84 8009AF84 3C01800E */ lui $at, %hi(D_800DF460) # $at, 0x800e -/* 09BB88 8009AF88 AC20F460 */ sw $zero, %lo(D_800DF460)($at) -/* 09BB8C 8009AF8C 3C018012 */ lui $at, %hi(D_80126BD0) # $at, 0x8012 -/* 09BB90 8009AF90 AC206BD0 */ sw $zero, %lo(D_80126BD0)($at) -/* 09BB94 8009AF94 3C018012 */ lui $at, %hi(D_80126BD8) # $at, 0x8012 -/* 09BB98 8009AF98 AC206BD8 */ sw $zero, %lo(D_80126BD8)($at) -/* 09BB9C 8009AF9C 3C018012 */ lui $at, %hi(D_80126BE0) # $at, 0x8012 -/* 09BBA0 8009AFA0 AFA20020 */ sw $v0, 0x20($sp) -/* 09BBA4 8009AFA4 AC206BE0 */ sw $zero, %lo(D_80126BE0)($at) -/* 09BBA8 8009AFA8 00002025 */ move $a0, $zero -/* 09BBAC 8009AFAC 00002825 */ move $a1, $zero -/* 09BBB0 8009AFB0 0C01DED7 */ jal func_80077B5C -/* 09BBB4 8009AFB4 00003025 */ move $a2, $zero -/* 09BBB8 8009AFB8 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 -/* 09BBBC 8009AFBC 8DEF0300 */ lw $t7, %lo(osTvType)($t7) -/* 09BBC0 8009AFC0 00002025 */ move $a0, $zero -/* 09BBC4 8009AFC4 15E00011 */ bnez $t7, .L8009B00C -/* 09BBC8 8009AFC8 00002825 */ move $a1, $zero -/* 09BBCC 8009AFCC 241800E0 */ li $t8, 224 -/* 09BBD0 8009AFD0 AFB80010 */ sw $t8, 0x10($sp) -/* 09BBD4 8009AFD4 00002025 */ move $a0, $zero -/* 09BBD8 8009AFD8 00002825 */ move $a1, $zero -/* 09BBDC 8009AFDC 24060026 */ li $a2, 38 -/* 09BBE0 8009AFE0 0C019A50 */ jal func_80066940 -/* 09BBE4 8009AFE4 24070140 */ li $a3, 320 -/* 09BBE8 8009AFE8 2419011C */ li $t9, 284 -/* 09BBEC 8009AFEC AFB90010 */ sw $t9, 0x10($sp) -/* 09BBF0 8009AFF0 00002025 */ move $a0, $zero -/* 09BBF4 8009AFF4 34058000 */ li $a1, 32768 -/* 09BBF8 8009AFF8 34068000 */ li $a2, 32768 -/* 09BBFC 8009AFFC 0C019AAA */ jal func_80066AA8 -/* 09BC00 8009B000 24070140 */ li $a3, 320 -/* 09BC04 8009B004 1000000D */ b .L8009B03C -/* 09BC08 8009B008 00000000 */ nop -.L8009B00C: -/* 09BC0C 8009B00C 240800C4 */ li $t0, 196 -/* 09BC10 8009B010 AFA80010 */ sw $t0, 0x10($sp) -/* 09BC14 8009B014 24060028 */ li $a2, 40 -/* 09BC18 8009B018 0C019A50 */ jal func_80066940 -/* 09BC1C 8009B01C 24070140 */ li $a3, 320 -/* 09BC20 8009B020 240900F0 */ li $t1, 240 -/* 09BC24 8009B024 AFA90010 */ sw $t1, 0x10($sp) -/* 09BC28 8009B028 00002025 */ move $a0, $zero -/* 09BC2C 8009B02C 34058000 */ li $a1, 32768 -/* 09BC30 8009B030 34068000 */ li $a2, 32768 -/* 09BC34 8009B034 0C019AAA */ jal func_80066AA8 -/* 09BC38 8009B038 24070140 */ li $a3, 320 -.L8009B03C: -/* 09BC3C 8009B03C 0C019984 */ jal func_80066610 -/* 09BC40 8009B040 00000000 */ nop -/* 09BC44 8009B044 00002025 */ move $a0, $zero -/* 09BC48 8009B048 0C019A06 */ jal func_80066818 -/* 09BC4C 8009B04C 24050001 */ li $a1, 1 -/* 09BC50 8009B050 3C04800E */ lui $a0, %hi(D_800E17D8) # $a0, 0x800e -/* 09BC54 8009B054 0C02719D */ jal func_8009C674 -/* 09BC58 8009B058 248417D8 */ addiu $a0, %lo(D_800E17D8) # addiu $a0, $a0, 0x17d8 -/* 09BC5C 8009B05C 3C04800E */ lui $a0, %hi(D_800E17F0) # $a0, 0x800e -/* 09BC60 8009B060 0C027229 */ jal func_8009C8A4 -/* 09BC64 8009B064 248417F0 */ addiu $a0, %lo(D_800E17F0) # addiu $a0, $a0, 0x17f0 -/* 09BC68 8009B068 0C025181 */ jal func_80094604 -/* 09BC6C 8009B06C 00000000 */ nop -/* 09BC70 8009B070 0C03105C */ jal func_800C4170 -/* 09BC74 8009B074 24040002 */ li $a0, 2 -/* 09BC78 8009B078 0C0002F8 */ jal func_80000BE0 -/* 09BC7C 8009B07C 24040018 */ li $a0, 24 -/* 09BC80 8009B080 3C0B800E */ lui $t3, %hi(D_800E1B4C) # $t3, 0x800e -/* 09BC84 8009B084 8D6B1B4C */ lw $t3, %lo(D_800E1B4C)($t3) -/* 09BC88 8009B088 240A1000 */ li $t2, 4096 -/* 09BC8C 8009B08C 3C01800E */ lui $at, %hi(D_800E18F8) # $at, 0x800e -/* 09BC90 8009B090 11600010 */ beqz $t3, .L8009B0D4 -/* 09BC94 8009B094 A42A18F8 */ sh $t2, %lo(D_800E18F8)($at) -/* 09BC98 8009B098 0C0002CD */ jal func_80000B34 -/* 09BC9C 8009B09C 24040008 */ li $a0, 8 -/* 09BCA0 8009B0A0 3C02800E */ lui $v0, %hi(D_800E1AE4) # $v0, 0x800e -/* 09BCA4 8009B0A4 24421AE4 */ addiu $v0, %lo(D_800E1AE4) # addiu $v0, $v0, 0x1ae4 -/* 09BCA8 8009B0A8 3C06800E */ lui $a2, %hi(D_800E1938) # $a2, 0x800e -/* 09BCAC 8009B0AC 24C61938 */ addiu $a2, %lo(D_800E1938) # addiu $a2, $a2, 0x1938 -/* 09BCB0 8009B0B0 8C4C0008 */ lw $t4, 8($v0) -/* 09BCB4 8009B0B4 8C4D000C */ lw $t5, 0xc($v0) -/* 09BCB8 8009B0B8 8C4E0010 */ lw $t6, 0x10($v0) -/* 09BCBC 8009B0BC 3C01800E */ lui $at, %hi(D_800E1B4C) # $at, 0x800e -/* 09BCC0 8009B0C0 ACCC0150 */ sw $t4, 0x150($a2) -/* 09BCC4 8009B0C4 ACCD0154 */ sw $t5, 0x154($a2) -/* 09BCC8 8009B0C8 ACCE0158 */ sw $t6, 0x158($a2) -/* 09BCCC 8009B0CC 1000003B */ b .L8009B1BC -/* 09BCD0 8009B0D0 AC201B4C */ sw $zero, %lo(D_800E1B4C)($at) -.L8009B0D4: -/* 09BCD4 8009B0D4 8FAF0020 */ lw $t7, 0x20($sp) -/* 09BCD8 8009B0D8 00000000 */ nop -/* 09BCDC 8009B0DC 95F8000C */ lhu $t8, 0xc($t7) -/* 09BCE0 8009B0E0 00000000 */ nop -/* 09BCE4 8009B0E4 33190020 */ andi $t9, $t8, 0x20 -/* 09BCE8 8009B0E8 13200010 */ beqz $t9, .L8009B12C -/* 09BCEC 8009B0EC 00000000 */ nop -/* 09BCF0 8009B0F0 0C0002CD */ jal func_80000B34 -/* 09BCF4 8009B0F4 24040025 */ li $a0, 37 -/* 09BCF8 8009B0F8 3C02800E */ lui $v0, %hi(D_800E1AE4) # $v0, 0x800e -/* 09BCFC 8009B0FC 24421AE4 */ addiu $v0, %lo(D_800E1AE4) # addiu $v0, $v0, 0x1ae4 -/* 09BD00 8009B100 8C480004 */ lw $t0, 4($v0) -/* 09BD04 8009B104 3C06800E */ lui $a2, %hi(D_800E1938) # $a2, 0x800e -/* 09BD08 8009B108 24C61938 */ addiu $a2, %lo(D_800E1938) # addiu $a2, $a2, 0x1938 -/* 09BD0C 8009B10C 240961F4 */ li $t1, 25076 -/* 09BD10 8009B110 3C01800E */ lui $at, %hi(D_800E18F8) # $at, 0x800e -/* 09BD14 8009B114 ACC80150 */ sw $t0, 0x150($a2) -/* 09BD18 8009B118 A42918F8 */ sh $t1, %lo(D_800E18F8)($at) -/* 09BD1C 8009B11C 3C018012 */ lui $at, %hi(D_80126BCC) # $at, 0x8012 -/* 09BD20 8009B120 240A0009 */ li $t2, 9 -/* 09BD24 8009B124 10000009 */ b .L8009B14C -/* 09BD28 8009B128 AC2A6BCC */ sw $t2, %lo(D_80126BCC)($at) -.L8009B12C: -/* 09BD2C 8009B12C 0C0002CD */ jal func_80000B34 -/* 09BD30 8009B130 24040008 */ li $a0, 8 -/* 09BD34 8009B134 3C02800E */ lui $v0, %hi(D_800E1AE4) # $v0, 0x800e -/* 09BD38 8009B138 24421AE4 */ addiu $v0, %lo(D_800E1AE4) # addiu $v0, $v0, 0x1ae4 -/* 09BD3C 8009B13C 8C4B0000 */ lw $t3, ($v0) -/* 09BD40 8009B140 3C06800E */ lui $a2, %hi(D_800E1938) # $a2, 0x800e -/* 09BD44 8009B144 24C61938 */ addiu $a2, %lo(D_800E1938) # addiu $a2, $a2, 0x1938 -/* 09BD48 8009B148 ACCB0150 */ sw $t3, 0x150($a2) -.L8009B14C: -/* 09BD4C 8009B14C 00002025 */ move $a0, $zero -/* 09BD50 8009B150 0C01BE53 */ jal func_8006F94C -/* 09BD54 8009B154 24050014 */ li $a1, 20 -/* 09BD58 8009B158 00026080 */ sll $t4, $v0, 2 -/* 09BD5C 8009B15C 3C03800E */ lui $v1, 0x800e -/* 09BD60 8009B160 006C1821 */ addu $v1, $v1, $t4 -/* 09BD64 8009B164 8C631AF8 */ lw $v1, 0x1af8($v1) -/* 09BD68 8009B168 3C06800E */ lui $a2, %hi(D_800E1938) # $a2, 0x800e -/* 09BD6C 8009B16C 24C61938 */ addiu $a2, %lo(D_800E1938) # addiu $a2, $a2, 0x1938 -/* 09BD70 8009B170 10600005 */ beqz $v1, .L8009B188 -/* 09BD74 8009B174 2404FFFF */ li $a0, -1 -.L8009B178: -/* 09BD78 8009B178 00036843 */ sra $t5, $v1, 1 -/* 09BD7C 8009B17C 01A01825 */ move $v1, $t5 -/* 09BD80 8009B180 15A0FFFD */ bnez $t5, .L8009B178 -/* 09BD84 8009B184 24840001 */ addiu $a0, $a0, 1 -.L8009B188: -/* 09BD88 8009B188 3C028012 */ lui $v0, %hi(D_80126C30) # $v0, 0x8012 -/* 09BD8C 8009B18C 8C426C30 */ lw $v0, %lo(D_80126C30)($v0) -/* 09BD90 8009B190 00047880 */ sll $t7, $a0, 2 -/* 09BD94 8009B194 24450002 */ addiu $a1, $v0, 2 -/* 09BD98 8009B198 00AF1821 */ addu $v1, $a1, $t7 -/* 09BD9C 8009B19C 94780002 */ lhu $t8, 2($v1) -/* 09BDA0 8009B1A0 00000000 */ nop -/* 09BDA4 8009B1A4 0302C821 */ addu $t9, $t8, $v0 -/* 09BDA8 8009B1A8 ACD90154 */ sw $t9, 0x154($a2) -/* 09BDAC 8009B1AC 94680000 */ lhu $t0, ($v1) -/* 09BDB0 8009B1B0 00000000 */ nop -/* 09BDB4 8009B1B4 01024821 */ addu $t1, $t0, $v0 -/* 09BDB8 8009B1B8 ACC90158 */ sw $t1, 0x158($a2) -.L8009B1BC: -/* 09BDBC 8009B1BC 0C0002C6 */ jal func_80000B18 -/* 09BDC0 8009B1C0 00000000 */ nop -/* 09BDC4 8009B1C4 0C03005C */ jal func_800C0170 -/* 09BDC8 8009B1C8 00000000 */ nop -/* 09BDCC 8009B1CC 0C01BD59 */ jal func_8006F564 -/* 09BDD0 8009B1D0 24040001 */ li $a0, 1 -/* 09BDD4 8009B1D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 09BDD8 8009B1D8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 09BDDC 8009B1DC 03E00008 */ jr $ra -/* 09BDE0 8009B1E0 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/MenuSaveOptionsInit.s b/asm/non_matchings/unknown_080500/MenuSaveOptionsInit.s deleted file mode 100644 index 340ee2b3..00000000 --- a/asm/non_matchings/unknown_080500/MenuSaveOptionsInit.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel MenuSaveOptionsInit -/* 085E70 80085270 24020001 */ li $v0, 1 -/* 085E74 80085274 3C018012 */ lui $at, %hi(D_80126A6C) # $at, 0x8012 -/* 085E78 80085278 AC226A6C */ sw $v0, %lo(D_80126A6C)($at) -/* 085E7C 8008527C 3C018012 */ lui $at, %hi(D_80126A10) # $at, 0x8012 -/* 085E80 80085280 AC206A10 */ sw $zero, %lo(D_80126A10)($at) -/* 085E84 80085284 3C018012 */ lui $at, %hi(D_80126A18) # $at, 0x8012 -/* 085E88 80085288 AC226A18 */ sw $v0, %lo(D_80126A18)($at) -/* 085E8C 8008528C 3C018012 */ lui $at, %hi(D_80126A1C) # $at, 0x8012 -/* 085E90 80085290 AC226A1C */ sw $v0, %lo(D_80126A1C)($at) -/* 085E94 80085294 3C018012 */ lui $at, %hi(D_80126C46) # $at, 0x8012 -/* 085E98 80085298 A4206C46 */ sh $zero, %lo(D_80126C46)($at) -/* 085E9C 8008529C 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 -/* 085EA0 800852A0 AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 085EA4 800852A4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 085EA8 800852A8 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 085EAC 800852AC 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 085EB0 800852B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 085EB4 800852B4 AC2263E0 */ sw $v0, %lo(D_801263E0)($at) -/* 085EB8 800852B8 AFBF0014 */ sw $ra, 0x14($sp) -/* 085EBC 800852BC 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 -/* 085EC0 800852C0 AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -/* 085EC4 800852C4 24040800 */ li $a0, 2048 -/* 085EC8 800852C8 0C01C327 */ jal func_80070C9C -/* 085ECC 800852CC 2405FFFF */ li $a1, -1 -/* 085ED0 800852D0 3C018012 */ lui $at, %hi(D_80126A64) # $at, 0x8012 -/* 085ED4 800852D4 AC226A64 */ sw $v0, %lo(D_80126A64)($at) -/* 085ED8 800852D8 24040A00 */ li $a0, 2560 -/* 085EDC 800852DC 0C01C327 */ jal func_80070C9C -/* 085EE0 800852E0 2405FFFF */ li $a1, -1 -/* 085EE4 800852E4 3C038012 */ lui $v1, %hi(D_80126A0C) # $v1, 0x8012 -/* 085EE8 800852E8 24636A0C */ addiu $v1, %lo(D_80126A0C) # addiu $v1, $v1, 0x6a0c -/* 085EEC 800852EC AC620000 */ sw $v0, ($v1) -/* 085EF0 800852F0 244F0500 */ addiu $t7, $v0, 0x500 -/* 085EF4 800852F4 3C018012 */ lui $at, %hi(D_80126A04) # $at, 0x8012 -/* 085EF8 800852F8 AC2F6A04 */ sw $t7, %lo(D_80126A04)($at) -/* 085EFC 800852FC 3C018012 */ lui $at, %hi(D_80126A08) # $at, 0x8012 -/* 085F00 80085300 AC206A08 */ sw $zero, %lo(D_80126A08)($at) -/* 085F04 80085304 3C018012 */ lui $at, %hi(D_80126BD4) # $at, 0x8012 -/* 085F08 80085308 44800000 */ mtc1 $zero, $f0 -/* 085F0C 8008530C AC206BD4 */ sw $zero, %lo(D_80126BD4)($at) -/* 085F10 80085310 3C018012 */ lui $at, %hi(D_80126BDC) # $at, 0x8012 -/* 085F14 80085314 E4206BDC */ swc1 $f0, %lo(D_80126BDC)($at) -/* 085F18 80085318 3C018012 */ lui $at, %hi(D_80126A00) # $at, 0x8012 -/* 085F1C 8008531C AC206A00 */ sw $zero, %lo(D_80126A00)($at) -/* 085F20 80085320 3C018012 */ lui $at, %hi(D_80126BE4) # $at, 0x8012 -/* 085F24 80085324 AC206BE4 */ sw $zero, %lo(D_80126BE4)($at) -/* 085F28 80085328 3C018012 */ lui $at, %hi(D_80126BEC) # $at, 0x8012 -/* 085F2C 8008532C 3C04800E */ lui $a0, %hi(D_800DFC78) # $a0, 0x800e -/* 085F30 80085330 2484FC78 */ addiu $a0, %lo(D_800DFC78) # addiu $a0, $a0, -0x388 -/* 085F34 80085334 0C02719D */ jal func_8009C674 -/* 085F38 80085338 E4206BEC */ swc1 $f0, %lo(D_80126BEC)($at) -/* 085F3C 8008533C 3C04800E */ lui $a0, %hi(D_800DFCAC) # $a0, 0x800e -/* 085F40 80085340 0C027229 */ jal func_8009C8A4 -/* 085F44 80085344 2484FCAC */ addiu $a0, %lo(D_800DFCAC) # addiu $a0, $a0, -0x354 -/* 085F48 80085348 0C01FFFB */ jal func_8007FFEC -/* 085F4C 8008534C 2404000A */ li $a0, 10 -/* 085F50 80085350 0C03105C */ jal func_800C4170 -/* 085F54 80085354 24040002 */ li $a0, 2 -/* 085F58 80085358 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012 -/* 085F5C 8008535C 24426550 */ addiu $v0, %lo(D_80126550) # addiu $v0, $v0, 0x6550 -/* 085F60 80085360 8C58011C */ lw $t8, 0x11c($v0) -/* 085F64 80085364 3C01800E */ lui $at, %hi(D_800DFC10) # $at, 0x800e -/* 085F68 80085368 AC38FC10 */ sw $t8, %lo(D_800DFC10)($at) -/* 085F6C 8008536C 8C590120 */ lw $t9, 0x120($v0) -/* 085F70 80085370 3C01800E */ lui $at, %hi(D_800DFC20) # $at, 0x800e -/* 085F74 80085374 AC39FC20 */ sw $t9, %lo(D_800DFC20)($at) -/* 085F78 80085378 8C48012C */ lw $t0, 0x12c($v0) -/* 085F7C 8008537C 3C01800E */ lui $at, %hi(D_800DFC30) # $at, 0x800e -/* 085F80 80085380 AC28FC30 */ sw $t0, %lo(D_800DFC30)($at) -/* 085F84 80085384 8C490128 */ lw $t1, 0x128($v0) -/* 085F88 80085388 3C01800E */ lui $at, %hi(D_800DFC40) # $at, 0x800e -/* 085F8C 8008538C AC29FC40 */ sw $t1, %lo(D_800DFC40)($at) -/* 085F90 80085390 8C4A0124 */ lw $t2, 0x124($v0) -/* 085F94 80085394 3C01800E */ lui $at, %hi(D_800DFC50) # $at, 0x800e -/* 085F98 80085398 AC2AFC50 */ sw $t2, %lo(D_800DFC50)($at) -/* 085F9C 8008539C 8C4B0118 */ lw $t3, 0x118($v0) -/* 085FA0 800853A0 3C01800E */ lui $at, %hi(D_800DFC60) # $at, 0x800e -/* 085FA4 800853A4 0C02392C */ jal func_8008E4B0 -/* 085FA8 800853A8 AC2BFC60 */ sw $t3, %lo(D_800DFC60)($at) -/* 085FAC 800853AC 0C01BAEA */ jal func_8006EBA8 -/* 085FB0 800853B0 00000000 */ nop -/* 085FB4 800853B4 3C04800E */ lui $a0, %hi(D_800DF77C) # $a0, 0x800e -/* 085FB8 800853B8 0C030076 */ jal func_800C01D8 -/* 085FBC 800853BC 2484F77C */ addiu $a0, %lo(D_800DF77C) # addiu $a0, $a0, -0x884 -/* 085FC0 800853C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 085FC4 800853C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 085FC8 800853C8 03E00008 */ jr $ra -/* 085FCC 800853CC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800841B8.s b/asm/non_matchings/unknown_080500/func_800841B8.s deleted file mode 100644 index 0c1166c9..00000000 --- a/asm/non_matchings/unknown_080500/func_800841B8.s +++ /dev/null @@ -1,111 +0,0 @@ -glabel func_800841B8 -/* 084DB8 800841B8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 084DBC 800841BC AFBF003C */ sw $ra, 0x3c($sp) -/* 084DC0 800841C0 AFA40040 */ sw $a0, 0x40($sp) -/* 084DC4 800841C4 AFB60038 */ sw $s6, 0x38($sp) -/* 084DC8 800841C8 AFB50034 */ sw $s5, 0x34($sp) -/* 084DCC 800841CC AFB40030 */ sw $s4, 0x30($sp) -/* 084DD0 800841D0 AFB3002C */ sw $s3, 0x2c($sp) -/* 084DD4 800841D4 AFB20028 */ sw $s2, 0x28($sp) -/* 084DD8 800841D8 AFB10024 */ sw $s1, 0x24($sp) -/* 084DDC 800841DC AFB00020 */ sw $s0, 0x20($sp) -/* 084DE0 800841E0 0C0310BB */ jal func_800C42EC -/* 084DE4 800841E4 24040002 */ li $a0, 2 -/* 084DE8 800841E8 00002025 */ move $a0, $zero -/* 084DEC 800841EC 00002825 */ move $a1, $zero -/* 084DF0 800841F0 00003025 */ move $a2, $zero -/* 084DF4 800841F4 0C0310F3 */ jal func_800C43CC -/* 084DF8 800841F8 00003825 */ move $a3, $zero -/* 084DFC 800841FC 240E0080 */ li $t6, 128 -/* 084E00 80084200 AFAE0010 */ sw $t6, 0x10($sp) -/* 084E04 80084204 00002025 */ move $a0, $zero -/* 084E08 80084208 00002825 */ move $a1, $zero -/* 084E0C 8008420C 00003025 */ move $a2, $zero -/* 084E10 80084210 0C0310E1 */ jal func_800C4384 -/* 084E14 80084214 240700FF */ li $a3, 255 -/* 084E18 80084218 3C10800E */ lui $s0, %hi(D_800DF4A0) # $s0, 0x800e -/* 084E1C 8008421C 2610F4A0 */ addiu $s0, %lo(D_800DF4A0) # addiu $s0, $s0, -0xb60 -/* 084E20 80084220 8E0F0000 */ lw $t7, ($s0) -/* 084E24 80084224 3C168012 */ lui $s6, %hi(D_801263A0) # $s6, 0x8012 -/* 084E28 80084228 26D663A0 */ addiu $s6, %lo(D_801263A0) # addiu $s6, $s6, 0x63a0 -/* 084E2C 8008422C 2418000C */ li $t8, 12 -/* 084E30 80084230 8DE70090 */ lw $a3, 0x90($t7) -/* 084E34 80084234 AFB80010 */ sw $t8, 0x10($sp) -/* 084E38 80084238 02C02025 */ move $a0, $s6 -/* 084E3C 8008423C 240500A1 */ li $a1, 161 -/* 084E40 80084240 0C031110 */ jal func_800C4440 -/* 084E44 80084244 24060023 */ li $a2, 35 -/* 084E48 80084248 241900FF */ li $t9, 255 -/* 084E4C 8008424C AFB90010 */ sw $t9, 0x10($sp) -/* 084E50 80084250 240400FF */ li $a0, 255 -/* 084E54 80084254 240500FF */ li $a1, 255 -/* 084E58 80084258 240600FF */ li $a2, 255 -/* 084E5C 8008425C 0C0310E1 */ jal func_800C4384 -/* 084E60 80084260 00003825 */ move $a3, $zero -/* 084E64 80084264 8E080000 */ lw $t0, ($s0) -/* 084E68 80084268 2409000C */ li $t1, 12 -/* 084E6C 8008426C 8D070090 */ lw $a3, 0x90($t0) -/* 084E70 80084270 AFA90010 */ sw $t1, 0x10($sp) -/* 084E74 80084274 02C02025 */ move $a0, $s6 -/* 084E78 80084278 240500A0 */ li $a1, 160 -/* 084E7C 8008427C 0C031110 */ jal func_800C4440 -/* 084E80 80084280 24060020 */ li $a2, 32 -/* 084E84 80084284 00008825 */ move $s1, $zero -/* 084E88 80084288 2412004C */ li $s2, 76 -/* 084E8C 8008428C 0C0310BB */ jal func_800C42EC -/* 084E90 80084290 00002025 */ move $a0, $zero -/* 084E94 80084294 3C0A800E */ lui $t2, %hi(D_800DFA10) # $t2, 0x800e -/* 084E98 80084298 8D4AFA10 */ lw $t2, %lo(D_800DFA10)($t2) -/* 084E9C 8008429C 00115880 */ sll $t3, $s1, 2 -/* 084EA0 800842A0 11400024 */ beqz $t2, .L80084334 -/* 084EA4 800842A4 3C0C800E */ lui $t4, %hi(D_800DFA10) # $t4, 0x800e -/* 084EA8 800842A8 258CFA10 */ addiu $t4, %lo(D_800DFA10) # addiu $t4, $t4, -0x5f0 -/* 084EAC 800842AC 3C148012 */ lui $s4, %hi(D_801263BC) # $s4, 0x8012 -/* 084EB0 800842B0 3C13800E */ lui $s3, %hi(D_800DF460) # $s3, 0x800e -/* 084EB4 800842B4 2673F460 */ addiu $s3, %lo(D_800DF460) # addiu $s3, $s3, -0xba0 -/* 084EB8 800842B8 269463BC */ addiu $s4, %lo(D_801263BC) # addiu $s4, $s4, 0x63bc -/* 084EBC 800842BC 016C8021 */ addu $s0, $t3, $t4 -/* 084EC0 800842C0 241501FF */ li $s5, 511 -.L800842C4: -/* 084EC4 800842C4 8E6D0000 */ lw $t5, ($s3) -/* 084EC8 800842C8 240400FF */ li $a0, 255 -/* 084ECC 800842CC 162D0008 */ bne $s1, $t5, .L800842F0 -/* 084ED0 800842D0 240500FF */ li $a1, 255 -/* 084ED4 800842D4 8E820000 */ lw $v0, ($s4) -/* 084ED8 800842D8 00000000 */ nop -/* 084EDC 800842DC 28410020 */ slti $at, $v0, 0x20 -/* 084EE0 800842E0 14200004 */ bnez $at, .L800842F4 -/* 084EE4 800842E4 000238C0 */ sll $a3, $v0, 3 -/* 084EE8 800842E8 10000002 */ b .L800842F4 -/* 084EEC 800842EC 02A73823 */ subu $a3, $s5, $a3 -.L800842F0: -/* 084EF0 800842F0 00003825 */ move $a3, $zero -.L800842F4: -/* 084EF4 800842F4 240E00FF */ li $t6, 255 -/* 084EF8 800842F8 AFAE0010 */ sw $t6, 0x10($sp) -/* 084EFC 800842FC 0C0310E1 */ jal func_800C4384 -/* 084F00 80084300 240600FF */ li $a2, 255 -/* 084F04 80084304 8E070000 */ lw $a3, ($s0) -/* 084F08 80084308 240F000C */ li $t7, 12 -/* 084F0C 8008430C AFAF0010 */ sw $t7, 0x10($sp) -/* 084F10 80084310 02C02025 */ move $a0, $s6 -/* 084F14 80084314 24058000 */ li $a1, -32768 -/* 084F18 80084318 0C031110 */ jal func_800C4440 -/* 084F1C 8008431C 02403025 */ move $a2, $s2 -/* 084F20 80084320 8E180004 */ lw $t8, 4($s0) -/* 084F24 80084324 26310001 */ addiu $s1, $s1, 1 -/* 084F28 80084328 26100004 */ addiu $s0, $s0, 4 -/* 084F2C 8008432C 1700FFE5 */ bnez $t8, .L800842C4 -/* 084F30 80084330 2652001C */ addiu $s2, $s2, 0x1c -.L80084334: -/* 084F34 80084334 8FBF003C */ lw $ra, 0x3c($sp) -/* 084F38 80084338 8FB00020 */ lw $s0, 0x20($sp) -/* 084F3C 8008433C 8FB10024 */ lw $s1, 0x24($sp) -/* 084F40 80084340 8FB20028 */ lw $s2, 0x28($sp) -/* 084F44 80084344 8FB3002C */ lw $s3, 0x2c($sp) -/* 084F48 80084348 8FB40030 */ lw $s4, 0x30($sp) -/* 084F4C 8008434C 8FB50034 */ lw $s5, 0x34($sp) -/* 084F50 80084350 8FB60038 */ lw $s6, 0x38($sp) -/* 084F54 80084354 03E00008 */ jr $ra -/* 084F58 80084358 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/unknown_080500/func_800887E8.s b/asm/non_matchings/unknown_080500/func_800887E8.s deleted file mode 100644 index 61252119..00000000 --- a/asm/non_matchings/unknown_080500/func_800887E8.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_800887E8 -/* 0893E8 800887E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0893EC 800887EC AFBF0014 */ sw $ra, 0x14($sp) -/* 0893F0 800887F0 24040200 */ li $a0, 512 -/* 0893F4 800887F4 0C01C327 */ jal func_80070C9C -/* 0893F8 800887F8 2405FFFF */ li $a1, -1 -/* 0893FC 800887FC 3C058012 */ lui $a1, %hi(D_80126AA0) # $a1, 0x8012 -/* 089400 80088800 24A56AA0 */ addiu $a1, %lo(D_80126AA0) # addiu $a1, $a1, 0x6aa0 -/* 089404 80088804 3C048012 */ lui $a0, %hi(D_80126AA4) # $a0, 0x8012 -/* 089408 80088808 ACA20000 */ sw $v0, ($a1) -/* 08940C 8008880C 24846AA4 */ addiu $a0, %lo(D_80126AA4) # addiu $a0, $a0, 0x6aa4 -/* 089410 80088810 24030020 */ li $v1, 32 -.L80088814: -/* 089414 80088814 8CAE0000 */ lw $t6, ($a1) -/* 089418 80088818 24840004 */ addiu $a0, $a0, 4 -/* 08941C 8008881C 01C37821 */ addu $t7, $t6, $v1 -/* 089420 80088820 24630020 */ addiu $v1, $v1, 0x20 -/* 089424 80088824 28610200 */ slti $at, $v1, 0x200 -/* 089428 80088828 1420FFFA */ bnez $at, .L80088814 -/* 08942C 8008882C AC8FFFFC */ sw $t7, -4($a0) -/* 089430 80088830 3C028012 */ lui $v0, %hi(D_80126A60) # $v0, 0x8012 -/* 089434 80088834 3C038012 */ lui $v1, %hi(D_80126A61) # $v1, 0x8012 -/* 089438 80088838 24636A61 */ addiu $v1, %lo(D_80126A61) # addiu $v1, $v1, 0x6a61 -/* 08943C 8008883C 24426A60 */ addiu $v0, %lo(D_80126A60) # addiu $v0, $v0, 0x6a60 -.L80088840: -/* 089440 80088840 24420001 */ addiu $v0, $v0, 1 -/* 089444 80088844 1443FFFE */ bne $v0, $v1, .L80088840 -/* 089448 80088848 A040FFFF */ sb $zero, -1($v0) -/* 08944C 8008884C 3C018012 */ lui $at, %hi(D_80126C10) # $at, 0x8012 -/* 089450 80088850 AC206C10 */ sw $zero, %lo(D_80126C10)($at) -/* 089454 80088854 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 089458 80088858 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 08945C 8008885C 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 -/* 089460 80088860 AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 089464 80088864 3C018012 */ lui $at, %hi(D_80126A68) # $at, 0x8012 -/* 089468 80088868 2418FFFF */ li $t8, -1 -/* 08946C 8008886C 0C027AC8 */ jal func_8009EB20 -/* 089470 80088870 AC386A68 */ sw $t8, %lo(D_80126A68)($at) -/* 089474 80088874 0C01FE40 */ jal func_8007F900 -/* 089478 80088878 00402025 */ move $a0, $v0 -/* 08947C 8008887C 3C048012 */ lui $a0, %hi(D_80126A68) # $a0, 0x8012 -/* 089480 80088880 24846A68 */ addiu $a0, %lo(D_80126A68) # addiu $a0, $a0, 0x6a68 -/* 089484 80088884 0C021FC5 */ jal func_80087F14 -/* 089488 80088888 00002825 */ move $a1, $zero -/* 08948C 8008888C 14400003 */ bnez $v0, .L8008889C -/* 089490 80088890 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 089494 80088894 10000007 */ b .L800888B4 -/* 089498 80088898 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -.L8008889C: -/* 08949C 8008889C 0C0220CB */ jal func_8008832C -/* 0894A0 800888A0 00000000 */ nop -/* 0894A4 800888A4 14400003 */ bnez $v0, .L800888B4 -/* 0894A8 800888A8 24190014 */ li $t9, 20 -/* 0894AC 800888AC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0894B0 800888B0 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) -.L800888B4: -/* 0894B4 800888B4 3C088012 */ lui $t0, %hi(D_80126BC8) # $t0, 0x8012 -/* 0894B8 800888B8 8D086BC8 */ lw $t0, %lo(D_80126BC8)($t0) -/* 0894BC 800888BC 3C09800E */ lui $t1, %hi(D_800DFD94) # $t1, 0x800e -/* 0894C0 800888C0 15000006 */ bnez $t0, .L800888DC -/* 0894C4 800888C4 2404003F */ li $a0, 63 -/* 0894C8 800888C8 8D29FD94 */ lw $t1, %lo(D_800DFD94)($t1) -/* 0894CC 800888CC 240A0014 */ li $t2, 20 -/* 0894D0 800888D0 15200002 */ bnez $t1, .L800888DC -/* 0894D4 800888D4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0894D8 800888D8 AC2AF47C */ sw $t2, %lo(D_800DF47C)($at) -.L800888DC: -/* 0894DC 800888DC 3C01800E */ lui $at, %hi(D_800DF460) # $at, 0x800e -/* 0894E0 800888E0 AC20F460 */ sw $zero, %lo(D_800DF460)($at) -/* 0894E4 800888E4 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 -/* 0894E8 800888E8 0C0271B5 */ jal func_8009C6D4 -/* 0894EC 800888EC AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -/* 0894F0 800888F0 0C02392C */ jal func_8008E4B0 -/* 0894F4 800888F4 00000000 */ nop -/* 0894F8 800888F8 3C0B8000 */ lui $t3, %hi(osTvType) # $t3, 0x8000 -/* 0894FC 800888FC 8D6B0300 */ lw $t3, %lo(osTvType)($t3) -/* 089500 80088900 240D0007 */ li $t5, 7 -/* 089504 80088904 15600005 */ bnez $t3, .L8008891C -/* 089508 80088908 3C018012 */ lui $at, 0x8012 -/* 08950C 8008890C 240C0008 */ li $t4, 8 -/* 089510 80088910 3C018012 */ lui $at, %hi(D_80126BB4) # $at, 0x8012 -/* 089514 80088914 10000002 */ b .L80088920 -/* 089518 80088918 AC2C6BB4 */ sw $t4, %lo(D_80126BB4)($at) -.L8008891C: -/* 08951C 8008891C AC2D6BB4 */ sw $t5, %lo(D_80126BB4)($at) -.L80088920: -/* 089520 80088920 0C03105C */ jal func_800C4170 -/* 089524 80088924 24040002 */ li $a0, 2 -/* 089528 80088928 8FBF0014 */ lw $ra, 0x14($sp) -/* 08952C 8008892C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 089530 80088930 03E00008 */ jr $ra -/* 089534 80088934 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8008B20C.s b/asm/non_matchings/unknown_080500/func_8008B20C.s deleted file mode 100644 index 167bdadd..00000000 --- a/asm/non_matchings/unknown_080500/func_8008B20C.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_8008B20C -/* 08BE0C 8008B20C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08BE10 8008B210 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) -/* 08BE14 8008B214 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08BE18 8008B218 2841FFEA */ slti $at, $v0, -0x16 -/* 08BE1C 8008B21C AFBF001C */ sw $ra, 0x1c($sp) -/* 08BE20 8008B220 14200049 */ bnez $at, .L8008B348 -/* 08BE24 8008B224 AFA40020 */ sw $a0, 0x20($sp) -/* 08BE28 8008B228 28410017 */ slti $at, $v0, 0x17 -/* 08BE2C 8008B22C 10200047 */ beqz $at, .L8008B34C -/* 08BE30 8008B230 8FBF001C */ lw $ra, 0x1c($sp) -/* 08BE34 8008B234 0C0310BB */ jal func_800C42EC -/* 08BE38 8008B238 24040002 */ li $a0, 2 -/* 08BE3C 8008B23C 00002025 */ move $a0, $zero -/* 08BE40 8008B240 00002825 */ move $a1, $zero -/* 08BE44 8008B244 00003025 */ move $a2, $zero -/* 08BE48 8008B248 0C0310F3 */ jal func_800C43CC -/* 08BE4C 8008B24C 00003825 */ move $a3, $zero -/* 08BE50 8008B250 240E0080 */ li $t6, 128 -/* 08BE54 8008B254 AFAE0010 */ sw $t6, 0x10($sp) -/* 08BE58 8008B258 00002025 */ move $a0, $zero -/* 08BE5C 8008B25C 00002825 */ move $a1, $zero -/* 08BE60 8008B260 00003025 */ move $a2, $zero -/* 08BE64 8008B264 0C0310E1 */ jal func_800C4384 -/* 08BE68 8008B268 240700FF */ li $a3, 255 -/* 08BE6C 8008B26C 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 08BE70 8008B270 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) -/* 08BE74 8008B274 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 08BE78 8008B278 2418000C */ li $t8, 12 -/* 08BE7C 8008B27C 8DE7021C */ lw $a3, 0x21c($t7) -/* 08BE80 8008B280 AFB80010 */ sw $t8, 0x10($sp) -/* 08BE84 8008B284 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 08BE88 8008B288 240500A1 */ li $a1, 161 -/* 08BE8C 8008B28C 0C031110 */ jal func_800C4440 -/* 08BE90 8008B290 24060023 */ li $a2, 35 -/* 08BE94 8008B294 241900FF */ li $t9, 255 -/* 08BE98 8008B298 AFB90010 */ sw $t9, 0x10($sp) -/* 08BE9C 8008B29C 240400FF */ li $a0, 255 -/* 08BEA0 8008B2A0 240500FF */ li $a1, 255 -/* 08BEA4 8008B2A4 240600FF */ li $a2, 255 -/* 08BEA8 8008B2A8 0C0310E1 */ jal func_800C4384 -/* 08BEAC 8008B2AC 00003825 */ move $a3, $zero -/* 08BEB0 8008B2B0 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 08BEB4 8008B2B4 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) -/* 08BEB8 8008B2B8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 08BEBC 8008B2BC 2409000C */ li $t1, 12 -/* 08BEC0 8008B2C0 8D07021C */ lw $a3, 0x21c($t0) -/* 08BEC4 8008B2C4 AFA90010 */ sw $t1, 0x10($sp) -/* 08BEC8 8008B2C8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 08BECC 8008B2CC 240500A0 */ li $a1, 160 -/* 08BED0 8008B2D0 0C031110 */ jal func_800C4440 -/* 08BED4 8008B2D4 24060020 */ li $a2, 32 -/* 08BED8 8008B2D8 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 08BEDC 8008B2DC 3C0A800E */ lui $t2, %hi(D_800DF480) # $t2, 0x800e -/* 08BEE0 8008B2E0 8D4AF480 */ lw $t2, %lo(D_800DF480)($t2) -/* 08BEE4 8008B2E4 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) -/* 08BEE8 8008B2E8 00000000 */ nop -/* 08BEEC 8008B2EC 144A000F */ bne $v0, $t2, .L8008B32C -/* 08BEF0 8008B2F0 00000000 */ nop -/* 08BEF4 8008B2F4 1840000D */ blez $v0, .L8008B32C -/* 08BEF8 8008B2F8 3C0B8000 */ lui $t3, %hi(osTvType) # $t3, 0x8000 -/* 08BEFC 8008B2FC 8D6B0300 */ lw $t3, %lo(osTvType)($t3) -/* 08BF00 8008B300 240600D0 */ li $a2, 208 -/* 08BF04 8008B304 15600002 */ bnez $t3, .L8008B310 -/* 08BF08 8008B308 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 08BF0C 8008B30C 240600EA */ li $a2, 234 -.L8008B310: -/* 08BF10 8008B310 3C07800F */ lui $a3, %hi(D_800E8230) # $a3, 0x800f -/* 08BF14 8008B314 240C000C */ li $t4, 12 -/* 08BF18 8008B318 AFAC0010 */ sw $t4, 0x10($sp) -/* 08BF1C 8008B31C 24E78230 */ addiu $a3, %lo(D_800E8230) # addiu $a3, $a3, -0x7dd0 -/* 08BF20 8008B320 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 08BF24 8008B324 0C031110 */ jal func_800C4440 -/* 08BF28 8008B328 240500A0 */ li $a1, 160 -.L8008B32C: -/* 08BF2C 8008B32C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 08BF30 8008B330 0C01ECF4 */ jal func_8007B3D0 -/* 08BF34 8008B334 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 08BF38 8008B338 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 08BF3C 8008B33C 44816000 */ mtc1 $at, $f12 -/* 08BF40 8008B340 0C01983B */ jal func_800660EC -/* 08BF44 8008B344 00000000 */ nop -.L8008B348: -/* 08BF48 8008B348 8FBF001C */ lw $ra, 0x1c($sp) -.L8008B34C: -/* 08BF4C 8008B34C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 08BF50 8008B350 03E00008 */ jr $ra -/* 08BF54 8008B354 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_800983C0.s b/asm/non_matchings/unknown_080500/func_800983C0.s deleted file mode 100644 index 7d17ebce..00000000 --- a/asm/non_matchings/unknown_080500/func_800983C0.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_800983C0 -/* 098FC0 800983C0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 098FC4 800983C4 AFBF001C */ sw $ra, 0x1c($sp) -/* 098FC8 800983C8 AFA40030 */ sw $a0, 0x30($sp) -/* 098FCC 800983CC 0C0078A7 */ jal func_8001E29C -/* 098FD0 800983D0 2404001A */ li $a0, 26 -/* 098FD4 800983D4 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 -/* 098FD8 800983D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) -/* 098FDC 800983DC AFA20020 */ sw $v0, 0x20($sp) -/* 098FE0 800983E0 15C00004 */ bnez $t6, .L800983F4 -/* 098FE4 800983E4 3C04800E */ lui $a0, %hi(gTrophyRaceWorldId) # $a0, 0x800e -/* 098FE8 800983E8 240F0012 */ li $t7, 18 -/* 098FEC 800983EC 10000002 */ b .L800983F8 -/* 098FF0 800983F0 AFAF002C */ sw $t7, 0x2c($sp) -.L800983F4: -/* 098FF4 800983F4 AFA0002C */ sw $zero, 0x2c($sp) -.L800983F8: -/* 098FF8 800983F8 8C840FE8 */ lw $a0, %lo(gTrophyRaceWorldId)($a0) -/* 098FFC 800983FC 0C01AC75 */ jal func_8006B1D4 -/* 099000 80098400 00000000 */ nop -/* 099004 80098404 0C01AF77 */ jal func_8006BDDC -/* 099008 80098408 00402025 */ move $a0, $v0 -/* 09900C 8009840C 3C18800E */ lui $t8, %hi(gTrophyRaceWorldId) # $t8, 0x800e -/* 099010 80098410 8F180FE8 */ lw $t8, %lo(gTrophyRaceWorldId)($t8) -/* 099014 80098414 3C08800E */ lui $t0, %hi(D_800E0FEC) # $t0, 0x800e -/* 099018 80098418 0018C880 */ sll $t9, $t8, 2 -/* 09901C 8009841C 8D080FEC */ lw $t0, %lo(D_800E0FEC)($t0) -/* 099020 80098420 0338C823 */ subu $t9, $t9, $t8 -/* 099024 80098424 8FAA0020 */ lw $t2, 0x20($sp) -/* 099028 80098428 0019C840 */ sll $t9, $t9, 1 -/* 09902C 8009842C 03284821 */ addu $t1, $t9, $t0 -/* 099030 80098430 AFA20028 */ sw $v0, 0x28($sp) -/* 099034 80098434 012A5821 */ addu $t3, $t1, $t2 -/* 099038 80098438 8164FFFA */ lb $a0, -6($t3) -/* 09903C 8009843C 0C01AF77 */ jal func_8006BDDC -/* 099040 80098440 00000000 */ nop -/* 099044 80098444 AFA20024 */ sw $v0, 0x24($sp) -/* 099048 80098448 00002025 */ move $a0, $zero -/* 09904C 8009844C 00002825 */ move $a1, $zero -/* 099050 80098450 00003025 */ move $a2, $zero -/* 099054 80098454 0C0310F3 */ jal func_800C43CC -/* 099058 80098458 00003825 */ move $a3, $zero -/* 09905C 8009845C 0C0310BB */ jal func_800C42EC -/* 099060 80098460 24040002 */ li $a0, 2 -/* 099064 80098464 240C0080 */ li $t4, 128 -/* 099068 80098468 AFAC0010 */ sw $t4, 0x10($sp) -/* 09906C 8009846C 00002025 */ move $a0, $zero -/* 099070 80098470 00002825 */ move $a1, $zero -/* 099074 80098474 00003025 */ move $a2, $zero -/* 099078 80098478 0C0310E1 */ jal func_800C4384 -/* 09907C 8009847C 240700FF */ li $a3, 255 -/* 099080 80098480 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 099084 80098484 8FA70028 */ lw $a3, 0x28($sp) -/* 099088 80098488 240D000C */ li $t5, 12 -/* 09908C 8009848C AFAD0010 */ sw $t5, 0x10($sp) -/* 099090 80098490 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 099094 80098494 240500A1 */ li $a1, 161 -/* 099098 80098498 0C031110 */ jal func_800C4440 -/* 09909C 8009849C 24060023 */ li $a2, 35 -/* 0990A0 800984A0 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 0990A4 800984A4 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) -/* 0990A8 800984A8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 0990AC 800984AC 240F000C */ li $t7, 12 -/* 0990B0 800984B0 8DC70118 */ lw $a3, 0x118($t6) -/* 0990B4 800984B4 AFAF0010 */ sw $t7, 0x10($sp) -/* 0990B8 800984B8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 0990BC 800984BC 240500A1 */ li $a1, 161 -/* 0990C0 800984C0 0C031110 */ jal func_800C4440 -/* 0990C4 800984C4 24060043 */ li $a2, 67 -/* 0990C8 800984C8 241800FF */ li $t8, 255 -/* 0990CC 800984CC AFB80010 */ sw $t8, 0x10($sp) -/* 0990D0 800984D0 240400FF */ li $a0, 255 -/* 0990D4 800984D4 240500FF */ li $a1, 255 -/* 0990D8 800984D8 240600FF */ li $a2, 255 -/* 0990DC 800984DC 0C0310E1 */ jal func_800C4384 -/* 0990E0 800984E0 00003825 */ move $a3, $zero -/* 0990E4 800984E4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 0990E8 800984E8 8FA70028 */ lw $a3, 0x28($sp) -/* 0990EC 800984EC 2419000C */ li $t9, 12 -/* 0990F0 800984F0 AFB90010 */ sw $t9, 0x10($sp) -/* 0990F4 800984F4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 0990F8 800984F8 240500A0 */ li $a1, 160 -/* 0990FC 800984FC 0C031110 */ jal func_800C4440 -/* 099100 80098500 24060020 */ li $a2, 32 -/* 099104 80098504 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 099108 80098508 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) -/* 09910C 8009850C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 099110 80098510 2409000C */ li $t1, 12 -/* 099114 80098514 8D070118 */ lw $a3, 0x118($t0) -/* 099118 80098518 AFA90010 */ sw $t1, 0x10($sp) -/* 09911C 8009851C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 099120 80098520 240500A0 */ li $a1, 160 -/* 099124 80098524 0C031110 */ jal func_800C4440 -/* 099128 80098528 24060040 */ li $a2, 64 -/* 09912C 8009852C 3C0B800E */ lui $t3, %hi(D_800E0FEC) # $t3, 0x800e -/* 099130 80098530 8D6B0FEC */ lw $t3, %lo(D_800E0FEC)($t3) -/* 099134 80098534 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 099138 80098538 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) -/* 09913C 8009853C 000B6080 */ sll $t4, $t3, 2 -/* 099140 80098540 8FA6002C */ lw $a2, 0x2c($sp) -/* 099144 80098544 014C6821 */ addu $t5, $t2, $t4 -/* 099148 80098548 8DA70228 */ lw $a3, 0x228($t5) -/* 09914C 8009854C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 099150 80098550 240E000C */ li $t6, 12 -/* 099154 80098554 AFAE0010 */ sw $t6, 0x10($sp) -/* 099158 80098558 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 09915C 8009855C 240500A0 */ li $a1, 160 -/* 099160 80098560 0C031110 */ jal func_800C4440 -/* 099164 80098564 24C600B0 */ addiu $a2, $a2, 0xb0 -/* 099168 80098568 8FA6002C */ lw $a2, 0x2c($sp) -/* 09916C 8009856C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 099170 80098570 8FA70024 */ lw $a3, 0x24($sp) -/* 099174 80098574 240F000C */ li $t7, 12 -/* 099178 80098578 AFAF0010 */ sw $t7, 0x10($sp) -/* 09917C 8009857C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 099180 80098580 240500A0 */ li $a1, 160 -/* 099184 80098584 0C031110 */ jal func_800C4440 -/* 099188 80098588 24C600D0 */ addiu $a2, $a2, 0xd0 -/* 09918C 8009858C 8FBF001C */ lw $ra, 0x1c($sp) -/* 099190 80098590 27BD0030 */ addiu $sp, $sp, 0x30 -/* 099194 80098594 03E00008 */ jr $ra -/* 099198 80098598 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009C508.s b/asm/non_matchings/unknown_080500/func_8009C508.s deleted file mode 100644 index 33fe4068..00000000 --- a/asm/non_matchings/unknown_080500/func_8009C508.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_8009C508 -/* 09D108 8009C508 3C0E8012 */ lui $t6, %hi(D_80126750) # $t6, 0x8012 -/* 09D10C 8009C50C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 09D110 8009C510 25CE6750 */ addiu $t6, %lo(D_80126750) # addiu $t6, $t6, 0x6750 -/* 09D114 8009C514 008E7821 */ addu $t7, $a0, $t6 -/* 09D118 8009C518 AFBF0014 */ sw $ra, 0x14($sp) -/* 09D11C 8009C51C AFAF001C */ sw $t7, 0x1c($sp) -/* 09D120 8009C520 91F90000 */ lbu $t9, ($t7) -/* 09D124 8009C524 00044080 */ sll $t0, $a0, 2 -/* 09D128 8009C528 13200036 */ beqz $t9, .L8009C604 -/* 09D12C 8009C52C 3C098012 */ lui $t1, %hi(D_80126550) # $t1, 0x8012 -/* 09D130 8009C530 25296550 */ addiu $t1, %lo(D_80126550) # addiu $t1, $t1, 0x6550 -/* 09D134 8009C534 01095021 */ addu $t2, $t0, $t1 -/* 09D138 8009C538 AFAA0018 */ sw $t2, 0x18($sp) -/* 09D13C 8009C53C 8D420000 */ lw $v0, ($t2) -/* 09D140 8009C540 3C0B800E */ lui $t3, %hi(D_800DF750) # $t3, 0x800e -/* 09D144 8009C544 10400025 */ beqz $v0, .L8009C5DC -/* 09D148 8009C548 8FA80018 */ lw $t0, 0x18($sp) -/* 09D14C 8009C54C 8D6BF750 */ lw $t3, %lo(D_800DF750)($t3) -/* 09D150 8009C550 00046040 */ sll $t4, $a0, 1 -/* 09D154 8009C554 016C6821 */ addu $t5, $t3, $t4 -/* 09D158 8009C558 85A30000 */ lh $v1, ($t5) -/* 09D15C 8009C55C 3401C000 */ li $at, 49152 -/* 09D160 8009C560 306EC000 */ andi $t6, $v1, 0xc000 -/* 09D164 8009C564 15C1000E */ bne $t6, $at, .L8009C5A0 -/* 09D168 8009C568 30788000 */ andi $t8, $v1, 0x8000 -/* 09D16C 8009C56C 1040000C */ beqz $v0, .L8009C5A0 -/* 09D170 8009C570 00000000 */ nop -/* 09D174 8009C574 0C01C42C */ jal func_800710B0 -/* 09D178 8009C578 00002025 */ move $a0, $zero -/* 09D17C 8009C57C 8FAF0018 */ lw $t7, 0x18($sp) -/* 09D180 8009C580 00000000 */ nop -/* 09D184 8009C584 8DE40000 */ lw $a0, ($t7) -/* 09D188 8009C588 0C01ECAF */ jal func_8007B2BC -/* 09D18C 8009C58C 00000000 */ nop -/* 09D190 8009C590 0C01C42C */ jal func_800710B0 -/* 09D194 8009C594 24040002 */ li $a0, 2 -/* 09D198 8009C598 10000010 */ b .L8009C5DC -/* 09D19C 8009C59C 8FA80018 */ lw $t0, 0x18($sp) -.L8009C5A0: -/* 09D1A0 8009C5A0 13000005 */ beqz $t8, .L8009C5B8 -/* 09D1A4 8009C5A4 30794000 */ andi $t9, $v1, 0x4000 -/* 09D1A8 8009C5A8 0C01F32C */ jal func_8007CCB0 -/* 09D1AC 8009C5AC 00402025 */ move $a0, $v0 -/* 09D1B0 8009C5B0 1000000A */ b .L8009C5DC -/* 09D1B4 8009C5B4 8FA80018 */ lw $t0, 0x18($sp) -.L8009C5B8: -/* 09D1B8 8009C5B8 13200005 */ beqz $t9, .L8009C5D0 -/* 09D1BC 8009C5BC 00000000 */ nop -/* 09D1C0 8009C5C0 0C003FEE */ jal func_8000FFB8 -/* 09D1C4 8009C5C4 00402025 */ move $a0, $v0 -/* 09D1C8 8009C5C8 10000004 */ b .L8009C5DC -/* 09D1CC 8009C5CC 8FA80018 */ lw $t0, 0x18($sp) -.L8009C5D0: -/* 09D1D0 8009C5D0 0C017FD0 */ jal func_8005FF40 -/* 09D1D4 8009C5D4 00402025 */ move $a0, $v0 -/* 09D1D8 8009C5D8 8FA80018 */ lw $t0, 0x18($sp) -.L8009C5DC: -/* 09D1DC 8009C5DC 3C02800E */ lui $v0, %hi(D_800DF758) # $v0, 0x800e -/* 09D1E0 8009C5E0 AD000000 */ sw $zero, ($t0) -/* 09D1E4 8009C5E4 8FA9001C */ lw $t1, 0x1c($sp) -/* 09D1E8 8009C5E8 2442F758 */ addiu $v0, %lo(D_800DF758) # addiu $v0, $v0, -0x8a8 -/* 09D1EC 8009C5EC A1200000 */ sb $zero, ($t1) -/* 09D1F0 8009C5F0 844A0000 */ lh $t2, ($v0) -/* 09D1F4 8009C5F4 00000000 */ nop -/* 09D1F8 8009C5F8 254BFFFF */ addiu $t3, $t2, -1 -/* 09D1FC 8009C5FC 0C004013 */ jal func_8001004C -/* 09D200 8009C600 A44B0000 */ sh $t3, ($v0) -.L8009C604: -/* 09D204 8009C604 3C0C800E */ lui $t4, %hi(D_800DF758) # $t4, 0x800e -/* 09D208 8009C608 858CF758 */ lh $t4, %lo(D_800DF758)($t4) -/* 09D20C 8009C60C 3C04800E */ lui $a0, %hi(D_800DF75C) # $a0, 0x800e -/* 09D210 8009C610 15800015 */ bnez $t4, .L8009C668 -/* 09D214 8009C614 8FBF0014 */ lw $ra, 0x14($sp) -/* 09D218 8009C618 8C84F75C */ lw $a0, %lo(D_800DF75C)($a0) -/* 09D21C 8009C61C 00000000 */ nop -/* 09D220 8009C620 10800005 */ beqz $a0, .L8009C638 -/* 09D224 8009C624 00000000 */ nop -/* 09D228 8009C628 0C01C450 */ jal func_80071140 -/* 09D22C 8009C62C 00000000 */ nop -/* 09D230 8009C630 3C01800E */ lui $at, %hi(D_800DF75C) # $at, 0x800e -/* 09D234 8009C634 AC20F75C */ sw $zero, %lo(D_800DF75C)($at) -.L8009C638: -/* 09D238 8009C638 3C04800E */ lui $a0, %hi(D_800DF750) # $a0, 0x800e -/* 09D23C 8009C63C 8C84F750 */ lw $a0, %lo(D_800DF750)($a0) -/* 09D240 8009C640 00000000 */ nop -/* 09D244 8009C644 10800008 */ beqz $a0, .L8009C668 -/* 09D248 8009C648 8FBF0014 */ lw $ra, 0x14($sp) -/* 09D24C 8009C64C 0C01C450 */ jal func_80071140 -/* 09D250 8009C650 00000000 */ nop -/* 09D254 8009C654 3C01800E */ lui $at, %hi(D_800DF750) # $at, 0x800e -/* 09D258 8009C658 AC20F750 */ sw $zero, %lo(D_800DF750)($at) -/* 09D25C 8009C65C 3C01800E */ lui $at, %hi(D_800DF754) # $at, 0x800e -/* 09D260 8009C660 A420F754 */ sh $zero, %lo(D_800DF754)($at) -/* 09D264 8009C664 8FBF0014 */ lw $ra, 0x14($sp) -.L8009C668: -/* 09D268 8009C668 27BD0020 */ addiu $sp, $sp, 0x20 -/* 09D26C 8009C66C 03E00008 */ jr $ra -/* 09D270 8009C670 00000000 */ nop - diff --git a/asm/non_matchings/unknown_080500/func_8009D9F4.s b/asm/non_matchings/unknown_080500/func_8009D9F4.s deleted file mode 100644 index f44f1d45..00000000 --- a/asm/non_matchings/unknown_080500/func_8009D9F4.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_8009D9F4 -/* 09E5F4 8009D9F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 09E5F8 8009D9F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 09E5FC 8009D9FC 240E0087 */ li $t6, 135 -/* 09E600 8009DA00 AFAE0010 */ sw $t6, 0x10($sp) -/* 09E604 8009DA04 24040001 */ li $a0, 1 -/* 09E608 8009DA08 24050018 */ li $a1, 24 -/* 09E60C 8009DA0C 24060010 */ li $a2, 16 -/* 09E610 8009DA10 0C0313B7 */ jal func_800C4EDC -/* 09E614 8009DA14 240700B8 */ li $a3, 184 -/* 09E618 8009DA18 24040001 */ li $a0, 1 -/* 09E61C 8009DA1C 0C0313DF */ jal func_800C4F7C -/* 09E620 8009DA20 00002825 */ move $a1, $zero -/* 09E624 8009DA24 AFA00024 */ sw $zero, 0x24($sp) -/* 09E628 8009DA28 0C01A955 */ jal func_8006A554 -/* 09E62C 8009DA2C 00002025 */ move $a0, $zero -/* 09E630 8009DA30 3C018012 */ lui $at, %hi(D_80126504) # $at, 0x8012 -/* 09E634 8009DA34 A0206504 */ sb $zero, %lo(D_80126504)($at) -/* 09E638 8009DA38 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 09E63C 8009DA3C 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) -/* 09E640 8009DA40 3C01800E */ lui $at, %hi(D_800DF4DC) # $at, 0x800e -/* 09E644 8009DA44 AFA20020 */ sw $v0, 0x20($sp) -/* 09E648 8009DA48 A020F4DC */ sb $zero, %lo(D_800DF4DC)($at) -/* 09E64C 8009DA4C 8DE700C4 */ lw $a3, 0xc4($t7) -/* 09E650 8009DA50 24180001 */ li $t8, 1 -/* 09E654 8009DA54 24190004 */ li $t9, 4 -/* 09E658 8009DA58 AFB90014 */ sw $t9, 0x14($sp) -/* 09E65C 8009DA5C AFB80010 */ sw $t8, 0x10($sp) -/* 09E660 8009DA60 24040001 */ li $a0, 1 -/* 09E664 8009DA64 24058000 */ li $a1, -32768 -/* 09E668 8009DA68 0C03145A */ jal func_800C5168 -/* 09E66C 8009DA6C 24060006 */ li $a2, 6 -/* 09E670 8009DA70 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 09E674 8009DA74 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) -/* 09E678 8009DA78 24090001 */ li $t1, 1 -/* 09E67C 8009DA7C 8D0700C8 */ lw $a3, 0xc8($t0) -/* 09E680 8009DA80 240A0004 */ li $t2, 4 -/* 09E684 8009DA84 AFAA0014 */ sw $t2, 0x14($sp) -/* 09E688 8009DA88 AFA90010 */ sw $t1, 0x10($sp) -/* 09E68C 8009DA8C 24040001 */ li $a0, 1 -/* 09E690 8009DA90 24058000 */ li $a1, -32768 -/* 09E694 8009DA94 0C03145A */ jal func_800C5168 -/* 09E698 8009DA98 24060014 */ li $a2, 20 -/* 09E69C 8009DA9C 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 09E6A0 8009DAA0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) -/* 09E6A4 8009DAA4 240B0032 */ li $t3, 50 -/* 09E6A8 8009DAA8 3C018012 */ lui $at, %hi(D_8012650E) # $at, 0x8012 -/* 09E6AC 8009DAAC A02B650E */ sb $t3, %lo(D_8012650E)($at) -/* 09E6B0 8009DAB0 8D84005C */ lw $a0, 0x5c($t4) -/* 09E6B4 8009DAB4 24050014 */ li $a1, 20 -/* 09E6B8 8009DAB8 0C02746E */ jal func_8009D1B8 -/* 09E6BC 8009DABC 00003025 */ move $a2, $zero -/* 09E6C0 8009DAC0 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09E6C4 8009DAC4 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) -/* 09E6C8 8009DAC8 24050014 */ li $a1, 20 -/* 09E6CC 8009DACC 8DA400CC */ lw $a0, 0xcc($t5) -/* 09E6D0 8009DAD0 0C02746E */ jal func_8009D1B8 -/* 09E6D4 8009DAD4 24060001 */ li $a2, 1 -/* 09E6D8 8009DAD8 0C02749B */ jal func_8009D26C -/* 09E6DC 8009DADC 00000000 */ nop -/* 09E6E0 8009DAE0 8FAE0020 */ lw $t6, 0x20($sp) -/* 09E6E4 8009DAE4 240400EF */ li $a0, 239 -/* 09E6E8 8009DAE8 31CF8000 */ andi $t7, $t6, 0x8000 -/* 09E6EC 8009DAEC 11E00010 */ beqz $t7, .L8009DB30 -/* 09E6F0 8009DAF0 8FBF001C */ lw $ra, 0x1c($sp) -/* 09E6F4 8009DAF4 0C000741 */ jal func_80001D04 -/* 09E6F8 8009DAF8 00002825 */ move $a1, $zero -/* 09E6FC 8009DAFC 3C028012 */ lui $v0, %hi(D_80126516) # $v0, 0x8012 -/* 09E700 8009DB00 80426516 */ lb $v0, %lo(D_80126516)($v0) -/* 09E704 8009DB04 24010001 */ li $at, 1 -/* 09E708 8009DB08 10400005 */ beqz $v0, .L8009DB20 -/* 09E70C 8009DB0C 24180001 */ li $t8, 1 -/* 09E710 8009DB10 10410005 */ beq $v0, $at, .L8009DB28 -/* 09E714 8009DB14 24190002 */ li $t9, 2 -/* 09E718 8009DB18 10000005 */ b .L8009DB30 -/* 09E71C 8009DB1C 8FBF001C */ lw $ra, 0x1c($sp) -.L8009DB20: -/* 09E720 8009DB20 10000002 */ b .L8009DB2C -/* 09E724 8009DB24 AFB80024 */ sw $t8, 0x24($sp) -.L8009DB28: -/* 09E728 8009DB28 AFB90024 */ sw $t9, 0x24($sp) -.L8009DB2C: -/* 09E72C 8009DB2C 8FBF001C */ lw $ra, 0x1c($sp) -.L8009DB30: -/* 09E730 8009DB30 8FA20024 */ lw $v0, 0x24($sp) -/* 09E734 8009DB34 03E00008 */ jr $ra -/* 09E738 8009DB38 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/data/dkr.data.s b/data/dkr.data.s index 51ae5016..670a7914 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -5857,6 +5857,8 @@ glabel D_800E1AE4 .word 0x800E81E0 .word 0x800E81E8 .word 0x800E81F4 + +glabel D_800E1AF8 .word 0x00000010 .word 0x00000020 .word 0x00000040 diff --git a/include/structs.h b/include/structs.h index 3ecc8bbd..cccdf2c1 100644 --- a/include/structs.h +++ b/include/structs.h @@ -41,7 +41,6 @@ typedef struct dkr_racer_t { /* 0x08 */ u16 placements[4]; /* 0x10 */ u16 course_time; /* 0x12 */ u16 lap_times[3]; - /* 0x14 */ u32 unk14; } dkr_racer_t; /* Unknown Size */ diff --git a/src/mips1/unknown_080500.c b/src/mips1/unknown_080500.c index a7d7cc61..8ca9e7a2 100644 --- a/src/mips1/unknown_080500.c +++ b/src/mips1/unknown_080500.c @@ -48,17 +48,35 @@ extern s32 gActiveMagicCodes; extern s32 gUnlockedMagicCodes; typedef struct unk800DF4A0 { - u8 pad0[0x25C]; + u8 pad0[0x5C]; + s32 unk5C; + s32 unk60; + u8 unk64[0xC]; + s32 unk70; + u8 pad74[0x1C]; + s32 unk90; + u8 pad94[0x30]; + s32 unkC4; + s32 unkC8; + s32 unkCC; + u8 padD0[0x48]; + s32 unk118; + u8 pad11C[0x100]; + s32 unk21C; + u8 pad220[0x8]; + s32 unk228[4]; + u8 pad238[0x24]; s32 unk25C; } unk800DF4A0; extern unk800DF4A0* D_800DF4A0; extern s32 D_800DF478; extern s32 D_800DF47C; +extern s32 D_800DF480; extern s32 D_800DF488; extern s32 D_800DF498; extern s32 D_800DF4B8; -extern s32 D_800DF4BC; +extern s32 D_800DF4BC; // Number of active players? extern s32 D_800DF4C8; extern s32 D_800DF4D4; extern s8 D_800DF4D8; @@ -68,6 +86,9 @@ extern s8 D_800DF4E4[4]; extern s8 D_800DF4EC; extern s32 gIsInTwoPlayerAdventure; extern s32 gSaveFileIndex; +extern s16 *D_800DF750[32]; // unknown number of entries +extern s16 D_800DF754; +extern s16 D_800DF758; extern s16 D_800DF7C4[11]; extern s32 D_800DF774; extern s32 D_800DF77C; @@ -75,9 +96,9 @@ extern s32 D_800DF794; extern s32 D_800DF798; extern s32 D_800DF79C; extern s32 D_800DF7A0; +extern char *D_800DFA10[7]; extern s32 D_800DFA2C; - typedef struct unk800DFA3C { u8 pad0[0x32]; u16 unk32; @@ -91,7 +112,16 @@ extern s32 D_800DFAC0; extern s32 D_800DFAC4; extern s16 D_800DFA38; + +extern u32* D_800DFC10; +extern u32* D_800DFC20; +extern u32* D_800DFC30; +extern u32* D_800DFC40; +extern u32* D_800DFC50; +extern u32* D_800DFC60; extern s16 D_800DFC78[24]; +extern u32* D_800DFCAC; +extern s32 D_800DFD94; extern u8 D_800DFDB4[10][2]; extern s32 D_800DFDC8; extern s32 D_800DFFD0; @@ -123,7 +153,9 @@ extern s16 D_800E0710[30]; extern s16 D_800E07C4[30]; extern s32 D_800E0970; extern s32 D_800E0984; +extern s32 D_800E0988; extern s32 D_800E0A24; +extern s32 D_800E0A40; extern u32* D_800E0A50; extern u32* D_800E0A60; extern u32* D_800E0A70; @@ -141,8 +173,8 @@ extern s32 D_800E0F98; extern s32 D_800E0F9C; extern s32 D_800E0FA0; extern s32 D_800E0FB4; -extern s32 D_800E0FE4; // Number of racers in trophy race? -extern s32 D_800E0FEC; +extern s32 D_800E0FE4; // Number of racers in trophy race? (1 to 8) +extern s32 D_800E0FEC; // Trophy race round? (0 to 3) extern s32 gTrophyRaceWorldId; extern s32 D_800E1024; extern MenuElement D_800E1048; @@ -150,12 +182,19 @@ extern MenuElement D_800E1088[8][3]; // 8 Racers with 3 MenuElement structs. extern s32 D_800E1708; extern s16 D_800E1768[10]; extern s32 D_800E17D8; +extern s16 D_800E17F0[8]; // Unknown number of entries +extern u16 D_800E18F8; +extern char *D_800E1938[107]; // Credits text look-up table +extern char *D_800E1AE4[5]; // Credits text look-up table +extern s32 D_800E1AF8[28]; +extern s32 D_800E1B4C; // boolean, set to 1 if viewing credits from "WHODIDTHIS" cheat extern s32 *D_800E1DA4[2]; extern s32 *D_800E1DAC[2]; extern s32 D_800E1DB4; extern s32 D_800E1DB8; extern s32 D_800E1DBC; extern s8 D_800E1E28; +extern s32 D_800E8230; extern f32 D_800E8414; extern s32 D_801263A0; @@ -182,8 +221,8 @@ 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 s8 D_8012645C; +extern s8 D_8012645D; extern u8 D_8012645E; extern u8 D_8012645F; extern s8 D_80126464; @@ -208,6 +247,7 @@ extern s8 D_8012650E; extern s8 D_80126516; extern Settings *D_80126530[3]; extern u32* D_80126550[1]; // lookup table? Unknown number of entries. +extern u8 D_80126750[1]; // unknown number of entries extern s8* D_801267EC; extern s32 D_80126804; extern s32 D_80126824; @@ -223,19 +263,36 @@ extern s8 D_801269C0[4]; // Unknown number of entries. extern u32* D_801269E0; extern s32 D_801269FC; extern s32 D_80126A00; +extern s32 D_80126A04; extern s32 D_80126A08; extern s32 D_80126A0C; extern s32 D_80126A10; extern s32 D_80126A14; +extern s32 D_80126A18; +extern s32 D_80126A1C; extern s32 D_80126A20[8]; // Unknown number of entries. +extern s8 D_80126A60[2]; extern s32 D_80126A64; +extern s32 D_80126A68; +extern s32 D_80126A6C; extern s32 D_80126A94; -extern s32 D_80126AA0; +extern s32* D_80126AA0[16]; +extern s32 D_80126BB4; +extern s32 D_80126BC4; +extern s32 D_80126BC8; +extern s32 D_80126BCC; +extern s32 D_80126BD0; extern s32 D_80126BD4; +extern s32 D_80126BD8; extern f32 D_80126BDC; +extern s32 D_80126BE0; extern f32 D_80126BEC; extern s32 D_80126BE4; +extern s32 D_80126BF0[3]; +extern s32 D_80126C10; +extern s32 D_80126C14; extern s32 *D_80126C2C; +extern u16 *D_80126C30[30]; // Cheat table. extern s32 D_80126C34; extern s32 D_80126C3C; extern u16 D_80126C40; @@ -252,11 +309,17 @@ extern s32 D_80126C74; extern s32 D_80126C78; extern s32 D_80126CC0; -Settings *get_settings(); +Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); void func_8008E4B0(void); s8* func_8001E29C(s32 arg0); +void func_80001D04(s32, s32*); +void func_800660EC(f32 arg0); +void func_8009C508(s32 arg0); +void *func_80070C9C(s32, u32); +void func_800C4170(s32 arg0); +void func_80000B34(s32 arg0); GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8007F900.s") @@ -304,7 +367,7 @@ void func_80081E54(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5) { D_800DF79C = arg4; D_800DF7A0 = arg5; if (D_80126858 > 0) { - func_80001D04(0x16, 0); + func_80001D04(0x16, NULL); } } @@ -419,7 +482,40 @@ void menu_options_init(void) { func_80000B18(); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800841B8.s") +void func_800841B8(s32 arg0) { + s32 phi_s1; + s32 phi_a3; + s32 phi_s2; + + func_800C42EC(2); + func_800C43CC(0, 0, 0, 0); + func_800C4384(0, 0, 0, 0xFF, 0x80); + func_800C4440(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk90, 0xC); + func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); + func_800C4440(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk90, 0xC); + + phi_s1 = 0; + phi_s2 = 0x4C; + + func_800C42EC(0); + + while(D_800DFA10[phi_s1] != NULL) { + if (phi_s1 == D_800DF460) { + phi_a3 = D_801263BC * 8; + if (D_801263BC >= 0x20) { + phi_a3 = 0x1FF - phi_a3; + } + } else { + phi_a3 = 0; + } + func_800C4384(0xFF, 0xFF, 0xFF, phi_a3, 0xFF); + func_800C4440(&D_801263A0, -0x8000, phi_s2, D_800DFA10[phi_s1], 0xC); + + phi_s1++; + phi_s2 += 0x1C; + } +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") void func_80084734(void) { @@ -428,7 +524,6 @@ void func_80084734(void) { void func_8009C8A4(s16 *arg0); -//GLOBAL_ASM("asm/non_matchings/unknown_080500/menu_audio_options_init") void MenuAudioOptionsInit(void) { D_80126C46 = 0; D_801263BC = 0; @@ -472,7 +567,42 @@ void func_800851FC(void) { func_800C422C(2); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuSaveOptionsInit.s") +//GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuSaveOptionsInit.s") + +void MenuSaveOptionsInit(void) { + D_80126A6C = 1; + D_80126A10 = 0; + D_80126A18 = 1; + D_80126A1C = 1; + D_80126C46 = 0; + D_801263BC = 0; + D_800DF47C = 0; + D_801263E0 = 1; + D_801263D8 = 0; + D_80126A64 = (s32)func_80070C9C(0x800, 0xFFFFFFFF); + D_80126A0C = (s32)func_80070C9C(0xA00, 0xFFFFFFFF); + D_80126A04 = (s32)(D_80126A0C + 0x500); + D_80126A08 = 0; + D_80126BD4 = 0; + D_80126BDC = 0.0f; + D_80126A00 = 0; + D_80126BE4 = 0; + D_80126BEC = 0.0f; + func_8009C674((s16*)&D_800DFC78); + func_8009C8A4((s16*)&D_800DFCAC); + func_8007FFEC(0xA); + func_800C4170(2); + D_800DFC10 = D_80126550[71]; + D_800DFC20 = D_80126550[72]; + D_800DFC30 = D_80126550[75]; + D_800DFC40 = D_80126550[74]; + D_800DFC50 = D_80126550[73]; + D_800DFC60 = D_80126550[70]; + func_8008E4B0(); + func_8006EBA8(); + func_800C01D8(&D_800DF77C); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800853D0.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80085B9C.s") @@ -578,19 +708,19 @@ s32 func_800874D0(s32 arg0, s32 arg1) { if (D_80126A10 != D_80126A14) { func_800871D8(8); } else { - func_80001D04(0x241, 0); + func_80001D04(0x241, NULL); sp1C = -1; } } else { if (arg0 & 0x9000) { - func_80001D04(0xEF, 0); + func_80001D04(0xEF, NULL); D_801263E0 = 4; } else { if ((arg1 < 0) && (D_80126BD4 > 0)) { - func_80001D04(0xEB, 0); + func_80001D04(0xEB, NULL); D_80126BD4 = (s32) (D_80126BD4 - 1); } else if ((arg1 > 0) && (D_80126BD4 < (D_80126A08 - 1))) { - func_80001D04(0xEB, 0); + func_80001D04(0xEB, NULL); D_80126BD4 = (s32) (D_80126BD4 + 1); } } @@ -600,18 +730,18 @@ s32 func_800874D0(s32 arg0, s32 arg1) { s32 func_800875E4(s32 arg0, s32 arg1) { if (arg0 & 0x4000) { - func_80001D04(0x241, 0); + func_80001D04(0x241, NULL); D_801263E0 = 3; } else { if (arg0 & 0x9000) { - func_80001D04(0xEF, 0); + func_80001D04(0xEF, NULL); D_801263E0 = 6; } else { if ((arg1 < 0) && (D_80126BE4 > 0)) { - func_80001D04(0xEB, 0); + func_80001D04(0xEB, NULL); D_80126BE4 = (s32) (D_80126BE4 - 1); } else if ((arg1 > 0) && (D_80126BE4 < D_80126A00 - 1)) { - func_80001D04(0xEB, 0); + func_80001D04(0xEB, NULL); D_80126BE4 = (s32) (D_80126BE4 + 1); } } @@ -622,10 +752,10 @@ s32 func_800875E4(s32 arg0, s32 arg1) { s32 func_800876CC(s32 arg0, s32 arg1) { if (arg0 & 0x4000) { - func_80001D04(0x241, 0); + func_80001D04(0x241, NULL); D_801263E0 = 5; } else if (arg0 & 0x9000) { - func_80001D04(0xEF, 0); + func_80001D04(0xEF, NULL); D_801263E0 = 7; D_801263D8 = 0; } @@ -691,13 +821,52 @@ void func_800887C4(void) { func_8009C4A8((s16*)D_800DF7C4); } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800887E8.s") +void func_800887E8(void) { + s32 i; + + // Starting point + D_80126AA0[0] = func_80070C9C(0x200, 0xFFFFFFFF); + + // Fills in the table. + for(i = 1; i < 16; i++) { + D_80126AA0[i] = (s32*)(((u32)D_80126AA0[0]) + (i * 0x20)); + } + + for(i = 0; i < 1; i++) { + D_80126A60[i] = 0; + } + + D_80126C10 = 0; + D_801263E0 = 0; + D_801263BC = 0; + D_80126A68 = -1; + func_8007F900(func_8009EB20()); + if (func_80087F14(&D_80126A68, 0) == 0) { + D_800DF47C = 0; + } else if (func_8008832C() == 0) { + D_800DF47C = 0x14; + } + if (D_80126BC8 == 0 && D_800DFD94 == 0) { + D_800DF47C = 0x14; + } + D_800DF460 = 0; + D_801263D8 = 0; + func_8009C6D4(0x3F); + func_8008E4B0(); + if (osTvType == 0) { + D_80126BB4 = 8; + } else { + D_80126BB4 = 7; + } + func_800C4170(2); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80088938.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800890AC.s") void func_800895A4(void) { func_8009C508(0x3F); - func_80071140(D_80126AA0); + func_80071140(D_80126AA0[0]); func_800C422C(2); } @@ -781,7 +950,28 @@ void func_8008AEB4(s32 arg0, s32 *arg1) { GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008AF00.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008B20C.s") + +void func_8008B20C(s32 arg0) { + s32 temp; + if (D_800DF47C >= -0x16 && D_800DF47C < 0x17) { + func_800C42EC(2); + func_800C43CC(0, 0, 0, 0); + func_800C4384(0, 0, 0, 0xFF, 0x80); + func_800C4440(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC); + func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); + func_800C4440(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC); + if (D_800DF480 == D_800DF4BC && D_800DF4BC > 0) { + temp = 0xD0; + if (osTvType == 0) { + temp = 0xEA; + } + func_800C4440(&D_801263A0, 0xA0, temp, &D_800E8230, 0xC); + } + func_8007B3D0(&D_801263A0); + func_800660EC(40.0f); + } +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008B358.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008B4C8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008B758.s") @@ -812,10 +1002,10 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { } if (!someBool) { D_801263E8[arg0] = arg1[j]; - func_80001D04(arg3, 0); + func_80001D04(arg3, NULL); return; } - func_80001D04(arg4, 0); + func_80001D04(arg4, NULL); } void func_8008C128(void) { @@ -848,7 +1038,7 @@ s32 menu_caution_loop(s32 arg0) { } else { if (D_801263C4 <= 0) { if (func_8006A554(0) & 0xD000) { - func_80001D04(0xEF, 0); + func_80001D04(0xEF, NULL); D_800DF47C = 1; func_800C01D8(&D_800DF774); } @@ -872,8 +1062,103 @@ void func_8008C4E8(void) { func_800C422C(2); } +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGameSelectInit.s") +#else + +typedef struct MenuElementTest { + MenuElement unk0; + MenuElement unk20; +} MenuElementTest; + +extern MenuElementTest *D_80126460; +extern MenuElementTest D_800E0198[4]; +extern MenuElementTest D_800E0278[4]; + +void MenuGameSelectInit(void) { + s32 i, j; + + D_800DF47C = 0; + D_801263BC = 0; + D_800DF460 = 0; + D_801263E0 = 2; + func_800C01D8(&D_800DF77C); + func_8006EBA8(); + func_8001B790(); + D_801263D8 = 1; + func_8009C6D4(0x43); + func_8007FFEC(3); + func_800C4170(2); + func_80000B34(0x1A); + + for(i = 0; i < 10; i++) { + if (i != D_801263B4) { + func_80001114(D_800DFDB4[i][0]); + func_80001114(D_800DFDB4[i][1]); + } + } + + func_80001114(6); + func_80000B18(); + if (func_8009EC60()) { + D_80126460 = (MenuElementTest *)D_800E0278; + D_801263E0 = 2; + } else { + D_80126460 = (MenuElementTest *)D_800E0198; + D_801263E0 = 1; + } + + for(i = 0; D_801263E0 >= i; i++) { + ((MenuElementTest*)(D_80126460 + i + 1))->unk0.source.texture = D_80126550[67]; + } +} +#endif + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008C698.s") +#else +typedef struct unk80126460 { + MenuElement textShadow; + MenuElement text; +} unk80126460; + +extern unk80126460 *D_80126460[4]; + +void func_8008C698(s32 arg0) { + s32 fade; + s32 i; + s32 filterAlpha; + + if (D_800DF47C >= -21 && D_800DF47C < 22) { + fade = D_801263BC * 8; + fade = fade; + if (fade >= 0x100) { + fade = 0x1FF - fade; + } + func_80067F2C(&D_801263A0, &D_801263A8); + + for(i = 0; i <= D_801263E0; i++) { + filterAlpha = 0; + if (i == D_800DF460) { + filterAlpha = fade; + } + ((unk80126460*)(*D_80126460 + i + 1))->text.filterAlpha = filterAlpha; + } + + if (osTvType == 0) { + D_800DF79C = 0xC; + D_800DF7A0 = 0; + } else { + D_800DF79C = 0; + D_800DF7A0 = 0; + } + + DrawMenuText(1, (MenuElement*)*D_80126460, 1.0f); + func_80080BC8(&D_801263A0); + } +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuFileSelectLoop.s") void func_8008CACC(void) { @@ -913,12 +1198,121 @@ void menu_file_select_init(void) { func_80000B18(); } +/* Size: 0x20 bytes */ +typedef struct unk8009C904 { + s16 unk0; + s16 unk2; + s16 unk4; + s16 unk6; + f32 unk8; + f32 unkC; + f32 unk10; + f32 unk14; + s16 unk18; + s8 unk1A; + s8 unk1B; + s8 unk1C; + s8 unk1D; + u8 pad1E[2]; +} unk8009C904; + +extern unk8009C904 D_800DF510[18]; +extern unk8009C904 *D_800DF75C; + +extern u8 D_800DF4A4; +extern u8 D_800DF4A8; +extern u8 D_800DF4AC; +extern s32 D_800DF764; GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008CC28.s") + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008CD74.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008D5F8.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008D8BC.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008DC7C.s") +#else +/* Size: 0x0C Bytes */ +typedef struct unk801264A0 { + u8 unk0; + u8 unk1; + u16 unk2; + char name[4]; + u32 pad8; +} unk801264A0; + +extern unk801264A0 D_801264A0[3]; // Filename structs? +extern s32 D_80126494; +extern s32 D_8012648C; + +void func_8008DC7C(s32 arg0) { + s32 temp_t6; + s32 temp_a1; + s32 phi_v1; + s32 phi_v1_2; + + phi_v1 = func_8006A554(0); + temp_a1 = D_8012645C; + if (D_800DF4BC == 2) { + phi_v1 = phi_v1 | func_8006A554(1); + temp_a1 += D_8012645D; + } + + if (D_80126494 == 0) { + if (phi_v1 & 0x4000) { + func_80001D04(0x241, NULL); + D_80126488 = 0; + } else if (phi_v1 & 0x9000) { + if (D_801264A0[D_8012648C].unk0 == 0) { + func_80001D04(0x241, NULL); + } + func_80001D04(0xEF, NULL); + D_80126494 = 1; + } + + phi_v1_2 = D_8012648C; + if (temp_a1 < 0) { + phi_v1_2 = D_8012648C; + if (D_8012648C > 0) { + D_8012648C--; + phi_v1_2 = D_8012648C; + } + } + + if (temp_a1 > 0) { + temp_t6 = phi_v1_2 + 1; + if (phi_v1_2 < 2) { + D_8012648C = temp_t6; + phi_v1_2 = temp_t6; + } + } + + //if (D_8012648C != phi_v1_2) { + func_80001D04(0xEB, NULL); + //} + } else { + if (phi_v1 & 0x9000) { + func_80001D04(0xEF, NULL); + func_8006ECAC(D_8012648C); + D_801264A0[D_8012648C].unk0 = 0; + D_801264A0[D_8012648C].unk1 = 0; + D_801264A0[D_8012648C].unk2 = 0; + D_801264A0[D_8012648C].name[0] = 'D'; + D_801264A0[D_8012648C].name[1] = 'K'; + D_801264A0[D_8012648C].name[2] = 'R'; + D_801264A0[D_8012648C].name[3] = '\0'; + gSaveFileIndex = (s32) D_8012648C; + D_801263E0 = 0; + D_80126488 = 0; + } else if (phi_v1 & 0x4000) { + func_80001D04(0x241, NULL); + D_80126494 = 0; + } + } +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuGameSelectLoop.s") void func_8008E428(void) { @@ -1123,7 +1517,44 @@ void func_80096790(void) { } #endif -GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Init.s") +void Menu11Init(void) { + Settings *settings; + u16 *placements; + s32 i; + s8 temp_a2; + + settings = get_settings(); + D_80126BF0[0] = (s32) D_800DF4A0->unk60; + D_80126BF0[1] = (s32) D_800DF4A0->unk5C; + D_80126BF0[2] = (s32) D_800DF4A0->unk70; + D_80126C14 = 3; + + + for (i = 0; i < D_800DF4BC; i++) { + temp_a2 = settings->racers[i].starting_position; + if (temp_a2 < 4) { + placements = settings->racers[i].placements; + placements[temp_a2]++; + } + } + + D_801263E0 = -1; + D_801263BC = 0; + D_801263D8 = 0; + D_800DF47C = 0; + D_80126A68 = 0; + D_801263C4 = 1; + D_800E0988 = 0; + func_8009C674((s16*)&D_800E0A24); + func_8009C8A4((s16*)&D_800E0A40); + func_80094604(); + func_800C4170(2); + func_800C01D8(&D_800DF77C); + func_80000BE0(0x18); + func_80000B34(0x18); + func_80000C98(0x80); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_80096978.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/Menu11Loop.s") @@ -1223,9 +1654,75 @@ void func_80098208(void) { func_8000E4BC(0); } +extern s32 D_800E0980; +s8* func_8001E29C(s32 arg0); +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800983C0.s") +#else +void MenuTrophyRaceRoundInit(void) { + s32 temp; + s32 i; + Settings *settings; + s8 *temp_t9; + + settings = get_settings(); + temp_t9 = func_8001E29C(0x1A); // Returns level ids array. + + if (D_800E0FEC == 0) { + for(i = 0; i < 8; i++) { + settings->racers[i].trophy_points = 0; + } + } + + temp = temp_t9[((gTrophyRaceWorldId - 1) * 6) + D_800E0FEC]; + while(temp == -1) { + temp = (temp + 1) & 3; + } + + for(i = 0; i < D_800DF4BC; i++){ + D_801269C0[i] = func_8006B0AC(temp); + } + + func_8006DB14(func_8006B0AC(temp)); + func_8006E2E8(temp, -1, 1); + + D_800DF47C = 0; + D_800E0980 = 10; + func_800C4170(2); + func_80000BE0(0x18); + func_80000B34(0x18); + func_80000C98(0x100); +} +#endif + +void func_800983C0(s32 arg0) { + s32 sp2C; + s32 sp28; + s32 sp24; + s8* sp20; + + sp20 = func_8001E29C(0x1A); + if (osTvType == 0) { + sp2C = 0x12; + } else { + sp2C = 0; + } + + sp28 = func_8006BDDC(func_8006B1D4(gTrophyRaceWorldId)); + sp24 = func_8006BDDC(sp20[((gTrophyRaceWorldId - 1) * 6) + D_800E0FEC]); + func_800C43CC(0, 0, 0, 0); + func_800C42EC(2); + func_800C4384(0, 0, 0, 0xFF, 0x80); + func_800C4440(&D_801263A0, 0xA1, 0x23, sp28, 0xC); + func_800C4440(&D_801263A0, 0xA1, 0x43, D_800DF4A0->unk118, 0xC); + func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); + func_800C4440(&D_801263A0, 0xA0, 0x20, sp28, 0xC); + func_800C4440(&D_801263A0, 0xA0, 0x40, D_800DF4A0->unk118, 0xC); + func_800C4440(&D_801263A0, 0xA0, sp2C + 0xB0, D_800DF4A0->unk228[D_800E0FEC], 0xC); + func_800C4440(&D_801263A0, 0xA0, sp2C + 0xD0, sp24, 0xC); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s") void func_80098754(void) { @@ -1331,7 +1828,71 @@ void func_8009AF18(void) { } } -GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCreditsInit.s") +void MenuCreditsInit(void) { + s32 phi_v1; + s32 phi_a0; + u16 *temp; + Settings *settings; + + settings = get_settings(); + D_800DF47C = 0; + D_80126BC4 = 0; + D_80126BCC = 0; + D_801263E0 = 0; + D_801263D8 = 0x28; + D_800DF460 = 0; + D_80126BD0 = 0; + D_80126BD8 = 0; + D_80126BE0 = 0; + func_80077B5C(0, 0, 0); + if (osTvType == 0) { + func_80066940(0, 0, 0x26, 0x140, 0xE0); + func_80066AA8(0, 0x8000, 0x8000, 0x140, 0x11C); + } else { + func_80066940(0, 0, 0x28, 0x140, 0xC4); + func_80066AA8(0, 0x8000, 0x8000, 0x140, 0xF0); + } + func_80066610(); + func_80066818(0, 1); + func_8009C674((s16*)&D_800E17D8); + func_8009C8A4((s16*)&D_800E17F0); + func_80094604(); + func_800C4170(2); + func_80000BE0(0x18); + D_800E18F8 = (u16)0x1000; + if (D_800E1B4C) { + func_80000B34(8); + D_800E1938[84] = D_800E1AE4[2]; + D_800E1938[85] = D_800E1AE4[3]; + D_800E1938[86] = D_800E1AE4[4]; + D_800E1B4C = 0; + } else { + if (settings->bosses & 0x20) { + func_80000B34(0x25); + D_800E1938[84] = D_800E1AE4[1]; + D_800E18F8 = (u16)0x61F4; + D_80126BCC = 9; + } else { + func_80000B34(8); + D_800E1938[84] = D_800E1AE4[0]; + } + phi_v1 = D_800E1AF8[func_8006F94C(0, 0x14, &D_800E1938)]; + phi_a0 = -1; + while(phi_v1 != 0) { + phi_v1 >>= 1; + phi_a0++; + } + + // I don't know why this works. Please clean it up if you can! + temp = *D_80126C30 + 1; + D_800E1938[85] = (char*)(*D_80126C30) + (temp)[(phi_a0 << 1) + 1]; + D_800E1938[86] = (char*)(*D_80126C30) + (temp)[(phi_a0 << 1)]; + } + func_80000B18(); + func_800C0170(); + func_8006F564(1); +} + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009B1E4.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuCreditsLoop.s") @@ -1560,7 +2121,48 @@ void func_8009C4A8(s16 *arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C508.s") +void func_8007B2BC(u32 arg0); +void func_8007CCB0(u32 arg0); +void func_8000FFB8(u32 arg0); +void func_8005FF40(u32 arg0); + +//GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C508.s") +void func_8009C508(s32 arg0) { + if (D_80126750[arg0] != 0) { + if (D_80126550[arg0] != 0) { + if ((((*D_800DF750)[arg0] & 0xC000) == 0xC000) && (D_80126550[arg0] != 0)) { + func_800710B0(0); + func_8007B2BC((u32)D_80126550[arg0]); + func_800710B0(2); + } else { + if ((*D_800DF750)[arg0] & 0x8000) { + func_8007CCB0((u32)D_80126550[arg0]); + } else { + if ((*D_800DF750)[arg0] & 0x4000) { + func_8000FFB8((u32)D_80126550[arg0]); + } else { + func_8005FF40((u32)D_80126550[arg0]); + } + } + } + } + D_80126550[arg0] = 0; + D_80126750[arg0] = 0; + D_800DF758--; + func_8001004C(); + } + if (D_800DF758 == 0) { + if (D_800DF75C != 0) { + func_80071140(D_800DF75C); + D_800DF75C = 0; + } + if (*D_800DF750 != NULL) { + func_80071140(*D_800DF750); + *D_800DF750 = NULL; + D_800DF754 = (u16)0; + } + } +} void func_8009C674(s16 *arg0) { s32 index = 0; @@ -1571,6 +2173,8 @@ void func_8009C674(s16 *arg0) { GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C6D4.s") +void func_8009C904(s32 arg0); + void func_8009C8A4(s16 *arg0) { s32 index = 0; while (arg0[index] != -1) { @@ -1578,7 +2182,32 @@ void func_8009C8A4(s16 *arg0) { } } +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009C904.s") +# else +s32 func_8006F94C(s32, s32); +unk8009C904 *func_80070C9C(s32, u32); +void func_8009C904(s32 arg0) { + if (D_800DF75C == NULL) { + D_800DF75C = func_80070C9C(0x240, 0xFF0000FF); + } + + D_800DF75C->unk0 = D_800DF510[arg0].unk0; + D_800DF75C->unk2 = D_800DF510[arg0].unk2; + D_800DF75C->unk4 = D_800DF510[arg0].unk4; + D_800DF75C->unk6 = D_800DF510[arg0].unk6; + D_800DF75C->unkC = D_800DF510[arg0].unkC; + D_800DF75C->unk10 = D_800DF510[arg0].unk10; + D_800DF75C->unk14 = D_800DF510[arg0].unk14; + D_800DF75C->unk8 = D_800DF510[arg0].unk8; + D_800DF75C->unk18 = D_800DF510[arg0].unk18; + D_800DF75C->unk1A = func_8006F94C(0, 0xFFFF); + D_800DF75C->unk1B = func_8006F94C(0, 0xFFFF); + D_800DF75C->unk1C = func_8006F94C(0, 0xFFFF); + D_800DF75C->unk1D = D_800DF510[arg0].unk1D; +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009CA60.s") GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009CD7C.s") @@ -1618,7 +2247,7 @@ void func_8009D118(s32 arg0) { void func_8009D1B8(s32 arg0, s32 arg1, s32 arg2) { func_8009D118(D_801264D8 == D_80126504); if (D_801264D8 == D_80126504) { - D_80126516 = (s8) arg2; + D_80126516 = arg2; } func_800C5168(1, -0x8000, D_8012650E, arg0, 1, 4); D_8012650E = (s8) (D_8012650E + arg1); @@ -1628,10 +2257,10 @@ void func_8009D1B8(s32 arg0, s32 arg1, s32 arg2) { void func_8009D26C(void) { if (D_80126464 < 0) { D_801264D8 = D_801264D8 + 1; - func_80001D04(0xB2, 0); + func_80001D04(0xB2, NULL); } else if (D_80126464 > 0) { D_801264D8 = D_801264D8 - 1; - func_80001D04(0xB2, 0); + func_80001D04(0xB2, NULL); } if (D_801264D8 < 0) { @@ -1658,7 +2287,37 @@ void func_8009D33C(s32 arg0, s32 arg1) { } GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D360.s") -GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8009D9F4.s") + +s32 func_8009D9F4(void) { + s32 state; + s32 temp_v0; + + func_800C4EDC(1, 0x18, 0x10, 0xB8, 0x87); + func_800C4F7C(1, 0); + state = 0; + temp_v0 = func_8006A554(0); + D_80126504 = 0; + D_800DF4DC = 0; + func_800C5168(1, -0x8000, 6, D_800DF4A0->unkC4, 1, 4); + func_800C5168(1, -0x8000, 0x14, D_800DF4A0->unkC8, 1, 4); + D_8012650E = 0x32; + func_8009D1B8(D_800DF4A0->unk5C, 0x14, 0); + func_8009D1B8(D_800DF4A0->unkCC, 0x14, 1); + func_8009D26C(); + if (temp_v0 & 0x8000) { + func_80001D04(0xEF, NULL); + switch(D_80126516) { + case 0: + state = 1; + break; + case 1: + state = 2; + break; + } + } + return state; +} + 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") diff --git a/undefined_syms.txt b/undefined_syms.txt index 04c32085..660bc561 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -544,6 +544,7 @@ D_800E17F4 = 0x800E17F4; D_800E18F8 = 0x800E18F8; D_800E1938 = 0x800E1938; D_800E1AE4 = 0x800E1AE4; +D_800E1AF8 = 0x800E1AF8; D_800E1B4C = 0x800E1B4C; D_800E1B50 = 0x800E1B50; D_800E1B58 = 0x800E1B58;