falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Text Color defines (#70) 

* Text Color defines

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Updates based on comments

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran 2021-11-28 20:39:50 -05:00 committed by GitHub
parent 632512ada9
commit 6451db9e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 112 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/bss_8001C4D0.s
View File

@ -1892,7 +1892,7 @@ glabel D_8018E858
glabel D_8018E85C
.skip 4
glabel D_8018E860
glabel gTextColor
.skip 8
glabel D_8018E868

4
asm/non_matchings/code_80091750/func_800959F8.s
View File

@ -1,6 +1,6 @@
glabel func_800959F8
/* 0965F8 800959F8 3C028019 */ lui $v0, %hi(D_8018E860) # $v0, 0x8019
/* 0965FC 800959FC 8042E860 */ lb $v0, %lo(D_8018E860)($v0)
/* 0965F8 800959F8 3C028019 */ lui $v0, %hi(gTextColor) # $v0, 0x8019
/* 0965FC 800959FC 8042E860 */ lb $v0, %lo(gTextColor)($v0)
/* 096600 80095A00 3C190200 */ lui $t9, %hi(D_02007BB8) # $t9, 0x200
/* 096604 80095A04 3C0F800E */ lui $t7, %hi(gGlobalTimer) # $t7, 0x800e
/* 096608 80095A08 28410004 */ slti $at, $v0, 4

15
include/defines.h
View File

@ -70,4 +70,19 @@
#define PEACH 6
#define BOWSER 7
/**
* Text color options
* The 2 cycling options cycle through Blue -> Green -> Red
* Cycle 2 appears to be one step ahead of Cycle 1
* Other values like 6 and 7 sort of work, they cause rapid
* flashing between 2 colors, but also cause individual characters
* to be cutoff on their right side
**/
#define TEXT_BLUE 0
#define TEXT_GREEN 1
#define TEXT_RED 2
#define TEXT_YELLOW 3
#define TEXT_BLUE_GREEN_RED_CYCLE_1 4
#define TEXT_BLUE_GREEN_RED_CYCLE_2 5
#endif // DEFINES_H

192
src/code_80091750.c
View File

@ -1072,14 +1072,14 @@ s32 func_80093034(s8 *arg0) {
GLOBAL_ASM("asm/non_matchings/code_80091750/func_80093034.s")
#endif
extern s8 D_8018E860;
extern s8 gTextColor;
void set_text_color(s32 arg0) {
D_8018E860 = arg0;
gTextColor = arg0;
}
void func_80093324(s32, s32, s32, s32, f32, f32);
UNUSED void func_800930E4(s32 arg0, s32 arg1, s32 *arg2) {
set_text_color(0);
set_text_color(TEXT_BLUE);
func_80093324(arg0, arg1, arg2, 0, 1.0, 1.0);
}
@ -2457,37 +2457,33 @@ extern ? D_02007BB8;
extern ? D_800E84CC;
extern ? D_800E84EC;
extern ? D_800E850C;
extern s8 D_8018E860;
extern s8 gTextColor;
extern s32 gGlobalTimer;
void *func_800959F8(void *arg0, s32 arg1) {
s8 temp_v0;
s8 phi_v1;
void *phi_a0;
temp_v0 = D_8018E860;
phi_a0 = arg0;
if (temp_v0 < 4) {
phi_v1 = temp_v0;
if (gTextColor < 4) {
phi_v1 = gTextColor;
} else {
phi_v1 = ((temp_v0 * 2) + (gGlobalTimer % 2)) - 4;
phi_v1 = ((gTextColor * 2) + (gGlobalTimer % 2)) - 4;
}
if (arg1 == &D_02007BB8) {
arg0->unk0 = 0x6000000;
arg0->unk4 = *(&D_800E84CC + (phi_v1 * 4));
arg0->unk4 = D_800E84CC[phi_v1];
return arg0 + 8;
}
if (arg1 == 0x2007CD8) {
arg0->unk0 = 0x6000000;
arg0->unk4 = *(&D_800E84EC + (phi_v1 * 4));
arg0->unk4 = D_800E84EC[phi_v1];
return arg0 + 8;
}
if (arg1 == 0x2007DF8) {
arg0->unk0 = 0x6000000;
arg0->unk4 = *(&D_800E850C + (phi_v1 * 4));
phi_a0 = arg0 + 8;
arg0->unk4 = D_800E850C[phi_v1];
arg0 += 8;
}
return phi_a0;
return arg0;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800959F8.s")
@ -8949,7 +8945,7 @@ void func_8009F5E0(void *arg0) {
}
sp4C = phi_f0;
func_800A86E8(arg0);
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_80093324(arg0->unkC + 8, arg0->unk10 + 0x10, *(&D_800E7594 + (arg0->unk0 * 4)), 0, phi_f0, 0.8f);
func_800A874C(arg0);
return;
@ -8996,7 +8992,7 @@ void func_8009F5E0(void *arg0) {
}
gDisplayListHead = phi_v0;
gDisplayListHead = func_8009BA74(gDisplayListHead, &D_02004A34, arg0->unkC, arg0->unk10);
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_800936B8(0x125, 0x1C, "a BUTTON*SEE DATA B BUTTON*EXIT", 0, 0.55f, 0.55f);
return;
case 0x8D: /* switch 3 */
@ -9021,7 +9017,7 @@ void func_8009F5E0(void *arg0) {
func_800A15EC(arg0);
return;
case 0x96: /* switch 3 */
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
func_800936B8(arg0->unkC, arg0->unk10, *(&D_800E7500 + (D_800DC540 * 4)), arg0->unk1C, arg0->unk24, 1.0f);
return;
case 0x97: /* switch 3 */
@ -9123,7 +9119,7 @@ void func_8009F5E0(void *arg0) {
case 0x5: /* switch 4 */
temp_t4 = ((func_80093034(*D_800E7574) + 5) * 0.9f) / 2;
gDisplayListHead = draw_box(gDisplayListHead, 0xA0 - temp_t4, 0x7B, temp_t4 + 0xA0, 0xA4, 0, 0, 0, 0x96);
set_text_color(1);
set_text_color(TEXT_GREEN);
draw_text(0x9B, 0x8C, *D_800E7574, 0, 0.9f, 0.9f);
temp_v1_4 = func_800B4EB4(0, 7) & 0xFFFFF;
if (temp_v1_4 < 0x1EAA) {
@ -9131,7 +9127,7 @@ void func_8009F5E0(void *arg0) {
} else if (temp_v1_4 < 0x2329) {
set_text_color(gGlobalTimer % 3);
} else {
set_text_color(3);
set_text_color(TEXT_YELLOW);
}
func_800A78F4(temp_v1_4, &sp80);
func_800939C8(0x77, 0xA0, &sp80, 0, 1.0f, 1.0f);
@ -9152,7 +9148,7 @@ void func_8009F5E0(void *arg0) {
temp_t2 = (phi_t0 * 0.75f) / 2;
temp_t5 = (((0.75f * 2.0f) + 0.5) * 16.0) / 2;
gDisplayListHead = draw_box(gDisplayListHead, 0xA0 - temp_t2, 0xB6 - temp_t5, temp_t2 + 0xA0, temp_t5 + 0xB6, 0, 0, 0, 0x96);
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
sp38 = 0xB4;
sp3C = 0xA0 - (1.0f * 0.75f);
phi_v0_2 = D_800E77A0;
@ -9917,24 +9913,24 @@ void func_800A1A20(void *arg0) {
temp_v0 = D_8018EDF7;
temp_s1 = *(&gCupTrackOrder + (((temp_v0 / 4) * 8) + ((temp_v0 % 4) * 2)));
arg0->unkC = 0x14;
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
temp_s0 = temp_s1 * 4;
draw_text(0x69, arg0->unk10 + 0x19, *(&D_800E7574 + temp_s0), 0, 0.75f, 0.75f);
set_text_color(2);
set_text_color(TEXT_RED);
func_80093324(0x2D, arg0->unk10 + 0x28, &D_800E77D8, 0, 0.75f, 0.75f);
func_800936B8(0xA5, arg0->unk10 + 0x28, *(&D_800E77E4 + temp_s0), 1, 0.75f, 0.75f);
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_80093324(0xA0, arg0->unk10 + 0x86, D_800E7728, 0, 0.75f, 0.75f);
phi_s0 = 0;
phi_s1 = 0;
do {
set_text_color(2);
set_text_color(TEXT_RED);
func_800A474C(phi_s0, 0x96, arg0->unk10 + phi_s1 + 0x92);
temp_s0_2 = phi_s0 + 1;
phi_s0 = temp_s0_2;
phi_s1 += 0xD;
} while (temp_s0_2 != 5);
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_80093324(0xA0, arg0->unk10 + 0xD5, D_800E772C, 0, 0.75f, 0.75f);
func_800A474C(5, 0x96, arg0->unk10 + 0xE1);
}
@ -9992,7 +9988,7 @@ block_9:
}
}
if (phi_s1 != 0) {
set_text_color(0);
set_text_color(TEXT_BLUE);
temp_v1 = gDisplayListHead;
gDisplayListHead = temp_v1 + 8;
temp_v1->unk4 = 0x96;
@ -10039,7 +10035,7 @@ void func_800A1DE0(s32 arg0) {
s32 phi_s1_2;
s32 *phi_s0_2;
set_text_color(1);
set_text_color(TEXT_GREEN);
temp_f20 = D_800F1B58;
phi_s0 = 0x3C;
phi_s1 = 0;
@ -10083,7 +10079,7 @@ void func_800A1F30(s32 arg0) {
s32 phi_s0;
s32 *phi_s1;
set_text_color(2);
set_text_color(TEXT_RED);
phi_s0 = 0x49;
phi_s1 = &D_800E7860;
do {
@ -10238,14 +10234,14 @@ void func_800A1FB0(void *arg0) {
phi_s2 = temp_s2;
phi_s0 += 0x23;
} while (temp_s2 != 4);
set_text_color(1);
set_text_color(TEXT_GREEN);
draw_text(0xE6, 0x78, *(&D_800E7710 + (D_8018EDF2 * 4)), 0, 1.0f, 1.0f);
block_98:
phi_v1_4 = D_8018EDEC;
break;
case 0x1E: /* switch 1 */
case 0x1F: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_s0_2 = 0x55;
phi_s1_2 = D_800E7878;
do {
@ -10276,7 +10272,7 @@ block_98:
} while (temp_s2_2 != 2);
break;
case 0x20: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_s0_4 = 0x55;
phi_s1_4 = D_800E7884;
do {
@ -10290,7 +10286,7 @@ block_98:
case 0x2B: /* switch 1 */
case 0x2C: /* switch 1 */
case 0x2D: /* switch 1 */
set_text_color(2);
set_text_color(TEXT_RED);
phi_s0_5 = 0x55;
phi_s1_5 = ((D_8018EDEC - 0x2A) * 0xC) + &D_800E78D0;
do {
@ -10304,7 +10300,7 @@ block_98:
case 0x35: /* switch 1 */
case 0x36: /* switch 1 */
case 0x37: /* switch 1 */
set_text_color(2);
set_text_color(TEXT_RED);
phi_s0_6 = 0x55;
phi_s1_6 = ((D_8018EDEC - 0x34) * 0x10) + &D_800E7890;
do {
@ -10316,7 +10312,7 @@ block_98:
goto block_98;
case 0x41: /* switch 1 */
case 0x42: /* switch 1 */
set_text_color(2);
set_text_color(TEXT_RED);
phi_s0_7 = 0x55;
phi_s1_7 = ((D_8018EDEC - 0x41) * 0xC) + &D_800E7900;
do {
@ -10328,7 +10324,7 @@ block_98:
goto block_98;
case 0x46: /* switch 1 */
case 0x47: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_s0_8 = 0x55;
phi_s1_8 = D_800E7A48;
do {
@ -10361,7 +10357,7 @@ block_98:
phi_s3 = 0x2A;
phi_s6 = 0x20;
do {
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(sp88, 0x7D, *sp84, 0, 0.75f, 0.75f);
phi_s0_9 = 0;
phi_s2_3 = 0x96;
@ -10375,7 +10371,7 @@ loop_38:
} else if ((phi_s4 != 0) && (phi_s0_9 == arg0->unk20)) {
set_text_color(gGlobalTimer % 3);
} else {
set_text_color(1);
set_text_color(TEXT_GREEN);
}
temp_s1_4 = phi_s0_9 + 1;
func_800A7894(temp_s1_4, &spB8);
@ -10405,7 +10401,7 @@ loop_38:
goto block_98;
case 0x38: /* switch 1 */
case 0x39: /* switch 1 */
set_text_color(2);
set_text_color(TEXT_RED);
phi_s1_9 = 0x4D;
phi_s0_10 = D_800E7928;
do {
@ -10419,7 +10415,7 @@ loop_38:
phi_s3_2 = 0x2A;
phi_s6_2 = 0x20;
do {
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(sp88, 0x7D, *sp84, 0, 0.75f, 0.75f);
phi_s0_11 = 0;
phi_s2_4 = 0x96;
@ -10428,12 +10424,12 @@ loop_58:
if (phi_s0_11 == arg0->unk1C) {
set_text_color(gGlobalTimer % 3);
} else {
set_text_color(1);
set_text_color(TEXT_GREEN);
}
} else if (phi_s0_11 == arg0->unk20) {
set_text_color(gGlobalTimer % 3);
} else {
set_text_color(1);
set_text_color(TEXT_GREEN);
}
temp_s1_5 = phi_s0_11 + 1;
func_800A7894(temp_s1_5, &spA8);
@ -10480,7 +10476,7 @@ loop_58:
case 0x3A: /* switch 1 */
case 0x3B: /* switch 1 */
case 0x3C: /* switch 1 */
set_text_color(2);
set_text_color(TEXT_RED);
temp_v0_3 = (((temp_v1 - 0x3A) / 2) * 4) + &D_800E7938;
sp78 = temp_v0_3;
draw_text(0xA0, 0x55, *temp_v0_3, 0, 1.0f, 1.0f);
@ -10489,7 +10485,7 @@ loop_58:
phi_s3_4 = 0x2A;
phi_s6_3 = 0x20;
do {
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(sp88, 0x7D, *sp84, 0, 0.75f, 0.75f);
phi_s0_12 = 0;
phi_s2_6 = 0x96;
@ -10497,17 +10493,17 @@ loop_80:
if (phi_s3_4 == 0x2A) {
if (phi_s0_12 == arg0->unk1C) {
if (sp78 == &D_800E7938) {
set_text_color(2);
set_text_color(TEXT_RED);
} else {
set_text_color(gGlobalTimer % 3);
}
} else {
set_text_color(1);
set_text_color(TEXT_GREEN);
}
} else if (phi_s0_12 == arg0->unk20) {
set_text_color(2);
set_text_color(TEXT_RED);
} else {
set_text_color(1);
set_text_color(TEXT_GREEN);
}
temp_s1_6 = phi_s0_12 + 1;
func_800A7894(temp_s1_6, &sp98);
@ -10672,7 +10668,7 @@ void func_800A2EB8(void *arg0) {
phi_s0 = temp_s0;
phi_s1 = temp_s1;
} while (temp_s0 < &D_80164370);
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
func_80093324(arg0->unkC + 0x1E, arg0->unk10 + 0x19, &D_800F0C1C, 0, 1.0f, 1.0f);
set_text_color(5);
temp_f0 = D_800F1C90;
@ -10835,7 +10831,7 @@ void func_800A34A8(void *arg0) {
func_800A3A10(&sp80);
func_800A3A10(gGPOverallRanks);
}
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
func_80093324(arg0->unkC + 0x19, 0x19 - arg0->unk10, "driver's points", 0, 0.8f, 0.8f);
set_text_color(5);
func_80093324(arg0->unkC + 0x36, 0x28 - arg0->unk10, "round", 0, 0.7f, 0.7f);
@ -11048,10 +11044,10 @@ void func_800A3C84(void *arg0) {
s32 phi_s0_2;
s32 phi_s1_2;
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
temp_f0 = D_800F1CC8;
draw_text(arg0->unkC + 0x43, arg0->unk10 + 0x19, *(&D_800E7574 + (*(&gCupTrackOrder + ((gCupSelection * 8) + (gCourseSelection * 2))) * 4)), 0, temp_f0, temp_f0);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC + 0x46, arg0->unk10 + 0x28, D_800E7730, 0, 0.75f, 0.75f);
phi_s0 = 0;
phi_s1 = 0;
@ -11063,16 +11059,16 @@ void func_800A3C84(void *arg0) {
phi_s0 = temp_s0;
phi_s1 += 0xF;
} while (temp_s0 < 4);
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_80093324(0xB4 - arg0->unkC, arg0->unk10 + 0x86, D_800E7728, 0, 0.75f, 0.75f);
do {
set_text_color(2);
set_text_color(TEXT_RED);
func_800A474C(phi_s0_2, 0xAA - arg0->unkC, arg0->unk10 + phi_s1_2 + 0x92);
temp_s0_2 = phi_s0_2 + 1;
phi_s0_2 = temp_s0_2;
phi_s1_2 += 0xD;
} while (temp_s0_2 != 5);
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_80093324(0xB4 - arg0->unkC, arg0->unk10 + 0xD5, D_800E772C, 0, 0.75f, 0.75f);
func_800A474C(5, 0xAA - arg0->unkC, arg0->unk10 + 0xE1);
}
@ -11161,9 +11157,9 @@ void func_800A3E60(void *arg0) {
temp_v0 = arg0->unk4;
if ((temp_v0 != 0) && (temp_v0 != 0x1F)) {
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
draw_text(arg0->unkC + 0x55, 0x19 - arg0->unk10, *(&D_800E7574 + (*(&gCupTrackOrder + ((gCupSelection * 8) + (gCourseSelection * 2))) * 4)), 0, 0.6f, 0.6f);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC + 0x55, 0x28 - arg0->unk10, D_800E7730, 0, 0.75f, 0.75f);
phi_s1 = 0;
phi_s0 = 0;
@ -11202,7 +11198,7 @@ void func_800A3E60(void *arg0) {
phi_v1 = 1;
}
if (phi_v1 != 0) {
set_text_color(0);
set_text_color(TEXT_BLUE);
temp_v1_2 = gDisplayListHead;
gDisplayListHead = temp_v1_2 + 8;
temp_v1_2->words.w1 = 0x96;
@ -11224,7 +11220,7 @@ block_43:
case 14: /* switch 1 */
case 15: /* switch 1 */
case 16: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0 = ((arg0->unk4 - 0xB) * 0x1C) + &D_800E798C;
phi_s0_3 = 0x8C;
do {
@ -11237,7 +11233,7 @@ block_43:
goto block_43;
case 17: /* switch 1 */
case 18: /* switch 1 */
set_text_color(1);
set_text_color(TEXT_GREEN);
phi_s2_2 = 0;
phi_s0_4 = D_800E7A3C;
do {
@ -11266,7 +11262,7 @@ block_43:
} while (sp54 != 2);
goto block_43;
case 19: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_2 = D_800E7A48;
phi_s0_6 = 0x93;
do {
@ -11279,7 +11275,7 @@ block_43:
goto block_43;
case 20: /* switch 1 */
case 21: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_s2_4 = 0;
phi_s0_7 = D_800E7A60;
do {
@ -11300,7 +11296,7 @@ block_43:
} while (temp_s1_3 != 2);
goto block_43;
case 25: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_3 = D_800E7A74;
phi_s0_9 = 0x93;
do {
@ -11312,7 +11308,7 @@ block_43:
} while (temp_v0_4 != D_800E7A80);
goto block_43;
case 26: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_4 = D_800E7A80;
phi_s0_10 = 0x93;
do {
@ -11388,11 +11384,11 @@ void func_800A4550(s32 arg0, s32 arg1, s32 arg2) {
temp_v0 = arg0 * 4;
sp2C = temp_v0;
sp40 = *(&D_8018CA90 + temp_v0);
set_text_color(2);
set_text_color(TEXT_RED);
phi_v0 = temp_v0;
} else {
sp40 = D_8018CA78;
set_text_color(1);
set_text_color(TEXT_GREEN);
phi_v0 = arg0 * 4;
}
temp_f20 = D_800F1DC4;
@ -11551,7 +11547,7 @@ void func_800A4A24(void *arg0) {
temp_f0 = D_800F1DCC;
temp_t2 = ((func_80093034(&D_800E7780, temp_a1) + 8) * temp_f0) / 2;
gDisplayListHead = draw_box(gDisplayListHead, temp_t0 - temp_t2, (temp_t1 - (24.0f * temp_f0)) + 4, temp_t2 + temp_t0, temp_t1 + 4, 0, 0, 0, 0x64);
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
temp_f0_2 = D_800F1DD0;
draw_text(arg0->unkC - 3, arg0->unk10, &D_800E7780, 0, temp_f0_2, temp_f0_2);
}
@ -11635,9 +11631,9 @@ void func_800A4BC8(void *arg0) {
? **phi_s2;
gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, 0x8C);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(0xA0, 0x50, *(&D_800E7574 + (*(&gCupTrackOrder + ((gCupSelection * 8) + (gCourseSelection * 2))) * 4)), 0, 1.0f, 1.0f);
set_text_color(2);
set_text_color(TEXT_RED);
temp_f20 = D_800F1DD4;
draw_text(0x9D, 0x60, D_800E7728.unk0, 0, temp_f20, temp_f20);
temp_a0 = func_800B4E24(0) & 0xFFFFF;
@ -11771,11 +11767,11 @@ void func_800A5084(void *arg0) {
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 + (gCCSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(0xA0 - temp_s1, temp_s3->unk2 - 0x32, *(&D_800E7500 + (gCupSelection * 4)), 0, 1.0f, 1.0f);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(temp_s0 + 0xA0, temp_s3->unk2 - 0x32, *(&D_800E76CC + (gCCSelection * 4)), 0, 1.0f, 1.0f);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(0xA0, temp_s3->unk2 - 0x1E, *(&D_800E7574 + (*(&gCupTrackOrder + ((gCupSelection * 8) + (gCourseSelection * 2))) * 4)), 0, 1.0f, 1.0f);
phi_s0 = 0;
phi_s1 = 0;
@ -12012,7 +12008,7 @@ void func_800A5738(void *arg0) {
if (temp_v1 == 0) {
if ((arg0->unk1C >= 0x1E) && (((gGlobalTimer / 16) % 2) != 0)) {
gDisplayListHead = draw_box(gDisplayListHead, 0xC0, 0x21, (func_80093034(D_800E775C->unk14) * 0.8f) + 0xC6, 0x32, 0, 0, 0, 0x96);
set_text_color(1);
set_text_color(TEXT_GREEN);
func_80093324(0xBF, 0x30, D_800E775C->unk14, 0, 0.8f, 0.8f);
return;
}
@ -12032,7 +12028,7 @@ void func_800A5738(void *arg0) {
gDisplayListHead = temp_v0 + 8;
temp_v0->words.w1 = phi_s2 & 0xFF;
temp_v0->words.w0 = 0xFA000000;
set_text_color(3);
set_text_color(TEXT_YELLOW);
func_80093754(0xA0, 0x50, *(&D_800E7574 + (*(&gCupTrackOrder + ((gCupSelection * 8) + (gCourseSelection * 2))) * 4)), 0, 1.0f, 1.0f);
temp_v1_2 = arg0->unk4;
switch (temp_v1_2) { /* switch 1 */
@ -12043,7 +12039,7 @@ void func_800A5738(void *arg0) {
case 14: /* switch 1 */
case 15: /* switch 1 */
case 16: /* switch 1 */
set_text_color(2);
set_text_color(TEXT_RED);
func_80093754(0x9D, 0x60, D_800E7728.unk0, 0, 0.8f, 0.8f);
temp_a0 = func_800B4E24(0) & 0xFFFFF;
temp_s1_2 = temp_a0;
@ -12086,7 +12082,7 @@ block_36:
case 24: /* switch 1 */
case 25: /* switch 1 */
case 26: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_2 = ((arg0->unk4 - 0x15) * 0x1C) + &D_800E798C;
phi_s0_2 = 0x6E;
do {
@ -12099,7 +12095,7 @@ block_36:
goto block_36;
case 30: /* switch 1 */
case 31: /* switch 1 */
set_text_color(1);
set_text_color(TEXT_GREEN);
phi_v0_3 = D_800E7A3C;
phi_s0_3 = 0;
do {
@ -12130,7 +12126,7 @@ block_36:
} while (sp54 != 2);
goto block_36;
case 32: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_4 = D_800E7A48;
phi_s0_5 = 0x6E;
do {
@ -12143,7 +12139,7 @@ block_36:
goto block_36;
case 35: /* switch 1 */
case 36: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_5 = D_800E7A60;
phi_s0_6 = 0;
do {
@ -12167,7 +12163,7 @@ block_36:
} while (temp_s1_5 != 2);
goto block_36;
case 40: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_7 = D_800E7A74;
phi_s0_8 = 0x6E;
do {
@ -12179,7 +12175,7 @@ block_36:
} while (temp_v0_6 != D_800E7A80);
goto block_36;
case 41: /* switch 1 */
set_text_color(3);
set_text_color(TEXT_YELLOW);
phi_v0_8 = D_800E7A80;
phi_s0_9 = 0x6E;
do {
@ -12283,7 +12279,7 @@ void func_800A6154(void *arg0) {
if (arg0->unk4 == 0) {
gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, arg0->unk1C);
set_text_color(3);
set_text_color(TEXT_YELLOW);
temp_v0 = gDisplayListHead;
gDisplayListHead = temp_v0 + 8;
temp_v0->unk0 = 0xFA000000;
@ -12564,7 +12560,7 @@ void func_800A69C8(s32 arg0) {
}
temp_s3 = *(&D_800E7720 + (phi_v1 * 4));
if (phi_v1 != 0) {
set_text_color(0);
set_text_color(TEXT_BLUE);
} else {
set_text_color(gGlobalTimer % 3);
}
@ -12578,7 +12574,7 @@ void func_800A69C8(s32 arg0) {
} while (temp_s0 < D_8018EDF3);
sp68 = phi_s4;
}
set_text_color(0);
set_text_color(TEXT_BLUE);
text_draw(0x9E, D_800E7302 + 0x6D, &D_800F0C7C, 0, 1.0f, 1.0f);
}
#else
@ -12687,7 +12683,7 @@ void func_800A6D94(s32 arg0, s32 arg1, s32 arg2) {
}
sp24 = *(arg2 + arg1);
if (phi_v0 != 0) {
set_text_color(0);
set_text_color(TEXT_BLUE);
} else {
set_text_color(gModeSelection % 3);
}
@ -12726,7 +12722,7 @@ void func_800A6E94(s32 arg0, s32 arg1, s32 arg2) {
if (temp_t8 == 0) {
set_text_color(gGlobalTimer % 3);
} else {
set_text_color(3);
set_text_color(TEXT_YELLOW);
}
temp_s0 = ((arg0 << 5) + (arg1 * 8)) - 0x40 + &D_800E7300;
temp_f20 = D_800F1F28;
@ -12740,7 +12736,7 @@ void func_800A6E94(s32 arg0, s32 arg1, s32 arg2) {
set_text_color(gGlobalTimer % 3);
} else {
sp38 = 1;
set_text_color(0);
set_text_color(TEXT_BLUE);
}
sp38 = sp38;
text_draw(temp_s0->unk0 + 4, temp_s0->unk2 + 0x69, &D_800F0C88, 0, temp_f20, temp_f20);
@ -12749,7 +12745,7 @@ void func_800A6E94(s32 arg0, s32 arg1, s32 arg2) {
if ((sp38 + 1) == sp3C) {
set_text_color(gGlobalTimer % 3);
} else {
set_text_color(2);
set_text_color(TEXT_RED);
}
text_draw(temp_s0->unk0 + 4, temp_s0->unk2 + 0x78, &D_800F0C90, 0, temp_f20, temp_f20);
func_800A7894(sp30->unk2, &sp40);
@ -12849,9 +12845,9 @@ void func_800A72FC(void *arg0) {
sp30 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
sp2C = ((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC - sp2C, arg0->unk10, *(&D_800E7500 + (gCupSelection * 4)), 0, 1.0f, 1.0f);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC + sp30, arg0->unk10, *(&D_800E76DC + (gCCSelection * 4)), 0, 1.0f, 1.0f);
}
#else
@ -12878,7 +12874,7 @@ void func_800A7448(void *arg0) {
temp_v1 = D_802874F5;
if (temp_v1 >= 3) {
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC, arg0->unk10, D_800E7A98, 0, 0.75f, 0.75f);
return;
}
@ -12888,9 +12884,9 @@ void func_800A7448(void *arg0) {
sp34 = temp_a1;
sp40 = temp_f8 / 2.0f;
sp3C = ((func_80093034(temp_a1->unk4, temp_a1) + 5) * 0.75f) / 2.0f;
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC - sp3C, arg0->unk10, D_800E7A88, 0, 0.75f, 0.75f);
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(arg0->unkC + sp40, arg0->unk10, sp34->unk4, 0, 0.75f, 0.75f);
}
#else
@ -12916,7 +12912,7 @@ void func_800A75A0(void *arg0) {
phi_v0 = 1;
}
sp20 = phi_v0;
set_text_color(4);
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
temp_f0 = D_800F1F30;
draw_text(arg0->unkC, arg0->unk10, *(&D_800E7A9C + (phi_v0 * 4)), 0, temp_f0, temp_f0);
}
@ -13769,7 +13765,7 @@ void func_800A874C(void *arg0) {
u32 phi_v0;
u32 phi_s2;
set_text_color(1);
set_text_color(TEXT_GREEN);
if (arg0->unk0 == 0x65) {
phi_v0 = func_800B4E24(0);
} else {
@ -13976,7 +13972,7 @@ extern f32 D_800F24B0;
extern f32 D_800F24B4;
void func_800A8E14(s32 arg0) {
set_text_color(3);
set_text_color(TEXT_YELLOW);
draw_text(0x98, 0x44, D_800E77A8, 0, 1.0f, 1.0f);
func_80093324(0x17, 0x58, D_800E77AC, 0, D_800F24A8, D_800F24AC);
func_80093324(0x17, 0x6A, D_800E77B0, 0, D_800F24B0, D_800F24B4);
@ -13998,7 +13994,7 @@ void func_800A8EC0(void *arg0) {
if (arg0->unk20 != 0) {
func_8009A76C(arg0->unk18, arg0->unkC, arg0->unk10, -1);
set_text_color(3);
set_text_color(TEXT_YELLOW);
temp_f0 = D_800F24B8;
func_80093324(arg0->unkC + 0x20, arg0->unk10 + 0x28, *(&D_800E7678 + (arg0->unk20 * 4)), 0, temp_f0, temp_f0);
}