diff --git a/asm/non_matchings/unknown_00BC20/D_80019808.s b/asm/non_matchings/unknown_00BC20/D_80019808.s index 9c33a943..3c3a5a0f 100644 --- a/asm/non_matchings/unknown_00BC20/D_80019808.s +++ b/asm/non_matchings/unknown_00BC20/D_80019808.s @@ -27,8 +27,8 @@ glabel D_80019808 /* 01A46C 8001986C 11C003D0 */ beqz $t6, .L8001A7B0 /* 01A470 80019870 24010042 */ li $at, 66 /* 01A474 80019874 14610008 */ bne $v1, $at, .L80019898 -/* 01A478 80019878 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 -/* 01A47C 8001987C 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c +/* 01A478 80019878 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01A47C 8001987C 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c /* 01A480 80019880 8D640000 */ lw $a0, ($t3) /* 01A484 80019884 AFBF0064 */ sw $ra, 0x64($sp) /* 01A488 80019888 0C01144A */ jal func_80045128 @@ -38,11 +38,11 @@ glabel D_80019808 .L80019898: /* 01A498 80019898 3C0F8012 */ lui $t7, %hi(D_8011ADB4) # $t7, 0x8012 /* 01A49C 8001989C 8DEFADB4 */ lw $t7, %lo(D_8011ADB4)($t7) -/* 01A4A0 800198A0 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 +/* 01A4A0 800198A0 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 /* 01A4A4 800198A4 15E003C2 */ bnez $t7, .L8001A7B0 -/* 01A4A8 800198A8 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c -/* 01A4AC 800198AC 3C128012 */ lui $s2, %hi(D_8011AEF0) # $s2, 0x8012 -/* 01A4B0 800198B0 2652AEF0 */ addiu $s2, %lo(D_8011AEF0) # addiu $s2, $s2, -0x5110 +/* 01A4A8 800198A8 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01A4AC 800198AC 3C128012 */ lui $s2, %hi(playerCount) # $s2, 0x8012 +/* 01A4B0 800198B0 2652AEF0 */ addiu $s2, %lo(playerCount) # addiu $s2, $s2, -0x5110 /* 01A4B4 800198B4 8E470000 */ lw $a3, ($s2) /* 01A4B8 800198B8 00008025 */ move $s0, $zero /* 01A4BC 800198BC 18E00066 */ blez $a3, .L80019A58 @@ -86,8 +86,8 @@ glabel D_80019808 /* 01A550 80019950 AFAA0044 */ sw $t2, 0x44($sp) /* 01A554 80019954 0C001AB2 */ jal func_80006AC8 /* 01A558 80019958 AFA5004C */ sw $a1, 0x4c($sp) -/* 01A55C 8001995C 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 -/* 01A560 80019960 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c +/* 01A55C 8001995C 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01A560 80019960 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c /* 01A564 80019964 8FAA0044 */ lw $t2, 0x44($sp) /* 01A568 80019968 8D6E0000 */ lw $t6, ($t3) /* 01A56C 8001996C 8FA5004C */ lw $a1, 0x4c($sp) @@ -478,13 +478,13 @@ glabel D_80019808 /* 01AAD4 80019ED4 10000236 */ b .L8001A7B0 /* 01AAD8 80019ED8 AC34ADB4 */ sw $s4, %lo(D_8011ADB4)($at) .L80019EDC: -/* 01AADC 80019EDC 3C078012 */ lui $a3, %hi(D_8011AEF0) # $a3, 0x8012 -/* 01AAE0 80019EE0 3C128012 */ lui $s2, %hi(D_8011AEF0) # $s2, 0x8012 -/* 01AAE4 80019EE4 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 -/* 01AAE8 80019EE8 8CE7AEF0 */ lw $a3, %lo(D_8011AEF0)($a3) +/* 01AADC 80019EDC 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 +/* 01AAE0 80019EE0 3C128012 */ lui $s2, %hi(playerCount) # $s2, 0x8012 +/* 01AAE4 80019EE4 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01AAE8 80019EE8 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) /* 01AAEC 80019EEC 00008025 */ move $s0, $zero -/* 01AAF0 80019EF0 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c -/* 01AAF4 80019EF4 2652AEF0 */ addiu $s2, %lo(D_8011AEF0) # addiu $s2, $s2, -0x5110 +/* 01AAF0 80019EF0 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01AAF4 80019EF4 2652AEF0 */ addiu $s2, %lo(playerCount) # addiu $s2, $s2, -0x5110 /* 01AAF8 80019EF8 00005025 */ move $t2, $zero /* 01AAFC 80019EFC 240D000A */ li $t5, 10 .L80019F00: @@ -608,11 +608,11 @@ glabel D_80019808 /* 01ACB0 8001A0B0 AFAA0044 */ sw $t2, 0x44($sp) /* 01ACB4 8001A0B4 8FA80080 */ lw $t0, 0x80($sp) /* 01ACB8 8001A0B8 8FAA0044 */ lw $t2, 0x44($sp) -/* 01ACBC 8001A0BC 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 +/* 01ACBC 8001A0BC 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 /* 01ACC0 8001A0C0 8FBF0064 */ lw $ra, 0x64($sp) /* 01ACC4 8001A0C4 24010004 */ li $at, 4 /* 01ACC8 8001A0C8 10410019 */ beq $v0, $at, .L8001A130 -/* 01ACCC 8001A0CC 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c +/* 01ACCC 8001A0CC 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c /* 01ACD0 8001A0D0 A11401D8 */ sb $s4, 0x1d8($t0) /* 01ACD4 8001A0D4 8E380000 */ lw $t8, ($s1) /* 01ACD8 8001A0D8 00000000 */ nop @@ -629,12 +629,12 @@ glabel D_80019808 /* 01AD04 8001A104 AFA80080 */ sw $t0, 0x80($sp) /* 01AD08 8001A108 0C000741 */ jal func_80001D04 /* 01AD0C 8001A10C AFAA0044 */ sw $t2, 0x44($sp) -/* 01AD10 8001A110 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 +/* 01AD10 8001A110 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 /* 01AD14 8001A114 8FA80080 */ lw $t0, 0x80($sp) /* 01AD18 8001A118 8FAA0044 */ lw $t2, 0x44($sp) /* 01AD1C 8001A11C 8FBF0064 */ lw $ra, 0x64($sp) /* 01AD20 8001A120 8E220000 */ lw $v0, ($s1) -/* 01AD24 8001A124 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c +/* 01AD24 8001A124 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c .L8001A128: /* 01AD28 8001A128 244E0001 */ addiu $t6, $v0, 1 .L8001A12C: @@ -781,8 +781,8 @@ glabel D_80019808 /* 01AF20 8001A320 8FA50094 */ lw $a1, 0x94($sp) /* 01AF24 8001A324 26100001 */ addiu $s0, $s0, 1 /* 01AF28 8001A328 2A010004 */ slti $at, $s0, 4 -/* 01AF2C 8001A32C 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 -/* 01AF30 8001A330 256BAEE4 */ addiu $t3, %lo(D_8011AEE4) # addiu $t3, $t3, -0x511c +/* 01AF2C 8001A32C 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01AF30 8001A330 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c /* 01AF34 8001A334 1420FFF7 */ bnez $at, .L8001A314 /* 01AF38 8001A338 00A22825 */ or $a1, $a1, $v0 /* 01AF3C 8001A33C 3C198012 */ lui $t9, %hi(D_8011AEF6) # $t9, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_8000B290.s b/asm/non_matchings/unknown_00BC20/func_8000B290.s index 8e14c2f7..13381ac9 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B290.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B290.s @@ -48,7 +48,7 @@ glabel func_8000B290 /* 00BF38 8000B338 00000000 */ nop /* 00BF3C 8000B33C 10800003 */ beqz $a0, .L8000B34C /* 00BF40 8000B340 00000000 */ nop -/* 00BF44 8000B344 0C003FEE */ jal func_8000FFB8 +/* 00BF44 8000B344 0C003FEE */ jal particlePtrList_addObject /* 00BF48 8000B348 00000000 */ nop .L8000B34C: /* 00BF4C 8000B34C 3C11800E */ lui $s1, %hi(D_800DC764) # $s1, 0x800e @@ -57,10 +57,10 @@ glabel func_8000B290 /* 00BF58 8000B358 AE000000 */ sw $zero, ($s0) /* 00BF5C 8000B35C 10800003 */ beqz $a0, .L8000B36C /* 00BF60 8000B360 00000000 */ nop -/* 00BF64 8000B364 0C003FEE */ jal func_8000FFB8 +/* 00BF64 8000B364 0C003FEE */ jal particlePtrList_addObject /* 00BF68 8000B368 00000000 */ nop .L8000B36C: -/* 00BF6C 8000B36C 0C004013 */ jal func_8001004C +/* 00BF6C 8000B36C 0C004013 */ jal particlePtrList_flush /* 00BF70 8000B370 AE200000 */ sw $zero, ($s1) /* 00BF74 8000B374 8FBF0024 */ lw $ra, 0x24($sp) /* 00BF78 8000B378 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000BADC.s b/asm/non_matchings/unknown_00BC20/func_8000BADC.s index a0684c07..1678da01 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000BADC.s +++ b/asm/non_matchings/unknown_00BC20/func_8000BADC.s @@ -44,8 +44,8 @@ glabel func_8000BADC /* 00C77C 8000BB7C 24630001 */ addiu $v1, $v1, 1 /* 00C780 8000BB80 1420FFF3 */ bnez $at, .L8000BB50 /* 00C784 8000BB84 A06AFFFF */ sb $t2, -1($v1) -/* 00C788 8000BB88 3C0E8012 */ lui $t6, %hi(D_8011AEF0) # $t6, 0x8012 -/* 00C78C 8000BB8C 8DCEAEF0 */ lw $t6, %lo(D_8011AEF0)($t6) +/* 00C788 8000BB88 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012 +/* 00C78C 8000BB8C 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6) /* 00C790 8000BB90 00004025 */ move $t0, $zero /* 00C794 8000BB94 19C000DD */ blez $t6, .L8000BF0C /* 00C798 8000BB98 00009025 */ move $s2, $zero @@ -53,10 +53,10 @@ glabel func_8000BADC /* 00C7A0 8000BBA0 44819000 */ mtc1 $at, $f18 /* 00C7A4 8000BBA4 44912000 */ mtc1 $s1, $f4 /* 00C7A8 8000BBA8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 00C7AC 8000BBAC 3C138012 */ lui $s3, %hi(D_8011AEE4) # $s3, 0x8012 +/* 00C7AC 8000BBAC 3C138012 */ lui $s3, %hi(playerStructArray_Ptr) # $s3, 0x8012 /* 00C7B0 8000BBB0 44817000 */ mtc1 $at, $f14 /* 00C7B4 8000BBB4 44806000 */ mtc1 $zero, $f12 -/* 00C7B8 8000BBB8 2673AEE4 */ addiu $s3, %lo(D_8011AEE4) # addiu $s3, $s3, -0x511c +/* 00C7B8 8000BBB8 2673AEE4 */ addiu $s3, %lo(playerStructArray_Ptr) # addiu $s3, $s3, -0x511c /* 00C7BC 8000BBBC 24090002 */ li $t1, 2 /* 00C7C0 8000BBC0 46802420 */ cvt.s.w $f16, $f4 .L8000BBC4: @@ -256,7 +256,7 @@ glabel func_8000BADC /* 00CA98 8000BE98 A0580001 */ sb $t8, 1($v0) /* 00CA9C 8000BE9C A04C0002 */ sb $t4, 2($v0) /* 00CAA0 8000BEA0 820D0175 */ lb $t5, 0x175($s0) -/* 00CAA4 8000BEA4 3C0C8012 */ lui $t4, %hi(D_8011AEF0) # $t4, 0x8012 +/* 00CAA4 8000BEA4 3C0C8012 */ lui $t4, %hi(playerCount) # $t4, 0x8012 /* 00CAA8 8000BEA8 11A0000B */ beqz $t5, .L8000BED8 /* 00CAAC 8000BEAC 00000000 */ nop /* 00CAB0 8000BEB0 904F0003 */ lbu $t7, 3($v0) @@ -281,7 +281,7 @@ glabel func_8000BADC .L8000BEF4: /* 00CAF4 8000BEF4 A0400003 */ sb $zero, 3($v0) .L8000BEF8: -/* 00CAF8 8000BEF8 8D8CAEF0 */ lw $t4, %lo(D_8011AEF0)($t4) +/* 00CAF8 8000BEF8 8D8CAEF0 */ lw $t4, %lo(playerCount)($t4) /* 00CAFC 8000BEFC 25080001 */ addiu $t0, $t0, 1 /* 00CB00 8000BF00 010C082A */ slt $at, $t0, $t4 /* 00CB04 8000BF04 1420FF2F */ bnez $at, .L8000BBC4 diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index 121331a6..ae949dd5 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -171,7 +171,7 @@ glabel func_8000C8F8 /* 00D778 8000CB78 00000000 */ nop /* 00D77C 8000CB7C 15000009 */ bnez $t0, .L8000CBA4 /* 00D780 8000CB80 00000000 */ nop -/* 00D784 8000CB84 0C004013 */ jal func_8001004C +/* 00D784 8000CB84 0C004013 */ jal particlePtrList_flush /* 00D788 8000CB88 00000000 */ nop /* 00D78C 8000CB8C 0C005FA6 */ jal func_80017E98 /* 00D790 8000CB90 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 1760289c..69b3ced3 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -9,13 +9,13 @@ glabel func_8000CC7C /* 00D898 8000CC98 A020ADC4 */ sb $zero, %lo(D_8011ADC4)($at) /* 00D89C 8000CC9C 3C118012 */ lui $s1, %hi(D_8011AF00) # $s1, 0x8012 /* 00D8A0 8000CCA0 AFBE0038 */ sw $fp, 0x38($sp) -/* 00D8A4 8000CCA4 3C018012 */ lui $at, %hi(D_8011AEF0) # $at, 0x8012 +/* 00D8A4 8000CCA4 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 /* 00D8A8 8000CCA8 0080F025 */ move $fp, $a0 /* 00D8AC 8000CCAC 2631AF00 */ addiu $s1, %lo(D_8011AF00) # addiu $s1, $s1, -0x5100 /* 00D8B0 8000CCB0 AFBF003C */ sw $ra, 0x3c($sp) /* 00D8B4 8000CCB4 AFB30024 */ sw $s3, 0x24($sp) /* 00D8B8 8000CCB8 AFB00018 */ sw $s0, 0x18($sp) -/* 00D8BC 8000CCBC AC20AEF0 */ sw $zero, %lo(D_8011AEF0)($at) +/* 00D8BC 8000CCBC AC20AEF0 */ sw $zero, %lo(playerCount)($at) /* 00D8C0 8000CCC0 00A08025 */ move $s0, $a1 /* 00D8C4 8000CCC4 00C09825 */ move $s3, $a2 /* 00D8C8 8000CCC8 AFB70034 */ sw $s7, 0x34($sp) @@ -109,13 +109,13 @@ glabel func_8000CC7C /* 00DA14 8000CE14 AC80FFFC */ sw $zero, -4($a0) /* 00DA18 8000CE18 1420FFF9 */ bnez $at, .L8000CE00 /* 00DA1C 8000CE1C AC40FFFC */ sw $zero, -4($v0) -/* 00DA20 8000CE20 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 00DA24 8000CE24 8C42AE5C */ lw $v0, %lo(D_8011AE5C)($v0) +/* 00DA20 8000CE20 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 00DA24 8000CE24 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 00DA28 8000CE28 00009025 */ move $s2, $zero /* 00DA2C 8000CE2C 18400050 */ blez $v0, .L8000CF70 /* 00DA30 8000CE30 0000A825 */ move $s5, $zero -/* 00DA34 8000CE34 3C048012 */ lui $a0, %hi(D_8011AE58) # $a0, 0x8012 -/* 00DA38 8000CE38 8C84AE58 */ lw $a0, %lo(D_8011AE58)($a0) +/* 00DA34 8000CE34 3C048012 */ lui $a0, %hi(objPtrList) # $a0, 0x8012 +/* 00DA38 8000CE38 8C84AE58 */ lw $a0, %lo(objPtrList)($a0) /* 00DA3C 8000CE3C 00022880 */ sll $a1, $v0, 2 /* 00DA40 8000CE40 27AA0094 */ addiu $t2, $sp, 0x94 /* 00DA44 8000CE44 27A900B4 */ addiu $t1, $sp, 0xb4 @@ -201,11 +201,11 @@ glabel func_8000CC7C /* 00DB74 8000CF74 81780000 */ lb $t8, ($t3) /* 00DB78 8000CF78 3C10800E */ lui $s0, %hi(D_800DC740) # $s0, 0x800e /* 00DB7C 8000CF7C 240D0008 */ li $t5, 8 -/* 00DB80 8000CF80 3C018012 */ lui $at, %hi(D_8011AEF0) # $at, 0x8012 +/* 00DB80 8000CF80 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 /* 00DB84 8000CF84 A5980000 */ sh $t8, ($t4) /* 00DB88 8000CF88 2610C740 */ addiu $s0, %lo(D_800DC740) # addiu $s0, $s0, -0x38c0 /* 00DB8C 8000CF8C 26620001 */ addiu $v0, $s3, 1 -/* 00DB90 8000CF90 AC2DAEF0 */ sw $t5, %lo(D_8011AEF0)($at) +/* 00DB90 8000CF90 AC2DAEF0 */ sw $t5, %lo(playerCount)($at) /* 00DB94 8000CF94 AFA20144 */ sw $v0, 0x144($sp) /* 00DB98 8000CF98 A2000000 */ sb $zero, ($s0) /* 00DB9C 8000CF9C 0C01B067 */ jal func_8006C19C @@ -245,9 +245,9 @@ glabel func_8000CC7C /* 00DC18 8000D018 24010002 */ li $at, 2 .L8000D01C: /* 00DC1C 8000D01C 8FAD0144 */ lw $t5, 0x144($sp) -/* 00DC20 8000D020 3C018012 */ lui $at, %hi(D_8011AEF0) # $at, 0x8012 +/* 00DC20 8000D020 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 /* 00DC24 8000D024 0C01B0BC */ jal func_8006C2F0 -/* 00DC28 8000D028 AC2DAEF0 */ sw $t5, %lo(D_8011AEF0)($at) +/* 00DC28 8000D028 AC2DAEF0 */ sw $t5, %lo(playerCount)($at) /* 00DC2C 8000D02C 14400010 */ bnez $v0, .L8000D070 /* 00DC30 8000D030 3C03800E */ lui $v1, %hi(D_800DC708) # $v1, 0x800e /* 00DC34 8000D034 2463C708 */ addiu $v1, %lo(D_800DC708) # addiu $v1, $v1, -0x38f8 @@ -264,23 +264,23 @@ glabel func_8000CC7C /* 00DC5C 8000D05C 8FB80064 */ lw $t8, 0x64($sp) /* 00DC60 8000D060 0C027110 */ jal func_8009C440 /* 00DC64 8000D064 00000000 */ nop -/* 00DC68 8000D068 3C018012 */ lui $at, %hi(D_8011AEF0) # $at, 0x8012 -/* 00DC6C 8000D06C AC22AEF0 */ sw $v0, %lo(D_8011AEF0)($at) +/* 00DC68 8000D068 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 +/* 00DC6C 8000D06C AC22AEF0 */ sw $v0, %lo(playerCount)($at) .L8000D070: /* 00DC70 8000D070 8FB80064 */ lw $t8, 0x64($sp) .L8000D074: /* 00DC74 8000D074 3C058012 */ lui $a1, %hi(D_8011AD3C) # $a1, 0x8012 /* 00DC78 8000D078 13000005 */ beqz $t8, .L8000D090 /* 00DC7C 8000D07C 24A5AD3C */ addiu $a1, %lo(D_8011AD3C) # addiu $a1, $a1, -0x52c4 -/* 00DC80 8000D080 3C068012 */ lui $a2, %hi(D_8011AEF0) # $a2, 0x8012 -/* 00DC84 8000D084 24C6AEF0 */ addiu $a2, %lo(D_8011AEF0) # addiu $a2, $a2, -0x5110 +/* 00DC80 8000D080 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 +/* 00DC84 8000D084 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 /* 00DC88 8000D088 240D0004 */ li $t5, 4 /* 00DC8C 8000D08C ACCD0000 */ sw $t5, ($a2) .L8000D090: /* 00DC90 8000D090 8FB90068 */ lw $t9, 0x68($sp) -/* 00DC94 8000D094 3C068012 */ lui $a2, %hi(D_8011AEF0) # $a2, 0x8012 +/* 00DC94 8000D094 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 /* 00DC98 8000D098 24010008 */ li $at, 8 -/* 00DC9C 8000D09C 24C6AEF0 */ addiu $a2, %lo(D_8011AEF0) # addiu $a2, $a2, -0x5110 +/* 00DC9C 8000D09C 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 /* 00DCA0 8000D0A0 17210006 */ bne $t9, $at, .L8000D0BC /* 00DCA4 8000D0A4 A0A00000 */ sb $zero, ($a1) /* 00DCA8 8000D0A8 24070001 */ li $a3, 1 @@ -499,11 +499,11 @@ glabel func_8000CC7C /* 00DF80 8000D380 24190001 */ li $t9, 1 /* 00DF84 8000D384 01F50019 */ multu $t7, $s5 /* 00DF88 8000D388 A0590000 */ sb $t9, ($v0) -/* 00DF8C 8000D38C 3C038012 */ lui $v1, %hi(D_8011AEF0) # $v1, 0x8012 +/* 00DF8C 8000D38C 3C038012 */ lui $v1, %hi(playerCount) # $v1, 0x8012 /* 00DF90 8000D390 0000C012 */ mflo $t8 /* 00DF94 8000D394 02F86821 */ addu $t5, $s7, $t8 /* 00DF98 8000D398 A1B2005A */ sb $s2, 0x5a($t5) -/* 00DF9C 8000D39C 8C63AEF0 */ lw $v1, %lo(D_8011AEF0)($v1) +/* 00DF9C 8000D39C 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) /* 00DFA0 8000D3A0 00000000 */ nop /* 00DFA4 8000D3A4 00609025 */ move $s2, $v1 .L8000D3A8: @@ -531,7 +531,7 @@ glabel func_8000CC7C /* 00DFF4 8000D3F4 832E004D */ lb $t6, 0x4d($t9) /* 00DFF8 8000D3F8 2419FFFF */ li $t9, -1 /* 00DFFC 8000D3FC 15C00004 */ bnez $t6, .L8000D410 -/* 00E000 8000D400 3C038012 */ lui $v1, %hi(D_8011AEF0) # $v1, 0x8012 +/* 00E000 8000D400 3C038012 */ lui $v1, %hi(playerCount) # $v1, 0x8012 /* 00E004 8000D404 3C018012 */ lui $at, %hi(D_8011AE02) # $at, 0x8012 /* 00E008 8000D408 10000004 */ b .L8000D41C /* 00E00C 8000D40C A020AE02 */ sb $zero, %lo(D_8011AE02)($at) @@ -541,7 +541,7 @@ glabel func_8000CC7C /* 00E018 8000D418 A02FAE02 */ sb $t7, %lo(D_8011AE02)($at) .L8000D41C: /* 00E01C 8000D41C 8FB80078 */ lw $t8, 0x78($sp) -/* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(D_8011AEF0)($v1) +/* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) /* 00E024 8000D424 830D00B8 */ lb $t5, 0xb8($t8) /* 00E028 8000D428 3C018012 */ lui $at, %hi(D_8011AD25) # $at, 0x8012 /* 00E02C 8000D42C A3B90127 */ sb $t9, 0x127($sp) @@ -787,9 +787,9 @@ glabel func_8000CC7C /* 00E394 8000D794 8FA60054 */ lw $a2, 0x54($sp) /* 00E398 8000D798 8F0F0000 */ lw $t7, ($t8) /* 00E39C 8000D79C 8FA7005C */ lw $a3, 0x5c($sp) -/* 00E3A0 8000D7A0 3C0D8012 */ lui $t5, %hi(D_8011AEE4) # $t5, 0x8012 +/* 00E3A0 8000D7A0 3C0D8012 */ lui $t5, %hi(playerStructArray_Ptr) # $t5, 0x8012 /* 00E3A4 8000D7A4 A44F0000 */ sh $t7, ($v0) -/* 00E3A8 8000D7A8 8DADAEE4 */ lw $t5, %lo(D_8011AEE4)($t5) +/* 00E3A8 8000D7A8 8DADAEE4 */ lw $t5, %lo(playerStructArray_Ptr)($t5) /* 00E3AC 8000D7AC 3C198012 */ lui $t9, %hi(D_8011AEE8) # $t9, 0x8012 /* 00E3B0 8000D7B0 01A67021 */ addu $t6, $t5, $a2 /* 00E3B4 8000D7B4 ADC20000 */ sw $v0, ($t6) @@ -928,8 +928,8 @@ glabel func_8000CC7C /* 00E58C 8000D98C 8FA40068 */ lw $a0, 0x68($sp) /* 00E590 8000D990 24020005 */ li $v0, 5 .L8000D994: -/* 00E594 8000D994 3C038012 */ lui $v1, %hi(D_8011AEF0) # $v1, 0x8012 -/* 00E598 8000D998 8C63AEF0 */ lw $v1, %lo(D_8011AEF0)($v1) +/* 00E594 8000D994 3C038012 */ lui $v1, %hi(playerCount) # $v1, 0x8012 +/* 00E598 8000D998 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) /* 00E59C 8000D99C 26100001 */ addiu $s0, $s0, 1 /* 00E5A0 8000D9A0 0203082A */ slt $at, $s0, $v1 /* 00E5A4 8000D9A4 1420FEA6 */ bnez $at, .L8000D440 @@ -952,12 +952,12 @@ glabel func_8000CC7C /* 00E5DC 8000D9DC 0C01B683 */ jal func_8006DA0C /* 00E5E0 8000D9E0 00000000 */ nop /* 00E5E4 8000D9E4 1440002D */ bnez $v0, .L8000DA9C -/* 00E5E8 8000D9E8 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 00E5EC 8000D9EC 8C42AE5C */ lw $v0, %lo(D_8011AE5C)($v0) +/* 00E5E8 8000D9E8 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 00E5EC 8000D9EC 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 00E5F0 8000D9F0 0000A825 */ move $s5, $zero /* 00E5F4 8000D9F4 18400029 */ blez $v0, .L8000DA9C -/* 00E5F8 8000D9F8 3C138012 */ lui $s3, %hi(D_8011AE58) # $s3, 0x8012 -/* 00E5FC 8000D9FC 2673AE58 */ addiu $s3, %lo(D_8011AE58) # addiu $s3, $s3, -0x51a8 +/* 00E5F8 8000D9F8 3C138012 */ lui $s3, %hi(objPtrList) # $s3, 0x8012 +/* 00E5FC 8000D9FC 2673AE58 */ addiu $s3, %lo(objPtrList) # addiu $s3, $s3, -0x51a8 .L8000DA00: /* 00E600 8000DA00 8E6E0000 */ lw $t6, ($s3) /* 00E604 8000DA04 3C0D8012 */ lui $t5, %hi(D_8011AEF5) # $t5, 0x8012 @@ -975,10 +975,10 @@ glabel func_8000CC7C /* 00E634 8000DA34 00000000 */ nop /* 00E638 8000DA38 11A00007 */ beqz $t5, .L8000DA58 /* 00E63C 8000DA3C 00000000 */ nop -/* 00E640 8000DA40 0C003FEE */ jal func_8000FFB8 +/* 00E640 8000DA40 0C003FEE */ jal particlePtrList_addObject /* 00E644 8000DA44 02202025 */ move $a0, $s1 -/* 00E648 8000DA48 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 00E64C 8000DA4C 8C42AE5C */ lw $v0, %lo(D_8011AE5C)($v0) +/* 00E648 8000DA48 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 00E64C 8000DA4C 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 00E650 8000DA50 1000000E */ b .L8000DA8C /* 00E654 8000DA54 26520001 */ addiu $s2, $s2, 1 .L8000DA58: @@ -989,10 +989,10 @@ glabel func_8000CC7C /* 00E668 8000DA68 2B210002 */ slti $at, $t9, 2 /* 00E66C 8000DA6C 14200006 */ bnez $at, .L8000DA88 /* 00E670 8000DA70 00000000 */ nop -/* 00E674 8000DA74 0C003FEE */ jal func_8000FFB8 +/* 00E674 8000DA74 0C003FEE */ jal particlePtrList_addObject /* 00E678 8000DA78 02202025 */ move $a0, $s1 -/* 00E67C 8000DA7C 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 00E680 8000DA80 8C42AE5C */ lw $v0, %lo(D_8011AE5C)($v0) +/* 00E67C 8000DA7C 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 00E680 8000DA80 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 00E684 8000DA84 00000000 */ nop .L8000DA88: /* 00E688 8000DA88 26520001 */ addiu $s2, $s2, 1 @@ -1130,16 +1130,16 @@ glabel func_8000CC7C /* 00E888 8000DC88 00000000 */ nop /* 00E88C 8000DC8C A26D01F7 */ sb $t5, 0x1f7($s3) .L8000DC90: -/* 00E890 8000DC90 3C0E8012 */ lui $t6, %hi(D_8011AEF0) # $t6, 0x8012 -/* 00E894 8000DC94 8DCEAEF0 */ lw $t6, %lo(D_8011AEF0)($t6) +/* 00E890 8000DC90 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012 +/* 00E894 8000DC94 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6) /* 00E898 8000DC98 24180064 */ li $t8, 100 /* 00E89C 8000DC9C 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 00E8A0 8000DCA0 19C00068 */ blez $t6, .L8000DE44 /* 00E8A4 8000DCA4 AC38ADB0 */ sw $t8, %lo(D_8011ADB0)($at) /* 00E8A8 8000DCA8 0000A825 */ move $s5, $zero .L8000DCAC: -/* 00E8AC 8000DCAC 3C198012 */ lui $t9, %hi(D_8011AEE4) # $t9, 0x8012 -/* 00E8B0 8000DCB0 8F39AEE4 */ lw $t9, %lo(D_8011AEE4)($t9) +/* 00E8AC 8000DCAC 3C198012 */ lui $t9, %hi(playerStructArray_Ptr) # $t9, 0x8012 +/* 00E8B0 8000DCB0 8F39AEE4 */ lw $t9, %lo(playerStructArray_Ptr)($t9) /* 00E8B4 8000DCB4 00008025 */ move $s0, $zero /* 00E8B8 8000DCB8 03357821 */ addu $t7, $t9, $s5 /* 00E8BC 8000DCBC 8DF10000 */ lw $s1, ($t7) @@ -1241,10 +1241,10 @@ glabel func_8000CC7C .L8000DE1C: /* 00EA1C 8000DE1C 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00EA20 8000DE20 44810000 */ mtc1 $at, $f0 -/* 00EA24 8000DE24 3C0D8012 */ lui $t5, %hi(D_8011AEF0) # $t5, 0x8012 +/* 00EA24 8000DE24 3C0D8012 */ lui $t5, %hi(playerCount) # $t5, 0x8012 /* 00EA28 8000DE28 E6600090 */ swc1 $f0, 0x90($s3) /* 00EA2C 8000DE2C E660008C */ swc1 $f0, 0x8c($s3) -/* 00EA30 8000DE30 8DADAEF0 */ lw $t5, %lo(D_8011AEF0)($t5) +/* 00EA30 8000DE30 8DADAEF0 */ lw $t5, %lo(playerCount)($t5) /* 00EA34 8000DE34 26520001 */ addiu $s2, $s2, 1 /* 00EA38 8000DE38 024D082A */ slt $at, $s2, $t5 /* 00EA3C 8000DE3C 1420FF9B */ bnez $at, .L8000DCAC diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 642f9303..00d8379f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -67,11 +67,11 @@ glabel func_8000E2B4 /* 00EFB0 8000E3B0 27A4002C */ addiu $a0, $sp, 0x2c /* 00EFB4 8000E3B4 0C003A95 */ jal func_8000EA54 /* 00EFB8 8000E3B8 24050011 */ li $a1, 17 -/* 00EFBC 8000E3BC 3C0C8012 */ lui $t4, %hi(D_8011AEE4) # $t4, 0x8012 -/* 00EFC0 8000E3C0 8D8CAEE4 */ lw $t4, %lo(D_8011AEE4)($t4) +/* 00EFBC 8000E3BC 3C0C8012 */ lui $t4, %hi(playerStructArray_Ptr) # $t4, 0x8012 +/* 00EFC0 8000E3C0 8D8CAEE4 */ lw $t4, %lo(playerStructArray_Ptr)($t4) /* 00EFC4 8000E3C4 240B0001 */ li $t3, 1 -/* 00EFC8 8000E3C8 3C018012 */ lui $at, %hi(D_8011AEF0) # $at, 0x8012 -/* 00EFCC 8000E3CC AC2BAEF0 */ sw $t3, %lo(D_8011AEF0)($at) +/* 00EFC8 8000E3C8 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 +/* 00EFCC 8000E3CC AC2BAEF0 */ sw $t3, %lo(playerCount)($at) /* 00EFD0 8000E3D0 3C0E8012 */ lui $t6, %hi(D_8011AEEC) # $t6, 0x8012 /* 00EFD4 8000E3D4 AD820000 */ sw $v0, ($t4) /* 00EFD8 8000E3D8 8DCEAEEC */ lw $t6, %lo(D_8011AEEC)($t6) diff --git a/asm/non_matchings/unknown_00BC20/func_8000E4D8.s b/asm/non_matchings/unknown_00BC20/func_8000E4D8.s deleted file mode 100644 index 3799afb2..00000000 --- a/asm/non_matchings/unknown_00BC20/func_8000E4D8.s +++ /dev/null @@ -1,321 +0,0 @@ -glabel func_8000E4D8 -/* 00F0D8 8000E4D8 3C028012 */ lui $v0, %hi(D_8011AEF5) # $v0, 0x8012 -/* 00F0DC 8000E4DC 9042AEF5 */ lbu $v0, %lo(D_8011AEF5)($v0) -/* 00F0E0 8000E4E0 03E00008 */ jr $ra -/* 00F0E4 8000E4E4 00000000 */ nop - -/* 00F0E8 8000E4E8 00041880 */ sll $v1, $a0, 2 -/* 00F0EC 8000E4EC 3C028012 */ lui $v0, 0x8012 -/* 00F0F0 8000E4F0 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012 -/* 00F0F4 8000E4F4 00431021 */ addu $v0, $v0, $v1 -/* 00F0F8 8000E4F8 25CEAEA0 */ addiu $t6, %lo(D_8011AEA0) # addiu $t6, $t6, -0x5160 -/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, -0x5150($v0) -/* 00F100 8000E500 006E2821 */ addu $a1, $v1, $t6 -/* 00F104 8000E504 8CAF0000 */ lw $t7, ($a1) -/* 00F108 8000E508 3C198012 */ lui $t9, 0x8012 -/* 00F10C 8000E50C AC40000C */ sw $zero, 0xc($v0) -/* 00F110 8000E510 AC400008 */ sw $zero, 8($v0) -/* 00F114 8000E514 AC400004 */ sw $zero, 4($v0) -/* 00F118 8000E518 AC4F0000 */ sw $t7, ($v0) -/* 00F11C 8000E51C 0323C821 */ addu $t9, $t9, $v1 -/* 00F120 8000E520 8F39AE98 */ lw $t9, -0x5168($t9) -/* 00F124 8000E524 8CB80000 */ lw $t8, ($a1) -/* 00F128 8000E528 24020010 */ li $v0, 16 -/* 00F12C 8000E52C 00003825 */ move $a3, $zero -/* 00F130 8000E530 03194021 */ addu $t0, $t8, $t9 -.L8000E534: -/* 00F134 8000E534 24E70004 */ addiu $a3, $a3, 4 -/* 00F138 8000E538 A1000000 */ sb $zero, ($t0) -/* 00F13C 8000E53C A1000001 */ sb $zero, 1($t0) -/* 00F140 8000E540 A1000002 */ sb $zero, 2($t0) -/* 00F144 8000E544 A1000003 */ sb $zero, 3($t0) -/* 00F148 8000E548 14E2FFFA */ bne $a3, $v0, .L8000E534 -/* 00F14C 8000E54C 25080004 */ addiu $t0, $t0, 4 -/* 00F150 8000E550 03E00008 */ jr $ra -/* 00F154 8000E554 00000000 */ nop - -/* 00F158 8000E558 8C82003C */ lw $v0, 0x3c($a0) -/* 00F15C 8000E55C 3C058012 */ lui $a1, %hi(D_8011AE98) # $a1, 0x8012 -/* 00F160 8000E560 14400003 */ bnez $v0, .L8000E570 -/* 00F164 8000E564 24A5AE98 */ addiu $a1, %lo(D_8011AE98) # addiu $a1, $a1, -0x5168 -/* 00F168 8000E568 03E00008 */ jr $ra -/* 00F16C 8000E56C 24020001 */ li $v0, 1 - -.L8000E570: -/* 00F170 8000E570 8CA40000 */ lw $a0, ($a1) -/* 00F174 8000E574 00401825 */ move $v1, $v0 -/* 00F178 8000E578 0044082A */ slt $at, $v0, $a0 -/* 00F17C 8000E57C 1420000A */ bnez $at, .L8000E5A8 -/* 00F180 8000E580 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012 -/* 00F184 8000E584 8DCEAEA0 */ lw $t6, %lo(D_8011AEA0)($t6) -/* 00F188 8000E588 00000000 */ nop -/* 00F18C 8000E58C 000E78C0 */ sll $t7, $t6, 3 -/* 00F190 8000E590 01E4C021 */ addu $t8, $t7, $a0 -/* 00F194 8000E594 0302082A */ slt $at, $t8, $v0 -/* 00F198 8000E598 14200003 */ bnez $at, .L8000E5A8 -/* 00F19C 8000E59C 00000000 */ nop -/* 00F1A0 8000E5A0 03E00008 */ jr $ra -/* 00F1A4 8000E5A4 00001025 */ move $v0, $zero - -.L8000E5A8: -/* 00F1A8 8000E5A8 8CA20004 */ lw $v0, 4($a1) -/* 00F1AC 8000E5AC 3C198012 */ lui $t9, %hi(D_8011AEA4) # $t9, 0x8012 -/* 00F1B0 8000E5B0 0062082A */ slt $at, $v1, $v0 -/* 00F1B4 8000E5B4 1420000A */ bnez $at, .L8000E5E0 -/* 00F1B8 8000E5B8 00000000 */ nop -/* 00F1BC 8000E5BC 8F39AEA4 */ lw $t9, %lo(D_8011AEA4)($t9) -/* 00F1C0 8000E5C0 00000000 */ nop -/* 00F1C4 8000E5C4 001940C0 */ sll $t0, $t9, 3 -/* 00F1C8 8000E5C8 01024821 */ addu $t1, $t0, $v0 -/* 00F1CC 8000E5CC 0123082A */ slt $at, $t1, $v1 -/* 00F1D0 8000E5D0 14200004 */ bnez $at, .L8000E5E4 -/* 00F1D4 8000E5D4 24020001 */ li $v0, 1 -/* 00F1D8 8000E5D8 03E00008 */ jr $ra -/* 00F1DC 8000E5DC 24020001 */ li $v0, 1 - -.L8000E5E0: -/* 00F1E0 8000E5E0 24020001 */ li $v0, 1 -.L8000E5E4: -/* 00F1E4 8000E5E4 03E00008 */ jr $ra -/* 00F1E8 8000E5E8 00000000 */ nop - -/* 00F1EC 8000E5EC 3C068012 */ lui $a2, %hi(D_8011AE98) # $a2, 0x8012 -/* 00F1F0 8000E5F0 3C0B8012 */ lui $t3, %hi(D_8011AEA0) # $t3, 0x8012 -/* 00F1F4 8000E5F4 256BAEA0 */ addiu $t3, %lo(D_8011AEA0) # addiu $t3, $t3, -0x5160 -/* 00F1F8 8000E5F8 24C6AE98 */ addiu $a2, %lo(D_8011AE98) # addiu $a2, $a2, -0x5168 -/* 00F1FC 8000E5FC 90820001 */ lbu $v0, 1($a0) -/* 00F200 8000E600 8CC30000 */ lw $v1, ($a2) -/* 00F204 8000E604 8D6F0000 */ lw $t7, ($t3) -/* 00F208 8000E608 8CC50004 */ lw $a1, 4($a2) -/* 00F20C 8000E60C 8D790004 */ lw $t9, 4($t3) -/* 00F210 8000E610 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 00F214 8000E614 304E003F */ andi $t6, $v0, 0x3f -/* 00F218 8000E618 0083082A */ slt $at, $a0, $v1 -/* 00F21C 8000E61C 01E3C021 */ addu $t8, $t7, $v1 -/* 00F220 8000E620 03256021 */ addu $t4, $t9, $a1 -/* 00F224 8000E624 01C01025 */ move $v0, $t6 -/* 00F228 8000E628 AFB8002C */ sw $t8, 0x2c($sp) -/* 00F22C 8000E62C 14200006 */ bnez $at, .L8000E648 -/* 00F230 8000E630 AFAC0030 */ sw $t4, 0x30($sp) -/* 00F234 8000E634 0098082A */ slt $at, $a0, $t8 -/* 00F238 8000E638 10200004 */ beqz $at, .L8000E64C -/* 00F23C 8000E63C 0085082A */ slt $at, $a0, $a1 -/* 00F240 8000E640 1000000A */ b .L8000E66C -/* 00F244 8000E644 AFA0001C */ sw $zero, 0x1c($sp) -.L8000E648: -/* 00F248 8000E648 0085082A */ slt $at, $a0, $a1 -.L8000E64C: -/* 00F24C 8000E64C 14200008 */ bnez $at, .L8000E670 -/* 00F250 8000E650 8FA8001C */ lw $t0, 0x1c($sp) -/* 00F254 8000E654 8FAE0030 */ lw $t6, 0x30($sp) -/* 00F258 8000E658 240F0001 */ li $t7, 1 -/* 00F25C 8000E65C 008E082A */ slt $at, $a0, $t6 -/* 00F260 8000E660 10200003 */ beqz $at, .L8000E670 -/* 00F264 8000E664 8FA8001C */ lw $t0, 0x1c($sp) -/* 00F268 8000E668 AFAF001C */ sw $t7, 0x1c($sp) -.L8000E66C: -/* 00F26C 8000E66C 8FA8001C */ lw $t0, 0x1c($sp) -.L8000E670: -/* 00F270 8000E670 00823021 */ addu $a2, $a0, $v0 -/* 00F274 8000E674 0008C080 */ sll $t8, $t0, 2 -/* 00F278 8000E678 03B83821 */ addu $a3, $sp, $t8 -/* 00F27C 8000E67C 8CE7002C */ lw $a3, 0x2c($a3) -/* 00F280 8000E680 00801825 */ move $v1, $a0 -/* 00F284 8000E684 00C7082B */ sltu $at, $a2, $a3 -/* 00F288 8000E688 00C02825 */ move $a1, $a2 -/* 00F28C 8000E68C 10200018 */ beqz $at, .L8000E6F0 -/* 00F290 8000E690 03004025 */ move $t0, $t8 -/* 00F294 8000E694 00E65023 */ subu $t2, $a3, $a2 -/* 00F298 8000E698 31590003 */ andi $t9, $t2, 3 -/* 00F29C 8000E69C 13200008 */ beqz $t9, .L8000E6C0 -/* 00F2A0 8000E6A0 03264821 */ addu $t1, $t9, $a2 -.L8000E6A4: -/* 00F2A4 8000E6A4 90AC0000 */ lbu $t4, ($a1) -/* 00F2A8 8000E6A8 24A50001 */ addiu $a1, $a1, 1 -/* 00F2AC 8000E6AC 24630001 */ addiu $v1, $v1, 1 -/* 00F2B0 8000E6B0 1525FFFC */ bne $t1, $a1, .L8000E6A4 -/* 00F2B4 8000E6B4 A06CFFFF */ sb $t4, -1($v1) -/* 00F2B8 8000E6B8 10A7000D */ beq $a1, $a3, .L8000E6F0 -/* 00F2BC 8000E6BC 00000000 */ nop -.L8000E6C0: -/* 00F2C0 8000E6C0 90AD0000 */ lbu $t5, ($a1) -/* 00F2C4 8000E6C4 24A50004 */ addiu $a1, $a1, 4 -/* 00F2C8 8000E6C8 A06D0000 */ sb $t5, ($v1) -/* 00F2CC 8000E6CC 90AEFFFD */ lbu $t6, -3($a1) -/* 00F2D0 8000E6D0 24630004 */ addiu $v1, $v1, 4 -/* 00F2D4 8000E6D4 A06EFFFD */ sb $t6, -3($v1) -/* 00F2D8 8000E6D8 90AFFFFE */ lbu $t7, -2($a1) -/* 00F2DC 8000E6DC 00000000 */ nop -/* 00F2E0 8000E6E0 A06FFFFE */ sb $t7, -2($v1) -/* 00F2E4 8000E6E4 90B8FFFF */ lbu $t8, -1($a1) -/* 00F2E8 8000E6E8 14A7FFF5 */ bne $a1, $a3, .L8000E6C0 -/* 00F2EC 8000E6EC A078FFFF */ sb $t8, -1($v1) -.L8000E6F0: -/* 00F2F0 8000E6F0 01681821 */ addu $v1, $t3, $t0 -/* 00F2F4 8000E6F4 8C790000 */ lw $t9, ($v1) -/* 00F2F8 8000E6F8 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 -/* 00F2FC 8000E6FC 03226023 */ subu $t4, $t9, $v0 -/* 00F300 8000E700 AC6C0000 */ sw $t4, ($v1) -/* 00F304 8000E704 8CC6AE5C */ lw $a2, %lo(D_8011AE5C)($a2) -/* 00F308 8000E708 00004025 */ move $t0, $zero -/* 00F30C 8000E70C 18C00021 */ blez $a2, .L8000E794 -/* 00F310 8000E710 00002825 */ move $a1, $zero -/* 00F314 8000E714 3C0B8012 */ lui $t3, %hi(D_8011AE58) # $t3, 0x8012 -/* 00F318 8000E718 256BAE58 */ addiu $t3, %lo(D_8011AE58) # addiu $t3, $t3, -0x51a8 -.L8000E71C: -/* 00F31C 8000E71C 8D6D0000 */ lw $t5, ($t3) -/* 00F320 8000E720 24A50001 */ addiu $a1, $a1, 1 -/* 00F324 8000E724 01A87021 */ addu $t6, $t5, $t0 -/* 00F328 8000E728 8DC30000 */ lw $v1, ($t6) -/* 00F32C 8000E72C 00000000 */ nop -/* 00F330 8000E730 10600016 */ beqz $v1, .L8000E78C -/* 00F334 8000E734 00A6082A */ slt $at, $a1, $a2 -/* 00F338 8000E738 8C69003C */ lw $t1, 0x3c($v1) -/* 00F33C 8000E73C 00000000 */ nop -/* 00F340 8000E740 11200011 */ beqz $t1, .L8000E788 -/* 00F344 8000E744 0089082A */ slt $at, $a0, $t1 -/* 00F348 8000E748 10200009 */ beqz $at, .L8000E770 -/* 00F34C 8000E74C 01205025 */ move $t2, $t1 -/* 00F350 8000E750 0127082A */ slt $at, $t1, $a3 -/* 00F354 8000E754 10200006 */ beqz $at, .L8000E770 -/* 00F358 8000E758 01227823 */ subu $t7, $t1, $v0 -/* 00F35C 8000E75C AC6F003C */ sw $t7, 0x3c($v1) -/* 00F360 8000E760 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 -/* 00F364 8000E764 8CC6AE5C */ lw $a2, %lo(D_8011AE5C)($a2) -/* 00F368 8000E768 10000008 */ b .L8000E78C -/* 00F36C 8000E76C 00A6082A */ slt $at, $a1, $a2 -.L8000E770: -/* 00F370 8000E770 148A0006 */ bne $a0, $t2, .L8000E78C -/* 00F374 8000E774 00A6082A */ slt $at, $a1, $a2 -/* 00F378 8000E778 AC60003C */ sw $zero, 0x3c($v1) -/* 00F37C 8000E77C 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 -/* 00F380 8000E780 8CC6AE5C */ lw $a2, %lo(D_8011AE5C)($a2) -/* 00F384 8000E784 00000000 */ nop -.L8000E788: -/* 00F388 8000E788 00A6082A */ slt $at, $a1, $a2 -.L8000E78C: -/* 00F38C 8000E78C 1420FFE3 */ bnez $at, .L8000E71C -/* 00F390 8000E790 25080004 */ addiu $t0, $t0, 4 -.L8000E794: -/* 00F394 8000E794 03E00008 */ jr $ra -/* 00F398 8000E798 27BD0040 */ addiu $sp, $sp, 0x40 - -/* 00F39C 8000E79C 3C068012 */ lui $a2, %hi(D_8011AEC0) # $a2, 0x8012 -/* 00F3A0 8000E7A0 8CC6AEC0 */ lw $a2, %lo(D_8011AEC0)($a2) -/* 00F3A4 8000E7A4 3C188012 */ lui $t8, %hi(D_8011AEA0) # $t8, 0x8012 -/* 00F3A8 8000E7A8 00064080 */ sll $t0, $a2, 2 -/* 00F3AC 8000E7AC 2718AEA0 */ addiu $t8, %lo(D_8011AEA0) # addiu $t8, $t8, -0x5160 -/* 00F3B0 8000E7B0 3C0D8012 */ lui $t5, 0x8012 -/* 00F3B4 8000E7B4 90820001 */ lbu $v0, 1($a0) -/* 00F3B8 8000E7B8 90A30001 */ lbu $v1, 1($a1) -/* 00F3BC 8000E7BC 01A86821 */ addu $t5, $t5, $t0 -/* 00F3C0 8000E7C0 01184821 */ addu $t1, $t0, $t8 -/* 00F3C4 8000E7C4 8D390000 */ lw $t9, ($t1) -/* 00F3C8 8000E7C8 8DADAEB0 */ lw $t5, -0x5150($t5) -/* 00F3CC 8000E7CC 304E003F */ andi $t6, $v0, 0x3f -/* 00F3D0 8000E7D0 306F003F */ andi $t7, $v1, 0x3f -/* 00F3D4 8000E7D4 01EE082A */ slt $at, $t7, $t6 -/* 00F3D8 8000E7D8 032D3821 */ addu $a3, $t9, $t5 -/* 00F3DC 8000E7DC 01C01025 */ move $v0, $t6 -/* 00F3E0 8000E7E0 01E01825 */ move $v1, $t7 -/* 00F3E4 8000E7E4 1020000E */ beqz $at, .L8000E820 -/* 00F3E8 8000E7E8 24E70010 */ addiu $a3, $a3, 0x10 -/* 00F3EC 8000E7EC 008E4021 */ addu $t0, $a0, $t6 -/* 00F3F0 8000E7F0 0107082B */ sltu $at, $t0, $a3 -/* 00F3F4 8000E7F4 008F3021 */ addu $a2, $a0, $t7 -/* 00F3F8 8000E7F8 10200017 */ beqz $at, .L8000E858 -/* 00F3FC 8000E7FC 00E05025 */ move $t2, $a3 -.L8000E800: -/* 00F400 8000E800 910E0000 */ lbu $t6, ($t0) -/* 00F404 8000E804 25080001 */ addiu $t0, $t0, 1 -/* 00F408 8000E808 010A082B */ sltu $at, $t0, $t2 -/* 00F40C 8000E80C 24C60001 */ addiu $a2, $a2, 1 -/* 00F410 8000E810 1420FFFB */ bnez $at, .L8000E800 -/* 00F414 8000E814 A0CEFFFF */ sb $t6, -1($a2) -/* 00F418 8000E818 10000010 */ b .L8000E85C -/* 00F41C 8000E81C 00003025 */ move $a2, $zero -.L8000E820: -/* 00F420 8000E820 0043082A */ slt $at, $v0, $v1 -/* 00F424 8000E824 1020000C */ beqz $at, .L8000E858 -/* 00F428 8000E828 00E37821 */ addu $t7, $a3, $v1 -/* 00F42C 8000E82C 01E23023 */ subu $a2, $t7, $v0 -/* 00F430 8000E830 00835021 */ addu $t2, $a0, $v1 -/* 00F434 8000E834 0146082B */ sltu $at, $t2, $a2 -/* 00F438 8000E838 10200007 */ beqz $at, .L8000E858 -/* 00F43C 8000E83C 00E04025 */ move $t0, $a3 -.L8000E840: -/* 00F440 8000E840 9118FFFF */ lbu $t8, -1($t0) -/* 00F444 8000E844 24C6FFFF */ addiu $a2, $a2, -1 -/* 00F448 8000E848 0146082B */ sltu $at, $t2, $a2 -/* 00F44C 8000E84C 2508FFFF */ addiu $t0, $t0, -1 -/* 00F450 8000E850 1420FFFB */ bnez $at, .L8000E840 -/* 00F454 8000E854 A0D80000 */ sb $t8, ($a2) -.L8000E858: -/* 00F458 8000E858 00003025 */ move $a2, $zero -.L8000E85C: -/* 00F45C 8000E85C 00803825 */ move $a3, $a0 -/* 00F460 8000E860 00A04025 */ move $t0, $a1 -.L8000E864: -/* 00F464 8000E864 91190000 */ lbu $t9, ($t0) -/* 00F468 8000E868 24C60001 */ addiu $a2, $a2, 1 -/* 00F46C 8000E86C 00C3082A */ slt $at, $a2, $v1 -/* 00F470 8000E870 24E70001 */ addiu $a3, $a3, 1 -/* 00F474 8000E874 25080001 */ addiu $t0, $t0, 1 -/* 00F478 8000E878 1420FFFA */ bnez $at, .L8000E864 -/* 00F47C 8000E87C A0F9FFFF */ sb $t9, -1($a3) -/* 00F480 8000E880 8D2D0000 */ lw $t5, ($t1) -/* 00F484 8000E884 00000000 */ nop -/* 00F488 8000E888 01A37021 */ addu $t6, $t5, $v1 -/* 00F48C 8000E88C 01C27823 */ subu $t7, $t6, $v0 -/* 00F490 8000E890 03E00008 */ jr $ra -/* 00F494 8000E894 AD2F0000 */ sw $t7, ($t1) - -/* 00F498 8000E898 3C0F8012 */ lui $t7, %hi(D_8011AEA0) # $t7, 0x8012 -/* 00F49C 8000E89C 25EFAEA0 */ addiu $t7, %lo(D_8011AEA0) # addiu $t7, $t7, -0x5160 -/* 00F4A0 8000E8A0 00053080 */ sll $a2, $a1, 2 -/* 00F4A4 8000E8A4 90820001 */ lbu $v0, 1($a0) -/* 00F4A8 8000E8A8 00CF3821 */ addu $a3, $a2, $t7 -/* 00F4AC 8000E8AC 3C188012 */ lui $t8, 0x8012 -/* 00F4B0 8000E8B0 8CE80000 */ lw $t0, ($a3) -/* 00F4B4 8000E8B4 0306C021 */ addu $t8, $t8, $a2 -/* 00F4B8 8000E8B8 8F18AE98 */ lw $t8, -0x5168($t8) -/* 00F4BC 8000E8BC 304E003F */ andi $t6, $v0, 0x3f -/* 00F4C0 8000E8C0 010EC821 */ addu $t9, $t0, $t6 -/* 00F4C4 8000E8C4 01C01025 */ move $v0, $t6 -/* 00F4C8 8000E8C8 ACF90000 */ sw $t9, ($a3) -/* 00F4CC 8000E8CC 00004825 */ move $t1, $zero -/* 00F4D0 8000E8D0 19C0001B */ blez $t6, .L8000E940 -/* 00F4D4 8000E8D4 01181821 */ addu $v1, $t0, $t8 -/* 00F4D8 8000E8D8 31C80003 */ andi $t0, $t6, 3 -/* 00F4DC 8000E8DC 1100000A */ beqz $t0, .L8000E908 -/* 00F4E0 8000E8E0 01002825 */ move $a1, $t0 -/* 00F4E4 8000E8E4 00603021 */ addu $a2, $v1, $zero -/* 00F4E8 8000E8E8 00803821 */ addu $a3, $a0, $zero -.L8000E8EC: -/* 00F4EC 8000E8EC 90EA0000 */ lbu $t2, ($a3) -/* 00F4F0 8000E8F0 25290001 */ addiu $t1, $t1, 1 -/* 00F4F4 8000E8F4 24C60001 */ addiu $a2, $a2, 1 -/* 00F4F8 8000E8F8 24E70001 */ addiu $a3, $a3, 1 -/* 00F4FC 8000E8FC 14A9FFFB */ bne $a1, $t1, .L8000E8EC -/* 00F500 8000E900 A0CAFFFF */ sb $t2, -1($a2) -/* 00F504 8000E904 1122000E */ beq $t1, $v0, .L8000E940 -.L8000E908: -/* 00F508 8000E908 00693021 */ addu $a2, $v1, $t1 -/* 00F50C 8000E90C 00893821 */ addu $a3, $a0, $t1 -.L8000E910: -/* 00F510 8000E910 90EB0000 */ lbu $t3, ($a3) -/* 00F514 8000E914 25290004 */ addiu $t1, $t1, 4 -/* 00F518 8000E918 A0CB0000 */ sb $t3, ($a2) -/* 00F51C 8000E91C 90EC0001 */ lbu $t4, 1($a3) -/* 00F520 8000E920 24C60004 */ addiu $a2, $a2, 4 -/* 00F524 8000E924 A0CCFFFD */ sb $t4, -3($a2) -/* 00F528 8000E928 90ED0002 */ lbu $t5, 2($a3) -/* 00F52C 8000E92C 24E70004 */ addiu $a3, $a3, 4 -/* 00F530 8000E930 A0CDFFFE */ sb $t5, -2($a2) -/* 00F534 8000E934 90EEFFFF */ lbu $t6, -1($a3) -/* 00F538 8000E938 1522FFF5 */ bne $t1, $v0, .L8000E910 -/* 00F53C 8000E93C A0CEFFFF */ sb $t6, -1($a2) -.L8000E940: -/* 00F540 8000E940 03E00008 */ jr $ra -/* 00F544 8000E944 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/unknown_00BC20/func_8000E4E8.s b/asm/non_matchings/unknown_00BC20/func_8000E4E8.s new file mode 100644 index 00000000..2a7123d6 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8000E4E8.s @@ -0,0 +1,32 @@ +glabel func_8000E4E8 +/* 00F0E8 8000E4E8 00041880 */ sll $v1, $a0, 2 +/* 00F0EC 8000E4EC 3C028012 */ lui $v0, 0x8012 +/* 00F0F0 8000E4F0 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012 +/* 00F0F4 8000E4F4 00431021 */ addu $v0, $v0, $v1 +/* 00F0F8 8000E4F8 25CEAEA0 */ addiu $t6, %lo(D_8011AEA0) # addiu $t6, $t6, -0x5160 +/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, -0x5150($v0) +/* 00F100 8000E500 006E2821 */ addu $a1, $v1, $t6 +/* 00F104 8000E504 8CAF0000 */ lw $t7, ($a1) +/* 00F108 8000E508 3C198012 */ lui $t9, 0x8012 +/* 00F10C 8000E50C AC40000C */ sw $zero, 0xc($v0) +/* 00F110 8000E510 AC400008 */ sw $zero, 8($v0) +/* 00F114 8000E514 AC400004 */ sw $zero, 4($v0) +/* 00F118 8000E518 AC4F0000 */ sw $t7, ($v0) +/* 00F11C 8000E51C 0323C821 */ addu $t9, $t9, $v1 +/* 00F120 8000E520 8F39AE98 */ lw $t9, -0x5168($t9) +/* 00F124 8000E524 8CB80000 */ lw $t8, ($a1) +/* 00F128 8000E528 24020010 */ li $v0, 16 +/* 00F12C 8000E52C 00003825 */ move $a3, $zero +/* 00F130 8000E530 03194021 */ addu $t0, $t8, $t9 +.L8000E534: +/* 00F134 8000E534 24E70004 */ addiu $a3, $a3, 4 +/* 00F138 8000E538 A1000000 */ sb $zero, ($t0) +/* 00F13C 8000E53C A1000001 */ sb $zero, 1($t0) +/* 00F140 8000E540 A1000002 */ sb $zero, 2($t0) +/* 00F144 8000E544 A1000003 */ sb $zero, 3($t0) +/* 00F148 8000E548 14E2FFFA */ bne $a3, $v0, .L8000E534 +/* 00F14C 8000E54C 25080004 */ addiu $t0, $t0, 4 +/* 00F150 8000E550 03E00008 */ jr $ra +/* 00F154 8000E554 00000000 */ nop + + diff --git a/asm/non_matchings/unknown_00BC20/func_8000E558.s b/asm/non_matchings/unknown_00BC20/func_8000E558.s new file mode 100644 index 00000000..d92a1870 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8000E558.s @@ -0,0 +1,45 @@ +glabel func_8000E558 +/* 00F158 8000E558 8C82003C */ lw $v0, 0x3c($a0) +/* 00F15C 8000E55C 3C058012 */ lui $a1, %hi(D_8011AE98) # $a1, 0x8012 +/* 00F160 8000E560 14400003 */ bnez $v0, .L8000E570 +/* 00F164 8000E564 24A5AE98 */ addiu $a1, %lo(D_8011AE98) # addiu $a1, $a1, -0x5168 +/* 00F168 8000E568 03E00008 */ jr $ra +/* 00F16C 8000E56C 24020001 */ li $v0, 1 + +.L8000E570: +/* 00F170 8000E570 8CA40000 */ lw $a0, ($a1) +/* 00F174 8000E574 00401825 */ move $v1, $v0 +/* 00F178 8000E578 0044082A */ slt $at, $v0, $a0 +/* 00F17C 8000E57C 1420000A */ bnez $at, .L8000E5A8 +/* 00F180 8000E580 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012 +/* 00F184 8000E584 8DCEAEA0 */ lw $t6, %lo(D_8011AEA0)($t6) +/* 00F188 8000E588 00000000 */ nop +/* 00F18C 8000E58C 000E78C0 */ sll $t7, $t6, 3 +/* 00F190 8000E590 01E4C021 */ addu $t8, $t7, $a0 +/* 00F194 8000E594 0302082A */ slt $at, $t8, $v0 +/* 00F198 8000E598 14200003 */ bnez $at, .L8000E5A8 +/* 00F19C 8000E59C 00000000 */ nop +/* 00F1A0 8000E5A0 03E00008 */ jr $ra +/* 00F1A4 8000E5A4 00001025 */ move $v0, $zero + +.L8000E5A8: +/* 00F1A8 8000E5A8 8CA20004 */ lw $v0, 4($a1) +/* 00F1AC 8000E5AC 3C198012 */ lui $t9, %hi(D_8011AEA4) # $t9, 0x8012 +/* 00F1B0 8000E5B0 0062082A */ slt $at, $v1, $v0 +/* 00F1B4 8000E5B4 1420000A */ bnez $at, .L8000E5E0 +/* 00F1B8 8000E5B8 00000000 */ nop +/* 00F1BC 8000E5BC 8F39AEA4 */ lw $t9, %lo(D_8011AEA4)($t9) +/* 00F1C0 8000E5C0 00000000 */ nop +/* 00F1C4 8000E5C4 001940C0 */ sll $t0, $t9, 3 +/* 00F1C8 8000E5C8 01024821 */ addu $t1, $t0, $v0 +/* 00F1CC 8000E5CC 0123082A */ slt $at, $t1, $v1 +/* 00F1D0 8000E5D0 14200004 */ bnez $at, .L8000E5E4 +/* 00F1D4 8000E5D4 24020001 */ li $v0, 1 +/* 00F1D8 8000E5D8 03E00008 */ jr $ra +/* 00F1DC 8000E5DC 24020001 */ li $v0, 1 + +.L8000E5E0: +/* 00F1E0 8000E5E0 24020001 */ li $v0, 1 +.L8000E5E4: +/* 00F1E4 8000E5E4 03E00008 */ jr $ra +/* 00F1E8 8000E5E8 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000E5EC.s b/asm/non_matchings/unknown_00BC20/func_8000E5EC.s new file mode 100644 index 00000000..5e77aab2 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8000E5EC.s @@ -0,0 +1,121 @@ +glabel func_8000E5EC +/* 00F1EC 8000E5EC 3C068012 */ lui $a2, %hi(D_8011AE98) # $a2, 0x8012 +/* 00F1F0 8000E5F0 3C0B8012 */ lui $t3, %hi(D_8011AEA0) # $t3, 0x8012 +/* 00F1F4 8000E5F4 256BAEA0 */ addiu $t3, %lo(D_8011AEA0) # addiu $t3, $t3, -0x5160 +/* 00F1F8 8000E5F8 24C6AE98 */ addiu $a2, %lo(D_8011AE98) # addiu $a2, $a2, -0x5168 +/* 00F1FC 8000E5FC 90820001 */ lbu $v0, 1($a0) +/* 00F200 8000E600 8CC30000 */ lw $v1, ($a2) +/* 00F204 8000E604 8D6F0000 */ lw $t7, ($t3) +/* 00F208 8000E608 8CC50004 */ lw $a1, 4($a2) +/* 00F20C 8000E60C 8D790004 */ lw $t9, 4($t3) +/* 00F210 8000E610 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 00F214 8000E614 304E003F */ andi $t6, $v0, 0x3f +/* 00F218 8000E618 0083082A */ slt $at, $a0, $v1 +/* 00F21C 8000E61C 01E3C021 */ addu $t8, $t7, $v1 +/* 00F220 8000E620 03256021 */ addu $t4, $t9, $a1 +/* 00F224 8000E624 01C01025 */ move $v0, $t6 +/* 00F228 8000E628 AFB8002C */ sw $t8, 0x2c($sp) +/* 00F22C 8000E62C 14200006 */ bnez $at, .L8000E648 +/* 00F230 8000E630 AFAC0030 */ sw $t4, 0x30($sp) +/* 00F234 8000E634 0098082A */ slt $at, $a0, $t8 +/* 00F238 8000E638 10200004 */ beqz $at, .L8000E64C +/* 00F23C 8000E63C 0085082A */ slt $at, $a0, $a1 +/* 00F240 8000E640 1000000A */ b .L8000E66C +/* 00F244 8000E644 AFA0001C */ sw $zero, 0x1c($sp) +.L8000E648: +/* 00F248 8000E648 0085082A */ slt $at, $a0, $a1 +.L8000E64C: +/* 00F24C 8000E64C 14200008 */ bnez $at, .L8000E670 +/* 00F250 8000E650 8FA8001C */ lw $t0, 0x1c($sp) +/* 00F254 8000E654 8FAE0030 */ lw $t6, 0x30($sp) +/* 00F258 8000E658 240F0001 */ li $t7, 1 +/* 00F25C 8000E65C 008E082A */ slt $at, $a0, $t6 +/* 00F260 8000E660 10200003 */ beqz $at, .L8000E670 +/* 00F264 8000E664 8FA8001C */ lw $t0, 0x1c($sp) +/* 00F268 8000E668 AFAF001C */ sw $t7, 0x1c($sp) +.L8000E66C: +/* 00F26C 8000E66C 8FA8001C */ lw $t0, 0x1c($sp) +.L8000E670: +/* 00F270 8000E670 00823021 */ addu $a2, $a0, $v0 +/* 00F274 8000E674 0008C080 */ sll $t8, $t0, 2 +/* 00F278 8000E678 03B83821 */ addu $a3, $sp, $t8 +/* 00F27C 8000E67C 8CE7002C */ lw $a3, 0x2c($a3) +/* 00F280 8000E680 00801825 */ move $v1, $a0 +/* 00F284 8000E684 00C7082B */ sltu $at, $a2, $a3 +/* 00F288 8000E688 00C02825 */ move $a1, $a2 +/* 00F28C 8000E68C 10200018 */ beqz $at, .L8000E6F0 +/* 00F290 8000E690 03004025 */ move $t0, $t8 +/* 00F294 8000E694 00E65023 */ subu $t2, $a3, $a2 +/* 00F298 8000E698 31590003 */ andi $t9, $t2, 3 +/* 00F29C 8000E69C 13200008 */ beqz $t9, .L8000E6C0 +/* 00F2A0 8000E6A0 03264821 */ addu $t1, $t9, $a2 +.L8000E6A4: +/* 00F2A4 8000E6A4 90AC0000 */ lbu $t4, ($a1) +/* 00F2A8 8000E6A8 24A50001 */ addiu $a1, $a1, 1 +/* 00F2AC 8000E6AC 24630001 */ addiu $v1, $v1, 1 +/* 00F2B0 8000E6B0 1525FFFC */ bne $t1, $a1, .L8000E6A4 +/* 00F2B4 8000E6B4 A06CFFFF */ sb $t4, -1($v1) +/* 00F2B8 8000E6B8 10A7000D */ beq $a1, $a3, .L8000E6F0 +/* 00F2BC 8000E6BC 00000000 */ nop +.L8000E6C0: +/* 00F2C0 8000E6C0 90AD0000 */ lbu $t5, ($a1) +/* 00F2C4 8000E6C4 24A50004 */ addiu $a1, $a1, 4 +/* 00F2C8 8000E6C8 A06D0000 */ sb $t5, ($v1) +/* 00F2CC 8000E6CC 90AEFFFD */ lbu $t6, -3($a1) +/* 00F2D0 8000E6D0 24630004 */ addiu $v1, $v1, 4 +/* 00F2D4 8000E6D4 A06EFFFD */ sb $t6, -3($v1) +/* 00F2D8 8000E6D8 90AFFFFE */ lbu $t7, -2($a1) +/* 00F2DC 8000E6DC 00000000 */ nop +/* 00F2E0 8000E6E0 A06FFFFE */ sb $t7, -2($v1) +/* 00F2E4 8000E6E4 90B8FFFF */ lbu $t8, -1($a1) +/* 00F2E8 8000E6E8 14A7FFF5 */ bne $a1, $a3, .L8000E6C0 +/* 00F2EC 8000E6EC A078FFFF */ sb $t8, -1($v1) +.L8000E6F0: +/* 00F2F0 8000E6F0 01681821 */ addu $v1, $t3, $t0 +/* 00F2F4 8000E6F4 8C790000 */ lw $t9, ($v1) +/* 00F2F8 8000E6F8 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012 +/* 00F2FC 8000E6FC 03226023 */ subu $t4, $t9, $v0 +/* 00F300 8000E700 AC6C0000 */ sw $t4, ($v1) +/* 00F304 8000E704 8CC6AE5C */ lw $a2, %lo(objCount)($a2) +/* 00F308 8000E708 00004025 */ move $t0, $zero +/* 00F30C 8000E70C 18C00021 */ blez $a2, .L8000E794 +/* 00F310 8000E710 00002825 */ move $a1, $zero +/* 00F314 8000E714 3C0B8012 */ lui $t3, %hi(objPtrList) # $t3, 0x8012 +/* 00F318 8000E718 256BAE58 */ addiu $t3, %lo(objPtrList) # addiu $t3, $t3, -0x51a8 +.L8000E71C: +/* 00F31C 8000E71C 8D6D0000 */ lw $t5, ($t3) +/* 00F320 8000E720 24A50001 */ addiu $a1, $a1, 1 +/* 00F324 8000E724 01A87021 */ addu $t6, $t5, $t0 +/* 00F328 8000E728 8DC30000 */ lw $v1, ($t6) +/* 00F32C 8000E72C 00000000 */ nop +/* 00F330 8000E730 10600016 */ beqz $v1, .L8000E78C +/* 00F334 8000E734 00A6082A */ slt $at, $a1, $a2 +/* 00F338 8000E738 8C69003C */ lw $t1, 0x3c($v1) +/* 00F33C 8000E73C 00000000 */ nop +/* 00F340 8000E740 11200011 */ beqz $t1, .L8000E788 +/* 00F344 8000E744 0089082A */ slt $at, $a0, $t1 +/* 00F348 8000E748 10200009 */ beqz $at, .L8000E770 +/* 00F34C 8000E74C 01205025 */ move $t2, $t1 +/* 00F350 8000E750 0127082A */ slt $at, $t1, $a3 +/* 00F354 8000E754 10200006 */ beqz $at, .L8000E770 +/* 00F358 8000E758 01227823 */ subu $t7, $t1, $v0 +/* 00F35C 8000E75C AC6F003C */ sw $t7, 0x3c($v1) +/* 00F360 8000E760 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012 +/* 00F364 8000E764 8CC6AE5C */ lw $a2, %lo(objCount)($a2) +/* 00F368 8000E768 10000008 */ b .L8000E78C +/* 00F36C 8000E76C 00A6082A */ slt $at, $a1, $a2 +.L8000E770: +/* 00F370 8000E770 148A0006 */ bne $a0, $t2, .L8000E78C +/* 00F374 8000E774 00A6082A */ slt $at, $a1, $a2 +/* 00F378 8000E778 AC60003C */ sw $zero, 0x3c($v1) +/* 00F37C 8000E77C 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012 +/* 00F380 8000E780 8CC6AE5C */ lw $a2, %lo(objCount)($a2) +/* 00F384 8000E784 00000000 */ nop +.L8000E788: +/* 00F388 8000E788 00A6082A */ slt $at, $a1, $a2 +.L8000E78C: +/* 00F38C 8000E78C 1420FFE3 */ bnez $at, .L8000E71C +/* 00F390 8000E790 25080004 */ addiu $t0, $t0, 4 +.L8000E794: +/* 00F394 8000E794 03E00008 */ jr $ra +/* 00F398 8000E798 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E79C.s b/asm/non_matchings/unknown_00BC20/func_8000E79C.s new file mode 100644 index 00000000..01b254bb --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8000E79C.s @@ -0,0 +1,70 @@ +glabel func_8000E79C +/* 00F39C 8000E79C 3C068012 */ lui $a2, %hi(D_8011AEC0) # $a2, 0x8012 +/* 00F3A0 8000E7A0 8CC6AEC0 */ lw $a2, %lo(D_8011AEC0)($a2) +/* 00F3A4 8000E7A4 3C188012 */ lui $t8, %hi(D_8011AEA0) # $t8, 0x8012 +/* 00F3A8 8000E7A8 00064080 */ sll $t0, $a2, 2 +/* 00F3AC 8000E7AC 2718AEA0 */ addiu $t8, %lo(D_8011AEA0) # addiu $t8, $t8, -0x5160 +/* 00F3B0 8000E7B0 3C0D8012 */ lui $t5, 0x8012 +/* 00F3B4 8000E7B4 90820001 */ lbu $v0, 1($a0) +/* 00F3B8 8000E7B8 90A30001 */ lbu $v1, 1($a1) +/* 00F3BC 8000E7BC 01A86821 */ addu $t5, $t5, $t0 +/* 00F3C0 8000E7C0 01184821 */ addu $t1, $t0, $t8 +/* 00F3C4 8000E7C4 8D390000 */ lw $t9, ($t1) +/* 00F3C8 8000E7C8 8DADAEB0 */ lw $t5, -0x5150($t5) +/* 00F3CC 8000E7CC 304E003F */ andi $t6, $v0, 0x3f +/* 00F3D0 8000E7D0 306F003F */ andi $t7, $v1, 0x3f +/* 00F3D4 8000E7D4 01EE082A */ slt $at, $t7, $t6 +/* 00F3D8 8000E7D8 032D3821 */ addu $a3, $t9, $t5 +/* 00F3DC 8000E7DC 01C01025 */ move $v0, $t6 +/* 00F3E0 8000E7E0 01E01825 */ move $v1, $t7 +/* 00F3E4 8000E7E4 1020000E */ beqz $at, .L8000E820 +/* 00F3E8 8000E7E8 24E70010 */ addiu $a3, $a3, 0x10 +/* 00F3EC 8000E7EC 008E4021 */ addu $t0, $a0, $t6 +/* 00F3F0 8000E7F0 0107082B */ sltu $at, $t0, $a3 +/* 00F3F4 8000E7F4 008F3021 */ addu $a2, $a0, $t7 +/* 00F3F8 8000E7F8 10200017 */ beqz $at, .L8000E858 +/* 00F3FC 8000E7FC 00E05025 */ move $t2, $a3 +.L8000E800: +/* 00F400 8000E800 910E0000 */ lbu $t6, ($t0) +/* 00F404 8000E804 25080001 */ addiu $t0, $t0, 1 +/* 00F408 8000E808 010A082B */ sltu $at, $t0, $t2 +/* 00F40C 8000E80C 24C60001 */ addiu $a2, $a2, 1 +/* 00F410 8000E810 1420FFFB */ bnez $at, .L8000E800 +/* 00F414 8000E814 A0CEFFFF */ sb $t6, -1($a2) +/* 00F418 8000E818 10000010 */ b .L8000E85C +/* 00F41C 8000E81C 00003025 */ move $a2, $zero +.L8000E820: +/* 00F420 8000E820 0043082A */ slt $at, $v0, $v1 +/* 00F424 8000E824 1020000C */ beqz $at, .L8000E858 +/* 00F428 8000E828 00E37821 */ addu $t7, $a3, $v1 +/* 00F42C 8000E82C 01E23023 */ subu $a2, $t7, $v0 +/* 00F430 8000E830 00835021 */ addu $t2, $a0, $v1 +/* 00F434 8000E834 0146082B */ sltu $at, $t2, $a2 +/* 00F438 8000E838 10200007 */ beqz $at, .L8000E858 +/* 00F43C 8000E83C 00E04025 */ move $t0, $a3 +.L8000E840: +/* 00F440 8000E840 9118FFFF */ lbu $t8, -1($t0) +/* 00F444 8000E844 24C6FFFF */ addiu $a2, $a2, -1 +/* 00F448 8000E848 0146082B */ sltu $at, $t2, $a2 +/* 00F44C 8000E84C 2508FFFF */ addiu $t0, $t0, -1 +/* 00F450 8000E850 1420FFFB */ bnez $at, .L8000E840 +/* 00F454 8000E854 A0D80000 */ sb $t8, ($a2) +.L8000E858: +/* 00F458 8000E858 00003025 */ move $a2, $zero +.L8000E85C: +/* 00F45C 8000E85C 00803825 */ move $a3, $a0 +/* 00F460 8000E860 00A04025 */ move $t0, $a1 +.L8000E864: +/* 00F464 8000E864 91190000 */ lbu $t9, ($t0) +/* 00F468 8000E868 24C60001 */ addiu $a2, $a2, 1 +/* 00F46C 8000E86C 00C3082A */ slt $at, $a2, $v1 +/* 00F470 8000E870 24E70001 */ addiu $a3, $a3, 1 +/* 00F474 8000E874 25080001 */ addiu $t0, $t0, 1 +/* 00F478 8000E878 1420FFFA */ bnez $at, .L8000E864 +/* 00F47C 8000E87C A0F9FFFF */ sb $t9, -1($a3) +/* 00F480 8000E880 8D2D0000 */ lw $t5, ($t1) +/* 00F484 8000E884 00000000 */ nop +/* 00F488 8000E888 01A37021 */ addu $t6, $t5, $v1 +/* 00F48C 8000E88C 01C27823 */ subu $t7, $t6, $v0 +/* 00F490 8000E890 03E00008 */ jr $ra +/* 00F494 8000E894 AD2F0000 */ sw $t7, ($t1) diff --git a/asm/non_matchings/unknown_00BC20/func_8000E898.s b/asm/non_matchings/unknown_00BC20/func_8000E898.s new file mode 100644 index 00000000..c37a9ed5 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8000E898.s @@ -0,0 +1,49 @@ +glabel func_8000E898 +/* 00F498 8000E898 3C0F8012 */ lui $t7, %hi(D_8011AEA0) # $t7, 0x8012 +/* 00F49C 8000E89C 25EFAEA0 */ addiu $t7, %lo(D_8011AEA0) # addiu $t7, $t7, -0x5160 +/* 00F4A0 8000E8A0 00053080 */ sll $a2, $a1, 2 +/* 00F4A4 8000E8A4 90820001 */ lbu $v0, 1($a0) +/* 00F4A8 8000E8A8 00CF3821 */ addu $a3, $a2, $t7 +/* 00F4AC 8000E8AC 3C188012 */ lui $t8, 0x8012 +/* 00F4B0 8000E8B0 8CE80000 */ lw $t0, ($a3) +/* 00F4B4 8000E8B4 0306C021 */ addu $t8, $t8, $a2 +/* 00F4B8 8000E8B8 8F18AE98 */ lw $t8, -0x5168($t8) +/* 00F4BC 8000E8BC 304E003F */ andi $t6, $v0, 0x3f +/* 00F4C0 8000E8C0 010EC821 */ addu $t9, $t0, $t6 +/* 00F4C4 8000E8C4 01C01025 */ move $v0, $t6 +/* 00F4C8 8000E8C8 ACF90000 */ sw $t9, ($a3) +/* 00F4CC 8000E8CC 00004825 */ move $t1, $zero +/* 00F4D0 8000E8D0 19C0001B */ blez $t6, .L8000E940 +/* 00F4D4 8000E8D4 01181821 */ addu $v1, $t0, $t8 +/* 00F4D8 8000E8D8 31C80003 */ andi $t0, $t6, 3 +/* 00F4DC 8000E8DC 1100000A */ beqz $t0, .L8000E908 +/* 00F4E0 8000E8E0 01002825 */ move $a1, $t0 +/* 00F4E4 8000E8E4 00603021 */ addu $a2, $v1, $zero +/* 00F4E8 8000E8E8 00803821 */ addu $a3, $a0, $zero +.L8000E8EC: +/* 00F4EC 8000E8EC 90EA0000 */ lbu $t2, ($a3) +/* 00F4F0 8000E8F0 25290001 */ addiu $t1, $t1, 1 +/* 00F4F4 8000E8F4 24C60001 */ addiu $a2, $a2, 1 +/* 00F4F8 8000E8F8 24E70001 */ addiu $a3, $a3, 1 +/* 00F4FC 8000E8FC 14A9FFFB */ bne $a1, $t1, .L8000E8EC +/* 00F500 8000E900 A0CAFFFF */ sb $t2, -1($a2) +/* 00F504 8000E904 1122000E */ beq $t1, $v0, .L8000E940 +.L8000E908: +/* 00F508 8000E908 00693021 */ addu $a2, $v1, $t1 +/* 00F50C 8000E90C 00893821 */ addu $a3, $a0, $t1 +.L8000E910: +/* 00F510 8000E910 90EB0000 */ lbu $t3, ($a3) +/* 00F514 8000E914 25290004 */ addiu $t1, $t1, 4 +/* 00F518 8000E918 A0CB0000 */ sb $t3, ($a2) +/* 00F51C 8000E91C 90EC0001 */ lbu $t4, 1($a3) +/* 00F520 8000E920 24C60004 */ addiu $a2, $a2, 4 +/* 00F524 8000E924 A0CCFFFD */ sb $t4, -3($a2) +/* 00F528 8000E928 90ED0002 */ lbu $t5, 2($a3) +/* 00F52C 8000E92C 24E70004 */ addiu $a3, $a3, 4 +/* 00F530 8000E930 A0CDFFFE */ sb $t5, -2($a2) +/* 00F534 8000E934 90EEFFFF */ lbu $t6, -1($a3) +/* 00F538 8000E938 1522FFF5 */ bne $t1, $v0, .L8000E910 +/* 00F53C 8000E93C A0CEFFFF */ sb $t6, -1($a2) +.L8000E940: +/* 00F540 8000E940 03E00008 */ jr $ra +/* 00F544 8000E944 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E9D0.s b/asm/non_matchings/unknown_00BC20/func_8000E9D0.s deleted file mode 100644 index 43a02324..00000000 --- a/asm/non_matchings/unknown_00BC20/func_8000E9D0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8000E9D0 -/* 00F5D0 8000E9D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00F5D4 8000E9D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 00F5D8 8000E9D8 848E0006 */ lh $t6, 6($a0) -/* 00F5DC 8000E9DC 00802825 */ move $a1, $a0 -/* 00F5E0 8000E9E0 35CF8000 */ ori $t7, $t6, 0x8000 -/* 00F5E4 8000E9E4 A48F0006 */ sh $t7, 6($a0) -/* 00F5E8 8000E9E8 8484002C */ lh $a0, 0x2c($a0) -/* 00F5EC 8000E9EC AFA50018 */ sw $a1, 0x18($sp) -/* 00F5F0 8000E9F0 3498C000 */ ori $t8, $a0, 0xc000 -/* 00F5F4 8000E9F4 0018CC00 */ sll $t9, $t8, 0x10 -/* 00F5F8 8000E9F8 0C00916D */ jal func_800245B4 -/* 00F5FC 8000E9FC 00192403 */ sra $a0, $t9, 0x10 -/* 00F600 8000EA00 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 00F604 8000EA04 2442AE5C */ addiu $v0, %lo(D_8011AE5C) # addiu $v0, $v0, -0x51a4 -/* 00F608 8000EA08 8C4A0000 */ lw $t2, ($v0) -/* 00F60C 8000EA0C 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 -/* 00F610 8000EA10 8D29AE58 */ lw $t1, %lo(D_8011AE58)($t1) -/* 00F614 8000EA14 8FA50018 */ lw $a1, 0x18($sp) -/* 00F618 8000EA18 000A5880 */ sll $t3, $t2, 2 -/* 00F61C 8000EA1C 012B6021 */ addu $t4, $t1, $t3 -/* 00F620 8000EA20 AD850000 */ sw $a1, ($t4) -/* 00F624 8000EA24 8C4D0000 */ lw $t5, ($v0) -/* 00F628 8000EA28 00000000 */ nop -/* 00F62C 8000EA2C 25AE0001 */ addiu $t6, $t5, 1 -/* 00F630 8000EA30 AC4E0000 */ sw $t6, ($v0) -/* 00F634 8000EA34 3C028012 */ lui $v0, %hi(D_8011AE64) # $v0, 0x8012 -/* 00F638 8000EA38 2442AE64 */ addiu $v0, %lo(D_8011AE64) # addiu $v0, $v0, -0x519c -/* 00F63C 8000EA3C 8C4F0000 */ lw $t7, ($v0) -/* 00F640 8000EA40 8FBF0014 */ lw $ra, 0x14($sp) -/* 00F644 8000EA44 25F80001 */ addiu $t8, $t7, 1 -/* 00F648 8000EA48 AC580000 */ sw $t8, ($v0) -/* 00F64C 8000EA4C 03E00008 */ jr $ra -/* 00F650 8000EA50 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index f4c683c1..7b768a25 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -691,9 +691,9 @@ glabel func_8000EA54 /* 01004C 8000F44C AC4A005C */ sw $t2, 0x5c($v0) .L8000F450: /* 010050 8000F450 8C430060 */ lw $v1, 0x60($v0) -/* 010054 8000F454 3C108012 */ lui $s0, %hi(D_8011AE5C) # $s0, 0x8012 +/* 010054 8000F454 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012 /* 010058 8000F458 10600005 */ beqz $v1, .L8000F470 -/* 01005C 8000F45C 2610AE5C */ addiu $s0, %lo(D_8011AE5C) # addiu $s0, $s0, -0x51a4 +/* 01005C 8000F45C 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4 /* 010060 8000F460 8CAB0000 */ lw $t3, ($a1) /* 010064 8000F464 0043C821 */ addu $t9, $v0, $v1 /* 010068 8000F468 032B6023 */ subu $t4, $t9, $t3 @@ -715,7 +715,7 @@ glabel func_8000EA54 /* 0100A0 8000F4A0 8068005A */ lb $t0, 0x5a($v1) /* 0100A4 8000F4A4 24490080 */ addiu $t1, $v0, 0x80 /* 0100A8 8000F4A8 19000006 */ blez $t0, .L8000F4C4 -/* 0100AC 8000F4AC 3C0F8012 */ lui $t7, %hi(D_8011AE58) # $t7, 0x8012 +/* 0100AC 8000F4AC 3C0F8012 */ lui $t7, %hi(objPtrList) # $t7, 0x8012 /* 0100B0 8000F4B0 8C4A0070 */ lw $t2, 0x70($v0) /* 0100B4 8000F4B4 8CAB0000 */ lw $t3, ($a1) /* 0100B8 8000F4B8 004AC821 */ addu $t9, $v0, $t2 @@ -729,7 +729,7 @@ glabel func_8000EA54 /* 0100D4 8000F4D4 11A0000A */ beqz $t5, .L8000F500 /* 0100D8 8000F4D8 01A08825 */ move $s1, $t5 /* 0100DC 8000F4DC 8E180000 */ lw $t8, ($s0) -/* 0100E0 8000F4E0 8DEFAE58 */ lw $t7, %lo(D_8011AE58)($t7) +/* 0100E0 8000F4E0 8DEFAE58 */ lw $t7, %lo(objPtrList)($t7) /* 0100E4 8000F4E4 00187080 */ sll $t6, $t8, 2 /* 0100E8 8000F4E8 01EE4021 */ addu $t0, $t7, $t6 /* 0100EC 8000F4EC AD020000 */ sw $v0, ($t0) @@ -738,10 +738,10 @@ glabel func_8000EA54 /* 0100F8 8000F4F8 25590001 */ addiu $t9, $t2, 1 /* 0100FC 8000F4FC AE190000 */ sw $t9, ($s0) .L8000F500: -/* 010100 8000F500 3C108012 */ lui $s0, %hi(D_8011AE5C) # $s0, 0x8012 +/* 010100 8000F500 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012 /* 010104 8000F504 8FA50068 */ lw $a1, 0x68($sp) /* 010108 8000F508 0C008E2F */ jal func_800238BC -/* 01010C 8000F50C 2610AE5C */ addiu $s0, %lo(D_8011AE5C) # addiu $s0, $s0, -0x51a4 +/* 01010C 8000F50C 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4 /* 010110 8000F510 8E42004C */ lw $v0, 0x4c($s2) /* 010114 8000F514 00000000 */ nop /* 010118 8000F518 1040000C */ beqz $v0, .L8000F54C diff --git a/asm/non_matchings/unknown_00BC20/func_8000FFB8.s b/asm/non_matchings/unknown_00BC20/func_8000FFB8.s deleted file mode 100644 index f193440f..00000000 --- a/asm/non_matchings/unknown_00BC20/func_8000FFB8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8000FFB8 -/* 010BB8 8000FFB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 010BBC 8000FFBC AFBF0014 */ sw $ra, 0x14($sp) -/* 010BC0 8000FFC0 AFA40018 */ sw $a0, 0x18($sp) -/* 010BC4 8000FFC4 8484004A */ lh $a0, 0x4a($a0) -/* 010BC8 8000FFC8 00000000 */ nop -/* 010BCC 8000FFCC 348F8000 */ ori $t7, $a0, 0x8000 -/* 010BD0 8000FFD0 000FC400 */ sll $t8, $t7, 0x10 -/* 010BD4 8000FFD4 0C00916D */ jal func_800245B4 -/* 010BD8 8000FFD8 00182403 */ sra $a0, $t8, 0x10 -/* 010BDC 8000FFDC 3C028012 */ lui $v0, %hi(D_8011AEC8) # $v0, 0x8012 -/* 010BE0 8000FFE0 2442AEC8 */ addiu $v0, %lo(D_8011AEC8) # addiu $v0, $v0, -0x5138 -/* 010BE4 8000FFE4 8C4A0000 */ lw $t2, ($v0) -/* 010BE8 8000FFE8 3C098012 */ lui $t1, %hi(D_8011AEC4) # $t1, 0x8012 -/* 010BEC 8000FFEC 8D29AEC4 */ lw $t1, %lo(D_8011AEC4)($t1) -/* 010BF0 8000FFF0 8FA80018 */ lw $t0, 0x18($sp) -/* 010BF4 8000FFF4 000A5880 */ sll $t3, $t2, 2 -/* 010BF8 8000FFF8 012B6021 */ addu $t4, $t1, $t3 -/* 010BFC 8000FFFC AD880000 */ sw $t0, ($t4) -/* 010C00 80010000 8C4D0000 */ lw $t5, ($v0) -/* 010C04 80010004 8FBF0014 */ lw $ra, 0x14($sp) -/* 010C08 80010008 25AE0001 */ addiu $t6, $t5, 1 -/* 010C0C 8001000C AC4E0000 */ sw $t6, ($v0) -/* 010C10 80010010 03E00008 */ jr $ra -/* 010C14 80010014 27BD0018 */ addiu $sp, $sp, 0x18 - -/* 010C18 80010018 3C028012 */ lui $v0, %hi(D_8011AEBC) # $v0, 0x8012 -/* 010C1C 8001001C 8C42AEBC */ lw $v0, %lo(D_8011AEBC)($v0) -/* 010C20 80010020 03E00008 */ jr $ra -/* 010C24 80010024 00000000 */ nop - -/* 010C28 80010028 3C0E8012 */ lui $t6, %hi(D_8011AEB8) # $t6, 0x8012 -/* 010C2C 8001002C 8DCEAEB8 */ lw $t6, %lo(D_8011AEB8)($t6) -/* 010C30 80010030 00047840 */ sll $t7, $a0, 1 -/* 010C34 80010034 3C088012 */ lui $t0, %hi(D_8011AD68) # $t0, 0x8012 -/* 010C38 80010038 01CFC021 */ addu $t8, $t6, $t7 -/* 010C3C 8001003C 87190000 */ lh $t9, ($t8) -/* 010C40 80010040 8D08AD68 */ lw $t0, %lo(D_8011AD68)($t0) -/* 010C44 80010044 03E00008 */ jr $ra -/* 010C48 80010048 0328102A */ slt $v0, $t9, $t0 - diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 601173ae..45c3e15d 100644 --- a/asm/non_matchings/unknown_00BC20/func_800101AC.s +++ b/asm/non_matchings/unknown_00BC20/func_800101AC.s @@ -123,16 +123,16 @@ glabel func_800101AC /* 010F68 80010368 00000000 */ nop /* 010F6C 8001036C 01800008 */ jr $t4 /* 010F70 80010370 00000000 */ nop -/* 010F74 80010374 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 010F78 80010378 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 010F74 80010374 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 010F78 80010378 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 010F7C 8001037C 0000A825 */ move $s5, $zero /* 010F80 80010380 1860001D */ blez $v1, .L800103F8 /* 010F84 80010384 0000A025 */ move $s4, $zero /* 010F88 80010388 24050001 */ li $a1, 1 /* 010F8C 8001038C 2404003D */ li $a0, 61 .L80010390: -/* 010F90 80010390 3C0D8012 */ lui $t5, %hi(D_8011AE58) # $t5, 0x8012 -/* 010F94 80010394 8DADAE58 */ lw $t5, %lo(D_8011AE58)($t5) +/* 010F90 80010390 3C0D8012 */ lui $t5, %hi(objPtrList) # $t5, 0x8012 +/* 010F94 80010394 8DADAE58 */ lw $t5, %lo(objPtrList)($t5) /* 010F98 80010398 26B50001 */ addiu $s5, $s5, 1 /* 010F9C 8001039C 01B47021 */ addu $t6, $t5, $s4 /* 010FA0 800103A0 8DD10000 */ lw $s1, ($t6) @@ -149,8 +149,8 @@ glabel func_800101AC /* 010FCC 800103CC 02A3082A */ slt $at, $s5, $v1 /* 010FD0 800103D0 AC400100 */ sw $zero, 0x100($v0) /* 010FD4 800103D4 A04500FD */ sb $a1, 0xfd($v0) -/* 010FD8 800103D8 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 010FDC 800103DC 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 010FD8 800103D8 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 010FDC 800103DC 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 010FE0 800103E0 00000000 */ nop /* 010FE4 800103E4 02A3082A */ slt $at, $s5, $v1 .L800103E8: @@ -224,7 +224,7 @@ glabel func_800101AC /* 0110E4 800104E4 00000000 */ nop /* 0110E8 800104E8 17200005 */ bnez $t9, .L80010500 /* 0110EC 800104EC 00000000 */ nop -/* 0110F0 800104F0 0C003FEE */ jal func_8000FFB8 +/* 0110F0 800104F0 0C003FEE */ jal particlePtrList_addObject /* 0110F4 800104F4 00000000 */ nop /* 0110F8 800104F8 86C50048 */ lh $a1, 0x48($s6) /* 0110FC 800104FC 00000000 */ nop @@ -391,16 +391,16 @@ glabel func_800101AC .L80010738: /* 011338 80010738 0C001AB2 */ jal func_80006AC8 /* 01133C 8001073C 02C02025 */ move $a0, $s6 -/* 011340 80010740 3C158012 */ lui $s5, %hi(D_8011AE5C) # $s5, 0x8012 -/* 011344 80010744 26B5AE5C */ addiu $s5, %lo(D_8011AE5C) # addiu $s5, $s5, -0x51a4 +/* 011340 80010740 3C158012 */ lui $s5, %hi(objCount) # $s5, 0x8012 +/* 011344 80010744 26B5AE5C */ addiu $s5, %lo(objCount) # addiu $s5, $s5, -0x51a4 /* 011348 80010748 8EA80000 */ lw $t0, ($s5) /* 01134C 8001074C 00008025 */ move $s0, $zero /* 011350 80010750 19000027 */ blez $t0, .L800107F0 /* 011354 80010754 24120005 */ li $s2, 5 /* 011358 80010758 2411004C */ li $s1, 76 .L8001075C: -/* 01135C 8001075C 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 -/* 011360 80010760 8D29AE58 */ lw $t1, %lo(D_8011AE58)($t1) +/* 01135C 8001075C 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 011360 80010760 8D29AE58 */ lw $t1, %lo(objPtrList)($t1) /* 011364 80010764 00000000 */ nop /* 011368 80010768 01305021 */ addu $t2, $t1, $s0 /* 01136C 8001076C 8D440000 */ lw $a0, ($t2) @@ -411,11 +411,11 @@ glabel func_800101AC /* 011380 80010780 1180000B */ beqz $t4, .L800107B0 /* 011384 80010784 00000000 */ nop /* 011388 80010788 8C8D003C */ lw $t5, 0x3c($a0) -/* 01138C 8001078C 3C0F8012 */ lui $t7, %hi(D_8011AE58) # $t7, 0x8012 +/* 01138C 8001078C 3C0F8012 */ lui $t7, %hi(objPtrList) # $t7, 0x8012 /* 011390 80010790 16CD0007 */ bne $s6, $t5, .L800107B0 /* 011394 80010794 00000000 */ nop /* 011398 80010798 AC80003C */ sw $zero, 0x3c($a0) -/* 01139C 8001079C 8DEFAE58 */ lw $t7, %lo(D_8011AE58)($t7) +/* 01139C 8001079C 8DEFAE58 */ lw $t7, %lo(objPtrList)($t7) /* 0113A0 800107A0 00000000 */ nop /* 0113A4 800107A4 01F07021 */ addu $t6, $t7, $s0 /* 0113A8 800107A8 8DC40000 */ lw $a0, ($t6) @@ -430,7 +430,7 @@ glabel func_800101AC /* 0113C8 800107C8 16420003 */ bne $s2, $v0, .L800107D8 /* 0113CC 800107CC 00000000 */ nop .L800107D0: -/* 0113D0 800107D0 0C003FEE */ jal func_8000FFB8 +/* 0113D0 800107D0 0C003FEE */ jal particlePtrList_addObject /* 0113D4 800107D4 00000000 */ nop .L800107D8: /* 0113D8 800107D8 8EB80000 */ lw $t8, ($s5) diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index dfe17c28..4bbf635c 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -39,7 +39,7 @@ glabel func_80010994 /* 011624 80010A24 00000000 */ nop .L80010A28: /* 011628 80010A28 1C400003 */ bgtz $v0, .L80010A38 -/* 01162C 80010A2C 3C048012 */ lui $a0, %hi(D_8011AEF0) # $a0, 0x8012 +/* 01162C 80010A2C 3C048012 */ lui $a0, %hi(playerCount) # $a0, 0x8012 /* 011630 80010A30 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 011634 80010A34 AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at) .L80010A38: @@ -54,13 +54,13 @@ glabel func_80010994 /* 011658 80010A58 804B0000 */ lb $t3, ($v0) /* 01165C 80010A5C 3C018012 */ lui $at, 0x8012 /* 011660 80010A60 002B0821 */ addu $at, $at, $t3 -/* 011664 80010A64 2484AEF0 */ addiu $a0, %lo(D_8011AEF0) # addiu $a0, $a0, -0x5110 +/* 011664 80010A64 2484AEF0 */ addiu $a0, %lo(playerCount) # addiu $a0, $a0, -0x5110 /* 011668 80010A68 A020AD22 */ sb $zero, -0x52de($at) /* 01166C 80010A6C 8C8C0000 */ lw $t4, ($a0) /* 011670 80010A70 00009825 */ move $s3, $zero /* 011674 80010A74 19800021 */ blez $t4, .L80010AFC -/* 011678 80010A78 3C158012 */ lui $s5, %hi(D_8011AEE4) # $s5, 0x8012 -/* 01167C 80010A7C 26B5AEE4 */ addiu $s5, %lo(D_8011AEE4) # addiu $s5, $s5, -0x511c +/* 011678 80010A78 3C158012 */ lui $s5, %hi(playerStructArray_Ptr) # $s5, 0x8012 +/* 01167C 80010A7C 26B5AEE4 */ addiu $s5, %lo(playerStructArray_Ptr) # addiu $s5, $s5, -0x511c /* 011680 80010A80 00001825 */ move $v1, $zero .L80010A84: /* 011684 80010A84 8EAD0000 */ lw $t5, ($s5) @@ -94,9 +94,9 @@ glabel func_80010994 /* 0116F4 80010AF4 1420FFE3 */ bnez $at, .L80010A84 /* 0116F8 80010AF8 00000000 */ nop .L80010AFC: -/* 0116FC 80010AFC 3C158012 */ lui $s5, %hi(D_8011AEE4) # $s5, 0x8012 +/* 0116FC 80010AFC 3C158012 */ lui $s5, %hi(playerStructArray_Ptr) # $s5, 0x8012 /* 011700 80010B00 0C0050AE */ jal func_800142B8 -/* 011704 80010B04 26B5AEE4 */ addiu $s5, %lo(D_8011AEE4) # addiu $s5, $s5, -0x511c +/* 011704 80010B04 26B5AEE4 */ addiu $s5, %lo(playerStructArray_Ptr) # addiu $s5, $s5, -0x511c /* 011708 80010B08 0C00556E */ jal func_800155B8 /* 01170C 80010B0C 00000000 */ nop /* 011710 80010B10 0C007A27 */ jal func_8001E89C @@ -144,17 +144,17 @@ glabel func_80010994 /* 0117AC 80010BAC 1420FFF6 */ bnez $at, .L80010B88 /* 0117B0 80010BB0 26520004 */ addiu $s2, $s2, 4 .L80010BB4: -/* 0117B4 80010BB4 3C138012 */ lui $s3, %hi(D_8011AE5C) # $s3, 0x8012 +/* 0117B4 80010BB4 3C138012 */ lui $s3, %hi(objCount) # $s3, 0x8012 /* 0117B8 80010BB8 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012 -/* 0117BC 80010BBC 8E73AE5C */ lw $s3, %lo(D_8011AE5C)($s3) +/* 0117BC 80010BBC 8E73AE5C */ lw $s3, %lo(objCount)($s3) /* 0117C0 80010BC0 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1) /* 0117C4 80010BC4 00000000 */ nop /* 0117C8 80010BC8 0233082A */ slt $at, $s1, $s3 /* 0117CC 80010BCC 1020004C */ beqz $at, .L80010D00 /* 0117D0 80010BD0 00119080 */ sll $s2, $s1, 2 /* 0117D4 80010BD4 00135080 */ sll $t2, $s3, 2 -/* 0117D8 80010BD8 3C168012 */ lui $s6, %hi(D_8011AE58) # $s6, 0x8012 -/* 0117DC 80010BDC 26D6AE58 */ addiu $s6, %lo(D_8011AE58) # addiu $s6, $s6, -0x51a8 +/* 0117D8 80010BD8 3C168012 */ lui $s6, %hi(objPtrList) # $s6, 0x8012 +/* 0117DC 80010BDC 26D6AE58 */ addiu $s6, %lo(objPtrList) # addiu $s6, $s6, -0x51a8 /* 0117E0 80010BE0 AFAA0038 */ sw $t2, 0x38($sp) /* 0117E4 80010BE4 24110021 */ li $s1, 33 .L80010BE8: @@ -237,10 +237,10 @@ glabel func_80010994 /* 0118F8 80010CF8 1420FFBB */ bnez $at, .L80010BE8 /* 0118FC 80010CFC 00000000 */ nop .L80010D00: -/* 011900 80010D00 3C0C8012 */ lui $t4, %hi(D_8011AEF0) # $t4, 0x8012 -/* 011904 80010D04 8D8CAEF0 */ lw $t4, %lo(D_8011AEF0)($t4) -/* 011908 80010D08 3C168012 */ lui $s6, %hi(D_8011AE58) # $s6, 0x8012 -/* 01190C 80010D0C 26D6AE58 */ addiu $s6, %lo(D_8011AE58) # addiu $s6, $s6, -0x51a8 +/* 011900 80010D00 3C0C8012 */ lui $t4, %hi(playerCount) # $t4, 0x8012 +/* 011904 80010D04 8D8CAEF0 */ lw $t4, %lo(playerCount)($t4) +/* 011908 80010D08 3C168012 */ lui $s6, %hi(objPtrList) # $s6, 0x8012 +/* 01190C 80010D0C 26D6AE58 */ addiu $s6, %lo(objPtrList) # addiu $s6, $s6, -0x51a8 /* 011910 80010D10 1980000E */ blez $t4, .L80010D4C /* 011914 80010D14 00008825 */ move $s1, $zero /* 011918 80010D18 00009025 */ move $s2, $zero @@ -251,8 +251,8 @@ glabel func_80010994 /* 011928 80010D28 8DC40000 */ lw $a0, ($t6) /* 01192C 80010D2C 0C01378E */ jal func_8004DE38 /* 011930 80010D30 00000000 */ nop -/* 011934 80010D34 3C0F8012 */ lui $t7, %hi(D_8011AEF0) # $t7, 0x8012 -/* 011938 80010D38 8DEFAEF0 */ lw $t7, %lo(D_8011AEF0)($t7) +/* 011934 80010D34 3C0F8012 */ lui $t7, %hi(playerCount) # $t7, 0x8012 +/* 011938 80010D38 8DEFAEF0 */ lw $t7, %lo(playerCount)($t7) /* 01193C 80010D3C 26310001 */ addiu $s1, $s1, 1 /* 011940 80010D40 022F082A */ slt $at, $s1, $t7 /* 011944 80010D44 1420FFF5 */ bnez $at, .L80010D1C @@ -261,8 +261,8 @@ glabel func_80010994 /* 01194C 80010D4C 0C01AF66 */ jal func_8006BD98 /* 011950 80010D50 00000000 */ nop /* 011954 80010D54 1440001C */ bnez $v0, .L80010DC8 -/* 011958 80010D58 3C078012 */ lui $a3, %hi(D_8011AEF0) # $a3, 0x8012 -/* 01195C 80010D5C 8CE7AEF0 */ lw $a3, %lo(D_8011AEF0)($a3) +/* 011958 80010D58 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 +/* 01195C 80010D5C 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) /* 011960 80010D60 00008825 */ move $s1, $zero /* 011964 80010D64 18E00018 */ blez $a3, .L80010DC8 /* 011968 80010D68 2412FFFF */ li $s2, -1 @@ -282,8 +282,8 @@ glabel func_80010994 /* 01199C 80010D9C 26310001 */ addiu $s1, $s1, 1 /* 0119A0 80010DA0 0C010FB3 */ jal func_80043ECC /* 0119A4 80010DA4 02803025 */ move $a2, $s4 -/* 0119A8 80010DA8 3C078012 */ lui $a3, %hi(D_8011AEF0) # $a3, 0x8012 -/* 0119AC 80010DAC 8CE7AEF0 */ lw $a3, %lo(D_8011AEF0)($a3) +/* 0119A8 80010DA8 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 +/* 0119AC 80010DAC 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) /* 0119B0 80010DB0 00000000 */ nop /* 0119B4 80010DB4 00E08825 */ move $s1, $a3 /* 0119B8 80010DB8 26310001 */ addiu $s1, $s1, 1 @@ -370,8 +370,8 @@ glabel func_80010994 /* 011AD4 80010ED4 00000000 */ nop /* 011AD8 80010ED8 1840001F */ blez $v0, .L80010F58 /* 011ADC 80010EDC 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012 -/* 011AE0 80010EE0 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 011AE4 80010EE4 8C42AE5C */ lw $v0, %lo(D_8011AE5C)($v0) +/* 011AE0 80010EE0 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 011AE4 80010EE4 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 011AE8 80010EE8 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1) /* 011AEC 80010EEC 00000000 */ nop /* 011AF0 80010EF0 0222082A */ slt $at, $s1, $v0 @@ -394,8 +394,8 @@ glabel func_80010994 /* 011B30 80010F30 00000000 */ nop /* 011B34 80010F34 0C00CB1F */ jal func_80032C7C /* 011B38 80010F38 02002025 */ move $a0, $s0 -/* 011B3C 80010F3C 3C028012 */ lui $v0, %hi(D_8011AE5C) # $v0, 0x8012 -/* 011B40 80010F40 8C42AE5C */ lw $v0, %lo(D_8011AE5C)($v0) +/* 011B3C 80010F3C 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 011B40 80010F40 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 011B44 80010F44 00000000 */ nop .L80010F48: /* 011B48 80010F48 26310001 */ addiu $s1, $s1, 1 @@ -419,7 +419,7 @@ glabel func_80010994 /* 011B88 80010F88 00000000 */ nop /* 011B8C 80010F8C 17200009 */ bnez $t9, .L80010FB4 /* 011B90 80010F90 00000000 */ nop -/* 011B94 80010F94 0C004013 */ jal func_8001004C +/* 011B94 80010F94 0C004013 */ jal particlePtrList_flush /* 011B98 80010F98 00000000 */ nop /* 011B9C 80010F9C 0C005FA6 */ jal func_80017E98 /* 011BA0 80010FA0 00000000 */ nop @@ -428,8 +428,8 @@ glabel func_80010994 /* 011BAC 80010FAC 0C007A4F */ jal func_8001E93C /* 011BB0 80010FB0 00000000 */ nop .L80010FB4: -/* 011BB4 80010FB4 3C078012 */ lui $a3, %hi(D_8011AEF0) # $a3, 0x8012 -/* 011BB8 80010FB8 8CE7AEF0 */ lw $a3, %lo(D_8011AEF0)($a3) +/* 011BB4 80010FB4 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 +/* 011BB8 80010FB8 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) /* 011BBC 80010FBC 3C098012 */ lui $t1, %hi(D_8011AD4E) # $t1, 0x8012 /* 011BC0 80010FC0 10E00010 */ beqz $a3, .L80011004 /* 011BC4 80010FC4 00000000 */ nop @@ -439,15 +439,15 @@ glabel func_80010994 /* 011BD4 80010FD4 00000000 */ nop /* 011BD8 80010FD8 0C006602 */ jal D_80019808 /* 011BDC 80010FDC 02802025 */ move $a0, $s4 -/* 011BE0 80010FE0 3C078012 */ lui $a3, %hi(D_8011AEF0) # $a3, 0x8012 -/* 011BE4 80010FE4 8CE7AEF0 */ lw $a3, %lo(D_8011AEF0)($a3) +/* 011BE0 80010FE0 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 +/* 011BE4 80010FE4 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) /* 011BE8 80010FE8 10000006 */ b .L80011004 /* 011BEC 80010FEC 00000000 */ nop .L80010FF0: /* 011BF0 80010FF0 0C006A3D */ jal func_8001A8F4 /* 011BF4 80010FF4 02802025 */ move $a0, $s4 -/* 011BF8 80010FF8 3C078012 */ lui $a3, %hi(D_8011AEF0) # $a3, 0x8012 -/* 011BFC 80010FFC 8CE7AEF0 */ lw $a3, %lo(D_8011AEF0)($a3) +/* 011BF8 80010FF8 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 +/* 011BFC 80010FFC 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) /* 011C00 80011000 00000000 */ nop .L80011004: /* 011C04 80011004 3C048012 */ lui $a0, %hi(D_8011AEEC) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_800120C8.s b/asm/non_matchings/unknown_00BC20/func_800120C8.s index ed8f39eb..09516c62 100644 --- a/asm/non_matchings/unknown_00BC20/func_800120C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800120C8.s @@ -649,7 +649,7 @@ glabel func_800120C8 /* 013634 80012A34 448F5000 */ mtc1 $t7, $f10 /* 013638 80012A38 44992000 */ mtc1 $t9, $f4 /* 01363C 80012A3C 46100201 */ sub.s $f8, $f0, $f16 -/* 013640 80012A40 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 +/* 013640 80012A40 3C013FD0 */ li $at, 0x3FD00000 # 0.25 double /* 013644 80012A44 468050A0 */ cvt.s.w $f2, $f10 /* 013648 80012A48 44817800 */ mtc1 $at, $f15 /* 01364C 80012A4C 44807000 */ mtc1 $zero, $f14 diff --git a/asm/non_matchings/unknown_00BC20/func_80012C3C.s b/asm/non_matchings/unknown_00BC20/func_80012C3C.s deleted file mode 100644 index e5928493..00000000 --- a/asm/non_matchings/unknown_00BC20/func_80012C3C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80012C3C -/* 01383C 80012C3C 3C078012 */ lui $a3, %hi(D_8011ADA4) # $a3, 0x8012 -/* 013840 80012C40 24E7ADA4 */ addiu $a3, %lo(D_8011ADA4) # addiu $a3, $a3, -0x525c -/* 013844 80012C44 84EE0000 */ lh $t6, ($a3) -/* 013848 80012C48 00001025 */ move $v0, $zero -/* 01384C 80012C4C 19C00010 */ blez $t6, .L80012C90 -/* 013850 80012C50 3C068012 */ lui $a2, %hi(D_8011AD78) # $a2, 0x8012 -/* 013854 80012C54 24C6AD78 */ addiu $a2, %lo(D_8011AD78) # addiu $a2, $a2, -0x5288 -/* 013858 80012C58 3C080600 */ lui $t0, 0x600 -.L80012C5C: -/* 01385C 80012C5C 8C850000 */ lw $a1, ($a0) -/* 013860 80012C60 24420001 */ addiu $v0, $v0, 1 -/* 013864 80012C64 24AF0008 */ addiu $t7, $a1, 8 -/* 013868 80012C68 AC8F0000 */ sw $t7, ($a0) -/* 01386C 80012C6C ACA80000 */ sw $t0, ($a1) -/* 013870 80012C70 8CD80000 */ lw $t8, ($a2) -/* 013874 80012C74 24C60004 */ addiu $a2, $a2, 4 -/* 013878 80012C78 ACB80004 */ sw $t8, 4($a1) -/* 01387C 80012C7C 84F90000 */ lh $t9, ($a3) -/* 013880 80012C80 00000000 */ nop -/* 013884 80012C84 0059082A */ slt $at, $v0, $t9 -/* 013888 80012C88 1420FFF4 */ bnez $at, .L80012C5C -/* 01388C 80012C8C 00000000 */ nop -.L80012C90: -/* 013890 80012C90 03E00008 */ jr $ra -/* 013894 80012C94 00000000 */ nop - diff --git a/asm/non_matchings/unknown_00BC20/func_80012D5C.s b/asm/non_matchings/unknown_00BC20/func_80012D5C.s deleted file mode 100644 index 01885630..00000000 --- a/asm/non_matchings/unknown_00BC20/func_80012D5C.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80012D5C -/* 01395C 80012D5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 013960 80012D60 AFBF0014 */ sw $ra, 0x14($sp) -/* 013964 80012D64 AFA40020 */ sw $a0, 0x20($sp) -/* 013968 80012D68 AFA50024 */ sw $a1, 0x24($sp) -/* 01396C 80012D6C AFA60028 */ sw $a2, 0x28($sp) -/* 013970 80012D70 84EE0006 */ lh $t6, 6($a3) -/* 013974 80012D74 24040002 */ li $a0, 2 -/* 013978 80012D78 31CF5000 */ andi $t7, $t6, 0x5000 -/* 01397C 80012D7C 15E00027 */ bnez $t7, .L80012E1C -/* 013980 80012D80 8FBF0014 */ lw $ra, 0x14($sp) -/* 013984 80012D84 84E5004A */ lh $a1, 0x4a($a3) -/* 013988 80012D88 0C02DDAE */ jal func_800B76B8 -/* 01398C 80012D8C AFA7002C */ sw $a3, 0x2c($sp) -/* 013990 80012D90 8FB80020 */ lw $t8, 0x20($sp) -/* 013994 80012D94 8FA80024 */ lw $t0, 0x24($sp) -/* 013998 80012D98 8F190000 */ lw $t9, ($t8) -/* 01399C 80012D9C 3C018012 */ lui $at, %hi(D_8011AE8C) # $at, 0x8012 -/* 0139A0 80012DA0 AC39AE8C */ sw $t9, %lo(D_8011AE8C)($at) -/* 0139A4 80012DA4 8D090000 */ lw $t1, ($t0) -/* 0139A8 80012DA8 8FAA0028 */ lw $t2, 0x28($sp) -/* 0139AC 80012DAC 3C018012 */ lui $at, %hi(D_8011AE90) # $at, 0x8012 -/* 0139B0 80012DB0 AC29AE90 */ sw $t1, %lo(D_8011AE90)($at) -/* 0139B4 80012DB4 8D4B0000 */ lw $t3, ($t2) -/* 0139B8 80012DB8 8FA4002C */ lw $a0, 0x2c($sp) -/* 0139BC 80012DBC 3C018012 */ lui $at, %hi(D_8011AE94) # $at, 0x8012 -/* 0139C0 80012DC0 AC2BAE94 */ sw $t3, %lo(D_8011AE94)($at) -/* 0139C4 80012DC4 C4840008 */ lwc1 $f4, 8($a0) -/* 0139C8 80012DC8 0C004D23 */ jal func_8001348C -/* 0139CC 80012DCC E7A4001C */ swc1 $f4, 0x1c($sp) -/* 0139D0 80012DD0 8FA7002C */ lw $a3, 0x2c($sp) -/* 0139D4 80012DD4 C7A6001C */ lwc1 $f6, 0x1c($sp) -/* 0139D8 80012DD8 3C0C8012 */ lui $t4, %hi(D_8011AE8C) # $t4, 0x8012 -/* 0139DC 80012DDC E4E60008 */ swc1 $f6, 8($a3) -/* 0139E0 80012DE0 8FAD0020 */ lw $t5, 0x20($sp) -/* 0139E4 80012DE4 8D8CAE8C */ lw $t4, %lo(D_8011AE8C)($t4) -/* 0139E8 80012DE8 3C0E8012 */ lui $t6, %hi(D_8011AE90) # $t6, 0x8012 -/* 0139EC 80012DEC ADAC0000 */ sw $t4, ($t5) -/* 0139F0 80012DF0 8FAF0024 */ lw $t7, 0x24($sp) -/* 0139F4 80012DF4 8DCEAE90 */ lw $t6, %lo(D_8011AE90)($t6) -/* 0139F8 80012DF8 3C188012 */ lui $t8, %hi(D_8011AE94) # $t8, 0x8012 -/* 0139FC 80012DFC ADEE0000 */ sw $t6, ($t7) -/* 013A00 80012E00 8FB90028 */ lw $t9, 0x28($sp) -/* 013A04 80012E04 8F18AE94 */ lw $t8, %lo(D_8011AE94)($t8) -/* 013A08 80012E08 24040002 */ li $a0, 2 -/* 013A0C 80012E0C 2405FFFF */ li $a1, -1 -/* 013A10 80012E10 0C02DDAE */ jal func_800B76B8 -/* 013A14 80012E14 AF380000 */ sw $t8, ($t9) -/* 013A18 80012E18 8FBF0014 */ lw $ra, 0x14($sp) -.L80012E1C: -/* 013A1C 80012E1C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 013A20 80012E20 03E00008 */ jr $ra -/* 013A24 80012E24 00000000 */ nop - diff --git a/asm/non_matchings/unknown_00BC20/func_8001348C.s b/asm/non_matchings/unknown_00BC20/func_8001348C.s deleted file mode 100644 index fd3b4bde..00000000 --- a/asm/non_matchings/unknown_00BC20/func_8001348C.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_8001348C -/* 01408C 8001348C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 014090 80013490 AFBF0024 */ sw $ra, 0x24($sp) -/* 014094 80013494 AFB00020 */ sw $s0, 0x20($sp) -/* 014098 80013498 0C004BE5 */ jal func_80012F94 -/* 01409C 8001349C 00808025 */ move $s0, $a0 -/* 0140A0 800134A0 860E0006 */ lh $t6, 6($s0) -/* 0140A4 800134A4 02002025 */ move $a0, $s0 -/* 0140A8 800134A8 31CF8000 */ andi $t7, $t6, 0x8000 -/* 0140AC 800134AC 11E0000B */ beqz $t7, .L800134DC -/* 0140B0 800134B0 3C058012 */ lui $a1, %hi(D_8011AE8C) # $a1, 0x8012 -/* 0140B4 800134B4 3C068012 */ lui $a2, %hi(D_8011AE90) # $a2, 0x8012 -/* 0140B8 800134B8 3C078012 */ lui $a3, %hi(D_8011AE94) # $a3, 0x8012 -/* 0140BC 800134BC 34188000 */ li $t8, 32768 -/* 0140C0 800134C0 AFB80010 */ sw $t8, 0x10($sp) -/* 0140C4 800134C4 24E7AE94 */ addiu $a3, %lo(D_8011AE94) # addiu $a3, $a3, -0x516c -/* 0140C8 800134C8 24C6AE90 */ addiu $a2, %lo(D_8011AE90) # addiu $a2, $a2, -0x5170 -/* 0140CC 800134CC 0C02CDD0 */ jal func_800B3740 -/* 0140D0 800134D0 24A5AE8C */ addiu $a1, %lo(D_8011AE8C) # addiu $a1, $a1, -0x5174 -/* 0140D4 800134D4 10000016 */ b .L80013530 -/* 0140D8 800134D8 00000000 */ nop -.L800134DC: -/* 0140DC 800134DC 8E190040 */ lw $t9, 0x40($s0) -/* 0140E0 800134E0 24010001 */ li $at, 1 -/* 0140E4 800134E4 83220053 */ lb $v0, 0x53($t9) -/* 0140E8 800134E8 00000000 */ nop -/* 0140EC 800134EC 14400005 */ bnez $v0, .L80013504 -/* 0140F0 800134F0 00000000 */ nop -/* 0140F4 800134F4 0C004832 */ jal func_800120C8 -/* 0140F8 800134F8 02002025 */ move $a0, $s0 -/* 0140FC 800134FC 1000000C */ b .L80013530 -/* 014100 80013500 00000000 */ nop -.L80013504: -/* 014104 80013504 14410006 */ bne $v0, $at, .L80013520 -/* 014108 80013508 24010004 */ li $at, 4 -/* 01410C 8001350C 0C004725 */ jal func_80011C94 -/* 014110 80013510 02002025 */ move $a0, $s0 -/* 014114 80013514 10000006 */ b .L80013530 -/* 014118 80013518 00000000 */ nop -/* 01411C 8001351C 24010004 */ li $at, 4 -.L80013520: -/* 014120 80013520 14410003 */ bne $v0, $at, .L80013530 -/* 014124 80013524 00000000 */ nop -/* 014128 80013528 0C0046B4 */ jal func_80011AD0 -/* 01412C 8001352C 02002025 */ move $a0, $s0 -.L80013530: -/* 014130 80013530 0C004D52 */ jal func_80013548 -/* 014134 80013534 02002025 */ move $a0, $s0 -/* 014138 80013538 8FBF0024 */ lw $ra, 0x24($sp) -/* 01413C 8001353C 8FB00020 */ lw $s0, 0x20($sp) -/* 014140 80013540 03E00008 */ jr $ra -/* 014144 80013544 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/unknown_00BC20/func_800142B8.s b/asm/non_matchings/unknown_00BC20/func_800142B8.s deleted file mode 100644 index ed5f6a5a..00000000 --- a/asm/non_matchings/unknown_00BC20/func_800142B8.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_800142B8 -/* 014EB8 800142B8 3C028012 */ lui $v0, %hi(D_8011AE60) # $v0, 0x8012 -/* 014EBC 800142BC 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 014EC0 800142C0 8C42AE60 */ lw $v0, %lo(D_8011AE60)($v0) -/* 014EC4 800142C4 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) -/* 014EC8 800142C8 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 014ECC 800142CC 0043082A */ slt $at, $v0, $v1 -/* 014ED0 800142D0 10200033 */ beqz $at, .L800143A0 -/* 014ED4 800142D4 00022880 */ sll $a1, $v0, 2 -/* 014ED8 800142D8 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 -.L800142DC: -/* 014EDC 800142DC 8D4E0000 */ lw $t6, ($t2) -/* 014EE0 800142E0 24420001 */ addiu $v0, $v0, 1 -/* 014EE4 800142E4 01C57821 */ addu $t7, $t6, $a1 -/* 014EE8 800142E8 8DE40000 */ lw $a0, ($t7) -/* 014EEC 800142EC 00000000 */ nop -/* 014EF0 800142F0 84980006 */ lh $t8, 6($a0) -/* 014EF4 800142F4 00000000 */ nop -/* 014EF8 800142F8 33198000 */ andi $t9, $t8, 0x8000 -/* 014EFC 800142FC 17200026 */ bnez $t9, .L80014398 -/* 014F00 80014300 0043082A */ slt $at, $v0, $v1 -/* 014F04 80014304 8C860040 */ lw $a2, 0x40($a0) -/* 014F08 80014308 00000000 */ nop -/* 014F0C 8001430C 80CB0053 */ lb $t3, 0x53($a2) -/* 014F10 80014310 00000000 */ nop -/* 014F14 80014314 15600020 */ bnez $t3, .L80014398 -/* 014F18 80014318 0043082A */ slt $at, $v0, $v1 -/* 014F1C 8001431C 80C80055 */ lb $t0, 0x55($a2) -/* 014F20 80014320 00003025 */ move $a2, $zero -/* 014F24 80014324 1900001B */ blez $t0, .L80014394 -/* 014F28 80014328 00003825 */ move $a3, $zero -.L8001432C: -/* 014F2C 8001432C 8C8C0068 */ lw $t4, 0x68($a0) -/* 014F30 80014330 24E70001 */ addiu $a3, $a3, 1 -/* 014F34 80014334 01866821 */ addu $t5, $t4, $a2 -/* 014F38 80014338 8DA30000 */ lw $v1, ($t5) -/* 014F3C 8001433C 00000000 */ nop -/* 014F40 80014340 1060000F */ beqz $v1, .L80014380 -/* 014F44 80014344 00E8082A */ slt $at, $a3, $t0 -/* 014F48 80014348 80690020 */ lb $t1, 0x20($v1) -/* 014F4C 8001434C 00000000 */ nop -/* 014F50 80014350 1920000A */ blez $t1, .L8001437C -/* 014F54 80014354 312E0003 */ andi $t6, $t1, 3 -/* 014F58 80014358 A06E0020 */ sb $t6, 0x20($v1) -/* 014F5C 8001435C 806F0020 */ lb $t7, 0x20($v1) -/* 014F60 80014360 00000000 */ nop -/* 014F64 80014364 25F8FFFF */ addiu $t8, $t7, -1 -/* 014F68 80014368 A0780020 */ sb $t8, 0x20($v1) -/* 014F6C 8001436C 8C990040 */ lw $t9, 0x40($a0) -/* 014F70 80014370 00000000 */ nop -/* 014F74 80014374 83280055 */ lb $t0, 0x55($t9) -/* 014F78 80014378 00000000 */ nop -.L8001437C: -/* 014F7C 8001437C 00E8082A */ slt $at, $a3, $t0 -.L80014380: -/* 014F80 80014380 1420FFEA */ bnez $at, .L8001432C -/* 014F84 80014384 24C60004 */ addiu $a2, $a2, 4 -/* 014F88 80014388 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 014F8C 8001438C 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) -/* 014F90 80014390 00000000 */ nop -.L80014394: -/* 014F94 80014394 0043082A */ slt $at, $v0, $v1 -.L80014398: -/* 014F98 80014398 1420FFD0 */ bnez $at, .L800142DC -/* 014F9C 8001439C 24A50004 */ addiu $a1, $a1, 4 -.L800143A0: -/* 014FA0 800143A0 03E00008 */ jr $ra -/* 014FA4 800143A4 00000000 */ nop - diff --git a/asm/non_matchings/unknown_00BC20/func_80014814.s b/asm/non_matchings/unknown_00BC20/func_80014814.s index c52d102a..c837a15e 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014814.s +++ b/asm/non_matchings/unknown_00BC20/func_80014814.s @@ -1,6 +1,6 @@ glabel func_80014814 -/* 015414 80014814 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 -/* 015418 80014818 24C6AE5C */ addiu $a2, %lo(D_8011AE5C) # addiu $a2, $a2, -0x51a4 +/* 015414 80014814 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012 +/* 015418 80014818 24C6AE5C */ addiu $a2, %lo(objCount) # addiu $a2, $a2, -0x51a4 /* 01541C 8001481C 8CCE0000 */ lw $t6, ($a2) /* 015420 80014820 3C0A8012 */ lui $t2, %hi(D_8011AE7C) # $t2, 0x8012 /* 015424 80014824 254AAE7C */ addiu $t2, %lo(D_8011AE7C) # addiu $t2, $t2, -0x5184 @@ -21,8 +21,8 @@ glabel func_80014814 /* 015458 80014858 00402825 */ move $a1, $v0 /* 01545C 8001485C 14200054 */ bnez $at, .L800149B0 /* 015460 80014860 00602025 */ move $a0, $v1 -/* 015464 80014864 3C0B8012 */ lui $t3, %hi(D_8011AE58) # $t3, 0x8012 -/* 015468 80014868 256BAE58 */ addiu $t3, %lo(D_8011AE58) # addiu $t3, $t3, -0x51a8 +/* 015464 80014864 3C0B8012 */ lui $t3, %hi(objPtrList) # $t3, 0x8012 +/* 015468 80014868 256BAE58 */ addiu $t3, %lo(objPtrList) # addiu $t3, $t3, -0x51a8 /* 01546C 8001486C 00A3082A */ slt $at, $a1, $v1 .L80014870: /* 015470 80014870 1420001E */ bnez $at, .L800148EC @@ -157,9 +157,9 @@ glabel func_80014814 /* 015638 80014A38 30990003 */ andi $t9, $a0, 3 /* 01563C 80014A3C 13200010 */ beqz $t9, .L80014A80 /* 015640 80014A40 03223021 */ addu $a2, $t9, $v0 -/* 015644 80014A44 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 +/* 015644 80014A44 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 /* 015648 80014A48 8FA80040 */ lw $t0, 0x40($sp) -/* 01564C 80014A4C 2529AE58 */ addiu $t1, %lo(D_8011AE58) # addiu $t1, $t1, -0x51a8 +/* 01564C 80014A4C 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 /* 015650 80014A50 00051880 */ sll $v1, $a1, 2 .L80014A54: /* 015654 80014A54 8D2C0000 */ lw $t4, ($t1) @@ -174,9 +174,9 @@ glabel func_80014814 /* 015678 80014A78 A08E0038 */ sb $t6, 0x38($a0) /* 01567C 80014A7C 10AB002A */ beq $a1, $t3, .L80014B28 .L80014A80: -/* 015680 80014A80 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 +/* 015680 80014A80 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 /* 015684 80014A84 8FA80040 */ lw $t0, 0x40($sp) -/* 015688 80014A88 2529AE58 */ addiu $t1, %lo(D_8011AE58) # addiu $t1, $t1, -0x51a8 +/* 015688 80014A88 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 /* 01568C 80014A8C 00051880 */ sll $v1, $a1, 2 /* 015690 80014A90 000B5080 */ sll $t2, $t3, 2 .L80014A94: diff --git a/asm/non_matchings/unknown_00BC20/func_80014B50.s b/asm/non_matchings/unknown_00BC20/func_80014B50.s index e606ac9c..13208040 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014B50.s +++ b/asm/non_matchings/unknown_00BC20/func_80014B50.s @@ -13,8 +13,8 @@ glabel func_80014B50 /* 01577C 80014B7C 00000000 */ nop /* 015780 80014B80 00A4082A */ slt $at, $a1, $a0 /* 015784 80014B84 142001EE */ bnez $at, .L80015340 -/* 015788 80014B88 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 01578C 80014B8C 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 +/* 015788 80014B88 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 01578C 80014B8C 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 /* 015790 80014B90 0064082A */ slt $at, $v1, $a0 .L80014B94: /* 015794 80014B94 1420001D */ bnez $at, .L80014C0C @@ -105,8 +105,8 @@ glabel func_80014B50 /* 0158CC 80014CCC 00A4082A */ slt $at, $a1, $a0 /* 0158D0 80014CD0 1420019B */ bnez $at, .L80015340 -/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 +/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 /* 0158DC 80014CDC 0064082A */ slt $at, $v1, $a0 .L80014CE0: /* 0158E0 80014CE0 1420001D */ bnez $at, .L80014D58 @@ -197,8 +197,8 @@ glabel func_80014B50 /* 015A18 80014E18 00A4082A */ slt $at, $a1, $a0 /* 015A1C 80014E1C 14200148 */ bnez $at, .L80015340 -/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 +/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 /* 015A28 80014E28 0064082A */ slt $at, $v1, $a0 .L80014E2C: /* 015A2C 80014E2C 1420001D */ bnez $at, .L80014EA4 @@ -289,8 +289,8 @@ glabel func_80014B50 /* 015B64 80014F64 00A4082A */ slt $at, $a1, $a0 /* 015B68 80014F68 142000F5 */ bnez $at, .L80015340 -/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 +/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 /* 015B74 80014F74 0064082A */ slt $at, $v1, $a0 .L80014F78: /* 015B78 80014F78 1420001D */ bnez $at, .L80014FF0 @@ -381,8 +381,8 @@ glabel func_80014B50 /* 015CB0 800150B0 00A4082A */ slt $at, $a1, $a0 /* 015CB4 800150B4 142000A2 */ bnez $at, .L80015340 -/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 +/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 /* 015CC0 800150C0 0064082A */ slt $at, $v1, $a0 .L800150C4: /* 015CC4 800150C4 1420001D */ bnez $at, .L8001513C @@ -473,8 +473,8 @@ glabel func_80014B50 /* 015DFC 800151FC 00A4082A */ slt $at, $a1, $a0 /* 015E00 80015200 1420004F */ bnez $at, .L80015340 -/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(D_8011AE58) # $t2, 0x8012 -/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(D_8011AE58) # addiu $t2, $t2, -0x51a8 +/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 /* 015E0C 8001520C 0064082A */ slt $at, $v1, $a0 .L80015210: /* 015E10 80015210 1420001D */ bnez $at, .L80015288 diff --git a/asm/non_matchings/unknown_00BC20/func_80014CCC.s b/asm/non_matchings/unknown_00BC20/func_80014CCC.s new file mode 100644 index 00000000..18735204 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_80014CCC.s @@ -0,0 +1,462 @@ +glabel func_80014CCC +/* 0158CC 80014CCC 00A4082A */ slt $at, $a1, $a0 +/* 0158D0 80014CD0 1420019B */ bnez $at, .L80015340 +/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 0158DC 80014CDC 0064082A */ slt $at, $v1, $a0 +.L80014CE0: +/* 0158E0 80014CE0 1420001D */ bnez $at, .L80014D58 +/* 0158E4 80014CE4 00A2082A */ slt $at, $a1, $v0 +/* 0158E8 80014CE8 8D590000 */ lw $t9, ($t2) +/* 0158EC 80014CEC 00045880 */ sll $t3, $a0, 2 +/* 0158F0 80014CF0 032B3821 */ addu $a3, $t9, $t3 +/* 0158F4 80014CF4 8CE60000 */ lw $a2, ($a3) +/* 0158F8 80014CF8 00000000 */ nop +/* 0158FC 80014CFC C4C40010 */ lwc1 $f4, 0x10($a2) +/* 015900 80014D00 C4C60034 */ lwc1 $f6, 0x34($a2) +/* 015904 80014D04 00000000 */ nop +/* 015908 80014D08 46062201 */ sub.s $f8, $f4, $f6 +/* 01590C 80014D0C 460C403C */ c.lt.s $f8, $f12 +/* 015910 80014D10 00000000 */ nop +/* 015914 80014D14 45000010 */ bc1f .L80014D58 +/* 015918 80014D18 00A2082A */ slt $at, $a1, $v0 +.L80014D1C: +/* 01591C 80014D1C 24840001 */ addiu $a0, $a0, 1 +/* 015920 80014D20 0064082A */ slt $at, $v1, $a0 +/* 015924 80014D24 1420000B */ bnez $at, .L80014D54 +/* 015928 80014D28 24E70004 */ addiu $a3, $a3, 4 +/* 01592C 80014D2C 8CE60000 */ lw $a2, ($a3) +/* 015930 80014D30 00000000 */ nop +/* 015934 80014D34 C4CA0010 */ lwc1 $f10, 0x10($a2) +/* 015938 80014D38 C4D00034 */ lwc1 $f16, 0x34($a2) +/* 01593C 80014D3C 00000000 */ nop +/* 015940 80014D40 46105481 */ sub.s $f18, $f10, $f16 +/* 015944 80014D44 460C903C */ c.lt.s $f18, $f12 +/* 015948 80014D48 00000000 */ nop +/* 01594C 80014D4C 4501FFF3 */ bc1t .L80014D1C +/* 015950 80014D50 00000000 */ nop +.L80014D54: +/* 015954 80014D54 00A2082A */ slt $at, $a1, $v0 +.L80014D58: +/* 015958 80014D58 1420001C */ bnez $at, .L80014DCC +/* 01595C 80014D5C 00047080 */ sll $t6, $a0, 2 +/* 015960 80014D60 8D4C0000 */ lw $t4, ($t2) +/* 015964 80014D64 00056880 */ sll $t5, $a1, 2 +/* 015968 80014D68 018D3021 */ addu $a2, $t4, $t5 +/* 01596C 80014D6C 8CC70000 */ lw $a3, ($a2) +/* 015970 80014D70 00000000 */ nop +/* 015974 80014D74 C4E40010 */ lwc1 $f4, 0x10($a3) +/* 015978 80014D78 C4E60034 */ lwc1 $f6, 0x34($a3) +/* 01597C 80014D7C 00000000 */ nop +/* 015980 80014D80 46062201 */ sub.s $f8, $f4, $f6 +/* 015984 80014D84 4608603E */ c.le.s $f12, $f8 +/* 015988 80014D88 00000000 */ nop +/* 01598C 80014D8C 45000010 */ bc1f .L80014DD0 +/* 015990 80014D90 0085082A */ slt $at, $a0, $a1 +.L80014D94: +/* 015994 80014D94 24A5FFFF */ addiu $a1, $a1, -1 +/* 015998 80014D98 00A2082A */ slt $at, $a1, $v0 +/* 01599C 80014D9C 1420000B */ bnez $at, .L80014DCC +/* 0159A0 80014DA0 24C6FFFC */ addiu $a2, $a2, -4 +/* 0159A4 80014DA4 8CC70000 */ lw $a3, ($a2) +/* 0159A8 80014DA8 00000000 */ nop +/* 0159AC 80014DAC C4EA0010 */ lwc1 $f10, 0x10($a3) +/* 0159B0 80014DB0 C4F00034 */ lwc1 $f16, 0x34($a3) +/* 0159B4 80014DB4 00000000 */ nop +/* 0159B8 80014DB8 46105481 */ sub.s $f18, $f10, $f16 +/* 0159BC 80014DBC 4612603E */ c.le.s $f12, $f18 +/* 0159C0 80014DC0 00000000 */ nop +/* 0159C4 80014DC4 4501FFF3 */ bc1t .L80014D94 +/* 0159C8 80014DC8 00000000 */ nop +.L80014DCC: +/* 0159CC 80014DCC 0085082A */ slt $at, $a0, $a1 +.L80014DD0: +/* 0159D0 80014DD0 1020000C */ beqz $at, .L80014E04 +/* 0159D4 80014DD4 00054080 */ sll $t0, $a1, 2 +/* 0159D8 80014DD8 8D460000 */ lw $a2, ($t2) +/* 0159DC 80014DDC 24840001 */ addiu $a0, $a0, 1 +/* 0159E0 80014DE0 00C87821 */ addu $t7, $a2, $t0 +/* 0159E4 80014DE4 8DF80000 */ lw $t8, ($t7) +/* 0159E8 80014DE8 00CE3821 */ addu $a3, $a2, $t6 +/* 0159EC 80014DEC 8CE90000 */ lw $t1, ($a3) +/* 0159F0 80014DF0 ACF80000 */ sw $t8, ($a3) +/* 0159F4 80014DF4 8D590000 */ lw $t9, ($t2) +/* 0159F8 80014DF8 24A5FFFF */ addiu $a1, $a1, -1 +/* 0159FC 80014DFC 03285821 */ addu $t3, $t9, $t0 +/* 015A00 80014E00 AD690000 */ sw $t1, ($t3) +.L80014E04: +/* 015A04 80014E04 00A4082A */ slt $at, $a1, $a0 +/* 015A08 80014E08 1020FFB5 */ beqz $at, .L80014CE0 +/* 015A0C 80014E0C 0064082A */ slt $at, $v1, $a0 +/* 015A10 80014E10 03E00008 */ jr $ra +/* 015A14 80014E14 00801025 */ move $v0, $a0 + +/* 015A18 80014E18 00A4082A */ slt $at, $a1, $a0 +/* 015A1C 80014E1C 14200148 */ bnez $at, .L80015340 +/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015A28 80014E28 0064082A */ slt $at, $v1, $a0 +.L80014E2C: +/* 015A2C 80014E2C 1420001D */ bnez $at, .L80014EA4 +/* 015A30 80014E30 00A2082A */ slt $at, $a1, $v0 +/* 015A34 80014E34 8D4C0000 */ lw $t4, ($t2) +/* 015A38 80014E38 00046880 */ sll $t5, $a0, 2 +/* 015A3C 80014E3C 018D3821 */ addu $a3, $t4, $t5 +/* 015A40 80014E40 8CE60000 */ lw $a2, ($a3) +/* 015A44 80014E44 00000000 */ nop +/* 015A48 80014E48 C4C40014 */ lwc1 $f4, 0x14($a2) +/* 015A4C 80014E4C C4C60034 */ lwc1 $f6, 0x34($a2) +/* 015A50 80014E50 00000000 */ nop +/* 015A54 80014E54 46062201 */ sub.s $f8, $f4, $f6 +/* 015A58 80014E58 460C403C */ c.lt.s $f8, $f12 +/* 015A5C 80014E5C 00000000 */ nop +/* 015A60 80014E60 45000010 */ bc1f .L80014EA4 +/* 015A64 80014E64 00A2082A */ slt $at, $a1, $v0 +.L80014E68: +/* 015A68 80014E68 24840001 */ addiu $a0, $a0, 1 +/* 015A6C 80014E6C 0064082A */ slt $at, $v1, $a0 +/* 015A70 80014E70 1420000B */ bnez $at, .L80014EA0 +/* 015A74 80014E74 24E70004 */ addiu $a3, $a3, 4 +/* 015A78 80014E78 8CE60000 */ lw $a2, ($a3) +/* 015A7C 80014E7C 00000000 */ nop +/* 015A80 80014E80 C4CA0014 */ lwc1 $f10, 0x14($a2) +/* 015A84 80014E84 C4D00034 */ lwc1 $f16, 0x34($a2) +/* 015A88 80014E88 00000000 */ nop +/* 015A8C 80014E8C 46105481 */ sub.s $f18, $f10, $f16 +/* 015A90 80014E90 460C903C */ c.lt.s $f18, $f12 +/* 015A94 80014E94 00000000 */ nop +/* 015A98 80014E98 4501FFF3 */ bc1t .L80014E68 +/* 015A9C 80014E9C 00000000 */ nop +.L80014EA0: +/* 015AA0 80014EA0 00A2082A */ slt $at, $a1, $v0 +.L80014EA4: +/* 015AA4 80014EA4 1420001C */ bnez $at, .L80014F18 +/* 015AA8 80014EA8 0004C080 */ sll $t8, $a0, 2 +/* 015AAC 80014EAC 8D4E0000 */ lw $t6, ($t2) +/* 015AB0 80014EB0 00057880 */ sll $t7, $a1, 2 +/* 015AB4 80014EB4 01CF3021 */ addu $a2, $t6, $t7 +/* 015AB8 80014EB8 8CC70000 */ lw $a3, ($a2) +/* 015ABC 80014EBC 00000000 */ nop +/* 015AC0 80014EC0 C4E40014 */ lwc1 $f4, 0x14($a3) +/* 015AC4 80014EC4 C4E60034 */ lwc1 $f6, 0x34($a3) +/* 015AC8 80014EC8 00000000 */ nop +/* 015ACC 80014ECC 46062201 */ sub.s $f8, $f4, $f6 +/* 015AD0 80014ED0 4608603E */ c.le.s $f12, $f8 +/* 015AD4 80014ED4 00000000 */ nop +/* 015AD8 80014ED8 45000010 */ bc1f .L80014F1C +/* 015ADC 80014EDC 0085082A */ slt $at, $a0, $a1 +.L80014EE0: +/* 015AE0 80014EE0 24A5FFFF */ addiu $a1, $a1, -1 +/* 015AE4 80014EE4 00A2082A */ slt $at, $a1, $v0 +/* 015AE8 80014EE8 1420000B */ bnez $at, .L80014F18 +/* 015AEC 80014EEC 24C6FFFC */ addiu $a2, $a2, -4 +/* 015AF0 80014EF0 8CC70000 */ lw $a3, ($a2) +/* 015AF4 80014EF4 00000000 */ nop +/* 015AF8 80014EF8 C4EA0014 */ lwc1 $f10, 0x14($a3) +/* 015AFC 80014EFC C4F00034 */ lwc1 $f16, 0x34($a3) +/* 015B00 80014F00 00000000 */ nop +/* 015B04 80014F04 46105481 */ sub.s $f18, $f10, $f16 +/* 015B08 80014F08 4612603E */ c.le.s $f12, $f18 +/* 015B0C 80014F0C 00000000 */ nop +/* 015B10 80014F10 4501FFF3 */ bc1t .L80014EE0 +/* 015B14 80014F14 00000000 */ nop +.L80014F18: +/* 015B18 80014F18 0085082A */ slt $at, $a0, $a1 +.L80014F1C: +/* 015B1C 80014F1C 1020000C */ beqz $at, .L80014F50 +/* 015B20 80014F20 00054080 */ sll $t0, $a1, 2 +/* 015B24 80014F24 8D460000 */ lw $a2, ($t2) +/* 015B28 80014F28 24840001 */ addiu $a0, $a0, 1 +/* 015B2C 80014F2C 00C8C821 */ addu $t9, $a2, $t0 +/* 015B30 80014F30 8F2B0000 */ lw $t3, ($t9) +/* 015B34 80014F34 00D83821 */ addu $a3, $a2, $t8 +/* 015B38 80014F38 8CE90000 */ lw $t1, ($a3) +/* 015B3C 80014F3C ACEB0000 */ sw $t3, ($a3) +/* 015B40 80014F40 8D4C0000 */ lw $t4, ($t2) +/* 015B44 80014F44 24A5FFFF */ addiu $a1, $a1, -1 +/* 015B48 80014F48 01886821 */ addu $t5, $t4, $t0 +/* 015B4C 80014F4C ADA90000 */ sw $t1, ($t5) +.L80014F50: +/* 015B50 80014F50 00A4082A */ slt $at, $a1, $a0 +/* 015B54 80014F54 1020FFB5 */ beqz $at, .L80014E2C +/* 015B58 80014F58 0064082A */ slt $at, $v1, $a0 +/* 015B5C 80014F5C 03E00008 */ jr $ra +/* 015B60 80014F60 00801025 */ move $v0, $a0 + +/* 015B64 80014F64 00A4082A */ slt $at, $a1, $a0 +/* 015B68 80014F68 142000F5 */ bnez $at, .L80015340 +/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015B74 80014F74 0064082A */ slt $at, $v1, $a0 +.L80014F78: +/* 015B78 80014F78 1420001D */ bnez $at, .L80014FF0 +/* 015B7C 80014F7C 00A2082A */ slt $at, $a1, $v0 +/* 015B80 80014F80 8D4E0000 */ lw $t6, ($t2) +/* 015B84 80014F84 00047880 */ sll $t7, $a0, 2 +/* 015B88 80014F88 01CF3821 */ addu $a3, $t6, $t7 +/* 015B8C 80014F8C 8CE60000 */ lw $a2, ($a3) +/* 015B90 80014F90 00000000 */ nop +/* 015B94 80014F94 C4C40034 */ lwc1 $f4, 0x34($a2) +/* 015B98 80014F98 C4C6000C */ lwc1 $f6, 0xc($a2) +/* 015B9C 80014F9C 00000000 */ nop +/* 015BA0 80014FA0 46062200 */ add.s $f8, $f4, $f6 +/* 015BA4 80014FA4 460C403C */ c.lt.s $f8, $f12 +/* 015BA8 80014FA8 00000000 */ nop +/* 015BAC 80014FAC 45000010 */ bc1f .L80014FF0 +/* 015BB0 80014FB0 00A2082A */ slt $at, $a1, $v0 +.L80014FB4: +/* 015BB4 80014FB4 24840001 */ addiu $a0, $a0, 1 +/* 015BB8 80014FB8 0064082A */ slt $at, $v1, $a0 +/* 015BBC 80014FBC 1420000B */ bnez $at, .L80014FEC +/* 015BC0 80014FC0 24E70004 */ addiu $a3, $a3, 4 +/* 015BC4 80014FC4 8CE60000 */ lw $a2, ($a3) +/* 015BC8 80014FC8 00000000 */ nop +/* 015BCC 80014FCC C4CA0034 */ lwc1 $f10, 0x34($a2) +/* 015BD0 80014FD0 C4D0000C */ lwc1 $f16, 0xc($a2) +/* 015BD4 80014FD4 00000000 */ nop +/* 015BD8 80014FD8 46105480 */ add.s $f18, $f10, $f16 +/* 015BDC 80014FDC 460C903C */ c.lt.s $f18, $f12 +/* 015BE0 80014FE0 00000000 */ nop +/* 015BE4 80014FE4 4501FFF3 */ bc1t .L80014FB4 +/* 015BE8 80014FE8 00000000 */ nop +.L80014FEC: +/* 015BEC 80014FEC 00A2082A */ slt $at, $a1, $v0 +.L80014FF0: +/* 015BF0 80014FF0 1420001C */ bnez $at, .L80015064 +/* 015BF4 80014FF4 00045880 */ sll $t3, $a0, 2 +/* 015BF8 80014FF8 8D580000 */ lw $t8, ($t2) +/* 015BFC 80014FFC 0005C880 */ sll $t9, $a1, 2 +/* 015C00 80015000 03193021 */ addu $a2, $t8, $t9 +/* 015C04 80015004 8CC70000 */ lw $a3, ($a2) +/* 015C08 80015008 00000000 */ nop +/* 015C0C 8001500C C4E40034 */ lwc1 $f4, 0x34($a3) +/* 015C10 80015010 C4E6000C */ lwc1 $f6, 0xc($a3) +/* 015C14 80015014 00000000 */ nop +/* 015C18 80015018 46062200 */ add.s $f8, $f4, $f6 +/* 015C1C 8001501C 4608603E */ c.le.s $f12, $f8 +/* 015C20 80015020 00000000 */ nop +/* 015C24 80015024 45000010 */ bc1f .L80015068 +/* 015C28 80015028 0085082A */ slt $at, $a0, $a1 +.L8001502C: +/* 015C2C 8001502C 24A5FFFF */ addiu $a1, $a1, -1 +/* 015C30 80015030 00A2082A */ slt $at, $a1, $v0 +/* 015C34 80015034 1420000B */ bnez $at, .L80015064 +/* 015C38 80015038 24C6FFFC */ addiu $a2, $a2, -4 +/* 015C3C 8001503C 8CC70000 */ lw $a3, ($a2) +/* 015C40 80015040 00000000 */ nop +/* 015C44 80015044 C4EA0034 */ lwc1 $f10, 0x34($a3) +/* 015C48 80015048 C4F0000C */ lwc1 $f16, 0xc($a3) +/* 015C4C 8001504C 00000000 */ nop +/* 015C50 80015050 46105480 */ add.s $f18, $f10, $f16 +/* 015C54 80015054 4612603E */ c.le.s $f12, $f18 +/* 015C58 80015058 00000000 */ nop +/* 015C5C 8001505C 4501FFF3 */ bc1t .L8001502C +/* 015C60 80015060 00000000 */ nop +.L80015064: +/* 015C64 80015064 0085082A */ slt $at, $a0, $a1 +.L80015068: +/* 015C68 80015068 1020000C */ beqz $at, .L8001509C +/* 015C6C 8001506C 00054080 */ sll $t0, $a1, 2 +/* 015C70 80015070 8D460000 */ lw $a2, ($t2) +/* 015C74 80015074 24840001 */ addiu $a0, $a0, 1 +/* 015C78 80015078 00C86021 */ addu $t4, $a2, $t0 +/* 015C7C 8001507C 8D8D0000 */ lw $t5, ($t4) +/* 015C80 80015080 00CB3821 */ addu $a3, $a2, $t3 +/* 015C84 80015084 8CE90000 */ lw $t1, ($a3) +/* 015C88 80015088 ACED0000 */ sw $t5, ($a3) +/* 015C8C 8001508C 8D4E0000 */ lw $t6, ($t2) +/* 015C90 80015090 24A5FFFF */ addiu $a1, $a1, -1 +/* 015C94 80015094 01C87821 */ addu $t7, $t6, $t0 +/* 015C98 80015098 ADE90000 */ sw $t1, ($t7) +.L8001509C: +/* 015C9C 8001509C 00A4082A */ slt $at, $a1, $a0 +/* 015CA0 800150A0 1020FFB5 */ beqz $at, .L80014F78 +/* 015CA4 800150A4 0064082A */ slt $at, $v1, $a0 +/* 015CA8 800150A8 03E00008 */ jr $ra +/* 015CAC 800150AC 00801025 */ move $v0, $a0 + +/* 015CB0 800150B0 00A4082A */ slt $at, $a1, $a0 +/* 015CB4 800150B4 142000A2 */ bnez $at, .L80015340 +/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015CC0 800150C0 0064082A */ slt $at, $v1, $a0 +.L800150C4: +/* 015CC4 800150C4 1420001D */ bnez $at, .L8001513C +/* 015CC8 800150C8 00A2082A */ slt $at, $a1, $v0 +/* 015CCC 800150CC 8D580000 */ lw $t8, ($t2) +/* 015CD0 800150D0 0004C880 */ sll $t9, $a0, 2 +/* 015CD4 800150D4 03193821 */ addu $a3, $t8, $t9 +/* 015CD8 800150D8 8CE60000 */ lw $a2, ($a3) +/* 015CDC 800150DC 00000000 */ nop +/* 015CE0 800150E0 C4C40034 */ lwc1 $f4, 0x34($a2) +/* 015CE4 800150E4 C4C60010 */ lwc1 $f6, 0x10($a2) +/* 015CE8 800150E8 00000000 */ nop +/* 015CEC 800150EC 46062200 */ add.s $f8, $f4, $f6 +/* 015CF0 800150F0 460C403C */ c.lt.s $f8, $f12 +/* 015CF4 800150F4 00000000 */ nop +/* 015CF8 800150F8 45000010 */ bc1f .L8001513C +/* 015CFC 800150FC 00A2082A */ slt $at, $a1, $v0 +.L80015100: +/* 015D00 80015100 24840001 */ addiu $a0, $a0, 1 +/* 015D04 80015104 0064082A */ slt $at, $v1, $a0 +/* 015D08 80015108 1420000B */ bnez $at, .L80015138 +/* 015D0C 8001510C 24E70004 */ addiu $a3, $a3, 4 +/* 015D10 80015110 8CE60000 */ lw $a2, ($a3) +/* 015D14 80015114 00000000 */ nop +/* 015D18 80015118 C4CA0034 */ lwc1 $f10, 0x34($a2) +/* 015D1C 8001511C C4D00010 */ lwc1 $f16, 0x10($a2) +/* 015D20 80015120 00000000 */ nop +/* 015D24 80015124 46105480 */ add.s $f18, $f10, $f16 +/* 015D28 80015128 460C903C */ c.lt.s $f18, $f12 +/* 015D2C 8001512C 00000000 */ nop +/* 015D30 80015130 4501FFF3 */ bc1t .L80015100 +/* 015D34 80015134 00000000 */ nop +.L80015138: +/* 015D38 80015138 00A2082A */ slt $at, $a1, $v0 +.L8001513C: +/* 015D3C 8001513C 1420001C */ bnez $at, .L800151B0 +/* 015D40 80015140 00046880 */ sll $t5, $a0, 2 +/* 015D44 80015144 8D4B0000 */ lw $t3, ($t2) +/* 015D48 80015148 00056080 */ sll $t4, $a1, 2 +/* 015D4C 8001514C 016C3021 */ addu $a2, $t3, $t4 +/* 015D50 80015150 8CC70000 */ lw $a3, ($a2) +/* 015D54 80015154 00000000 */ nop +/* 015D58 80015158 C4E40034 */ lwc1 $f4, 0x34($a3) +/* 015D5C 8001515C C4E60010 */ lwc1 $f6, 0x10($a3) +/* 015D60 80015160 00000000 */ nop +/* 015D64 80015164 46062200 */ add.s $f8, $f4, $f6 +/* 015D68 80015168 4608603E */ c.le.s $f12, $f8 +/* 015D6C 8001516C 00000000 */ nop +/* 015D70 80015170 45000010 */ bc1f .L800151B4 +/* 015D74 80015174 0085082A */ slt $at, $a0, $a1 +.L80015178: +/* 015D78 80015178 24A5FFFF */ addiu $a1, $a1, -1 +/* 015D7C 8001517C 00A2082A */ slt $at, $a1, $v0 +/* 015D80 80015180 1420000B */ bnez $at, .L800151B0 +/* 015D84 80015184 24C6FFFC */ addiu $a2, $a2, -4 +/* 015D88 80015188 8CC70000 */ lw $a3, ($a2) +/* 015D8C 8001518C 00000000 */ nop +/* 015D90 80015190 C4EA0034 */ lwc1 $f10, 0x34($a3) +/* 015D94 80015194 C4F00010 */ lwc1 $f16, 0x10($a3) +/* 015D98 80015198 00000000 */ nop +/* 015D9C 8001519C 46105480 */ add.s $f18, $f10, $f16 +/* 015DA0 800151A0 4612603E */ c.le.s $f12, $f18 +/* 015DA4 800151A4 00000000 */ nop +/* 015DA8 800151A8 4501FFF3 */ bc1t .L80015178 +/* 015DAC 800151AC 00000000 */ nop +.L800151B0: +/* 015DB0 800151B0 0085082A */ slt $at, $a0, $a1 +.L800151B4: +/* 015DB4 800151B4 1020000C */ beqz $at, .L800151E8 +/* 015DB8 800151B8 00054080 */ sll $t0, $a1, 2 +/* 015DBC 800151BC 8D460000 */ lw $a2, ($t2) +/* 015DC0 800151C0 24840001 */ addiu $a0, $a0, 1 +/* 015DC4 800151C4 00C87021 */ addu $t6, $a2, $t0 +/* 015DC8 800151C8 8DCF0000 */ lw $t7, ($t6) +/* 015DCC 800151CC 00CD3821 */ addu $a3, $a2, $t5 +/* 015DD0 800151D0 8CE90000 */ lw $t1, ($a3) +/* 015DD4 800151D4 ACEF0000 */ sw $t7, ($a3) +/* 015DD8 800151D8 8D580000 */ lw $t8, ($t2) +/* 015DDC 800151DC 24A5FFFF */ addiu $a1, $a1, -1 +/* 015DE0 800151E0 0308C821 */ addu $t9, $t8, $t0 +/* 015DE4 800151E4 AF290000 */ sw $t1, ($t9) +.L800151E8: +/* 015DE8 800151E8 00A4082A */ slt $at, $a1, $a0 +/* 015DEC 800151EC 1020FFB5 */ beqz $at, .L800150C4 +/* 015DF0 800151F0 0064082A */ slt $at, $v1, $a0 +/* 015DF4 800151F4 03E00008 */ jr $ra +/* 015DF8 800151F8 00801025 */ move $v0, $a0 + +/* 015DFC 800151FC 00A4082A */ slt $at, $a1, $a0 +/* 015E00 80015200 1420004F */ bnez $at, .L80015340 +/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 +/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015E0C 8001520C 0064082A */ slt $at, $v1, $a0 +.L80015210: +/* 015E10 80015210 1420001D */ bnez $at, .L80015288 +/* 015E14 80015214 00A2082A */ slt $at, $a1, $v0 +/* 015E18 80015218 8D4B0000 */ lw $t3, ($t2) +/* 015E1C 8001521C 00046080 */ sll $t4, $a0, 2 +/* 015E20 80015220 016C3821 */ addu $a3, $t3, $t4 +/* 015E24 80015224 8CE60000 */ lw $a2, ($a3) +/* 015E28 80015228 00000000 */ nop +/* 015E2C 8001522C C4C40034 */ lwc1 $f4, 0x34($a2) +/* 015E30 80015230 C4C60014 */ lwc1 $f6, 0x14($a2) +/* 015E34 80015234 00000000 */ nop +/* 015E38 80015238 46062200 */ add.s $f8, $f4, $f6 +/* 015E3C 8001523C 460C403C */ c.lt.s $f8, $f12 +/* 015E40 80015240 00000000 */ nop +/* 015E44 80015244 45000010 */ bc1f .L80015288 +/* 015E48 80015248 00A2082A */ slt $at, $a1, $v0 +.L8001524C: +/* 015E4C 8001524C 24840001 */ addiu $a0, $a0, 1 +/* 015E50 80015250 0064082A */ slt $at, $v1, $a0 +/* 015E54 80015254 1420000B */ bnez $at, .L80015284 +/* 015E58 80015258 24E70004 */ addiu $a3, $a3, 4 +/* 015E5C 8001525C 8CE60000 */ lw $a2, ($a3) +/* 015E60 80015260 00000000 */ nop +/* 015E64 80015264 C4CA0034 */ lwc1 $f10, 0x34($a2) +/* 015E68 80015268 C4D00014 */ lwc1 $f16, 0x14($a2) +/* 015E6C 8001526C 00000000 */ nop +/* 015E70 80015270 46105480 */ add.s $f18, $f10, $f16 +/* 015E74 80015274 460C903C */ c.lt.s $f18, $f12 +/* 015E78 80015278 00000000 */ nop +/* 015E7C 8001527C 4501FFF3 */ bc1t .L8001524C +/* 015E80 80015280 00000000 */ nop +.L80015284: +/* 015E84 80015284 00A2082A */ slt $at, $a1, $v0 +.L80015288: +/* 015E88 80015288 1420001C */ bnez $at, .L800152FC +/* 015E8C 8001528C 00047880 */ sll $t7, $a0, 2 +/* 015E90 80015290 8D4D0000 */ lw $t5, ($t2) +/* 015E94 80015294 00057080 */ sll $t6, $a1, 2 +/* 015E98 80015298 01AE3021 */ addu $a2, $t5, $t6 +/* 015E9C 8001529C 8CC70000 */ lw $a3, ($a2) +/* 015EA0 800152A0 00000000 */ nop +/* 015EA4 800152A4 C4E40034 */ lwc1 $f4, 0x34($a3) +/* 015EA8 800152A8 C4E60014 */ lwc1 $f6, 0x14($a3) +/* 015EAC 800152AC 00000000 */ nop +/* 015EB0 800152B0 46062200 */ add.s $f8, $f4, $f6 +/* 015EB4 800152B4 4608603E */ c.le.s $f12, $f8 +/* 015EB8 800152B8 00000000 */ nop +/* 015EBC 800152BC 45000010 */ bc1f .L80015300 +/* 015EC0 800152C0 0085082A */ slt $at, $a0, $a1 +.L800152C4: +/* 015EC4 800152C4 24A5FFFF */ addiu $a1, $a1, -1 +/* 015EC8 800152C8 00A2082A */ slt $at, $a1, $v0 +/* 015ECC 800152CC 1420000B */ bnez $at, .L800152FC +/* 015ED0 800152D0 24C6FFFC */ addiu $a2, $a2, -4 +/* 015ED4 800152D4 8CC70000 */ lw $a3, ($a2) +/* 015ED8 800152D8 00000000 */ nop +/* 015EDC 800152DC C4EA0034 */ lwc1 $f10, 0x34($a3) +/* 015EE0 800152E0 C4F00014 */ lwc1 $f16, 0x14($a3) +/* 015EE4 800152E4 00000000 */ nop +/* 015EE8 800152E8 46105480 */ add.s $f18, $f10, $f16 +/* 015EEC 800152EC 4612603E */ c.le.s $f12, $f18 +/* 015EF0 800152F0 00000000 */ nop +/* 015EF4 800152F4 4501FFF3 */ bc1t .L800152C4 +/* 015EF8 800152F8 00000000 */ nop +.L800152FC: +/* 015EFC 800152FC 0085082A */ slt $at, $a0, $a1 +.L80015300: +/* 015F00 80015300 1020000C */ beqz $at, .L80015334 +/* 015F04 80015304 00054080 */ sll $t0, $a1, 2 +/* 015F08 80015308 8D460000 */ lw $a2, ($t2) +/* 015F0C 8001530C 24840001 */ addiu $a0, $a0, 1 +/* 015F10 80015310 00C8C021 */ addu $t8, $a2, $t0 +/* 015F14 80015314 8F190000 */ lw $t9, ($t8) +/* 015F18 80015318 00CF3821 */ addu $a3, $a2, $t7 +/* 015F1C 8001531C 8CE90000 */ lw $t1, ($a3) +/* 015F20 80015320 ACF90000 */ sw $t9, ($a3) +/* 015F24 80015324 8D4B0000 */ lw $t3, ($t2) +/* 015F28 80015328 24A5FFFF */ addiu $a1, $a1, -1 +/* 015F2C 8001532C 01686021 */ addu $t4, $t3, $t0 +/* 015F30 80015330 AD890000 */ sw $t1, ($t4) +.L80015334: +/* 015F34 80015334 00A4082A */ slt $at, $a1, $a0 +/* 015F38 80015338 1020FFB5 */ beqz $at, .L80015210 +/* 015F3C 8001533C 0064082A */ slt $at, $v1, $a0 +.L80015340: +/* 015F40 80015340 03E00008 */ jr $ra +/* 015F44 80015344 00801025 */ move $v0, $a0 + diff --git a/asm/non_matchings/unknown_00BC20/func_80015348.s b/asm/non_matchings/unknown_00BC20/func_80015348.s index a06cedc6..d7576517 100644 --- a/asm/non_matchings/unknown_00BC20/func_80015348.s +++ b/asm/non_matchings/unknown_00BC20/func_80015348.s @@ -20,10 +20,10 @@ glabel func_80015348 /* 015F90 80015390 00048880 */ sll $s1, $a0, 2 /* 015F94 80015394 3C01C67A */ li $at, 0xC67A0000 # -16000.000000 /* 015F98 80015398 0005A880 */ sll $s5, $a1, 2 -/* 015F9C 8001539C 3C128012 */ lui $s2, %hi(D_8011AE58) # $s2, 0x8012 +/* 015F9C 8001539C 3C128012 */ lui $s2, %hi(objPtrList) # $s2, 0x8012 /* 015FA0 800153A0 4481A000 */ mtc1 $at, $f20 /* 015FA4 800153A4 4480B000 */ mtc1 $zero, $f22 -/* 015FA8 800153A8 2652AE58 */ addiu $s2, %lo(D_8011AE58) # addiu $s2, $s2, -0x51a8 +/* 015FA8 800153A8 2652AE58 */ addiu $s2, %lo(objPtrList) # addiu $s2, $s2, -0x51a8 /* 015FAC 800153AC 26B50004 */ addiu $s5, $s5, 4 .L800153B0: /* 015FB0 800153B0 8E4E0000 */ lw $t6, ($s2) @@ -75,8 +75,8 @@ glabel func_80015348 /* 016058 80015458 16B1FFD5 */ bne $s5, $s1, .L800153B0 /* 01605C 8001545C 00000000 */ nop .L80015460: -/* 016060 80015460 3C128012 */ lui $s2, %hi(D_8011AE58) # $s2, 0x8012 -/* 016064 80015464 2652AE58 */ addiu $s2, %lo(D_8011AE58) # addiu $s2, $s2, -0x51a8 +/* 016060 80015460 3C128012 */ lui $s2, %hi(objPtrList) # $s2, 0x8012 +/* 016064 80015464 2652AE58 */ addiu $s2, %lo(objPtrList) # addiu $s2, $s2, -0x51a8 /* 016068 80015468 0274082A */ slt $at, $s3, $s4 .L8001546C: /* 01606C 8001546C 24050001 */ li $a1, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_800155B8.s b/asm/non_matchings/unknown_00BC20/func_800155B8.s index 0662e3ac..3eccd4ba 100644 --- a/asm/non_matchings/unknown_00BC20/func_800155B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800155B8.s @@ -2,8 +2,8 @@ glabel func_800155B8 /* 0161B8 800155B8 27BDFB70 */ addiu $sp, $sp, -0x490 /* 0161BC 800155BC AFB30034 */ sw $s3, 0x34($sp) /* 0161C0 800155C0 3C138012 */ lui $s3, %hi(D_8011AE60) # $s3, 0x8012 -/* 0161C4 800155C4 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 0161C8 800155C8 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 0161C4 800155C4 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 0161C8 800155C8 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 0161CC 800155CC 8E73AE60 */ lw $s3, %lo(D_8011AE60)($s3) /* 0161D0 800155D0 AFB5003C */ sw $s5, 0x3c($sp) /* 0161D4 800155D4 0263082A */ slt $at, $s3, $v1 @@ -21,8 +21,8 @@ glabel func_800155B8 /* 016204 80015604 E7B4001C */ swc1 $f20, 0x1c($sp) /* 016208 80015608 10200026 */ beqz $at, .L800156A4 /* 01620C 8001560C 0000A825 */ move $s5, $zero -/* 016210 80015610 3C048012 */ lui $a0, %hi(D_8011AE58) # $a0, 0x8012 -/* 016214 80015614 2484AE58 */ addiu $a0, %lo(D_8011AE58) # addiu $a0, $a0, -0x51a8 +/* 016210 80015610 3C048012 */ lui $a0, %hi(objPtrList) # $a0, 0x8012 +/* 016214 80015614 2484AE58 */ addiu $a0, %lo(objPtrList) # addiu $a0, $a0, -0x51a8 /* 016218 80015618 00131080 */ sll $v0, $s3, 2 /* 01621C 8001561C 241E0002 */ li $fp, 2 /* 016220 80015620 27B60064 */ addiu $s6, $sp, 0x64 @@ -53,8 +53,8 @@ glabel func_800155B8 /* 016280 80015680 01656024 */ and $t4, $t3, $a1 /* 016284 80015684 A64C0014 */ sh $t4, 0x14($s2) /* 016288 80015688 A2460013 */ sb $a2, 0x13($s2) -/* 01628C 8001568C 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 016290 80015690 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 01628C 8001568C 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 016290 80015690 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 016294 80015694 00000000 */ nop .L80015698: /* 016298 80015698 0263082A */ slt $at, $s3, $v1 diff --git a/asm/non_matchings/unknown_00BC20/func_80016C68.s b/asm/non_matchings/unknown_00BC20/func_80016C68.s index 3b4066d4..ca16303f 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016C68.s +++ b/asm/non_matchings/unknown_00BC20/func_80016C68.s @@ -1,8 +1,8 @@ glabel func_80016C68 /* 017868 80016C68 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 01786C 80016C6C AFB60050 */ sw $s6, 0x50($sp) -/* 017870 80016C70 3C168012 */ lui $s6, %hi(D_8011AE5C) # $s6, 0x8012 -/* 017874 80016C74 26D6AE5C */ addiu $s6, %lo(D_8011AE5C) # addiu $s6, $s6, -0x51a4 +/* 017870 80016C70 3C168012 */ lui $s6, %hi(objCount) # $s6, 0x8012 +/* 017874 80016C74 26D6AE5C */ addiu $s6, %lo(objCount) # addiu $s6, $s6, -0x51a4 /* 017878 80016C78 8ECE0000 */ lw $t6, ($s6) /* 01787C 80016C7C E7BA0034 */ swc1 $f26, 0x34($sp) /* 017880 80016C80 E7B60024 */ swc1 $f22, 0x24($sp) @@ -25,9 +25,9 @@ glabel func_80016C68 /* 0178C4 80016CC4 E7B70020 */ swc1 $f23, 0x20($sp) /* 0178C8 80016CC8 19C00034 */ blez $t6, .L80016D9C /* 0178CC 80016CCC 00008825 */ move $s1, $zero -/* 0178D0 80016CD0 3C148012 */ lui $s4, %hi(D_8011AE58) # $s4, 0x8012 +/* 0178D0 80016CD0 3C148012 */ lui $s4, %hi(objPtrList) # $s4, 0x8012 /* 0178D4 80016CD4 8FB30068 */ lw $s3, 0x68($sp) -/* 0178D8 80016CD8 2694AE58 */ addiu $s4, %lo(D_8011AE58) # addiu $s4, $s4, -0x51a8 +/* 0178D8 80016CD8 2694AE58 */ addiu $s4, %lo(objPtrList) # addiu $s4, $s4, -0x51a8 /* 0178DC 80016CDC 00009025 */ move $s2, $zero /* 0178E0 80016CE0 24150055 */ li $s5, 85 .L80016CE4: diff --git a/asm/non_matchings/unknown_00BC20/func_80016DE8.s b/asm/non_matchings/unknown_00BC20/func_80016DE8.s index 3d225cff..4dbb803a 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016DE8.s +++ b/asm/non_matchings/unknown_00BC20/func_80016DE8.s @@ -1,8 +1,8 @@ glabel func_80016DE8 /* 0179E8 80016DE8 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 0179EC 80016DEC AFB6004C */ sw $s6, 0x4c($sp) -/* 0179F0 80016DF0 3C168012 */ lui $s6, %hi(D_8011AEF0) # $s6, 0x8012 -/* 0179F4 80016DF4 26D6AEF0 */ addiu $s6, %lo(D_8011AEF0) # addiu $s6, $s6, -0x5110 +/* 0179F0 80016DF0 3C168012 */ lui $s6, %hi(playerCount) # $s6, 0x8012 +/* 0179F4 80016DF4 26D6AEF0 */ addiu $s6, %lo(playerCount) # addiu $s6, $s6, -0x5110 /* 0179F8 80016DF8 8EC20000 */ lw $v0, ($s6) /* 0179FC 80016DFC E7BA002C */ swc1 $f26, 0x2c($sp) /* 017A00 80016E00 E7B6001C */ swc1 $f22, 0x1c($sp) @@ -28,10 +28,10 @@ glabel func_80016DE8 /* 017A50 80016E50 0000A025 */ move $s4, $zero /* 017A54 80016E54 1840003C */ blez $v0, .L80016F48 /* 017A58 80016E58 00008825 */ move $s1, $zero -/* 017A5C 80016E5C 3C138012 */ lui $s3, %hi(D_8011AEE4) # $s3, 0x8012 +/* 017A5C 80016E5C 3C138012 */ lui $s3, %hi(playerStructArray_Ptr) # $s3, 0x8012 /* 017A60 80016E60 8FB500C8 */ lw $s5, 0xc8($sp) /* 017A64 80016E64 8FB000CC */ lw $s0, 0xcc($sp) -/* 017A68 80016E68 2673AEE4 */ addiu $s3, %lo(D_8011AEE4) # addiu $s3, $s3, -0x511c +/* 017A68 80016E68 2673AEE4 */ addiu $s3, %lo(playerStructArray_Ptr) # addiu $s3, $s3, -0x511c /* 017A6C 80016E6C 00009025 */ move $s2, $zero /* 017A70 80016E70 27B70098 */ addiu $s7, $sp, 0x98 .L80016E74: diff --git a/asm/non_matchings/unknown_00BC20/func_80017E98.s b/asm/non_matchings/unknown_00BC20/func_80017E98.s index 656d1ae5..c94fa4f5 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017E98.s +++ b/asm/non_matchings/unknown_00BC20/func_80017E98.s @@ -1,7 +1,7 @@ glabel func_80017E98 /* 018A98 80017E98 27BDFEE8 */ addiu $sp, $sp, -0x118 -/* 018A9C 80017E9C 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 018AA0 80017EA0 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 018A9C 80017E9C 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 018AA0 80017EA0 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 018AA4 80017EA4 AFB30044 */ sw $s3, 0x44($sp) /* 018AA8 80017EA8 3C018012 */ lui $at, %hi(D_8011AED0) # $at, 0x8012 /* 018AAC 80017EAC AFBF005C */ sw $ra, 0x5c($sp) @@ -23,8 +23,8 @@ glabel func_80017E98 /* 018AEC 80017EEC 00009825 */ move $s3, $zero /* 018AF0 80017EF0 3C148012 */ lui $s4, %hi(D_8011AECC) # $s4, 0x8012 /* 018AF4 80017EF4 3C098012 */ lui $t1, %hi(D_8011AED8) # $t1, 0x8012 -/* 018AF8 80017EF8 3C068012 */ lui $a2, %hi(D_8011AE58) # $a2, 0x8012 -/* 018AFC 80017EFC 24C6AE58 */ addiu $a2, %lo(D_8011AE58) # addiu $a2, $a2, -0x51a8 +/* 018AF8 80017EF8 3C068012 */ lui $a2, %hi(objPtrList) # $a2, 0x8012 +/* 018AFC 80017EFC 24C6AE58 */ addiu $a2, %lo(objPtrList) # addiu $a2, $a2, -0x51a8 /* 018B00 80017F00 2529AED8 */ addiu $t1, %lo(D_8011AED8) # addiu $t1, $t1, -0x5128 /* 018B04 80017F04 2694AECC */ addiu $s4, %lo(D_8011AECC) # addiu $s4, $s4, -0x5134 /* 018B08 80017F08 00001025 */ move $v0, $zero @@ -74,7 +74,7 @@ glabel func_80017E98 /* 018BB0 80017FB0 8E8B0000 */ lw $t3, ($s4) /* 018BB4 80017FB4 01850019 */ multu $t4, $a1 /* 018BB8 80017FB8 240FFFFF */ li $t7, -1 -/* 018BBC 80017FBC 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 +/* 018BBC 80017FBC 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 /* 018BC0 80017FC0 00006812 */ mflo $t5 /* 018BC4 80017FC4 016D7021 */ addu $t6, $t3, $t5 /* 018BC8 80017FC8 A5C4002C */ sh $a0, 0x2c($t6) @@ -88,7 +88,7 @@ glabel func_80017E98 /* 018BE8 80017FE8 00000000 */ nop /* 018BEC 80017FEC 25AE0001 */ addiu $t6, $t5, 1 /* 018BF0 80017FF0 ACEE0000 */ sw $t6, ($a3) -/* 018BF4 80017FF4 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 018BF4 80017FF4 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 018BF8 80017FF8 00000000 */ nop /* 018BFC 80017FFC 0263082A */ slt $at, $s3, $v1 .L80018000: diff --git a/asm/non_matchings/unknown_00BC20/func_80018C6C.s b/asm/non_matchings/unknown_00BC20/func_80018C6C.s deleted file mode 100644 index d4b90b0d..00000000 --- a/asm/non_matchings/unknown_00BC20/func_80018C6C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80018C6C -/* 01986C 80018C6C 3C028012 */ lui $v0, %hi(D_8011AE60) # $v0, 0x8012 -/* 019870 80018C70 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 019874 80018C74 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) -/* 019878 80018C78 8C42AE60 */ lw $v0, %lo(D_8011AE60)($v0) -/* 01987C 80018C7C 3C0E8012 */ lui $t6, %hi(D_8011AE58) # $t6, 0x8012 -/* 019880 80018C80 0043082A */ slt $at, $v0, $v1 -/* 019884 80018C84 10200013 */ beqz $at, .L80018CD4 -/* 019888 80018C88 00027880 */ sll $t7, $v0, 2 -/* 01988C 80018C8C 8DCEAE58 */ lw $t6, %lo(D_8011AE58)($t6) -/* 019890 80018C90 2406003E */ li $a2, 62 -/* 019894 80018C94 01CF2821 */ addu $a1, $t6, $t7 -.L80018C98: -/* 019898 80018C98 8CA40000 */ lw $a0, ($a1) -/* 01989C 80018C9C 24420001 */ addiu $v0, $v0, 1 -/* 0198A0 80018CA0 84980006 */ lh $t8, 6($a0) -/* 0198A4 80018CA4 0043082A */ slt $at, $v0, $v1 -/* 0198A8 80018CA8 33198000 */ andi $t9, $t8, 0x8000 -/* 0198AC 80018CAC 17200007 */ bnez $t9, .L80018CCC -/* 0198B0 80018CB0 00000000 */ nop -/* 0198B4 80018CB4 84880048 */ lh $t0, 0x48($a0) -/* 0198B8 80018CB8 00000000 */ nop -/* 0198BC 80018CBC 14C80003 */ bne $a2, $t0, .L80018CCC -/* 0198C0 80018CC0 00000000 */ nop -/* 0198C4 80018CC4 03E00008 */ jr $ra -/* 0198C8 80018CC8 00801025 */ move $v0, $a0 - -.L80018CCC: -/* 0198CC 80018CCC 1420FFF2 */ bnez $at, .L80018C98 -/* 0198D0 80018CD0 24A50004 */ addiu $a1, $a1, 4 -.L80018CD4: -/* 0198D4 80018CD4 00001025 */ move $v0, $zero -/* 0198D8 80018CD8 03E00008 */ jr $ra -/* 0198DC 80018CDC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_00BC20/func_80018CE0.s b/asm/non_matchings/unknown_00BC20/func_80018CE0.s index 2096ca95..32d52818 100644 --- a/asm/non_matchings/unknown_00BC20/func_80018CE0.s +++ b/asm/non_matchings/unknown_00BC20/func_80018CE0.s @@ -36,8 +36,8 @@ glabel func_80018CE0 /* 019968 80018D68 144001E4 */ bnez $v0, .L800194FC /* 01996C 80018D6C 3C0C8012 */ lui $t4, %hi(D_8011AE60) # $t4, 0x8012 /* 019970 80018D70 8D8CAE60 */ lw $t4, %lo(D_8011AE60)($t4) -/* 019974 80018D74 3C0D8012 */ lui $t5, %hi(D_8011AE5C) # $t5, 0x8012 -/* 019978 80018D78 8DADAE5C */ lw $t5, %lo(D_8011AE5C)($t5) +/* 019974 80018D74 3C0D8012 */ lui $t5, %hi(objCount) # $t5, 0x8012 +/* 019978 80018D78 8DADAE5C */ lw $t5, %lo(objCount)($t5) /* 01997C 80018D7C AFAC00F4 */ sw $t4, 0xf4($sp) /* 019980 80018D80 018D082A */ slt $at, $t4, $t5 /* 019984 80018D84 10200135 */ beqz $at, .L8001925C @@ -48,8 +48,8 @@ glabel func_80018CE0 /* 019998 80018D98 24160002 */ li $s6, 2 /* 01999C 80018D9C 24150001 */ li $s5, 1 .L80018DA0: -/* 0199A0 80018DA0 3C0F8012 */ lui $t7, %hi(D_8011AE58) # $t7, 0x8012 -/* 0199A4 80018DA4 8DEFAE58 */ lw $t7, %lo(D_8011AE58)($t7) +/* 0199A0 80018DA0 3C0F8012 */ lui $t7, %hi(objPtrList) # $t7, 0x8012 +/* 0199A4 80018DA4 8DEFAE58 */ lw $t7, %lo(objPtrList)($t7) /* 0199A8 80018DA8 8FAE0098 */ lw $t6, 0x98($sp) /* 0199AC 80018DAC 00000000 */ nop /* 0199B0 80018DB0 01EEC821 */ addu $t9, $t7, $t6 @@ -357,8 +357,8 @@ glabel func_80018CE0 .L80019234: /* 019E34 80019234 8FAA00F4 */ lw $t2, 0xf4($sp) .L80019238: -/* 019E38 80019238 3C188012 */ lui $t8, %hi(D_8011AE5C) # $t8, 0x8012 -/* 019E3C 8001923C 8F18AE5C */ lw $t8, %lo(D_8011AE5C)($t8) +/* 019E38 80019238 3C188012 */ lui $t8, %hi(objCount) # $t8, 0x8012 +/* 019E3C 8001923C 8F18AE5C */ lw $t8, %lo(objCount)($t8) /* 019E40 80019240 8FAD0098 */ lw $t5, 0x98($sp) /* 019E44 80019244 254B0001 */ addiu $t3, $t2, 1 /* 019E48 80019248 0178082A */ slt $at, $t3, $t8 diff --git a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index dd5b1ec3..b4526871 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -37,15 +37,15 @@ glabel func_8001A8F4 /* 01B578 8001A978 860A0000 */ lh $t2, ($s0) /* 01B57C 8001A97C 2401FFFF */ li $at, -1 /* 01B580 8001A980 1541006D */ bne $t2, $at, .L8001AB38 -/* 01B584 8001A984 3C118012 */ lui $s1, %hi(D_8011AEF0) # $s1, 0x8012 -/* 01B588 8001A988 2631AEF0 */ addiu $s1, %lo(D_8011AEF0) # addiu $s1, $s1, -0x5110 +/* 01B584 8001A984 3C118012 */ lui $s1, %hi(playerCount) # $s1, 0x8012 +/* 01B588 8001A988 2631AEF0 */ addiu $s1, %lo(playerCount) # addiu $s1, $s1, -0x5110 /* 01B58C 8001A98C 8E2B0000 */ lw $t3, ($s1) /* 01B590 8001A990 00008025 */ move $s0, $zero /* 01B594 8001A994 19600029 */ blez $t3, .L8001AA3C /* 01B598 8001A998 00001825 */ move $v1, $zero .L8001A99C: -/* 01B59C 8001A99C 3C0C8012 */ lui $t4, %hi(D_8011AEE4) # $t4, 0x8012 -/* 01B5A0 8001A9A0 8D8CAEE4 */ lw $t4, %lo(D_8011AEE4)($t4) +/* 01B59C 8001A99C 3C0C8012 */ lui $t4, %hi(playerStructArray_Ptr) # $t4, 0x8012 +/* 01B5A0 8001A9A0 8D8CAEE4 */ lw $t4, %lo(playerStructArray_Ptr)($t4) /* 01B5A4 8001A9A4 2401FFFF */ li $at, -1 /* 01B5A8 8001A9A8 01836821 */ addu $t5, $t4, $v1 /* 01B5AC 8001A9AC 8DAE0000 */ lw $t6, ($t5) @@ -89,19 +89,19 @@ glabel func_8001A8F4 /* 01B638 8001AA38 24630004 */ addiu $v1, $v1, 4 .L8001AA3C: /* 01B63C 8001AA3C 8FA30030 */ lw $v1, 0x30($sp) -/* 01B640 8001AA40 3C028012 */ lui $v0, %hi(D_8011AEE4) # $v0, 0x8012 -/* 01B644 8001AA44 8C42AEE4 */ lw $v0, %lo(D_8011AEE4)($v0) +/* 01B640 8001AA40 3C028012 */ lui $v0, %hi(playerStructArray_Ptr) # $v0, 0x8012 +/* 01B644 8001AA44 8C42AEE4 */ lw $v0, %lo(playerStructArray_Ptr)($v0) /* 01B648 8001AA48 00034880 */ sll $t1, $v1, 2 /* 01B64C 8001AA4C 00495021 */ addu $t2, $v0, $t1 /* 01B650 8001AA50 8D4B0000 */ lw $t3, ($t2) /* 01B654 8001AA54 8C460000 */ lw $a2, ($v0) -/* 01B658 8001AA58 3C0C8012 */ lui $t4, %hi(D_8011AEE4) # $t4, 0x8012 +/* 01B658 8001AA58 3C0C8012 */ lui $t4, %hi(playerStructArray_Ptr) # $t4, 0x8012 /* 01B65C 8001AA5C AC4B0000 */ sw $t3, ($v0) -/* 01B660 8001AA60 8D8CAEE4 */ lw $t4, %lo(D_8011AEE4)($t4) -/* 01B664 8001AA64 3C0E8012 */ lui $t6, %hi(D_8011AEE4) # $t6, 0x8012 +/* 01B660 8001AA60 8D8CAEE4 */ lw $t4, %lo(playerStructArray_Ptr)($t4) +/* 01B664 8001AA64 3C0E8012 */ lui $t6, %hi(playerStructArray_Ptr) # $t6, 0x8012 /* 01B668 8001AA68 01896821 */ addu $t5, $t4, $t1 /* 01B66C 8001AA6C ADA60000 */ sw $a2, ($t5) -/* 01B670 8001AA70 8DCEAEE4 */ lw $t6, %lo(D_8011AEE4)($t6) +/* 01B670 8001AA70 8DCEAEE4 */ lw $t6, %lo(playerStructArray_Ptr)($t6) /* 01B674 8001AA74 00000000 */ nop /* 01B678 8001AA78 8DC40000 */ lw $a0, ($t6) /* 01B67C 8001AA7C 0C001AB2 */ jal func_80006AC8 @@ -120,8 +120,8 @@ glabel func_8001A8F4 /* 01B6B0 8001AAB0 00002025 */ move $a0, $zero /* 01B6B4 8001AAB4 0C01994B */ jal func_8006652C /* 01B6B8 8001AAB8 00002025 */ move $a0, $zero -/* 01B6BC 8001AABC 3C0F8012 */ lui $t7, %hi(D_8011AEE4) # $t7, 0x8012 -/* 01B6C0 8001AAC0 8DEFAEE4 */ lw $t7, %lo(D_8011AEE4)($t7) +/* 01B6BC 8001AABC 3C0F8012 */ lui $t7, %hi(playerStructArray_Ptr) # $t7, 0x8012 +/* 01B6C0 8001AAC0 8DEFAEE4 */ lw $t7, %lo(playerStructArray_Ptr)($t7) /* 01B6C4 8001AAC4 3C078012 */ lui $a3, %hi(D_8011AEEC) # $a3, 0x8012 /* 01B6C8 8001AAC8 24E7AEEC */ addiu $a3, %lo(D_8011AEEC) # addiu $a3, $a3, -0x5114 /* 01B6CC 8001AACC 8CE40000 */ lw $a0, ($a3) @@ -153,10 +153,10 @@ glabel func_8001A8F4 /* 01B730 8001AB30 A02AAD50 */ sb $t2, %lo(D_8011AD50)($at) /* 01B734 8001AB34 24020001 */ li $v0, 1 .L8001AB38: -/* 01B738 8001AB38 3C118012 */ lui $s1, %hi(D_8011AEF0) # $s1, 0x8012 +/* 01B738 8001AB38 3C118012 */ lui $s1, %hi(playerCount) # $s1, 0x8012 /* 01B73C 8001AB3C 24010001 */ li $at, 1 /* 01B740 8001AB40 14410055 */ bne $v0, $at, .L8001AC98 -/* 01B744 8001AB44 2631AEF0 */ addiu $s1, %lo(D_8011AEF0) # addiu $s1, $s1, -0x5110 +/* 01B744 8001AB44 2631AEF0 */ addiu $s1, %lo(playerCount) # addiu $s1, $s1, -0x5110 /* 01B748 8001AB48 0C02AC75 */ jal func_800AB1D4 /* 01B74C 8001AB4C 00002025 */ move $a0, $zero /* 01B750 8001AB50 3C078012 */ lui $a3, %hi(D_8011AD51) # $a3, 0x8012 @@ -173,8 +173,8 @@ glabel func_8001A8F4 /* 01B77C 8001AB7C 00008025 */ move $s0, $zero /* 01B780 8001AB80 18800015 */ blez $a0, .L8001ABD8 /* 01B784 8001AB84 3C058012 */ lui $a1, %hi(D_8011AEE8) # $a1, 0x8012 -/* 01B788 8001AB88 3C0D8012 */ lui $t5, %hi(D_8011AEE4) # $t5, 0x8012 -/* 01B78C 8001AB8C 8DADAEE4 */ lw $t5, %lo(D_8011AEE4)($t5) +/* 01B788 8001AB88 3C0D8012 */ lui $t5, %hi(playerStructArray_Ptr) # $t5, 0x8012 +/* 01B78C 8001AB8C 8DADAEE4 */ lw $t5, %lo(playerStructArray_Ptr)($t5) /* 01B790 8001AB90 24A5AEE8 */ addiu $a1, %lo(D_8011AEE8) # addiu $a1, $a1, -0x5118 /* 01B794 8001AB94 8CA20000 */ lw $v0, ($a1) /* 01B798 8001AB98 00067080 */ sll $t6, $a2, 2 @@ -219,18 +219,18 @@ glabel func_8001A8F4 /* 01B828 8001AC28 80E60000 */ lb $a2, ($a3) /* 01B82C 8001AC2C 00000000 */ nop .L8001AC30: -/* 01B830 8001AC30 3C188012 */ lui $t8, %hi(D_8011AEE4) # $t8, 0x8012 -/* 01B834 8001AC34 8F18AEE4 */ lw $t8, %lo(D_8011AEE4)($t8) +/* 01B830 8001AC30 3C188012 */ lui $t8, %hi(playerStructArray_Ptr) # $t8, 0x8012 +/* 01B834 8001AC34 8F18AEE4 */ lw $t8, %lo(playerStructArray_Ptr)($t8) /* 01B838 8001AC38 0006C880 */ sll $t9, $a2, 2 /* 01B83C 8001AC3C 03194821 */ addu $t1, $t8, $t9 /* 01B840 8001AC40 8D240000 */ lw $a0, ($t1) -/* 01B844 8001AC44 0C003FEE */ jal func_8000FFB8 +/* 01B844 8001AC44 0C003FEE */ jal particlePtrList_addObject /* 01B848 8001AC48 00000000 */ nop /* 01B84C 8001AC4C 3C078012 */ lui $a3, %hi(D_8011AD51) # $a3, 0x8012 /* 01B850 8001AC50 24E7AD51 */ addiu $a3, %lo(D_8011AD51) # addiu $a3, $a3, -0x52af /* 01B854 8001AC54 80EB0000 */ lb $t3, ($a3) -/* 01B858 8001AC58 3C0A8012 */ lui $t2, %hi(D_8011AEE4) # $t2, 0x8012 -/* 01B85C 8001AC5C 8D4AAEE4 */ lw $t2, %lo(D_8011AEE4)($t2) +/* 01B858 8001AC58 3C0A8012 */ lui $t2, %hi(playerStructArray_Ptr) # $t2, 0x8012 +/* 01B85C 8001AC5C 8D4AAEE4 */ lw $t2, %lo(playerStructArray_Ptr)($t2) /* 01B860 8001AC60 000B6080 */ sll $t4, $t3, 2 /* 01B864 8001AC64 014C6821 */ addu $t5, $t2, $t4 /* 01B868 8001AC68 ADA00000 */ sw $zero, ($t5) @@ -250,8 +250,8 @@ glabel func_8001A8F4 /* 01B898 8001AC98 24010002 */ li $at, 2 .L8001AC9C: /* 01B89C 8001AC9C 14410016 */ bne $v0, $at, .L8001ACF8 -/* 01B8A0 8001ACA0 3C198012 */ lui $t9, %hi(D_8011AEE4) # $t9, 0x8012 -/* 01B8A4 8001ACA4 8F39AEE4 */ lw $t9, %lo(D_8011AEE4)($t9) +/* 01B8A0 8001ACA0 3C198012 */ lui $t9, %hi(playerStructArray_Ptr) # $t9, 0x8012 +/* 01B8A4 8001ACA4 8F39AEE4 */ lw $t9, %lo(playerStructArray_Ptr)($t9) /* 01B8A8 8001ACA8 00000000 */ nop /* 01B8AC 8001ACAC 8F240000 */ lw $a0, ($t9) /* 01B8B0 8001ACB0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001AE64.s b/asm/non_matchings/unknown_00BC20/func_8001AE64.s index 90553d2b..1de67a21 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001AE64.s +++ b/asm/non_matchings/unknown_00BC20/func_8001AE64.s @@ -11,9 +11,9 @@ glabel func_8001AE64 /* 01BA88 8001AE88 A0400115 */ sb $zero, 0x115($v0) /* 01BA8C 8001AE8C 3C0E8012 */ lui $t6, %hi(D_8011AEE8) # $t6, 0x8012 /* 01BA90 8001AE90 8DCEAEE8 */ lw $t6, %lo(D_8011AEE8)($t6) -/* 01BA94 8001AE94 3C198012 */ lui $t9, %hi(D_8011AEF0) # $t9, 0x8012 +/* 01BA94 8001AE94 3C198012 */ lui $t9, %hi(playerCount) # $t9, 0x8012 /* 01BA98 8001AE98 8DCF0000 */ lw $t7, ($t6) -/* 01BA9C 8001AE9C 8F39AEF0 */ lw $t9, %lo(D_8011AEF0)($t9) +/* 01BA9C 8001AE9C 8F39AEF0 */ lw $t9, %lo(playerCount)($t9) /* 01BAA0 8001AEA0 8DF80064 */ lw $t8, 0x64($t7) /* 01BAA4 8001AEA4 00404025 */ move $t0, $v0 /* 01BAA8 8001AEA8 34108CA1 */ li $s0, 36001 @@ -109,8 +109,8 @@ glabel func_8001AE64 /* 01BC00 8001B000 A1190114 */ sb $t9, 0x114($t0) /* 01BC04 8001B004 AFA70034 */ sw $a3, 0x34($sp) .L8001B008: -/* 01BC08 8001B008 3C0E8012 */ lui $t6, %hi(D_8011AEF0) # $t6, 0x8012 -/* 01BC0C 8001B00C 8DCEAEF0 */ lw $t6, %lo(D_8011AEF0)($t6) +/* 01BC08 8001B008 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012 +/* 01BC0C 8001B00C 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6) /* 01BC10 8001B010 25AD0001 */ addiu $t5, $t5, 1 /* 01BC14 8001B014 01AE082A */ slt $at, $t5, $t6 /* 01BC18 8001B018 1420FFA9 */ bnez $at, .L8001AEC0 diff --git a/asm/non_matchings/unknown_00BC20/func_8001B7A8.s b/asm/non_matchings/unknown_00BC20/func_8001B7A8.s index ed1ec67e..6910eba0 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B7A8.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B7A8.s @@ -3,12 +3,12 @@ glabel func_8001B7A8 /* 01C3AC 8001B7AC AFBF0014 */ sw $ra, 0x14($sp) /* 01C3B0 8001B7B0 AFA60028 */ sw $a2, 0x28($sp) /* 01C3B4 8001B7B4 848E01AA */ lh $t6, 0x1aa($a0) -/* 01C3B8 8001B7B8 3C0F8012 */ lui $t7, %hi(D_8011AEF0) # $t7, 0x8012 +/* 01C3B8 8001B7B8 3C0F8012 */ lui $t7, %hi(playerCount) # $t7, 0x8012 /* 01C3BC 8001B7BC 01C52823 */ subu $a1, $t6, $a1 /* 01C3C0 8001B7C0 24A5FFFF */ addiu $a1, $a1, -1 /* 01C3C4 8001B7C4 04A00006 */ bltz $a1, .L8001B7E0 /* 01C3C8 8001B7C8 00000000 */ nop -/* 01C3CC 8001B7CC 8DEFAEF0 */ lw $t7, %lo(D_8011AEF0)($t7) +/* 01C3CC 8001B7CC 8DEFAEF0 */ lw $t7, %lo(playerCount)($t7) /* 01C3D0 8001B7D0 3C188012 */ lui $t8, %hi(D_8011AEE8) # $t8, 0x8012 /* 01C3D4 8001B7D4 00AF082A */ slt $at, $a1, $t7 /* 01C3D8 8001B7D8 14200003 */ bnez $at, .L8001B7E8 diff --git a/asm/non_matchings/unknown_00BC20/func_8001B834.s b/asm/non_matchings/unknown_00BC20/func_8001B834.s index 17c03100..d3d0e87c 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B834.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B834.s @@ -80,53 +80,3 @@ glabel func_8001B834 /* 01C548 8001B948 46001006 */ mov.s $f0, $f2 /* 01C54C 8001B94C 03E00008 */ jr $ra /* 01C550 8001B950 00000000 */ nop - -/* 01C554 8001B954 3C028012 */ lui $v0, %hi(D_8011AED0) # $v0, 0x8012 -/* 01C558 8001B958 8C42AED0 */ lw $v0, %lo(D_8011AED0)($v0) -/* 01C55C 8001B95C 00000000 */ nop -/* 01C560 8001B960 1C400004 */ bgtz $v0, .L8001B974 -/* 01C564 8001B964 00000000 */ nop -/* 01C568 8001B968 44800000 */ mtc1 $zero, $f0 -/* 01C56C 8001B96C 03E00008 */ jr $ra -/* 01C570 8001B970 00000000 */ nop - -.L8001B974: -/* 01C574 8001B974 80850192 */ lb $a1, 0x192($a0) -/* 01C578 8001B978 44801000 */ mtc1 $zero, $f2 -/* 01C57C 8001B97C 00A2082A */ slt $at, $a1, $v0 -/* 01C580 8001B980 1020000D */ beqz $at, .L8001B9B8 -/* 01C584 8001B984 00A01825 */ move $v1, $a1 -/* 01C588 8001B988 3C0E8012 */ lui $t6, %hi(D_8011AECC) # $t6, 0x8012 -/* 01C58C 8001B98C 00037900 */ sll $t7, $v1, 4 -/* 01C590 8001B990 8DCEAECC */ lw $t6, %lo(D_8011AECC)($t6) -/* 01C594 8001B994 01E37823 */ subu $t7, $t7, $v1 -/* 01C598 8001B998 000F7880 */ sll $t7, $t7, 2 -/* 01C59C 8001B99C 01CF3021 */ addu $a2, $t6, $t7 -.L8001B9A0: -/* 01C5A0 8001B9A0 C4C40020 */ lwc1 $f4, 0x20($a2) -/* 01C5A4 8001B9A4 24630001 */ addiu $v1, $v1, 1 -/* 01C5A8 8001B9A8 0062082A */ slt $at, $v1, $v0 -/* 01C5AC 8001B9AC 24C6003C */ addiu $a2, $a2, 0x3c -/* 01C5B0 8001B9B0 1420FFFB */ bnez $at, .L8001B9A0 -/* 01C5B4 8001B9B4 46041080 */ add.s $f2, $f2, $f4 -.L8001B9B8: -/* 01C5B8 8001B9B8 3C068012 */ lui $a2, %hi(D_8011AECC) # $a2, 0x8012 -/* 01C5BC 8001B9BC 24A3FFFF */ addiu $v1, $a1, -1 -/* 01C5C0 8001B9C0 8CC6AECC */ lw $a2, %lo(D_8011AECC)($a2) -/* 01C5C4 8001B9C4 04610003 */ bgez $v1, .L8001B9D4 -/* 01C5C8 8001B9C8 0003C100 */ sll $t8, $v1, 4 -/* 01C5CC 8001B9CC 2443FFFF */ addiu $v1, $v0, -1 -/* 01C5D0 8001B9D0 0003C100 */ sll $t8, $v1, 4 -.L8001B9D4: -/* 01C5D4 8001B9D4 0303C023 */ subu $t8, $t8, $v1 -/* 01C5D8 8001B9D8 0018C080 */ sll $t8, $t8, 2 -/* 01C5DC 8001B9DC 00D8C821 */ addu $t9, $a2, $t8 -/* 01C5E0 8001B9E0 C7260020 */ lwc1 $f6, 0x20($t9) -/* 01C5E4 8001B9E4 C48800A8 */ lwc1 $f8, 0xa8($a0) -/* 01C5E8 8001B9E8 00000000 */ nop -/* 01C5EC 8001B9EC 46083282 */ mul.s $f10, $f6, $f8 -/* 01C5F0 8001B9F0 460A1080 */ add.s $f2, $f2, $f10 -/* 01C5F4 8001B9F4 46001006 */ mov.s $f0, $f2 -/* 01C5F8 8001B9F8 03E00008 */ jr $ra -/* 01C5FC 8001B9FC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_00BC20/func_8001B974.s b/asm/non_matchings/unknown_00BC20/func_8001B974.s new file mode 100644 index 00000000..b64a2a60 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8001B974.s @@ -0,0 +1,49 @@ +glabel func_8001B974 +/* 01C554 8001B954 3C028012 */ lui $v0, %hi(D_8011AED0) # $v0, 0x8012 +/* 01C558 8001B958 8C42AED0 */ lw $v0, %lo(D_8011AED0)($v0) +/* 01C55C 8001B95C 00000000 */ nop +/* 01C560 8001B960 1C400004 */ bgtz $v0, .L8001B974 +/* 01C564 8001B964 00000000 */ nop +/* 01C568 8001B968 44800000 */ mtc1 $zero, $f0 +/* 01C56C 8001B96C 03E00008 */ jr $ra +/* 01C570 8001B970 00000000 */ nop + +.L8001B974: +/* 01C574 8001B974 80850192 */ lb $a1, 0x192($a0) +/* 01C578 8001B978 44801000 */ mtc1 $zero, $f2 +/* 01C57C 8001B97C 00A2082A */ slt $at, $a1, $v0 +/* 01C580 8001B980 1020000D */ beqz $at, .L8001B9B8 +/* 01C584 8001B984 00A01825 */ move $v1, $a1 +/* 01C588 8001B988 3C0E8012 */ lui $t6, %hi(D_8011AECC) # $t6, 0x8012 +/* 01C58C 8001B98C 00037900 */ sll $t7, $v1, 4 +/* 01C590 8001B990 8DCEAECC */ lw $t6, %lo(D_8011AECC)($t6) +/* 01C594 8001B994 01E37823 */ subu $t7, $t7, $v1 +/* 01C598 8001B998 000F7880 */ sll $t7, $t7, 2 +/* 01C59C 8001B99C 01CF3021 */ addu $a2, $t6, $t7 +.L8001B9A0: +/* 01C5A0 8001B9A0 C4C40020 */ lwc1 $f4, 0x20($a2) +/* 01C5A4 8001B9A4 24630001 */ addiu $v1, $v1, 1 +/* 01C5A8 8001B9A8 0062082A */ slt $at, $v1, $v0 +/* 01C5AC 8001B9AC 24C6003C */ addiu $a2, $a2, 0x3c +/* 01C5B0 8001B9B0 1420FFFB */ bnez $at, .L8001B9A0 +/* 01C5B4 8001B9B4 46041080 */ add.s $f2, $f2, $f4 +.L8001B9B8: +/* 01C5B8 8001B9B8 3C068012 */ lui $a2, %hi(D_8011AECC) # $a2, 0x8012 +/* 01C5BC 8001B9BC 24A3FFFF */ addiu $v1, $a1, -1 +/* 01C5C0 8001B9C0 8CC6AECC */ lw $a2, %lo(D_8011AECC)($a2) +/* 01C5C4 8001B9C4 04610003 */ bgez $v1, .L8001B9D4 +/* 01C5C8 8001B9C8 0003C100 */ sll $t8, $v1, 4 +/* 01C5CC 8001B9CC 2443FFFF */ addiu $v1, $v0, -1 +/* 01C5D0 8001B9D0 0003C100 */ sll $t8, $v1, 4 +.L8001B9D4: +/* 01C5D4 8001B9D4 0303C023 */ subu $t8, $t8, $v1 +/* 01C5D8 8001B9D8 0018C080 */ sll $t8, $t8, 2 +/* 01C5DC 8001B9DC 00D8C821 */ addu $t9, $a2, $t8 +/* 01C5E0 8001B9E0 C7260020 */ lwc1 $f6, 0x20($t9) +/* 01C5E4 8001B9E4 C48800A8 */ lwc1 $f8, 0xa8($a0) +/* 01C5E8 8001B9E8 00000000 */ nop +/* 01C5EC 8001B9EC 46083282 */ mul.s $f10, $f6, $f8 +/* 01C5F0 8001B9F0 460A1080 */ add.s $f2, $f2, $f10 +/* 01C5F4 8001B9F4 46001006 */ mov.s $f0, $f2 +/* 01C5F8 8001B9F8 03E00008 */ jr $ra +/* 01C5FC 8001B9FC 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001BB18.s b/asm/non_matchings/unknown_00BC20/func_8001BB18.s index 51f0a428..07f0ff0c 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BB18.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BB18.s @@ -1,6 +1,6 @@ glabel func_8001BB18 -/* 01C718 8001BB18 3C028012 */ lui $v0, %hi(D_8011AEF0) # $v0, 0x8012 -/* 01C71C 8001BB1C 8C42AEF0 */ lw $v0, %lo(D_8011AEF0)($v0) +/* 01C718 8001BB18 3C028012 */ lui $v0, %hi(playerCount) # $v0, 0x8012 +/* 01C71C 8001BB1C 8C42AEF0 */ lw $v0, %lo(playerCount)($v0) /* 01C720 8001BB20 00000000 */ nop /* 01C724 8001BB24 14400003 */ bnez $v0, .L8001BB34 /* 01C728 8001BB28 00000000 */ nop @@ -24,64 +24,3 @@ glabel func_8001BB18 /* 01C75C 8001BB5C 00000000 */ nop /* 01C760 8001BB60 03E00008 */ jr $ra /* 01C764 8001BB64 00000000 */ nop - -/* 01C768 8001BB68 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 01C76C 8001BB6C AFB3002C */ sw $s3, 0x2c($sp) -/* 01C770 8001BB70 AFB20028 */ sw $s2, 0x28($sp) -/* 01C774 8001BB74 00A09025 */ move $s2, $a1 -/* 01C778 8001BB78 00C09825 */ move $s3, $a2 -/* 01C77C 8001BB7C AFBF0034 */ sw $ra, 0x34($sp) -/* 01C780 8001BB80 AFB10024 */ sw $s1, 0x24($sp) -/* 01C784 8001BB84 00808825 */ move $s1, $a0 -/* 01C788 8001BB88 AFB40030 */ sw $s4, 0x30($sp) -/* 01C78C 8001BB8C AFB00020 */ sw $s0, 0x20($sp) -/* 01C790 8001BB90 24060002 */ li $a2, 2 -/* 01C794 8001BB94 0C01ED32 */ jal func_8007B4C8 -/* 01C798 8001BB98 00002825 */ move $a1, $zero -/* 01C79C 8001BB9C 3C148012 */ lui $s4, %hi(D_8011AED0) # $s4, 0x8012 -/* 01C7A0 8001BBA0 2694AED0 */ addiu $s4, %lo(D_8011AED0) # addiu $s4, $s4, -0x5130 -/* 01C7A4 8001BBA4 8E820000 */ lw $v0, ($s4) -/* 01C7A8 8001BBA8 00000000 */ nop -/* 01C7AC 8001BBAC 28410004 */ slti $at, $v0, 4 -/* 01C7B0 8001BBB0 1420001C */ bnez $at, .L8001BC24 -/* 01C7B4 8001BBB4 8FBF0034 */ lw $ra, 0x34($sp) -/* 01C7B8 8001BBB8 1840000D */ blez $v0, .L8001BBF0 -/* 01C7BC 8001BBBC 00008025 */ move $s0, $zero -/* 01C7C0 8001BBC0 02002025 */ move $a0, $s0 -.L8001BBC4: -/* 01C7C4 8001BBC4 00002825 */ move $a1, $zero -/* 01C7C8 8001BBC8 02203025 */ move $a2, $s1 -/* 01C7CC 8001BBCC 02403825 */ move $a3, $s2 -/* 01C7D0 8001BBD0 0C006F10 */ jal func_8001BC40 -/* 01C7D4 8001BBD4 AFB30010 */ sw $s3, 0x10($sp) -/* 01C7D8 8001BBD8 8E820000 */ lw $v0, ($s4) -/* 01C7DC 8001BBDC 26100001 */ addiu $s0, $s0, 1 -/* 01C7E0 8001BBE0 0202082A */ slt $at, $s0, $v0 -/* 01C7E4 8001BBE4 1420FFF7 */ bnez $at, .L8001BBC4 -/* 01C7E8 8001BBE8 02002025 */ move $a0, $s0 -/* 01C7EC 8001BBEC 00008025 */ move $s0, $zero -.L8001BBF0: -/* 01C7F0 8001BBF0 1840000B */ blez $v0, .L8001BC20 -/* 01C7F4 8001BBF4 02002025 */ move $a0, $s0 -.L8001BBF8: -/* 01C7F8 8001BBF8 24050001 */ li $a1, 1 -/* 01C7FC 8001BBFC 02203025 */ move $a2, $s1 -/* 01C800 8001BC00 02403825 */ move $a3, $s2 -/* 01C804 8001BC04 0C006F10 */ jal func_8001BC40 -/* 01C808 8001BC08 AFB30010 */ sw $s3, 0x10($sp) -/* 01C80C 8001BC0C 8E8E0000 */ lw $t6, ($s4) -/* 01C810 8001BC10 26100001 */ addiu $s0, $s0, 1 -/* 01C814 8001BC14 020E082A */ slt $at, $s0, $t6 -/* 01C818 8001BC18 1420FFF7 */ bnez $at, .L8001BBF8 -/* 01C81C 8001BC1C 02002025 */ move $a0, $s0 -.L8001BC20: -/* 01C820 8001BC20 8FBF0034 */ lw $ra, 0x34($sp) -.L8001BC24: -/* 01C824 8001BC24 8FB00020 */ lw $s0, 0x20($sp) -/* 01C828 8001BC28 8FB10024 */ lw $s1, 0x24($sp) -/* 01C82C 8001BC2C 8FB20028 */ lw $s2, 0x28($sp) -/* 01C830 8001BC30 8FB3002C */ lw $s3, 0x2c($sp) -/* 01C834 8001BC34 8FB40030 */ lw $s4, 0x30($sp) -/* 01C838 8001BC38 03E00008 */ jr $ra -/* 01C83C 8001BC3C 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/unknown_00BC20/func_8001BB68.s b/asm/non_matchings/unknown_00BC20/func_8001BB68.s new file mode 100644 index 00000000..176abdd2 --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8001BB68.s @@ -0,0 +1,60 @@ +glabel func_8001BB68 +/* 01C768 8001BB68 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 01C76C 8001BB6C AFB3002C */ sw $s3, 0x2c($sp) +/* 01C770 8001BB70 AFB20028 */ sw $s2, 0x28($sp) +/* 01C774 8001BB74 00A09025 */ move $s2, $a1 +/* 01C778 8001BB78 00C09825 */ move $s3, $a2 +/* 01C77C 8001BB7C AFBF0034 */ sw $ra, 0x34($sp) +/* 01C780 8001BB80 AFB10024 */ sw $s1, 0x24($sp) +/* 01C784 8001BB84 00808825 */ move $s1, $a0 +/* 01C788 8001BB88 AFB40030 */ sw $s4, 0x30($sp) +/* 01C78C 8001BB8C AFB00020 */ sw $s0, 0x20($sp) +/* 01C790 8001BB90 24060002 */ li $a2, 2 +/* 01C794 8001BB94 0C01ED32 */ jal func_8007B4C8 +/* 01C798 8001BB98 00002825 */ move $a1, $zero +/* 01C79C 8001BB9C 3C148012 */ lui $s4, %hi(D_8011AED0) # $s4, 0x8012 +/* 01C7A0 8001BBA0 2694AED0 */ addiu $s4, %lo(D_8011AED0) # addiu $s4, $s4, -0x5130 +/* 01C7A4 8001BBA4 8E820000 */ lw $v0, ($s4) +/* 01C7A8 8001BBA8 00000000 */ nop +/* 01C7AC 8001BBAC 28410004 */ slti $at, $v0, 4 +/* 01C7B0 8001BBB0 1420001C */ bnez $at, .L8001BC24 +/* 01C7B4 8001BBB4 8FBF0034 */ lw $ra, 0x34($sp) +/* 01C7B8 8001BBB8 1840000D */ blez $v0, .L8001BBF0 +/* 01C7BC 8001BBBC 00008025 */ move $s0, $zero +/* 01C7C0 8001BBC0 02002025 */ move $a0, $s0 +.L8001BBC4: +/* 01C7C4 8001BBC4 00002825 */ move $a1, $zero +/* 01C7C8 8001BBC8 02203025 */ move $a2, $s1 +/* 01C7CC 8001BBCC 02403825 */ move $a3, $s2 +/* 01C7D0 8001BBD0 0C006F10 */ jal func_8001BC40 +/* 01C7D4 8001BBD4 AFB30010 */ sw $s3, 0x10($sp) +/* 01C7D8 8001BBD8 8E820000 */ lw $v0, ($s4) +/* 01C7DC 8001BBDC 26100001 */ addiu $s0, $s0, 1 +/* 01C7E0 8001BBE0 0202082A */ slt $at, $s0, $v0 +/* 01C7E4 8001BBE4 1420FFF7 */ bnez $at, .L8001BBC4 +/* 01C7E8 8001BBE8 02002025 */ move $a0, $s0 +/* 01C7EC 8001BBEC 00008025 */ move $s0, $zero +.L8001BBF0: +/* 01C7F0 8001BBF0 1840000B */ blez $v0, .L8001BC20 +/* 01C7F4 8001BBF4 02002025 */ move $a0, $s0 +.L8001BBF8: +/* 01C7F8 8001BBF8 24050001 */ li $a1, 1 +/* 01C7FC 8001BBFC 02203025 */ move $a2, $s1 +/* 01C800 8001BC00 02403825 */ move $a3, $s2 +/* 01C804 8001BC04 0C006F10 */ jal func_8001BC40 +/* 01C808 8001BC08 AFB30010 */ sw $s3, 0x10($sp) +/* 01C80C 8001BC0C 8E8E0000 */ lw $t6, ($s4) +/* 01C810 8001BC10 26100001 */ addiu $s0, $s0, 1 +/* 01C814 8001BC14 020E082A */ slt $at, $s0, $t6 +/* 01C818 8001BC18 1420FFF7 */ bnez $at, .L8001BBF8 +/* 01C81C 8001BC1C 02002025 */ move $a0, $s0 +.L8001BC20: +/* 01C820 8001BC20 8FBF0034 */ lw $ra, 0x34($sp) +.L8001BC24: +/* 01C824 8001BC24 8FB00020 */ lw $s0, 0x20($sp) +/* 01C828 8001BC28 8FB10024 */ lw $s1, 0x24($sp) +/* 01C82C 8001BC2C 8FB20028 */ lw $s2, 0x28($sp) +/* 01C830 8001BC30 8FB3002C */ lw $s3, 0x2c($sp) +/* 01C834 8001BC34 8FB40030 */ lw $s4, 0x30($sp) +/* 01C838 8001BC38 03E00008 */ jr $ra +/* 01C83C 8001BC3C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/unknown_00BC20/func_8001BC54.s b/asm/non_matchings/unknown_00BC20/func_8001BC54.s index f4bbf435..a53d3f2f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BC54.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BC54.s @@ -2,14 +2,14 @@ glabel func_8001BC54 /* 01C854 8001BC54 3C078012 */ lui $a3, %hi(D_8011AEE0) # $a3, 0x8012 /* 01C858 8001BC58 24E7AEE0 */ addiu $a3, %lo(D_8011AEE0) # addiu $a3, $a3, -0x5120 /* 01C85C 8001BC5C ACE00000 */ sw $zero, ($a3) -/* 01C860 8001BC60 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 01C864 8001BC64 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 01C860 8001BC60 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 01C864 8001BC64 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 01C868 8001BC68 00001025 */ move $v0, $zero /* 01C86C 8001BC6C 18600026 */ blez $v1, .L8001BD08 /* 01C870 8001BC70 00002825 */ move $a1, $zero /* 01C874 8001BC74 3C0A8012 */ lui $t2, %hi(D_8011AEDC) # $t2, 0x8012 -/* 01C878 8001BC78 3C088012 */ lui $t0, %hi(D_8011AE58) # $t0, 0x8012 -/* 01C87C 8001BC7C 2508AE58 */ addiu $t0, %lo(D_8011AE58) # addiu $t0, $t0, -0x51a8 +/* 01C878 8001BC78 3C088012 */ lui $t0, %hi(objPtrList) # $t0, 0x8012 +/* 01C87C 8001BC7C 2508AE58 */ addiu $t0, %lo(objPtrList) # addiu $t0, $t0, -0x51a8 /* 01C880 8001BC80 254AAEDC */ addiu $t2, %lo(D_8011AEDC) # addiu $t2, $t2, -0x5124 /* 01C884 8001BC84 2409000A */ li $t1, 10 .L8001BC88: @@ -37,10 +37,10 @@ glabel func_8001BC54 /* 01C8DC 8001BCDC 018D7021 */ addu $t6, $t4, $t5 /* 01C8E0 8001BCE0 ADC40000 */ sw $a0, ($t6) /* 01C8E4 8001BCE4 8CEF0000 */ lw $t7, ($a3) -/* 01C8E8 8001BCE8 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 +/* 01C8E8 8001BCE8 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 /* 01C8EC 8001BCEC 25F80001 */ addiu $t8, $t7, 1 /* 01C8F0 8001BCF0 ACF80000 */ sw $t8, ($a3) -/* 01C8F4 8001BCF4 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 01C8F4 8001BCF4 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 01C8F8 8001BCF8 00000000 */ nop /* 01C8FC 8001BCFC 0043082A */ slt $at, $v0, $v1 .L8001BD00: diff --git a/asm/non_matchings/unknown_00BC20/func_8001BF20.s b/asm/non_matchings/unknown_00BC20/func_8001BF20.s index 7eb6256e..7695645c 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BF20.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BF20.s @@ -26,13 +26,13 @@ glabel func_8001BF20 /* 01CB7C 8001BF7C 2BC10200 */ slti $at, $fp, 0x200 /* 01CB80 8001BF80 1420FFFA */ bnez $at, .L8001BF6C /* 01CB84 8001BF84 AF000000 */ sw $zero, ($t8) -/* 01CB88 8001BF88 3C048012 */ lui $a0, %hi(D_8011AE5C) # $a0, 0x8012 -/* 01CB8C 8001BF8C 8C84AE5C */ lw $a0, %lo(D_8011AE5C)($a0) +/* 01CB88 8001BF88 3C048012 */ lui $a0, %hi(objCount) # $a0, 0x8012 +/* 01CB8C 8001BF8C 8C84AE5C */ lw $a0, %lo(objCount)($a0) /* 01CB90 8001BF90 A7A00186 */ sh $zero, 0x186($sp) /* 01CB94 8001BF94 1880002D */ blez $a0, .L8001C04C /* 01CB98 8001BF98 00003825 */ move $a3, $zero -/* 01CB9C 8001BF9C 3C058012 */ lui $a1, %hi(D_8011AE58) # $a1, 0x8012 -/* 01CBA0 8001BFA0 24A5AE58 */ addiu $a1, %lo(D_8011AE58) # addiu $a1, $a1, -0x51a8 +/* 01CB9C 8001BF9C 3C058012 */ lui $a1, %hi(objPtrList) # $a1, 0x8012 +/* 01CBA0 8001BFA0 24A5AE58 */ addiu $a1, %lo(objPtrList) # addiu $a1, $a1, -0x51a8 /* 01CBA4 8001BFA4 0000F025 */ move $fp, $zero /* 01CBA8 8001BFA8 27B70064 */ addiu $s7, $sp, 0x64 /* 01CBAC 8001BFAC 24060010 */ li $a2, 16 @@ -59,7 +59,7 @@ glabel func_8001BF20 /* 01CBFC 8001BFFC 15E00010 */ bnez $t7, .L8001C040 /* 01CC00 8001C000 0003C880 */ sll $t9, $v1, 2 /* 01CC04 8001C004 8D580000 */ lw $t8, ($t2) -/* 01CC08 8001C008 3C048012 */ lui $a0, %hi(D_8011AE5C) # $a0, 0x8012 +/* 01CC08 8001C008 3C048012 */ lui $a0, %hi(objCount) # $a0, 0x8012 /* 01CC0C 8001C00C 03195821 */ addu $t3, $t8, $t9 /* 01CC10 8001C010 AD730000 */ sw $s3, ($t3) /* 01CC14 8001C014 87AD0186 */ lh $t5, 0x186($sp) @@ -71,7 +71,7 @@ glabel func_8001BF20 /* 01CC2C 8001C02C 31F80003 */ andi $t8, $t7, 3 /* 01CC30 8001C030 A3380000 */ sb $t8, ($t9) /* 01CC34 8001C034 25AB0001 */ addiu $t3, $t5, 1 -/* 01CC38 8001C038 8C84AE5C */ lw $a0, %lo(D_8011AE5C)($a0) +/* 01CC38 8001C038 8C84AE5C */ lw $a0, %lo(objCount)($a0) /* 01CC3C 8001C03C A7AB0186 */ sh $t3, 0x186($sp) .L8001C040: /* 01CC40 8001C040 00E4082A */ slt $at, $a3, $a0 diff --git a/asm/non_matchings/unknown_00BC20/func_8001D258.s b/asm/non_matchings/unknown_00BC20/func_8001D258.s index b294dde0..6726ea7e 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001D258.s +++ b/asm/non_matchings/unknown_00BC20/func_8001D258.s @@ -17,145 +17,3 @@ glabel func_8001D258 /* 01DE94 8001D294 27BD0020 */ addiu $sp, $sp, 0x20 /* 01DE98 8001D298 03E00008 */ jr $ra /* 01DE9C 8001D29C 00000000 */ nop - -/* 01DEA0 8001D2A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 01DEA4 8001D2A4 AFBF0024 */ sw $ra, 0x24($sp) -/* 01DEA8 8001D2A8 AFB10020 */ sw $s1, 0x20($sp) -/* 01DEAC 8001D2AC AFB0001C */ sw $s0, 0x1c($sp) -/* 01DEB0 8001D2B0 AFA70034 */ sw $a3, 0x34($sp) -/* 01DEB4 8001D2B4 8C900054 */ lw $s0, 0x54($a0) -/* 01DEB8 8001D2B8 44856000 */ mtc1 $a1, $f12 -/* 01DEBC 8001D2BC 44867000 */ mtc1 $a2, $f14 -/* 01DEC0 8001D2C0 12000077 */ beqz $s0, .L8001D4A0 -/* 01DEC4 8001D2C4 00808825 */ move $s1, $a0 -/* 01DEC8 8001D2C8 C6040028 */ lwc1 $f4, 0x28($s0) -/* 01DECC 8001D2CC 44801000 */ mtc1 $zero, $f2 -/* 01DED0 8001D2D0 460C2180 */ add.s $f6, $f4, $f12 -/* 01DED4 8001D2D4 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 01DED8 8001D2D8 E6060028 */ swc1 $f6, 0x28($s0) -/* 01DEDC 8001D2DC 8C900054 */ lw $s0, 0x54($a0) -/* 01DEE0 8001D2E0 00000000 */ nop -/* 01DEE4 8001D2E4 C6000028 */ lwc1 $f0, 0x28($s0) -/* 01DEE8 8001D2E8 00000000 */ nop -/* 01DEEC 8001D2EC 4602003C */ c.lt.s $f0, $f2 -/* 01DEF0 8001D2F0 00000000 */ nop -/* 01DEF4 8001D2F4 45000005 */ bc1f .L8001D30C -/* 01DEF8 8001D2F8 00000000 */ nop -/* 01DEFC 8001D2FC E6020028 */ swc1 $f2, 0x28($s0) -/* 01DF00 8001D300 8C900054 */ lw $s0, 0x54($a0) -/* 01DF04 8001D304 1000000B */ b .L8001D334 -/* 01DF08 8001D308 C608002C */ lwc1 $f8, 0x2c($s0) -.L8001D30C: -/* 01DF0C 8001D30C 44816000 */ mtc1 $at, $f12 -/* 01DF10 8001D310 00000000 */ nop -/* 01DF14 8001D314 4600603C */ c.lt.s $f12, $f0 -/* 01DF18 8001D318 00000000 */ nop -/* 01DF1C 8001D31C 45000004 */ bc1f .L8001D330 -/* 01DF20 8001D320 00000000 */ nop -/* 01DF24 8001D324 E60C0028 */ swc1 $f12, 0x28($s0) -/* 01DF28 8001D328 8E300054 */ lw $s0, 0x54($s1) -/* 01DF2C 8001D32C 00000000 */ nop -.L8001D330: -/* 01DF30 8001D330 C608002C */ lwc1 $f8, 0x2c($s0) -.L8001D334: -/* 01DF34 8001D334 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 01DF38 8001D338 460E4280 */ add.s $f10, $f8, $f14 -/* 01DF3C 8001D33C 44818000 */ mtc1 $at, $f16 -/* 01DF40 8001D340 E60A002C */ swc1 $f10, 0x2c($s0) -/* 01DF44 8001D344 8E300054 */ lw $s0, 0x54($s1) -/* 01DF48 8001D348 3C01800E */ lui $at, %hi(D_800E5660) # $at, 0x800e -/* 01DF4C 8001D34C C600002C */ lwc1 $f0, 0x2c($s0) -/* 01DF50 8001D350 00000000 */ nop -/* 01DF54 8001D354 4602003C */ c.lt.s $f0, $f2 -/* 01DF58 8001D358 00000000 */ nop -/* 01DF5C 8001D35C 45000006 */ bc1f .L8001D378 -/* 01DF60 8001D360 00000000 */ nop -/* 01DF64 8001D364 E602002C */ swc1 $f2, 0x2c($s0) -/* 01DF68 8001D368 8E300054 */ lw $s0, 0x54($s1) -/* 01DF6C 8001D36C 00000000 */ nop -/* 01DF70 8001D370 C600002C */ lwc1 $f0, 0x2c($s0) -/* 01DF74 8001D374 00000000 */ nop -.L8001D378: -/* 01DF78 8001D378 4600803E */ c.le.s $f16, $f0 -/* 01DF7C 8001D37C 00000000 */ nop -/* 01DF80 8001D380 45000008 */ bc1f .L8001D3A4 -/* 01DF84 8001D384 00000000 */ nop -/* 01DF88 8001D388 C4325660 */ lwc1 $f18, %lo(D_800E5660)($at) -/* 01DF8C 8001D38C 00000000 */ nop -/* 01DF90 8001D390 E612002C */ swc1 $f18, 0x2c($s0) -/* 01DF94 8001D394 8E300054 */ lw $s0, 0x54($s1) -/* 01DF98 8001D398 00000000 */ nop -/* 01DF9C 8001D39C C600002C */ lwc1 $f0, 0x2c($s0) -/* 01DFA0 8001D3A0 00000000 */ nop -.L8001D3A4: -/* 01DFA4 8001D3A4 86080024 */ lh $t0, 0x24($s0) -/* 01DFA8 8001D3A8 87A9003A */ lh $t1, 0x3a($sp) -/* 01DFAC 8001D3AC 860E0022 */ lh $t6, 0x22($s0) -/* 01DFB0 8001D3B0 8E050028 */ lw $a1, 0x28($s0) -/* 01DFB4 8001D3B4 01095021 */ addu $t2, $t0, $t1 -/* 01DFB8 8001D3B8 87AF0036 */ lh $t7, 0x36($sp) -/* 01DFBC 8001D3BC AFAA0010 */ sw $t2, 0x10($sp) -/* 01DFC0 8001D3C0 860B0026 */ lh $t3, 0x26($s0) -/* 01DFC4 8001D3C4 87AC003E */ lh $t4, 0x3e($sp) -/* 01DFC8 8001D3C8 01CF3821 */ addu $a3, $t6, $t7 -/* 01DFCC 8001D3CC 0007C400 */ sll $t8, $a3, 0x10 -/* 01DFD0 8001D3D0 44060000 */ mfc1 $a2, $f0 -/* 01DFD4 8001D3D4 016C6821 */ addu $t5, $t3, $t4 -/* 01DFD8 8001D3D8 AFAD0014 */ sw $t5, 0x14($sp) -/* 01DFDC 8001D3DC 00183C03 */ sra $a3, $t8, 0x10 -/* 01DFE0 8001D3E0 0C00752D */ jal func_8001D4B4 -/* 01DFE4 8001D3E4 02002025 */ move $a0, $s0 -/* 01DFE8 8001D3E8 8E220040 */ lw $v0, 0x40($s1) -/* 01DFEC 8001D3EC 00000000 */ nop -/* 01DFF0 8001D3F0 904E003D */ lbu $t6, 0x3d($v0) -/* 01DFF4 8001D3F4 00000000 */ nop -/* 01DFF8 8001D3F8 11C0002A */ beqz $t6, .L8001D4A4 -/* 01DFFC 8001D3FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 01E000 8001D400 904F003A */ lbu $t7, 0x3a($v0) -/* 01E004 8001D404 8E380054 */ lw $t8, 0x54($s1) -/* 01E008 8001D408 00000000 */ nop -/* 01E00C 8001D40C A30F0004 */ sb $t7, 4($t8) -/* 01E010 8001D410 8E390040 */ lw $t9, 0x40($s1) -/* 01E014 8001D414 8E290054 */ lw $t1, 0x54($s1) -/* 01E018 8001D418 9328003B */ lbu $t0, 0x3b($t9) -/* 01E01C 8001D41C 00000000 */ nop -/* 01E020 8001D420 A1280005 */ sb $t0, 5($t1) -/* 01E024 8001D424 8E2A0040 */ lw $t2, 0x40($s1) -/* 01E028 8001D428 8E2C0054 */ lw $t4, 0x54($s1) -/* 01E02C 8001D42C 914B003C */ lbu $t3, 0x3c($t2) -/* 01E030 8001D430 00000000 */ nop -/* 01E034 8001D434 A18B0006 */ sb $t3, 6($t4) -/* 01E038 8001D438 8E2D0040 */ lw $t5, 0x40($s1) -/* 01E03C 8001D43C 8E2F0054 */ lw $t7, 0x54($s1) -/* 01E040 8001D440 91AE003D */ lbu $t6, 0x3d($t5) -/* 01E044 8001D444 00000000 */ nop -/* 01E048 8001D448 A1EE0007 */ sb $t6, 7($t7) -/* 01E04C 8001D44C 8E300054 */ lw $s0, 0x54($s1) -/* 01E050 8001D450 00000000 */ nop -/* 01E054 8001D454 8618001C */ lh $t8, 0x1c($s0) -/* 01E058 8001D458 00000000 */ nop -/* 01E05C 8001D45C 0018C843 */ sra $t9, $t8, 1 -/* 01E060 8001D460 00194023 */ negu $t0, $t9 -/* 01E064 8001D464 A6080008 */ sh $t0, 8($s0) -/* 01E068 8001D468 8E300054 */ lw $s0, 0x54($s1) -/* 01E06C 8001D46C 00000000 */ nop -/* 01E070 8001D470 8609001E */ lh $t1, 0x1e($s0) -/* 01E074 8001D474 00000000 */ nop -/* 01E078 8001D478 00095043 */ sra $t2, $t1, 1 -/* 01E07C 8001D47C 000A5823 */ negu $t3, $t2 -/* 01E080 8001D480 A60B000A */ sh $t3, 0xa($s0) -/* 01E084 8001D484 8E300054 */ lw $s0, 0x54($s1) -/* 01E088 8001D488 00000000 */ nop -/* 01E08C 8001D48C 860C0020 */ lh $t4, 0x20($s0) -/* 01E090 8001D490 00000000 */ nop -/* 01E094 8001D494 000C6843 */ sra $t5, $t4, 1 -/* 01E098 8001D498 000D7023 */ negu $t6, $t5 -/* 01E09C 8001D49C A60E000C */ sh $t6, 0xc($s0) -.L8001D4A0: -/* 01E0A0 8001D4A0 8FBF0024 */ lw $ra, 0x24($sp) -.L8001D4A4: -/* 01E0A4 8001D4A4 8FB0001C */ lw $s0, 0x1c($sp) -/* 01E0A8 8001D4A8 8FB10020 */ lw $s1, 0x20($sp) -/* 01E0AC 8001D4AC 03E00008 */ jr $ra -/* 01E0B0 8001D4B0 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/unknown_00BC20/func_8001D2A0.s b/asm/non_matchings/unknown_00BC20/func_8001D2A0.s new file mode 100644 index 00000000..1d051d0c --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8001D2A0.s @@ -0,0 +1,141 @@ +glabel func_8001D2A0 +/* 01DEA0 8001D2A0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 01DEA4 8001D2A4 AFBF0024 */ sw $ra, 0x24($sp) +/* 01DEA8 8001D2A8 AFB10020 */ sw $s1, 0x20($sp) +/* 01DEAC 8001D2AC AFB0001C */ sw $s0, 0x1c($sp) +/* 01DEB0 8001D2B0 AFA70034 */ sw $a3, 0x34($sp) +/* 01DEB4 8001D2B4 8C900054 */ lw $s0, 0x54($a0) +/* 01DEB8 8001D2B8 44856000 */ mtc1 $a1, $f12 +/* 01DEBC 8001D2BC 44867000 */ mtc1 $a2, $f14 +/* 01DEC0 8001D2C0 12000077 */ beqz $s0, .L8001D4A0 +/* 01DEC4 8001D2C4 00808825 */ move $s1, $a0 +/* 01DEC8 8001D2C8 C6040028 */ lwc1 $f4, 0x28($s0) +/* 01DECC 8001D2CC 44801000 */ mtc1 $zero, $f2 +/* 01DED0 8001D2D0 460C2180 */ add.s $f6, $f4, $f12 +/* 01DED4 8001D2D4 3C013F80 */ li $at, 0x3F800000 # 1.000000 +/* 01DED8 8001D2D8 E6060028 */ swc1 $f6, 0x28($s0) +/* 01DEDC 8001D2DC 8C900054 */ lw $s0, 0x54($a0) +/* 01DEE0 8001D2E0 00000000 */ nop +/* 01DEE4 8001D2E4 C6000028 */ lwc1 $f0, 0x28($s0) +/* 01DEE8 8001D2E8 00000000 */ nop +/* 01DEEC 8001D2EC 4602003C */ c.lt.s $f0, $f2 +/* 01DEF0 8001D2F0 00000000 */ nop +/* 01DEF4 8001D2F4 45000005 */ bc1f .L8001D30C +/* 01DEF8 8001D2F8 00000000 */ nop +/* 01DEFC 8001D2FC E6020028 */ swc1 $f2, 0x28($s0) +/* 01DF00 8001D300 8C900054 */ lw $s0, 0x54($a0) +/* 01DF04 8001D304 1000000B */ b .L8001D334 +/* 01DF08 8001D308 C608002C */ lwc1 $f8, 0x2c($s0) +.L8001D30C: +/* 01DF0C 8001D30C 44816000 */ mtc1 $at, $f12 +/* 01DF10 8001D310 00000000 */ nop +/* 01DF14 8001D314 4600603C */ c.lt.s $f12, $f0 +/* 01DF18 8001D318 00000000 */ nop +/* 01DF1C 8001D31C 45000004 */ bc1f .L8001D330 +/* 01DF20 8001D320 00000000 */ nop +/* 01DF24 8001D324 E60C0028 */ swc1 $f12, 0x28($s0) +/* 01DF28 8001D328 8E300054 */ lw $s0, 0x54($s1) +/* 01DF2C 8001D32C 00000000 */ nop +.L8001D330: +/* 01DF30 8001D330 C608002C */ lwc1 $f8, 0x2c($s0) +.L8001D334: +/* 01DF34 8001D334 3C014000 */ li $at, 0x40000000 # 2.000000 +/* 01DF38 8001D338 460E4280 */ add.s $f10, $f8, $f14 +/* 01DF3C 8001D33C 44818000 */ mtc1 $at, $f16 +/* 01DF40 8001D340 E60A002C */ swc1 $f10, 0x2c($s0) +/* 01DF44 8001D344 8E300054 */ lw $s0, 0x54($s1) +/* 01DF48 8001D348 3C01800E */ lui $at, %hi(D_800E5660) # $at, 0x800e +/* 01DF4C 8001D34C C600002C */ lwc1 $f0, 0x2c($s0) +/* 01DF50 8001D350 00000000 */ nop +/* 01DF54 8001D354 4602003C */ c.lt.s $f0, $f2 +/* 01DF58 8001D358 00000000 */ nop +/* 01DF5C 8001D35C 45000006 */ bc1f .L8001D378 +/* 01DF60 8001D360 00000000 */ nop +/* 01DF64 8001D364 E602002C */ swc1 $f2, 0x2c($s0) +/* 01DF68 8001D368 8E300054 */ lw $s0, 0x54($s1) +/* 01DF6C 8001D36C 00000000 */ nop +/* 01DF70 8001D370 C600002C */ lwc1 $f0, 0x2c($s0) +/* 01DF74 8001D374 00000000 */ nop +.L8001D378: +/* 01DF78 8001D378 4600803E */ c.le.s $f16, $f0 +/* 01DF7C 8001D37C 00000000 */ nop +/* 01DF80 8001D380 45000008 */ bc1f .L8001D3A4 +/* 01DF84 8001D384 00000000 */ nop +/* 01DF88 8001D388 C4325660 */ lwc1 $f18, %lo(D_800E5660)($at) +/* 01DF8C 8001D38C 00000000 */ nop +/* 01DF90 8001D390 E612002C */ swc1 $f18, 0x2c($s0) +/* 01DF94 8001D394 8E300054 */ lw $s0, 0x54($s1) +/* 01DF98 8001D398 00000000 */ nop +/* 01DF9C 8001D39C C600002C */ lwc1 $f0, 0x2c($s0) +/* 01DFA0 8001D3A0 00000000 */ nop +.L8001D3A4: +/* 01DFA4 8001D3A4 86080024 */ lh $t0, 0x24($s0) +/* 01DFA8 8001D3A8 87A9003A */ lh $t1, 0x3a($sp) +/* 01DFAC 8001D3AC 860E0022 */ lh $t6, 0x22($s0) +/* 01DFB0 8001D3B0 8E050028 */ lw $a1, 0x28($s0) +/* 01DFB4 8001D3B4 01095021 */ addu $t2, $t0, $t1 +/* 01DFB8 8001D3B8 87AF0036 */ lh $t7, 0x36($sp) +/* 01DFBC 8001D3BC AFAA0010 */ sw $t2, 0x10($sp) +/* 01DFC0 8001D3C0 860B0026 */ lh $t3, 0x26($s0) +/* 01DFC4 8001D3C4 87AC003E */ lh $t4, 0x3e($sp) +/* 01DFC8 8001D3C8 01CF3821 */ addu $a3, $t6, $t7 +/* 01DFCC 8001D3CC 0007C400 */ sll $t8, $a3, 0x10 +/* 01DFD0 8001D3D0 44060000 */ mfc1 $a2, $f0 +/* 01DFD4 8001D3D4 016C6821 */ addu $t5, $t3, $t4 +/* 01DFD8 8001D3D8 AFAD0014 */ sw $t5, 0x14($sp) +/* 01DFDC 8001D3DC 00183C03 */ sra $a3, $t8, 0x10 +/* 01DFE0 8001D3E0 0C00752D */ jal func_8001D4B4 +/* 01DFE4 8001D3E4 02002025 */ move $a0, $s0 +/* 01DFE8 8001D3E8 8E220040 */ lw $v0, 0x40($s1) +/* 01DFEC 8001D3EC 00000000 */ nop +/* 01DFF0 8001D3F0 904E003D */ lbu $t6, 0x3d($v0) +/* 01DFF4 8001D3F4 00000000 */ nop +/* 01DFF8 8001D3F8 11C0002A */ beqz $t6, .L8001D4A4 +/* 01DFFC 8001D3FC 8FBF0024 */ lw $ra, 0x24($sp) +/* 01E000 8001D400 904F003A */ lbu $t7, 0x3a($v0) +/* 01E004 8001D404 8E380054 */ lw $t8, 0x54($s1) +/* 01E008 8001D408 00000000 */ nop +/* 01E00C 8001D40C A30F0004 */ sb $t7, 4($t8) +/* 01E010 8001D410 8E390040 */ lw $t9, 0x40($s1) +/* 01E014 8001D414 8E290054 */ lw $t1, 0x54($s1) +/* 01E018 8001D418 9328003B */ lbu $t0, 0x3b($t9) +/* 01E01C 8001D41C 00000000 */ nop +/* 01E020 8001D420 A1280005 */ sb $t0, 5($t1) +/* 01E024 8001D424 8E2A0040 */ lw $t2, 0x40($s1) +/* 01E028 8001D428 8E2C0054 */ lw $t4, 0x54($s1) +/* 01E02C 8001D42C 914B003C */ lbu $t3, 0x3c($t2) +/* 01E030 8001D430 00000000 */ nop +/* 01E034 8001D434 A18B0006 */ sb $t3, 6($t4) +/* 01E038 8001D438 8E2D0040 */ lw $t5, 0x40($s1) +/* 01E03C 8001D43C 8E2F0054 */ lw $t7, 0x54($s1) +/* 01E040 8001D440 91AE003D */ lbu $t6, 0x3d($t5) +/* 01E044 8001D444 00000000 */ nop +/* 01E048 8001D448 A1EE0007 */ sb $t6, 7($t7) +/* 01E04C 8001D44C 8E300054 */ lw $s0, 0x54($s1) +/* 01E050 8001D450 00000000 */ nop +/* 01E054 8001D454 8618001C */ lh $t8, 0x1c($s0) +/* 01E058 8001D458 00000000 */ nop +/* 01E05C 8001D45C 0018C843 */ sra $t9, $t8, 1 +/* 01E060 8001D460 00194023 */ negu $t0, $t9 +/* 01E064 8001D464 A6080008 */ sh $t0, 8($s0) +/* 01E068 8001D468 8E300054 */ lw $s0, 0x54($s1) +/* 01E06C 8001D46C 00000000 */ nop +/* 01E070 8001D470 8609001E */ lh $t1, 0x1e($s0) +/* 01E074 8001D474 00000000 */ nop +/* 01E078 8001D478 00095043 */ sra $t2, $t1, 1 +/* 01E07C 8001D47C 000A5823 */ negu $t3, $t2 +/* 01E080 8001D480 A60B000A */ sh $t3, 0xa($s0) +/* 01E084 8001D484 8E300054 */ lw $s0, 0x54($s1) +/* 01E088 8001D488 00000000 */ nop +/* 01E08C 8001D48C 860C0020 */ lh $t4, 0x20($s0) +/* 01E090 8001D490 00000000 */ nop +/* 01E094 8001D494 000C6843 */ sra $t5, $t4, 1 +/* 01E098 8001D498 000D7023 */ negu $t6, $t5 +/* 01E09C 8001D49C A60E000C */ sh $t6, 0xc($s0) +.L8001D4A0: +/* 01E0A0 8001D4A0 8FBF0024 */ lw $ra, 0x24($sp) +.L8001D4A4: +/* 01E0A4 8001D4A4 8FB0001C */ lw $s0, 0x1c($sp) +/* 01E0A8 8001D4A8 8FB10020 */ lw $s1, 0x20($sp) +/* 01E0AC 8001D4AC 03E00008 */ jr $ra +/* 01E0B0 8001D4B0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/unknown_00BC20/func_8001DD54.s b/asm/non_matchings/unknown_00BC20/func_8001DD54.s index e1afa9e9..f40b5b55 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001DD54.s +++ b/asm/non_matchings/unknown_00BC20/func_8001DD54.s @@ -267,97 +267,3 @@ glabel func_8001DD54 /* 01ED30 8001E130 8FBE0038 */ lw $fp, 0x38($sp) /* 01ED34 8001E134 03E00008 */ jr $ra /* 01ED38 8001E138 27BD0118 */ addiu $sp, $sp, 0x118 - -/* 01ED3C 8001E13C 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 01ED40 8001E140 3C0B8012 */ lui $t3, %hi(D_8011AE5C) # $t3, 0x8012 -/* 01ED44 8001E144 256BAE5C */ addiu $t3, %lo(D_8011AE5C) # addiu $t3, $t3, -0x51a4 -/* 01ED48 8001E148 AFB00008 */ sw $s0, 8($sp) -/* 01ED4C 8001E14C 8D630000 */ lw $v1, ($t3) -/* 01ED50 8001E150 00048400 */ sll $s0, $a0, 0x10 -/* 01ED54 8001E154 00107403 */ sra $t6, $s0, 0x10 -/* 01ED58 8001E158 AFB1000C */ sw $s1, 0xc($sp) -/* 01ED5C 8001E15C 00A08825 */ move $s1, $a1 -/* 01ED60 8001E160 01C08025 */ move $s0, $t6 -/* 01ED64 8001E164 AFA40010 */ sw $a0, 0x10($sp) -/* 01ED68 8001E168 18600048 */ blez $v1, .L8001E28C -/* 01ED6C 8001E16C 00001025 */ move $v0, $zero -/* 01ED70 8001E170 3C0C8012 */ lui $t4, %hi(D_8011AE58) # $t4, 0x8012 -/* 01ED74 8001E174 8FAA0028 */ lw $t2, 0x28($sp) -/* 01ED78 8001E178 8FA90024 */ lw $t1, 0x24($sp) -/* 01ED7C 8001E17C 8FA80020 */ lw $t0, 0x20($sp) -/* 01ED80 8001E180 258CAE58 */ addiu $t4, %lo(D_8011AE58) # addiu $t4, $t4, -0x51a8 -/* 01ED84 8001E184 240D0001 */ li $t5, 1 -.L8001E188: -/* 01ED88 8001E188 8D8F0000 */ lw $t7, ($t4) -/* 01ED8C 8001E18C 0002C080 */ sll $t8, $v0, 2 -/* 01ED90 8001E190 01F8C821 */ addu $t9, $t7, $t8 -/* 01ED94 8001E194 8F240000 */ lw $a0, ($t9) -/* 01ED98 8001E198 00000000 */ nop -/* 01ED9C 8001E19C 848E0006 */ lh $t6, 6($a0) -/* 01EDA0 8001E1A0 00000000 */ nop -/* 01EDA4 8001E1A4 31CF8000 */ andi $t7, $t6, 0x8000 -/* 01EDA8 8001E1A8 15E00034 */ bnez $t7, .L8001E27C -/* 01EDAC 8001E1AC 00000000 */ nop -/* 01EDB0 8001E1B0 84980048 */ lh $t8, 0x48($a0) -/* 01EDB4 8001E1B4 00000000 */ nop -/* 01EDB8 8001E1B8 15B80030 */ bne $t5, $t8, .L8001E27C -/* 01EDBC 8001E1BC 00000000 */ nop -/* 01EDC0 8001E1C0 8C850064 */ lw $a1, 0x64($a0) -/* 01EDC4 8001E1C4 00000000 */ nop -/* 01EDC8 8001E1C8 84B90000 */ lh $t9, ($a1) -/* 01EDCC 8001E1CC 00000000 */ nop -/* 01EDD0 8001E1D0 1619002B */ bne $s0, $t9, .L8001E280 -/* 01EDD4 8001E1D4 24420001 */ addiu $v0, $v0, 1 -/* 01EDD8 8001E1D8 444EF800 */ cfc1 $t6, $31 -/* 01EDDC 8001E1DC C484000C */ lwc1 $f4, 0xc($a0) -/* 01EDE0 8001E1E0 35C10003 */ ori $at, $t6, 3 -/* 01EDE4 8001E1E4 38210002 */ xori $at, $at, 2 -/* 01EDE8 8001E1E8 44C1F800 */ ctc1 $at, $31 -/* 01EDEC 8001E1EC 00000000 */ nop -/* 01EDF0 8001E1F0 460021A4 */ cvt.w.s $f6, $f4 -/* 01EDF4 8001E1F4 44CEF800 */ ctc1 $t6, $31 -/* 01EDF8 8001E1F8 440F3000 */ mfc1 $t7, $f6 -/* 01EDFC 8001E1FC 00000000 */ nop -/* 01EE00 8001E200 4458F800 */ cfc1 $t8, $31 -/* 01EE04 8001E204 A62F0000 */ sh $t7, ($s1) -/* 01EE08 8001E208 37010003 */ ori $at, $t8, 3 -/* 01EE0C 8001E20C 38210002 */ xori $at, $at, 2 -/* 01EE10 8001E210 44C1F800 */ ctc1 $at, $31 -/* 01EE14 8001E214 C4880010 */ lwc1 $f8, 0x10($a0) -/* 01EE18 8001E218 35C10003 */ ori $at, $t6, 3 -/* 01EE1C 8001E21C 460042A4 */ cvt.w.s $f10, $f8 -/* 01EE20 8001E220 38210002 */ xori $at, $at, 2 -/* 01EE24 8001E224 44195000 */ mfc1 $t9, $f10 -/* 01EE28 8001E228 44D8F800 */ ctc1 $t8, $31 -/* 01EE2C 8001E22C A4D90000 */ sh $t9, ($a2) -/* 01EE30 8001E230 C4900014 */ lwc1 $f16, 0x14($a0) -/* 01EE34 8001E234 44C1F800 */ ctc1 $at, $31 -/* 01EE38 8001E238 00000000 */ nop -/* 01EE3C 8001E23C 460084A4 */ cvt.w.s $f18, $f16 -/* 01EE40 8001E240 440F9000 */ mfc1 $t7, $f18 -/* 01EE44 8001E244 44CEF800 */ ctc1 $t6, $31 -/* 01EE48 8001E248 A4EF0000 */ sh $t7, ($a3) -/* 01EE4C 8001E24C 84980004 */ lh $t8, 4($a0) -/* 01EE50 8001E250 00000000 */ nop -/* 01EE54 8001E254 A5180000 */ sh $t8, ($t0) -/* 01EE58 8001E258 84990002 */ lh $t9, 2($a0) -/* 01EE5C 8001E25C 00000000 */ nop -/* 01EE60 8001E260 A5390000 */ sh $t9, ($t1) -/* 01EE64 8001E264 848E0000 */ lh $t6, ($a0) -/* 01EE68 8001E268 00000000 */ nop -/* 01EE6C 8001E26C A54E0000 */ sh $t6, ($t2) -/* 01EE70 8001E270 8D630000 */ lw $v1, ($t3) -/* 01EE74 8001E274 00000000 */ nop -/* 01EE78 8001E278 00601025 */ move $v0, $v1 -.L8001E27C: -/* 01EE7C 8001E27C 24420001 */ addiu $v0, $v0, 1 -.L8001E280: -/* 01EE80 8001E280 0043082A */ slt $at, $v0, $v1 -/* 01EE84 8001E284 1420FFC0 */ bnez $at, .L8001E188 -/* 01EE88 8001E288 00000000 */ nop -.L8001E28C: -/* 01EE8C 8001E28C 8FB00008 */ lw $s0, 8($sp) -/* 01EE90 8001E290 8FB1000C */ lw $s1, 0xc($sp) -/* 01EE94 8001E294 03E00008 */ jr $ra -/* 01EE98 8001E298 27BD0010 */ addiu $sp, $sp, 0x10 - diff --git a/asm/non_matchings/unknown_00BC20/func_8001E13C.s b/asm/non_matchings/unknown_00BC20/func_8001E13C.s new file mode 100644 index 00000000..24141b8a --- /dev/null +++ b/asm/non_matchings/unknown_00BC20/func_8001E13C.s @@ -0,0 +1,93 @@ +glabel func_8001E13C +/* 01ED3C 8001E13C 27BDFFF0 */ addiu $sp, $sp, -0x10 +/* 01ED40 8001E140 3C0B8012 */ lui $t3, %hi(objCount) # $t3, 0x8012 +/* 01ED44 8001E144 256BAE5C */ addiu $t3, %lo(objCount) # addiu $t3, $t3, -0x51a4 +/* 01ED48 8001E148 AFB00008 */ sw $s0, 8($sp) +/* 01ED4C 8001E14C 8D630000 */ lw $v1, ($t3) +/* 01ED50 8001E150 00048400 */ sll $s0, $a0, 0x10 +/* 01ED54 8001E154 00107403 */ sra $t6, $s0, 0x10 +/* 01ED58 8001E158 AFB1000C */ sw $s1, 0xc($sp) +/* 01ED5C 8001E15C 00A08825 */ move $s1, $a1 +/* 01ED60 8001E160 01C08025 */ move $s0, $t6 +/* 01ED64 8001E164 AFA40010 */ sw $a0, 0x10($sp) +/* 01ED68 8001E168 18600048 */ blez $v1, .L8001E28C +/* 01ED6C 8001E16C 00001025 */ move $v0, $zero +/* 01ED70 8001E170 3C0C8012 */ lui $t4, %hi(objPtrList) # $t4, 0x8012 +/* 01ED74 8001E174 8FAA0028 */ lw $t2, 0x28($sp) +/* 01ED78 8001E178 8FA90024 */ lw $t1, 0x24($sp) +/* 01ED7C 8001E17C 8FA80020 */ lw $t0, 0x20($sp) +/* 01ED80 8001E180 258CAE58 */ addiu $t4, %lo(objPtrList) # addiu $t4, $t4, -0x51a8 +/* 01ED84 8001E184 240D0001 */ li $t5, 1 +.L8001E188: +/* 01ED88 8001E188 8D8F0000 */ lw $t7, ($t4) +/* 01ED8C 8001E18C 0002C080 */ sll $t8, $v0, 2 +/* 01ED90 8001E190 01F8C821 */ addu $t9, $t7, $t8 +/* 01ED94 8001E194 8F240000 */ lw $a0, ($t9) +/* 01ED98 8001E198 00000000 */ nop +/* 01ED9C 8001E19C 848E0006 */ lh $t6, 6($a0) +/* 01EDA0 8001E1A0 00000000 */ nop +/* 01EDA4 8001E1A4 31CF8000 */ andi $t7, $t6, 0x8000 +/* 01EDA8 8001E1A8 15E00034 */ bnez $t7, .L8001E27C +/* 01EDAC 8001E1AC 00000000 */ nop +/* 01EDB0 8001E1B0 84980048 */ lh $t8, 0x48($a0) +/* 01EDB4 8001E1B4 00000000 */ nop +/* 01EDB8 8001E1B8 15B80030 */ bne $t5, $t8, .L8001E27C +/* 01EDBC 8001E1BC 00000000 */ nop +/* 01EDC0 8001E1C0 8C850064 */ lw $a1, 0x64($a0) +/* 01EDC4 8001E1C4 00000000 */ nop +/* 01EDC8 8001E1C8 84B90000 */ lh $t9, ($a1) +/* 01EDCC 8001E1CC 00000000 */ nop +/* 01EDD0 8001E1D0 1619002B */ bne $s0, $t9, .L8001E280 +/* 01EDD4 8001E1D4 24420001 */ addiu $v0, $v0, 1 +/* 01EDD8 8001E1D8 444EF800 */ cfc1 $t6, $31 +/* 01EDDC 8001E1DC C484000C */ lwc1 $f4, 0xc($a0) +/* 01EDE0 8001E1E0 35C10003 */ ori $at, $t6, 3 +/* 01EDE4 8001E1E4 38210002 */ xori $at, $at, 2 +/* 01EDE8 8001E1E8 44C1F800 */ ctc1 $at, $31 +/* 01EDEC 8001E1EC 00000000 */ nop +/* 01EDF0 8001E1F0 460021A4 */ cvt.w.s $f6, $f4 +/* 01EDF4 8001E1F4 44CEF800 */ ctc1 $t6, $31 +/* 01EDF8 8001E1F8 440F3000 */ mfc1 $t7, $f6 +/* 01EDFC 8001E1FC 00000000 */ nop +/* 01EE00 8001E200 4458F800 */ cfc1 $t8, $31 +/* 01EE04 8001E204 A62F0000 */ sh $t7, ($s1) +/* 01EE08 8001E208 37010003 */ ori $at, $t8, 3 +/* 01EE0C 8001E20C 38210002 */ xori $at, $at, 2 +/* 01EE10 8001E210 44C1F800 */ ctc1 $at, $31 +/* 01EE14 8001E214 C4880010 */ lwc1 $f8, 0x10($a0) +/* 01EE18 8001E218 35C10003 */ ori $at, $t6, 3 +/* 01EE1C 8001E21C 460042A4 */ cvt.w.s $f10, $f8 +/* 01EE20 8001E220 38210002 */ xori $at, $at, 2 +/* 01EE24 8001E224 44195000 */ mfc1 $t9, $f10 +/* 01EE28 8001E228 44D8F800 */ ctc1 $t8, $31 +/* 01EE2C 8001E22C A4D90000 */ sh $t9, ($a2) +/* 01EE30 8001E230 C4900014 */ lwc1 $f16, 0x14($a0) +/* 01EE34 8001E234 44C1F800 */ ctc1 $at, $31 +/* 01EE38 8001E238 00000000 */ nop +/* 01EE3C 8001E23C 460084A4 */ cvt.w.s $f18, $f16 +/* 01EE40 8001E240 440F9000 */ mfc1 $t7, $f18 +/* 01EE44 8001E244 44CEF800 */ ctc1 $t6, $31 +/* 01EE48 8001E248 A4EF0000 */ sh $t7, ($a3) +/* 01EE4C 8001E24C 84980004 */ lh $t8, 4($a0) +/* 01EE50 8001E250 00000000 */ nop +/* 01EE54 8001E254 A5180000 */ sh $t8, ($t0) +/* 01EE58 8001E258 84990002 */ lh $t9, 2($a0) +/* 01EE5C 8001E25C 00000000 */ nop +/* 01EE60 8001E260 A5390000 */ sh $t9, ($t1) +/* 01EE64 8001E264 848E0000 */ lh $t6, ($a0) +/* 01EE68 8001E268 00000000 */ nop +/* 01EE6C 8001E26C A54E0000 */ sh $t6, ($t2) +/* 01EE70 8001E270 8D630000 */ lw $v1, ($t3) +/* 01EE74 8001E274 00000000 */ nop +/* 01EE78 8001E278 00601025 */ move $v0, $v1 +.L8001E27C: +/* 01EE7C 8001E27C 24420001 */ addiu $v0, $v0, 1 +.L8001E280: +/* 01EE80 8001E280 0043082A */ slt $at, $v0, $v1 +/* 01EE84 8001E284 1420FFC0 */ bnez $at, .L8001E188 +/* 01EE88 8001E288 00000000 */ nop +.L8001E28C: +/* 01EE8C 8001E28C 8FB00008 */ lw $s0, 8($sp) +/* 01EE90 8001E290 8FB1000C */ lw $s1, 0xc($sp) +/* 01EE94 8001E294 03E00008 */ jr $ra +/* 01EE98 8001E298 27BD0010 */ addiu $sp, $sp, 0x10 diff --git a/asm/non_matchings/unknown_00BC20/func_8001E36C.s b/asm/non_matchings/unknown_00BC20/func_8001E36C.s deleted file mode 100644 index d3697070..00000000 --- a/asm/non_matchings/unknown_00BC20/func_8001E36C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_8001E36C -/* 01EF6C 8001E36C 3C01C6FA */ li $at, 0xC6FA0000 # -32000.000000 -/* 01EF70 8001E370 44810000 */ mtc1 $at, $f0 -/* 01EF74 8001E374 27BDFFF8 */ addiu $sp, $sp, -8 -/* 01EF78 8001E378 AFB00004 */ sw $s0, 4($sp) -/* 01EF7C 8001E37C E4A00000 */ swc1 $f0, ($a1) -/* 01EF80 8001E380 E4C00000 */ swc1 $f0, ($a2) -/* 01EF84 8001E384 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 01EF88 8001E388 E4E00000 */ swc1 $f0, ($a3) -/* 01EF8C 8001E38C 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) -/* 01EF90 8001E390 00808025 */ move $s0, $a0 -/* 01EF94 8001E394 18600027 */ blez $v1, .L8001E434 -/* 01EF98 8001E398 00001025 */ move $v0, $zero -/* 01EF9C 8001E39C 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 -/* 01EFA0 8001E3A0 2529AE58 */ addiu $t1, %lo(D_8011AE58) # addiu $t1, $t1, -0x51a8 -/* 01EFA4 8001E3A4 00004025 */ move $t0, $zero -/* 01EFA8 8001E3A8 240A0027 */ li $t2, 39 -.L8001E3AC: -/* 01EFAC 8001E3AC 8D2E0000 */ lw $t6, ($t1) -/* 01EFB0 8001E3B0 24420001 */ addiu $v0, $v0, 1 -/* 01EFB4 8001E3B4 01C87821 */ addu $t7, $t6, $t0 -/* 01EFB8 8001E3B8 8DE40000 */ lw $a0, ($t7) -/* 01EFBC 8001E3BC 00000000 */ nop -/* 01EFC0 8001E3C0 1080001A */ beqz $a0, .L8001E42C -/* 01EFC4 8001E3C4 0043082A */ slt $at, $v0, $v1 -/* 01EFC8 8001E3C8 84980006 */ lh $t8, 6($a0) -/* 01EFCC 8001E3CC 00000000 */ nop -/* 01EFD0 8001E3D0 33198000 */ andi $t9, $t8, 0x8000 -/* 01EFD4 8001E3D4 17200015 */ bnez $t9, .L8001E42C -/* 01EFD8 8001E3D8 0043082A */ slt $at, $v0, $v1 -/* 01EFDC 8001E3DC 848B0048 */ lh $t3, 0x48($a0) -/* 01EFE0 8001E3E0 00000000 */ nop -/* 01EFE4 8001E3E4 154B0011 */ bne $t2, $t3, .L8001E42C -/* 01EFE8 8001E3E8 0043082A */ slt $at, $v0, $v1 -/* 01EFEC 8001E3EC 8C8C0078 */ lw $t4, 0x78($a0) -/* 01EFF0 8001E3F0 00000000 */ nop -/* 01EFF4 8001E3F4 160C000D */ bne $s0, $t4, .L8001E42C -/* 01EFF8 8001E3F8 0043082A */ slt $at, $v0, $v1 -/* 01EFFC 8001E3FC C484000C */ lwc1 $f4, 0xc($a0) -/* 01F000 8001E400 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 01F004 8001E404 E4A40000 */ swc1 $f4, ($a1) -/* 01F008 8001E408 C4860010 */ lwc1 $f6, 0x10($a0) -/* 01F00C 8001E40C 00000000 */ nop -/* 01F010 8001E410 E4C60000 */ swc1 $f6, ($a2) -/* 01F014 8001E414 C4880014 */ lwc1 $f8, 0x14($a0) -/* 01F018 8001E418 00000000 */ nop -/* 01F01C 8001E41C E4E80000 */ swc1 $f8, ($a3) -/* 01F020 8001E420 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) -/* 01F024 8001E424 00000000 */ nop -/* 01F028 8001E428 0043082A */ slt $at, $v0, $v1 -.L8001E42C: -/* 01F02C 8001E42C 1420FFDF */ bnez $at, .L8001E3AC -/* 01F030 8001E430 25080004 */ addiu $t0, $t0, 4 -.L8001E434: -/* 01F034 8001E434 8FB00004 */ lw $s0, 4($sp) -/* 01F038 8001E438 03E00008 */ jr $ra -/* 01F03C 8001E43C 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s index cd5e2430..6c7aa0c9 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s @@ -1,12 +1,12 @@ glabel func_8001E4C4 -/* 01F0C4 8001E4C4 3C088012 */ lui $t0, %hi(D_8011AE5C) # $t0, 0x8012 -/* 01F0C8 8001E4C8 2508AE5C */ addiu $t0, %lo(D_8011AE5C) # addiu $t0, $t0, -0x51a4 +/* 01F0C4 8001E4C4 3C088012 */ lui $t0, %hi(objCount) # $t0, 0x8012 +/* 01F0C8 8001E4C8 2508AE5C */ addiu $t0, %lo(objCount) # addiu $t0, $t0, -0x51a4 /* 01F0CC 8001E4CC 8D030000 */ lw $v1, ($t0) /* 01F0D0 8001E4D0 00001025 */ move $v0, $zero /* 01F0D4 8001E4D4 18600013 */ blez $v1, .L8001E524 /* 01F0D8 8001E4D8 00002025 */ move $a0, $zero -/* 01F0DC 8001E4DC 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 -/* 01F0E0 8001E4E0 2529AE58 */ addiu $t1, %lo(D_8011AE58) # addiu $t1, $t1, -0x51a8 +/* 01F0DC 8001E4DC 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 01F0E0 8001E4E0 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 /* 01F0E4 8001E4E4 2406DFFF */ li $a2, -8193 .L8001E4E8: /* 01F0E8 8001E4E8 8D2E0000 */ lw $t6, ($t1) @@ -25,9 +25,9 @@ glabel func_8001E4C4 /* 01F11C 8001E51C 00000000 */ nop /* 01F120 8001E520 00001025 */ move $v0, $zero .L8001E524: -/* 01F124 8001E524 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 +/* 01F124 8001E524 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 /* 01F128 8001E528 1860002C */ blez $v1, .L8001E5DC -/* 01F12C 8001E52C 2529AE58 */ addiu $t1, %lo(D_8011AE58) # addiu $t1, $t1, -0x51a8 +/* 01F12C 8001E52C 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 /* 01F130 8001E530 3C0B8012 */ lui $t3, %hi(D_8011AE7A) # $t3, 0x8012 /* 01F134 8001E534 256BAE7A */ addiu $t3, %lo(D_8011AE7A) # addiu $t3, $t3, -0x5186 /* 01F138 8001E538 00002025 */ move $a0, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_8001E93C.s b/asm/non_matchings/unknown_00BC20/func_8001E93C.s index 66b819f2..db0e8063 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E93C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E93C.s @@ -31,7 +31,7 @@ glabel func_8001E93C /* 01F5AC 8001E9AC 1219000A */ beq $s0, $t9, .L8001E9D8 /* 01F5B0 8001E9B0 00000000 */ nop /* 01F5B4 8001E9B4 00602025 */ move $a0, $v1 -/* 01F5B8 8001E9B8 0C003FEE */ jal func_8000FFB8 +/* 01F5B8 8001E9B8 0C003FEE */ jal particlePtrList_addObject /* 01F5BC 8001E9BC AFA2003C */ sw $v0, 0x3c($sp) /* 01F5C0 8001E9C0 8FA2003C */ lw $v0, 0x3c($sp) /* 01F5C4 8001E9C4 3C048012 */ lui $a0, %hi(D_8011AE78) # $a0, 0x8012 @@ -56,15 +56,15 @@ glabel func_8001E93C .L8001EA08: /* 01F608 8001EA08 0C007931 */ jal func_8001E4C4 /* 01F60C 8001EA0C 00000000 */ nop -/* 01F610 8001EA10 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 -/* 01F614 8001EA14 8CC6AE5C */ lw $a2, %lo(D_8011AE5C)($a2) +/* 01F610 8001EA10 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012 +/* 01F614 8001EA14 8CC6AE5C */ lw $a2, %lo(objCount)($a2) /* 01F618 8001EA18 3C0D8012 */ lui $t5, %hi(D_8011AE74) # $t5, 0x8012 /* 01F61C 8001EA1C 18C00023 */ blez $a2, .L8001EAAC /* 01F620 8001EA20 25ADAE74 */ addiu $t5, %lo(D_8011AE74) # addiu $t5, $t5, -0x518c -/* 01F624 8001EA24 3C058012 */ lui $a1, %hi(D_8011AE58) # $a1, 0x8012 +/* 01F624 8001EA24 3C058012 */ lui $a1, %hi(objPtrList) # $a1, 0x8012 /* 01F628 8001EA28 3C0B8012 */ lui $t3, %hi(D_8011ADD8) # $t3, 0x8012 /* 01F62C 8001EA2C 3C098012 */ lui $t1, %hi(D_8011AE7A) # $t1, 0x8012 -/* 01F630 8001EA30 8CA5AE58 */ lw $a1, %lo(D_8011AE58)($a1) +/* 01F630 8001EA30 8CA5AE58 */ lw $a1, %lo(objPtrList)($a1) /* 01F634 8001EA34 2529AE7A */ addiu $t1, %lo(D_8011AE7A) # addiu $t1, $t1, -0x5186 /* 01F638 8001EA38 256BADD8 */ addiu $t3, %lo(D_8011ADD8) # addiu $t3, $t3, -0x5228 /* 01F63C 8001EA3C 00005025 */ move $t2, $zero @@ -111,8 +111,8 @@ glabel func_8001E93C /* 01F6D0 8001EAD0 0186082A */ slt $at, $t4, $a2 /* 01F6D4 8001EAD4 1020001E */ beqz $at, .L8001EB50 /* 01F6D8 8001EAD8 00009825 */ move $s3, $zero -/* 01F6DC 8001EADC 3C038012 */ lui $v1, %hi(D_8011AE58) # $v1, 0x8012 -/* 01F6E0 8001EAE0 2463AE58 */ addiu $v1, %lo(D_8011AE58) # addiu $v1, $v1, -0x51a8 +/* 01F6DC 8001EADC 3C038012 */ lui $v1, %hi(objPtrList) # $v1, 0x8012 +/* 01F6E0 8001EAE0 2463AE58 */ addiu $v1, %lo(objPtrList) # addiu $v1, $v1, -0x51a8 /* 01F6E4 8001EAE4 000C5080 */ sll $t2, $t4, 2 /* 01F6E8 8001EAE8 24040031 */ li $a0, 49 .L8001EAEC: @@ -133,10 +133,10 @@ glabel func_8001E93C /* 01F724 8001EB24 14990008 */ bne $a0, $t9, .L8001EB48 /* 01F728 8001EB28 0186082A */ slt $at, $t4, $a2 /* 01F72C 8001EB2C 8DAE0000 */ lw $t6, ($t5) -/* 01F730 8001EB30 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 +/* 01F730 8001EB30 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012 /* 01F734 8001EB34 01CFC021 */ addu $t8, $t6, $t7 /* 01F738 8001EB38 AF020000 */ sw $v0, ($t8) -/* 01F73C 8001EB3C 8CC6AE5C */ lw $a2, %lo(D_8011AE5C)($a2) +/* 01F73C 8001EB3C 8CC6AE5C */ lw $a2, %lo(objCount)($a2) /* 01F740 8001EB40 26730001 */ addiu $s3, $s3, 1 /* 01F744 8001EB44 0186082A */ slt $at, $t4, $a2 .L8001EB48: diff --git a/asm/non_matchings/unknown_00BC20/func_8001F23C.s b/asm/non_matchings/unknown_00BC20/func_8001F23C.s index 7aa33f76..67d984df 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F23C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F23C.s @@ -37,7 +37,7 @@ glabel func_8001F23C /* 01FEC8 8001F2C8 00000000 */ nop /* 01FECC 8001F2CC 11A00005 */ beqz $t5, .L8001F2E4 /* 01FED0 8001F2D0 00000000 */ nop -/* 01FED4 8001F2D4 0C003FEE */ jal func_8000FFB8 +/* 01FED4 8001F2D4 0C003FEE */ jal particlePtrList_addObject /* 01FED8 8001F2D8 00402025 */ move $a0, $v0 /* 01FEDC 8001F2DC AE800064 */ sw $zero, 0x64($s4) /* 01FEE0 8001F2E0 00008825 */ move $s1, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_80021104.s b/asm/non_matchings/unknown_00BC20/func_80021104.s index a95d6f34..5fc18ad6 100644 --- a/asm/non_matchings/unknown_00BC20/func_80021104.s +++ b/asm/non_matchings/unknown_00BC20/func_80021104.s @@ -57,8 +57,8 @@ glabel func_80021104 /* 021DD8 800211D8 1420001C */ bnez $at, .L8002124C /* 021DDC 800211DC 28810012 */ slti $at, $a0, 0x12 /* 021DE0 800211E0 1020001A */ beqz $at, .L8002124C -/* 021DE4 800211E4 3C188012 */ lui $t8, %hi(D_8011AEE4) # $t8, 0x8012 -/* 021DE8 800211E8 8F18AEE4 */ lw $t8, %lo(D_8011AEE4)($t8) +/* 021DE4 800211E4 3C188012 */ lui $t8, %hi(playerStructArray_Ptr) # $t8, 0x8012 +/* 021DE8 800211E8 8F18AEE4 */ lw $t8, %lo(playerStructArray_Ptr)($t8) /* 021DEC 800211EC 0004C880 */ sll $t9, $a0, 2 /* 021DF0 800211F0 03194021 */ addu $t0, $t8, $t9 /* 021DF4 800211F4 8D02FFD8 */ lw $v0, -0x28($t0) diff --git a/asm/non_matchings/unknown_00BC20/func_80022948.s b/asm/non_matchings/unknown_00BC20/func_80022948.s index 027663ce..e4154525 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022948.s +++ b/asm/non_matchings/unknown_00BC20/func_80022948.s @@ -22,7 +22,7 @@ glabel func_80022948 /* 023598 80022998 AC29AEFC */ sw $t1, %lo(D_8011AEFC)($at) /* 02359C 8002299C A04A0052 */ sb $t2, 0x52($v0) /* 0235A0 800229A0 A44B0054 */ sh $t3, 0x54($v0) -/* 0235A4 800229A4 0C006EB2 */ jal func_8001BAC8 +/* 0235A4 800229A4 0C006EB2 */ jal getPlayerStruct /* 0235A8 800229A8 00002025 */ move $a0, $zero /* 0235AC 800229AC 8C500064 */ lw $s0, 0x64($v0) /* 0235B0 800229B0 3C018012 */ lui $at, %hi(D_8011AEF6) # $at, 0x8012 @@ -166,8 +166,8 @@ glabel func_80022948 /* 0237CC 80022BCC 27A40058 */ addiu $a0, $sp, 0x58 /* 0237D0 80022BD0 0C003A95 */ jal func_8000EA54 /* 0237D4 80022BD4 24050001 */ li $a1, 1 -/* 0237D8 80022BD8 3C0B8012 */ lui $t3, %hi(D_8011AEE4) # $t3, 0x8012 -/* 0237DC 80022BDC 8D6BAEE4 */ lw $t3, %lo(D_8011AEE4)($t3) +/* 0237D8 80022BD8 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 0237DC 80022BDC 8D6BAEE4 */ lw $t3, %lo(playerStructArray_Ptr)($t3) /* 0237E0 80022BE0 3C0D8012 */ lui $t5, %hi(D_8011AEE8) # $t5, 0x8012 /* 0237E4 80022BE4 AD620004 */ sw $v0, 4($t3) /* 0237E8 80022BE8 8DADAEE8 */ lw $t5, %lo(D_8011AEE8)($t5) @@ -178,9 +178,9 @@ glabel func_80022948 /* 0237FC 80022BFC 44810000 */ mtc1 $at, $f0 /* 023800 80022C00 AD820004 */ sw $v0, 4($t4) /* 023804 80022C04 AC40003C */ sw $zero, 0x3c($v0) -/* 023808 80022C08 3C018012 */ lui $at, %hi(D_8011AEF0) # $at, 0x8012 +/* 023808 80022C08 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 /* 02380C 80022C0C 240E0002 */ li $t6, 2 -/* 023810 80022C10 AC2EAEF0 */ sw $t6, %lo(D_8011AEF0)($at) +/* 023810 80022C10 AC2EAEF0 */ sw $t6, %lo(playerCount)($at) /* 023814 80022C14 8C500064 */ lw $s0, 0x64($v0) /* 023818 80022C18 2418000A */ li $t8, 10 /* 02381C 80022C1C A21801D6 */ sb $t8, 0x1d6($s0) @@ -200,15 +200,15 @@ glabel func_80022948 /* 023854 80022C54 240D0002 */ li $t5, 2 /* 023858 80022C58 A18D0012 */ sb $t5, 0x12($t4) /* 02385C 80022C5C 3C048012 */ lui $a0, %hi(D_8011AE60) # $a0, 0x8012 -/* 023860 80022C60 3C058012 */ lui $a1, %hi(D_8011AE5C) # $a1, 0x8012 -/* 023864 80022C64 8CA5AE5C */ lw $a1, %lo(D_8011AE5C)($a1) +/* 023860 80022C60 3C058012 */ lui $a1, %hi(objCount) # $a1, 0x8012 +/* 023864 80022C64 8CA5AE5C */ lw $a1, %lo(objCount)($a1) /* 023868 80022C68 8C84AE60 */ lw $a0, %lo(D_8011AE60)($a0) /* 02386C 80022C6C 2407003E */ li $a3, 62 /* 023870 80022C70 0085082A */ slt $at, $a0, $a1 /* 023874 80022C74 10200018 */ beqz $at, .L80022CD8 /* 023878 80022C78 00041880 */ sll $v1, $a0, 2 -/* 02387C 80022C7C 3C068012 */ lui $a2, %hi(D_8011AE58) # $a2, 0x8012 -/* 023880 80022C80 24C6AE58 */ addiu $a2, %lo(D_8011AE58) # addiu $a2, $a2, -0x51a8 +/* 02387C 80022C7C 3C068012 */ lui $a2, %hi(objPtrList) # $a2, 0x8012 +/* 023880 80022C80 24C6AE58 */ addiu $a2, %lo(objPtrList) # addiu $a2, $a2, -0x51a8 .L80022C84: /* 023884 80022C84 8CCE0000 */ lw $t6, ($a2) /* 023888 80022C88 24840001 */ addiu $a0, $a0, 1 @@ -225,8 +225,8 @@ glabel func_80022948 /* 0238B4 80022CB4 14E90006 */ bne $a3, $t1, .L80022CD0 /* 0238B8 80022CB8 0085082A */ slt $at, $a0, $a1 /* 0238BC 80022CBC AE020154 */ sw $v0, 0x154($s0) -/* 0238C0 80022CC0 3C058012 */ lui $a1, %hi(D_8011AE5C) # $a1, 0x8012 -/* 0238C4 80022CC4 8CA5AE5C */ lw $a1, %lo(D_8011AE5C)($a1) +/* 0238C0 80022CC0 3C058012 */ lui $a1, %hi(objCount) # $a1, 0x8012 +/* 0238C4 80022CC4 8CA5AE5C */ lw $a1, %lo(objCount)($a1) /* 0238C8 80022CC8 00000000 */ nop /* 0238CC 80022CCC 0085082A */ slt $at, $a0, $a1 .L80022CD0: diff --git a/asm/non_matchings/unknown_00BC20/func_80022CFC.s b/asm/non_matchings/unknown_00BC20/func_80022CFC.s index 7194005b..19cb247c 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022CFC.s +++ b/asm/non_matchings/unknown_00BC20/func_80022CFC.s @@ -11,17 +11,17 @@ glabel func_80022CFC /* 023920 80022D20 E7AC002C */ swc1 $f12, 0x2c($sp) /* 023924 80022D24 0C01BAA4 */ jal get_settings /* 023928 80022D28 E7AE0030 */ swc1 $f14, 0x30($sp) -/* 02392C 80022D2C 3C088012 */ lui $t0, %hi(D_8011AE5C) # $t0, 0x8012 -/* 023930 80022D30 8D08AE5C */ lw $t0, %lo(D_8011AE5C)($t0) +/* 02392C 80022D2C 3C088012 */ lui $t0, %hi(objCount) # $t0, 0x8012 +/* 023930 80022D30 8D08AE5C */ lw $t0, %lo(objCount)($t0) /* 023934 80022D34 C7AC002C */ lwc1 $f12, 0x2c($sp) /* 023938 80022D38 C7AE0030 */ lwc1 $f14, 0x30($sp) /* 02393C 80022D3C 19000030 */ blez $t0, .L80022E00 /* 023940 80022D40 00003025 */ move $a2, $zero /* 023944 80022D44 3C014024 */ li $at, 0x40240000 # 2.562500 -/* 023948 80022D48 3C098012 */ lui $t1, %hi(D_8011AE58) # $t1, 0x8012 +/* 023948 80022D48 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 /* 02394C 80022D4C 44810800 */ mtc1 $at, $f1 /* 023950 80022D50 44800000 */ mtc1 $zero, $f0 -/* 023954 80022D54 2529AE58 */ addiu $t1, %lo(D_8011AE58) # addiu $t1, $t1, -0x51a8 +/* 023954 80022D54 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 /* 023958 80022D58 00003825 */ move $a3, $zero /* 02395C 80022D5C 240A004D */ li $t2, 77 .L80022D60: @@ -59,8 +59,8 @@ glabel func_80022CFC /* 0239DC 80022DDC A470002E */ sh $s0, 0x2e($v1) /* 0239E0 80022DE0 AC600078 */ sw $zero, 0x78($v1) /* 0239E4 80022DE4 A0600039 */ sb $zero, 0x39($v1) -/* 0239E8 80022DE8 3C088012 */ lui $t0, %hi(D_8011AE5C) # $t0, 0x8012 -/* 0239EC 80022DEC 8D08AE5C */ lw $t0, %lo(D_8011AE5C)($t0) +/* 0239E8 80022DE8 3C088012 */ lui $t0, %hi(objCount) # $t0, 0x8012 +/* 0239EC 80022DEC 8D08AE5C */ lw $t0, %lo(objCount)($t0) /* 0239F0 80022DF0 00000000 */ nop .L80022DF4: /* 0239F4 80022DF4 00C8082A */ slt $at, $a2, $t0 diff --git a/asm/non_matchings/unknown_00BC20/func_80022E18.s b/asm/non_matchings/unknown_00BC20/func_80022E18.s index dbdc6ae5..fd73b8f2 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022E18.s +++ b/asm/non_matchings/unknown_00BC20/func_80022E18.s @@ -13,11 +13,11 @@ glabel func_80022E18 /* 023A44 80022E44 24040001 */ li $a0, 1 /* 023A48 80022E48 0C02AC6B */ jal func_800AB1AC /* 023A4C 80022E4C A4580054 */ sh $t8, 0x54($v0) -/* 023A50 80022E50 3C078012 */ lui $a3, %hi(D_8011AEE4) # $a3, 0x8012 -/* 023A54 80022E54 3C068012 */ lui $a2, %hi(D_8011AEF0) # $a2, 0x8012 +/* 023A50 80022E50 3C078012 */ lui $a3, %hi(playerStructArray_Ptr) # $a3, 0x8012 +/* 023A54 80022E54 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 /* 023A58 80022E58 00002825 */ move $a1, $zero -/* 023A5C 80022E5C 24C6AEF0 */ addiu $a2, %lo(D_8011AEF0) # addiu $a2, $a2, -0x5110 -/* 023A60 80022E60 24E7AEE4 */ addiu $a3, %lo(D_8011AEE4) # addiu $a3, $a3, -0x511c +/* 023A5C 80022E5C 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 +/* 023A60 80022E60 24E7AEE4 */ addiu $a3, %lo(playerStructArray_Ptr) # addiu $a3, $a3, -0x511c /* 023A64 80022E64 00001025 */ move $v0, $zero .L80022E68: /* 023A68 80022E68 8CF90000 */ lw $t9, ($a3) @@ -39,28 +39,28 @@ glabel func_80022E18 /* 023AA8 80022EA8 8CEB0000 */ lw $t3, ($a3) /* 023AAC 80022EAC 00000000 */ nop /* 023AB0 80022EB0 8D640004 */ lw $a0, 4($t3) -/* 023AB4 80022EB4 0C003FEE */ jal func_8000FFB8 +/* 023AB4 80022EB4 0C003FEE */ jal particlePtrList_addObject /* 023AB8 80022EB8 00000000 */ nop -/* 023ABC 80022EBC 3C078012 */ lui $a3, %hi(D_8011AEE4) # $a3, 0x8012 -/* 023AC0 80022EC0 24E7AEE4 */ addiu $a3, %lo(D_8011AEE4) # addiu $a3, $a3, -0x511c +/* 023ABC 80022EBC 3C078012 */ lui $a3, %hi(playerStructArray_Ptr) # $a3, 0x8012 +/* 023AC0 80022EC0 24E7AEE4 */ addiu $a3, %lo(playerStructArray_Ptr) # addiu $a3, $a3, -0x511c /* 023AC4 80022EC4 8CEC0000 */ lw $t4, ($a3) /* 023AC8 80022EC8 3C0E8012 */ lui $t6, %hi(D_8011AEE8) # $t6, 0x8012 /* 023ACC 80022ECC 8DCEAEE8 */ lw $t6, %lo(D_8011AEE8)($t6) /* 023AD0 80022ED0 8D8D0000 */ lw $t5, ($t4) -/* 023AD4 80022ED4 3C068012 */ lui $a2, %hi(D_8011AEF0) # $a2, 0x8012 -/* 023AD8 80022ED8 24C6AEF0 */ addiu $a2, %lo(D_8011AEF0) # addiu $a2, $a2, -0x5110 +/* 023AD4 80022ED4 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 +/* 023AD8 80022ED8 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 /* 023ADC 80022EDC 240F0001 */ li $t7, 1 /* 023AE0 80022EE0 ADCD0000 */ sw $t5, ($t6) /* 023AE4 80022EE4 ACCF0000 */ sw $t7, ($a2) /* 023AE8 80022EE8 3C058012 */ lui $a1, %hi(D_8011AE60) # $a1, 0x8012 -/* 023AEC 80022EEC 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 -/* 023AF0 80022EF0 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 023AEC 80022EEC 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 023AF0 80022EF0 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 023AF4 80022EF4 8CA5AE60 */ lw $a1, %lo(D_8011AE60)($a1) -/* 023AF8 80022EF8 3C188012 */ lui $t8, %hi(D_8011AE58) # $t8, 0x8012 +/* 023AF8 80022EF8 3C188012 */ lui $t8, %hi(objPtrList) # $t8, 0x8012 /* 023AFC 80022EFC 00A3082A */ slt $at, $a1, $v1 /* 023B00 80022F00 10200013 */ beqz $at, .L80022F50 /* 023B04 80022F04 00051080 */ sll $v0, $a1, 2 -/* 023B08 80022F08 8F18AE58 */ lw $t8, %lo(D_8011AE58)($t8) +/* 023B08 80022F08 8F18AE58 */ lw $t8, %lo(objPtrList)($t8) /* 023B0C 80022F0C 00033080 */ sll $a2, $v1, 2 /* 023B10 80022F10 2405003E */ li $a1, 62 /* 023B14 80022F14 03022021 */ addu $a0, $t8, $v0 @@ -91,7 +91,7 @@ glabel func_80022E18 /* 023B6C 80022F6C 00000000 */ nop /* 023B70 80022F70 10800007 */ beqz $a0, .L80022F90 /* 023B74 80022F74 8FAC0030 */ lw $t4, 0x30($sp) -/* 023B78 80022F78 0C003FEE */ jal func_8000FFB8 +/* 023B78 80022F78 0C003FEE */ jal particlePtrList_addObject /* 023B7C 80022F7C AFA30024 */ sw $v1, 0x24($sp) /* 023B80 80022F80 8FA30024 */ lw $v1, 0x24($sp) /* 023B84 80022F84 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800230D0.s b/asm/non_matchings/unknown_00BC20/func_800230D0.s index 9cdd6ddb..d165dff0 100644 --- a/asm/non_matchings/unknown_00BC20/func_800230D0.s +++ b/asm/non_matchings/unknown_00BC20/func_800230D0.s @@ -8,14 +8,14 @@ glabel func_800230D0 /* 023CE8 800230E8 00A08825 */ move $s1, $a1 /* 023CEC 800230EC 14400032 */ bnez $v0, .L800231B8 /* 023CF0 800230F0 AFBF001C */ sw $ra, 0x1c($sp) -/* 023CF4 800230F4 3C078012 */ lui $a3, %hi(D_8011AE5C) # $a3, 0x8012 -/* 023CF8 800230F8 24E7AE5C */ addiu $a3, %lo(D_8011AE5C) # addiu $a3, $a3, -0x51a4 +/* 023CF4 800230F4 3C078012 */ lui $a3, %hi(objCount) # $a3, 0x8012 +/* 023CF8 800230F8 24E7AE5C */ addiu $a3, %lo(objCount) # addiu $a3, $a3, -0x51a4 /* 023CFC 800230FC 8CE40000 */ lw $a0, ($a3) /* 023D00 80023100 00004025 */ move $t0, $zero /* 023D04 80023104 1880002A */ blez $a0, .L800231B0 /* 023D08 80023108 00001025 */ move $v0, $zero -/* 023D0C 8002310C 3C058012 */ lui $a1, %hi(D_8011AE58) # $a1, 0x8012 -/* 023D10 80023110 24A5AE58 */ addiu $a1, %lo(D_8011AE58) # addiu $a1, $a1, -0x51a8 +/* 023D0C 8002310C 3C058012 */ lui $a1, %hi(objPtrList) # $a1, 0x8012 +/* 023D10 80023110 24A5AE58 */ addiu $a1, %lo(objPtrList) # addiu $a1, $a1, -0x51a8 /* 023D14 80023114 2406000B */ li $a2, 11 .L80023118: /* 023D18 80023118 8CAE0000 */ lw $t6, ($a1) diff --git a/asm/non_matchings/unknown_00BC20/func_8002342C.s b/asm/non_matchings/unknown_00BC20/func_8002342C.s index 73fac14c..533087a2 100644 --- a/asm/non_matchings/unknown_00BC20/func_8002342C.s +++ b/asm/non_matchings/unknown_00BC20/func_8002342C.s @@ -1,8 +1,8 @@ glabel func_8002342C /* 02402C 8002342C 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 024030 80023430 AFB3003C */ sw $s3, 0x3c($sp) -/* 024034 80023434 3C138012 */ lui $s3, %hi(D_8011AE5C) # $s3, 0x8012 -/* 024038 80023438 2673AE5C */ addiu $s3, %lo(D_8011AE5C) # addiu $s3, $s3, -0x51a4 +/* 024034 80023434 3C138012 */ lui $s3, %hi(objCount) # $s3, 0x8012 +/* 024038 80023438 2673AE5C */ addiu $s3, %lo(objCount) # addiu $s3, $s3, -0x51a4 /* 02403C 8002343C 8E6E0000 */ lw $t6, ($s3) /* 024040 80023440 E7B4001C */ swc1 $f20, 0x1c($sp) /* 024044 80023444 AFB60048 */ sw $s6, 0x48($sp) @@ -23,8 +23,8 @@ glabel func_8002342C /* 024080 80023480 00008825 */ move $s1, $zero /* 024084 80023484 19C00027 */ blez $t6, .L80023524 /* 024088 80023488 0000B025 */ move $s6, $zero -/* 02408C 8002348C 3C148012 */ lui $s4, %hi(D_8011AE58) # $s4, 0x8012 -/* 024090 80023490 2694AE58 */ addiu $s4, %lo(D_8011AE58) # addiu $s4, $s4, -0x51a8 +/* 02408C 8002348C 3C148012 */ lui $s4, %hi(objPtrList) # $s4, 0x8012 +/* 024090 80023490 2694AE58 */ addiu $s4, %lo(objPtrList) # addiu $s4, $s4, -0x51a8 /* 024094 80023494 00009025 */ move $s2, $zero /* 024098 80023498 24150057 */ li $s5, 87 .L8002349C: diff --git a/asm/non_matchings/unknown_00BC20/func_8001004C.s b/asm/non_matchings/unknown_00BC20/particlePtrList_flush.s similarity index 86% rename from asm/non_matchings/unknown_00BC20/func_8001004C.s rename to asm/non_matchings/unknown_00BC20/particlePtrList_flush.s index 81aef223..ee2f7852 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001004C.s +++ b/asm/non_matchings/unknown_00BC20/particlePtrList_flush.s @@ -1,9 +1,9 @@ -glabel func_8001004C +glabel particlePtrList_flush /* 010C4C 8001004C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 010C50 80010050 AFB70030 */ sw $s7, 0x30($sp) -/* 010C54 80010054 3C178012 */ lui $s7, %hi(D_8011AEC8) # $s7, 0x8012 +/* 010C54 80010054 3C178012 */ lui $s7, %hi(particleCount) # $s7, 0x8012 /* 010C58 80010058 3C018012 */ lui $at, %hi(D_8011AE88) # $at, 0x8012 -/* 010C5C 8001005C 26F7AEC8 */ addiu $s7, %lo(D_8011AEC8) # addiu $s7, $s7, -0x5138 +/* 010C5C 8001005C 26F7AEC8 */ addiu $s7, %lo(particleCount) # addiu $s7, $s7, -0x5138 /* 010C60 80010060 AC20AE88 */ sw $zero, %lo(D_8011AE88)($at) /* 010C64 80010064 8EEE0000 */ lw $t6, ($s7) /* 010C68 80010068 AFB30020 */ sw $s3, 0x20($sp) @@ -16,14 +16,14 @@ glabel func_8001004C /* 010C84 80010084 AFB00014 */ sw $s0, 0x14($sp) /* 010C88 80010088 19C0003C */ blez $t6, .L8001017C /* 010C8C 8001008C 00009825 */ move $s3, $zero -/* 010C90 80010090 3C158012 */ lui $s5, %hi(D_8011AEC4) # $s5, 0x8012 +/* 010C90 80010090 3C158012 */ lui $s5, %hi(particlePtrList) # $s5, 0x8012 /* 010C94 80010094 3C148012 */ lui $s4, %hi(D_8011AE7C) # $s4, 0x8012 -/* 010C98 80010098 3C118012 */ lui $s1, %hi(D_8011AE58) # $s1, 0x8012 -/* 010C9C 8001009C 3C108012 */ lui $s0, %hi(D_8011AE5C) # $s0, 0x8012 -/* 010CA0 800100A0 2610AE5C */ addiu $s0, %lo(D_8011AE5C) # addiu $s0, $s0, -0x51a4 -/* 010CA4 800100A4 2631AE58 */ addiu $s1, %lo(D_8011AE58) # addiu $s1, $s1, -0x51a8 +/* 010C98 80010098 3C118012 */ lui $s1, %hi(objPtrList) # $s1, 0x8012 +/* 010C9C 8001009C 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012 +/* 010CA0 800100A0 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4 +/* 010CA4 800100A4 2631AE58 */ addiu $s1, %lo(objPtrList) # addiu $s1, $s1, -0x51a8 /* 010CA8 800100A8 2694AE7C */ addiu $s4, %lo(D_8011AE7C) # addiu $s4, $s4, -0x5184 -/* 010CAC 800100AC 26B5AEC4 */ addiu $s5, %lo(D_8011AEC4) # addiu $s5, $s5, -0x513c +/* 010CAC 800100AC 26B5AEC4 */ addiu $s5, %lo(particlePtrList) # addiu $s5, $s5, -0x513c /* 010CB0 800100B0 00009025 */ move $s2, $zero /* 010CB4 800100B4 2416FFFF */ li $s6, -1 .L800100B8: diff --git a/asm/non_matchings/unknown_0255E0/func_80027568.s b/asm/non_matchings/unknown_0255E0/func_80027568.s index b5b21bcf..112bbbc0 100644 --- a/asm/non_matchings/unknown_0255E0/func_80027568.s +++ b/asm/non_matchings/unknown_0255E0/func_80027568.s @@ -13,7 +13,7 @@ glabel func_80027568 /* 028194 80027594 E7B6001C */ swc1 $f22, 0x1c($sp) /* 028198 80027598 E7B50010 */ swc1 $f21, 0x10($sp) /* 02819C 8002759C E7B40014 */ swc1 $f20, 0x14($sp) -/* 0281A0 800275A0 0C006E9D */ jal func_8001BA74 +/* 0281A0 800275A0 0C006E9D */ jal getPlayerStructArray /* 0281A4 800275A4 27A400C4 */ addiu $a0, $sp, 0xc4 /* 0281A8 800275A8 8FAE00C4 */ lw $t6, 0xc4($sp) /* 0281AC 800275AC 00403025 */ move $a2, $v0 diff --git a/asm/non_matchings/unknown_0255E0/func_800278E8.s b/asm/non_matchings/unknown_0255E0/func_800278E8.s index e4db33ff..77042650 100644 --- a/asm/non_matchings/unknown_0255E0/func_800278E8.s +++ b/asm/non_matchings/unknown_0255E0/func_800278E8.s @@ -4,7 +4,7 @@ glabel func_800278E8 /* 0284F0 800278F0 AFA40070 */ sw $a0, 0x70($sp) /* 0284F4 800278F4 AFB10018 */ sw $s1, 0x18($sp) /* 0284F8 800278F8 AFB00014 */ sw $s0, 0x14($sp) -/* 0284FC 800278FC 0C006E9D */ jal func_8001BA74 +/* 0284FC 800278FC 0C006E9D */ jal getPlayerStructArray /* 028500 80027900 27A40038 */ addiu $a0, $sp, 0x38 /* 028504 80027904 8FAE0038 */ lw $t6, 0x38($sp) /* 028508 80027908 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/unknown_0255E0/func_80028C10.s b/asm/non_matchings/unknown_0255E0/func_80028C10.s deleted file mode 100644 index 04397708..00000000 --- a/asm/non_matchings/unknown_0255E0/func_80028C10.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80028C10 -/* 029810 80028C10 3C038012 */ lui $v1, %hi(D_8011B0B8) # $v1, 0x8012 -/* 029814 80028C14 2463B0B8 */ addiu $v1, %lo(D_8011B0B8) # addiu $v1, $v1, -0x4f48 -/* 029818 80028C18 8C6E0000 */ lw $t6, ($v1) -/* 02981C 80028C1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 029820 80028C20 11C00027 */ beqz $t6, .L80028CC0 -/* 029824 80028C24 AFBF0014 */ sw $ra, 0x14($sp) -/* 029828 80028C28 0C01A748 */ jal func_80069D20 -/* 02982C 80028C2C 00000000 */ nop -/* 029830 80028C30 3C0F800E */ lui $t7, %hi(D_800DC91C) # $t7, 0x800e -/* 029834 80028C34 8DEFC91C */ lw $t7, %lo(D_800DC91C)($t7) -/* 029838 80028C38 3C038012 */ lui $v1, %hi(D_8011B0B8) # $v1, 0x8012 -/* 02983C 80028C3C 81F80049 */ lb $t8, 0x49($t7) -/* 029840 80028C40 2463B0B8 */ addiu $v1, %lo(D_8011B0B8) # addiu $v1, $v1, -0x4f48 -/* 029844 80028C44 1700000D */ bnez $t8, .L80028C7C -/* 029848 80028C48 3C048012 */ lui $a0, %hi(D_8011B0A0) # $a0, 0x8012 -/* 02984C 80028C4C C444000C */ lwc1 $f4, 0xc($v0) -/* 029850 80028C50 8C790000 */ lw $t9, ($v1) -/* 029854 80028C54 00000000 */ nop -/* 029858 80028C58 E724000C */ swc1 $f4, 0xc($t9) -/* 02985C 80028C5C 8C680000 */ lw $t0, ($v1) -/* 029860 80028C60 C4460010 */ lwc1 $f6, 0x10($v0) -/* 029864 80028C64 00000000 */ nop -/* 029868 80028C68 E5060010 */ swc1 $f6, 0x10($t0) -/* 02986C 80028C6C 8C690000 */ lw $t1, ($v1) -/* 029870 80028C70 C4480014 */ lwc1 $f8, 0x14($v0) -/* 029874 80028C74 00000000 */ nop -/* 029878 80028C78 E5280014 */ swc1 $f8, 0x14($t1) -.L80028C7C: -/* 02987C 80028C7C 3C058012 */ lui $a1, %hi(D_8011B0A4) # $a1, 0x8012 -/* 029880 80028C80 24A5B0A4 */ addiu $a1, %lo(D_8011B0A4) # addiu $a1, $a1, -0x4f5c -/* 029884 80028C84 0C01A102 */ jal func_80068408 -/* 029888 80028C88 2484B0A0 */ addiu $a0, %lo(D_8011B0A0) # addiu $a0, $a0, -0x4f60 -/* 02988C 80028C8C 3C0A8012 */ lui $t2, %hi(D_8011B0DC) # $t2, 0x8012 -/* 029890 80028C90 8D4AB0DC */ lw $t2, %lo(D_8011B0DC)($t2) -/* 029894 80028C94 3C038012 */ lui $v1, %hi(D_8011B0B8) # $v1, 0x8012 -/* 029898 80028C98 11400009 */ beqz $t2, .L80028CC0 -/* 02989C 80028C9C 2463B0B8 */ addiu $v1, %lo(D_8011B0B8) # addiu $v1, $v1, -0x4f48 -/* 0298A0 80028CA0 3C048012 */ lui $a0, %hi(D_8011B0A0) # $a0, 0x8012 -/* 0298A4 80028CA4 3C058012 */ lui $a1, %hi(D_8011B0A4) # $a1, 0x8012 -/* 0298A8 80028CA8 3C068012 */ lui $a2, %hi(D_8011B0A8) # $a2, 0x8012 -/* 0298AC 80028CAC 8C670000 */ lw $a3, ($v1) -/* 0298B0 80028CB0 24C6B0A8 */ addiu $a2, %lo(D_8011B0A8) # addiu $a2, $a2, -0x4f58 -/* 0298B4 80028CB4 24A5B0A4 */ addiu $a1, %lo(D_8011B0A4) # addiu $a1, $a1, -0x4f5c -/* 0298B8 80028CB8 0C004B57 */ jal func_80012D5C -/* 0298BC 80028CBC 2484B0A0 */ addiu $a0, %lo(D_8011B0A0) # addiu $a0, $a0, -0x4f60 -.L80028CC0: -/* 0298C0 80028CC0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0298C4 80028CC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0298C8 80028CC8 03E00008 */ jr $ra -/* 0298CC 80028CCC 00000000 */ nop - diff --git a/asm/non_matchings/unknown_0255E0/func_80028CD0.s b/asm/non_matchings/unknown_0255E0/func_80028CD0.s index fca2c488..2c1b4e39 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028CD0.s +++ b/asm/non_matchings/unknown_0255E0/func_80028CD0.s @@ -65,7 +65,7 @@ glabel func_80028CD0 /* 0299C4 80028DC4 E42AD31C */ swc1 $f10, %lo(D_8011D31C)($at) /* 0299C8 80028DC8 0C02E2E3 */ jal func_800B8B8C /* 0299CC 80028DCC AFA7003C */ sw $a3, 0x3c($sp) -/* 0299D0 80028DD0 0C006E9D */ jal func_8001BA74 +/* 0299D0 80028DD0 0C006E9D */ jal getPlayerStructArray /* 0299D4 80028DD4 27A40040 */ addiu $a0, $sp, 0x40 /* 0299D8 80028DD8 3C0F8012 */ lui $t7, %hi(D_8011B0B0) # $t7, 0x8012 /* 0299DC 80028DDC 8DEFB0B0 */ lw $t7, %lo(D_8011B0B0)($t7) diff --git a/asm/non_matchings/unknown_0255E0/func_80028FAC.s b/asm/non_matchings/unknown_0255E0/func_80028FAC.s index 4f24d3c6..37f70df5 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028FAC.s +++ b/asm/non_matchings/unknown_0255E0/func_80028FAC.s @@ -117,7 +117,7 @@ glabel func_80028FAC /* 029D58 80029158 26B5B0A8 */ addiu $s5, %lo(D_8011B0A8) # addiu $s5, $s5, -0x4f58 /* 029D5C 8002915C 02402025 */ move $a0, $s2 .L80029160: -/* 029D60 80029160 0C003A52 */ jal func_8000E948 +/* 029D60 80029160 0C003A52 */ jal getObject /* 029D64 80029164 241000FF */ li $s0, 255 /* 029D68 80029168 84430006 */ lh $v1, 6($v0) /* 029D6C 8002916C 8FAF0158 */ lw $t7, 0x158($sp) @@ -217,7 +217,7 @@ glabel func_80028FAC /* 029EC0 800292C0 25F8FFFF */ addiu $t8, $t7, -1 /* 029EC4 800292C4 AFB80044 */ sw $t8, 0x44($sp) .L800292C8: -/* 029EC8 800292C8 0C003A52 */ jal func_8000E948 +/* 029EC8 800292C8 0C003A52 */ jal getObject /* 029ECC 800292CC 02402025 */ move $a0, $s2 /* 029ED0 800292D0 84430006 */ lh $v1, 6($v0) /* 029ED4 800292D4 8FB90158 */ lw $t9, 0x158($sp) @@ -335,7 +335,7 @@ glabel func_80028FAC /* 02A070 80029470 AFAD0044 */ sw $t5, 0x44($sp) /* 02A074 80029474 02402025 */ move $a0, $s2 .L80029478: -/* 02A078 80029478 0C003A52 */ jal func_8000E948 +/* 02A078 80029478 0C003A52 */ jal getObject /* 02A07C 8002947C 241000FF */ li $s0, 255 /* 02A080 80029480 84430006 */ lh $v1, 6($v0) /* 02A084 80029484 8FB80158 */ lw $t8, 0x158($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_8002A05C.s b/asm/non_matchings/unknown_0255E0/func_8002A05C.s deleted file mode 100644 index 7ab83127..00000000 --- a/asm/non_matchings/unknown_0255E0/func_8002A05C.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_8002A05C -/* 02AC5C 8002A05C 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 02AC60 8002A060 3C07800E */ lui $a3, %hi(D_800DC918) # $a3, 0x800e -/* 02AC64 8002A064 8CE7C918 */ lw $a3, %lo(D_800DC918)($a3) -/* 02AC68 8002A068 AFB1000C */ sw $s1, 0xc($sp) -/* 02AC6C 8002A06C AFB00008 */ sw $s0, 8($sp) -/* 02AC70 8002A070 84E8001A */ lh $t0, 0x1a($a3) -/* 02AC74 8002A074 00808025 */ move $s0, $a0 -/* 02AC78 8002A078 00A08825 */ move $s1, $a1 -/* 02AC7C 8002A07C 00001825 */ move $v1, $zero -/* 02AC80 8002A080 19000027 */ blez $t0, .L8002A120 -/* 02AC84 8002A084 00001025 */ move $v0, $zero -/* 02AC88 8002A088 00002825 */ move $a1, $zero -.L8002A08C: -/* 02AC8C 8002A08C 8CEE0008 */ lw $t6, 8($a3) -/* 02AC90 8002A090 00000000 */ nop -/* 02AC94 8002A094 01C52021 */ addu $a0, $t6, $a1 -/* 02AC98 8002A098 848F0006 */ lh $t7, 6($a0) -/* 02AC9C 8002A09C 00000000 */ nop -/* 02ACA0 8002A0A0 25F80004 */ addiu $t8, $t7, 4 -/* 02ACA4 8002A0A4 0218082A */ slt $at, $s0, $t8 -/* 02ACA8 8002A0A8 10200019 */ beqz $at, .L8002A110 -/* 02ACAC 8002A0AC 00000000 */ nop -/* 02ACB0 8002A0B0 84990000 */ lh $t9, ($a0) -/* 02ACB4 8002A0B4 00000000 */ nop -/* 02ACB8 8002A0B8 2729FFFC */ addiu $t1, $t9, -4 -/* 02ACBC 8002A0BC 0130082A */ slt $at, $t1, $s0 -/* 02ACC0 8002A0C0 10200013 */ beqz $at, .L8002A110 -/* 02ACC4 8002A0C4 00000000 */ nop -/* 02ACC8 8002A0C8 848A000A */ lh $t2, 0xa($a0) -/* 02ACCC 8002A0CC 00000000 */ nop -/* 02ACD0 8002A0D0 254B0004 */ addiu $t3, $t2, 4 -/* 02ACD4 8002A0D4 022B082A */ slt $at, $s1, $t3 -/* 02ACD8 8002A0D8 1020000D */ beqz $at, .L8002A110 -/* 02ACDC 8002A0DC 00000000 */ nop -/* 02ACE0 8002A0E0 848C0004 */ lh $t4, 4($a0) -/* 02ACE4 8002A0E4 00000000 */ nop -/* 02ACE8 8002A0E8 258DFFFC */ addiu $t5, $t4, -4 -/* 02ACEC 8002A0EC 01B1082A */ slt $at, $t5, $s1 -/* 02ACF0 8002A0F0 10200007 */ beqz $at, .L8002A110 -/* 02ACF4 8002A0F4 00000000 */ nop -/* 02ACF8 8002A0F8 ACC20000 */ sw $v0, ($a2) -/* 02ACFC 8002A0FC 3C07800E */ lui $a3, %hi(D_800DC918) # $a3, 0x800e -/* 02AD00 8002A100 8CE7C918 */ lw $a3, %lo(D_800DC918)($a3) -/* 02AD04 8002A104 24630001 */ addiu $v1, $v1, 1 -/* 02AD08 8002A108 84E8001A */ lh $t0, 0x1a($a3) -/* 02AD0C 8002A10C 24C60004 */ addiu $a2, $a2, 4 -.L8002A110: -/* 02AD10 8002A110 24420001 */ addiu $v0, $v0, 1 -/* 02AD14 8002A114 0048082A */ slt $at, $v0, $t0 -/* 02AD18 8002A118 1420FFDC */ bnez $at, .L8002A08C -/* 02AD1C 8002A11C 24A5000C */ addiu $a1, $a1, 0xc -.L8002A120: -/* 02AD20 8002A120 8FB00008 */ lw $s0, 8($sp) -/* 02AD24 8002A124 8FB1000C */ lw $s1, 0xc($sp) -/* 02AD28 8002A128 27BD0010 */ addiu $sp, $sp, 0x10 -/* 02AD2C 8002A12C 03E00008 */ jr $ra -/* 02AD30 8002A130 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/unknown_0255E0/func_8002A134.s b/asm/non_matchings/unknown_0255E0/func_8002A134.s index 8f0806a5..aa7be802 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A134.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A134.s @@ -92,24 +92,3 @@ glabel func_8002A134 /* 02AE90 8002A290 27BD0018 */ addiu $sp, $sp, 0x18 /* 02AE94 8002A294 03E00008 */ jr $ra /* 02AE98 8002A298 00601025 */ move $v0, $v1 - -/* 02AE9C 8002A29C 04800008 */ bltz $a0, .L8002A2C0 -/* 02AEA0 8002A2A0 3C03800E */ lui $v1, %hi(D_800DC918) # $v1, 0x800e -/* 02AEA4 8002A2A4 8C63C918 */ lw $v1, %lo(D_800DC918)($v1) -/* 02AEA8 8002A2A8 0004C100 */ sll $t8, $a0, 4 -/* 02AEAC 8002A2AC 846E001A */ lh $t6, 0x1a($v1) -/* 02AEB0 8002A2B0 0304C021 */ addu $t8, $t8, $a0 -/* 02AEB4 8002A2B4 01C4082A */ slt $at, $t6, $a0 -/* 02AEB8 8002A2B8 10200003 */ beqz $at, .L8002A2C8 -/* 02AEBC 8002A2BC 00000000 */ nop -.L8002A2C0: -/* 02AEC0 8002A2C0 03E00008 */ jr $ra -/* 02AEC4 8002A2C4 00001025 */ move $v0, $zero - -.L8002A2C8: -/* 02AEC8 8002A2C8 8C6F0004 */ lw $t7, 4($v1) -/* 02AECC 8002A2CC 0018C080 */ sll $t8, $t8, 2 -/* 02AED0 8002A2D0 01F81021 */ addu $v0, $t7, $t8 -/* 02AED4 8002A2D4 03E00008 */ jr $ra -/* 02AED8 8002A2D8 00000000 */ nop - diff --git a/asm/non_matchings/unknown_0255E0/func_8002A2DC.s b/asm/non_matchings/unknown_0255E0/func_8002A2DC.s deleted file mode 100644 index 0c91f0ec..00000000 --- a/asm/non_matchings/unknown_0255E0/func_8002A2DC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8002A2DC -/* 02AEDC 8002A2DC 04800008 */ bltz $a0, .L8002A300 -/* 02AEE0 8002A2E0 3C03800E */ lui $v1, %hi(D_800DC918) # $v1, 0x800e -/* 02AEE4 8002A2E4 8C63C918 */ lw $v1, %lo(D_800DC918)($v1) -/* 02AEE8 8002A2E8 0004C080 */ sll $t8, $a0, 2 -/* 02AEEC 8002A2EC 846E001A */ lh $t6, 0x1a($v1) -/* 02AEF0 8002A2F0 0304C023 */ subu $t8, $t8, $a0 -/* 02AEF4 8002A2F4 01C4082A */ slt $at, $t6, $a0 -/* 02AEF8 8002A2F8 10200003 */ beqz $at, .L8002A308 -/* 02AEFC 8002A2FC 00000000 */ nop -.L8002A300: -/* 02AF00 8002A300 03E00008 */ jr $ra -/* 02AF04 8002A304 00001025 */ move $v0, $zero - -.L8002A308: -/* 02AF08 8002A308 8C6F0008 */ lw $t7, 8($v1) -/* 02AF0C 8002A30C 0018C080 */ sll $t8, $t8, 2 -/* 02AF10 8002A310 01F81021 */ addu $v0, $t7, $t8 -/* 02AF14 8002A314 03E00008 */ jr $ra -/* 02AF18 8002A318 00000000 */ nop - diff --git a/asm/non_matchings/unknown_0255E0/func_8002C7D4.s b/asm/non_matchings/unknown_0255E0/func_8002C7D4.s index 5fadae3d..32ffde75 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002C7D4.s +++ b/asm/non_matchings/unknown_0255E0/func_8002C7D4.s @@ -84,9 +84,9 @@ glabel func_8002C7D4 /* 02D50C 8002C90C 00000000 */ nop /* 02D510 8002C910 10800005 */ beqz $a0, .L8002C928 /* 02D514 8002C914 00000000 */ nop -/* 02D518 8002C918 0C003FEE */ jal func_8000FFB8 +/* 02D518 8002C918 0C003FEE */ jal particlePtrList_addObject /* 02D51C 8002C91C 00000000 */ nop -/* 02D520 8002C920 0C004013 */ jal func_8001004C +/* 02D520 8002C920 0C004013 */ jal particlePtrList_flush /* 02D524 8002C924 00000000 */ nop .L8002C928: /* 02D528 8002C928 0C003181 */ jal func_8000C604 diff --git a/asm/non_matchings/unknown_0255E0/func_80030A74.s b/asm/non_matchings/unknown_0255E0/func_80030A74.s index 6d43db27..a4ce0495 100644 --- a/asm/non_matchings/unknown_0255E0/func_80030A74.s +++ b/asm/non_matchings/unknown_0255E0/func_80030A74.s @@ -26,7 +26,7 @@ glabel func_80030A74 /* 0316D4 80030AD4 10000005 */ b .L80030AEC /* 0316D8 80030AD8 AFAE0074 */ sw $t6, 0x74($sp) .L80030ADC: -/* 0316DC 80030ADC 0C006E9D */ jal func_8001BA74 +/* 0316DC 80030ADC 0C006E9D */ jal getPlayerStructArray /* 0316E0 80030AE0 AFAB0044 */ sw $t3, 0x44($sp) /* 0316E4 80030AE4 8FAB0044 */ lw $t3, 0x44($sp) /* 0316E8 80030AE8 0040F825 */ move $ra, $v0 diff --git a/asm/non_matchings/unknown_0255E0/func_80031018.s b/asm/non_matchings/unknown_0255E0/func_80031018.s deleted file mode 100644 index 96404e99..00000000 --- a/asm/non_matchings/unknown_0255E0/func_80031018.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80031018 -/* 031C18 80031018 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 031C1C 8003101C 44800000 */ mtc1 $zero, $f0 -/* 031C20 80031020 3C01C780 */ li $at, 0xC7800000 # -65536.000000 -/* 031C24 80031024 44812000 */ mtc1 $at, $f4 -/* 031C28 80031028 3C028012 */ lui $v0, %hi(D_8011B0B0) # $v0, 0x8012 -/* 031C2C 8003102C 8C42B0B0 */ lw $v0, %lo(D_8011B0B0)($v0) -/* 031C30 80031030 AFBF0024 */ sw $ra, 0x24($sp) -/* 031C34 80031034 E7A00034 */ swc1 $f0, 0x34($sp) -/* 031C38 80031038 E7A00030 */ swc1 $f0, 0x30($sp) -/* 031C3C 8003103C E7A4002C */ swc1 $f4, 0x2c($sp) -/* 031C40 80031040 844E0004 */ lh $t6, 4($v0) -/* 031C44 80031044 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 031C48 80031048 A7AE003C */ sh $t6, 0x3c($sp) -/* 031C4C 8003104C 844F0002 */ lh $t7, 2($v0) -/* 031C50 80031050 44813000 */ mtc1 $at, $f6 -/* 031C54 80031054 A7AF003A */ sh $t7, 0x3a($sp) -/* 031C58 80031058 84580000 */ lh $t8, ($v0) -/* 031C5C 8003105C 27A40050 */ addiu $a0, $sp, 0x50 -/* 031C60 80031060 27A50038 */ addiu $a1, $sp, 0x38 -/* 031C64 80031064 E7A00044 */ swc1 $f0, 0x44($sp) -/* 031C68 80031068 E7A00048 */ swc1 $f0, 0x48($sp) -/* 031C6C 8003106C E7A0004C */ swc1 $f0, 0x4c($sp) -/* 031C70 80031070 E7A60040 */ swc1 $f6, 0x40($sp) -/* 031C74 80031074 0C01BF0C */ jal func_8006FC30 -/* 031C78 80031078 A7B80038 */ sh $t8, 0x38($sp) -/* 031C7C 8003107C 8FA50034 */ lw $a1, 0x34($sp) -/* 031C80 80031080 8FA60030 */ lw $a2, 0x30($sp) -/* 031C84 80031084 8FA7002C */ lw $a3, 0x2c($sp) -/* 031C88 80031088 27B90034 */ addiu $t9, $sp, 0x34 -/* 031C8C 8003108C 27A80030 */ addiu $t0, $sp, 0x30 -/* 031C90 80031090 27A9002C */ addiu $t1, $sp, 0x2c -/* 031C94 80031094 AFA90018 */ sw $t1, 0x18($sp) -/* 031C98 80031098 AFA80014 */ sw $t0, 0x14($sp) -/* 031C9C 8003109C AFB90010 */ sw $t9, 0x10($sp) -/* 031CA0 800310A0 0C01BD93 */ jal func_8006F64C -/* 031CA4 800310A4 27A40050 */ addiu $a0, $sp, 0x50 -/* 031CA8 800310A8 444AF800 */ cfc1 $t2, $31 -/* 031CAC 800310AC C7A80034 */ lwc1 $f8, 0x34($sp) -/* 031CB0 800310B0 35410003 */ ori $at, $t2, 3 -/* 031CB4 800310B4 38210002 */ xori $at, $at, 2 -/* 031CB8 800310B8 44C1F800 */ ctc1 $at, $31 -/* 031CBC 800310BC C7B00030 */ lwc1 $f16, 0x30($sp) -/* 031CC0 800310C0 460042A4 */ cvt.w.s $f10, $f8 -/* 031CC4 800310C4 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 031CC8 800310C8 44CAF800 */ ctc1 $t2, $31 -/* 031CCC 800310CC 3C028012 */ lui $v0, %hi(D_8011D468) # $v0, 0x8012 -/* 031CD0 800310D0 440B5000 */ mfc1 $t3, $f10 -/* 031CD4 800310D4 444CF800 */ cfc1 $t4, $31 -/* 031CD8 800310D8 8FBF0024 */ lw $ra, 0x24($sp) -/* 031CDC 800310DC 35810003 */ ori $at, $t4, 3 -/* 031CE0 800310E0 38210002 */ xori $at, $at, 2 -/* 031CE4 800310E4 44C1F800 */ ctc1 $at, $31 -/* 031CE8 800310E8 2442D468 */ addiu $v0, %lo(D_8011D468) # addiu $v0, $v0, -0x2b98 -/* 031CEC 800310EC 460084A4 */ cvt.w.s $f18, $f16 -/* 031CF0 800310F0 27BD0090 */ addiu $sp, $sp, 0x90 -/* 031CF4 800310F4 44CCF800 */ ctc1 $t4, $31 -/* 031CF8 800310F8 440D9000 */ mfc1 $t5, $f18 -/* 031CFC 800310FC AC4B0000 */ sw $t3, ($v0) -/* 031D00 80031100 444EF800 */ cfc1 $t6, $31 -/* 031D04 80031104 AC4D0004 */ sw $t5, 4($v0) -/* 031D08 80031108 35C10003 */ ori $at, $t6, 3 -/* 031D0C 8003110C 38210002 */ xori $at, $at, 2 -/* 031D10 80031110 44C1F800 */ ctc1 $at, $31 -/* 031D14 80031114 00000000 */ nop -/* 031D18 80031118 460021A4 */ cvt.w.s $f6, $f4 -/* 031D1C 8003111C 440F3000 */ mfc1 $t7, $f6 -/* 031D20 80031120 44CEF800 */ ctc1 $t6, $31 -/* 031D24 80031124 03E00008 */ jr $ra -/* 031D28 80031128 AC4F0008 */ sw $t7, 8($v0) - -/* 031D2C 8003112C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/func_80033F60.s index ae522d9c..ea9afef2 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/func_80033F60.s @@ -272,7 +272,7 @@ glabel func_80033F60 /* 034F6C 8003436C 2407002C */ li $a3, 44 /* 034F70 80034370 0C00FF11 */ jal func_8003FC44 /* 034F74 80034374 E7A60014 */ swc1 $f6, 0x14($sp) -/* 034F78 80034378 0C003FEE */ jal func_8000FFB8 +/* 034F78 80034378 0C003FEE */ jal particlePtrList_addObject /* 034F7C 8003437C 02002025 */ move $a0, $s0 /* 034F80 80034380 1000000D */ b .L800343B8 /* 034F84 80034384 86090048 */ lh $t1, 0x48($s0) @@ -308,7 +308,7 @@ glabel func_80033F60 /* 034FF0 800343F0 2401012A */ li $at, 298 /* 034FF4 800343F4 15A1000F */ bne $t5, $at, .L80034434 /* 034FF8 800343F8 00000000 */ nop -/* 034FFC 800343FC 0C003FEE */ jal func_8000FFB8 +/* 034FFC 800343FC 0C003FEE */ jal particlePtrList_addObject /* 035000 80034400 02002025 */ move $a0, $s0 /* 035004 80034404 C60C000C */ lwc1 $f12, 0xc($s0) /* 035008 80034408 C60E0010 */ lwc1 $f14, 0x10($s0) @@ -340,7 +340,7 @@ glabel func_80033F60 /* 03506C 8003446C 00000000 */ nop /* 035070 80034470 4500002C */ bc1f .L80034524 /* 035074 80034474 8FBF002C */ lw $ra, 0x2c($sp) -/* 035078 80034478 0C003FEE */ jal func_8000FFB8 +/* 035078 80034478 0C003FEE */ jal particlePtrList_addObject /* 03507C 8003447C 02002025 */ move $a0, $s0 /* 035080 80034480 10000028 */ b .L80034524 /* 035084 80034484 8FBF002C */ lw $ra, 0x2c($sp) @@ -384,7 +384,7 @@ glabel func_80033F60 /* 03510C 8003450C AFA00014 */ sw $zero, 0x14($sp) /* 035110 80034510 0C002556 */ jal func_80009558 /* 035114 80034514 24040155 */ li $a0, 341 -/* 035118 80034518 0C003FEE */ jal func_8000FFB8 +/* 035118 80034518 0C003FEE */ jal particlePtrList_addObject /* 03511C 8003451C 02002025 */ move $a0, $s0 .L80034520: /* 035120 80034520 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80034860.s b/asm/non_matchings/unknown_032760/func_80034860.s index 819fcadb..4a346fdb 100644 --- a/asm/non_matchings/unknown_032760/func_80034860.s +++ b/asm/non_matchings/unknown_032760/func_80034860.s @@ -165,7 +165,7 @@ glabel func_80034860 .L80034AD0: /* 0356D0 80034AD0 11000004 */ beqz $t0, .L80034AE4 /* 0356D4 80034AD4 8FBF002C */ lw $ra, 0x2c($sp) -/* 0356D8 80034AD8 0C003FEE */ jal func_8000FFB8 +/* 0356D8 80034AD8 0C003FEE */ jal particlePtrList_addObject /* 0356DC 80034ADC 02002025 */ move $a0, $s0 /* 0356E0 80034AE0 8FBF002C */ lw $ra, 0x2c($sp) .L80034AE4: diff --git a/asm/non_matchings/unknown_032760/func_80034B74.s b/asm/non_matchings/unknown_032760/func_80034B74.s index de293b6c..73469250 100644 --- a/asm/non_matchings/unknown_032760/func_80034B74.s +++ b/asm/non_matchings/unknown_032760/func_80034B74.s @@ -18,7 +18,7 @@ glabel func_80034B74 /* 0357B4 80034BB4 8C90003C */ lw $s0, 0x3c($a0) /* 0357B8 80034BB8 00803025 */ move $a2, $a0 /* 0357BC 80034BBC AFA60098 */ sw $a2, 0x98($sp) -/* 0357C0 80034BC0 0C006E9D */ jal func_8001BA74 +/* 0357C0 80034BC0 0C006E9D */ jal getPlayerStructArray /* 0357C4 80034BC4 27A4008C */ addiu $a0, $sp, 0x8c /* 0357C8 80034BC8 AFA20094 */ sw $v0, 0x94($sp) /* 0357CC 80034BCC 9204000B */ lbu $a0, 0xb($s0) diff --git a/asm/non_matchings/unknown_032760/func_80034E9C.s b/asm/non_matchings/unknown_032760/func_80034E9C.s index 7ef65e3e..29754dbe 100644 --- a/asm/non_matchings/unknown_032760/func_80034E9C.s +++ b/asm/non_matchings/unknown_032760/func_80034E9C.s @@ -63,7 +63,7 @@ glabel func_80034E9C /* 035B8C 80034F8C 8E0D0054 */ lw $t5, 0x54($s0) /* 035B90 80034F90 00002025 */ move $a0, $zero /* 035B94 80034F94 E5A60028 */ swc1 $f6, 0x28($t5) -/* 035B98 80034F98 0C006EB2 */ jal func_8001BAC8 +/* 035B98 80034F98 0C006EB2 */ jal getPlayerStruct /* 035B9C 80034F9C AFA30054 */ sw $v1, 0x54($sp) /* 035BA0 80034FA0 8FA30054 */ lw $v1, 0x54($sp) /* 035BA4 80034FA4 1040009E */ beqz $v0, .L80035220 diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/func_80035260.s index ab76416b..56fa4148 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -149,7 +149,7 @@ glabel func_80035260 /* 03609C 8003549C 00000000 */ nop /* 0360A0 800354A0 AC400078 */ sw $zero, 0x78($v0) .L800354A4: -/* 0360A4 800354A4 0C003FEE */ jal func_8000FFB8 +/* 0360A4 800354A4 0C003FEE */ jal particlePtrList_addObject /* 0360A8 800354A8 02002025 */ move $a0, $s0 .L800354AC: /* 0360AC 800354AC 8FAB0034 */ lw $t3, 0x34($sp) @@ -176,7 +176,7 @@ glabel func_80035260 /* 0360F4 800354F4 A22F000A */ sb $t7, 0xa($s1) /* 0360F8 800354F8 24180003 */ li $t8, 3 /* 0360FC 800354FC 8224000A */ lb $a0, 0xa($s1) -/* 036100 80035500 0C006EB2 */ jal func_8001BAC8 +/* 036100 80035500 0C006EB2 */ jal getPlayerStruct /* 036104 80035504 A238000B */ sb $t8, 0xb($s1) /* 036108 80035508 44800000 */ mtc1 $zero, $f0 /* 03610C 8003550C 10400007 */ beqz $v0, .L8003552C @@ -196,7 +196,7 @@ glabel func_80035260 /* 03613C 8003553C 862A0008 */ lh $t2, 8($s1) /* 036140 80035540 8224000A */ lb $a0, 0xa($s1) /* 036144 80035544 01455823 */ subu $t3, $t2, $a1 -/* 036148 80035548 0C006EB2 */ jal func_8001BAC8 +/* 036148 80035548 0C006EB2 */ jal getPlayerStruct /* 03614C 8003554C A62B0008 */ sh $t3, 8($s1) /* 036150 80035550 10400004 */ beqz $v0, .L80035564 /* 036154 80035554 00403825 */ move $a3, $v0 @@ -245,7 +245,7 @@ glabel func_80035260 /* 0361F0 800355F0 A0C801CF */ sb $t0, 0x1cf($a2) .L800355F4: /* 0361F4 800355F4 8224000A */ lb $a0, 0xa($s1) -/* 0361F8 800355F8 0C006EB2 */ jal func_8001BAC8 +/* 0361F8 800355F8 0C006EB2 */ jal getPlayerStruct /* 0361FC 800355FC 00000000 */ nop /* 036200 80035600 10400009 */ beqz $v0, .L80035628 /* 036204 80035604 240B0080 */ li $t3, 128 diff --git a/asm/non_matchings/unknown_032760/func_800357D4.s b/asm/non_matchings/unknown_032760/func_800357D4.s index e861fd37..f1701739 100644 --- a/asm/non_matchings/unknown_032760/func_800357D4.s +++ b/asm/non_matchings/unknown_032760/func_800357D4.s @@ -3,7 +3,7 @@ glabel func_800357D4 /* 0363D8 800357D8 AFBF0014 */ sw $ra, 0x14($sp) /* 0363DC 800357DC AFA40020 */ sw $a0, 0x20($sp) /* 0363E0 800357E0 AFA50024 */ sw $a1, 0x24($sp) -/* 0363E4 800357E4 0C006EB2 */ jal func_8001BAC8 +/* 0363E4 800357E4 0C006EB2 */ jal getPlayerStruct /* 0363E8 800357E8 00002025 */ move $a0, $zero /* 0363EC 800357EC 1040001F */ beqz $v0, .L8003586C /* 0363F0 800357F0 8FAC0020 */ lw $t4, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003588C.s b/asm/non_matchings/unknown_032760/func_8003588C.s index 3d21eacc..b5467400 100644 --- a/asm/non_matchings/unknown_032760/func_8003588C.s +++ b/asm/non_matchings/unknown_032760/func_8003588C.s @@ -51,7 +51,7 @@ glabel func_8003588C /* 036548 80035948 0002CA80 */ sll $t9, $v0, 0xa /* 03654C 8003594C 07210004 */ bgez $t9, .L80035960 /* 036550 80035950 8FBF0014 */ lw $ra, 0x14($sp) -/* 036554 80035954 0C003FEE */ jal func_8000FFB8 +/* 036554 80035954 0C003FEE */ jal particlePtrList_addObject /* 036558 80035958 00000000 */ nop /* 03655C 8003595C 8FBF0014 */ lw $ra, 0x14($sp) .L80035960: diff --git a/asm/non_matchings/unknown_032760/func_8003596C.s b/asm/non_matchings/unknown_032760/func_8003596C.s index 41da3de5..cc1daa30 100644 --- a/asm/non_matchings/unknown_032760/func_8003596C.s +++ b/asm/non_matchings/unknown_032760/func_8003596C.s @@ -34,7 +34,7 @@ glabel func_8003596C /* 0365E4 800359E4 314B4000 */ andi $t3, $t2, 0x4000 /* 0365E8 800359E8 15600038 */ bnez $t3, .L80035ACC /* 0365EC 800359EC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0365F0 800359F0 0C006E9D */ jal func_8001BA74 +/* 0365F0 800359F0 0C006E9D */ jal getPlayerStructArray /* 0365F4 800359F4 27A40040 */ addiu $a0, $sp, 0x40 /* 0365F8 800359F8 8FAC0040 */ lw $t4, 0x40($sp) /* 0365FC 800359FC 00008825 */ move $s1, $zero diff --git a/asm/non_matchings/unknown_032760/func_80035AE8.s b/asm/non_matchings/unknown_032760/func_80035AE8.s index a9277027..3cf6a451 100644 --- a/asm/non_matchings/unknown_032760/func_80035AE8.s +++ b/asm/non_matchings/unknown_032760/func_80035AE8.s @@ -87,7 +87,7 @@ glabel func_80035AE8 /* 03682C 80035C2C 0002C280 */ sll $t8, $v0, 0xa /* 036830 80035C30 07010004 */ bgez $t8, .L80035C44 /* 036834 80035C34 8FBF0014 */ lw $ra, 0x14($sp) -/* 036838 80035C38 0C003FEE */ jal func_8000FFB8 +/* 036838 80035C38 0C003FEE */ jal particlePtrList_addObject /* 03683C 80035C3C 00000000 */ nop /* 036840 80035C40 8FBF0014 */ lw $ra, 0x14($sp) .L80035C44: diff --git a/asm/non_matchings/unknown_032760/func_80035C50.s b/asm/non_matchings/unknown_032760/func_80035C50.s index b18def50..17b96a9f 100644 --- a/asm/non_matchings/unknown_032760/func_80035C50.s +++ b/asm/non_matchings/unknown_032760/func_80035C50.s @@ -17,7 +17,7 @@ glabel func_80035C50 /* 03688C 80035C8C 00000000 */ nop /* 036890 80035C90 37191000 */ ori $t9, $t8, 0x1000 /* 036894 80035C94 A4990006 */ sh $t9, 6($a0) -/* 036898 80035C98 0C006EB2 */ jal func_8001BAC8 +/* 036898 80035C98 0C006EB2 */ jal getPlayerStruct /* 03689C 80035C9C 00002025 */ move $a0, $zero /* 0368A0 80035CA0 8E48004C */ lw $t0, 0x4c($s2) /* 0368A4 80035CA4 8E4A0078 */ lw $t2, 0x78($s2) @@ -26,7 +26,7 @@ glabel func_80035C50 /* 0368B0 80035CB0 012A082A */ slt $at, $t1, $t2 /* 0368B4 80035CB4 10200051 */ beqz $at, .L80035DFC /* 0368B8 80035CB8 8FBF003C */ lw $ra, 0x3c($sp) -/* 0368BC 80035CBC 0C006E9D */ jal func_8001BA74 +/* 0368BC 80035CBC 0C006E9D */ jal getPlayerStructArray /* 0368C0 80035CC0 27A40054 */ addiu $a0, $sp, 0x54 /* 0368C4 80035CC4 8FAB0054 */ lw $t3, 0x54($sp) /* 0368C8 80035CC8 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/unknown_032760/func_80035E34.s b/asm/non_matchings/unknown_032760/func_80035E34.s index abac12f7..912e4f7c 100644 --- a/asm/non_matchings/unknown_032760/func_80035E34.s +++ b/asm/non_matchings/unknown_032760/func_80035E34.s @@ -21,7 +21,7 @@ glabel func_80035E34 /* 036A7C 80035E7C 8FA50024 */ lw $a1, 0x24($sp) /* 036A80 80035E80 0C02BF0F */ jal func_800AFC3C /* 036A84 80035E84 02002025 */ move $a0, $s0 -/* 036A88 80035E88 0C006EB2 */ jal func_8001BAC8 +/* 036A88 80035E88 0C006EB2 */ jal getPlayerStruct /* 036A8C 80035E8C 00002025 */ move $a0, $zero /* 036A90 80035E90 8E030060 */ lw $v1, 0x60($s0) /* 036A94 80035E94 24050001 */ li $a1, 1 diff --git a/asm/non_matchings/unknown_032760/func_80035F6C.s b/asm/non_matchings/unknown_032760/func_80035F6C.s index 0401a283..bed50f15 100644 --- a/asm/non_matchings/unknown_032760/func_80035F6C.s +++ b/asm/non_matchings/unknown_032760/func_80035F6C.s @@ -7,7 +7,7 @@ glabel func_80035F6C /* 036B80 80035F80 05C1002C */ bgez $t6, .L80036034 /* 036B84 80035F84 8FBF0014 */ lw $ra, 0x14($sp) /* 036B88 80035F88 8C840078 */ lw $a0, 0x78($a0) -/* 036B8C 80035F8C 0C006EB2 */ jal func_8001BAC8 +/* 036B8C 80035F8C 0C006EB2 */ jal getPlayerStruct /* 036B90 80035F90 AFA60018 */ sw $a2, 0x18($sp) /* 036B94 80035F94 8FA60018 */ lw $a2, 0x18($sp) /* 036B98 80035F98 10400025 */ beqz $v0, .L80036030 diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index 0b04e4ea..1b4b3523 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -44,7 +44,7 @@ glabel func_800361E0 /* 036E80 80036280 E7A00070 */ swc1 $f0, 0x70($sp) /* 036E84 80036284 00002025 */ move $a0, $zero /* 036E88 80036288 E600001C */ swc1 $f0, 0x1c($s0) -/* 036E8C 8003628C 0C006EB2 */ jal func_8001BAC8 +/* 036E8C 8003628C 0C006EB2 */ jal getPlayerStruct /* 036E90 80036290 E6000024 */ swc1 $f0, 0x24($s0) /* 036E94 80036294 00402825 */ move $a1, $v0 /* 036E98 80036298 10400042 */ beqz $v0, .L800363A4 diff --git a/asm/non_matchings/unknown_032760/func_800370D4.s b/asm/non_matchings/unknown_032760/func_800370D4.s index 55b19218..4617731f 100644 --- a/asm/non_matchings/unknown_032760/func_800370D4.s +++ b/asm/non_matchings/unknown_032760/func_800370D4.s @@ -8,7 +8,7 @@ glabel func_800370D4 /* 037CEC 800370EC AFA50074 */ sw $a1, 0x74($sp) /* 037CF0 800370F0 18400005 */ blez $v0, .L80037108 /* 037CF4 800370F4 00000000 */ nop -/* 037CF8 800370F8 0C003FEE */ jal func_8000FFB8 +/* 037CF8 800370F8 0C003FEE */ jal particlePtrList_addObject /* 037CFC 800370FC 02202025 */ move $a0, $s1 /* 037D00 80037100 10000119 */ b .L80037568 /* 037D04 80037104 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80037A18.s b/asm/non_matchings/unknown_032760/func_80037A18.s index 6adff54c..e296b239 100644 --- a/asm/non_matchings/unknown_032760/func_80037A18.s +++ b/asm/non_matchings/unknown_032760/func_80037A18.s @@ -178,7 +178,7 @@ glabel func_80037A18 /* 0388A8 80037CA8 11F80004 */ beq $t7, $t8, .L80037CBC /* 0388AC 80037CAC 00000000 */ nop .L80037CB0: -/* 0388B0 80037CB0 0C003FEE */ jal func_8000FFB8 +/* 0388B0 80037CB0 0C003FEE */ jal particlePtrList_addObject /* 0388B4 80037CB4 00A02025 */ move $a0, $a1 /* 0388B8 80037CB8 AE000064 */ sw $zero, 0x64($s0) .L80037CBC: diff --git a/asm/non_matchings/unknown_032760/func_800387CC.s b/asm/non_matchings/unknown_032760/func_800387CC.s index a93b0ae6..ab4bce5e 100644 --- a/asm/non_matchings/unknown_032760/func_800387CC.s +++ b/asm/non_matchings/unknown_032760/func_800387CC.s @@ -7,7 +7,7 @@ glabel func_800387CC /* 0393E0 800387E0 10400006 */ beqz $v0, .L800387FC /* 0393E4 800387E4 00001825 */ move $v1, $zero /* 0393E8 800387E8 2444FFFF */ addiu $a0, $v0, -1 -/* 0393EC 800387EC 0C006EB2 */ jal func_8001BAC8 +/* 0393EC 800387EC 0C006EB2 */ jal getPlayerStruct /* 0393F0 800387F0 AFA70020 */ sw $a3, 0x20($sp) /* 0393F4 800387F4 8FA70020 */ lw $a3, 0x20($sp) /* 0393F8 800387F8 00401825 */ move $v1, $v0 diff --git a/asm/non_matchings/unknown_032760/func_800389B8.s b/asm/non_matchings/unknown_032760/func_800389B8.s index 8df7043f..de3ae2ad 100644 --- a/asm/non_matchings/unknown_032760/func_800389B8.s +++ b/asm/non_matchings/unknown_032760/func_800389B8.s @@ -36,7 +36,7 @@ glabel func_800389B8 /* 03963C 80038A3C E4900010 */ swc1 $f16, 0x10($a0) /* 039640 80038A40 14200006 */ bnez $at, .L80038A5C /* 039644 80038A44 E4880014 */ swc1 $f8, 0x14($a0) -/* 039648 80038A48 0C003FEE */ jal func_8000FFB8 +/* 039648 80038A48 0C003FEE */ jal particlePtrList_addObject /* 03964C 80038A4C AFA40018 */ sw $a0, 0x18($sp) /* 039650 80038A50 8FA40018 */ lw $a0, 0x18($sp) /* 039654 80038A54 240900FF */ li $t1, 255 diff --git a/asm/non_matchings/unknown_032760/func_80038AD4.s b/asm/non_matchings/unknown_032760/func_80038AD4.s index cb02f03f..33b14047 100644 --- a/asm/non_matchings/unknown_032760/func_80038AD4.s +++ b/asm/non_matchings/unknown_032760/func_80038AD4.s @@ -31,7 +31,7 @@ glabel func_80038AD4 /* 039744 80038B44 29010100 */ slti $at, $t0, 0x100 /* 039748 80038B48 14200006 */ bnez $at, .L80038B64 /* 03974C 80038B4C E4900010 */ swc1 $f16, 0x10($a0) -/* 039750 80038B50 0C003FEE */ jal func_8000FFB8 +/* 039750 80038B50 0C003FEE */ jal particlePtrList_addObject /* 039754 80038B54 AFA40018 */ sw $a0, 0x18($sp) /* 039758 80038B58 8FA40018 */ lw $a0, 0x18($sp) /* 03975C 80038B5C 240900FF */ li $t1, 255 diff --git a/asm/non_matchings/unknown_032760/func_80038BF4.s b/asm/non_matchings/unknown_032760/func_80038BF4.s index 79e25306..2368f037 100644 --- a/asm/non_matchings/unknown_032760/func_80038BF4.s +++ b/asm/non_matchings/unknown_032760/func_80038BF4.s @@ -73,7 +73,7 @@ glabel func_80038BF4 /* 039908 80038D08 10000003 */ b .L80038D18 /* 03990C 80038D0C E6100008 */ swc1 $f16, 8($s0) .L80038D10: -/* 039910 80038D10 0C003FEE */ jal func_8000FFB8 +/* 039910 80038D10 0C003FEE */ jal particlePtrList_addObject /* 039914 80038D14 02002025 */ move $a0, $s0 .L80038D18: /* 039918 80038D18 8E190074 */ lw $t9, 0x74($s0) diff --git a/asm/non_matchings/unknown_032760/func_80038F58.s b/asm/non_matchings/unknown_032760/func_80038F58.s index 793e3dbc..8a26d60c 100644 --- a/asm/non_matchings/unknown_032760/func_80038F58.s +++ b/asm/non_matchings/unknown_032760/func_80038F58.s @@ -56,7 +56,7 @@ glabel func_80038F58 /* 039C28 80039028 1020003F */ beqz $at, .L80039128 /* 039C2C 8003902C 8FBF0044 */ lw $ra, 0x44($sp) /* 039C30 80039030 44822000 */ mtc1 $v0, $f4 -/* 039C34 80039034 0C006E9D */ jal func_8001BA74 +/* 039C34 80039034 0C006E9D */ jal getPlayerStructArray /* 039C38 80039038 468025A0 */ cvt.s.w $f22, $f4 /* 039C3C 8003903C 8FB80074 */ lw $t8, 0x74($sp) /* 039C40 80039040 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index eae07092..1571fc68 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -47,7 +47,7 @@ glabel func_80039330 /* 039FDC 800393DC 00002025 */ move $a0, $zero /* 039FE0 800393E0 E7A0009C */ swc1 $f0, 0x9c($sp) /* 039FE4 800393E4 E600001C */ swc1 $f0, 0x1c($s0) -/* 039FE8 800393E8 0C006EB2 */ jal func_8001BAC8 +/* 039FE8 800393E8 0C006EB2 */ jal getPlayerStruct /* 039FEC 800393EC E6000024 */ swc1 $f0, 0x24($s0) /* 039FF0 800393F0 00401825 */ move $v1, $v0 /* 039FF4 800393F4 10400019 */ beqz $v0, .L8003945C @@ -1408,7 +1408,7 @@ glabel func_80039330 /* 03B3D8 8003A7D8 46204120 */ cvt.s.d $f4, $f8 /* 03B3DC 8003A7DC E6240004 */ swc1 $f4, 4($s1) .L8003A7E0: -/* 03B3E0 8003A7E0 0C006E9D */ jal func_8001BA74 +/* 03B3E0 8003A7E0 0C006E9D */ jal getPlayerStructArray /* 03B3E4 8003A7E4 27A40078 */ addiu $a0, $sp, 0x78 /* 03B3E8 8003A7E8 8C480000 */ lw $t0, ($v0) /* 03B3EC 8003A7EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003AE50.s b/asm/non_matchings/unknown_032760/func_8003AE50.s index 3b7da49a..466f4d99 100644 --- a/asm/non_matchings/unknown_032760/func_8003AE50.s +++ b/asm/non_matchings/unknown_032760/func_8003AE50.s @@ -23,7 +23,7 @@ glabel func_8003AE50 /* 03BAA4 8003AEA4 1020005D */ beqz $at, .L8003B01C /* 03BAA8 8003AEA8 27A40074 */ addiu $a0, $sp, 0x74 /* 03BAAC 8003AEAC 44822000 */ mtc1 $v0, $f4 -/* 03BAB0 8003AEB0 0C006E9D */ jal func_8001BA74 +/* 03BAB0 8003AEB0 0C006E9D */ jal getPlayerStructArray /* 03BAB4 8003AEB4 468025A0 */ cvt.s.w $f22, $f4 /* 03BAB8 8003AEB8 8FB80074 */ lw $t8, 0x74($sp) /* 03BABC 8003AEBC 0000A025 */ move $s4, $zero diff --git a/asm/non_matchings/unknown_032760/func_8003B174.s b/asm/non_matchings/unknown_032760/func_8003B174.s index 5c544939..23542d87 100644 --- a/asm/non_matchings/unknown_032760/func_8003B174.s +++ b/asm/non_matchings/unknown_032760/func_8003B174.s @@ -24,7 +24,7 @@ glabel func_8003B174 /* 03BDCC 8003B1CC 10200056 */ beqz $at, .L8003B328 /* 03BDD0 8003B1D0 27A40084 */ addiu $a0, $sp, 0x84 /* 03BDD4 8003B1D4 44822000 */ mtc1 $v0, $f4 -/* 03BDD8 8003B1D8 0C006E9D */ jal func_8001BA74 +/* 03BDD8 8003B1D8 0C006E9D */ jal getPlayerStructArray /* 03BDDC 8003B1DC 468025A0 */ cvt.s.w $f22, $f4 /* 03BDE0 8003B1E0 8FB80084 */ lw $t8, 0x84($sp) /* 03BDE4 8003B1E4 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index 43b1ca62..52767314 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -55,7 +55,7 @@ glabel func_8003B4BC /* 03C188 8003B588 1000008B */ b .L8003B7B8 /* 03C18C 8003B58C AE2B007C */ sw $t3, 0x7c($s1) .L8003B590: -/* 03C190 8003B590 0C003FEE */ jal func_8000FFB8 +/* 03C190 8003B590 0C003FEE */ jal particlePtrList_addObject /* 03C194 8003B594 02202025 */ move $a0, $s1 /* 03C198 8003B598 10000088 */ b .L8003B7BC /* 03C19C 8003B59C 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003C7A4.s b/asm/non_matchings/unknown_032760/func_8003C7A4.s index 76251dc6..afa20dd3 100644 --- a/asm/non_matchings/unknown_032760/func_8003C7A4.s +++ b/asm/non_matchings/unknown_032760/func_8003C7A4.s @@ -47,7 +47,7 @@ glabel func_8003C7A4 /* 03D454 8003C854 44852000 */ mtc1 $a1, $f4 /* 03D458 8003C858 27A4008C */ addiu $a0, $sp, 0x8c /* 03D45C 8003C85C AFA60060 */ sw $a2, 0x60($sp) -/* 03D460 8003C860 0C006E9D */ jal func_8001BA74 +/* 03D460 8003C860 0C006E9D */ jal getPlayerStructArray /* 03D464 8003C864 468025A0 */ cvt.s.w $f22, $f4 /* 03D468 8003C868 8FAD008C */ lw $t5, 0x8c($sp) /* 03D46C 8003C86C 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/func_8003CA68.s index c7795619..53c5e200 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/func_8003CA68.s @@ -206,7 +206,7 @@ glabel func_8003CA68 .L8003CD6C: /* 03D96C 8003CD6C AE090078 */ sw $t1, 0x78($s0) /* 03D970 8003CD70 AFA8005C */ sw $t0, 0x5c($sp) -/* 03D974 8003CD74 0C006EB2 */ jal func_8001BAC8 +/* 03D974 8003CD74 0C006EB2 */ jal getPlayerStruct /* 03D978 8003CD78 00002025 */ move $a0, $zero /* 03D97C 8003CD7C 8FA8005C */ lw $t0, 0x5c($sp) /* 03D980 8003CD80 10400013 */ beqz $v0, .L8003CDD0 diff --git a/asm/non_matchings/unknown_032760/func_8003D058.s b/asm/non_matchings/unknown_032760/func_8003D058.s index 7cabb7bc..85848c8c 100644 --- a/asm/non_matchings/unknown_032760/func_8003D058.s +++ b/asm/non_matchings/unknown_032760/func_8003D058.s @@ -4,7 +4,7 @@ glabel func_8003D058 /* 03DC60 8003D060 AFA5004C */ sw $a1, 0x4c($sp) /* 03DC64 8003D064 00803025 */ move $a2, $a0 /* 03DC68 8003D068 8C840078 */ lw $a0, 0x78($a0) -/* 03DC6C 8003D06C 0C006EB2 */ jal func_8001BAC8 +/* 03DC6C 8003D06C 0C006EB2 */ jal getPlayerStruct /* 03DC70 8003D070 AFA60048 */ sw $a2, 0x48($sp) /* 03DC74 8003D074 8FA60048 */ lw $a2, 0x48($sp) /* 03DC78 8003D078 10400088 */ beqz $v0, .L8003D29C diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/func_8003D2B8.s index 67a404ab..539890a0 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/func_8003D2B8.s @@ -59,7 +59,7 @@ glabel func_8003D2B8 /* 03DF98 8003D398 00000000 */ nop /* 03DF9C 8003D39C A04D01D8 */ sb $t5, 0x1d8($v0) .L8003D3A0: -/* 03DFA0 8003D3A0 0C003FEE */ jal func_8000FFB8 +/* 03DFA0 8003D3A0 0C003FEE */ jal particlePtrList_addObject /* 03DFA4 8003D3A4 AFA20020 */ sw $v0, 0x20($sp) /* 03DFA8 8003D3A8 8FA20020 */ lw $v0, 0x20($sp) /* 03DFAC 8003D3AC 2401FFFF */ li $at, -1 diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index 523369e1..c89376bd 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -47,7 +47,7 @@ glabel func_8003D5A0 /* 03E250 8003D650 00000000 */ nop /* 03E254 8003D654 1D80014F */ bgtz $t4, .L8003DB94 /* 03E258 8003D658 8FBF0024 */ lw $ra, 0x24($sp) -/* 03E25C 8003D65C 0C003FEE */ jal func_8000FFB8 +/* 03E25C 8003D65C 0C003FEE */ jal particlePtrList_addObject /* 03E260 8003D660 02002025 */ move $a0, $s0 /* 03E264 8003D664 1000014B */ b .L8003DB94 /* 03E268 8003D668 8FBF0024 */ lw $ra, 0x24($sp) @@ -387,7 +387,7 @@ glabel func_8003D5A0 /* 03E75C 8003DB5C 28410002 */ slti $at, $v0, 2 /* 03E760 8003DB60 14200005 */ bnez $at, .L8003DB78 /* 03E764 8003DB64 2418FFFF */ li $t8, -1 -/* 03E768 8003DB68 0C003FEE */ jal func_8000FFB8 +/* 03E768 8003DB68 0C003FEE */ jal particlePtrList_addObject /* 03E76C 8003DB6C 02002025 */ move $a0, $s0 /* 03E770 8003DB70 10000008 */ b .L8003DB94 /* 03E774 8003DB74 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003DBA0.s b/asm/non_matchings/unknown_032760/func_8003DBA0.s index 1f615ab2..03245723 100644 --- a/asm/non_matchings/unknown_032760/func_8003DBA0.s +++ b/asm/non_matchings/unknown_032760/func_8003DBA0.s @@ -42,7 +42,7 @@ glabel func_8003DBA0 /* 03E838 8003DC38 848D0006 */ lh $t5, 6($a0) /* 03E83C 8003DC3C 00000000 */ nop /* 03E840 8003DC40 35AE0600 */ ori $t6, $t5, 0x600 -/* 03E844 8003DC44 0C003FEE */ jal func_8000FFB8 +/* 03E844 8003DC44 0C003FEE */ jal particlePtrList_addObject /* 03E848 8003DC48 A48E0006 */ sh $t6, 6($a0) /* 03E84C 8003DC4C 8FBF0014 */ lw $ra, 0x14($sp) .L8003DC50: diff --git a/asm/non_matchings/unknown_032760/func_8003DC5C.s b/asm/non_matchings/unknown_032760/func_8003DC5C.s index adddaa87..5fa591c1 100644 --- a/asm/non_matchings/unknown_032760/func_8003DC5C.s +++ b/asm/non_matchings/unknown_032760/func_8003DC5C.s @@ -41,7 +41,7 @@ glabel func_8003DC5C /* 03E8F0 8003DCF0 848C0006 */ lh $t4, 6($a0) /* 03E8F4 8003DCF4 00000000 */ nop /* 03E8F8 8003DCF8 358D0600 */ ori $t5, $t4, 0x600 -/* 03E8FC 8003DCFC 0C003FEE */ jal func_8000FFB8 +/* 03E8FC 8003DCFC 0C003FEE */ jal particlePtrList_addObject /* 03E900 8003DD00 A48D0006 */ sh $t5, 6($a0) /* 03E904 8003DD04 8FBF0014 */ lw $ra, 0x14($sp) .L8003DD08: diff --git a/asm/non_matchings/unknown_032760/func_8003DE74.s b/asm/non_matchings/unknown_032760/func_8003DE74.s index f5babfa7..a1c21eb4 100644 --- a/asm/non_matchings/unknown_032760/func_8003DE74.s +++ b/asm/non_matchings/unknown_032760/func_8003DE74.s @@ -31,7 +31,7 @@ glabel func_8003DE74 /* 03EAE8 8003DEE8 13200004 */ beqz $t9, .L8003DEFC /* 03EAEC 8003DEEC 8FBF0014 */ lw $ra, 0x14($sp) .L8003DEF0: -/* 03EAF0 8003DEF0 0C003FEE */ jal func_8000FFB8 +/* 03EAF0 8003DEF0 0C003FEE */ jal particlePtrList_addObject /* 03EAF4 8003DEF4 00000000 */ nop /* 03EAF8 8003DEF8 8FBF0014 */ lw $ra, 0x14($sp) .L8003DEFC: diff --git a/asm/non_matchings/unknown_032760/func_8003DF08.s b/asm/non_matchings/unknown_032760/func_8003DF08.s index 6a5d766c..3dc46079 100644 --- a/asm/non_matchings/unknown_032760/func_8003DF08.s +++ b/asm/non_matchings/unknown_032760/func_8003DF08.s @@ -35,7 +35,7 @@ glabel func_8003DF08 /* 03EB8C 8003DF8C 240A0001 */ li $t2, 1 /* 03EB90 8003DF90 012A5804 */ sllv $t3, $t2, $t1 /* 03EB94 8003DF94 010B6025 */ or $t4, $t0, $t3 -/* 03EB98 8003DF98 0C003FEE */ jal func_8000FFB8 +/* 03EB98 8003DF98 0C003FEE */ jal particlePtrList_addObject /* 03EB9C 8003DF9C A44C0008 */ sh $t4, 8($v0) /* 03EBA0 8003DFA0 8FA60018 */ lw $a2, 0x18($sp) /* 03EBA4 8003DFA4 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003DFCC.s b/asm/non_matchings/unknown_032760/func_8003DFCC.s index ec958611..ac739e76 100644 --- a/asm/non_matchings/unknown_032760/func_8003DFCC.s +++ b/asm/non_matchings/unknown_032760/func_8003DFCC.s @@ -94,7 +94,7 @@ glabel func_8003DFCC /* 03ED1C 8003E11C 30480800 */ andi $t0, $v0, 0x800 /* 03ED20 8003E120 11000004 */ beqz $t0, .L8003E134 /* 03ED24 8003E124 8FBF0014 */ lw $ra, 0x14($sp) -/* 03ED28 8003E128 0C003FEE */ jal func_8000FFB8 +/* 03ED28 8003E128 0C003FEE */ jal particlePtrList_addObject /* 03ED2C 8003E12C 00000000 */ nop /* 03ED30 8003E130 8FBF0014 */ lw $ra, 0x14($sp) .L8003E134: diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 181b488d..91817585 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -294,7 +294,7 @@ glabel func_8003E694 /* 03F6E8 8003EAE8 2407002C */ li $a3, 44 /* 03F6EC 8003EAEC 0C00FF11 */ jal func_8003FC44 /* 03F6F0 8003EAF0 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03F6F4 8003EAF4 0C003FEE */ jal func_8000FFB8 +/* 03F6F4 8003EAF4 0C003FEE */ jal particlePtrList_addObject /* 03F6F8 8003EAF8 02002025 */ move $a0, $s0 /* 03F6FC 8003EAFC 10000041 */ b .L8003EC04 /* 03F700 8003EB00 8FBF002C */ lw $ra, 0x2c($sp) @@ -363,7 +363,7 @@ glabel func_8003E694 /* 03F7EC 8003EBEC AFA80010 */ sw $t0, 0x10($sp) /* 03F7F0 8003EBF0 0C00FF11 */ jal func_8003FC44 /* 03F7F4 8003EBF4 E7B00014 */ swc1 $f16, 0x14($sp) -/* 03F7F8 8003EBF8 0C003FEE */ jal func_8000FFB8 +/* 03F7F8 8003EBF8 0C003FEE */ jal particlePtrList_addObject /* 03F7FC 8003EBFC 02002025 */ move $a0, $s0 .L8003EC00: /* 03F800 8003EC00 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index ea56a6df..3b307b61 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -193,7 +193,7 @@ glabel func_8003F2E8 /* 0401CC 8003F5CC 1D800007 */ bgtz $t4, .L8003F5EC /* 0401D0 8003F5D0 8FAE0064 */ lw $t6, 0x64($sp) /* 0401D4 8003F5D4 A50D0006 */ sh $t5, 6($t0) -/* 0401D8 8003F5D8 0C003FEE */ jal func_8000FFB8 +/* 0401D8 8003F5D8 0C003FEE */ jal particlePtrList_addObject /* 0401DC 8003F5DC AFA80038 */ sw $t0, 0x38($sp) /* 0401E0 8003F5E0 8FA80038 */ lw $t0, 0x38($sp) /* 0401E4 8003F5E4 00000000 */ nop @@ -339,7 +339,7 @@ glabel func_8003F2E8 /* 0403EC 8003F7EC 1DA00006 */ bgtz $t5, .L8003F808 /* 0403F0 8003F7F0 00000000 */ nop /* 0403F4 8003F7F4 A50F0006 */ sh $t7, 6($t0) -/* 0403F8 8003F7F8 0C003FEE */ jal func_8000FFB8 +/* 0403F8 8003F7F8 0C003FEE */ jal particlePtrList_addObject /* 0403FC 8003F7FC AFA80038 */ sw $t0, 0x38($sp) /* 040400 8003F800 8FA80038 */ lw $t0, 0x38($sp) /* 040404 8003F804 00000000 */ nop @@ -571,7 +571,7 @@ glabel func_8003F2E8 /* 04074C 8003FB4C 2401000A */ li $at, 10 /* 040750 8003FB50 10410005 */ beq $v0, $at, .L8003FB68 /* 040754 8003FB54 00000000 */ nop -/* 040758 8003FB58 0C003FEE */ jal func_8000FFB8 +/* 040758 8003FB58 0C003FEE */ jal particlePtrList_addObject /* 04075C 8003FB5C 02002025 */ move $a0, $s0 /* 040760 8003FB60 10000035 */ b .L8003FC38 /* 040764 8003FB64 8FBF002C */ lw $ra, 0x2c($sp) @@ -627,7 +627,7 @@ glabel func_8003F2E8 /* 040820 8003FC20 AFB80010 */ sw $t8, 0x10($sp) /* 040824 8003FC24 0C00FF11 */ jal func_8003FC44 /* 040828 8003FC28 E7A60014 */ swc1 $f6, 0x14($sp) -/* 04082C 8003FC2C 0C003FEE */ jal func_8000FFB8 +/* 04082C 8003FC2C 0C003FEE */ jal particlePtrList_addObject /* 040830 8003FC30 02002025 */ move $a0, $s0 .L8003FC34: /* 040834 8003FC34 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003FD68.s b/asm/non_matchings/unknown_032760/func_8003FD68.s index d01a539b..eee36cf9 100644 --- a/asm/non_matchings/unknown_032760/func_8003FD68.s +++ b/asm/non_matchings/unknown_032760/func_8003FD68.s @@ -94,7 +94,7 @@ glabel func_8003FD68 /* 040AD4 8003FED4 AFAC0028 */ sw $t4, 0x28($sp) /* 040AD8 8003FED8 8FA40048 */ lw $a0, 0x48($sp) .L8003FEDC: -/* 040ADC 8003FEDC 0C003FEE */ jal func_8000FFB8 +/* 040ADC 8003FEDC 0C003FEE */ jal particlePtrList_addObject /* 040AE0 8003FEE0 00000000 */ nop /* 040AE4 8003FEE4 8FBF003C */ lw $ra, 0x3c($sp) /* 040AE8 8003FEE8 8FB00038 */ lw $s0, 0x38($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003FEF4.s b/asm/non_matchings/unknown_032760/func_8003FEF4.s index cdbfe645..d3bfbe82 100644 --- a/asm/non_matchings/unknown_032760/func_8003FEF4.s +++ b/asm/non_matchings/unknown_032760/func_8003FEF4.s @@ -67,7 +67,7 @@ glabel func_8003FEF4 /* 040BF8 8003FFF8 0C002629 */ jal func_800098A4 /* 040BFC 8003FFFC AFAF0030 */ sw $t7, 0x30($sp) /* 040C00 80040000 8FA40048 */ lw $a0, 0x48($sp) -/* 040C04 80040004 0C003FEE */ jal func_8000FFB8 +/* 040C04 80040004 0C003FEE */ jal particlePtrList_addObject /* 040C08 80040008 00000000 */ nop /* 040C0C 8004000C 8FBF0044 */ lw $ra, 0x44($sp) /* 040C10 80040010 8FB00040 */ lw $s0, 0x40($sp) diff --git a/asm/non_matchings/unknown_032760/func_8004001C.s b/asm/non_matchings/unknown_032760/func_8004001C.s index 73b3a337..f28fed8f 100644 --- a/asm/non_matchings/unknown_032760/func_8004001C.s +++ b/asm/non_matchings/unknown_032760/func_8004001C.s @@ -27,7 +27,7 @@ glabel func_8004001C /* 040C80 80040080 0C00265A */ jal func_80009968 /* 040C84 80040084 46802320 */ cvt.s.w $f12, $f4 /* 040C88 80040088 8FA40020 */ lw $a0, 0x20($sp) -/* 040C8C 8004008C 0C003FEE */ jal func_8000FFB8 +/* 040C8C 8004008C 0C003FEE */ jal particlePtrList_addObject /* 040C90 80040090 00000000 */ nop /* 040C94 80040094 8FBF001C */ lw $ra, 0x1c($sp) /* 040C98 80040098 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/unknown_032760/func_80040820.s b/asm/non_matchings/unknown_032760/func_80040820.s index 686105dd..931c5cf1 100644 --- a/asm/non_matchings/unknown_032760/func_80040820.s +++ b/asm/non_matchings/unknown_032760/func_80040820.s @@ -5,7 +5,7 @@ glabel func_80040820 /* 04142C 8004082C 0C019888 */ jal func_80066220 /* 041430 80040830 AFA5005C */ sw $a1, 0x5c($sp) /* 041434 80040834 27A40050 */ addiu $a0, $sp, 0x50 -/* 041438 80040838 0C006E9D */ jal func_8001BA74 +/* 041438 80040838 0C006E9D */ jal getPlayerStructArray /* 04143C 8004083C AFA20054 */ sw $v0, 0x54($sp) /* 041440 80040840 8FA50050 */ lw $a1, 0x50($sp) /* 041444 80040844 8FA60054 */ lw $a2, 0x54($sp) diff --git a/asm/non_matchings/unknown_032760/func_80042210.s b/asm/non_matchings/unknown_032760/func_80042210.s index d33c8ca8..3ac262b7 100644 --- a/asm/non_matchings/unknown_032760/func_80042210.s +++ b/asm/non_matchings/unknown_032760/func_80042210.s @@ -47,7 +47,7 @@ glabel func_80042210 /* 042EC4 800422C4 11210007 */ beq $t1, $at, .L800422E4 /* 042EC8 800422C8 8FBF0014 */ lw $ra, 0x14($sp) .L800422CC: -/* 042ECC 800422CC 0C003FEE */ jal func_8000FFB8 +/* 042ECC 800422CC 0C003FEE */ jal particlePtrList_addObject /* 042ED0 800422D0 00000000 */ nop /* 042ED4 800422D4 10000003 */ b .L800422E4 /* 042ED8 800422D8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index 3c4d8b9f..1e46259c 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -96,7 +96,7 @@ glabel func_800422F0 /* 043060 80042460 24040002 */ li $a0, 2 /* 043064 80042464 0C01B629 */ jal func_8006D8A4 /* 043068 80042468 00000000 */ nop -/* 04306C 8004246C 0C003FEE */ jal func_8000FFB8 +/* 04306C 8004246C 0C003FEE */ jal particlePtrList_addObject /* 043070 80042470 02202025 */ move $a0, $s1 /* 043074 80042474 10000140 */ b .L80042978 /* 043078 80042478 8FBF0034 */ lw $ra, 0x34($sp) @@ -366,7 +366,7 @@ glabel func_800422F0 /* 043454 80042854 24040002 */ li $a0, 2 /* 043458 80042858 0C01B629 */ jal func_8006D8A4 /* 04345C 8004285C 00000000 */ nop -/* 043460 80042860 0C003FEE */ jal func_8000FFB8 +/* 043460 80042860 0C003FEE */ jal particlePtrList_addObject /* 043464 80042864 02202025 */ move $a0, $s1 /* 043468 80042868 10000043 */ b .L80042978 /* 04346C 8004286C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index d5f83721..a318f05a 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -15,7 +15,7 @@ glabel func_8004447C /* 0450B0 800444B0 00A08025 */ move $s0, $a1 /* 0450B4 800444B4 AFA60080 */ sw $a2, 0x80($sp) /* 0450B8 800444B8 AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 0450BC 800444BC 0C006E9D */ jal func_8001BA74 +/* 0450BC 800444BC 0C006E9D */ jal getPlayerStructArray /* 0450C0 800444C0 27A40058 */ addiu $a0, $sp, 0x58 /* 0450C4 800444C4 8FAE0058 */ lw $t6, 0x58($sp) /* 0450C8 800444C8 24010004 */ li $at, 4 @@ -285,7 +285,7 @@ glabel func_8004447C /* 045498 80044898 A7A70048 */ sh $a3, 0x48($sp) /* 04549C 8004489C A7A8004A */ sh $t0, 0x4a($sp) /* 0454A0 800448A0 A7A90046 */ sh $t1, 0x46($sp) -/* 0454A4 800448A4 0C006EB2 */ jal func_8001BAC8 +/* 0454A4 800448A4 0C006EB2 */ jal getPlayerStruct /* 0454A8 800448A8 A7AA004C */ sh $t2, 0x4c($sp) /* 0454AC 800448AC 87A90046 */ lh $t1, 0x46($sp) /* 0454B0 800448B0 87A50052 */ lh $a1, 0x52($sp) @@ -345,7 +345,7 @@ glabel func_8004447C /* 045580 80044980 87A8004A */ lh $t0, 0x4a($sp) /* 045584 80044984 1440000A */ bnez $v0, .L800449B0 /* 045588 80044988 00C02025 */ move $a0, $a2 -/* 04558C 8004498C 0C006EB2 */ jal func_8001BAC8 +/* 04558C 8004498C 0C006EB2 */ jal getPlayerStruct /* 045590 80044990 A7A8004A */ sh $t0, 0x4a($sp) /* 045594 80044994 8C430064 */ lw $v1, 0x64($v0) /* 045598 80044998 87A8004A */ lh $t0, 0x4a($sp) @@ -636,7 +636,7 @@ glabel func_8004447C /* 0459B4 80044DB4 AFA20058 */ sw $v0, 0x58($sp) .L80044DB8: /* 0459B8 80044DB8 820401CF */ lb $a0, 0x1cf($s0) -/* 0459BC 80044DBC 0C006EB2 */ jal func_8001BAC8 +/* 0459BC 80044DBC 0C006EB2 */ jal getPlayerStruct /* 0459C0 80044DC0 00000000 */ nop /* 0459C4 80044DC4 8C430064 */ lw $v1, 0x64($v0) /* 0459C8 80044DC8 2401FFFF */ li $at, -1 @@ -776,7 +776,7 @@ glabel func_8004447C /* 045BA8 80044FA8 00A02025 */ move $a0, $a1 /* 045BAC 80044FAC 10AC0054 */ beq $a1, $t4, .L80045100 /* 045BB0 80044FB0 00000000 */ nop -/* 045BB4 80044FB4 0C006EB2 */ jal func_8001BAC8 +/* 045BB4 80044FB4 0C006EB2 */ jal getPlayerStruct /* 045BB8 80044FB8 A7A50052 */ sh $a1, 0x52($sp) /* 045BBC 80044FBC 8C430064 */ lw $v1, 0x64($v0) /* 045BC0 80044FC0 87A50052 */ lh $a1, 0x52($sp) diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index 1a4dab2d..5a79fb42 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -30,7 +30,7 @@ glabel func_800452A0 /* 045F10 80045310 E7B50018 */ swc1 $f21, 0x18($sp) /* 045F14 80045314 E7B4001C */ swc1 $f20, 0x1c($sp) /* 045F18 80045318 AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 045F1C 8004531C 0C006E9D */ jal func_8001BA74 +/* 045F1C 8004531C 0C006E9D */ jal getPlayerStructArray /* 045F20 80045320 27A4009C */ addiu $a0, $sp, 0x9c /* 045F24 80045324 8FAF009C */ lw $t7, 0x9c($sp) /* 045F28 80045328 24010004 */ li $at, 4 @@ -415,7 +415,7 @@ glabel func_800452A0 /* 046468 80045868 2401FFFF */ li $at, -1 /* 04646C 8004586C 12210004 */ beq $s1, $at, .L80045880 /* 046470 80045870 00000000 */ nop -/* 046474 80045874 0C006EB2 */ jal func_8001BAC8 +/* 046474 80045874 0C006EB2 */ jal getPlayerStruct /* 046478 80045878 02202025 */ move $a0, $s1 /* 04647C 8004587C 0040F025 */ move $fp, $v0 .L80045880: diff --git a/asm/non_matchings/unknown_043920/func_800521C4.s b/asm/non_matchings/unknown_043920/func_800521C4.s index 68784f80..4eaa3846 100644 --- a/asm/non_matchings/unknown_043920/func_800521C4.s +++ b/asm/non_matchings/unknown_043920/func_800521C4.s @@ -10,7 +10,7 @@ glabel func_800521C4 /* 052DE4 800521E4 83A3002B */ lb $v1, 0x2b($sp) /* 052DE8 800521E8 1040000C */ beqz $v0, .L8005221C /* 052DEC 800521EC 00000000 */ nop -/* 052DF0 800521F0 0C006EB2 */ jal func_8001BAC8 +/* 052DF0 800521F0 0C006EB2 */ jal getPlayerStruct /* 052DF4 800521F4 24040001 */ li $a0, 1 /* 052DF8 800521F8 8FA40030 */ lw $a0, 0x30($sp) /* 052DFC 800521FC 3C07481C */ lui $a3, (0x481C4000 >> 16) # lui $a3, 0x481c diff --git a/asm/non_matchings/unknown_043920/func_8005698C.s b/asm/non_matchings/unknown_043920/func_8005698C.s index 4b5ed100..40fc3e3e 100644 --- a/asm/non_matchings/unknown_043920/func_8005698C.s +++ b/asm/non_matchings/unknown_043920/func_8005698C.s @@ -61,7 +61,7 @@ glabel func_8005698C /* 057674 80056A74 E7B000A8 */ swc1 $f16, 0xa8($sp) /* 057678 80056A78 460A4780 */ add.s $f30, $f8, $f10 /* 05767C 80056A7C 4600D687 */ neg.s $f26, $f26 -/* 057680 80056A80 0C006E9D */ jal func_8001BA74 +/* 057680 80056A80 0C006E9D */ jal getPlayerStructArray /* 057684 80056A84 4600F787 */ neg.s $f30, $f30 /* 057688 80056A88 3C01800E */ lui $at, %hi(D_800E68C4) # $at, 0x800e /* 05768C 80056A8C C42C68C4 */ lwc1 $f12, %lo(D_800E68C4)($at) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index 19f331cd..a152a3db 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -159,7 +159,7 @@ glabel func_8005A6F0 /* 05B53C 8005A93C C422694C */ lwc1 $f2, %lo(D_800E694C)($at) /* 05B540 8005A940 1700007C */ bnez $t8, .L8005AB34 /* 05B544 8005A944 27A40090 */ addiu $a0, $sp, 0x90 -/* 05B548 8005A948 0C006E9D */ jal func_8001BA74 +/* 05B548 8005A948 0C006E9D */ jal getPlayerStructArray /* 05B54C 8005A94C E7A20078 */ swc1 $f2, 0x78($sp) /* 05B550 8005A950 8FAF0090 */ lw $t7, 0x90($sp) /* 05B554 8005A954 C7A20078 */ lwc1 $f2, 0x78($sp) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index 93a57aa2..246d154c 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -337,7 +337,7 @@ glabel func_8005C364 /* 05D458 8005C858 10000001 */ b .L8005C860 /* 05D45C 8005C85C 24052500 */ li $a1, 9472 .L8005C860: -/* 05D460 8005C860 0C006EB2 */ jal func_8001BAC8 +/* 05D460 8005C860 0C006EB2 */ jal getPlayerStruct /* 05D464 8005C864 AFA50038 */ sw $a1, 0x38($sp) /* 05D468 8005C868 AFA20030 */ sw $v0, 0x30($sp) /* 05D46C 8005C86C C626000C */ lwc1 $f6, 0xc($s1) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005D048.s b/asm/non_matchings/unknown_05CEF0/func_8005D048.s index 125f3938..70aad9a2 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005D048.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005D048.s @@ -4,7 +4,7 @@ glabel func_8005D048 /* 05DC50 8005D050 AFA40020 */ sw $a0, 0x20($sp) /* 05DC54 8005D054 AFA50024 */ sw $a1, 0x24($sp) /* 05DC58 8005D058 AFA60028 */ sw $a2, 0x28($sp) -/* 05DC5C 8005D05C 0C006EB2 */ jal func_8001BAC8 +/* 05DC5C 8005D05C 0C006EB2 */ jal getPlayerStruct /* 05DC60 8005D060 00002025 */ move $a0, $zero /* 05DC64 8005D064 8FAF0024 */ lw $t7, 0x24($sp) /* 05DC68 8005D068 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index b47a7c23..b593bc98 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -386,7 +386,7 @@ glabel func_8005D0D0 /* 05E274 8005D674 02002825 */ move $a1, $s0 /* 05E278 8005D678 0C017412 */ jal func_8005D048 /* 05E27C 8005D67C 24060028 */ li $a2, 40 -/* 05E280 8005D680 0C006EB2 */ jal func_8001BAC8 +/* 05E280 8005D680 0C006EB2 */ jal getPlayerStruct /* 05E284 8005D684 00002025 */ move $a0, $zero /* 05E288 8005D688 AFA20034 */ sw $v0, 0x34($sp) /* 05E28C 8005D68C C626000C */ lwc1 $f6, 0xc($s1) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index 48223c8d..4782b6a2 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -574,7 +574,7 @@ glabel func_8005D820 /* 05EC70 8005E070 02002825 */ move $a1, $s0 /* 05EC74 8005E074 0C017412 */ jal func_8005D048 /* 05EC78 8005E078 24060028 */ li $a2, 40 -/* 05EC7C 8005E07C 0C006EB2 */ jal func_8001BAC8 +/* 05EC7C 8005E07C 0C006EB2 */ jal getPlayerStruct /* 05EC80 8005E080 00002025 */ move $a0, $zero /* 05EC84 8005E084 AFA20034 */ sw $v0, 0x34($sp) /* 05EC88 8005E088 C62A000C */ lwc1 $f10, 0xc($s1) diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index e1ae402e..ea9a0676 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -284,7 +284,7 @@ glabel func_8005E4C0 /* 05F4EC 8005E8EC 10000001 */ b .L8005E8F4 /* 05F4F0 8005E8F0 24052500 */ li $a1, 9472 .L8005E8F4: -/* 05F4F4 8005E8F4 0C006EB2 */ jal func_8001BAC8 +/* 05F4F4 8005E8F4 0C006EB2 */ jal getPlayerStruct /* 05F4F8 8005E8F8 AFA50038 */ sw $a1, 0x38($sp) /* 05F4FC 8005E8FC AFA20030 */ sw $v0, 0x30($sp) /* 05F500 8005E900 C632000C */ lwc1 $f18, 0xc($s1) diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index f9a84b2b..f35bee2d 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -548,7 +548,7 @@ glabel func_8005EA90 /* 05FE80 8005F280 02002825 */ move $a1, $s0 /* 05FE84 8005F284 0C017412 */ jal func_8005D048 /* 05FE88 8005F288 24060028 */ li $a2, 40 -/* 05FE8C 8005F28C 0C006EB2 */ jal func_8001BAC8 +/* 05FE8C 8005F28C 0C006EB2 */ jal getPlayerStruct /* 05FE90 8005F290 00002025 */ move $a0, $zero /* 05FE94 8005F294 8C43004C */ lw $v1, 0x4c($v0) /* 05FE98 8005F298 8C500064 */ lw $s0, 0x64($v0) diff --git a/asm/non_matchings/unknown_05F690/func_8005F310.s b/asm/non_matchings/unknown_05F690/func_8005F310.s index 406e0eba..b6276a4f 100644 --- a/asm/non_matchings/unknown_05F690/func_8005F310.s +++ b/asm/non_matchings/unknown_05F690/func_8005F310.s @@ -317,7 +317,7 @@ glabel func_8005F310 /* 0603C4 8005F7C4 0C002DD4 */ jal func_8000B750 /* 0603C8 8005F7C8 24070001 */ li $a3, 1 .L8005F7CC: -/* 0603CC 8005F7CC 0C006EB2 */ jal func_8001BAC8 +/* 0603CC 8005F7CC 0C006EB2 */ jal getPlayerStruct /* 0603D0 8005F7D0 00002025 */ move $a0, $zero /* 0603D4 8005F7D4 8C43004C */ lw $v1, 0x4c($v0) /* 0603D8 8005F7D8 8C470064 */ lw $a3, 0x64($v0) diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index edbad0ea..8f058a03 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -285,8 +285,8 @@ glabel func_8006C60C /* 06D63C 8006CA3C 3C01800E */ lui $at, %hi(D_800DD38C) # $at, 0x800e /* 06D640 8006CA40 0C01C466 */ jal func_80071198 /* 06D644 8006CA44 A020D38C */ sb $zero, %lo(D_800DD38C)($at) -/* 06D648 8006CA48 3C098012 */ lui $t1, %hi(D_80123515) # $t1, 0x8012 -/* 06D64C 8006CA4C 81293515 */ lb $t1, %lo(D_80123515)($t1) +/* 06D648 8006CA48 3C098012 */ lui $t1, %hi(gIsPaused) # $t1, 0x8012 +/* 06D64C 8006CA4C 81293515 */ lb $t1, %lo(gIsPaused)($t1) /* 06D650 8006CA50 00000000 */ nop /* 06D654 8006CA54 15200003 */ bnez $t1, .L8006CA64 /* 06D658 8006CA58 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index 16fc62a9..62904546 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -37,11 +37,11 @@ glabel func_8006CCF0 /* 06D974 8006CD74 816BD374 */ lb $t3, %lo(D_800DD374)($t3) /* 06D978 8006CD78 8FAC004C */ lw $t4, 0x4c($sp) /* 06D97C 8006CD7C 11600003 */ beqz $t3, .L8006CD8C -/* 06D980 8006CD80 3C0E8012 */ lui $t6, %hi(D_80123515) # $t6, 0x8012 +/* 06D980 8006CD80 3C0E8012 */ lui $t6, %hi(gIsPaused) # $t6, 0x8012 /* 06D984 8006CD84 358D1000 */ ori $t5, $t4, 0x1000 /* 06D988 8006CD88 AFAD004C */ sw $t5, 0x4c($sp) .L8006CD8C: -/* 06D98C 8006CD8C 81CE3515 */ lb $t6, %lo(D_80123515)($t6) +/* 06D98C 8006CD8C 81CE3515 */ lb $t6, %lo(gIsPaused)($t6) /* 06D990 8006CD90 8FA40050 */ lw $a0, 0x50($sp) /* 06D994 8006CD94 15C00032 */ bnez $t6, .L8006CE60 /* 06D998 8006CD98 00000000 */ nop @@ -84,10 +84,10 @@ glabel func_8006CCF0 /* 06DA28 8006CE28 808C0000 */ lb $t4, ($a0) /* 06DA2C 8006CE2C 240D0001 */ li $t5, 1 /* 06DA30 8006CE30 15800004 */ bnez $t4, .L8006CE44 -/* 06DA34 8006CE34 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06DA34 8006CE34 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06DA38 8006CE38 AFA0004C */ sw $zero, 0x4c($sp) /* 06DA3C 8006CE3C 0C024E90 */ jal func_80093A40 -/* 06DA40 8006CE40 A02D3515 */ sb $t5, %lo(D_80123515)($at) +/* 06DA40 8006CE40 A02D3515 */ sb $t5, %lo(gIsPaused)($at) .L8006CE44: /* 06DA44 8006CE44 3C04800E */ lui $a0, %hi(D_800DD398) # $a0, 0x800e /* 06DA48 8006CE48 2484D398 */ addiu $a0, %lo(D_800DD398) # addiu $a0, $a0, -0x2c68 @@ -107,7 +107,7 @@ glabel func_8006CCF0 /* 06DA7C 8006CE7C 2484D398 */ addiu $a0, %lo(D_800DD398) # addiu $a0, $a0, -0x2c68 /* 06DA80 8006CE80 8FAE0050 */ lw $t6, 0x50($sp) .L8006CE84: -/* 06DA84 8006CE84 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06DA84 8006CE84 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06DA88 8006CE88 006E7823 */ subu $t7, $v1, $t6 /* 06DA8C 8006CE8C A08F0000 */ sb $t7, ($a0) /* 06DA90 8006CE90 80980000 */ lb $t8, ($a0) @@ -118,9 +118,9 @@ glabel func_8006CCF0 .L8006CEA4: /* 06DAA4 8006CEA4 10400002 */ beqz $v0, .L8006CEB0 /* 06DAA8 8006CEA8 00000000 */ nop -/* 06DAAC 8006CEAC A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06DAAC 8006CEAC A0203515 */ sb $zero, %lo(gIsPaused)($at) .L8006CEB0: -/* 06DAB0 8006CEB0 0C004013 */ jal func_8001004C +/* 06DAB0 8006CEB0 0C004013 */ jal particlePtrList_flush /* 06DAB4 8006CEB4 00000000 */ nop /* 06DAB8 8006CEB8 0C006FC8 */ jal func_8001BF20 /* 06DABC 8006CEBC 00000000 */ nop @@ -226,19 +226,19 @@ glabel func_8006CCF0 /* 06DC40 8006D040 24010002 */ li $at, 2 /* 06DC44 8006D044 14410003 */ bne $v0, $at, .L8006D054 /* 06DC48 8006D048 240B0001 */ li $t3, 1 -/* 06DC4C 8006D04C 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 -/* 06DC50 8006D050 A02B3515 */ sb $t3, %lo(D_80123515)($at) +/* 06DC4C 8006D04C 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 +/* 06DC50 8006D050 A02B3515 */ sb $t3, %lo(gIsPaused)($at) .L8006D054: /* 06DC54 8006D054 0C030D00 */ jal func_800C3400 /* 06DC58 8006D058 00000000 */ nop /* 06DC5C 8006D05C 24010002 */ li $at, 2 /* 06DC60 8006D060 10410003 */ beq $v0, $at, .L8006D070 -/* 06DC64 8006D064 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06DC64 8006D064 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06DC68 8006D068 0C025179 */ jal func_800945E4 -/* 06DC6C 8006D06C A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06DC6C 8006D06C A0203515 */ sb $zero, %lo(gIsPaused)($at) .L8006D070: -/* 06DC70 8006D070 3C0C8012 */ lui $t4, %hi(D_80123515) # $t4, 0x8012 -/* 06DC74 8006D074 818C3515 */ lb $t4, %lo(D_80123515)($t4) +/* 06DC70 8006D070 3C0C8012 */ lui $t4, %hi(gIsPaused) # $t4, 0x8012 +/* 06DC74 8006D074 818C3515 */ lb $t4, %lo(gIsPaused)($t4) /* 06DC78 8006D078 8FA50050 */ lw $a1, 0x50($sp) /* 06DC7C 8006D07C 11800050 */ beqz $t4, .L8006D1C0 /* 06DC80 8006D080 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 @@ -255,9 +255,9 @@ glabel func_8006CCF0 /* 06DCAC 8006D0AC 00000000 */ nop /* 06DCB0 8006D0B0 01A00008 */ jr $t5 /* 06DCB4 8006D0B4 00000000 */ nop -/* 06DCB8 8006D0B8 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06DCB8 8006D0B8 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06DCBC 8006D0BC 10000040 */ b .L8006D1C0 -/* 06DCC0 8006D0C0 A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06DCC0 8006D0C0 A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06DCC4 8006D0C4 0C000414 */ jal func_80001050 /* 06DCC8 8006D0C8 00000000 */ nop /* 06DCCC 8006D0CC 0C030C53 */ jal func_800C314C @@ -306,14 +306,14 @@ glabel func_8006CCF0 /* 06DD70 8006D170 360A0020 */ ori $t2, $s0, 0x20 /* 06DD74 8006D174 10000012 */ b .L8006D1C0 /* 06DD78 8006D178 01408025 */ move $s0, $t2 -/* 06DD7C 8006D17C 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06DD7C 8006D17C 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06DD80 8006D180 1000000F */ b .L8006D1C0 -/* 06DD84 8006D184 A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06DD84 8006D184 A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06DD88 8006D188 0C008B86 */ jal func_80022E18 /* 06DD8C 8006D18C 24040001 */ li $a0, 1 -/* 06DD90 8006D190 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06DD90 8006D190 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06DD94 8006D194 1000000A */ b .L8006D1C0 -/* 06DD98 8006D198 A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06DD98 8006D198 A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06DD9C 8006D19C 3C01800E */ lui $at, %hi(D_800DD390) # $at, 0x800e /* 06DDA0 8006D1A0 0C000414 */ jal func_80001050 /* 06DDA4 8006D1A4 A020D390 */ sb $zero, %lo(D_800DD390)($at) @@ -589,8 +589,8 @@ glabel func_8006CCF0 /* 06E180 8006D580 00000000 */ nop /* 06E184 8006D584 11C000AC */ beqz $t6, .L8006D838 .L8006D588: -/* 06E188 8006D588 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 -/* 06E18C 8006D58C A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06E188 8006D588 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 +/* 06E18C 8006D58C A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06E190 8006D590 3C01800E */ lui $at, %hi(D_800DD394) # $at, 0x800e /* 06E194 8006D594 A420D394 */ sh $zero, %lo(D_800DD394)($at) /* 06E198 8006D598 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index 50dfdf7e..8c0d1434 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -1,9 +1,9 @@ glabel func_8006DCF8 -/* 06E8F8 8006DCF8 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 +/* 06E8F8 8006DCF8 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 /* 06E8FC 8006DCFC 3C0E8012 */ lui $t6, %hi(D_80123514) # $t6, 0x8012 /* 06E900 8006DD00 81CE3514 */ lb $t6, %lo(D_80123514)($t6) /* 06E904 8006DD04 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 06E908 8006DD08 A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06E908 8006DD08 A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06E90C 8006DD0C 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012 /* 06E910 8006DD10 AFBF0024 */ sw $ra, 0x24($sp) /* 06E914 8006DD14 AFB00020 */ sw $s0, 0x20($sp) @@ -84,8 +84,8 @@ glabel func_8006DCF8 /* 06EA34 8006DE34 AD780000 */ sw $t8, ($t3) /* 06EA38 8006DE38 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012 /* 06EA3C 8006DE3C AC2034EC */ sw $zero, %lo(D_801234EC)($at) -/* 06EA40 8006DE40 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 -/* 06EA44 8006DE44 A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06EA40 8006DE40 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 +/* 06EA44 8006DE44 A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06EA48 8006DE48 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012 /* 06EA4C 8006DE4C A0203516 */ sb $zero, %lo(D_80123516)($at) /* 06EA50 8006DE50 3C038012 */ lui $v1, %hi(D_80123500) # $v1, 0x8012 @@ -112,8 +112,8 @@ glabel func_8006DCF8 /* 06EAA0 8006DEA0 0C01B305 */ jal func_8006CC14 /* 06EAA4 8006DEA4 00000000 */ nop /* 06EAA8 8006DEA8 8FAC002C */ lw $t4, 0x2c($sp) -/* 06EAAC 8006DEAC 3C018012 */ lui $at, %hi(D_80123515) # $at, 0x8012 -/* 06EAB0 8006DEB0 A0203515 */ sb $zero, %lo(D_80123515)($at) +/* 06EAAC 8006DEAC 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 +/* 06EAB0 8006DEB0 A0203515 */ sb $zero, %lo(gIsPaused)($at) /* 06EAB4 8006DEB4 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012 /* 06EAB8 8006DEB8 318D007F */ andi $t5, $t4, 0x7f /* 06EABC 8006DEBC A0203516 */ sb $zero, %lo(D_80123516)($at) diff --git a/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s b/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s index a115ad6b..5a003899 100644 --- a/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s @@ -64,9 +64,9 @@ glabel MenuCharacterSelectInit /* 08BCB0 8008B0B0 3C01800E */ lui $at, %hi(D_800DF484) # $at, 0x800e /* 08BCB4 8008B0B4 250863D4 */ addiu $t0, %lo(D_801263D4) # addiu $t0, $t0, 0x63d4 /* 08BCB8 8008B0B8 3C128012 */ lui $s2, %hi(D_801263C0) # $s2, 0x8012 -/* 08BCBC 8008B0BC 3C038012 */ lui $v1, %hi(D_801263E8) # $v1, 0x8012 +/* 08BCBC 8008B0BC 3C038012 */ lui $v1, %hi(players_character_array) # $v1, 0x8012 /* 08BCC0 8008B0C0 AC20F484 */ sw $zero, %lo(D_800DF484)($at) -/* 08BCC4 8008B0C4 246363E8 */ addiu $v1, %lo(D_801263E8) # addiu $v1, $v1, 0x63e8 +/* 08BCC4 8008B0C4 246363E8 */ addiu $v1, %lo(players_character_array) # addiu $v1, $v1, 0x63e8 /* 08BCC8 8008B0C8 265263C0 */ addiu $s2, %lo(D_801263C0) # addiu $s2, $s2, 0x63c0 /* 08BCCC 8008B0CC 00081021 */ addu $v0, $zero, $t0 /* 08BCD0 8008B0D0 00008025 */ move $s0, $zero diff --git a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s index df764a9a..dd5f6368 100644 --- a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s @@ -83,14 +83,14 @@ glabel MenuCharacterSelectLoop /* 08CA54 8008BE54 0C02304A */ jal func_8008C128 /* 08CA58 8008BE58 AFAB0024 */ sw $t3, 0x24($sp) /* 08CA5C 8008BE5C 3C038012 */ lui $v1, %hi(D_801263D4) # $v1, 0x8012 -/* 08CA60 8008BE60 3C078012 */ lui $a3, %hi(D_801263E8) # $a3, 0x8012 +/* 08CA60 8008BE60 3C078012 */ lui $a3, %hi(players_character_array) # $a3, 0x8012 /* 08CA64 8008BE64 3C068012 */ lui $a2, %hi(D_801263CC) # $a2, 0x8012 /* 08CA68 8008BE68 3C058012 */ lui $a1, %hi(D_801263F0) # $a1, 0x8012 /* 08CA6C 8008BE6C 8FAB0024 */ lw $t3, 0x24($sp) /* 08CA70 8008BE70 00002025 */ move $a0, $zero /* 08CA74 8008BE74 24A563F0 */ addiu $a1, %lo(D_801263F0) # addiu $a1, $a1, 0x63f0 /* 08CA78 8008BE78 24C663CC */ addiu $a2, %lo(D_801263CC) # addiu $a2, $a2, 0x63cc -/* 08CA7C 8008BE7C 24E763E8 */ addiu $a3, %lo(D_801263E8) # addiu $a3, $a3, 0x63e8 +/* 08CA7C 8008BE7C 24E763E8 */ addiu $a3, %lo(players_character_array) # addiu $a3, $a3, 0x63e8 /* 08CA80 8008BE80 246363D4 */ addiu $v1, %lo(D_801263D4) # addiu $v1, $v1, 0x63d4 /* 08CA84 8008BE84 00001025 */ move $v0, $zero /* 08CA88 8008BE88 24090004 */ li $t1, 4 diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index 5cb6f76a..fe2c3088 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -72,9 +72,9 @@ glabel MenuFileSelectLoop /* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) /* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e /* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) -/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(D_801269C0) # $at, 0x8012 +/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 /* 08D4D0 8008C8D0 0C01B6C5 */ jal func_8006DB14 -/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(D_801269C0)($at) +/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(p1_vehicle)($at) /* 08D4D8 8008C8D8 0C0204F4 */ jal MenuInit /* 08D4DC 8008C8DC 24040006 */ li $a0, 6 /* 08D4E0 8008C8E0 10000076 */ b .L8008CABC diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s index 71ae7978..b40837cd 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s @@ -15,8 +15,8 @@ glabel MenuLoadNewAreaInit /* 0938B8 80092CB8 81D00002 */ lb $s0, 2($t6) /* 0938BC 80092CBC 0C01AC2B */ jal func_8006B0AC /* 0938C0 80092CC0 02002025 */ move $a0, $s0 -/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(D_801269C0) # $at, 0x8012 -/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(D_801269C0)($at) +/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) /* 0938CC 80092CCC 0C01AC53 */ jal func_8006B14C /* 0938D0 80092CD0 02002025 */ move $a0, $s0 /* 0938D4 80092CD4 24010005 */ li $at, 5 diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index c78d523c..87c790ad 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -84,11 +84,11 @@ glabel MenuLoadNewAreaLoop /* 094330 80093730 00000000 */ nop /* 094334 80093734 0C01AC2B */ jal func_8006B0AC /* 094338 80093738 00000000 */ nop -/* 09433C 8009373C 3C018012 */ lui $at, %hi(D_801269C0) # $at, 0x8012 -/* 094340 80093740 A02269C0 */ sb $v0, %lo(D_801269C0)($at) +/* 09433C 8009373C 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 094340 80093740 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) .L80093744: -/* 094344 80093744 3C038012 */ lui $v1, %hi(D_801269C0) # $v1, 0x8012 -/* 094348 80093748 806369C0 */ lb $v1, %lo(D_801269C0)($v1) +/* 094344 80093744 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 +/* 094348 80093748 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) /* 09434C 8009374C 8FA40024 */ lw $a0, 0x24($sp) /* 094350 80093750 0C01AC3E */ jal func_8006B0F8 /* 094354 80093754 AFA30034 */ sw $v1, 0x34($sp) @@ -238,9 +238,9 @@ glabel MenuLoadNewAreaLoop /* 094558 80093958 0C000741 */ jal func_80001D04 /* 09455C 8009395C AFA30034 */ sw $v1, 0x34($sp) /* 094560 80093960 8FA30034 */ lw $v1, 0x34($sp) -/* 094564 80093964 3C018012 */ lui $at, %hi(D_801269C0) # $at, 0x8012 +/* 094564 80093964 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 /* 094568 80093968 10000021 */ b .L800939F0 -/* 09456C 8009396C A02369C0 */ sb $v1, %lo(D_801269C0)($at) +/* 09456C 8009396C A02369C0 */ sb $v1, %lo(p1_vehicle)($at) .L80093970: /* 094570 80093970 04410007 */ bgez $v0, .L80093990 /* 094574 80093974 8FAA0038 */ lw $t2, 0x38($sp) diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s index cf20bad3..122bcd55 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s @@ -50,8 +50,8 @@ glabel MenuTrophyRaceRoundInit /* 098F1C 8009831C 8E690000 */ lw $t1, ($s3) /* 098F20 80098320 00008825 */ move $s1, $zero /* 098F24 80098324 1920000A */ blez $t1, .L80098350 -/* 098F28 80098328 3C128012 */ lui $s2, %hi(D_801269C0) # $s2, 0x8012 -/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(D_801269C0) # addiu $s2, $s2, 0x69c0 +/* 098F28 80098328 3C128012 */ lui $s2, %hi(p1_vehicle) # $s2, 0x8012 +/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(p1_vehicle) # addiu $s2, $s2, 0x69c0 .L80098330: /* 098F30 80098330 0C01AC2B */ jal func_8006B0AC /* 098F34 80098334 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/unknown_080500/func_8008B358.s b/asm/non_matchings/unknown_080500/func_8008B358.s index 315a42f8..615aabe3 100644 --- a/asm/non_matchings/unknown_080500/func_8008B358.s +++ b/asm/non_matchings/unknown_080500/func_8008B358.s @@ -9,7 +9,7 @@ glabel func_8008B358 /* 08BF74 8008B374 AFBE0038 */ sw $fp, 0x38($sp) /* 08BF78 8008B378 AFB60030 */ sw $s6, 0x30($sp) /* 08BF7C 8008B37C AFB1001C */ sw $s1, 0x1c($sp) -/* 08BF80 8008B380 3C108012 */ lui $s0, %hi(D_801263E8) # $s0, 0x8012 +/* 08BF80 8008B380 3C108012 */ lui $s0, %hi(players_character_array) # $s0, 0x8012 /* 08BF84 8008B384 3C128012 */ lui $s2, %hi(D_801263D4) # $s2, 0x8012 /* 08BF88 8008B388 3C138012 */ lui $s3, %hi(D_801263C0) # $s3, 0x8012 /* 08BF8C 8008B38C 3C14800E */ lui $s4, %hi(D_800DF4BC) # $s4, 0x800e @@ -21,7 +21,7 @@ glabel func_8008B358 /* 08BFA4 8008B3A4 2694F4BC */ addiu $s4, %lo(D_800DF4BC) # addiu $s4, $s4, -0xb44 /* 08BFA8 8008B3A8 267363C0 */ addiu $s3, %lo(D_801263C0) # addiu $s3, $s3, 0x63c0 /* 08BFAC 8008B3AC 265263D4 */ addiu $s2, %lo(D_801263D4) # addiu $s2, $s2, 0x63d4 -/* 08BFB0 8008B3B0 261063E8 */ addiu $s0, %lo(D_801263E8) # addiu $s0, $s0, 0x63e8 +/* 08BFB0 8008B3B0 261063E8 */ addiu $s0, %lo(players_character_array) # addiu $s0, $s0, 0x63e8 /* 08BFB4 8008B3B4 00008825 */ move $s1, $zero /* 08BFB8 8008B3B8 24160001 */ li $s6, 1 /* 08BFBC 8008B3BC 241E000E */ li $fp, 14 diff --git a/asm/non_matchings/unknown_080500/func_8008B4C8.s b/asm/non_matchings/unknown_080500/func_8008B4C8.s index 4b8740de..becfd79e 100644 --- a/asm/non_matchings/unknown_080500/func_8008B4C8.s +++ b/asm/non_matchings/unknown_080500/func_8008B4C8.s @@ -132,10 +132,10 @@ glabel func_8008B4C8 /* 08C2AC 8008B6AC 02E22821 */ addu $a1, $s7, $v0 /* 08C2B0 8008B6B0 31F94000 */ andi $t9, $t7, 0x4000 /* 08C2B4 8008B6B4 13200019 */ beqz $t9, .L8008B71C -/* 08C2B8 8008B6B8 3C0A8012 */ lui $t2, %hi(D_801263E8) # $t2, 0x8012 +/* 08C2B8 8008B6B8 3C0A8012 */ lui $t2, %hi(players_character_array) # $t2, 0x8012 /* 08C2BC 8008B6BC 8E680000 */ lw $t0, ($s3) /* 08C2C0 8008B6C0 8CA40000 */ lw $a0, ($a1) -/* 08C2C4 8008B6C4 254A63E8 */ addiu $t2, %lo(D_801263E8) # addiu $t2, $t2, 0x63e8 +/* 08C2C4 8008B6C4 254A63E8 */ addiu $t2, %lo(players_character_array) # addiu $t2, $t2, 0x63e8 /* 08C2C8 8008B6C8 2509FFFF */ addiu $t1, $t0, -1 /* 08C2CC 8008B6CC A0600000 */ sb $zero, ($v1) /* 08C2D0 8008B6D0 AE690000 */ sw $t1, ($s3) diff --git a/asm/non_matchings/unknown_080500/func_8008B758.s b/asm/non_matchings/unknown_080500/func_8008B758.s index 191bedda..2669674e 100644 --- a/asm/non_matchings/unknown_080500/func_8008B758.s +++ b/asm/non_matchings/unknown_080500/func_8008B758.s @@ -8,7 +8,7 @@ glabel func_8008B758 /* 08C370 8008B770 AFB40030 */ sw $s4, 0x30($sp) /* 08C374 8008B774 AFB3002C */ sw $s3, 0x2c($sp) /* 08C378 8008B778 3C108012 */ lui $s0, %hi(D_801263C0) # $s0, 0x8012 -/* 08C37C 8008B77C 3C168012 */ lui $s6, %hi(D_801263E8) # $s6, 0x8012 +/* 08C37C 8008B77C 3C168012 */ lui $s6, %hi(players_character_array) # $s6, 0x8012 /* 08C380 8008B780 3C17800E */ lui $s7, %hi(D_800DF480) # $s7, 0x800e /* 08C384 8008B784 3C1E8012 */ lui $fp, %hi(D_801263CC) # $fp, 0x8012 /* 08C388 8008B788 AFBF0044 */ sw $ra, 0x44($sp) @@ -16,7 +16,7 @@ glabel func_8008B758 /* 08C390 8008B790 AFB10024 */ sw $s1, 0x24($sp) /* 08C394 8008B794 27DE63CC */ addiu $fp, %lo(D_801263CC) # addiu $fp, $fp, 0x63cc /* 08C398 8008B798 26F7F480 */ addiu $s7, %lo(D_800DF480) # addiu $s7, $s7, -0xb80 -/* 08C39C 8008B79C 26D663E8 */ addiu $s6, %lo(D_801263E8) # addiu $s6, $s6, 0x63e8 +/* 08C39C 8008B79C 26D663E8 */ addiu $s6, %lo(players_character_array) # addiu $s6, $s6, 0x63e8 /* 08C3A0 8008B7A0 261063C0 */ addiu $s0, %lo(D_801263C0) # addiu $s0, $s0, 0x63c0 /* 08C3A4 8008B7A4 2413000E */ li $s3, 14 /* 08C3A8 8008B7A8 0000A025 */ move $s4, $zero diff --git a/asm/non_matchings/unknown_080500/func_8008FF1C.s b/asm/non_matchings/unknown_080500/func_8008FF1C.s index 74beb728..75591292 100644 --- a/asm/non_matchings/unknown_080500/func_8008FF1C.s +++ b/asm/non_matchings/unknown_080500/func_8008FF1C.s @@ -335,11 +335,11 @@ glabel func_8008FF1C /* 091000 80090400 3C018012 */ lui $at, %hi(D_801269F0) # $at, 0x8012 /* 091004 80090404 3C108012 */ lui $s0, %hi(D_80126930) # $s0, 0x8012 /* 091008 80090408 3C14800E */ lui $s4, %hi(D_800E05F4) # $s4, 0x800e -/* 09100C 8009040C 3C138012 */ lui $s3, %hi(D_801269C0) # $s3, 0x8012 +/* 09100C 8009040C 3C138012 */ lui $s3, %hi(p1_vehicle) # $s3, 0x8012 /* 091010 80090410 3C12800E */ lui $s2, %hi(D_800E05D4) # $s2, 0x800e /* 091014 80090414 AC2069F0 */ sw $zero, %lo(D_801269F0)($at) /* 091018 80090418 265205D4 */ addiu $s2, %lo(D_800E05D4) # addiu $s2, $s2, 0x5d4 -/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(D_801269C0) # addiu $s3, $s3, 0x69c0 +/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(p1_vehicle) # addiu $s3, $s3, 0x69c0 /* 091020 80090420 269405F4 */ addiu $s4, %lo(D_800E05F4) # addiu $s4, $s4, 0x5f4 /* 091024 80090424 26106930 */ addiu $s0, %lo(D_80126930) # addiu $s0, $s0, 0x6930 /* 091028 80090428 AFA0007C */ sw $zero, 0x7c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index ca441a6c..762ecaa1 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -347,8 +347,8 @@ glabel func_80090F30 /* 092040 80091440 24070060 */ li $a3, 96 /* 092044 80091444 0C0310E1 */ jal func_800C4384 /* 092048 80091448 AFAE0010 */ sw $t6, 0x10($sp) -/* 09204C 8009144C 3C188012 */ lui $t8, %hi(D_801269C0) # $t8, 0x8012 -/* 092050 80091450 831869C0 */ lb $t8, %lo(D_801269C0)($t8) +/* 09204C 8009144C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 092050 80091450 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) /* 092054 80091454 8FAF0070 */ lw $t7, 0x70($sp) /* 092058 80091458 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 09205C 8009145C 0018C880 */ sll $t9, $t8, 2 @@ -370,8 +370,8 @@ glabel func_80090F30 /* 09209C 8009149C 02003025 */ move $a2, $s0 /* 0920A0 800914A0 0C031110 */ jal func_800C4440 /* 0920A4 800914A4 02203825 */ move $a3, $s1 -/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(D_801269C0) # $t8, 0x8012 -/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(D_801269C0)($t8) +/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) /* 0920B0 800914B0 8FAE0070 */ lw $t6, 0x70($sp) /* 0920B4 800914B4 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 0920B8 800914B8 00187880 */ sll $t7, $t8, 2 @@ -392,8 +392,8 @@ glabel func_80090F30 /* 0920F4 800914F4 02403025 */ move $a2, $s2 /* 0920F8 800914F8 0C031110 */ jal func_800C4440 /* 0920FC 800914FC 02203825 */ move $a3, $s1 -/* 092100 80091500 3C188012 */ lui $t8, %hi(D_801269C0) # $t8, 0x8012 -/* 092104 80091504 831869C0 */ lb $t8, %lo(D_801269C0)($t8) +/* 092100 80091500 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 092104 80091504 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) /* 092108 80091508 8FAD0070 */ lw $t5, 0x70($sp) /* 09210C 8009150C 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 092110 80091510 00187080 */ sll $t6, $t8, 2 @@ -412,8 +412,8 @@ glabel func_80090F30 /* 092144 80091544 24060035 */ li $a2, 53 /* 092148 80091548 0C020600 */ jal func_80081800 /* 09214C 8009154C 24070080 */ li $a3, 128 -/* 092150 80091550 3C0D8012 */ lui $t5, %hi(D_801269C0) # $t5, 0x8012 -/* 092154 80091554 81AD69C0 */ lb $t5, %lo(D_801269C0)($t5) +/* 092150 80091550 3C0D8012 */ lui $t5, %hi(p1_vehicle) # $t5, 0x8012 +/* 092154 80091554 81AD69C0 */ lb $t5, %lo(p1_vehicle)($t5) /* 092158 80091558 8FB80070 */ lw $t8, 0x70($sp) /* 09215C 8009155C 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e /* 092160 80091560 000D7080 */ sll $t6, $t5, 2 @@ -659,10 +659,10 @@ glabel func_80090F30 /* 0924E8 800918E8 258C06B0 */ addiu $t4, %lo(D_800E06B0) # addiu $t4, $t4, 0x6b0 /* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(D_800E0624) # addiu $t2, $t2, 0x624 /* 0924F0 800918F0 00094080 */ sll $t0, $t1, 2 -/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(D_801269C0) # $s1, 0x8012 +/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(p1_vehicle) # $s1, 0x8012 /* 0924F8 800918F8 00135840 */ sll $t3, $s3, 1 /* 0924FC 800918FC 016C8021 */ addu $s0, $t3, $t4 -/* 092500 80091900 263169C0 */ addiu $s1, %lo(D_801269C0) # addiu $s1, $s1, 0x69c0 +/* 092500 80091900 263169C0 */ addiu $s1, %lo(p1_vehicle) # addiu $s1, $s1, 0x69c0 /* 092504 80091904 010A9021 */ addu $s2, $t0, $t2 .L80091908: /* 092508 80091908 822D0000 */ lb $t5, ($s1) @@ -745,8 +745,8 @@ glabel func_80090F30 /* 092624 80091A24 8FAF007C */ lw $t7, 0x7c($sp) /* 092628 80091A28 8FB00080 */ lw $s0, 0x80($sp) .L80091A2C: -/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(D_801269C0) # $v1, 0x8012 -/* 092630 80091A30 806369C0 */ lb $v1, %lo(D_801269C0)($v1) +/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 +/* 092630 80091A30 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) /* 092634 80091A34 24010002 */ li $at, 2 /* 092638 80091A38 2610008B */ addiu $s0, $s0, 0x8b /* 09263C 80091A3C 24160003 */ li $s6, 3 @@ -816,10 +816,10 @@ glabel func_80090F30 /* 092730 80091B30 14410031 */ bne $v0, $at, .L80091BF8 /* 092734 80091B34 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624 /* 092738 80091B38 8FAA0074 */ lw $t2, 0x74($sp) -/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(D_801269C0) # $t0, 0x8012 +/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(p1_vehicle) # $t0, 0x8012 /* 092740 80091B40 1540002D */ bnez $t2, .L80091BF8 /* 092744 80091B44 00000000 */ nop -/* 092748 80091B48 810869C0 */ lb $t0, %lo(D_801269C0)($t0) +/* 092748 80091B48 810869C0 */ lb $t0, %lo(p1_vehicle)($t0) /* 09274C 80091B4C 8FD90000 */ lw $t9, ($fp) /* 092750 80091B50 01160019 */ multu $t0, $s6 /* 092754 80091B54 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -839,8 +839,8 @@ glabel func_80090F30 /* 09278C 80091B8C AFB80010 */ sw $t8, 0x10($sp) /* 092790 80091B90 0C01E2AE */ jal func_80078AB8 /* 092794 80091B94 AFB9001C */ sw $t9, 0x1c($sp) -/* 092798 80091B98 3C028012 */ lui $v0, %hi(D_801269C1) # $v0, 0x8012 -/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(D_801269C1)($v0) +/* 092798 80091B98 3C028012 */ lui $v0, %hi(p2_vehicle) # $v0, 0x8012 +/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(p2_vehicle)($v0) /* 0927A0 80091BA0 24010002 */ li $at, 2 /* 0927A4 80091BA4 14410002 */ bne $v0, $at, .L80091BB0 /* 0927A8 80091BA8 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index f1be05e4..8f8c7649 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -322,10 +322,10 @@ glabel func_80092188 /* 093230 80092630 000FC080 */ sll $t8, $t7, 2 /* 093234 80092634 03387021 */ addu $t6, $t9, $t8 /* 093238 80092638 8DCF0000 */ lw $t7, ($t6) -/* 09323C 8009263C 3C188012 */ lui $t8, %hi(D_801269C0) # $t8, 0x8012 +/* 09323C 8009263C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 /* 093240 80092640 31F90002 */ andi $t9, $t7, 2 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 -/* 093248 80092648 271869C0 */ addiu $t8, %lo(D_801269C0) # addiu $t8, $t8, 0x69c0 +/* 093248 80092648 271869C0 */ addiu $t8, %lo(p1_vehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 /* 093250 80092650 3C068012 */ lui $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 @@ -691,8 +691,8 @@ glabel func_80092188 /* 093760 80092B60 0C000741 */ jal func_80001D04 /* 093764 80092B64 00002825 */ move $a1, $zero .L80092B68: -/* 093768 80092B68 3C048012 */ lui $a0, %hi(D_801269C0) # $a0, 0x8012 -/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(D_801269C0)($a0) +/* 093768 80092B68 3C048012 */ lui $a0, %hi(p1_vehicle) # $a0, 0x8012 +/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(p1_vehicle)($a0) /* 093770 80092B70 0C01B6C5 */ jal func_8006DB14 /* 093774 80092B74 00000000 */ nop /* 093778 80092B78 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 1f348cff..5562da95 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -159,8 +159,8 @@ glabel func_80092E94 /* 093D00 80093100 240600FF */ li $a2, 255 /* 093D04 80093104 0C0310E1 */ jal func_800C4384 /* 093D08 80093108 24070060 */ li $a3, 96 -/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(D_801269C0) # $t1, 0x8012 -/* 093D10 80093110 812969C0 */ lb $t1, %lo(D_801269C0)($t1) +/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(p1_vehicle) # $t1, 0x8012 +/* 093D10 80093110 812969C0 */ lb $t1, %lo(p1_vehicle)($t1) /* 093D14 80093114 8FA80050 */ lw $t0, 0x50($sp) /* 093D18 80093118 00095080 */ sll $t2, $t1, 2 /* 093D1C 8009311C 8FB10058 */ lw $s1, 0x58($sp) @@ -180,8 +180,8 @@ glabel func_80092E94 /* 093D54 80093154 02003025 */ move $a2, $s0 /* 093D58 80093158 0C031110 */ jal func_800C4440 /* 093D5C 8009315C 27A70054 */ addiu $a3, $sp, 0x54 -/* 093D60 80093160 3C188012 */ lui $t8, %hi(D_801269C0) # $t8, 0x8012 -/* 093D64 80093164 831869C0 */ lb $t8, %lo(D_801269C0)($t8) +/* 093D60 80093160 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 093D64 80093164 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) /* 093D68 80093168 8FAF0050 */ lw $t7, 0x50($sp) /* 093D6C 8009316C 0018C880 */ sll $t9, $t8, 2 /* 093D70 80093170 01F94821 */ addu $t1, $t7, $t9 @@ -201,8 +201,8 @@ glabel func_80092E94 /* 093DA8 800931A8 02003825 */ move $a3, $s0 /* 093DAC 800931AC 8FA20050 */ lw $v0, 0x50($sp) /* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(D_800DF4C4) # $t5, 0x800e -/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(D_801269C0) # $t9, 0x8012 -/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(D_801269C0)($t9) +/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 +/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) /* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(D_800DF4C4)($t5) /* 093DC0 800931C0 8C4C004C */ lw $t4, 0x4c($v0) /* 093DC4 800931C4 00194880 */ sll $t1, $t9, 2 @@ -223,10 +223,10 @@ glabel func_80092E94 /* 093E00 80093200 0C020600 */ jal func_80081800 /* 093E04 80093204 24070080 */ li $a3, 128 /* 093E08 80093208 8FAE0050 */ lw $t6, 0x50($sp) -/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(D_801269C0) # $t8, 0x8012 +/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 /* 093E10 80093210 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e /* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) -/* 093E18 80093218 831869C0 */ lb $t8, %lo(D_801269C0)($t8) +/* 093E18 80093218 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) /* 093E1C 8009321C 8DCA004C */ lw $t2, 0x4c($t6) /* 093E20 80093220 0018C880 */ sll $t9, $t8, 2 /* 093E24 80093224 014F5821 */ addu $t3, $t2, $t7 @@ -313,8 +313,8 @@ glabel func_80092E94 /* 093F58 80093358 01EB6024 */ and $t4, $t7, $t3 /* 093F5C 8009335C 11800025 */ beqz $t4, .L800933F4 /* 093F60 80093360 00104080 */ sll $t0, $s0, 2 -/* 093F64 80093364 3C198012 */ lui $t9, %hi(D_801269C0) # $t9, 0x8012 -/* 093F68 80093368 833969C0 */ lb $t9, %lo(D_801269C0)($t9) +/* 093F64 80093364 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 +/* 093F68 80093368 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) /* 093F6C 8009336C 01104023 */ subu $t0, $t0, $s0 /* 093F70 80093370 3C18800E */ lui $t8, %hi(D_800E0624) # $t8, 0x800e /* 093F74 80093374 27180624 */ addiu $t8, %lo(D_800E0624) # addiu $t8, $t8, 0x624 @@ -355,8 +355,8 @@ glabel func_80092E94 /* 093FF8 800933F8 24010003 */ li $at, 3 /* 093FFC 800933FC 1601FFC8 */ bne $s0, $at, .L80093320 /* 094000 80093400 8FAE007C */ lw $t6, 0x7c($sp) -/* 094004 80093404 3C028012 */ lui $v0, %hi(D_801269C0) # $v0, 0x8012 -/* 094008 80093408 804269C0 */ lb $v0, %lo(D_801269C0)($v0) +/* 094004 80093404 3C028012 */ lui $v0, %hi(p1_vehicle) # $v0, 0x8012 +/* 094008 80093408 804269C0 */ lb $v0, %lo(p1_vehicle)($v0) /* 09400C 8009340C 8FB10040 */ lw $s1, 0x40($sp) /* 094010 80093410 24010002 */ li $at, 2 /* 094014 80093414 14410002 */ bne $v0, $at, .L80093420 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 25c74db8..97a5b9b1 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -298,8 +298,8 @@ glabel func_80095728 /* 096780 80095B80 3C013F00 */ lui $at, 0x3f00 /* 096784 80095B84 11C0005B */ beqz $t6, .L80095CF4 /* 096788 80095B88 240D0003 */ li $t5, 3 -/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(D_801269C0) # $t7, 0x8012 -/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(D_801269C0)($t7) +/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 +/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(p1_vehicle)($t7) /* 096794 80095B94 90EC0049 */ lbu $t4, 0x49($a3) /* 096798 80095B98 000FC080 */ sll $t8, $t7, 2 /* 09679C 80095B9C 00F81021 */ addu $v0, $a3, $t8 @@ -323,9 +323,9 @@ glabel func_80095728 /* 0967E4 80095BE4 24A56390 */ addiu $a1, %lo(D_80126390) # addiu $a1, $a1, 0x6390 /* 0967E8 80095BE8 0C025DBE */ jal func_800976F8 /* 0967EC 80095BEC 24060003 */ li $a2, 3 -/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(D_801269C0) # $t4, 0x8012 +/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(p1_vehicle) # $t4, 0x8012 /* 0967F4 80095BF4 8FA2002C */ lw $v0, 0x2c($sp) -/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(D_801269C0)($t4) +/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(p1_vehicle)($t4) /* 0967FC 80095BFC 90580049 */ lbu $t8, 0x49($v0) /* 096800 80095C00 000CC880 */ sll $t9, $t4, 2 /* 096804 80095C04 00597021 */ addu $t6, $v0, $t9 @@ -428,8 +428,8 @@ glabel func_80095728 /* 09697C 80095D7C 304E0080 */ andi $t6, $v0, 0x80 /* 096980 80095D80 0C025DD1 */ jal func_80097744 /* 096984 80095D84 24050003 */ li $a1, 3 -/* 096988 80095D88 3C078012 */ lui $a3, %hi(D_801269C0) # $a3, 0x8012 -/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(D_801269C0) # addiu $a3, $a3, 0x69c0 +/* 096988 80095D88 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 +/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 /* 096990 80095D90 80ED0000 */ lb $t5, ($a3) /* 096994 80095D94 8FA3002C */ lw $v1, 0x2c($sp) /* 096998 80095D98 000D7880 */ sll $t7, $t5, 2 @@ -462,8 +462,8 @@ glabel func_80095728 /* 096A00 80095E00 24840FA8 */ addiu $a0, %lo(D_800E0FA8) # addiu $a0, $a0, 0xfa8 /* 096A04 80095E04 0C025DD1 */ jal func_80097744 /* 096A08 80095E08 24050003 */ li $a1, 3 -/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(D_801269C0) # $a3, 0x8012 -/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(D_801269C0) # addiu $a3, $a3, 0x69c0 +/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 +/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 /* 096A14 80095E14 80F80000 */ lb $t8, ($a3) /* 096A18 80095E18 8FA3002C */ lw $v1, 0x2c($sp) /* 096A1C 80095E1C 0018C880 */ sll $t9, $t8, 2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A003C.s b/asm/non_matchings/unknown_09F8F0/func_800A003C.s index 22223ca0..c0b3cdc0 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A003C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A003C.s @@ -46,7 +46,7 @@ glabel func_800A003C .L800A00E4: /* 0A0CE4 800A00E4 11600005 */ beqz $t3, .L800A00FC /* 0A0CE8 800A00E8 00000000 */ nop -/* 0A0CEC 800A00EC 0C003FEE */ jal func_8000FFB8 +/* 0A0CEC 800A00EC 0C003FEE */ jal particlePtrList_addObject /* 0A0CF0 800A00F0 00000000 */ nop /* 0A0CF4 800A00F4 10000004 */ b .L800A0108 /* 0A0CF8 800A00F8 8E4C0000 */ lw $t4, ($s2) @@ -81,7 +81,7 @@ glabel func_800A003C /* 0A0D5C 800A015C 8E440000 */ lw $a0, ($s2) /* 0A0D60 800A0160 0C01C450 */ jal func_80071140 /* 0A0D64 800A0164 00000000 */ nop -/* 0A0D68 800A0168 0C004013 */ jal func_8001004C +/* 0A0D68 800A0168 0C004013 */ jal particlePtrList_flush /* 0A0D6C 800A016C 00000000 */ nop /* 0A0D70 800A0170 8FBF002C */ lw $ra, 0x2c($sp) /* 0A0D74 800A0174 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1248.s b/asm/non_matchings/unknown_09F8F0/func_800A1248.s index 2c6830e3..c6e2fe47 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1248.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1248.s @@ -12,7 +12,7 @@ glabel func_800A1248 /* 0A1E70 800A1270 8CA70064 */ lw $a3, 0x64($a1) /* 0A1E74 800A1274 00808025 */ move $s0, $a0 /* 0A1E78 800A1278 27A4003C */ addiu $a0, $sp, 0x3c -/* 0A1E7C 800A127C 0C006E9D */ jal func_8001BA74 +/* 0A1E7C 800A127C 0C006E9D */ jal getPlayerStructArray /* 0A1E80 800A1280 AFA70044 */ sw $a3, 0x44($sp) /* 0A1E84 800A1284 00409025 */ move $s2, $v0 /* 0A1E88 800A1288 0C01A142 */ jal func_80068508 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s index c1e39f9b..7f4c82e7 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s @@ -3,7 +3,7 @@ glabel func_800A14F0 /* 0A20F4 800A14F4 AFBF0014 */ sw $ra, 0x14($sp) /* 0A20F8 800A14F8 AFA40060 */ sw $a0, 0x60($sp) /* 0A20FC 800A14FC AFA50064 */ sw $a1, 0x64($sp) -/* 0A2100 800A1500 0C006E9D */ jal func_8001BA74 +/* 0A2100 800A1500 0C006E9D */ jal getPlayerStructArray /* 0A2104 800A1504 27A40050 */ addiu $a0, $sp, 0x50 /* 0A2108 800A1508 3C0E8012 */ lui $t6, %hi(D_80126D37) # $t6, 0x8012 /* 0A210C 800A150C 91CE6D37 */ lbu $t6, %lo(D_80126D37)($t6) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1C04.s b/asm/non_matchings/unknown_09F8F0/func_800A1C04.s index ae32e2b5..ccf3e04c 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1C04.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1C04.s @@ -25,7 +25,7 @@ glabel func_800A1C04 /* 0A285C 800A1C5C 8FA50048 */ lw $a1, 0x48($sp) /* 0A2860 800A1C60 0C029D48 */ jal func_800A7520 /* 0A2864 800A1C64 00000000 */ nop -/* 0A2868 800A1C68 0C006E9D */ jal func_8001BA74 +/* 0A2868 800A1C68 0C006E9D */ jal getPlayerStructArray /* 0A286C 800A1C6C 27A40034 */ addiu $a0, $sp, 0x34 /* 0A2870 800A1C70 3C038012 */ lui $v1, %hi(D_80126D37) # $v1, 0x8012 /* 0A2874 800A1C74 90636D37 */ lbu $v1, %lo(D_80126D37)($v1) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s index ef5283d6..124cf062 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s @@ -14,7 +14,7 @@ glabel func_800A1E48 /* 0A2A78 800A1E78 E7B50018 */ swc1 $f21, 0x18($sp) /* 0A2A7C 800A1E7C E7B4001C */ swc1 $f20, 0x1c($sp) /* 0A2A80 800A1E80 AFA5008C */ sw $a1, 0x8c($sp) -/* 0A2A84 800A1E84 0C006E9D */ jal func_8001BA74 +/* 0A2A84 800A1E84 0C006E9D */ jal getPlayerStructArray /* 0A2A88 800A1E88 27A40078 */ addiu $a0, $sp, 0x78 /* 0A2A8C 800A1E8C 12000004 */ beqz $s0, .L800A1EA0 /* 0A2A90 800A1E90 0040A825 */ move $s5, $v0 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s index 2e3e90c5..3a99b020 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s @@ -89,7 +89,7 @@ glabel func_800A3CE4 /* 0A4A34 800A3E34 00000000 */ nop /* 0A4A38 800A3E38 144000C0 */ bnez $v0, .L800A413C /* 0A4A3C 800A3E3C 00000000 */ nop -/* 0A4A40 800A3E40 0C006E9D */ jal func_8001BA74 +/* 0A4A40 800A3E40 0C006E9D */ jal getPlayerStructArray /* 0A4A44 800A3E44 27A40038 */ addiu $a0, $sp, 0x38 /* 0A4A48 800A3E48 8FA50038 */ lw $a1, 0x38($sp) /* 0A4A4C 800A3E4C AFA20044 */ sw $v0, 0x44($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index 197ec134..b697b9ec 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -31,7 +31,7 @@ glabel func_800A5F18 /* 0A6B8C 800A5F8C 00000000 */ nop /* 0A6B90 800A5F90 144000AD */ bnez $v0, .L800A6248 /* 0A6B94 800A5F94 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6B98 800A5F98 0C006E9D */ jal func_8001BA74 +/* 0A6B98 800A5F98 0C006E9D */ jal getPlayerStructArray /* 0A6B9C 800A5F9C 27A40024 */ addiu $a0, $sp, 0x24 /* 0A6BA0 800A5FA0 3C0F8012 */ lui $t7, %hi(D_80126D37) # $t7, 0x8012 /* 0A6BA4 800A5FA4 91EF6D37 */ lbu $t7, %lo(D_80126D37)($t7) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 1e7d9b37..591c69a8 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -133,7 +133,7 @@ glabel func_800A8474 /* 0A9268 800A8668 00000000 */ nop /* 0A926C 800A866C 01B17021 */ addu $t6, $t5, $s1 /* 0A9270 800A8670 8DC40000 */ lw $a0, ($t6) -/* 0A9274 800A8674 0C003FEE */ jal func_8000FFB8 +/* 0A9274 800A8674 0C003FEE */ jal particlePtrList_addObject /* 0A9278 800A8678 AFA30144 */ sw $v1, 0x144($sp) /* 0A927C 800A867C 8FA30144 */ lw $v1, 0x144($sp) /* 0A9280 800A8680 10000009 */ b .L800A86A8 @@ -922,7 +922,7 @@ glabel func_800A8474 /* 0A9E24 800A9224 460021A4 */ cvt.w.s $f6, $f4 /* 0A9E28 800A9228 440B3000 */ mfc1 $t3, $f6 /* 0A9E2C 800A922C 44CAF800 */ ctc1 $t2, $31 -/* 0A9E30 800A9230 0C006E9D */ jal func_8001BA74 +/* 0A9E30 800A9230 0C006E9D */ jal getPlayerStructArray /* 0A9E34 800A9234 AFAB00BC */ sw $t3, 0xbc($sp) /* 0A9E38 800A9238 8FAC00CC */ lw $t4, 0xcc($sp) /* 0A9E3C 800A923C 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/unknown_0AEE70/func_800B22FC.s b/asm/non_matchings/unknown_0AEE70/func_800B22FC.s index e0e71cd0..b8ec0e76 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B22FC.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B22FC.s @@ -167,7 +167,7 @@ glabel func_800B22FC /* 0B3158 800B2558 00000000 */ nop /* 0B315C 800B255C 1D400005 */ bgtz $t2, .L800B2574 /* 0B3160 800B2560 00000000 */ nop -/* 0B3164 800B2564 0C003FEE */ jal func_8000FFB8 +/* 0B3164 800B2564 0C003FEE */ jal particlePtrList_addObject /* 0B3168 800B2568 02002025 */ move $a0, $s0 /* 0B316C 800B256C 10000030 */ b .L800B2630 /* 0B3170 800B2570 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s index 907405a1..d579b90c 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s @@ -509,7 +509,7 @@ glabel func_800B26E0 /* 0B3A88 800B2E88 1DE00009 */ bgtz $t7, .L800B2EB0 /* 0B3A8C 800B2E8C 00000000 */ nop /* 0B3A90 800B2E90 AFA30038 */ sw $v1, 0x38($sp) -/* 0B3A94 800B2E94 0C003FEE */ jal func_8000FFB8 +/* 0B3A94 800B2E94 0C003FEE */ jal particlePtrList_addObject /* 0B3A98 800B2E98 AFA60050 */ sw $a2, 0x50($sp) /* 0B3A9C 800B2E9C 8FA30038 */ lw $v1, 0x38($sp) /* 0B3AA0 800B2EA0 3C058012 */ lui $a1, %hi(D_80127C80) # $a1, 0x8012 diff --git a/asm/non_matchings/unknown_0B8920/func_800BFFDC.s b/asm/non_matchings/unknown_0B8920/func_800BFFDC.s index d132afbc..85e5131a 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BFFDC.s +++ b/asm/non_matchings/unknown_0B8920/func_800BFFDC.s @@ -6,7 +6,7 @@ glabel func_800BFFDC /* 0C0BEC 800BFFEC 00808025 */ move $s0, $a0 /* 0C0BF0 800BFFF0 108E005B */ beq $a0, $t6, .L800C0160 /* 0C0BF4 800BFFF4 AFBF001C */ sw $ra, 0x1c($sp) -/* 0C0BF8 800BFFF8 0C006E9D */ jal func_8001BA74 +/* 0C0BF8 800BFFF8 0C006E9D */ jal getPlayerStructArray /* 0C0BFC 800BFFFC 27A40050 */ addiu $a0, $sp, 0x50 /* 0C0C00 800C0000 8FA50050 */ lw $a1, 0x50($sp) /* 0C0C04 800C0004 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C6000.s b/asm/non_matchings/unknown_0B8920/func_800C6000.s deleted file mode 100644 index f8f20825..00000000 --- a/asm/non_matchings/unknown_0B8920/func_800C6000.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel osCreatePiManager -/* 0C6C00 800C6000 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0C6C04 800C6004 AFB00020 */ sw $s0, 0x20($sp) -/* 0C6C08 800C6008 3C10800E */ lui $s0, %hi(__osPiDevMgr) # $s0, 0x800e -/* 0C6C0C 800C600C 26103740 */ addiu $s0, %lo(__osPiDevMgr) # addiu $s0, $s0, 0x3740 -/* 0C6C10 800C6010 8E0E0000 */ lw $t6, ($s0) -/* 0C6C14 800C6014 AFBF0024 */ sw $ra, 0x24($sp) -/* 0C6C18 800C6018 AFA40030 */ sw $a0, 0x30($sp) -/* 0C6C1C 800C601C AFA50034 */ sw $a1, 0x34($sp) -/* 0C6C20 800C6020 15C0004F */ bnez $t6, .L800C6160 -/* 0C6C24 800C6024 AFA60038 */ sw $a2, 0x38($sp) -/* 0C6C28 800C6028 00A02025 */ move $a0, $a1 -/* 0C6C2C 800C602C 00C02825 */ move $a1, $a2 -/* 0C6C30 800C6030 0C032208 */ jal osCreateMesgQueue -/* 0C6C34 800C6034 00E03025 */ move $a2, $a3 -/* 0C6C38 800C6038 3C048013 */ lui $a0, %hi(piEventQueue) # $a0, 0x8013 -/* 0C6C3C 800C603C 3C058013 */ lui $a1, %hi(piEventBuf) # $a1, 0x8013 -/* 0C6C40 800C6040 24A5AAC8 */ addiu $a1, %lo(piEventBuf) # addiu $a1, $a1, -0x5538 -/* 0C6C44 800C6044 2484AAB0 */ addiu $a0, %lo(piEventQueue) # addiu $a0, $a0, -0x5550 -/* 0C6C48 800C6048 0C032208 */ jal osCreateMesgQueue -/* 0C6C4C 800C604C 24060001 */ li $a2, 1 -/* 0C6C50 800C6050 3C0F800E */ lui $t7, %hi(__osPiAccessQueueEnabled) # $t7, 0x800e -/* 0C6C54 800C6054 8DEF4800 */ lw $t7, %lo(__osPiAccessQueueEnabled)($t7) -/* 0C6C58 800C6058 00000000 */ nop -/* 0C6C5C 800C605C 15E00003 */ bnez $t7, .L800C606C -/* 0C6C60 800C6060 00000000 */ nop -/* 0C6C64 800C6064 0C034920 */ jal __osPiCreateAccessQueue -/* 0C6C68 800C6068 00000000 */ nop -.L800C606C: -/* 0C6C6C 800C606C 3C058013 */ lui $a1, %hi(piEventQueue) # $a1, 0x8013 -/* 0C6C70 800C6070 3C062222 */ lui $a2, (0x22222222 >> 16) # lui $a2, 0x2222 -/* 0C6C74 800C6074 34C62222 */ ori $a2, (0x22222222 & 0xFFFF) # ori $a2, $a2, 0x2222 -/* 0C6C78 800C6078 24A5AAB0 */ addiu $a1, %lo(piEventQueue) # addiu $a1, $a1, -0x5550 -/* 0C6C7C 800C607C 0C0332EC */ jal osSetEventMesg -/* 0C6C80 800C6080 24040008 */ li $a0, 8 -/* 0C6C84 800C6084 2418FFFF */ li $t8, -1 -/* 0C6C88 800C6088 AFB80028 */ sw $t8, 0x28($sp) -/* 0C6C8C 800C608C 0C034950 */ jal osGetThreadPri -/* 0C6C90 800C6090 00002025 */ move $a0, $zero -/* 0C6C94 800C6094 8FB90030 */ lw $t9, 0x30($sp) -/* 0C6C98 800C6098 00002025 */ move $a0, $zero -/* 0C6C9C 800C609C 0059082A */ slt $at, $v0, $t9 -/* 0C6CA0 800C60A0 10200003 */ beqz $at, .L800C60B0 -/* 0C6CA4 800C60A4 03202825 */ move $a1, $t9 -/* 0C6CA8 800C60A8 0C033210 */ jal osSetThreadPri -/* 0C6CAC 800C60AC AFA20028 */ sw $v0, 0x28($sp) -.L800C60B0: -/* 0C6CB0 800C60B0 0C034958 */ jal __osDisableInt -/* 0C6CB4 800C60B4 00000000 */ nop -/* 0C6CB8 800C60B8 8FA90034 */ lw $t1, 0x34($sp) -/* 0C6CBC 800C60BC 8FAF0030 */ lw $t7, 0x30($sp) -/* 0C6CC0 800C60C0 3C048013 */ lui $a0, %hi(piThread) # $a0, 0x8013 -/* 0C6CC4 800C60C4 3C0A8013 */ lui $t2, %hi(piEventQueue) # $t2, 0x8013 -/* 0C6CC8 800C60C8 3C0B8013 */ lui $t3, %hi(piAccessQueue) # $t3, 0x8013 -/* 0C6CCC 800C60CC 3C0C800D */ lui $t4, %hi(osPiRawStartDma) # $t4, 0x800d -/* 0C6CD0 800C60D0 3C0D800D */ lui $t5, %hi(osEPiRawStartDma) # $t5, 0x800d -/* 0C6CD4 800C60D4 3C0E8013 */ lui $t6, %hi(piEventQueue) # $t6, 0x8013 -/* 0C6CD8 800C60D8 2484A800 */ addiu $a0, %lo(piThread) # addiu $a0, $a0, -0x5800 -/* 0C6CDC 800C60DC 24080001 */ li $t0, 1 -/* 0C6CE0 800C60E0 254AAAB0 */ addiu $t2, %lo(piEventQueue) # addiu $t2, $t2, -0x5550 -/* 0C6CE4 800C60E4 256BD1E8 */ addiu $t3, %lo(piAccessQueue) # addiu $t3, $t3, -0x2e18 -/* 0C6CE8 800C60E8 258C25A0 */ addiu $t4, %lo(osPiRawStartDma) # addiu $t4, $t4, 0x25a0 -/* 0C6CEC 800C60EC 25AD2680 */ addiu $t5, %lo(osEPiRawStartDma) # addiu $t5, $t5, 0x2680 -/* 0C6CF0 800C60F0 25CEAAB0 */ addiu $t6, %lo(piEventQueue) # addiu $t6, $t6, -0x5550 -/* 0C6CF4 800C60F4 3C06800D */ lui $a2, %hi(__osDevMgrMain) # $a2, 0x800d -/* 0C6CF8 800C60F8 AFA2002C */ sw $v0, 0x2c($sp) -/* 0C6CFC 800C60FC AE080000 */ sw $t0, ($s0) -/* 0C6D00 800C6100 AE040004 */ sw $a0, 4($s0) -/* 0C6D04 800C6104 AE0A000C */ sw $t2, 0xc($s0) -/* 0C6D08 800C6108 AE0B0010 */ sw $t3, 0x10($s0) -/* 0C6D0C 800C610C AE0C0014 */ sw $t4, 0x14($s0) -/* 0C6D10 800C6110 AE0D0018 */ sw $t5, 0x18($s0) -/* 0C6D14 800C6114 24C62760 */ addiu $a2, %lo(__osDevMgrMain) # addiu $a2, $a2, 0x2760 -/* 0C6D18 800C6118 AFAE0010 */ sw $t6, 0x10($sp) -/* 0C6D1C 800C611C 00002825 */ move $a1, $zero -/* 0C6D20 800C6120 02003825 */ move $a3, $s0 -/* 0C6D24 800C6124 AE090008 */ sw $t1, 8($s0) -/* 0C6D28 800C6128 0C032214 */ jal osCreateThread -/* 0C6D2C 800C612C AFAF0014 */ sw $t7, 0x14($sp) -/* 0C6D30 800C6130 3C048013 */ lui $a0, %hi(piThread) # $a0, 0x8013 -/* 0C6D34 800C6134 0C032268 */ jal osStartThread -/* 0C6D38 800C6138 2484A800 */ addiu $a0, %lo(piThread) # addiu $a0, $a0, -0x5800 -/* 0C6D3C 800C613C 8FA4002C */ lw $a0, 0x2c($sp) -/* 0C6D40 800C6140 0C034960 */ jal __osRestoreInt -/* 0C6D44 800C6144 00000000 */ nop -/* 0C6D48 800C6148 8FB80028 */ lw $t8, 0x28($sp) -/* 0C6D4C 800C614C 2401FFFF */ li $at, -1 -/* 0C6D50 800C6150 13010003 */ beq $t8, $at, .L800C6160 -/* 0C6D54 800C6154 00002025 */ move $a0, $zero -/* 0C6D58 800C6158 0C033210 */ jal osSetThreadPri -/* 0C6D5C 800C615C 03002825 */ move $a1, $t8 -.L800C6160: -/* 0C6D60 800C6160 8FBF0024 */ lw $ra, 0x24($sp) -/* 0C6D64 800C6164 8FB00020 */ lw $s0, 0x20($sp) -/* 0C6D68 800C6168 03E00008 */ jr $ra -/* 0C6D6C 800C616C 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/include/structs.h b/include/structs.h index 8f666024..00a9b503 100644 --- a/include/structs.h +++ b/include/structs.h @@ -173,9 +173,19 @@ typedef struct LevelHeader { /* 0xB0 */ u8 padB0[0x3]; /* 0xB3 */ u8 unkB3; - /* 0xB4 */ u8 padB4[0x6]; + /* 0xB3 */ u8 unkB4; + /* 0xB3 */ u8 unkB5; + /* 0xB3 */ u8 unkB6; + /* 0xB3 */ u8 unkB7; + /* 0xB4 */ u8 padB8[0x2]; /* 0xBA */ s16 unkBA; - /* 0xBE */ u8 padBE[0xA]; + /* 0xBE */ u8 unkBE; + /* 0xBE */ u8 unkBF; + /* 0xBE */ u8 unkC0; + /* 0xC1 */ u8 unkC1; + /* 0xC2 */ u8 unkC2; + /* 0xC3 */ u8 unkC3; + /* 0xC4 */ u8 padC4[0x4]; } LevelHeader; /* Size: 0x50 bytes */ @@ -205,14 +215,21 @@ typedef struct { typedef struct Player_3C { u8 pad0[0x8]; s8 unk8; + u8 pad9[0x4]; + u8 unkD; } Player_3C; typedef struct Player_40 { u8 pad0[0xC]; f32 unkC; - u8 pad10[0x44]; + u8 pad10[0x43]; + s8 unk53; s8 unk54; - s8 unk55; + s8 unk55; //size of array pointed by Player->unk68 + u8 pad56[0x02]; + u8 pad58[0x18]; + u8 unk70; + u8 unk71; } Player_40; typedef struct Player_4C { @@ -239,29 +256,46 @@ typedef struct Player_64 { s8 unkF; u8 unk10; u8 unk11; - u8 pad12[0x16]; + u8 pad12[0x0E]; + u32 unk20; + u32 unk24; s16 unk28; s16 unk2A; s32 unk2C; s32 unk30; s16 unk34; s8 unk36; - u8 pad37[0x41]; + u8 pad37[0x39]; + u8 unk70; + u8 pad71[0x03]; + f32 unk74; f32 unk78; f32 unk7C; f32 unk80; - u8 pad84[0xDC]; + u8 pad84[0x4C]; + f32 unkD0; + u8 padD0[0x24]; + u32 unkF8; + u8 unkFC; + u8 padFD[0x63]; s16 unk160; s16 unk162; s16 unk164; - u8 pad166[0x2A]; + s16 unk166; + u8 pad166[0x28]; u16 unk190; u8 unk192; u8 unk193; u8 pad194[0x26]; u16 unk1BA; + u8 pad1BC[0x1B]; + s8 unk1D7; } Player_64; +typedef struct Player_68{ + u8 pad00[0x20]; + s8 unk20; + } Player_68; /* Size: 0x0630 bytes */ typedef struct Player { /* 0x0000 */ s16 y_rotation; @@ -294,7 +328,7 @@ typedef struct Player { /* 0x0040 */ Player_40 *descriptor_ptr; /* 0x0044 */ void *unk44; /* 0x0048 */ s16 unk48; - /* 0x004A */ u16 unk4A; + /* 0x004A */ s16 unk4A; /* 0x004C */ Player_4C *unk4C; //player + 0x318 /* 0x0050 */ void *unk50; //player + 0x2F4 /* 0x0054 */ void *unk54; //player + 0x2C0 @@ -303,7 +337,7 @@ typedef struct Player { /* 0x0060 */ void *unk60; //player + 0x340 /* 0x0064 */ Player_64 *unk64; //player + 0x98 - /* 0x0068 */ void *unk68; //player + 0x80 + /* 0x0068 */ Player_68 **unk68; //player + 0x80 /* 0x006C */ void *unk6C; //player + 0x370 /* 0x0070 */ u32 unk70; @@ -364,7 +398,7 @@ typedef struct Player { /* 0x0120 */ u32 unk120; /* 0x0124 */ f32 stretch_height; /* 0x0128 */ f32 stretch_height_cap; - /* 0x012C */ f32 unk12C; + /* 0x012C */ f32 camera_zoom; /* 0x0130 */ u32 unk130; /* 0x0134 */ f32 pitch; /* 0x0138 */ u32 unk138; diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index e6769fe7..57639ede 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -6,6 +6,7 @@ #include "structs.h" #include "fast3d.h" + extern s32 D_800DC700; extern s16 D_800DC708; extern s32 D_800DC718; @@ -35,15 +36,8 @@ extern s32 D_8011AD34; extern s8 D_8011AD3C; extern s8 D_8011AD3D; -typedef struct unk8011AD40 { - s16 unk0; - s8 pad2[0xA]; - f32 unkC; - f32 unk10; - f32 unk14; -} unk8011AD40; -extern unk8011AD40 *D_8011AD40; +extern Player *D_8011AD40; extern s8 D_8011AD44; extern s8 D_8011AD45; extern s16 D_8011AD46; @@ -83,8 +77,8 @@ extern s8 D_8011AE03; u32 *D_8011AE08[16]; extern s32 (*D_8011AE48)[8]; // Unknown number of entries. extern u8 (*D_8011AE4C)[8]; // Unknown number of entries. -extern u32 (*D_8011AE58)[64]; // Not sure about the number of elements -extern s32 D_8011AE5C; +extern Player **objPtrList; // Not sure about the number of elements +extern s32 objCount; extern s32 D_8011AE60; extern s32 D_8011AE64; extern s32 *D_8011AE68; @@ -97,11 +91,14 @@ extern s16 D_8011AE7C; extern s8 D_8011AE7E; extern s16 D_8011AE82; extern s32 D_8011AE88; +extern u32 D_8011AE8C; +extern u32 D_8011AE90; +extern u32 D_8011AE94; extern s32 D_8011AEB0[2]; extern s16 *D_8011AEB8; extern s32 D_8011AEBC; -extern s32 *D_8011AEC4; -extern s32 D_8011AEC8; +extern Player **particlePtrList; +extern s32 particleCount; /* Size: 0x3C bytes */ typedef struct unknown8011AECC { @@ -116,10 +113,10 @@ extern s32 D_8011AED4; extern s16 D_8011AED8; extern u32 (*D_8011AEDC)[64]; // Not sure about the number of elements extern s32 D_8011AEE0; -extern Player *(*D_8011AEE4)[8]; +extern Player *(*playerStructArray_Ptr)[8]; extern s32 *D_8011AEE8; extern s32 *D_8011AEEC; -extern s32 D_8011AEF0; +extern s32 playerCount; extern u8 D_8011AEF4; extern u8 D_8011AEF5; extern u8 D_8011AEF6; @@ -129,6 +126,7 @@ extern s32 D_8011AF08[2]; extern s32 D_8011AF10; extern s32 D_8011AF60; + /* Size: 0x40 bytes */ typedef struct unk800179D0 { s32 unk0; @@ -156,10 +154,52 @@ void func_8000C460(void); void *func_80070B78(s32, u32); void *func_80070C9C(s32, u32); s32 *func_80076C58(s32); +void particlePtrList_addObject(Player *); +void particlePtrList_flush(void); void func_8001D258(f32, f32, s32, s32, s32); +extern void func_800245B4(s16); + + GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B020.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B290.s") +#else + +extern s32 D_800DC754; +extern Player* D_800DC75C; +extern Player* D_800DC764; + +s32 *func_8001E29C(s32 arg0); + +void func_8000B290(){ + + if(D_800DC754){ + func_80071140(); + } + func_8001E29C(20); + /*{ + if(D_800DC754->unk7a) + func_8007CCB0(); + D_800DC754->unk7a = 0; + + if(D_800DC754->unk7C) + func_8007B2BC(); + D_800DC754->unk7C = 0; + }*/ + if(D_800DC75C) + particlePtrList_addObject(D_800DC75C); + D_800DC75C = NULL; + + if(D_800DC764) + particlePtrList_addObject(D_800DC764); + D_800DC764 = NULL; + + particlePtrList_flush(); +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B38C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B750.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000BADC.s") @@ -181,12 +221,12 @@ void func_8000BF8C(void) { func_8001D258(D_800E514C, D_800E5150, 0, -0x2000, 0); D_8011AE68 = (s32*)func_80070B78(0x15800, 0x200); - D_8011AEC4 = (s32*)func_80070C9C(0x320, 0xFFFF); + particlePtrList = (Player **)func_80070C9C(0x320, 0xFFFF); D_8011AE6C = (s32*)func_80070C9C(0x50, 0xFFFF); D_8011AE74 = (s32*)func_80070C9C(0x200, 0xFFFF); D_8011AECC = (unknown8011AECC*)func_80070C9C(0xE10, 0xFFFF); D_8011AEDC = (s32*)func_80070C9C(0x50, 0xFFFF); - D_8011AEE4 = (s32*)func_80070C9C(0x28, 0xFFFF); + playerStructArray_Ptr = (s32*)func_80070C9C(0x28, 0xFFFF); D_8011AEEC = (s32*)func_80070C9C(0x28, 0xFFFF); D_8011AEE8 = (s32*)func_80070C9C(0x28, 0xFFFF); D_8011AF04 = (s32*)func_80070C9C(0x200, 0xFFFF); @@ -218,7 +258,7 @@ void func_8000BF8C(void) { D_8011ADA0++; } func_8000C2D8(&D_8011AD6C[D_8011AD70[65]], (D_8011AD70[66] - D_8011AD70[65]) * 4); - D_8011AE58 = (u32**)func_80070C9C(0x800, 0xFFFF); + objPtrList = (Player**)func_80070C9C(0x800, 0xFFFF); D_8011ADC4 = 0; D_8011AEF4 = 0; D_8011AEF5 = 0; @@ -259,11 +299,11 @@ void func_8000C460(void) { D_8011AD26 = 1; D_8011AD5C = 0; D_8011AD60 = 0; - D_8011AEC8 = 0; + particleCount = 0; D_8011AE70 = 0; D_8011AED0 = 0; D_8011AED4 = 0; - D_8011AEF0 = 0; + playerCount = 0; D_8011AE78 = 0; D_8011AD21 = 0; D_8011AD22[0] = 0; @@ -281,7 +321,7 @@ void func_8000C460(void) { D_8011AF08[0] = 0xFF; D_8011AF08[1] = 0xFF; - D_8011AE5C = 0; + objCount = 0; D_8011AE60 = 0; D_8011AE64 = 0; D_8011AE88 = 0; @@ -311,13 +351,13 @@ void func_8000C604(void) { D_800DC744 = 0; func_8006F398(); } - func_8001004C(); - len = D_8011AE5C; + particlePtrList_flush(); + len = objCount; for (i = 0; i < len; i++) { - func_800101AC((*D_8011AE58)[i], 1); + func_800101AC(objPtrList[i], 1); } - D_8011AEC8 = 0; - D_8011AE5C = 0; + particleCount = 0; + objCount = 0; D_8011AE60 = 0; func_8000C460(); func_80071140(D_8011AEB0[0]); @@ -362,10 +402,10 @@ void func_8000CBF0(u32 *arg0, s32 arg1) { u32 *temp2; temp2 = *temp; if (temp2 != NULL) { - return; + return; // I can't get this second return to appear. } D_8011AE08[arg1] = arg0; - return; // I can't get this second return to appear. + return; } #endif @@ -392,6 +432,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000CC7C.s") // Has a jump table GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E0B0.s") + void func_8000E128(void) { D_800DC708 = 0x8000; } @@ -435,16 +476,16 @@ s8 func_8000E1DC() { return D_8011AE03; } -void func_8000E1EC(unk8011AD40 *arg0, s32 arg1) { +void func_8000E1EC(Player *arg0, s32 arg1) { D_8011AD40 = arg0; D_8011AD44 = 4; D_8011AD45 = arg1; - D_8011AD46 = arg0->unkC; - D_8011AD48 = arg0->unk10; - D_8011AD4A = arg0->unk14; - D_8011AD4C = arg0->unk0; - func_8000FFB8(); - D_8011AEF0 = 0; + D_8011AD46 = arg0->x_position; + D_8011AD48 = arg0->y_position; + D_8011AD4A = arg0->z_position; + D_8011AD4C = arg0->y_rotation; + particlePtrList_addObject(arg0); + playerCount = 0; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E2B4.s") @@ -457,24 +498,33 @@ u8 func_8000E4C8() { return D_8011AEF4; } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E4D8.s") - -u32 func_8000E948(s32 arg0) { - if (arg0 < 0 || arg0 >= D_8011AE5C) { - return 0; - } - return (*D_8011AE58)[arg0]; +u8 func_8000E4D8(void){ + return D_8011AEF5; } -u32 *func_8000E988(s32 *arg0, s32 *arg1) { +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E4E8.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E558.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E5EC.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E79C.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E898.s") + + +Player *getObject(s32 indx) { + if (indx < 0 || indx >= objCount) { + return 0; + } + return objPtrList[indx]; +} + +Player **func_8000E988(s32 *arg0, s32 *cnt) { *arg0 = D_8011AE60; - *arg1 = D_8011AE5C; - return *D_8011AE58; + *cnt = objCount; + return objPtrList; } // Unused? -s32 func_8000E9B0(void) { - return D_8011AE5C; +s32 getObjectCount(void) { + return objCount; } // Unused? @@ -482,7 +532,13 @@ s32 func_8000E9C0(void) { return D_8011AE64; } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E9D0.s") +void func_8000E9D0(Player* arg0){ + arg0->unk6 |= 0x8000; + func_800245B4(arg0->unk2C | 0xC000); + objPtrList[objCount++] = arg0; + if(1); + D_8011AE64++; +} GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000EA54.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000F648.s") @@ -524,8 +580,60 @@ s32 func_8000FD34(unk8000FD34 *arg0, s32 arg1) { } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000FD54.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000FFB8.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001004C.s") + + +void particlePtrList_addObject(Player* arg0){ + func_800245B4(arg0->unk4A | 0x8000); + particlePtrList[particleCount] = arg0; + particleCount++; +} + + +s32 func_80010018(void){ + return D_8011AEBC; +} + +s32 func_80010028(s32 arg0){ + return (D_8011AEB8[arg0] < D_8011AD68); +} + +#if 1 +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/particlePtrList_flush.s") +#else +//bad regalloc; swap s2 = s3 +/*removes objects in particleList from objPtrList and frees*/ +void particlePtrList_flush(void){ + s32 j, i, search_indx, tmp; + Player* searchObj; + + D_8011AE88 = 0; + for (i = 0; i < particleCount; i++){ + search_indx = -1; + searchObj = particlePtrList[i]; + + for(j = 0; j < objCount; j++){ + if(searchObj == objPtrList[j]) + search_indx = j; + } + + //if object found + if(search_indx != -1){ + tmp = D_8011AE7C; + if(search_indx < D_8011AE7C) + D_8011AE7C = tmp-1; + + objCount--; + for(j = search_indx; j < objCount; j++){ + objPtrList[j] = objPtrList[j+1]; + } + } + func_800101AC(searchObj,0); + } + particleCount = 0; +} +#endif + + GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800101AC.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80010994.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011134.s") @@ -554,16 +662,183 @@ void func_80011560(void) { } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011570.s") +void func_80011960(Player*, s32, u32, Player_64*, u32, u32, u32, u32, f32); +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011960.s") +#else +void func_80011960(Player* arg0, s32 arg2, u32 arg3, Player_64* arg4 + , u32 arg5 , u32 arg6 , u32 arg7, u32 arg8, f32 arg9) +{ + + +} +#endif + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011AD0.s") +#else +extern f32 D_800E5550; +void func_80011AD0(Player* this){ + f32 tmp_f0; + u32 offset; + switch(this->unk48){ + case 47: + //L80011B10 + if(this->unk7C.word < 0) + break; + func_80011960( this, this->unk64->unk20, 4, this->unk64 + , 2, this->unk64->unk24, 11, 0, 1.0f); + break; + + case 61: + //L80011B58 + offset = (this->unk64->unkFC*6); + offset *= 5; + offset = offset*2 + 0x80; + func_80011960(this, offset, 6, this->unk64 + , 8, this->unk64->unkF8, 10, 0, 1.0f); + break; + + case 3://L80011BB4 + tmp_f0 = (f32) this->unk3C->unkD; + if(this->unk3C->unkD < 0){ + tmp_f0 += 4294967296.0f; + } + offset = (this->unk64->unkFC*6); + offset *= 5; + offset = offset*2 + 0x80; + func_80011960(this, offset, 6, this->unk64 + , 8, this->unk64->unkF8, 26, 0, tmp_f0 * D_800E5550); + break; + + case 89: //L80011C38 + if(this->unk78 == 0) + break; + if(this->unk64->unk70 > 0 || 0.0f < this->unk64->unk74){ + func_800135B8(this); + } + break; + default: + break; + }//L80011C88 +} +#endif + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011C94.s") +#else +void func_80011C94(Player* this){ +} +#endif + + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800120C8.s") +#else + +extern f32 D_8011AD30; + +void func_800120C8(Player* this){ + u32 sp_b8; + u32 sp_a8; + u32 sp_a4; + u32 sp_78; + + u32 *s0; + f32 tmp_f_1; + f32 *tmp_fp_s1; + Player_64* tmp_s3; + + s0 = ((u32*) this->unk68)[this->unk3A]; + if(s0){ + /* + sp_a8 = 0; + sp_a4 = 0; + sp_b8 = 255; + sp_78 = *s0; + + if(this->unk54){ + tmp_f_1 = *((f32*) this->unk54) * 255.0f * D_8011AD30; + sp_a8 = 1; + sp_a4 = 1; + sp_b8 = tmp_f_1; + } + + + tmp_fp_s1 = &D_8011AD30; + if(this->unk48 == 1){ + tmp_s3 = this->unk64; + func_80012E28(this); + + }else{ + tmp_s3 = NULL; + } + if(s0->unk20 < 0){ + this->s0->unk1f + } + //L800122Fc + */ + //L800129A0 + { + $t6 = this->unk3A; + + + //f64 $f8; + $f12 = (f32) $t9; + $f8 = ( (f64) $f16) + (((f64) $f8)* 0.25f); + $f4 = (((f32) $v0->unk2) - this->y_position); + this->x_position = (f32) $f8; + this->y_position = (f32) (((f64)$f18) + (((f64) $f4) * $f14)); + $sp_38 = this->z_position; + $f8 = ( (f64) $f10) + (((f64) ($f12 - $f6)) * $f14); + $s0->0x14 = (f32) $f8; + if(this->descriptor_ptr->unk53 == 1){ + + func_80068514( $s1, &D_8011AE90, &D_8011AE94, this, $t4, 266); + } + } + //L80012AF8 + if($sp_9c != -1){ + if(this->descriptor_ptr->unk71){ + fast3d_cmd($v0++, 0xFA000000, + ($v1->unk18 << 0x18) | ($v1->unk19 << 0x10) | ($v1->unk1a << 0x08) | ($sp_b4 & 0xff)); + //G_SETPRIMCOLOR + + func_8007B43C(); + } + //L80012B6C + func_800143A8($sp_78, this, $sp_9c, 4, $sp_b0); + if(this->descriptor_ptr->unk71){ + func_8007B54(); + } + } + //L80012BA8 + if( $sp_a8 || this->descriptor_ptr->unk71){ + fast3d_cmd($v0++, 0xFA000000, 0xFFFFFFFF); //G_SETPRIMCOLOR + } + //L80012BE8 + if($sp_a4){ + fast3d_cmd($v0++, 0xFB000000, 0xFFFFFDA9); //G_SETENVCOLOR + } + //L80012C0C + func_80069A40($s1); + } + //L80012C14 + return; +} +#endif void func_80012C30(void) { D_8011ADA4 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012C3C.s") +void func_80012C3C(Gfx** dlist){ + s32 i; + Gfx *tmp; + for(i = 0; iunk6 & 0x5000) + return; + + func_800B76B8(2, arg3->unk4A); + D_8011AE8C = *arg0; + D_8011AE90 = *arg1; + D_8011AE94 = *arg2; + scale = arg3->scale; + func_8001348C(arg3); + arg3->scale = scale; + *arg0 = D_8011AE8C; + *arg1 = D_8011AE90; + *arg2 = D_8011AE94; + func_800B76B8(2, -1); + + +} + +extern f32 func_800707F8(s16); +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012E28.s") +#else +void func_80012E28(Player *this){ + s32 unused1; + Player_64 *sp_20; + f32 tmp_f2; + f32 sp_1c; + f32 tmp_f0; + + + if(this->unk48 == 1){ + + sp_20 = this->unk64; + this->y_rotation += sp_20->unk160; + this->x_rotation += sp_20->unk162; + this->z_rotation += sp_20->unk164; + sp_1c = 0.0f; + if(sp_20->unk1D7 < 5) { + + sp_1c = func_800707F8(sp_20->unk164); + tmp_f2 = sp_1c; + tmp_f0 = func_800707F8(sp_20->unk162 - sp_20->unk166)*tmp_f2; + + //bad regalloc of 0.0f + tmp_f0 = (tmp_f0 < 0.0f) ? 0.0f : tmp_f0*tmp_f0; + + sp_1c = (1.0f - tmp_f0)*24.0f + sp_20->unkD0; + } + //L80012F0C + this->y_position = this->y_position + sp_1c; + D_8011ADD0 = sp_1c; + } + //L80012F20 +} +#endif + void func_80012F30(Player *arg0) { if (arg0->unk48 == 1) { @@ -594,7 +929,27 @@ void func_80012F30(Player *arg0) { } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012F94.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001348C.s") + + + + +void func_80013548(Player *arg0); + +void func_8001348C(Player *this){ + func_80012F94(this); + if(this->unk6 & 0x8000){ + func_800B3740(this, &D_8011AE8C, &D_8011AE90, &D_8011AE94, 32768); + } + else{ + if(this->descriptor_ptr->unk53 == 0) + func_800120C8(this); + else if(this->descriptor_ptr->unk53 == 1) + func_80011C94(this); + else if(this->descriptor_ptr->unk53 == 4) + func_80011AD0(this); + } + func_80013548(this); +} void func_80013548(Player *arg0) { if ((arg0->unk6 & 0x8000) == 0 && arg0->descriptor_ptr->unk54 == 1) { @@ -609,7 +964,27 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800138A8.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80013A0C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80013DCC.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80014090.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800142B8.s") + +void func_800142B8(void){ + s32 i = D_8011AE60; + s32 j; + Player* currObj; + Player_68 *curr_68; + + for(; i < objCount; i++){ + currObj = objPtrList[i]; + if( (currObj->unk6 & 0x8000) == 0 && currObj->descriptor_ptr->unk53 == 0){ + for(j=0; jdescriptor_ptr->unk55; j++){ + curr_68 = currObj->unk68[j]; + if( curr_68 != NULL && curr_68->unk20 > 0){ + curr_68->unk20 = curr_68->unk20-- & 0x03; + } + } + } + } + +} + GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800143A8.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80014814.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80014B50.s") @@ -651,7 +1026,18 @@ s16 func_80017E88(void) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017E98.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800185E4.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80018C6C.s") + +Player * func_80018C6C(void){ + s32 i; + Player* current_obj; + for(i=D_8011AE60; i < objCount; i++){ + current_obj = objPtrList[i]; + if(!(current_obj->unk6 & 0x8000) && (current_obj->unk48 == 62)) + return current_obj; + } + return NULL; +} + GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80018CE0.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001955C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/D_80019808.s") @@ -726,6 +1112,7 @@ void func_8001B790(void) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001B7A8.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001B834.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001B974.s") // Returns a pointer to some struct that is 0x3C bytes long. unknown8011AECC *func_8001BA00(s32 arg0) { @@ -744,32 +1131,33 @@ s32 func_8001BA64() { return D_8011AED0; } -Player **func_8001BA74(s32 *arg0) { - *arg0 = D_8011AEF0; - return *D_8011AEE4; +Player **getPlayerStructArray(s32 *cnt) { + *cnt = playerCount; + return *playerStructArray_Ptr; } s32 *func_8001BA90(s32 *arg0) { - *arg0 = D_8011AEF0; + *arg0 = playerCount; return D_8011AEEC; } s32 *func_8001BAAC(s32 *arg0) { - *arg0 = D_8011AEF0; + *arg0 = playerCount; return D_8011AEE8; } -Player *func_8001BAC8(s32 arg0) { - if (D_8011AEF0 == 0) { +Player *getPlayerStruct(s32 indx) { + if (playerCount == 0) { return NULL; } - if(arg0 < 0 || arg0 >= D_8011AEF0) { + if(indx < 0 || indx >= playerCount) { return NULL; } - return (*D_8011AEE4)[arg0]; + return (*playerStructArray_Ptr)[indx]; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001BB18.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001BB68.s") void func_8001BC40(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { @@ -777,6 +1165,7 @@ void func_8001BC40(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001BC54.s") + u32 func_8001BD94(s32 arg0) { if (arg0 < 0 || arg0 >= D_8011AEE0) { return 0; @@ -821,11 +1210,13 @@ void func_8001D23C(s32 arg0, s32 arg1, s32 arg2) { } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D258.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D2A0.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D4B4.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D5E0.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D6E4.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D80C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001DD54.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001E13C.s") s32 *func_8001E29C(s32 arg0) { if (arg0 < 0 || arg0 >= D_8011ADA0) { @@ -851,7 +1242,26 @@ void func_8001E344(s32 arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001E36C.s") +void func_8001E36C(s32 arg0, f32* arg1, f32* arg2, f32* arg3){ + s32 i; + Player* current_obj; + *arg1 = -32000.0f; + *arg2 = -32000.0f; + *arg3 = -32000.0f; + for(i=0; iunk6 & 0x8000) == 0 + && current_obj->unk48 == 39 + && current_obj->unk78 == arg0 + ){ + *arg1 = current_obj->x_position; + *arg2 = current_obj->y_position; + *arg3 = current_obj->z_position; + } + } +} s16 func_8001E440() { return D_8011AE7A; @@ -954,7 +1364,7 @@ void func_800228EC(s32 arg0) { Player_64 *player_64; D_8011AEF7 = 3; - player_64 = func_8001BAC8(0)->unk64; + player_64 = getPlayerStruct(0)->unk64; player_64->unk190 = 0; player_64->unk192 = 0; player_64->unk193 = 0; @@ -971,10 +1381,39 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800230D0.s") s8 func_8002341C(void) { return D_8011AEF6; } - +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8002342C.s") +#else -//GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80023568.s") +extern f32 sqrtf(f32); + +//bad regalloc +//finds furthest object (with some additional conditions) +Player* func_8002342C(f32 x, f32 z){ + Player* retval = NULL; + s32 i; + Player* currObj = NULL; + f32 x; + f32 z; + f32 dist; + f32 max = 0.0f; + + for(i=0; iunk6 & 0x8000) == 0 && currObj->unk48 == 87){ + x = currObj->x_position - x; + z = currObj->z_position - z; + dist = sqrtf(x*x + z*z); + + if(max < dist){ + max = dist; + retval = currObj; + } + } + } + return retval; +} +#endif s32 func_80023568(void) { if (D_8011AD3C != 0) { diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index e89d8d4f..d6d50b56 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -3,10 +3,47 @@ #include "types.h" #include "macros.h" +#include "structs.h" +/* Size: 0x44 bytes */ +typedef struct unk80120AC0 { + s16 unk0; + s16 unk2; + s16 unk4; + u8 pad6[6]; + f32 x_position; + f32 y_position; + f32 z_position; + f32 pad18; + f32 unk1C; + f32 pad20; + f32 unk24; + f32 unk28; + f32 unk2C; + f32 unk30; + s16 unk34; + s16 pad36; + s16 unk38; + s8 pad3A; + s8 unk3B; + u8 pad3C[8]; +} unk80120AC0; + +extern LevelHeader *D_800DC91C; extern s32 D_800DC924; extern s32 D_8011D37C; extern s32 D_8011D474; + +extern s32 D_8011B0A0; +extern s32 D_8011B0A4; +extern s32 D_8011B0A8; + +typedef struct{ + Player * unk00; +} unk8011B0B8; + +extern unk8011B0B8 D_8011B0B8; + extern s32 D_8011B0DC; extern s32 D_8011B0F0; extern s32 D_8011B0F4; @@ -16,14 +53,179 @@ extern f32 D_8011B0E4; extern f32 D_8011B0E8; extern f32 D_8011B0EC; -extern s32* D_800DC918; +typedef struct{ + u8 pad00[0x12]; + u16 unk12; + u16 unk14; +} unk800DC918_00_00; + +typedef struct{ + unk800DC918_00_00 *unk00; + u8 pad00[0x04]; +} unk800DC918_00; + +typedef struct{ + u8 unk00; + u8 pad01[0x05]; + u8 unk06; + u8 unk07; + u32 unk08; +} unk800DC918_04_0C; + +typedef struct{ + u8 pad00[0x0C]; + unk800DC918_04_0C* unk0C; + u8 pad0C[0x10]; + s16 unk20; + u8 pad22[0x09]; + s8 unk2B; + u8 pad2C[0x14]; + u8 unk40; + u8 pad41[0x3]; +} unk800DC918_04; + +typedef struct{ + s16 unk00; //sx + s16 unk02; //sy + s16 unk04; //sz + s16 unk06; //lx + s16 unk08; //ly + s16 unk0A; //lz +} unk800DC918_08; //bounding box + +typedef struct{ + unk800DC918_00 *unk00; + unk800DC918_04 *unk04; + unk800DC918_08 *unk08; + u8 pad0C[0x0E]; + s16 count; +} unk800DC918; + +extern unk800DC918* D_800DC918; + +typedef struct{ + s16 unk00; + s16 unk02; + s16 unk04; +}unk8011B0B0; + +unk8011B0B0 *D_8011B0B0; + +typedef struct{ + s32 unk00; + s32 unk04; + s32 unk08; +}unk8011D468; + +unk8011D468 D_8011D468; +extern void func_8006F64C(void*, f32, f32, f32, f32*, f32*, f32*); + + s32 func_800249E0(s32 arg0) { D_8011D37C = arg0; return 0; } +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800249F0.s") +#else +extern u32 D_800DC874; +extern u32 D_800DC87C; +extern u32 D_8011B0C8; +extern u8 D_8011B0E1; +extern u8 D_8011B0E2; +extern u8 D_8011B0E3; +extern u32 D_8011B0F8; +extern u32 D_8011B100; +extern u32 D_8011B104; +extern u32 D_8011B108; +extern u32 D_8011B10C; +extern u32 D_8011B110; +extern u32 D_8011B114; +extern u32 D_8011D320[4]; +extern u32 D_8011D338[4]; +extern u32 D_8011D348; +extern u32 D_8011D350[4]; + +extern u32 D_8011D384; + + +void func_800249F0(u32 arg0, u32 arg1, s32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 arg6){ + s32 i; + s32 tmp_a2; + + D_800DC91C = func_8006BDB0(); + D_8011B0F8 = 0; + D_8011B100 = 0; + D_8011B104 = 0; + D_8011B108 = 0; + D_8011B10C = 0; + if(D_800DC91C->race_type == 6 || D_800DC91C->race_type == 7){ + D_8011B0F8 = 1; + } + func_8002C0C4(arg0); + + if(arg2 < 2){ + D_8011D384 = 0; + for(i = 0; i < D_800DC918->count; i++){ + if(D_800DC918->unk04[i].unk2B != 0){ + D_8011D384++; + D_800DC918->unk04[i].unk2B = 1; + } + } + } + if(is_in_two_player_adventure() && (D_800DC91C->race_type == 0 || D_800DC91C->race_type & 0x40)){ + tmp_a2 = 2; + }else{ + tmp_a2 = arg2; + tmp_a2++; + } + if(D_8011D384){ + func_800B82B4(D_800DC918, D_800DC91C, tmp_a2); + } + func_8006652C(arg2); + func_80027FC4(arg1); + D_8011B110 = 0; + D_8011B114 = 0x10000; + func_80011390(); + func_8000C8F8(arg6,0); + func_8000C8F8(arg5,1); + D_8011D37C = arg2; + func_8000CC7C(arg3, arg4, arg2); + func_8000B020(72, 64); + if(arg0 == 0 && arg4 == 0){ + func_800C01D8(&D_800DC87C); + } + else{ + func_800C01D8(&D_800DC874); + } + func_8006652C(D_8011D37C); + D_8011B0FC = 0; + i = 0; + do{ + D_8011D350[i] = func_80070C9C(3200, 0xFFFF00FF); + D_8011D320[i] = func_80070C9C(12800, 0xFFFF00FF); + D_8011D338[i] = func_80070C9C(20000, 0xFFFF00FF); + }while(&D_8011D338[++i] != &D_8011D348); + + D_8011B0C8 = 0; + func_8002D8DC(1,1,0); + func_8002D8DC(2,2,0); + D_8011B0C8 = 1; + func_8002D8DC(1,1,0); + func_8002D8DC(2,2,0); + D_8011B0C8 = 0; + if(D_800DC91C->unkB7){ + D_8011B0E1 = D_800DC91C->unkB4; + D_8011B0E2 = D_800DC91C->unkB5; + D_8011B0E3 = D_800DC91C->unkB6; + func_80025510(arg2 + 1); + } +} +#endif + + GLOBAL_ASM("asm/non_matchings/unknown_0255E0/D_80024D54.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80025510.s") @@ -43,7 +245,27 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80026E54.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027184.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027568.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800278E8.s") +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027E24.s") +#else +typedef struct{ + u32 unk00; + u8 pad04[0x10]; + u32 unk14; + +}unk80027E24_sp58; + +void func_80027E24(u32 arg0){ + unk80027E24_sp58 sp58; + unk800DC918_04 *s6; + unk800DC918_04_0C * s0; + unk800DC918_04_0C * s5; + unk800DC918_00_00 * tmp_a0; + s32 i;//sp_6c + s32 j; +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80027FC4.s") void func_80028044(s32 arg0) { @@ -51,22 +273,184 @@ void func_80028044(s32 arg0) { } GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028050.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_800289B8.s") -GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028C10.s") +#else +void func_800289B8(void){ + u8 sp_2f = D_800DC91C->unkC1; + u8 sp_2e = D_800DC91C->unkC2; + u8 sp_2d = D_800DC91C->unkC3; + u8 sp_2c = D_800DC91C->unkBE; + u8 sp_2b = D_800DC91C->unkBF; + u8 sp_2a = D_800DC91C->unkC0; + u32 sp_24 = D_8011B0A8; + func_8007B3D0(&D_8011B0A0); + func_8007B4C8(&D_8011B0A0, 0, 8); + D_8011B0A0 += 8; +} +#endif + +void func_80028C10(void){ + unk80120AC0 * v0_some_struct; + if(D_8011B0B8.unk00 == NULL) + return; + + v0_some_struct = func_80069D20(); + if(D_800DC91C->unk49 == 0){ + D_8011B0B8.unk00->x_position = v0_some_struct->x_position; + D_8011B0B8.unk00->y_position = v0_some_struct->y_position; + D_8011B0B8.unk00->z_position = v0_some_struct->z_position; + } + + func_80068408(&D_8011B0A0, &D_8011B0A4); + if(D_8011B0DC){ + func_80012D5C(&D_8011B0A0, &D_8011B0A4, &D_8011B0A8, D_8011B0B8.unk00); + } +} +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028CD0.s") +#else + +#endif + void func_80028FA0(s32 arg0) { D_8011B0FC = arg0; } GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80028FAC.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029658.s") +#else + +extern s32 D_8011D384; + +func_80029658(s32 arg0, s32 arg1){ + unk800DC918_04 *sp_ac; + void *sp_78; + u32 sp_70; + u8 v0; + + sp_ac = D_800DC918->unk04 + arg0; + if(D_8011D384){ + sp_78 = func_800B9228(sp_ac); + } + else{ + sp_78 = NULL; + } + + if(arg1){ + v0 = sp_ac->unk40; + sp_70 = sp_ac->unk20; + } + else{ + v0 = 0; + sp_70 = sp_ac->unk20; + } + + if(v0 > sp_70) + return; + + for(i = v0; i <= sp_70; i++){ + if(sp_ac->unk0C[i].unk08 & 0x100) + break; + + if(sp_ac->unk0C[i].unk00 == 255){ + + } + else{ + + } + + if((sp_ac->unk0C[i].unk08 | 0xa) & 0x10 == 0 + || (sp_ac->unk0C[i].unk08 | 0xa) & 0x800 == 0 + ){ + //$s1 = (sp_ac->unk0C[i].unk08 | 0xa) | D_8011B0FC; + } + } +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029AF8.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029D14.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80029F18.s") -GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A05C.s") +#else +func_80029F18(){ + +} +#endif + + +s32 func_8002A05C(s32 arg0, s32 arg1, s32* arg2){ + s32 i; + s32 cnt = 0; + unk800DC918_08 * a0; + for(i = 0; i < D_800DC918->count; i++){ + a0 = D_800DC918->unk08 + i; + if(arg0 < a0->unk06 + 4 && a0->unk00 - 4 < arg0 + && arg1 < a0->unk0A + 4 && a0->unk04 - 4 < arg1 + ){ + *arg2 = i; + cnt++; + arg2++; + } + } + return cnt; +} + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A134.s") -GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A2DC.s") +#else +s32 func_8002A134(s32* arg0, unk800DC918_08 arg1){ + s32 i; + unk800DC918_08 * a0; + s32 cnt = 0; + unk800DC918_08 bnd; + + //BAD variable assignments; + bnd.unk00 = arg1.unk00 - 4; + bnd.unk02 = arg1.unk02 - 4; + bnd.unk04 = arg1.unk04 - 4; + bnd.unk06 = arg1.unk06 + 4; + bnd.unk08 = arg1.unk08 + 4; + bnd.unk0A = arg1.unk0A + 4; + + + for(i = 0; i < D_800DC918->count; i++){ + a0 = D_800DC918->unk08 + i; + if( a0->unk06 >= bnd.unk00 && bnd.unk06 >= a0->unk00 + && a0->unk0A >= bnd.unk04 && bnd.unk0A >= a0->unk04 + && a0->unk08 >= bnd.unk02 && bnd.unk08 >= a0->unk02 + ){ + *arg0 = i; + cnt++; + arg0++; + } + } + return cnt; +} +#endif + +unk800DC918_04 *func_8002A2C8(s32 arg0){ + if(arg0 < 0 || D_800DC918->count < arg0) + return NULL; + + return D_800DC918->unk04 + arg0; +} + + + +unk800DC918_08 *func_8002A2DC(s32 arg0){ + if(arg0 < 0 || D_800DC918->count < arg0) + return NULL; + + return D_800DC918->unk08 + arg0; +} + GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A31C.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A5F8.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002A900.s") @@ -89,14 +473,41 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002BAB0.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C0C4.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C71C.s") -s32* func_8002C7C4(void) { +unk800DC918* func_8002C7C4(void) { return D_800DC918; } GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C7D4.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002C954.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002CC30.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002D30C.s") +#else + +typedef struct{ + u8 pad00[0x04]; + u32 unk04; + u32 unk08; +}unk8002D30C_a0; + +void func_8002D30C(unk8002D30C_a0* arg0, u32 arg1){ + unk8002D30C_a0* s0 = arg0; + while(s0 != NULL){ + if(s0->unk04){ + s0->unk04 += arg1; + } + + if(s0->unk08){ + s0->unk08 += arg1; + } + + func_8002D30C(s0->unk04, arg1); + s0 = s0->unk08; + } +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002D384.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002D670.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002D8DC.s") @@ -117,4 +528,39 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80030838.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8003093C.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80030A74.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80030DE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80031018.s") + + +void func_80031018(void){ + struct { + u8 pad00[0x40]; + } sp_50; //same as unk80535C4_3 + + struct { + s16 unk00; //sp_38 + s16 unk02; //sp_3A + s16 unk04; //sp_3C + u8 pad06[0x02]; + f32 unk08; //sp40; + f32 unk0C; //sp44; + f32 unk10; //sp48; + f32 unk14; //sp4C; + } sp_38; + + f32 sp_34 = 0.0f; + f32 sp_30 = 0.0f; + f32 sp_2C = -65536.0f; + + sp_38.unk04 = D_8011B0B0->unk04; + sp_38.unk02 = D_8011B0B0->unk02; + sp_38.unk00 = D_8011B0B0->unk00; + sp_38.unk0C = 0.0f; + sp_38.unk10 = 0.0f; + sp_38.unk14 = 0.0f; + sp_38.unk08 = 1.0f; + + func_8006FC30(&sp_50, &sp_38); + func_8006F64C(&sp_50, sp_34, sp_30, sp_2C, &sp_34, &sp_30, &sp_2C); + D_8011D468.unk00 = sp_34; + D_8011D468.unk04 = sp_30; + D_8011D468.unk08 = sp_2C; +} \ No newline at end of file diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 22b107b2..edac00c9 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -362,7 +362,7 @@ typedef struct unk80038A78 { void func_80038A78(unk80038A78 *arg0, s32 arg1) { arg0->unk18 += arg1 * 8; if (arg0->unk18 >= 0x100) { - func_8000FFB8(); + particlePtrList_addObject(); arg0->unk18 = 0xFF; } } @@ -631,7 +631,7 @@ void func_8003D534(Player *arg0, s32 arg1) { arg0->unk7C.half.upper = 0x14; arg0->unk7C.half.lower = 0x10; if (func_8009C30C() & 0x1000) { - func_8000FFB8(arg0); + particlePtrList_addObject(arg0); } } @@ -834,7 +834,7 @@ void func_80042A1C(unk80042A1C *arg0, s8 *arg1) { arg0->unk7C = arg1[8]; arg0->unk7E = 0; if (is_in_tracks_mode()) { - func_8000FFB8(arg0); + particlePtrList_addObject(arg0); } func_800C56D0(4); } diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 47c7bc7e..63dc0673 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -58,9 +58,9 @@ typedef struct unk80120AC0 { s16 unk2; s16 unk4; u8 pad6[6]; - f32 unkC; - f32 unk10; - f32 unk14; + f32 x_position; + f32 y_position; + f32 z_position; f32 pad18; f32 unk1C; f32 pad20; @@ -147,7 +147,7 @@ extern s32 D_80123504; extern s32 D_80123508; extern Settings *gSettingsPtr; extern s8 D_80123514; -extern s8 D_80123515; +extern s8 gIsPaused; extern s8 D_80123516; extern s32 D_80123518; extern s32 D_8012351C; @@ -248,26 +248,26 @@ void func_80066230(s32 arg0, s32 arg1) { sp2A = someStruct->unk0; sp28 = someStruct->unk2; sp26 = someStruct->unk4; - sp20 = someStruct->unkC; - sp1C = someStruct->unk10; - sp18 = someStruct->unk14; + sp20 = someStruct->x_position; + sp1C = someStruct->y_position; + sp18 = someStruct->z_position; sp24 = someStruct->unk38; someStruct->unk4 = 0; someStruct->unk2 = 0; someStruct->unk0 = -0x8000; someStruct->unk38 = 0; - someStruct->unkC = 0.0f; - someStruct->unk10 = 0.0f; - someStruct->unk14 = 0.0f; + someStruct->x_position = 0.0f; + someStruct->y_position = 0.0f; + someStruct->z_position = 0.0f; func_8001D5E0(0.0f, 0.0f, -1.0f); func_80066CDC(arg0, arg1); someStruct->unk38 = sp24; someStruct->unk0 = sp2A; someStruct->unk2 = sp28; someStruct->unk4 = sp26; - someStruct->unkC = sp20; - someStruct->unk10 = sp1C; - someStruct->unk14 = sp18; + someStruct->x_position = sp20; + someStruct->y_position = sp1C; + someStruct->z_position = sp18; } f32 func_80066348(f32 arg0, f32 arg1, f32 arg2) { @@ -280,17 +280,17 @@ f32 func_80066348(f32 arg0, f32 arg1, f32 arg2) { phi_v1 += 4; } - temp_f0 = arg2 - D_80120AC0[phi_v1].unk14; - temp_f2 = arg0 - D_80120AC0[phi_v1].unkC; - temp_f14 = arg1 - D_80120AC0[phi_v1].unk10; + temp_f0 = arg2 - D_80120AC0[phi_v1].z_position; + temp_f2 = arg0 - D_80120AC0[phi_v1].x_position; + temp_f14 = arg1 - D_80120AC0[phi_v1].y_position; return sqrtf((temp_f0 * temp_f0) + ((temp_f2 * temp_f2) + (temp_f14 * temp_f14))); } -void func_800663DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { +void func_800663DC(s32 x_pos, s32 y_pos, s32 z_pos, s32 arg3, s32 arg4, s32 arg5) { D_80120AC0[D_80120CE4].unk4 = (s16) (arg3 * 0xB6); - D_80120AC0[D_80120CE4].unkC = (f32) arg0; - D_80120AC0[D_80120CE4].unk10 = (f32) arg1; - D_80120AC0[D_80120CE4].unk14 = (f32) arg2; + D_80120AC0[D_80120CE4].x_position = (f32) x_pos; + D_80120AC0[D_80120CE4].y_position = (f32) y_pos; + D_80120AC0[D_80120CE4].z_position = (f32) z_pos; D_80120AC0[D_80120CE4].unk2 = (s16) (arg4 * 0xB6); D_80120AC0[D_80120CE4].unk38 = (u16)0; D_80120AC0[D_80120CE4].unk24 = 0.0f; @@ -305,9 +305,9 @@ void func_800663DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { void func_80066488(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) { arg0 += 4; D_80120AC0[arg0].unk38 = 0; - D_80120AC0[arg0].unkC = arg1; - D_80120AC0[arg0].unk10 = arg2; - D_80120AC0[arg0].unk14 = arg3; + D_80120AC0[arg0].x_position = arg1; + D_80120AC0[arg0].y_position = arg2; + D_80120AC0[arg0].z_position = arg3; D_80120AC0[arg0].unk0 = arg4; D_80120AC0[arg0].unk2 = arg5; D_80120AC0[arg0].unk4 = arg6; @@ -793,9 +793,9 @@ void func_80069E14(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { s32 i; for (i = 0; i <= D_80120CE0; i++) { - temp_f0 = arg0 - D_80120AC0[i].unkC; - temp_f2 = arg1 - D_80120AC0[i].unk10; - temp_f14 = arg2 - D_80120AC0[i].unk14; + temp_f0 = arg0 - D_80120AC0[i].x_position; + temp_f2 = arg1 - D_80120AC0[i].y_position; + temp_f14 = arg2 - D_80120AC0[i].z_position; temp_f0_2 = sqrtf(((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) + (temp_f14 * temp_f14)); if (temp_f0_2 < arg3) { D_80120AC0[i].unk30 = ((arg3 - temp_f0_2) * arg4) / arg3; @@ -1549,7 +1549,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006CCF0.s") void func_8006D8A4(void) { D_800DD390 = 0x2C; - D_80123515 = 0; + gIsPaused = 0; func_800945E4(); func_800C01D8(&D_800DD408); } @@ -1679,7 +1679,7 @@ void func_8006DBE4(void) { void func_8006DC58(s32 arg0) { if (func_800C73E0() == 0) { func_80010994(arg0); - func_8001004C(); + particlePtrList_flush(); func_8001BF20(); D_80024D54(&D_801211F8, &D_80121208, &D_80121218, &D_80121228, arg0); func_800C3440(arg0); @@ -1779,7 +1779,7 @@ Settings* get_settings(void) { } s8 func_8006EAA0(void) { - return D_80123515; + return gIsPaused; } s8 func_8006EAB0(void) { diff --git a/src/unknown_080500.c b/src/unknown_080500.c index e8056068..dfd6eeb6 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -237,7 +237,7 @@ extern s8 D_801263D4[4]; // Array of bools extern s8 D_801263DC[4]; extern s32 D_801263D8; extern s32 D_801263E0; -extern s8 D_801263E8[8]; +extern s8 players_character_array[8]; extern s8 D_801263F0[8]; extern u8 D_80126418[8]; extern u8 D_80126420[8]; @@ -273,7 +273,7 @@ extern s32 D_80126854; extern s32 D_80126858; extern s32 D_8012685C; extern s32 D_80126860; -extern s8 D_801269C0[4]; // Unknown number of entries. +extern s8 p1_vehicle[4]; // Unknown number of entries. extern s32 D_801269C8; extern s32 D_801269CC; extern u32* D_801269E0; @@ -1440,7 +1440,7 @@ void func_8008AF00(s32 arg0) { D_800DF4BC = 1; for (i = 0; i < 8; i++) { - D_801263E8[i] = (i == arg0) ? 1 : -1; + players_character_array[i] = (i == arg0) ? 1 : -1; } for(i = 0; i < 4; i++) { @@ -1534,7 +1534,7 @@ s32 MenuCharacterSelectLoop(s32 arg0) { phi_a0 = 0; for(i = 0; i < 4; i++) { if (D_801263D4[i]) { - D_801263F0[phi_a0] = (*D_801263CC)[D_801263E8[i]].unkC; + D_801263F0[phi_a0] = (*D_801263CC)[players_character_array[i]].unkC; phi_a0++; } } @@ -1583,7 +1583,7 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { if ((func_8009C30C() & 0x400000) == 0) { i = 0; while(i < 4 && !someBool){ - if (i != arg0 && D_801263E8[i] == arg1[j]) { + if (i != arg0 && players_character_array[i] == arg1[j]) { someBool = 1; } i++; @@ -1594,7 +1594,7 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { } } if (!someBool) { - D_801263E8[arg0] = arg1[j]; + players_character_array[arg0] = arg1[j]; func_80001D04(arg3, NULL); return; } @@ -2123,7 +2123,7 @@ void MenuLoadNewAreaInit(void) { D_801263BC = 0; D_800DF47C = 0; temp_s0 = settings->unk4C->unk2; - D_801269C0 = func_8006B0AC(temp_s0); + p1_vehicle = func_8006B0AC(temp_s0); temp_v0_2 = func_8006B14C(temp_s0); if (temp_v0_2 != 5) { if (temp_v0_2 != 8) { @@ -2460,7 +2460,7 @@ void MenuTrophyRaceRoundInit(void) { } for(i = 0; i < D_800DF4BC; i++){ - D_801269C0[i] = func_8006B0AC(temp); + p1_vehicle[i] = func_8006B0AC(temp); } func_8006DB14(func_8006B0AC(temp)); @@ -2792,11 +2792,11 @@ s8 func_8009C23C(s32 arg0) { } s8 func_8009C250(s32 arg0) { - return D_801269C0[arg0]; + return p1_vehicle[arg0]; } void func_8009C264(s32 arg0, s32 arg1) { - D_801269C0[arg0] = arg1; + p1_vehicle[arg0] = arg1; } s8* func_8009C274(void) { @@ -2810,7 +2810,7 @@ s8 func_8009C280(s32 arg0) { if (D_801263D4[arg0] == 0) { return -1; } - return D_801263E8[arg0]; + return players_character_array[arg0]; } void func_8009C2C4(s32 arg0) { @@ -2890,7 +2890,7 @@ void func_8009C4A8(s16 *arg0) { void func_8007B2BC(u32 arg0); void func_8007CCB0(u32 arg0); -void func_8000FFB8(u32 arg0); +void particlePtrList_addObject(u32 arg0); void func_8005FF40(u32 arg0); void func_8009C508(s32 arg0) { @@ -2905,7 +2905,7 @@ void func_8009C508(s32 arg0) { func_8007CCB0((u32)D_80126550[arg0]); } else { if ((*D_800DF750)[arg0] & 0x4000) { - func_8000FFB8((u32)D_80126550[arg0]); + particlePtrList_addObject((u32)D_80126550[arg0]); } else { func_8005FF40((u32)D_80126550[arg0]); } @@ -2915,7 +2915,7 @@ void func_8009C508(s32 arg0) { D_80126550[arg0] = 0; D_80126750[arg0] = 0; D_800DF758--; - func_8001004C(); + particlePtrList_flush(); } if (D_800DF758 == 0) { if (D_800DF75C != NULL) { diff --git a/src/unknown_0B8920.c b/src/unknown_0B8920.c index eb6c5439..f5bc82e7 100644 --- a/src/unknown_0B8920.c +++ b/src/unknown_0B8920.c @@ -24,7 +24,35 @@ extern s32* D_800E3070; extern s32* D_800E3080; extern s32* D_800E30D0; extern s32* D_800E30D4; -extern s32* D_800E30D8; + +typedef struct{ + u8 unk00; + u8 pad01[0x05]; + u8 unk06; + u8 unk07; + u32 unk08; +} unk800DC918_04_0C; //copied from unknown_0255E0.c + +typedef struct{ + u8 pad00[0x0C]; + unk800DC918_04_0C* unk0C; + u8 pad0C[0x10]; + s16 unk20; + u8 pad22[0x09]; + s8 unk2B; + u8 pad2C[0x14]; + u8 unk40; + u8 pad41[0x3]; +} unk800DC918_04; //copied from unknown_0255E0.c + +typedef struct{ + unk800DC918_04 * unk00; + u8 pad04[0x8]; + u32 unk0C; + u8 pad10[0xC]; +}unk800E30D8; + +extern unk800E30D8 *D_800E30D8; extern s32 D_800E30DC; extern s32* D_800E3178; extern s32* D_800E3184; @@ -49,6 +77,14 @@ extern u16 D_8012A7B6; extern s32* D_8012A7C8; extern s32 D_8012A7E0; +/* Size: 0x28 bytes */ +typedef struct unk8012A7E8_24 { + u8 unk00; + u8 unk01; + u8 pad02[0x1A]; + struct unk8012A7E8_24* unk1C; +} unk8012A7E8_24; + /* Size: 0x28 bytes */ typedef struct unk8012A7E8 { s16 unk0; @@ -76,9 +112,12 @@ typedef struct unk8012A7E8 { u16 unk1E; s16 unk20; s16 unk22; - u8 pad24[0x4]; + unk8012A7E8_24 *unk24; } unk8012A7E8; + + + extern unk8012A7E8 (*D_8012A7E8)[1]; extern s32 D_8012A7F0; extern s8 D_8012A7F4; @@ -159,7 +198,32 @@ void func_800B8B8C(void) { } GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B8C04.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B9228.s") +#else + +extern s32 D_800E30DC; +extern s32 D_8012A0E0; +extern s16* D_8012A1E8; + +s32 func_800B9228(unk800DC918_04 * arg0){ + s32 v0 = 0; + s32 retval = 0; + s32 tmp; + while(v0 < D_8012A0E0 && arg0 != D_800E30D8[v0].unk00){ + v0++; + }; + if(D_800E30D4[D_800E30D8[v0].unk0C]){ + //load array address differently; + retval = 1; + *(D_8012A1E8 + (tmp = D_800E30DC)) = v0; + D_800E30DC = tmp + 1; + } + return retval; +} +#endif + GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B92F4.s") GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B97A8.s") GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800B9C18.s") @@ -266,7 +330,22 @@ s32 func_800C3400(void) { GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C3440.s") GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C3564.s") GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C38B4.s") + +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C3C00.s") +#else + +extern u32* D_8012A7E4; +void func_800C3C00(void){ + s32 i; + D_8012A7E4 = func_80076C58(44); + D_8012A7E0 = *(D_8012A7E4++); + for(i = 0; i< D_8012A7E0; i++){ + D_8012A7E0[] + } +} +#endif + void func_800C4164(s32 arg0) { D_8012A7F0 = arg0; @@ -429,7 +508,46 @@ void func_800C510C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C5168.s") +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C5494.s") +#else +void func_800C5494(s32 arg0){ + unk8012A7E8 *tmp2 = &(*D_8012A7E8)[arg0]; + unk8012A7E8_24 *tmp = tmp2->unk24; + if(tmp == NULL) + return; + + while(tmp){ + tmp->unk01 = 255; + tmp = tmp->unk1C; + } + tmp2->unk24 = NULL; +} + +void func_800C54E8(s32 arg0, s16* arg1, u16 arg2, u16 arg3){ + s16 t4; + s16 a3 = arg3; + if(arg1 == 0 || (*D_8012A7E8)[arg0].unk19 == 255) + return; + t4 = arg1[6]; + switch(arg3){ + case 4: //L800C55E4; + arg1[6] = 0; + arg1[7] = 0; + return; + case 1: //L800C554C; + a3 = arg3*1; + break; + case 2: //L800C5564; + default: //L800C5564; + break; + + } + arg1[6] += arg2; + arg1[7] += a3; +} +#endif + void func_800C55F4(s32 arg0) { (*D_8012A7E8)[arg0].unk1E |= 0x8000; diff --git a/undefined_syms.txt b/undefined_syms.txt index 05052cca..fc8c3371 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -131,6 +131,7 @@ D_800DC768 = 0x800DC768; D_800DC848 = 0x800DC848; D_800DC858 = 0x800DC858; D_800DC860 = 0x800DC860; +D_800DC874 = 0x800DC874; D_800DC87C = 0x800DC87C; D_800DC884 = 0x800DC884; D_800DC8AC = 0x800DC8AC; @@ -1848,8 +1849,8 @@ D_8011AE48 = 0x8011AE48; D_8011AE4C = 0x8011AE4C; D_8011AE50 = 0x8011AE50; D_8011AE54 = 0x8011AE54; -D_8011AE58 = 0x8011AE58; -D_8011AE5C = 0x8011AE5C; +objPtrList = 0x8011AE58; +objCount = 0x8011AE5C; D_8011AE60 = 0x8011AE60; D_8011AE64 = 0x8011AE64; D_8011AE68 = 0x8011AE68; @@ -1874,18 +1875,18 @@ D_8011AEB0 = 0x8011AEB0; D_8011AEB8 = 0x8011AEB8; D_8011AEBC = 0x8011AEBC; D_8011AEC0 = 0x8011AEC0; -D_8011AEC4 = 0x8011AEC4; -D_8011AEC8 = 0x8011AEC8; +particlePtrList = 0x8011AEC4; +particleCount = 0x8011AEC8; D_8011AECC = 0x8011AECC; D_8011AED0 = 0x8011AED0; D_8011AED4 = 0x8011AED4; D_8011AED8 = 0x8011AED8; D_8011AEDC = 0x8011AEDC; D_8011AEE0 = 0x8011AEE0; -D_8011AEE4 = 0x8011AEE4; +playerStructArray_Ptr = 0x8011AEE4; D_8011AEE8 = 0x8011AEE8; D_8011AEEC = 0x8011AEEC; -D_8011AEF0 = 0x8011AEF0; +playerCount = 0x8011AEF0; D_8011AEF4 = 0x8011AEF4; D_8011AEF5 = 0x8011AEF5; D_8011AEF6 = 0x8011AEF6; @@ -2197,7 +2198,7 @@ D_80123508 = 0x80123508; D_8012350C = 0x8012350C; gSettingsPtr = 0x80123510; D_80123514 = 0x80123514; -D_80123515 = 0x80123515; +gIsPaused = 0x80123515; D_80123516 = 0x80123516; D_80123518 = 0x80123518; D_8012351C = 0x8012351C; @@ -2336,7 +2337,7 @@ D_801263D7 = 0x801263D7; D_801263D8 = 0x801263D8; D_801263DC = 0x801263DC; D_801263E0 = 0x801263E0; -D_801263E8 = 0x801263E8; +players_character_array = 0x801263E8; D_801263F0 = 0x801263F0; D_801263F8 = 0x801263F8; D_80126418 = 0x80126418; @@ -2455,8 +2456,8 @@ D_80126924 = 0x80126924; D_80126928 = 0x80126928; D_8012692C = 0x8012692C; D_80126930 = 0x80126930; -D_801269C0 = 0x801269C0; -D_801269C1 = 0x801269C1; +p1_vehicle = 0x801269C0; +p2_vehicle = 0x801269C1; D_801269C4 = 0x801269C4; D_801269C8 = 0x801269C8; D_801269CC = 0x801269CC;