diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 7acac1f5..3198ff92 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -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 @@ -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 @@ -977,8 +977,8 @@ glabel func_8000CC7C /* 00E63C 8000DA3C 00000000 */ nop /* 00E640 8000DA40 0C003FEE */ jal func_8000FFB8 /* 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: @@ -991,8 +991,8 @@ glabel func_8000CC7C /* 00E670 8000DA70 00000000 */ nop /* 00E674 8000DA74 0C003FEE */ jal func_8000FFB8 /* 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 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E4D8.s b/asm/non_matchings/unknown_00BC20/func_8000E4D8.s index 3799afb2..b16f7215 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E4D8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E4D8.s @@ -153,15 +153,15 @@ glabel func_8000E4D8 .L8000E6F0: /* 00F2F0 8000E6F0 01681821 */ addu $v1, $t3, $t0 /* 00F2F4 8000E6F4 8C790000 */ lw $t9, ($v1) -/* 00F2F8 8000E6F8 3C068012 */ lui $a2, %hi(D_8011AE5C) # $a2, 0x8012 +/* 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(D_8011AE5C)($a2) +/* 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(D_8011AE58) # $t3, 0x8012 -/* 00F318 8000E718 256BAE58 */ addiu $t3, %lo(D_8011AE58) # addiu $t3, $t3, -0x51a8 +/* 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 @@ -180,16 +180,16 @@ glabel func_8000E4D8 /* 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) +/* 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(D_8011AE5C) # $a2, 0x8012 -/* 00F380 8000E780 8CC6AE5C */ lw $a2, %lo(D_8011AE5C)($a2) +/* 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 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E9D0.s b/asm/non_matchings/unknown_00BC20/func_8000E9D0.s index 43a02324..e00084a5 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E9D0.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E9D0.s @@ -11,11 +11,11 @@ glabel func_8000E9D0 /* 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 +/* 00F600 8000EA00 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 +/* 00F604 8000EA04 2442AE5C */ addiu $v0, %lo(objCount) # 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) +/* 00F60C 8000EA0C 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 00F610 8000EA10 8D29AE58 */ lw $t1, %lo(objPtrList)($t1) /* 00F614 8000EA14 8FA50018 */ lw $a1, 0x18($sp) /* 00F618 8000EA18 000A5880 */ sll $t3, $t2, 2 /* 00F61C 8000EA1C 012B6021 */ addu $t4, $t1, $t3 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_8001004C.s b/asm/non_matchings/unknown_00BC20/func_8001004C.s index 81aef223..f3806657 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001004C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001004C.s @@ -18,10 +18,10 @@ glabel func_8001004C /* 010C8C 8001008C 00009825 */ move $s3, $zero /* 010C90 80010090 3C158012 */ lui $s5, %hi(D_8011AEC4) # $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 /* 010CB0 800100B0 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 601173ae..38c36e7d 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: @@ -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) diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index 53db00f0..6363aa5a 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -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: @@ -239,8 +239,8 @@ glabel func_80010994 .L80010D00: /* 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 +/* 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 @@ -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 diff --git a/asm/non_matchings/unknown_00BC20/func_800142B8.s b/asm/non_matchings/unknown_00BC20/func_800142B8.s index ed5f6a5a..17463a95 100644 --- a/asm/non_matchings/unknown_00BC20/func_800142B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800142B8.s @@ -1,13 +1,13 @@ glabel func_800142B8 /* 014EB8 800142B8 3C028012 */ lui $v0, %hi(D_8011AE60) # $v0, 0x8012 -/* 014EBC 800142BC 3C038012 */ lui $v1, %hi(D_8011AE5C) # $v1, 0x8012 +/* 014EBC 800142BC 3C038012 */ lui $v1, %hi(objCount) # $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 +/* 014EC4 800142C4 8C63AE5C */ lw $v1, %lo(objCount)($v1) +/* 014EC8 800142C8 3C0A8012 */ lui $t2, %hi(objPtrList) # $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 +/* 014ED8 800142D8 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 .L800142DC: /* 014EDC 800142DC 8D4E0000 */ lw $t6, ($t2) /* 014EE0 800142E0 24420001 */ addiu $v0, $v0, 1 @@ -55,8 +55,8 @@ glabel func_800142B8 .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) +/* 014F88 80014388 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 014F8C 8001438C 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 014F90 80014390 00000000 */ nop .L80014394: /* 014F94 80014394 0043082A */ slt $at, $v0, $v1 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_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_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 index d4b90b0d..39b26b04 100644 --- a/asm/non_matchings/unknown_00BC20/func_80018C6C.s +++ b/asm/non_matchings/unknown_00BC20/func_80018C6C.s @@ -1,13 +1,13 @@ 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) +/* 019870 80018C70 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 +/* 019874 80018C74 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 019878 80018C78 8C42AE60 */ lw $v0, %lo(D_8011AE60)($v0) -/* 01987C 80018C7C 3C0E8012 */ lui $t6, %hi(D_8011AE58) # $t6, 0x8012 +/* 01987C 80018C7C 3C0E8012 */ lui $t6, %hi(objPtrList) # $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) +/* 01988C 80018C8C 8DCEAE58 */ lw $t6, %lo(objPtrList)($t6) /* 019890 80018C90 2406003E */ li $a2, 62 /* 019894 80018C94 01CF2821 */ addu $a1, $t6, $t7 .L80018C98: 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_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_8001DD54.s b/asm/non_matchings/unknown_00BC20/func_8001DD54.s index e1afa9e9..4ecf0030 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001DD54.s +++ b/asm/non_matchings/unknown_00BC20/func_8001DD54.s @@ -269,8 +269,8 @@ glabel func_8001DD54 /* 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 +/* 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 @@ -281,11 +281,11 @@ glabel func_8001DD54 /* 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 +/* 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(D_8011AE58) # addiu $t4, $t4, -0x51a8 +/* 01ED80 8001E180 258CAE58 */ addiu $t4, %lo(objPtrList) # addiu $t4, $t4, -0x51a8 /* 01ED84 8001E184 240D0001 */ li $t5, 1 .L8001E188: /* 01ED88 8001E188 8D8F0000 */ lw $t7, ($t4) diff --git a/asm/non_matchings/unknown_00BC20/func_8001E36C.s b/asm/non_matchings/unknown_00BC20/func_8001E36C.s index d3697070..da306276 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E36C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E36C.s @@ -5,14 +5,14 @@ glabel func_8001E36C /* 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 +/* 01EF84 8001E384 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 /* 01EF88 8001E388 E4E00000 */ swc1 $f0, ($a3) -/* 01EF8C 8001E38C 8C63AE5C */ lw $v1, %lo(D_8011AE5C)($v1) +/* 01EF8C 8001E38C 8C63AE5C */ lw $v1, %lo(objCount)($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 +/* 01EF9C 8001E39C 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 01EFA0 8001E3A0 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 /* 01EFA4 8001E3A4 00004025 */ move $t0, $zero /* 01EFA8 8001E3A8 240A0027 */ li $t2, 39 .L8001E3AC: @@ -37,7 +37,7 @@ glabel func_8001E36C /* 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 +/* 01F000 8001E400 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 /* 01F004 8001E404 E4A40000 */ swc1 $f4, ($a1) /* 01F008 8001E408 C4860010 */ lwc1 $f6, 0x10($a0) /* 01F00C 8001E40C 00000000 */ nop @@ -45,7 +45,7 @@ glabel func_8001E36C /* 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) +/* 01F020 8001E420 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 01F024 8001E424 00000000 */ nop /* 01F028 8001E428 0043082A */ slt $at, $v0, $v1 .L8001E42C: 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..67b18e51 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E93C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E93C.s @@ -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_80022948.s b/asm/non_matchings/unknown_00BC20/func_80022948.s index 9f0e01cb..e4154525 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022948.s +++ b/asm/non_matchings/unknown_00BC20/func_80022948.s @@ -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 cfc43592..1cb34708 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022E18.s +++ b/asm/non_matchings/unknown_00BC20/func_80022E18.s @@ -53,14 +53,14 @@ glabel func_80022E18 /* 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 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_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_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..bef0a557 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,7 +118,7 @@ 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 /* 06DAB4 8006CEB4 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_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 67564cba..989b2d8d 100644 --- a/include/structs.h +++ b/include/structs.h @@ -394,7 +394,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 7f5d32c5..c948fce2 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -83,8 +83,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; @@ -222,7 +222,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; @@ -285,7 +285,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; @@ -316,12 +316,12 @@ void func_8000C604(void) { func_8006F398(); } func_8001004C(); - len = D_8011AE5C; + 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; + objCount = 0; D_8011AE60 = 0; func_8000C460(); func_80071140(D_8011AEB0[0]); @@ -463,22 +463,22 @@ u8 func_8000E4C8() { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E4D8.s") -u32 func_8000E948(s32 arg0) { - if (arg0 < 0 || arg0 >= D_8011AE5C) { +Player *getObject(s32 indx) { + if (indx < 0 || indx >= objCount) { return 0; } - return (*D_8011AE58)[arg0]; + return objPtrList[indx]; } -u32 *func_8000E988(s32 *arg0, s32 *arg1) { +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? @@ -896,7 +896,20 @@ s16 func_80017E88(void) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017E98.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800185E4.s") +#if 0 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80018C6C.s") +#else +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; +} +#endif 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") diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index 4ed2f929..d6d50b56 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -79,7 +79,9 @@ typedef struct{ s16 unk20; u8 pad22[0x09]; s8 unk2B; - u8 pad2C[0x18]; + u8 pad2C[0x14]; + u8 unk40; + u8 pad41[0x3]; } unk800DC918_04; typedef struct{ @@ -318,7 +320,59 @@ void func_80028FA0(s32 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") @@ -426,7 +480,34 @@ unk800DC918* func_8002C7C4(void) { 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") diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 94049a73..33cf5a96 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -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; @@ -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); } @@ -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..57f7d488 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) { 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 02c3a2f0..1a76599e 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1849,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; @@ -2198,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; @@ -2337,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; @@ -2456,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;