mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-03 01:43:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Found the variable that tracks the CC type selected. (#57)

Browse Source 
Added some comments for the possible values of Mode and CC
selection

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2021-11-16 14:37:58 -05:00
committed by GitHub
parent 62aa193922
commit f6a11c734a
42 changed files with 164 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/code_80005FD0/func_80007D04.s
+2 -2
View File
@@ -59,8 +59,8 @@ glabel func_80007D04
/* 0089E4 80007DE4 1000006B */ b .L80007F94
/* 0089E8 80007DE8 A42534C0 */ sh $a1, %lo(D_801634C0)($at) # 0x34c0($at)
.L80007DEC:
/* 0089EC 80007DEC 3C03800E */ lui $v1, %hi(D_800DC548)
/* 0089F0 80007DF0 8C63C548 */ lw $v1, %lo(D_800DC548)($v1)
/* 0089EC 80007DEC 3C03800E */ lui $v1, %hi(gCCSelection)
/* 0089F0 80007DF0 8C63C548 */ lw $v1, %lo(gCCSelection)($v1)
/* 0089F4 80007DF4 24050003 */ li $a1, 3
/* 0089F8 80007DF8 24010001 */ li $at, 1
/* 0089FC 80007DFC 1060000A */ beqz $v1, .L80007E28
asm/non_matchings/code_80005FD0/func_80008424.s
+2 -2
View File
@@ -65,8 +65,8 @@ glabel func_80008424
/* 00911C 8000851C 100000EA */ b .L800088C8
/* 009120 80008520 E4E0003C */ swc1 $f0, 0x3c($a3)
.L80008524:
/* 009124 80008524 3C02800E */ lui $v0, %hi(D_800DC548)
/* 009128 80008528 8C42C548 */ lw $v0, %lo(D_800DC548)($v0)
/* 009124 80008524 3C02800E */ lui $v0, %hi(gCCSelection)
/* 009128 80008528 8C42C548 */ lw $v0, %lo(gCCSelection)($v0)
/* 00912C 8000852C 3C01800F */ lui $at, %hi(D_800ECF9C) # $at, 0x800f
/* 009130 80008530 C420CF9C */ lwc1 $f0, %lo(D_800ECF9C)($at)
/* 009134 80008534 10400009 */ beqz $v0, .L8000855C
asm/non_matchings/code_80005FD0/func_800088D8.s
+2 -2
View File
@@ -168,7 +168,7 @@ glabel func_800088D8
/* 009748 80008B48 00052823 */ negu $a1, $a1
.L80008B4C:
/* 00974C 80008B4C 10200015 */ beqz $at, .L80008BA4
/* 009750 80008B50 3C0F800E */ lui $t7, %hi(D_800DC548)
/* 009750 80008B50 3C0F800E */ lui $t7, %hi(gCCSelection)
/* 009754 80008B54 84E20000 */ lh $v0, ($a3)
/* 009758 80008B58 3C018016 */ lui $at, %hi(D_801644A8)
/* 00975C 80008B5C 00280821 */ addu $at, $at, $t0
@@ -192,7 +192,7 @@ glabel func_800088D8
.L80008BA4:
/* 0097A4 80008BA4 84E40000 */ lh $a0, ($a3)
.L80008BA8:
/* 0097A8 80008BA8 8DEFC548 */ lw $t7, %lo(D_800DC548)($t7)
/* 0097A8 80008BA8 8DEFC548 */ lw $t7, %lo(gCCSelection)($t7)
/* 0097AC 80008BAC 25F80001 */ addiu $t8, $t7, 1
/* 0097B0 80008BB0 03040019 */ multu $t8, $a0
/* 0097B4 80008BB4 00002012 */ mflo $a0
asm/non_matchings/code_80005FD0/func_80009B60.s
+14 -14
View File
@@ -462,8 +462,8 @@ glabel func_80009B60
/* 00AE0C 8000A20C 1538001C */ bne $t1, $t8, .L8000A280
/* 00AE10 8000A210 3C0A800E */ lui $t2, %hi(gCurrentCourseId)
/* 00AE14 8000A214 854AC5A0 */ lh $t2, %lo(gCurrentCourseId)($t2)
/* 00AE18 8000A218 3C19800E */ lui $t9, %hi(D_800DC548)
/* 00AE1C 8000A21C 8F39C548 */ lw $t9, %lo(D_800DC548)($t9)
/* 00AE18 8000A218 3C19800E */ lui $t9, %hi(gCCSelection)
/* 00AE1C 8000A21C 8F39C548 */ lw $t9, %lo(gCCSelection)($t9)
/* 00AE20 8000A220 8FAC00D0 */ lw $t4, 0xd0($sp)
/* 00AE24 8000A224 000A6900 */ sll $t5, $t2, 4
/* 00AE28 8000A228 3C0A8016 */ lui $t2, %hi(D_801634F8) # $t2, 0x8016
@@ -498,8 +498,8 @@ glabel func_80009B60
/* 00AE98 8000A298 85980000 */ lh $t8, ($t4)
/* 00AE9C 8000A29C 1B000012 */ blez $t8, .L8000A2E8
/* 00AEA0 8000A2A0 3C0A800E */ lui $t2, %hi(gCurrentCourseId)
/* 00AEA4 8000A2A4 3C0D800E */ lui $t5, %hi(D_800DC548)
/* 00AEA8 8000A2A8 8DADC548 */ lw $t5, %lo(D_800DC548)($t5)
/* 00AEA4 8000A2A4 3C0D800E */ lui $t5, %hi(gCCSelection)
/* 00AEA8 8000A2A8 8DADC548 */ lw $t5, %lo(gCCSelection)($t5)
/* 00AEAC 8000A2AC 854AC5A0 */ lh $t2, %lo(gCurrentCourseId)($t2)
/* 00AEB0 8000A2B0 3C0E0D01 */ lui $t6, %hi(D_0D009418) # $t6, 0xd01
/* 00AEB4 8000A2B4 000D7880 */ sll $t7, $t5, 2
@@ -517,8 +517,8 @@ glabel func_80009B60
/* 00AEE4 8000A2E4 E5120000 */ swc1 $f18, ($t0)
.L8000A2E8:
/* 00AEE8 8000A2E8 3C0A800E */ lui $t2, %hi(gCurrentCourseId)
/* 00AEEC 8000A2EC 3C19800E */ lui $t9, %hi(D_800DC548)
/* 00AEF0 8000A2F0 8F39C548 */ lw $t9, %lo(D_800DC548)($t9)
/* 00AEEC 8000A2EC 3C19800E */ lui $t9, %hi(gCCSelection)
/* 00AEF0 8000A2F0 8F39C548 */ lw $t9, %lo(gCCSelection)($t9)
/* 00AEF4 8000A2F4 854AC5A0 */ lh $t2, %lo(gCurrentCourseId)($t2)
/* 00AEF8 8000A2F8 3C0E0D01 */ lui $t6, %hi(D_0D009568) # $t6, 0xd01
/* 00AEFC 8000A2FC 00197880 */ sll $t7, $t9, 2
@@ -1378,8 +1378,8 @@ glabel func_80009B60
/* 00BB54 8000AF54 11A00014 */ beqz $t5, .L8000AFA8
.L8000AF58:
/* 00BB58 8000AF58 3C0F800E */ lui $t7, %hi(gCurrentCourseId)
/* 00BB5C 8000AF5C 3C0C800E */ lui $t4, %hi(D_800DC548)
/* 00BB60 8000AF60 8D8CC548 */ lw $t4, %lo(D_800DC548)($t4)
/* 00BB5C 8000AF5C 3C0C800E */ lui $t4, %hi(gCCSelection)
/* 00BB60 8000AF60 8D8CC548 */ lw $t4, %lo(gCCSelection)($t4)
/* 00BB64 8000AF64 85EFC5A0 */ lh $t7, %lo(gCurrentCourseId)($t7)
/* 00BB68 8000AF68 3C0E0D01 */ lui $t6, %hi(D_0D009418) # $t6, 0xd01
/* 00BB6C 8000AF6C 000CC080 */ sll $t8, $t4, 2
@@ -1399,8 +1399,8 @@ glabel func_80009B60
/* 00BBA4 8000AFA4 E4640000 */ swc1 $f4, ($v1)
.L8000AFA8:
/* 00BBA8 8000AFA8 3C0F800E */ lui $t7, %hi(gCurrentCourseId)
/* 00BBAC 8000AFAC 3C0B800E */ lui $t3, %hi(D_800DC548)
/* 00BBB0 8000AFB0 8D6BC548 */ lw $t3, %lo(D_800DC548)($t3)
/* 00BBAC 8000AFAC 3C0B800E */ lui $t3, %hi(gCCSelection)
/* 00BBB0 8000AFB0 8D6BC548 */ lw $t3, %lo(gCCSelection)($t3)
/* 00BBB4 8000AFB4 85EFC5A0 */ lh $t7, %lo(gCurrentCourseId)($t7)
/* 00BBB8 8000AFB8 3C0E0D01 */ lui $t6, %hi(D_0D009568) # $t6, 0xd01
/* 00BBBC 8000AFBC 000BC080 */ sll $t8, $t3, 2
@@ -1426,7 +1426,7 @@ glabel func_80009B60
/* 00BC08 8000B008 4600803C */ c.lt.s $f16, $f0
/* 00BC0C 8000B00C 25CE9808 */ addiu $t6, %lo(D_0D009808) # addiu $t6, $t6, -0x67f8
/* 00BC10 8000B010 3C0F800E */ lui $t7, %hi(gCurrentCourseId)
/* 00BC14 8000B014 3C0C800E */ lui $t4, %hi(D_800DC548)
/* 00BC14 8000B014 3C0C800E */ lui $t4, %hi(gCCSelection)
/* 00BC18 8000B018 45010006 */ bc1t .L8000B034
/* 00BC1C 8000B01C 00000000 */ nop
/* 00BC20 8000B020 C428CFC4 */ lwc1 $f8, %lo(D_800ECFC4)($at)
@@ -1436,7 +1436,7 @@ glabel func_80009B60
/* 00BC30 8000B030 00000000 */ nop
.L8000B034:
/* 00BC34 8000B034 85EFC5A0 */ lh $t7, %lo(gCurrentCourseId)($t7)
/* 00BC38 8000B038 8D8CC548 */ lw $t4, %lo(D_800DC548)($t4)
/* 00BC38 8000B038 8D8CC548 */ lw $t4, %lo(gCCSelection)($t4)
/* 00BC3C 8000B03C AFA30034 */ sw $v1, 0x34($sp)
/* 00BC40 8000B040 000F5900 */ sll $t3, $t7, 4
/* 00BC44 8000B044 000CC080 */ sll $t8, $t4, 2
@@ -1452,9 +1452,9 @@ glabel func_80009B60
/* 00BC68 8000B068 24010001 */ li $at, 1
/* 00BC6C 8000B06C 3C0D800E */ lui $t5, %hi(gCurrentCourseId)
/* 00BC70 8000B070 1541000E */ bne $t2, $at, .L8000B0AC
/* 00BC74 8000B074 3C0C800E */ lui $t4, %hi(D_800DC548)
/* 00BC74 8000B074 3C0C800E */ lui $t4, %hi(gCCSelection)
/* 00BC78 8000B078 85ADC5A0 */ lh $t5, %lo(gCurrentCourseId)($t5)
/* 00BC7C 8000B07C 8D8CC548 */ lw $t4, %lo(D_800DC548)($t4)
/* 00BC7C 8000B07C 8D8CC548 */ lw $t4, %lo(gCCSelection)($t4)
/* 00BC80 8000B080 3C190D01 */ lui $t9, %hi(D_0D0096B8) # $t9, 0xd01
/* 00BC84 8000B084 000D7900 */ sll $t7, $t5, 4
/* 00BC88 8000B088 000C5880 */ sll $t3, $t4, 2
asm/non_matchings/code_80005FD0/func_8000F628.s
+4 -4
View File
@@ -167,8 +167,8 @@ glabel func_8000F628
/* 0104B8 8000F8B8 8FAD00DC */ lw $t5, 0xdc($sp)
/* 0104BC 8000F8BC 8FBF00D8 */ lw $ra, 0xd8($sp)
.L8000F8C0:
/* 0104C0 8000F8C0 3C0F800E */ lui $t7, %hi(D_800DC548)
/* 0104C4 8000F8C4 8DEFC548 */ lw $t7, %lo(D_800DC548)($t7)
/* 0104C0 8000F8C0 3C0F800E */ lui $t7, %hi(gCCSelection)
/* 0104C4 8000F8C4 8DEFC548 */ lw $t7, %lo(gCCSelection)($t7)
/* 0104C8 8000F8C8 00027100 */ sll $t6, $v0, 4
/* 0104CC 8000F8CC AFBF00D8 */ sw $ra, 0xd8($sp)
/* 0104D0 8000F8D0 000FC080 */ sll $t8, $t7, 2
@@ -569,8 +569,8 @@ glabel func_8000F628
/* 010AD4 8000FED4 3C028016 */ lui $v0, %hi(D_8016347A) # $v0, 0x8016
/* 010AD8 8000FED8 2442347A */ addiu $v0, %lo(D_8016347A) # addiu $v0, $v0, 0x347a
/* 010ADC 8000FEDC A4400000 */ sh $zero, ($v0)
/* 010AE0 8000FEE0 3C0F800E */ lui $t7, %hi(D_800DC548)
/* 010AE4 8000FEE4 8DEFC548 */ lw $t7, %lo(D_800DC548)($t7)
/* 010AE0 8000FEE0 3C0F800E */ lui $t7, %hi(gCCSelection)
/* 010AE4 8000FEE4 8DEFC548 */ lw $t7, %lo(gCCSelection)($t7)
/* 010AE8 8000FEE8 24010003 */ li $at, 3
/* 010AEC 8000FEEC 3C038016 */ lui $v1, %hi(D_80162F10) # $v1, 0x8016
/* 010AF0 8000FEF0 15E10002 */ bne $t7, $at, .L8000FEFC
asm/non_matchings/code_80005FD0/func_800139E4.s
+2 -2
View File
@@ -102,7 +102,7 @@ glabel func_800139E4
/* 01475C 80013B5C A602002E */ sh $v0, 0x2e($s0)
/* 014760 80013B60 8602002E */ lh $v0, 0x2e($s0)
.L80013B64:
/* 014764 80013B64 3C19800E */ lui $t9, %hi(D_800DC548)
/* 014764 80013B64 3C19800E */ lui $t9, %hi(gCCSelection)
/* 014768 80013B68 24010002 */ li $at, 2
/* 01476C 80013B6C 2458FFFF */ addiu $t8, $v0, -1
/* 014770 80013B70 44982000 */ mtc1 $t8, $f4
@@ -115,7 +115,7 @@ glabel func_800139E4
/* 01478C 80013B8C 46364282 */ mul.d $f10, $f8, $f22
/* 014790 80013B90 46205420 */ cvt.s.d $f16, $f10
/* 014794 80013B94 E6100024 */ swc1 $f16, 0x24($s0)
/* 014798 80013B98 8F39C548 */ lw $t9, %lo(D_800DC548)($t9)
/* 014798 80013B98 8F39C548 */ lw $t9, %lo(gCCSelection)($t9)
/* 01479C 80013B9C 1F200004 */ bgtz $t9, .L80013BB0
/* 0147A0 80013BA0 00000000 */ nop
/* 0147A4 80013BA4 8EC80000 */ lw $t0, ($s6)
asm/non_matchings/code_80005FD0/func_800147E0.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_800147E0
/* 0153E0 800147E0 3C0E800E */ lui $t6, %hi(D_800DC548)
/* 0153E4 800147E4 8DCEC548 */ lw $t6, %lo(D_800DC548)($t6)
/* 0153E0 800147E0 3C0E800E */ lui $t6, %hi(gCCSelection)
/* 0153E4 800147E4 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6)
/* 0153E8 800147E8 3C01800F */ lui $at, %hi(D_800ED1B8)
/* 0153EC 800147EC D428D1B8 */ ldc1 $f8, %lo(D_800ED1B8)($at)
/* 0153F0 800147F0 448E2000 */ mtc1 $t6, $f4
asm/non_matchings/code_80005FD0/func_80014934.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_80014934
/* 015534 80014934 3C0E800E */ lui $t6, %hi(D_800DC548)
/* 015538 80014938 8DCEC548 */ lw $t6, %lo(D_800DC548)($t6)
/* 015534 80014934 3C0E800E */ lui $t6, %hi(gCCSelection)
/* 015538 80014938 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6)
/* 01553C 8001493C 3C01800F */ lui $at, %hi(D_800ED1D0)
/* 015540 80014940 D428D1D0 */ ldc1 $f8, %lo(D_800ED1D0)($at)
/* 015544 80014944 448E2000 */ mtc1 $t6, $f4
asm/non_matchings/code_80005FD0/func_80014A88.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_80014A88
/* 015688 80014A88 3C0E800E */ lui $t6, %hi(D_800DC548)
/* 01568C 80014A8C 8DCEC548 */ lw $t6, %lo(D_800DC548)($t6)
/* 015688 80014A88 3C0E800E */ lui $t6, %hi(gCCSelection)
/* 01568C 80014A8C 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6)
/* 015690 80014A90 3C01800F */ lui $at, %hi(D_800ED1E8)
/* 015694 80014A94 D428D1E8 */ ldc1 $f8, %lo(D_800ED1E8)($at)
/* 015698 80014A98 448E2000 */ mtc1 $t6, $f4
asm/non_matchings/code_80005FD0/func_80014BDC.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_80014BDC
/* 0157DC 80014BDC 3C0E800E */ lui $t6, %hi(D_800DC548)
/* 0157E0 80014BE0 8DCEC548 */ lw $t6, %lo(D_800DC548)($t6)
/* 0157DC 80014BDC 3C0E800E */ lui $t6, %hi(gCCSelection)
/* 0157E0 80014BE0 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6)
/* 0157E4 80014BE4 3C01800F */ lui $at, %hi(D_800ED200)
/* 0157E8 80014BE8 D428D200 */ ldc1 $f8, %lo(D_800ED200)($at)
/* 0157EC 80014BEC 448E2000 */ mtc1 $t6, $f4
asm/non_matchings/code_80027D00/func_80033AE0.s
+2 -2
View File
@@ -175,11 +175,11 @@ glabel func_80033AE0
/* 03495C 80033D5C 55E00025 */ bnel $t7, $zero, .L80033DF4
/* 034960 80033D60 920201EC */ lbu $v0, 0x1ec($s0)
/* 034964 80033D64 8E0300BC */ lw $v1, 0xbc($s0)
/* 034968 80033D68 3C0B800E */ lui $t3, %hi(D_800DC548) # $t3, 0x800e
/* 034968 80033D68 3C0B800E */ lui $t3, %hi(gCCSelection) # $t3, 0x800e
/* 03496C 80033D6C 306E0010 */ andi $t6, $v1, 0x10
/* 034970 80033D70 55C00020 */ bnel $t6, $zero, .L80033DF4
/* 034974 80033D74 920201EC */ lbu $v0, 0x1ec($s0)
/* 034978 80033D78 8D6BC548 */ lw $t3, %lo(D_800DC548)($t3)
/* 034978 80033D78 8D6BC548 */ lw $t3, %lo(gCCSelection)($t3)
/* 03497C 80033D7C 24050002 */ li $a1, 2
/* 034980 80033D80 54AB001C */ bnel $a1, $t3, .L80033DF4
/* 034984 80033D84 920201EC */ lbu $v0, 0x1ec($s0)
asm/non_matchings/code_8006E9C0/func_80070780.s
+4 -4
View File
@@ -62,8 +62,8 @@ glabel L80070848
/* 071460 80070860 254A5894 */ addiu $t2, %lo(D_800E5894) # addiu $t2, $t2, 0x5894
/* 071464 80070864 A4C90000 */ sh $t1, ($a2)
/* 071468 80070868 ACEA0000 */ sw $t2, ($a3)
/* 07146C 8007086C 3C02800E */ lui $v0, %hi(D_800DC548) # $v0, 0x800e
/* 071470 80070870 8C42C548 */ lw $v0, %lo(D_800DC548)($v0)
/* 07146C 8007086C 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e
/* 071470 80070870 8C42C548 */ lw $v0, %lo(gCCSelection)($v0)
/* 071474 80070874 3C0B800E */ lui $t3, %hi(D_800E5854) # $t3, 0x800e
/* 071478 80070878 24100008 */ li $s0, 8
/* 07147C 8007087C 1040000B */ beqz $v0, .L800708AC
@@ -602,8 +602,8 @@ glabel L80071024
/* 071C5C 8007105C 8DADC53C */ lw $t5, %lo(gModeSelection)($t5)
/* 071C60 80071060 148D002F */ bne $a0, $t5, .L80071120
.L80071064:
/* 071C64 80071064 3C02800E */ lui $v0, %hi(D_800DC548) # $v0, 0x800e
/* 071C68 80071068 8C42C548 */ lw $v0, %lo(D_800DC548)($v0)
/* 071C64 80071064 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e
/* 071C68 80071068 8C42C548 */ lw $v0, %lo(gCCSelection)($v0)
/* 071C6C 8007106C 24040002 */ li $a0, 2
/* 071C70 80071070 240E0004 */ li $t6, 4
/* 071C74 80071074 1040000A */ beqz $v0, .L800710A0
asm/non_matchings/code_80071F00/func_8007D360.s
+2 -2
View File
@@ -171,8 +171,8 @@ glabel func_8007D360
/* 07E1E8 8007D5E8 0C022E03 */ jal func_8008B80C
/* 07E1EC 8007D5EC 24070000 */ li $a3, 0
/* 07E1F0 8007D5F0 A60000B0 */ sh $zero, 0xb0($s0)
/* 07E1F4 8007D5F4 3C08800E */ lui $t0, %hi(D_800DC548) # $t0, 0x800e
/* 07E1F8 8007D5F8 8D08C548 */ lw $t0, %lo(D_800DC548)($t0)
/* 07E1F4 8007D5F4 3C08800E */ lui $t0, %hi(gCCSelection) # $t0, 0x800e
/* 07E1F8 8007D5F8 8D08C548 */ lw $t0, %lo(gCCSelection)($t0)
/* 07E1FC 8007D5FC 29010002 */ slti $at, $t0, 2
/* 07E200 8007D600 10200013 */ beqz $at, .L8007D650
/* 07E204 8007D604 00000000 */ nop
asm/non_matchings/code_80071F00/func_8007D794.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_8007D794
/* 07E394 8007D794 3C02800E */ lui $v0, %hi(D_800DC548) # $v0, 0x800e
/* 07E398 8007D798 8C42C548 */ lw $v0, %lo(D_800DC548)($v0)
/* 07E394 8007D794 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e
/* 07E398 8007D798 8C42C548 */ lw $v0, %lo(gCCSelection)($v0)
/* 07E39C 8007D79C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 07E3A0 8007D7A0 AFBF0014 */ sw $ra, 0x14($sp)
/* 07E3A4 8007D7A4 14400007 */ bnez $v0, .L8007D7C4
asm/non_matchings/code_80071F00/func_8007DDC0.s
+2 -2
View File
@@ -28,10 +28,10 @@ glabel func_8007DDC0
/* 07EA24 8007DE24 26040004 */ addiu $a0, $s0, 4
.L8007DE28:
/* 07EA28 8007DE28 8E0B004C */ lw $t3, 0x4c($s0)
/* 07EA2C 8007DE2C 3C02800E */ lui $v0, %hi(D_800DC548) # $v0, 0x800e
/* 07EA2C 8007DE2C 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e
/* 07EA30 8007DE30 55600031 */ bnel $t3, $zero, .L8007DEF8
/* 07EA34 8007DE34 2404000F */ li $a0, 15
/* 07EA38 8007DE38 8C42C548 */ lw $v0, %lo(D_800DC548)($v0)
/* 07EA38 8007DE38 8C42C548 */ lw $v0, %lo(gCCSelection)($v0)
/* 07EA3C 8007DE3C 24010001 */ li $at, 1
/* 07EA40 8007DE40 10400006 */ beqz $v0, .L8007DE5C
/* 07EA44 8007DE44 00000000 */ nop
asm/non_matchings/code_80071F00/func_8007E00C.s
+2 -2
View File
@@ -38,10 +38,10 @@ glabel L8007E084
/* 07EC90 8007E090 AFA60030 */ sw $a2, 0x30($sp)
/* 07EC94 8007E094 3C088016 */ lui $t0, %hi(D_80165594) # $t0, 0x8016
/* 07EC98 8007E098 8D085594 */ lw $t0, %lo(D_80165594)($t0)
/* 07EC9C 8007E09C 3C09800E */ lui $t1, %hi(D_800DC548) # $t1, 0x800e
/* 07EC9C 8007E09C 3C09800E */ lui $t1, %hi(gCCSelection) # $t1, 0x800e
/* 07ECA0 8007E0A0 55000014 */ bnel $t0, $zero, .L8007E0F4
/* 07ECA4 8007E0A4 240A0400 */ li $t2, 1024
/* 07ECA8 8007E0A8 8D29C548 */ lw $t1, %lo(D_800DC548)($t1)
/* 07ECA8 8007E0A8 8D29C548 */ lw $t1, %lo(gCCSelection)($t1)
/* 07ECAC 8007E0AC 29210002 */ slti $at, $t1, 2
/* 07ECB0 8007E0B0 10200007 */ beqz $at, .L8007E0D0
/* 07ECB4 8007E0B4 00000000 */ nop
asm/non_matchings/code_80071F00/func_8007E1F4.s
+2 -2
View File
@@ -28,10 +28,10 @@ glabel func_8007E1F4
/* 07EE58 8007E258 26040004 */ addiu $a0, $s0, 4
.L8007E25C:
/* 07EE5C 8007E25C 8E0B004C */ lw $t3, 0x4c($s0)
/* 07EE60 8007E260 3C02800E */ lui $v0, %hi(D_800DC548) # $v0, 0x800e
/* 07EE60 8007E260 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e
/* 07EE64 8007E264 55600032 */ bnel $t3, $zero, .L8007E330
/* 07EE68 8007E268 2404000F */ li $a0, 15
/* 07EE6C 8007E26C 8C42C548 */ lw $v0, %lo(D_800DC548)($v0)
/* 07EE6C 8007E26C 8C42C548 */ lw $v0, %lo(gCCSelection)($v0)
/* 07EE70 8007E270 24010001 */ li $at, 1
/* 07EE74 8007E274 50400007 */ beql $v0, $zero, .L8007E294
/* 07EE78 8007E278 3C01442F */ lui $at, 0x442f
asm/non_matchings/code_80071F00/func_8007E3EC.s
+2 -2
View File
@@ -32,10 +32,10 @@ glabel L8007E454
/* 07F058 8007E458 240500D2 */ li $a1, 210
/* 07F05C 8007E45C 3C198016 */ lui $t9, %hi(D_80165598) # $t9, 0x8016
/* 07F060 8007E460 8F395598 */ lw $t9, %lo(D_80165598)($t9)
/* 07F064 8007E464 3C08800E */ lui $t0, %hi(D_800DC548) # $t0, 0x800e
/* 07F064 8007E464 3C08800E */ lui $t0, %hi(gCCSelection) # $t0, 0x800e
/* 07F068 8007E468 57200013 */ bnel $t9, $zero, .L8007E4B8
/* 07F06C 8007E46C 8FBF0014 */ lw $ra, 0x14($sp)
/* 07F070 8007E470 8D08C548 */ lw $t0, %lo(D_800DC548)($t0)
/* 07F070 8007E470 8D08C548 */ lw $t0, %lo(gCCSelection)($t0)
/* 07F074 8007E474 29010002 */ slti $at, $t0, 2
/* 07F078 8007E478 10200005 */ beqz $at, .L8007E490
/* 07F07C 8007E47C 00000000 */ nop
asm/non_matchings/code_80071F00/func_80086700.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_80086700
/* 087300 80086700 3C0E800E */ lui $t6, %hi(D_800DC548) # $t6, 0x800e
/* 087304 80086704 8DCEC548 */ lw $t6, %lo(D_800DC548)($t6)
/* 087300 80086700 3C0E800E */ lui $t6, %hi(gCCSelection) # $t6, 0x800e
/* 087304 80086704 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6)
/* 087308 80086708 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 08730C 8008670C AFB00018 */ sw $s0, 0x18($sp)
/* 087310 80086710 29C10002 */ slti $at, $t6, 2
asm/non_matchings/code_80091750/func_8009CE64.s
+10 -10
View File
@@ -6,8 +6,8 @@ glabel func_8009CE64
/* 09DA74 8009CE74 AFBF0014 */ sw $ra, 0x14($sp)
/* 09DA78 8009CE78 15020026 */ bne $t0, $v0, .L8009CF14
/* 09DA7C 8009CE7C 00002825 */ move $a1, $zero
/* 09DA80 8009CE80 3C03800E */ lui $v1, %hi(D_800DC548) # $v1, 0x800e
/* 09DA84 8009CE84 8C63C548 */ lw $v1, %lo(D_800DC548)($v1)
/* 09DA80 8009CE80 3C03800E */ lui $v1, %hi(gCCSelection) # $v1, 0x800e
/* 09DA84 8009CE84 8C63C548 */ lw $v1, %lo(gCCSelection)($v1)
/* 09DA88 8009CE88 24060002 */ li $a2, 2
/* 09DA8C 8009CE8C 24070003 */ li $a3, 3
/* 09DA90 8009CE90 10660006 */ beq $v1, $a2, .L8009CEAC
@@ -282,9 +282,9 @@ glabel L8009D22C
/* 09DE44 8009D244 3C01800E */ lui $at, %hi(D_800DC524) # $at, 0x800e
/* 09DE48 8009D248 AC29C524 */ sw $t1, %lo(D_800DC524)($at)
/* 09DE4C 8009D24C 3C04800F */ lui $a0, %hi(D_800E86BC) # $a0, 0x800f
/* 09DE50 8009D250 3C01800E */ lui $at, %hi(D_800DC548) # $at, 0x800e
/* 09DE50 8009D250 3C01800E */ lui $at, %hi(gCCSelection) # $at, 0x800e
/* 09DE54 8009D254 248486BC */ addiu $a0, %lo(D_800E86BC) # addiu $a0, $a0, -0x7944
/* 09DE58 8009D258 AC25C548 */ sw $a1, %lo(D_800DC548)($at)
/* 09DE58 8009D258 AC25C548 */ sw $a1, %lo(gCCSelection)($at)
/* 09DE5C 8009D25C 80830000 */ lb $v1, ($a0)
/* 09DE60 8009D260 2C610006 */ sltiu $at, $v1, 6
/* 09DE64 8009D264 10200084 */ beqz $at, .L8009D478
@@ -618,19 +618,19 @@ glabel L8009D50C
/* 09E31C 8009D71C 10650013 */ beq $v1, $a1, .L8009D76C
/* 09E320 8009D720 A02FEE0B */ sb $t7, %lo(gCourseSelection)($at)
/* 09E324 8009D724 10660005 */ beq $v1, $a2, .L8009D73C
/* 09E328 8009D728 3C01800E */ lui $at, %hi(D_800DC548)
/* 09E328 8009D728 3C01800E */ lui $at, %hi(gCCSelection)
/* 09E32C 8009D72C 10670005 */ beq $v1, $a3, .L8009D744
/* 09E330 8009D730 3C01800E */ lui $at, %hi(D_800DC548) # $at, 0x800e
/* 09E330 8009D730 3C01800E */ lui $at, %hi(gCCSelection) # $at, 0x800e
/* 09E334 8009D734 10000005 */ b .L8009D74C
/* 09E338 8009D738 3C18800E */ lui $t8, %hi(D_800DC548) # $t8, 0x800e
/* 09E338 8009D738 3C18800E */ lui $t8, %hi(gCCSelection) # $t8, 0x800e
.L8009D73C:
/* 09E33C 8009D73C 1000000B */ b .L8009D76C
/* 09E340 8009D740 AC20C548 */ sw $zero, %lo(D_800DC548)($at)
/* 09E340 8009D740 AC20C548 */ sw $zero, %lo(gCCSelection)($at)
.L8009D744:
/* 09E344 8009D744 10000009 */ b .L8009D76C
/* 09E348 8009D748 AC27C548 */ sw $a3, %lo(D_800DC548)($at)
/* 09E348 8009D748 AC27C548 */ sw $a3, %lo(gCCSelection)($at)
.L8009D74C:
/* 09E34C 8009D74C 8F18C548 */ lw $t8, %lo(D_800DC548)($t8)
/* 09E34C 8009D74C 8F18C548 */ lw $t8, %lo(gCCSelection)($t8)
/* 09E350 8009D750 3C01800E */ lui $at, %hi(gIsMirrorMode)
/* 09E354 8009D754 14F80004 */ bne $a3, $t8, .L8009D768
/* 09E358 8009D758 00000000 */ nop
asm/non_matchings/code_80091750/func_8009E650.s
+6 -6
View File
@@ -640,17 +640,17 @@ glabel L8009EFB8
/* 09FBB8 8009EFB8 3C028019 */ lui $v0, %hi(gCupSelection) # $v0, 0x8019
/* 09FBBC 8009EFBC 2442EE09 */ addiu $v0, %lo(gCupSelection) # addiu $v0, $v0, -0x11f7
/* 09FBC0 8009EFC0 804F0000 */ lb $t7, ($v0)
/* 09FBC4 8009EFC4 3C05800E */ lui $a1, %hi(D_800DC548) # $a1, 0x800e
/* 09FBC4 8009EFC4 3C05800E */ lui $a1, %hi(gCCSelection) # $a1, 0x800e
/* 09FBC8 8009EFC8 AFEF001C */ sw $t7, 0x1c($ra)
/* 09FBCC 8009EFCC AFBF007C */ sw $ra, 0x7c($sp)
/* 09FBD0 8009EFD0 8CA5C548 */ lw $a1, %lo(D_800DC548)($a1)
/* 09FBD0 8009EFD0 8CA5C548 */ lw $a1, %lo(gCCSelection)($a1)
/* 09FBD4 8009EFD4 0C02D530 */ jal func_800B54C0
/* 09FBD8 8009EFD8 80440000 */ lb $a0, ($v0)
/* 09FBDC 8009EFDC 8FBF007C */ lw $ra, 0x7c($sp)
/* 09FBE0 8009EFE0 3C18800E */ lui $t8, %hi(D_800DC548) # $t8, 0x800e
/* 09FBE0 8009EFE0 3C18800E */ lui $t8, %hi(gCCSelection) # $t8, 0x800e
/* 09FBE4 8009EFE4 00401825 */ move $v1, $v0
/* 09FBE8 8009EFE8 AFE20020 */ sw $v0, 0x20($ra)
/* 09FBEC 8009EFEC 8F18C548 */ lw $t8, %lo(D_800DC548)($t8)
/* 09FBEC 8009EFEC 8F18C548 */ lw $t8, %lo(gCCSelection)($t8)
/* 09FBF0 8009EFF0 3C04800E */ lui $a0, %hi(D_800E7E20)
/* 09FBF4 8009EFF4 07010003 */ bgez $t8, .L8009F004
/* 09FBF8 8009EFF8 0018C843 */ sra $t9, $t8, 1
@@ -677,8 +677,8 @@ glabel L8009EFB8
/* 09FC48 8009F048 10000161 */ b .L8009F5D0
/* 09FC4C 8009F04C AFEF0010 */ sw $t7, 0x10($ra)
glabel L8009F050
/* 09FC50 8009F050 3C19800E */ lui $t9, %hi(D_800DC548) # $t9, 0x800e
/* 09FC54 8009F054 8F39C548 */ lw $t9, %lo(D_800DC548)($t9)
/* 09FC50 8009F050 3C19800E */ lui $t9, %hi(gCCSelection) # $t9, 0x800e
/* 09FC54 8009F054 8F39C548 */ lw $t9, %lo(gCCSelection)($t9)
/* 09FC58 8009F058 3C04800F */ lui $a0, %hi(D_800E8294) # 0x800f
/* 09FC5C 8009F05C AFBF007C */ sw $ra, 0x7c($sp)
/* 09FC60 8009F060 00197080 */ sll $t6, $t9, 2
asm/non_matchings/code_80091750/func_8009F5E0.s
+2 -2
View File
@@ -956,8 +956,8 @@ glabel L800A037C
/* 0A0FB0 800A03B0 0C026306 */ jal func_80098C18
/* 0A0FB4 800A03B4 24A7003F */ addiu $a3, $a1, 0x3f
/* 0A0FB8 800A03B8 AE020000 */ sw $v0, ($s0)
/* 0A0FBC 800A03BC 3C09800E */ lui $t1, %hi(D_800DC548) # $t1, 0x800e
/* 0A0FC0 800A03C0 8D29C548 */ lw $t1, %lo(D_800DC548)($t1)
/* 0A0FBC 800A03BC 3C09800E */ lui $t1, %hi(gCCSelection) # $t1, 0x800e
/* 0A0FC0 800A03C0 8D29C548 */ lw $t1, %lo(gCCSelection)($t1)
/* 0A0FC4 800A03C4 3C04800F */ lui $a0, %hi(D_800E8294) # 0x800f
/* 0A0FC8 800A03C8 00095080 */ sll $t2, $t1, 2
/* 0A0FCC 800A03CC 008A2021 */ addu $a0, $a0, $t2
asm/non_matchings/code_80091750/func_800A2EB8.s
+2 -2
View File
@@ -187,8 +187,8 @@ glabel func_800A2EB8
/* 0A3D78 800A3178 468021A0 */ cvt.s.w $f6, $f4
/* 0A3D7C 800A317C 3C014000 */ li $at, 0x40000000 # 2.000000
/* 0A3D80 800A3180 44815000 */ mtc1 $at, $f10
/* 0A3D84 800A3184 3C0C800E */ lui $t4, %hi(D_800DC548) # $t4, 0x800e
/* 0A3D88 800A3188 8D8CC548 */ lw $t4, %lo(D_800DC548)($t4)
/* 0A3D84 800A3184 3C0C800E */ lui $t4, %hi(gCCSelection) # $t4, 0x800e
/* 0A3D88 800A3188 8D8CC548 */ lw $t4, %lo(gCCSelection)($t4)
/* 0A3D8C 800A318C 3C12800E */ lui $s2, %hi(D_800E76CC) # $s2, 0x800e
/* 0A3D90 800A3190 46003202 */ mul.s $f8, $f6, $f0
/* 0A3D94 800A3194 265276CC */ addiu $s2, %lo(D_800E76CC) # addiu $s2, $s2, 0x76cc
asm/non_matchings/code_80091750/func_800A34A8.s
+2 -2
View File
@@ -291,8 +291,8 @@ glabel func_800A34A8
/* 0A44D0 800A38D0 468021A0 */ cvt.s.w $f6, $f4
/* 0A44D4 800A38D4 3C014000 */ li $at, 0x40000000 # 2.000000
/* 0A44D8 800A38D8 44815000 */ mtc1 $at, $f10
/* 0A44DC 800A38DC 3C18800E */ lui $t8, %hi(D_800DC548) # $t8, 0x800e
/* 0A44E0 800A38E0 8F18C548 */ lw $t8, %lo(D_800DC548)($t8)
/* 0A44DC 800A38DC 3C18800E */ lui $t8, %hi(gCCSelection) # $t8, 0x800e
/* 0A44E0 800A38E0 8F18C548 */ lw $t8, %lo(gCCSelection)($t8)
/* 0A44E4 800A38E4 3C12800E */ lui $s2, %hi(D_800E76CC) # $s2, 0x800e
/* 0A44E8 800A38E8 46003202 */ mul.s $f8, $f6, $f0
/* 0A44EC 800A38EC 265276CC */ addiu $s2, %lo(D_800E76CC) # addiu $s2, $s2, 0x76cc
asm/non_matchings/code_80091750/func_800A5084.s
+4 -4
View File
@@ -74,9 +74,9 @@ glabel func_800A5084
/* 0A5D9C 800A519C 44815000 */ mtc1 $at, $f10
/* 0A5DA0 800A51A0 3C014000 */ li $at, 0x40000000 # 2.000000
/* 0A5DA4 800A51A4 44819000 */ mtc1 $at, $f18
/* 0A5DA8 800A51A8 3C0D800E */ lui $t5, %hi(D_800DC548) # $t5, 0x800e
/* 0A5DA8 800A51A8 3C0D800E */ lui $t5, %hi(gCCSelection) # $t5, 0x800e
/* 0A5DAC 800A51AC 46143202 */ mul.s $f8, $f6, $f20
/* 0A5DB0 800A51B0 8DADC548 */ lw $t5, %lo(D_800DC548)($t5)
/* 0A5DB0 800A51B0 8DADC548 */ lw $t5, %lo(gCCSelection)($t5)
/* 0A5DB4 800A51B4 3C04800E */ lui $a0, %hi(D_800E76CC)
/* 0A5DB8 800A51B8 000D7080 */ sll $t6, $t5, 2
/* 0A5DBC 800A51BC 008E2021 */ addu $a0, $a0, $t6
@@ -115,8 +115,8 @@ glabel func_800A5084
/* 0A5E40 800A5240 24A5FFCE */ addiu $a1, $a1, -0x32
/* 0A5E44 800A5244 0C024C36 */ jal set_text_color
/* 0A5E48 800A5248 24040003 */ li $a0, 3
/* 0A5E4C 800A524C 3C0D800E */ lui $t5, %hi(D_800DC548) # $t5, 0x800e
/* 0A5E50 800A5250 8DADC548 */ lw $t5, %lo(D_800DC548)($t5)
/* 0A5E4C 800A524C 3C0D800E */ lui $t5, %hi(gCCSelection) # $t5, 0x800e
/* 0A5E50 800A5250 8DADC548 */ lw $t5, %lo(gCCSelection)($t5)
/* 0A5E54 800A5254 86650002 */ lh $a1, 2($s3)
/* 0A5E58 800A5258 3C06800E */ lui $a2, %hi(D_800E76CC)
/* 0A5E5C 800A525C 000D7080 */ sll $t6, $t5, 2
asm/non_matchings/code_80091750/func_800A72FC.s
+4 -4
View File
@@ -18,9 +18,9 @@ glabel func_800A72FC
/* 0A7F3C 800A733C 44815000 */ mtc1 $at, $f10
/* 0A7F40 800A7340 3C014000 */ li $at, 0x40000000 # 2.000000
/* 0A7F44 800A7344 44819000 */ mtc1 $at, $f18
/* 0A7F48 800A7348 3C08800E */ lui $t0, %hi(D_800DC548) # $t0, 0x800e
/* 0A7F48 800A7348 3C08800E */ lui $t0, %hi(gCCSelection) # $t0, 0x800e
/* 0A7F4C 800A734C 46143202 */ mul.s $f8, $f6, $f20
/* 0A7F50 800A7350 8D08C548 */ lw $t0, %lo(D_800DC548)($t0)
/* 0A7F50 800A7350 8D08C548 */ lw $t0, %lo(gCCSelection)($t0)
/* 0A7F54 800A7354 3C04800E */ lui $a0, %hi(D_800E76CC)
/* 0A7F58 800A7358 00084880 */ sll $t1, $t0, 2
/* 0A7F5C 800A735C 00892021 */ addu $a0, $a0, $t1
@@ -62,8 +62,8 @@ glabel func_800A72FC
/* 0A7FEC 800A73EC 018D2023 */ subu $a0, $t4, $t5
/* 0A7FF0 800A73F0 0C024C36 */ jal set_text_color
/* 0A7FF4 800A73F4 24040003 */ li $a0, 3
/* 0A7FF8 800A73F8 3C09800E */ lui $t1, %hi(D_800DC548) # $t1, 0x800e
/* 0A7FFC 800A73FC 8D29C548 */ lw $t1, %lo(D_800DC548)($t1)
/* 0A7FF8 800A73F8 3C09800E */ lui $t1, %hi(gCCSelection) # $t1, 0x800e
/* 0A7FFC 800A73FC 8D29C548 */ lw $t1, %lo(gCCSelection)($t1)
/* 0A8000 800A7400 8FB80038 */ lw $t8, 0x38($sp)
/* 0A8004 800A7404 8FA80030 */ lw $t0, 0x30($sp)
/* 0A8008 800A7408 3C06800E */ lui $a2, %hi(D_800E76DC)
asm/non_matchings/code_80091750/func_800AB9B0.s
+4 -4
View File
@@ -7,16 +7,16 @@ glabel func_800AB9B0
/* 0AC5C4 800AB9C4 8C8E001C */ lw $t6, 0x1c($a0)
/* 0AC5C8 800AB9C8 80620000 */ lb $v0, ($v1)
/* 0AC5CC 800AB9CC 00808025 */ move $s0, $a0
/* 0AC5D0 800AB9D0 3C05800E */ lui $a1, %hi(D_800DC548) # $a1, 0x800e
/* 0AC5D0 800AB9D0 3C05800E */ lui $a1, %hi(gCCSelection) # $a1, 0x800e
/* 0AC5D4 800AB9D4 504E0020 */ beql $v0, $t6, .L800ABA58
/* 0AC5D8 800AB9D8 8E020004 */ lw $v0, 4($s0)
/* 0AC5DC 800AB9DC AC82001C */ sw $v0, 0x1c($a0)
/* 0AC5E0 800AB9E0 8CA5C548 */ lw $a1, %lo(D_800DC548)($a1)
/* 0AC5E0 800AB9E0 8CA5C548 */ lw $a1, %lo(gCCSelection)($a1)
/* 0AC5E4 800AB9E4 0C02D530 */ jal func_800B54C0
/* 0AC5E8 800AB9E8 80640000 */ lb $a0, ($v1)
/* 0AC5EC 800AB9EC AE020020 */ sw $v0, 0x20($s0)
/* 0AC5F0 800AB9F0 3C0F800E */ lui $t7, %hi(D_800DC548) # $t7, 0x800e
/* 0AC5F4 800AB9F4 8DEFC548 */ lw $t7, %lo(D_800DC548)($t7)
/* 0AC5F0 800AB9F0 3C0F800E */ lui $t7, %hi(gCCSelection) # $t7, 0x800e
/* 0AC5F4 800AB9F4 8DEFC548 */ lw $t7, %lo(gCCSelection)($t7)
/* 0AC5F8 800AB9F8 00401825 */ move $v1, $v0
/* 0AC5FC 800AB9FC 00034880 */ sll $t1, $v1, 2
/* 0AC600 800ABA00 05E10003 */ bgez $t7, .L800ABA10
asm/non_matchings/code_80091750/func_800AF004.s
+2 -2
View File
@@ -21,10 +21,10 @@ glabel L800AF038
/* 0AFC4C 800AF04C 14200052 */ bnez $at, .L800AF198
/* 0AFC50 800AF050 AE18001C */ sw $t8, 0x1c($s0)
/* 0AFC54 800AF054 24080001 */ li $t0, 1
/* 0AFC58 800AF058 3C03800E */ lui $v1, %hi(D_800DC548) # $v1, 0x800e
/* 0AFC58 800AF058 3C03800E */ lui $v1, %hi(gCCSelection) # $v1, 0x800e
/* 0AFC5C 800AF05C AE00001C */ sw $zero, 0x1c($s0)
/* 0AFC60 800AF060 AE080004 */ sw $t0, 4($s0)
/* 0AFC64 800AF064 2463C548 */ addiu $v1, %lo(D_800DC548) # addiu $v1, $v1, -0x3ab8
/* 0AFC64 800AF064 2463C548 */ addiu $v1, %lo(gCCSelection) # addiu $v1, $v1, -0x3ab8
/* 0AFC68 800AF068 80490000 */ lb $t1, ($v0)
/* 0AFC6C 800AF06C 8C6B0000 */ lw $t3, ($v1)
/* 0AFC70 800AF070 2404012C */ li $a0, 300
asm/non_matchings/code_800AF9B0/func_800B28C8.s
+6 -6
View File
@@ -21,7 +21,7 @@ glabel func_800B28C8
/* 0B3514 800B2914 804286AD */ lb $v0, %lo(D_800E86AD)($v0) # -0x7953($v0)
/* 0B3518 800B2918 24030001 */ li $v1, 1
/* 0B351C 800B291C 10A30026 */ beq $a1, $v1, .L800B29B8
/* 0B3520 800B2920 3C01800E */ lui $at, %hi(D_800DC548) # 0x800e
/* 0B3520 800B2920 3C01800E */ lui $at, %hi(gCCSelection) # 0x800e
/* 0B3524 800B2924 24010002 */ li $at, 2
/* 0B3528 800B2928 10A10012 */ beq $a1, $at, .L800B2974
/* 0B352C 800B292C 24010003 */ li $at, 3
@@ -31,8 +31,8 @@ glabel func_800B28C8
/* 0B353C 800B293C 00000000 */ nop
.L800B2940:
/* 0B3540 800B2940 3C01800E */ lui $at, %hi(D_800DC548) # $at, 0x800e
/* 0B3544 800B2944 AC22C548 */ sw $v0, %lo(D_800DC548)($at)
/* 0B3540 800B2940 3C01800E */ lui $at, %hi(gCCSelection) # $at, 0x800e
/* 0B3544 800B2944 AC22C548 */ sw $v0, %lo(gCCSelection)($at)
/* 0B3548 800B2948 24030001 */ li $v1, 1
/* 0B354C 800B294C 3C01800E */ lui $at, %hi(D_800DC648) # $at, 0x800e
/* 0B3550 800B2950 A423C648 */ sh $v1, %lo(D_800DC648)($at)
@@ -48,8 +48,8 @@ glabel func_800B28C8
/* 0B3570 800B2970 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) # -0x39fc($at)
.L800B2974:
/* 0B3574 800B2974 3C01800E */ lui $at, %hi(D_800DC548) # $at, 0x800e
/* 0B3578 800B2978 AC22C548 */ sw $v0, %lo(D_800DC548)($at)
/* 0B3574 800B2974 3C01800E */ lui $at, %hi(gCCSelection) # $at, 0x800e
/* 0B3578 800B2978 AC22C548 */ sw $v0, %lo(gCCSelection)($at)
/* 0B357C 800B297C 3C01800E */ lui $at, %hi(D_800DC648) # $at, 0x800e
/* 0B3580 800B2980 A423C648 */ sh $v1, %lo(D_800DC648)($at)
/* 0B3584 800B2984 24010003 */ li $at, 3
@@ -71,7 +71,7 @@ glabel func_800B28C8
/* 0B35B4 800B29B4 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) # -0x39fc($at)
.L800B29B8:
/* 0B35B8 800B29B8 AC23C548 */ sw $v1, %lo(D_800DC548)($at) # -0x3ab8($at)
/* 0B35B8 800B29B8 AC23C548 */ sw $v1, %lo(gCCSelection)($at) # -0x3ab8($at)
/* 0B35BC 800B29BC 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e
/* 0B35C0 800B29C0 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at)
/* 0B35C4 800B29C4 3C01800E */ lui $at, %hi(D_800DC648) # $at, 0x800e
asm/non_matchings/code_800AF9B0/func_800B536C.s
+2 -2
View File
@@ -3,8 +3,8 @@ glabel func_800B536C
/* 0B5F70 800B5370 AFBF0014 */ sw $ra, 0x14($sp)
/* 0B5F74 800B5374 0480001F */ bltz $a0, .L800B53F4
/* 0B5F78 800B5378 00803025 */ move $a2, $a0
/* 0B5F7C 800B537C 3C0E800E */ lui $t6, %hi(D_800DC548) # $t6, 0x800e
/* 0B5F80 800B5380 8DCEC548 */ lw $t6, %lo(D_800DC548)($t6)
/* 0B5F7C 800B537C 3C0E800E */ lui $t6, %hi(gCCSelection) # $t6, 0x800e
/* 0B5F80 800B5380 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6)
/* 0B5F84 800B5384 3C188019 */ lui $t8, %hi(D_8018EB90) # $t8, 0x8019
/* 0B5F88 800B5388 2718EB90 */ addiu $t8, %lo(D_8018EB90) # addiu $t8, $t8, -0x1470
/* 0B5F8C 800B538C 25CF0180 */ addiu $t7, $t6, 0x180
asm/non_matchings/code_80281FA0/func_802847CC.s
+2 -2
View File
@@ -171,8 +171,8 @@ glabel func_802847CC
/* 128098 80284A58 0C0A0B64 */ jal func_80282D90
/* 12809C 80284A5C 00003825 */ move $a3, $zero
.L80284A60:
/* 1280A0 80284A60 3C19800E */ lui $t9, %hi(D_800DC548) # $t9, 0x800e
/* 1280A4 80284A64 8F39C548 */ lw $t9, %lo(D_800DC548)($t9)
/* 1280A0 80284A60 3C19800E */ lui $t9, %hi(gCCSelection) # $t9, 0x800e
/* 1280A4 80284A64 8F39C548 */ lw $t9, %lo(gCCSelection)($t9)
/* 1280A8 80284A68 24010003 */ li $at, 3
/* 1280AC 80284A6C 3C08800E */ lui $t0, %hi(D_800DC5E4) # $t0, 0x800e
/* 1280B0 80284A70 17210007 */ bne $t9, $at, .L80284A90
asm/non_matchings/code_80290C20/func_80295D88.s
+2 -2
View File
@@ -92,8 +92,8 @@ glabel L80295EB0
/* 0FF4F0 80295EE0 3C01802C */ lui $at, %hi(D_802B87B4) # $at, 0x802c
/* 0FF4F4 80295EE4 240A03E8 */ li $t2, 1000
/* 0FF4F8 80295EE8 A42A87B4 */ sh $t2, %lo(D_802B87B4)($at)
/* 0FF4FC 80295EEC 3C0D800E */ lui $t5, %hi(D_800DC548) # $t5, 0x800e
/* 0FF500 80295EF0 8DADC548 */ lw $t5, %lo(D_800DC548)($t5)
/* 0FF4FC 80295EEC 3C0D800E */ lui $t5, %hi(gCCSelection) # $t5, 0x800e
/* 0FF500 80295EF0 8DADC548 */ lw $t5, %lo(gCCSelection)($t5)
/* 0FF504 80295EF4 3C01802C */ lui $at, %hi(D_802B87D4) # $at, 0x802c
/* 0FF508 80295EF8 240B071C */ li $t3, 1820
/* 0FF50C 80295EFC A42B87D4 */ sh $t3, %lo(D_802B87D4)($at)
include/variables.h
+1 -1
View File
@@ -60,7 +60,7 @@ extern s16* D_80164550;
extern f32 D_80165210[];
extern f32 D_80165230[];
extern struct_D_800E261C D_800E261C;
extern s32 D_800DC548;
extern s32 gCCSelection;
extern f32 D_80164510[];
extern s32 D_80165420[];
extern s32 D_80165440[];
src/code_80005FD0.c
+17 -17
View File
@@ -1595,7 +1595,7 @@ void func_80007D04(s32 arg0, void *arg1) {
phi_at = &D_801634C0 + (arg0 * 2);
goto block_25;
}
temp_v1_2 = D_800DC548;
temp_v1_2 = gCCSelection;
if (temp_v1_2 != 0) {
if (temp_v1_2 != 1) {
if (temp_v1_2 != 2) {
@@ -1838,7 +1838,7 @@ void func_80008424(s32 arg0, f32 arg1, void *arg2) {
// Duplicate return node #55. Try simplifying control flow for better match
return;
}
temp_v0_2 = D_800DC548;
temp_v0_2 = gCCSelection;
phi_f0 = D_800ECF9C;
if (temp_v0_2 != 0) {
if (temp_v0_2 != 1) {
@@ -2077,7 +2077,7 @@ extern ? gPlayers;
} else {
phi_a0_2 = temp_a3->unk0;
}
temp_lo = (D_800DC548 + 1) * phi_a0_2;
temp_lo = (gCCSelection + 1) * phi_a0_2;
*temp_t4 = temp_lo;
if ((temp_lo < phi_a1_4) && (((temp_t1->unk94 / 18.0f) * 216.0f) >= 20.0f)) {
goto block_55;
@@ -3116,16 +3116,16 @@ block_63:
temp_v1_3 = (arg0 * 0x10) + &D_801634F8;
sp30 = temp_v1_3;
temp_t0_2 = sp38 + &D_80163210;
*temp_t0_2 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D0096B8, sp34 + &D_801631E0);
*temp_t0_2 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D0096B8, sp34 + &D_801631E0);
temp_v1_3->unk4 = -0.5f;
phi_t0_2 = temp_t0_2;
} else if (*(D_801645E0 + (D_80162FCE * 2)) > 0) {
temp_t0_3 = sp38 + &D_80163210;
*temp_t0_3 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D009418, sp34 + &D_801631E0);
*temp_t0_3 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D009418, sp34 + &D_801631E0);
phi_t0_2 = temp_t0_3;
} else {
temp_t0_4 = sp38 + &D_80163210;
*temp_t0_4 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D009568, sp34 + &D_801631E0);
*temp_t0_4 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D009568, sp34 + &D_801631E0);
phi_t0_2 = temp_t0_4;
}
sp3C = phi_t0_2;
@@ -3345,22 +3345,22 @@ block_63:
if ((*sp28 == 1) || (temp_v0_23 = *sp2C, (temp_v0_23 == 1)) || (temp_v0_23 == -1) || ((sp40->unkBC & 0x1000000C) != 0)) {
sp20 = temp_t0_6;
temp_v1_11 = sp38 + &D_80163028;
*temp_v1_11 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D009418, phi_a1_3);
*temp_v1_11 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D009418, phi_a1_3);
phi_v1_3 = temp_v1_11;
} else {
sp20 = temp_t0_6;
temp_v1_10 = sp38 + &D_80163028;
*temp_v1_10 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D009568, phi_a1_3);
*temp_v1_10 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D009568, phi_a1_3);
phi_v1_3 = temp_v1_10;
}
temp_f0_5 = *(sp38 + &D_80163068);
if ((D_800ECFC0 < temp_f0_5) || (temp_f0_5 < D_800ECFC4)) {
sp34 = phi_v1_3;
*phi_v1_3 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D009808);
*phi_v1_3 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D009808);
}
if (D_80162FD0 == 1) {
sp34 = phi_v1_3;
*phi_v1_3 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (D_800DC548 * 4) + &D_0D0096B8);
*phi_v1_3 = *segmented_to_virtual_dupe((gCurrentCourseId * 0x10) + (gCCSelection * 4) + &D_0D0096B8);
}
temp_v0_24 = *sp2C;
if ((temp_v0_24 == 2) || (temp_v0_24 == -2) || (temp_v0_24 == 3)) {
@@ -6156,7 +6156,7 @@ void func_8000F628(void) {
spE4 = phi_t3;
spE0 = phi_t4;
spDC = phi_t5;
*phi_t2 = *segmented_to_virtual_dupe((phi_v0 * 0x10) + (D_800DC548 * 4) + &D_0D009418);
*phi_t2 = *segmented_to_virtual_dupe((phi_v0 * 0x10) + (gCCSelection * 4) + &D_0D009418);
*phi_t3 = 0;
*phi_t4 = 0;
*phi_t5 = 0.0f;
@@ -6345,7 +6345,7 @@ void func_8000F628(void) {
} while (temp_v1_3 < &D_80164448);
D_8016347A = 0;
phi_v1_2 = &D_80162F10;
if (D_800DC548 == 3) {
if (gCCSelection == 3) {
D_8016347A = 1;
}
phi_v0_5 = &D_80162F50;
@@ -8678,7 +8678,7 @@ void func_800139E4(f32 arg0, f32 arg1, s32 arg2, s32 arg3, void *arg4, s32 arg5)
}
temp_v0_2 = phi_s0->unk2E;
phi_s0->unk24 = (temp_v0_2 - 1) * D_800ED168;
if (((D_800DC548 > 0) || (gModeSelection == 1)) && (temp_v0_2 == 2)) {
if (((gCCSelection > 0) || (gModeSelection == 1)) && (temp_v0_2 == 2)) {
phi_s0->unk20 = arg0;
} else {
phi_s0->unk20 = arg1;
@@ -9123,7 +9123,7 @@ void func_800147E0(void) {
f64 temp_f0;
? phi_a2;
temp_f0 = (D_800DC548 * D_800ED1B8) / 216.0;
temp_f0 = (gCCSelection * D_800ED1B8) / 216.0;
phi_a2 = 7;
if (gModeSelection == 1) {
phi_a2 = 8;
@@ -9191,7 +9191,7 @@ void func_80014934(void) {
f64 temp_f0;
? phi_a2;
temp_f0 = (D_800DC548 * D_800ED1D0) / 216.0;
temp_f0 = (gCCSelection * D_800ED1D0) / 216.0;
phi_a2 = 7;
if (gModeSelection == 1) {
phi_a2 = 8;
@@ -9259,7 +9259,7 @@ void func_80014A88(void) {
f64 temp_f0;
? phi_a2;
temp_f0 = (D_800DC548 * D_800ED1E8) / 216.0;
temp_f0 = (gCCSelection * D_800ED1E8) / 216.0;
phi_a2 = 7;
if (gModeSelection == 1) {
phi_a2 = 8;
@@ -9327,7 +9327,7 @@ void func_80014BDC(void) {
f64 temp_f0;
? phi_a2;
temp_f0 = (D_800DC548 * D_800ED200) / 216.0;
temp_f0 = (gCCSelection * D_800ED200) / 216.0;
phi_a2 = 7;
if (gModeSelection == 1) {
phi_a2 = 8;
src/code_80027D00.c
+1 -1
View File
@@ -5834,7 +5834,7 @@ void func_80033AE0(void *arg0, void *arg1, s8 arg2) {
arg0->unkFA = temp_t9;
if (((sp2D0 >= 0x5A) || (sp2D0 < -0x59)) && ((arg0->unk44 & 0x4000) == 0)) {
temp_v1_4 = arg0->unkBC;
if (((temp_v1_4 & 0x10) == 0) && (D_800DC548 == 2) && (gModeSelection != 3) && ((temp_v1_4 & 8) == 0) && (((arg0->unk94 / 18.0f) * 216.0f) >= 40.0f) && (arg0->unk204 == 0)) {
if (((temp_v1_4 & 0x10) == 0) && (gCCSelection == 2) && (gModeSelection != 3) && ((temp_v1_4 & 8) == 0) && (((arg0->unk94 / 18.0f) * 216.0f) >= 40.0f) && (arg0->unk204 == 0)) {
arg0->unkC = arg0->unkC | 0x80;
}
}
src/code_800393C0.c
+8 -4
View File
@@ -29,14 +29,17 @@ void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg
player->unk_100 = gKartGravityTable[player->characterId];
switch (gModeSelection) {
// Mario Grand Prix
case 0:
// Versus
case 2:
player->unk_084 = D_800E2400.unk_00[D_800DC548][player->characterId];
player->unk_088 = D_800E24B4.unk_00[D_800DC548][player->characterId];
player->unk_210 = D_800E2568.unk_00[D_800DC548][player->characterId];
player->unk_214 = D_800E261C.unk_00[D_800DC548][player->characterId];
player->unk_084 = D_800E2400.unk_00[gCCSelection][player->characterId];
player->unk_088 = D_800E24B4.unk_00[gCCSelection][player->characterId];
player->unk_210 = D_800E2568.unk_00[gCCSelection][player->characterId];
player->unk_214 = D_800E261C.unk_00[gCCSelection][player->characterId];
break;
// Time Trial (uses 100CC values)
case 1:
player->unk_084 = D_800E2400.unk_00[1][player->characterId];
player->unk_088 = D_800E24B4.unk_00[1][player->characterId];
@@ -44,6 +47,7 @@ void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg
player->unk_214 = D_800E261C.unk_00[1][player->characterId];
break;
// Battle
case 3:
player->unk_084 = D_800E2400.unk_00[4][player->characterId];
player->unk_088 = D_800E24B4.unk_00[4][player->characterId];
src/code_80071F00.c
+5 -5
View File
@@ -6629,7 +6629,7 @@ void func_8007D360(s32 arg0, s32 arg1) {
temp_s0_2->unkC2 = 0;
func_8008B80C(arg0, 0, 0, 0);
temp_s0_2->unkB0 = 0;
if (D_800DC548 < 2) {
if (gCCSelection < 2) {
temp_v0_6 = random_int(4);
temp_f10 = temp_v0_6;
phi_f10 = temp_f10;
@@ -6711,7 +6711,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D714.s")
void func_8007D794(void) {
s32 temp_v0;
temp_v0 = D_800DC548;
temp_v0 = gCCSelection;
if (temp_v0 == 0) {
func_80089A04(0x3F000000, 0x3E4CCCCD);
return;
@@ -6967,7 +6967,7 @@ void func_8007DDC0(s32 arg0) {
}
}
if (temp_s0->unk4C == 0) {
temp_v0_3 = D_800DC548;
temp_v0_3 = gCCSelection;
if ((temp_v0_3 == 0) || (temp_v0_3 == 1) || (temp_v0_3 == 2) || (temp_v0_3 == 3)) {
sp2C = D_800EEF40;
}
@@ -7111,7 +7111,7 @@ void func_8007E1F4(s32 arg0) {
}
}
if (temp_s0->unk4C == 0) {
temp_v0_3 = D_800DC548;
temp_v0_3 = gCCSelection;
if ((temp_v0_3 == 0) || (temp_v0_3 == 1) || (temp_v0_3 == 2) || (temp_v0_3 == 3)) {
sp2C = 0x442F0000;
}
@@ -10987,7 +10987,7 @@ void func_80086700(s32 arg0) {
void *temp_v1;
void *phi_v0;
if (D_800DC548 < 2) {
if (gCCSelection < 2) {
temp_v0 = D_802874F5;
if (temp_v0 != 0) {
if (temp_v0 != 1) {
src/code_80091750.c
+8 -8
View File
@@ -7675,7 +7675,7 @@ void func_800A2EB8(void *arg0) {
set_text_color(5);
temp_s0_2 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) + 8) * D_800F1C98) / 2.0f;
temp_f0_3 = D_800F1C9C;
draw_text((-(((func_80093034(*(&D_800E76CC + (D_800DC548 * 4))) + 8) * temp_f0_3) / 2.0f) - arg0->unkC) + 0xF5, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, temp_f0_3, temp_f0_3);
draw_text((-(((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) + 8) * temp_f0_3) / 2.0f) - arg0->unkC) + 0xF5, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, temp_f0_3, temp_f0_3);
temp_v0 = D_8018EDF3;
temp_f0_4 = D_800F1CA0;
draw_text((temp_s0_2 - arg0->unkC) + 0xF5, arg0->unk10 + 0xE1, *(&D_800E76CC + (*(&D_800E86AD + ((temp_v0 * 3) + *(&D_800E86AB + temp_v0))) * 4)), 0, temp_f0_4, temp_f0_4);
@@ -7881,7 +7881,7 @@ void func_800A34A8(void *arg0) {
set_text_color(5);
temp_s0_4 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) + 8) * D_800F1CB8) / 2.0f;
temp_f0_4 = D_800F1CBC;
draw_text((-(((func_80093034(*(&D_800E76CC + (D_800DC548 * 4))) + 8) * temp_f0_4) / 2.0f) - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, temp_f0_4, temp_f0_4);
draw_text((-(((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) + 8) * temp_f0_4) / 2.0f) - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, temp_f0_4, temp_f0_4);
temp_v0 = D_8018EDF3;
temp_f0_5 = D_800F1CC0;
draw_text((temp_s0_4 - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E76CC + (*(&D_800E86AD + ((temp_v0 * 3) + *(&D_800E86AB + temp_v0))) * 4)), 0, temp_f0_5, temp_f0_5);
@@ -8492,11 +8492,11 @@ void func_800A5084(void *arg0) {
gDisplayListHead = draw_box(gDisplayListHead, temp_v1 - temp_t3, temp_t0 - temp_t4, temp_v1 + temp_t3, temp_t0 + temp_t4, 0, 0, 0, 0x8C);
temp_s3 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E85C0;
temp_s0 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
temp_s1 = ((func_80093034(*(&D_800E76CC + (D_800DC548 * 4))) * 1.0f) + 10.0f) / 2.0f;
temp_s1 = ((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
set_text_color(3);
draw_text(0xA0 - temp_s1, temp_s3->unk2 - 0x32, *(&D_800E7500 + (gCupSelection * 4)), 0, 1.0f, 1.0f);
set_text_color(3);
draw_text(temp_s0 + 0xA0, temp_s3->unk2 - 0x32, *(&D_800E76CC + (D_800DC548 * 4)), 0, 1.0f, 1.0f);
draw_text(temp_s0 + 0xA0, temp_s3->unk2 - 0x32, *(&D_800E76CC + (gCCSelection * 4)), 0, 1.0f, 1.0f);
set_text_color(3);
draw_text(0xA0, temp_s3->unk2 - 0x1E, *(&D_800E7574 + (*(&gCupTrackOrder + ((gCupSelection * 8) + (gCourseSelection * 2))) * 4)), 0, 1.0f, 1.0f);
phi_s0 = 0;
@@ -9275,11 +9275,11 @@ void func_800A72FC(void *arg0) {
s32 sp2C;
sp30 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
sp2C = ((func_80093034(*(&D_800E76CC + (D_800DC548 * 4))) * 1.0f) + 10.0f) / 2.0f;
sp2C = ((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
set_text_color(3);
draw_text(arg0->unkC - sp2C, arg0->unk10, *(&D_800E7500 + (gCupSelection * 4)), 0, 1.0f, 1.0f);
set_text_color(3);
draw_text(arg0->unkC + sp30, arg0->unk10, *(&D_800E76DC + (D_800DC548 * 4)), 0, 1.0f, 1.0f);
draw_text(arg0->unkC + sp30, arg0->unk10, *(&D_800E76DC + (gCCSelection * 4)), 0, 1.0f, 1.0f);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A72FC.s")
@@ -11281,9 +11281,9 @@ void func_800AB9B0(void *arg0) {
temp_v0 = gCupSelection;
if (temp_v0 != arg0->unk1C) {
arg0->unk1C = temp_v0;
temp_v0_2 = func_800B54C0(gCupSelection, D_800DC548);
temp_v0_2 = func_800B54C0(gCupSelection, gCCSelection);
arg0->unk20 = temp_v0_2;
func_8009A594(arg0->unk18, 0, segmented_to_virtual_dupe(*(&D_800E7E20 + (((D_800DC548 / 2) * 0x10) + -(temp_v0_2 * 4)))));
func_8009A594(arg0->unk18, 0, segmented_to_virtual_dupe(*(&D_800E7E20 + (((gCCSelection / 2) * 0x10) + -(temp_v0_2 * 4)))));
arg0->unkC = D_800E7268.unk0;
arg0->unk10 = D_800E7268.unk2;
}
src/code_800AF9B0.c
+4 -4
View File
@@ -852,7 +852,7 @@ void func_800B28C8(void) {
gIsMirrorMode = 0;
return;
}
D_800DC548 = temp_v0;
gCCSelection = temp_v0;
D_800DC648 = 1;
if (temp_v0 == 3) {
gIsMirrorMode = 1;
@@ -861,7 +861,7 @@ void func_800B28C8(void) {
gIsMirrorMode = 0;
return;
}
D_800DC548 = 1;
gCCSelection = 1;
gIsMirrorMode = 0;
D_800DC648 = 0;
if (temp_v0 != 0) {
@@ -869,7 +869,7 @@ void func_800B28C8(void) {
}
return;
}
D_800DC548 = temp_v0;
gCCSelection = temp_v0;
D_800DC648 = 1;
if (temp_v0 == 3) {
gIsMirrorMode = 1;
@@ -1803,7 +1803,7 @@ void func_800B536C(s32 arg0) {
temp_a2 = arg0;
if (arg0 >= 0) {
temp_v0 = D_800DC548 + 0x180 + &D_8018EB90;
temp_v0 = gCCSelection + 0x180 + &D_8018EB90;
arg0 = temp_a2;
sp1C = temp_v0;
temp_v1 = 3 - arg0;
src/code_80281FA0.c
+1 -1
View File
@@ -1808,7 +1808,7 @@ block_3:
temp_a2_2 = sp2E - 0x14;
func_802832C4(&D_802839E0, arg0, temp_a2_2, temp_a2_2);
}
if (D_800DC548 == 3) {
if (gCCSelection == 3) {
sp2C = *(&D_80286B34 + (D_800DC5E4 * 2));
}
if (sp2C == D_802876D2) {
src/kart_attributes.inc.c
+3 -3
View File
@@ -3,7 +3,7 @@
#include "types.h"
#include "kart_attributes.h"
// Mario Luigi Yoshi Toad D.K. Wario Peach Bowser
// Mario Luigi Yoshi Toad D.K. Wario Peach Bowser
float D_800E2360[] = {
-10.0, -10.0, -10.0, -10.0, -10.0, -10.0, -10.0, -10.0,
};
@@ -28,7 +28,7 @@ struct D_800E2404 D_800E2404 = {
struct D_800E2410 D_800E2410 = {
D_800E23E0,
};
// Mario Luigi Yoshi Toad D.K. Wario Peach Bowser
// Mario Luigi Yoshi Toad D.K. Wario Peach Bowser
float D_800E2414[] = {
28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0,
};
@@ -53,7 +53,7 @@ struct D_800E24B8 D_800E24B8 = {
struct D_800E24C4 D_800E24C4 = {
D_800E2494,
};
// Mario Luigi Yoshi Toad D.K. Wario Peach Bowser
// Mario Luigi Yoshi Toad D.K. Wario Peach Bowser
float D_800E24C8[] = {
3364.0, 3364.0, 3457.0, 3457.0, 3364.0, 3364.0, 3457.0, 3364.0,
};
src/main.c
+14 -1
View File
@@ -172,10 +172,23 @@ s32 D_800DC52C = 0;
s32 D_800DC530[2] = {0};
s32 gPlayerCountSelection1 = 2;
/**
* 0 = Mario Grand Prix
* 1 = Time Trial
* 2 = Versus
* 3 = Battle
**/
s32 gModeSelection = 0;
s32 D_800DC540 = 0;
s32 D_800DC544 = 0;
s32 D_800DC548 = 0;
/**
* 0 = 50CC
* 1 = 100CC
* 2 = 150CC
* 3 = Extra (a.k.a Mirror)
* 4 = Battle
**/
s32 gCCSelection = 0;
s32 gGlobalTimer = 0;
UNUSED s32 D_800DC550 = 0;
UNUSED s32 D_800DC554 = 0;