mirror of
https://github.com/n64decomp/mk64
synced 2026-08-10 02:45:20 -04:00
Match a couple functions related to text color (#96)
* Match a couple functions related to text color Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
@@ -1,4 +0,0 @@
|
||||
glabel func_800921B4
|
||||
/* 092DB4 800921B4 3C018019 */ lui $at, %hi(D_8018D9D9)
|
||||
/* 092DB8 800921B8 03E00008 */ jr $ra
|
||||
/* 092DBC 800921BC A020D9D9 */ sb $zero, %lo(D_8018D9D9)($at)
|
||||
@@ -1,29 +0,0 @@
|
||||
glabel func_800921C0
|
||||
/* 092DC0 800921C0 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 092DC4 800921C4 14850011 */ bne $a0, $a1, .L8009220C
|
||||
/* 092DC8 800921C8 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 092DCC 800921CC 0C02D148 */ jal func_800B4520
|
||||
/* 092DD0 800921D0 00000000 */ nop
|
||||
/* 092DD4 800921D4 10400009 */ beqz $v0, .L800921FC
|
||||
/* 092DD8 800921D8 3C04800E */ lui $a0, %hi(gGlobalTimer) # $a0, 0x800e
|
||||
/* 092DDC 800921DC 8C84C54C */ lw $a0, %lo(gGlobalTimer)($a0)
|
||||
/* 092DE0 800921E0 24010003 */ li $at, 3
|
||||
/* 092DE4 800921E4 0081001A */ div $zero, $a0, $at
|
||||
/* 092DE8 800921E8 00002010 */ mfhi $a0
|
||||
/* 092DEC 800921EC 0C024C36 */ jal set_text_color
|
||||
/* 092DF0 800921F0 00000000 */ nop
|
||||
/* 092DF4 800921F4 10000008 */ b .L80092218
|
||||
/* 092DF8 800921F8 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
.L800921FC:
|
||||
/* 092DFC 800921FC 0C024C36 */ jal set_text_color
|
||||
/* 092E00 80092200 24040005 */ li $a0, 5
|
||||
/* 092E04 80092204 10000004 */ b .L80092218
|
||||
/* 092E08 80092208 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
.L8009220C:
|
||||
/* 092E0C 8009220C 0C024C36 */ jal set_text_color
|
||||
/* 092E10 80092210 00C02025 */ move $a0, $a2
|
||||
/* 092E14 80092214 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
.L80092218:
|
||||
/* 092E18 80092218 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 092E1C 8009221C 03E00008 */ jr $ra
|
||||
/* 092E20 80092220 00000000 */ nop
|
||||
@@ -1,16 +0,0 @@
|
||||
glabel func_80092224
|
||||
/* 092E24 80092224 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 092E28 80092228 14850005 */ bne $a0, $a1, .L80092240
|
||||
/* 092E2C 8009222C AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 092E30 80092230 0C024C36 */ jal set_text_color
|
||||
/* 092E34 80092234 24040005 */ li $a0, 5
|
||||
/* 092E38 80092238 10000004 */ b .L8009224C
|
||||
/* 092E3C 8009223C 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
.L80092240:
|
||||
/* 092E40 80092240 0C024C36 */ jal set_text_color
|
||||
/* 092E44 80092244 00C02025 */ move $a0, $a2
|
||||
/* 092E48 80092248 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
.L8009224C:
|
||||
/* 092E4C 8009224C 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 092E50 80092250 03E00008 */ jr $ra
|
||||
/* 092E54 80092254 00000000 */ nop
|
||||
@@ -16,6 +16,7 @@ extern s8 gCupSelection;
|
||||
extern u8 gCupSelectionByCourseId[NUM_COURSES]; // D_800E7664
|
||||
extern s16 gCurrentCourseId;
|
||||
extern char *gDebugSoundModeNames[NUM_SOUND_MODES]; // D_800E7700
|
||||
extern s32 gGlobalTimer; // D_800DC54C
|
||||
extern s8 gGPPointsByCharacterId[8]; // D_8018D9C8
|
||||
extern s16 gGPCurrentRacePlayerIdByRank[8]; // D_80164360
|
||||
extern s8 gHumanPlayerCount;
|
||||
|
||||
+51
-68
@@ -1,6 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include <macros.h>
|
||||
#include <defines.h>
|
||||
#include "variables.h"
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
@@ -516,52 +517,34 @@ void func_80092148(void) {
|
||||
GLOBAL_ASM("asm/non_matchings/code_80091750/func_80092148.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern s8 D_8018D9D9;
|
||||
|
||||
void func_800921B4(void) {
|
||||
D_8018D9D9 = 0;
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800921B4.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
s32 func_800B4520(); // extern
|
||||
? set_text_color(s32); // extern
|
||||
extern s32 gGlobalTimer;
|
||||
void set_text_color(s32);
|
||||
extern s32 func_800B4520();
|
||||
|
||||
void func_800921C0(s32 arg0, s32 arg1, s32 arg2) {
|
||||
if (arg0 == arg1) {
|
||||
void func_800921C0(s32 test, s32 target, s32 alternative_color) {
|
||||
if (test == target) {
|
||||
if (func_800B4520() != 0) {
|
||||
set_text_color(gGlobalTimer % 3);
|
||||
return;
|
||||
} else {
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
}
|
||||
set_text_color(5);
|
||||
return;
|
||||
} else {
|
||||
set_text_color(alternative_color);
|
||||
}
|
||||
set_text_color(arg2);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800921C0.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
? set_text_color(?); // extern
|
||||
|
||||
void func_80092224(s32 arg0, s32 arg1, ? arg2) {
|
||||
if (arg0 == arg1) {
|
||||
set_text_color(5);
|
||||
return;
|
||||
void func_80092224(s32 test, s32 target, s32 alternative_color) {
|
||||
if (test == target) {
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
} else {
|
||||
set_text_color(alternative_color);
|
||||
}
|
||||
set_text_color(arg2);
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/code_80091750/func_80092224.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
@@ -8861,7 +8844,7 @@ void func_8009F5E0(void *arg0) {
|
||||
func_800936B8(arg0->unkC, arg0->unk10, *(&D_800E7500 + (D_800DC540 * 4)), arg0->unk1C, arg0->unk24, 1.0f);
|
||||
return;
|
||||
case 0x97: /* switch 3 */
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
func_80093324(arg0->unkC, arg0->unk10, *(&D_800E7524 + (gCurrentCourseId * 4)), arg0->unk1C, arg0->unk24, 1.0f);
|
||||
return;
|
||||
case 0x98: /* switch 3 */
|
||||
@@ -9813,9 +9796,9 @@ void func_800A1BE0(s32 arg0) {
|
||||
do {
|
||||
phi_s1 = 0;
|
||||
if (phi_s0 == D_8018EDF8) {
|
||||
phi_s2 = 5;
|
||||
phi_s2 = TEXT_BLUE_GREEN_RED_CYCLE_2;
|
||||
} else {
|
||||
phi_s2 = 1;
|
||||
phi_s2 = TEXT_GREEN;
|
||||
if (phi_s0 != 1) {
|
||||
if (phi_s0 != 2) {
|
||||
|
||||
@@ -9889,9 +9872,9 @@ void func_800A1DE0(s32 arg0) {
|
||||
phi_s1_2 = 0x6E;
|
||||
phi_s0_2 = &D_800E7840;
|
||||
do {
|
||||
phi_a0 = 1;
|
||||
phi_a0 = TEXT_GREEN;
|
||||
if (phi_s2 == D_8018EDF9) {
|
||||
phi_a0 = 5;
|
||||
phi_a0 = TEXT_BLUE_GREEN_RED_CYCLE_2;
|
||||
}
|
||||
set_text_color(phi_a0);
|
||||
func_80093324(0x43, phi_s1_2, *phi_s0_2, 0, temp_f20, temp_f20);
|
||||
@@ -10061,7 +10044,7 @@ void func_800A1FB0(void *arg0) {
|
||||
phi_s0 = 0x55;
|
||||
phi_s1 = D_800E7868;
|
||||
do {
|
||||
func_80092224(phi_a0, phi_s2, 3);
|
||||
func_80092224(phi_a0, phi_s2, TEXT_YELLOW);
|
||||
func_80093324(0x32, phi_s0, *phi_s1, 0, 0.9f, 1.0f);
|
||||
temp_a0 = D_8018EDEC - 0x15;
|
||||
phi_a0 = temp_a0;
|
||||
@@ -10095,7 +10078,7 @@ block_98:
|
||||
phi_s0_3 = 0x96;
|
||||
phi_s1_3 = D_800E7840;
|
||||
do {
|
||||
func_80092224(phi_a0_2, phi_s2_2, 1);
|
||||
func_80092224(phi_a0_2, phi_s2_2, TEXT_GREEN);
|
||||
func_80093324(0x84, phi_s0_3, *phi_s1_3, 0, 1.0f, 1.0f);
|
||||
temp_v1_2 = D_8018EDEC;
|
||||
temp_a0_2 = temp_v1_2 - 0x1E;
|
||||
@@ -10203,7 +10186,7 @@ block_98:
|
||||
phi_s2_3 = 0x96;
|
||||
loop_38:
|
||||
if (phi_s3 != sp78) {
|
||||
func_800921C0(D_8018EDEC - phi_s5, phi_s0_9, 1);
|
||||
func_800921C0(D_8018EDEC - phi_s5, phi_s0_9, TEXT_GREEN);
|
||||
if (phi_s0_9 == (D_8018EDEC - phi_s5)) {
|
||||
spE0 = phi_s6;
|
||||
spE2 = phi_s2_3;
|
||||
@@ -10305,7 +10288,7 @@ loop_58:
|
||||
spE0 = phi_s1_10;
|
||||
spE2 = 0xD2;
|
||||
}
|
||||
func_800921C0(temp_a0_3, temp_s1_5, 3);
|
||||
func_800921C0(temp_a0_3, temp_s1_5, TEXT_YELLOW);
|
||||
func_80093324(phi_s1_10, 0xD2, *phi_s3_3, 0, 0.75f, 0.75f);
|
||||
temp_s2_3 = phi_s2_5 + 1;
|
||||
phi_s2_5 = temp_s2_3;
|
||||
@@ -10512,7 +10495,7 @@ void func_800A2EB8(void *arg0) {
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1);
|
||||
func_80093324(arg0->unkC + 0x1E, arg0->unk10 + 0x19, &D_800F0C1C, 0, 1.0f, 1.0f);
|
||||
// "Round"
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
temp_f0 = D_800F1C90;
|
||||
func_80093324(arg0->unkC + 0x2C, arg0->unk10 + 0x28, &D_800F0C24, 0, temp_f0, temp_f0);
|
||||
// Convert index of current course in the cup order into a round number
|
||||
@@ -10529,7 +10512,7 @@ void func_800A2EB8(void *arg0) {
|
||||
if (*phi_s0_2 < D_8018EDF3) {
|
||||
phi_a0 = gGlobalTimer % 3;
|
||||
} else {
|
||||
phi_a0 = 3;
|
||||
phi_a0 = TEXT_YELLOW;
|
||||
}
|
||||
set_text_color(phi_a0);
|
||||
func_800A32B4(arg0->unkC + 7, arg0->unk10 + phi_s3 + 0x38, *phi_s1_2, phi_s2);
|
||||
@@ -10548,7 +10531,7 @@ void func_800A2EB8(void *arg0) {
|
||||
if (*phi_s0_3 < D_8018EDF3) {
|
||||
phi_a0_2 = gGlobalTimer % 3;
|
||||
} else {
|
||||
phi_a0_2 = 3;
|
||||
phi_a0_2 = TEXT_YELLOW;
|
||||
}
|
||||
set_text_color(phi_a0_2);
|
||||
func_800A32B4(0xBE - arg0->unkC, arg0->unk10 + phi_s3_2 + 0x5A, *phi_s1_3, phi_s2_2);
|
||||
@@ -10559,7 +10542,7 @@ void func_800A2EB8(void *arg0) {
|
||||
phi_s2_2 = temp_s2_2;
|
||||
} while (temp_s2_2 != 8);
|
||||
// Print Cup name
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
temp_s0_2 = ((get_string_width(*(&D_800E7500 + (gCupSelection * 4))) + 8) * D_800F1C98) / 2.0f;
|
||||
temp_f0_3 = D_800F1C9C;
|
||||
// Some very complicated way to print the cup name and CC mode
|
||||
@@ -10699,7 +10682,7 @@ void func_800A34A8(void *arg0) {
|
||||
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);
|
||||
// "Round"
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
func_80093324(arg0->unkC + 0x36, 0x28 - arg0->unk10, "round", 0, 0.7f, 0.7f);
|
||||
// Convert course index to a round number
|
||||
convert_number_to_ascii(gCupCourseSelection + 1, &sp78);
|
||||
@@ -10728,7 +10711,7 @@ void func_800A34A8(void *arg0) {
|
||||
if (phi_v0_2 < D_8018EDF3) {
|
||||
phi_a0_2 = gGlobalTimer % 3;
|
||||
} else {
|
||||
phi_a0_2 = 3;
|
||||
phi_a0_2 = TEXT_YELLOW;
|
||||
}
|
||||
sp68 = phi_v1;
|
||||
set_text_color(phi_a0_2);
|
||||
@@ -10758,7 +10741,7 @@ void func_800A34A8(void *arg0) {
|
||||
if (phi_v0_4 < D_8018EDF3) {
|
||||
phi_a0_3 = gGlobalTimer % 3;
|
||||
} else {
|
||||
phi_a0_3 = 3;
|
||||
phi_a0_3 = TEXT_YELLOW;
|
||||
}
|
||||
set_text_color(phi_a0_3);
|
||||
func_800A3ADC(arg0, 0xBE - arg0->unkC, arg0->unk10 + (phi_s1_2 * 0x10) + 0x5A, (&sp80)[phi_s1_2], phi_s1_2, &sp80);
|
||||
@@ -10766,7 +10749,7 @@ void func_800A34A8(void *arg0) {
|
||||
temp_s1_2 = phi_s1_2 + 1;
|
||||
phi_s1_2 = temp_s1_2;
|
||||
} while (temp_s1_2 != 8);
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
temp_s0_2 = ((get_string_width(*(&D_800E7500 + (gCupSelection * 4))) + 8) * 0.6f) / 2.0f;
|
||||
draw_text((-(((get_string_width(*(&D_800E76CC + (gCCSelection * 4))) + 8) * 0.6f) / 2.0f) - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, 0.6f, 0.6f);
|
||||
temp_v0 = D_8018EDF3;
|
||||
@@ -11062,7 +11045,7 @@ void func_800A3E60(void *arg0) {
|
||||
phi_s0_2 = &D_800E775C;
|
||||
do {
|
||||
sp6C = 0;
|
||||
func_800921C0(arg0->unk4 - 5, phi_s1_2, 1);
|
||||
func_800921C0(arg0->unk4 - 5, phi_s1_2, TEXT_GREEN);
|
||||
phi_v1 = sp6C;
|
||||
if (phi_s1_2 != 4) {
|
||||
if (phi_s1_2 != 5) {
|
||||
@@ -11121,7 +11104,7 @@ block_43:
|
||||
phi_s0_5 = 0xAA;
|
||||
phi_s2_3 = &D_8018EE10;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0x11, phi_s1_3, 1);
|
||||
func_800921C0(arg0->unk4 - 0x11, phi_s1_3, TEXT_GREEN);
|
||||
temp_a0 = phi_s1_3 + 1;
|
||||
sp54 = temp_a0;
|
||||
convert_number_to_ascii(temp_a0, &sp60);
|
||||
@@ -11163,7 +11146,7 @@ block_43:
|
||||
phi_s0_8 = 0xB9;
|
||||
phi_s2_5 = D_800E7A6C;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0x14, phi_s1_4, 1);
|
||||
func_800921C0(arg0->unk4 - 0x14, phi_s1_4, TEXT_GREEN);
|
||||
func_80093324(0xC8 - arg0->unkC, phi_s0_8, *phi_s2_5, 0, 0.75f, 0.75f);
|
||||
temp_s1_3 = phi_s1_4 + 1;
|
||||
phi_s1_4 = temp_s1_3;
|
||||
@@ -11274,10 +11257,10 @@ void func_800A4550(s32 arg0, s32 arg1, s32 arg2) {
|
||||
if ((temp_v0_2->unk20 & (1 << arg0)) != 0) {
|
||||
phi_a0 = gGlobalTimer % 3;
|
||||
} else {
|
||||
phi_a0 = 3;
|
||||
phi_a0 = TEXT_YELLOW;
|
||||
}
|
||||
} else {
|
||||
phi_a0 = 3;
|
||||
phi_a0 = TEXT_YELLOW;
|
||||
// If 3 lap time is in top 5 times
|
||||
if (temp_v0_2->unk1C >= 0) {
|
||||
phi_a0 = gGlobalTimer % 3;
|
||||
@@ -11352,7 +11335,7 @@ void func_800A474C(s32 arg0, s32 arg1, s32 arg2) {
|
||||
phi_v0 = func_800B4EB4(arg0, D_8018EDF7);
|
||||
}
|
||||
sp48 = phi_v0;
|
||||
set_text_color(1);
|
||||
set_text_color(TEXT_GREEN);
|
||||
} else {
|
||||
if (sp30 == 0) {
|
||||
phi_v0_2 = func_800B4F2C(&D_8018EDF7);
|
||||
@@ -11563,7 +11546,7 @@ void func_800A4BC8(void *arg0) {
|
||||
phi_s1 = 0;
|
||||
phi_s2 = &D_800E775C;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0xB, phi_s0, 1);
|
||||
func_800921C0(arg0->unk4 - 0xB, phi_s0, TEXT_GREEN);
|
||||
func_80093324(D_800E8538, D_800E853A + phi_s1, *phi_s2, 0, 0.75f, 0.75f);
|
||||
temp_s0 = phi_s0 + 1;
|
||||
phi_s0 = temp_s0;
|
||||
@@ -11617,7 +11600,7 @@ void func_800A4EF8(void *arg0) {
|
||||
} else {
|
||||
phi_s0 = phi_a1 + 1;
|
||||
}
|
||||
func_800921C0(arg0->unk4 - 0x15, phi_a1, 3);
|
||||
func_800921C0(arg0->unk4 - 0x15, phi_a1, TEXT_YELLOW);
|
||||
func_80093324(temp_s3->unk0 - 2, temp_s3->unk2 + phi_s2, *(&D_800E775C + (phi_s1 * 4)), 0, 0.75f, 0.75f);
|
||||
phi_a1 = phi_s0;
|
||||
phi_s2 += 0xD;
|
||||
@@ -11679,7 +11662,7 @@ void func_800A5084(void *arg0) {
|
||||
phi_s1 = 0;
|
||||
phi_s2 = &D_800E775C;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0x1F, phi_s0, 3);
|
||||
func_800921C0(arg0->unk4 - 0x1F, phi_s0, TEXT_YELLOW);
|
||||
func_80093324(temp_s3->unk0, temp_s3->unk2 + phi_s1, *phi_s2, 0, 0.75f, 0.75f);
|
||||
temp_s0_2 = phi_s0 + 1;
|
||||
phi_s0 = temp_s0_2;
|
||||
@@ -11733,7 +11716,7 @@ void func_800A5360(void *arg0) {
|
||||
} else {
|
||||
phi_s0 = phi_a1 + 1;
|
||||
}
|
||||
func_800921C0(arg0->unk4 - 0x29, phi_a1, 3);
|
||||
func_800921C0(arg0->unk4 - 0x29, phi_a1, TEXT_YELLOW);
|
||||
func_80093324(temp_s3->unk0 - 2, temp_s3->unk2 + phi_s2, *(&D_800E775C + (phi_s1 * 4)), 0, 0.75f, 0.75f);
|
||||
phi_a1 = phi_s0;
|
||||
phi_s2 += 0xD;
|
||||
@@ -11969,7 +11952,7 @@ void func_800A5738(void *arg0) {
|
||||
phi_s0 = 0;
|
||||
do {
|
||||
sp50 = phi_v0;
|
||||
func_800921C0(arg0->unk4 - 0xB, phi_s1_2, 1);
|
||||
func_800921C0(arg0->unk4 - 0xB, phi_s1_2, TEXT_GREEN);
|
||||
func_80093358(D_800E8538, D_800E853A + phi_s0, phi_v0->unk4, 0, 0.75f, 0.75f);
|
||||
temp_s1_4 = phi_s1_2 + 1;
|
||||
phi_v0 += 4;
|
||||
@@ -12011,7 +11994,7 @@ block_36:
|
||||
phi_s0_4 = 0x96;
|
||||
phi_s2_2 = &D_8018EE10;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0x1E, phi_s1_3, 1);
|
||||
func_800921C0(arg0->unk4 - 0x1E, phi_s1_3, TEXT_GREEN);
|
||||
temp_a0_3 = phi_s1_3 + 1;
|
||||
sp54 = temp_a0_3;
|
||||
convert_number_to_ascii(temp_a0_3, &sp5C);
|
||||
@@ -12056,7 +12039,7 @@ block_36:
|
||||
phi_s0_7 = 0x9B;
|
||||
do {
|
||||
sp50 = phi_v0_6;
|
||||
func_800921C0(arg0->unk4 - 0x23, phi_s1_4, 1);
|
||||
func_800921C0(arg0->unk4 - 0x23, phi_s1_4, TEXT_GREEN);
|
||||
func_80093324(0x7D - arg0->unkC, phi_s0_7, *phi_v0_6, 0, 0.8f, 0.8f);
|
||||
temp_s1_5 = phi_s1_4 + 1;
|
||||
phi_v0_6 += 4;
|
||||
@@ -12141,7 +12124,7 @@ void func_800A6034(void *arg0) {
|
||||
temp_v1->unk0 = 0xFA000000;
|
||||
temp_v1->unk4 = arg0->unk1C & 0xFF;
|
||||
sp2C = *(&D_800E7500 + (D_800DC540 * 4));
|
||||
set_text_color(5, &gDisplayListHead);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
func_80093754(arg0->unkC + 0x41, arg0->unk10 + 0xA0, sp2C, 0, D_800F1F04, 1.0f);
|
||||
temp_v0 = gCurrentCourseId;
|
||||
sp2C = *(&D_800E7524 + (temp_v0 * 4));
|
||||
@@ -12200,7 +12183,7 @@ void func_800A6154(void *arg0) {
|
||||
phi_s0_2 = 0x96;
|
||||
phi_s2_2 = &D_800E775C;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0xB, phi_s1, 3);
|
||||
func_800921C0(arg0->unk4 - 0xB, phi_s1, TEXT_YELLOW);
|
||||
func_80093324(0x8C, phi_s0_2, phi_s2_2->unk4, 0, 1.0f, 1.0f);
|
||||
temp_s1 = phi_s1 + 1;
|
||||
phi_s1 = temp_s1;
|
||||
@@ -12256,7 +12239,7 @@ void func_800A638C(void *arg0) {
|
||||
|
||||
if (arg0->unk4 == 0) {
|
||||
gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, arg0->unk1C);
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
temp_v0 = gDisplayListHead;
|
||||
gDisplayListHead = temp_v0 + 8;
|
||||
temp_v0->unk0 = 0xFA000000;
|
||||
@@ -12264,7 +12247,7 @@ void func_800A638C(void *arg0) {
|
||||
func_80093754(0xA0, arg0->unk10 + 0x1E, *(&D_800E7778 + ((gModeSelection / 3) * 4)), 0, 1.0f, 1.0f);
|
||||
} else {
|
||||
gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, 0x64);
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
draw_text(0xA0, arg0->unk10 + 0x1E, *(&D_800E7778 + ((gModeSelection / 3) * 4)), 0, 1.0f, 1.0f);
|
||||
}
|
||||
temp_a0 = arg0->unk4;
|
||||
@@ -12301,7 +12284,7 @@ void func_800A638C(void *arg0) {
|
||||
temp_f20 = D_800F1F10;
|
||||
phi_s2 = &D_800E775C;
|
||||
do {
|
||||
func_800921C0(arg0->unk4 - 0xA, phi_s0, 1);
|
||||
func_800921C0(arg0->unk4 - 0xA, phi_s0, TEXT_GREEN);
|
||||
func_80093324(0x69, phi_s1, phi_s2->unk4, 0, temp_f20, temp_f20);
|
||||
temp_s0 = phi_s0 + 1;
|
||||
phi_s0 = temp_s0;
|
||||
@@ -12697,7 +12680,7 @@ void func_800A70E8(void *arg0) {
|
||||
gDisplayListHead = temp_v0 + 8;
|
||||
temp_v0->unk4 = phi_a1 & 0xFF;
|
||||
temp_v0->unk0 = 0xFA000000;
|
||||
set_text_color(2, phi_a1);
|
||||
set_text_color(TEXT_RED);
|
||||
phi_s0_2 = 0x2C;
|
||||
phi_s1 = &D_800E7A34;
|
||||
do {
|
||||
@@ -12856,7 +12839,7 @@ void func_800A761C(void *arg0) {
|
||||
sp34 = temp_v1;
|
||||
sp48 = temp_f8 / 2.0f;
|
||||
sp44 = ((get_string_width(*temp_v1) + 5) * temp_f20) / 2.0f;
|
||||
set_text_color(5);
|
||||
set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2);
|
||||
draw_text(arg0->unkC - sp44, arg0->unk10, D_800E7AA4, 0, temp_f20, temp_f20);
|
||||
set_text_color(gGlobalTimer % 3);
|
||||
draw_text(arg0->unkC + sp48, arg0->unk10, *sp34, 0, temp_f20, temp_f20);
|
||||
|
||||
Reference in New Issue
Block a user