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_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_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 1760289c..7acac1f5 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) @@ -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 @@ -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_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index dfe17c28..53db00f0 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 @@ -237,8 +237,8 @@ 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) +/* 011900 80010D00 3C0C8012 */ lui $t4, %hi(playerCount) # $t4, 0x8012 +/* 011904 80010D04 8D8CAEF0 */ lw $t4, %lo(playerCount)($t4) /* 011908 80010D08 3C168012 */ lui $s6, %hi(D_8011AE58) # $s6, 0x8012 /* 01190C 80010D0C 26D6AE58 */ addiu $s6, %lo(D_8011AE58) # addiu $s6, $s6, -0x51a8 /* 011910 80010D10 1980000E */ blez $t4, .L80010D4C @@ -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 @@ -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_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_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_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index dd5b1ec3..0457a9e6 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,8 +219,8 @@ 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) @@ -229,8 +229,8 @@ glabel func_8001A8F4 /* 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_8001BB18.s b/asm/non_matchings/unknown_00BC20/func_8001BB18.s index 51f0a428..51f11c42 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 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..9f0e01cb 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) diff --git a/asm/non_matchings/unknown_00BC20/func_80022E18.s b/asm/non_matchings/unknown_00BC20/func_80022E18.s index dbdc6ae5..cfc43592 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) @@ -41,14 +41,14 @@ glabel func_80022E18 /* 023AB0 80022EB0 8D640004 */ lw $a0, 4($t3) /* 023AB4 80022EB4 0C003FEE */ jal func_8000FFB8 /* 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) 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_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_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_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..ea99ee45 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -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_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_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_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_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_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_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_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_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..37fdb53b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -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_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/include/structs.h b/include/structs.h index 91c36900..9a9dbeba 100644 --- a/include/structs.h +++ b/include/structs.h @@ -205,6 +205,8 @@ typedef struct { typedef struct Player_3C { u8 pad0[0x8]; s8 unk8; + u8 pad9[0x4]; + u8 unkD; } Player_3C; typedef struct Player_40 { @@ -214,6 +216,10 @@ typedef struct Player_40 { s8 unk53; s8 unk54; s8 unk55; + u8 pad56[0x02]; + u8 pad58[0x18]; + u8 unk70; + u8 unk71; } Player_40; typedef struct Player_4C { @@ -240,27 +246,40 @@ 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; /* Size: 0x0630 bytes */ @@ -295,7 +314,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 diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 65719c89..7f5d32c5 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -119,10 +119,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; @@ -190,7 +190,7 @@ void func_8000BF8C(void) { 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); @@ -267,7 +267,7 @@ void func_8000C460(void) { D_8011AE70 = 0; D_8011AED0 = 0; D_8011AED4 = 0; - D_8011AEF0 = 0; + playerCount = 0; D_8011AE78 = 0; D_8011AD21 = 0; D_8011AD22[0] = 0; @@ -448,7 +448,7 @@ void func_8000E1EC(unk8011AD40 *arg0, s32 arg1) { D_8011AD4A = arg0->unk14; D_8011AD4C = arg0->unk0; func_8000FFB8(); - D_8011AEF0 = 0; + playerCount = 0; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E2B4.s") @@ -558,10 +558,171 @@ 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; @@ -584,8 +745,68 @@ void func_80012CE8(Gfx **dlist) { } } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012D5C.s") +void func_8001348C(Player *); + +func_80012D5C(u32 *arg0, u32 *arg1, u32 *arg2, Player * arg3){ + f32 scale; + u32 tmp2; + u32 tmp3; + if(arg3->unk6 & 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) { @@ -768,29 +989,29 @@ 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") @@ -978,7 +1199,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; @@ -998,8 +1219,6 @@ s8 func_8002341C(void) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8002342C.s") -//GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80023568.s") - s32 func_80023568(void) { if (D_8011AD3C != 0) { return D_8011AD25 + 1; diff --git a/undefined_syms.txt b/undefined_syms.txt index 05052cca..11484ef8 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1882,10 +1882,10 @@ 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;