diff --git a/asm/non_matchings/code_80091750/func_8009F5E0.s b/asm/non_matchings/code_80091750/func_8009F5E0.s index 3cf6765e0..7f02ab417 100644 --- a/asm/non_matchings/code_80091750/func_8009F5E0.s +++ b/asm/non_matchings/code_80091750/func_8009F5E0.s @@ -443,7 +443,7 @@ glabel L8009F904 /* 0A067C 8009FA7C 240500A0 */ li $a1, 160 /* 0A0680 8009FA80 00003825 */ move $a3, $zero /* 0A0684 8009FA84 E7A00010 */ swc1 $f0, 0x10($sp) -/* 0A0688 8009FA88 0C024CC9 */ jal func_80093324 +/* 0A0688 8009FA88 0C024CC9 */ jal print_text_mode_1 /* 0A068C 8009FA8C E7A00014 */ swc1 $f0, 0x14($sp) /* 0A0690 8009FA90 02202025 */ move $a0, $s1 /* 0A0694 8009FA94 0C029E51 */ jal get_time_record_seconds @@ -465,7 +465,7 @@ glabel L8009F904 /* 0A06D4 8009FAD4 240500A0 */ li $a1, 160 /* 0A06D8 8009FAD8 00003825 */ move $a3, $zero /* 0A06DC 8009FADC E7A00010 */ swc1 $f0, 0x10($sp) -/* 0A06E0 8009FAE0 0C024CC9 */ jal func_80093324 +/* 0A06E0 8009FAE0 0C024CC9 */ jal print_text_mode_1 /* 0A06E4 8009FAE4 E7A00014 */ swc1 $f0, 0x14($sp) /* 0A06E8 8009FAE8 02202025 */ move $a0, $s1 /* 0A06EC 8009FAEC 0C029E69 */ jal get_time_record_centiseconds @@ -1039,15 +1039,15 @@ glabel L800A02DC /* 0A0F18 800A0318 C4261AF8 */ lwc1 $f6, %lo(D_800F1AF8)($at) /* 0A0F1C 800A031C 8E24000C */ lw $a0, 0xc($s1) /* 0A0F20 800A0320 8E250010 */ lw $a1, 0x10($s1) -/* 0A0F24 800A0324 3C06800E */ lui $a2, %hi(D_800E7728 - 0x194) +/* 0A0F24 800A0324 3C06800E */ lui $a2, %hi(gBestTimeText - 0x194) /* 0A0F28 800A0328 000B6080 */ sll $t4, $t3, 2 /* 0A0F2C 800A032C 00CC3021 */ addu $a2, $a2, $t4 -/* 0A0F30 800A0330 8CC67594 */ lw $a2, %lo(D_800E7728 - 0x194)($a2) +/* 0A0F30 800A0330 8CC67594 */ lw $a2, %lo(gBestTimeText - 0x194)($a2) /* 0A0F34 800A0334 00003825 */ move $a3, $zero /* 0A0F38 800A0338 E7A00010 */ swc1 $f0, 0x10($sp) /* 0A0F3C 800A033C E7A60014 */ swc1 $f6, 0x14($sp) /* 0A0F40 800A0340 24840008 */ addiu $a0, $a0, 8 -/* 0A0F44 800A0344 0C024CC9 */ jal func_80093324 +/* 0A0F44 800A0344 0C024CC9 */ jal print_text_mode_1 /* 0A0F48 800A0348 24A50010 */ addiu $a1, $a1, 0x10 /* 0A0F4C 800A034C 0C02A1D3 */ jal func_800A874C /* 0A0F50 800A0350 02202025 */ move $a0, $s1 @@ -1236,7 +1236,7 @@ glabel L800A05C4 /* 0A11F4 800A05F4 8E27001C */ lw $a3, 0x1c($s1) /* 0A11F8 800A05F8 8CC67524 */ lw $a2, %lo(gCourseNames)($a2) /* 0A11FC 800A05FC E7B20014 */ swc1 $f18, 0x14($sp) -/* 0A1200 800A0600 0C024CC9 */ jal func_80093324 +/* 0A1200 800A0600 0C024CC9 */ jal print_text_mode_1 /* 0A1204 800A0604 E7B00010 */ swc1 $f16, 0x10($sp) /* 0A1208 800A0608 100000AF */ b .L800A08C8 /* 0A120C 800A060C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code_80091750/func_800A1FB0.s b/asm/non_matchings/code_80091750/func_800A1FB0.s index 270a7a766..893672e3c 100644 --- a/asm/non_matchings/code_80091750/func_800A1FB0.s +++ b/asm/non_matchings/code_80091750/func_800A1FB0.s @@ -110,7 +110,7 @@ glabel L800A2054 /* 0A2C90 800A2090 8E260000 */ lw $a2, ($s1) /* 0A2C94 800A2094 00003825 */ move $a3, $zero /* 0A2C98 800A2098 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A2C9C 800A209C 0C024CC9 */ jal func_80093324 +/* 0A2C9C 800A209C 0C024CC9 */ jal print_text_mode_1 /* 0A2CA0 800A20A0 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A2CA4 800A20A4 3C048019 */ lui $a0, %hi(D_8018EDEC) # $a0, 0x8019 /* 0A2CA8 800A20A8 8084EDEC */ lb $a0, %lo(D_8018EDEC)($a0) @@ -158,7 +158,7 @@ glabel L800A2118 /* 0A2D44 800A2144 8E260000 */ lw $a2, ($s1) /* 0A2D48 800A2148 00003825 */ move $a3, $zero /* 0A2D4C 800A214C E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A2D50 800A2150 0C024CC9 */ jal func_80093324 +/* 0A2D50 800A2150 0C024CC9 */ jal print_text_mode_1 /* 0A2D54 800A2154 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A2D58 800A2158 26310004 */ addiu $s1, $s1, 4 /* 0A2D5C 800A215C 0232082B */ sltu $at, $s1, $s2 @@ -180,7 +180,7 @@ glabel L800A2118 /* 0A2D98 800A2198 8E260000 */ lw $a2, ($s1) /* 0A2D9C 800A219C 00003825 */ move $a3, $zero /* 0A2DA0 800A21A0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A2DA4 800A21A4 0C024CC9 */ jal func_80093324 +/* 0A2DA4 800A21A4 0C024CC9 */ jal print_text_mode_1 /* 0A2DA8 800A21A8 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A2DAC 800A21AC 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019 /* 0A2DB0 800A21B0 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1) @@ -213,7 +213,7 @@ glabel L800A21E4 /* 0A2E10 800A2210 8E260000 */ lw $a2, ($s1) /* 0A2E14 800A2214 00003825 */ move $a3, $zero /* 0A2E18 800A2218 E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A2E1C 800A221C 0C024CC9 */ jal func_80093324 +/* 0A2E1C 800A221C 0C024CC9 */ jal print_text_mode_1 /* 0A2E20 800A2220 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A2E24 800A2224 26310004 */ addiu $s1, $s1, 4 /* 0A2E28 800A2228 1632FFF7 */ bne $s1, $s2, .L800A2208 @@ -243,7 +243,7 @@ glabel L800A223C /* 0A2E80 800A2280 8E260000 */ lw $a2, ($s1) /* 0A2E84 800A2284 00003825 */ move $a3, $zero /* 0A2E88 800A2288 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A2E8C 800A228C 0C024CC9 */ jal func_80093324 +/* 0A2E8C 800A228C 0C024CC9 */ jal print_text_mode_1 /* 0A2E90 800A2290 E7B40014 */ swc1 $f20, 0x14($sp) /* 0A2E94 800A2294 26100014 */ addiu $s0, $s0, 0x14 /* 0A2E98 800A2298 1612FFF7 */ bne $s0, $s2, .L800A2278 @@ -271,7 +271,7 @@ glabel L800A22AC /* 0A2EE8 800A22E8 8E260000 */ lw $a2, ($s1) /* 0A2EEC 800A22EC 00003825 */ move $a3, $zero /* 0A2EF0 800A22F0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A2EF4 800A22F4 0C024CC9 */ jal func_80093324 +/* 0A2EF4 800A22F4 0C024CC9 */ jal print_text_mode_1 /* 0A2EF8 800A22F8 E7B40014 */ swc1 $f20, 0x14($sp) /* 0A2EFC 800A22FC 26100014 */ addiu $s0, $s0, 0x14 /* 0A2F00 800A2300 1612FFF7 */ bne $s0, $s2, .L800A22E0 @@ -301,7 +301,7 @@ glabel L800A2314 /* 0A2F58 800A2358 8E260000 */ lw $a2, ($s1) /* 0A2F5C 800A235C 00003825 */ move $a3, $zero /* 0A2F60 800A2360 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A2F64 800A2364 0C024CC9 */ jal func_80093324 +/* 0A2F64 800A2364 0C024CC9 */ jal print_text_mode_1 /* 0A2F68 800A2368 E7B40014 */ swc1 $f20, 0x14($sp) /* 0A2F6C 800A236C 26100014 */ addiu $s0, $s0, 0x14 /* 0A2F70 800A2370 1612FFF7 */ bne $s0, $s2, .L800A2350 @@ -325,7 +325,7 @@ glabel L800A2384 /* 0A2FB0 800A23B0 8E260000 */ lw $a2, ($s1) /* 0A2FB4 800A23B4 00003825 */ move $a3, $zero /* 0A2FB8 800A23B8 E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A2FBC 800A23BC 0C024CC9 */ jal func_80093324 +/* 0A2FBC 800A23BC 0C024CC9 */ jal print_text_mode_1 /* 0A2FC0 800A23C0 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A2FC4 800A23C4 26310004 */ addiu $s1, $s1, 4 /* 0A2FC8 800A23C8 1632FFF7 */ bne $s1, $s2, .L800A23A8 @@ -456,7 +456,7 @@ glabel L800A23DC /* 0A318C 800A258C 27A600B9 */ addiu $a2, $sp, 0xb9 /* 0A3190 800A2590 00003825 */ move $a3, $zero /* 0A3194 800A2594 E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A3198 800A2598 0C024CC9 */ jal func_80093324 +/* 0A3198 800A2598 0C024CC9 */ jal print_text_mode_1 /* 0A319C 800A259C E7B60014 */ swc1 $f22, 0x14($sp) /* 0A31A0 800A25A0 2401002A */ li $at, 42 /* 0A31A4 800A25A4 16610006 */ bne $s3, $at, .L800A25C0 @@ -482,7 +482,7 @@ glabel L800A23DC /* 0A31EC 800A25EC 02402825 */ move $a1, $s2 /* 0A31F0 800A25F0 00003825 */ move $a3, $zero /* 0A31F4 800A25F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A31F8 800A25F8 0C024CC9 */ jal func_80093324 +/* 0A31F8 800A25F8 0C024CC9 */ jal print_text_mode_1 /* 0A31FC 800A25FC E7B40014 */ swc1 $f20, 0x14($sp) /* 0A3200 800A2600 10000019 */ b .L800A2668 /* 0A3204 800A2604 24010002 */ li $at, 2 @@ -510,7 +510,7 @@ glabel L800A23DC /* 0A3250 800A2650 00003825 */ move $a3, $zero /* 0A3254 800A2654 000D7080 */ sll $t6, $t5, 2 /* 0A3258 800A2658 00CE3021 */ addu $a2, $a2, $t6 -/* 0A325C 800A265C 0C024CC9 */ jal func_80093324 +/* 0A325C 800A265C 0C024CC9 */ jal print_text_mode_1 /* 0A3260 800A2660 8CC675C4 */ lw $a2, %lo(gCourseNamesDup2)($a2) /* 0A3264 800A2664 24010002 */ li $at, 2 .L800A2668: @@ -649,7 +649,7 @@ glabel L800A26A8 /* 0A3448 800A2848 27A600A9 */ addiu $a2, $sp, 0xa9 /* 0A344C 800A284C 00003825 */ move $a3, $zero /* 0A3450 800A2850 E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A3454 800A2854 0C024CC9 */ jal func_80093324 +/* 0A3454 800A2854 0C024CC9 */ jal print_text_mode_1 /* 0A3458 800A2858 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A345C 800A285C 2401002A */ li $at, 42 /* 0A3460 800A2860 16610006 */ bne $s3, $at, .L800A287C @@ -675,7 +675,7 @@ glabel L800A26A8 /* 0A34A8 800A28A8 02402825 */ move $a1, $s2 /* 0A34AC 800A28AC 00003825 */ move $a3, $zero /* 0A34B0 800A28B0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A34B4 800A28B4 0C024CC9 */ jal func_80093324 +/* 0A34B4 800A28B4 0C024CC9 */ jal print_text_mode_1 /* 0A34B8 800A28B8 E7B40014 */ swc1 $f20, 0x14($sp) /* 0A34BC 800A28BC 10000019 */ b .L800A2924 /* 0A34C0 800A28C0 24010002 */ li $at, 2 @@ -703,7 +703,7 @@ glabel L800A26A8 /* 0A350C 800A290C 00003825 */ move $a3, $zero /* 0A3510 800A2910 00085080 */ sll $t2, $t0, 2 /* 0A3514 800A2914 00CA3021 */ addu $a2, $a2, $t2 -/* 0A3518 800A2918 0C024CC9 */ jal func_80093324 +/* 0A3518 800A2918 0C024CC9 */ jal print_text_mode_1 /* 0A351C 800A291C 8CC675C4 */ lw $a2, %lo(gCourseNamesDup2)($a2) /* 0A3520 800A2920 24010002 */ li $at, 2 .L800A2924: @@ -742,7 +742,7 @@ glabel L800A26A8 /* 0A359C 800A299C 8E660000 */ lw $a2, ($s3) /* 0A35A0 800A29A0 00003825 */ move $a3, $zero /* 0A35A4 800A29A4 E7B80010 */ swc1 $f24, 0x10($sp) -/* 0A35A8 800A29A8 0C024CC9 */ jal func_80093324 +/* 0A35A8 800A29A8 0C024CC9 */ jal print_text_mode_1 /* 0A35AC 800A29AC E7B80014 */ swc1 $f24, 0x14($sp) /* 0A35B0 800A29B0 26520001 */ addiu $s2, $s2, 1 /* 0A35B4 800A29B4 24010002 */ li $at, 2 @@ -867,7 +867,7 @@ glabel L800A29D0 /* 0A3764 800A2B64 27A60099 */ addiu $a2, $sp, 0x99 /* 0A3768 800A2B68 00003825 */ move $a3, $zero /* 0A376C 800A2B6C E7B60010 */ swc1 $f22, 0x10($sp) -/* 0A3770 800A2B70 0C024CC9 */ jal func_80093324 +/* 0A3770 800A2B70 0C024CC9 */ jal print_text_mode_1 /* 0A3774 800A2B74 E7B60014 */ swc1 $f22, 0x14($sp) /* 0A3778 800A2B78 2401002A */ li $at, 42 /* 0A377C 800A2B7C 16610006 */ bne $s3, $at, .L800A2B98 @@ -893,7 +893,7 @@ glabel L800A29D0 /* 0A37C4 800A2BC4 02402825 */ move $a1, $s2 /* 0A37C8 800A2BC8 00003825 */ move $a3, $zero /* 0A37CC 800A2BCC E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A37D0 800A2BD0 0C024CC9 */ jal func_80093324 +/* 0A37D0 800A2BD0 0C024CC9 */ jal print_text_mode_1 /* 0A37D4 800A2BD4 E7B40014 */ swc1 $f20, 0x14($sp) /* 0A37D8 800A2BD8 10000019 */ b .L800A2C40 /* 0A37DC 800A2BDC 24010002 */ li $at, 2 @@ -921,7 +921,7 @@ glabel L800A29D0 /* 0A3828 800A2C28 00003825 */ move $a3, $zero /* 0A382C 800A2C2C 00194080 */ sll $t0, $t9, 2 /* 0A3830 800A2C30 00C83021 */ addu $a2, $a2, $t0 -/* 0A3834 800A2C34 0C024CC9 */ jal func_80093324 +/* 0A3834 800A2C34 0C024CC9 */ jal print_text_mode_1 /* 0A3838 800A2C38 8CC675C4 */ lw $a2, %lo(gCourseNamesDup2)($a2) /* 0A383C 800A2C3C 24010002 */ li $at, 2 .L800A2C40: diff --git a/asm/non_matchings/code_80091750/func_800A474C.s b/asm/non_matchings/code_80091750/func_800A474C.s index d01240183..dad729a13 100644 --- a/asm/non_matchings/code_80091750/func_800A474C.s +++ b/asm/non_matchings/code_80091750/func_800A474C.s @@ -152,7 +152,7 @@ glabel func_800A474C /* 0A552C 800A492C 00003825 */ move $a3, $zero /* 0A5530 800A4930 E7B40010 */ swc1 $f20, 0x10($sp) /* 0A5534 800A4934 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A5538 800A4938 0C024CC9 */ jal func_80093324 +/* 0A5538 800A4938 0C024CC9 */ jal print_text_mode_1 /* 0A553C 800A493C 24840032 */ addiu $a0, $a0, 0x32 /* 0A5540 800A4940 8FA4002C */ lw $a0, 0x2c($sp) /* 0A5544 800A4944 0C029E51 */ jal get_time_record_seconds @@ -172,7 +172,7 @@ glabel func_800A474C /* 0A557C 800A497C 00003825 */ move $a3, $zero /* 0A5580 800A4980 E7B40010 */ swc1 $f20, 0x10($sp) /* 0A5584 800A4984 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A5588 800A4988 0C024CC9 */ jal func_80093324 +/* 0A5588 800A4988 0C024CC9 */ jal print_text_mode_1 /* 0A558C 800A498C 24840046 */ addiu $a0, $a0, 0x46 /* 0A5590 800A4990 8FA4002C */ lw $a0, 0x2c($sp) /* 0A5594 800A4994 0C029E69 */ jal get_time_record_centiseconds diff --git a/include/defines.h b/include/defines.h index 729a53df3..aea440a7d 100644 --- a/include/defines.h +++ b/include/defines.h @@ -269,12 +269,14 @@ enum { COURSE_ONE, COURSE_TWO, COURSE_THREE, COURSE_FOUR }; * 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 +enum COLOR_ID { + TEXT_BLUE, + TEXT_GREEN, + TEXT_RED, + TEXT_YELLOW, + TEXT_BLUE_GREEN_RED_CYCLE_1, + TEXT_BLUE_GREEN_RED_CYCLE_2, +} /** * @brief Sound mode options @@ -336,12 +338,7 @@ enum KART_AI_BEHAVIOURS { BEHAVIOUR_MAX_SPEED }; -enum DIRECTION { - NORTH, - EAST, - SOUTH, - WEST -}; +enum DIRECTION { NORTH, EAST, SOUTH, WEST }; /** * @brief Balloon status diff --git a/src/code_80091750.c b/src/code_80091750.c index 7b5176eff..035308b68 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -351,7 +351,7 @@ s8 gCupSelectionByCourseId[] = { #include "assets/course_metadata/gCupSelectionByCourseId.inc.c" }; -char* D_800E7678[] = { +char* gCupText[] = { "none", "bronze", "silver", @@ -394,20 +394,20 @@ char* gDebugSoundModeNames[] = { char* gSoundModeNames[NUM_SOUND_MODES] = { "STEREO", "HEADPHONE", "", "MONO" }; -char* D_800E7720[] = { +char* gWinLoseText[] = { "WINNER!", "LOSER!", }; -char* D_800E7728[] = { +char* gBestTimeText[] = { "BEST RECORDS", "BEST LAP", }; // Might need a const? -char* D_800E7730 = "LAP TIME"; +char* gLapTimeText = "LAP TIME"; -char* D_800E7734[] = { +char* gPrefixTimeText[] = { "LAP 1", "LAP 2", "LAP 3", @@ -420,10 +420,20 @@ char* D_800E7744[] = { "1 ｓ", "2 ｎ", "3 ｒ", "4 ｔ", "5 ｔ", " ", }; -char* gTextPauseButton[] = { +char* gMenuText[] = { "CONTINUE GAME", "RETRY", "COURSE CHANGE", "DRIVER CHANGE", "QUIT", "REPLAY", "SAVE GHOST", }; +enum TEXT_MENU_ID { + CONTINUE_GAME, + RETRY, + COURSE_CHANGE, + DRIVER_CHANGE, + QUIT, + REPLAY, + SAVE_GHOST, +}; + char* D_800E7778[] = { "VS MATCH RANKING", "BATTLE RANKING", @@ -461,8 +471,8 @@ char* D_800E7840[] = { "erase", }; -// Why oh why is this array flat? It should be D_800E7848[][3] -char* D_800E7848[] = { +// Why oh why is this array flat? It should be gEraseBestGhostText[][3] +char* gEraseBestGhostText[] = { "THE BEST RECORDS AND BEST", "LAP FOR THIS COURSE WILL BE", "ERASED. IS THIS OK?", "GHOST DATA FOR THIS", "COURSE WILL BE ERASED.", "IS THIS OK?", @@ -701,7 +711,7 @@ char* D_800E7A9C[] = { "WHAT A PITY!", }; -char* D_800E7AA4[] = { +char* gPlaceText[] = { "YOU PLACED", " st", " nd", " rd", " th", " th", " th", " th", " th", }; @@ -1431,8 +1441,8 @@ void func_800925A0(void) { void func_800925CC(void) { struct_8018D9E0_entry* temp = find_8018D9E0_entry_dupe(0xAF); - if (temp->cursor == 2) { - temp->cursor = 3; + if (temp->state == 2) { + temp->state = 3; } } @@ -1802,7 +1812,7 @@ void set_text_color(s32 arg0) { UNUSED void func_800930E4(s32 arg0, s32 arg1, char* arg2) { set_text_color(TEXT_BLUE); - func_80093324(arg0, arg1, arg2, 0, 1.0, 1.0); + print_text_mode_1(arg0, arg1, arg2, 0, 1.0, 1.0); } // "tracking" is a uniform spacing between all characters in a given word @@ -1837,11 +1847,11 @@ void print_text0(s32 column, s32 row, char* text, s32 tracking, f32 scaleX, f32 gSPDisplayList(gDisplayListHead++, D_020077D8); } -void func_80093324(s32 column, s32 row, char* text, s32 tracking, f32 scaleX, f32 scaleY) { +void print_text_mode_1(s32 column, s32 row, char* text, s32 tracking, f32 scaleX, f32 scaleY) { print_text0(column, row, text, tracking, scaleX, scaleY, 1); } -void func_80093358(s32 column, s32 row, char* text, s32 tracking, f32 scaleX, f32 scaleY) { +void print_text_mode_2(s32 column, s32 row, char* text, s32 tracking, f32 scaleX, f32 scaleY) { print_text0(column, row, text, tracking, scaleX, scaleY, 2); } @@ -4665,8 +4675,8 @@ void func_8009CE64(s32 arg0) { var_a1 = 0; temp_v0 = find_8018D9E0_entry(0x000000B0); if (temp_v0 != NULL) { - switch (temp_v0->cursor) { /* switch 8; irregular */ - case 10: /* switch 8 */ + switch (temp_v0->state) { /* switch 8; irregular */ + case 10: /* switch 8 */ func_802903B0(); break; case 11: /* switch 8 */ @@ -4684,8 +4694,8 @@ void func_8009CE64(s32 arg0) { var_a1 = 0; temp_v0 = find_8018D9E0_entry(0x000000AC); if (temp_v0 != NULL) { - switch (temp_v0->cursor) { /* switch 7; irregular */ - case 11: /* switch 7 */ + switch (temp_v0->state) { /* switch 7; irregular */ + case 11: /* switch 7 */ func_802903B0(); D_8016556E = 1; break; @@ -4698,8 +4708,8 @@ void func_8009CE64(s32 arg0) { var_a1 = 0; temp_v0 = find_8018D9E0_entry(0x000000C7); if (temp_v0 != NULL) { - switch (temp_v0->cursor) { /* switch 1 */ - case 12: /* switch 1 */ + switch (temp_v0->state) { /* switch 1 */ + case 12: /* switch 1 */ func_802903B0(); var_a1 = 1; break; @@ -4732,8 +4742,8 @@ void func_8009CE64(s32 arg0) { } temp_v0 = find_8018D9E0_entry(0x000000BD); if (temp_v0 != NULL) { - switch (temp_v0->cursor) { /* switch 2 */ - case 11: /* switch 2 */ + switch (temp_v0->state) { /* switch 2 */ + case 11: /* switch 2 */ D_8015F892 = 1; D_8015F890 = 0; func_802903B0(); @@ -5353,7 +5363,7 @@ void add_8018D9E0_entry(s32 type, s32 column, s32 row, s8 priority) { var_ra++; } var_ra->type = type; - var_ra->cursor = 0; + var_ra->state = 0; var_ra->unk8 = 0; var_ra->column = column; var_ra->row = row; @@ -5662,7 +5672,7 @@ void add_8018D9E0_entry(s32 type, s32 column, s32 row, s8 priority) { } break; case 0xF0: - var_ra->cursor = (s32) gSoundMode; + var_ra->state = (s32) gSoundMode; break; case 0xF1: func_800996BC(segmented_to_virtual_dupe(D_02004638), 0); @@ -5842,7 +5852,7 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { var_t0 = (s32) ((f32) (get_string_width(gCourseNamesDup[0]) + 5) * 0.9f) / 2; gDisplayListHead = draw_box(gDisplayListHead, 0xA0 - var_t0, 0x0000007B, var_t0 + 0xA0, 0x000000A4, 0, 0, 0, 0x00000096); - set_text_color(1); + set_text_color(TEXT_GREEN); draw_text(0x0000009B, 0x0000008C, gCourseNamesDup[0], 0, 0.9f, 0.9f); temp_v1 = func_800B4EB4(0, 7) & 0xFFFFF; if (temp_v1 < 0x1EAA) { @@ -5850,14 +5860,14 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { } else if (temp_v1 < 0x2329) { set_text_color((s32) gGlobalTimer % 3); } else { - set_text_color(3); + set_text_color(TEXT_YELLOW); } get_time_record_minutes(temp_v1, sp80); func_800939C8(0x00000077, 0x000000A0, sp80, 0, 1.0f, 1.0f); - func_80093324(0x0000008B, 0x000000A0, "'", 0, 1.0f, 1.0f); + print_text_mode_1(0x0000008B, 0x000000A0, "'", 0, 1.0f, 1.0f); get_time_record_seconds(temp_v1, sp80); func_800939C8(0x00000094, 0x000000A0, sp80, 0, 1.0f, 1.0f); - func_80093324(0x000000A7, 0x000000A0, "\"", 0, 1.0f, 1.0f); + print_text_mode_1(0x000000A7, 0x000000A0, "\"", 0, 1.0f, 1.0f); get_time_record_centiseconds(temp_v1, sp80); func_800939C8(0x000000B4, 0x000000A0, sp80, 0, 1.0f, 1.0f); break; @@ -5871,7 +5881,7 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { temp_t5 = (s32) (((why * 2) + 0.5) * 16.0) / 2; gDisplayListHead = draw_box(gDisplayListHead, 0xA0 - temp_t2, 0xB6 - temp_t5, temp_t2 + 0xA0, temp_t5 + 0xB6, 0, 0, 0, 0x00000096); - set_text_color(4); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); for (temp_t9 = 0; temp_t9 < 2; temp_t9++) { draw_text(0xA0 * one - floatone * why, (s32) (0xB4 * one + ((f32) (temp_t9 * 0x12) * why)), D_800E77A0[temp_t9], 0, why, why); @@ -6061,8 +6071,8 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { var_f0 = 0.8f; } func_800A86E8(arg0); - set_text_color(3); - func_80093324(arg0->column + 8, arg0->row + 0x10, D_800E7728[arg0->type - 0x65], 0, var_f0, 0.8f); + set_text_color(TEXT_YELLOW); + print_text_mode_1(arg0->column + 8, arg0->row + 0x10, gBestTimeText[arg0->type - 0x65], 0, var_f0, 0.8f); func_800A874C(arg0); break; case 0x6E: /* switch 6 */ @@ -6103,7 +6113,7 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { arg0->row + 0x11, 1, 1, 1, 0x000000FF); } gDisplayListHead = func_8009BA74(gDisplayListHead, D_02004A34, arg0->column, arg0->row); - set_text_color(3); + set_text_color(TEXT_YELLOW); func_800936B8(0x00000125, 0x0000001C, D_800E77B4, 0, 0.55f, 0.55f); break; case 0x8D: /* switch 6 */ @@ -6128,12 +6138,12 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { func_800A15EC(arg0); break; case 0x96: /* switch 6 */ - set_text_color(4); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); func_800936B8(arg0->column, arg0->row, gCupNames[D_800DC540], arg0->unk1C, arg0->unk24, 1.0f); break; case 0x97: /* switch 6 */ - set_text_color(5); - func_80093324(arg0->column, arg0->row, gCourseNames[gCurrentCourseId], arg0->unk1C, arg0->unk24, 1.0f); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); + print_text_mode_1(arg0->column, arg0->row, gCourseNames[gCurrentCourseId], arg0->unk1C, arg0->unk24, 1.0f); break; case 0x98: /* switch 6 */ func_800A2D1C(arg0); @@ -6160,7 +6170,7 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { case 0xB2: /* switch 6 */ case 0xB3: /* switch 6 */ case 0xB4: /* switch 6 */ - if (arg0->cursor != 0) { + if (arg0->state != 0) { var_v1 = arg0->type - 0xB1; gDisplayListHead = func_8009BA74(gDisplayListHead, @@ -6225,7 +6235,7 @@ void func_8009F5E0(struct_8018D9E0_entry* arg0) { func_800A761C(arg0); break; case 0x130: /* switch 6 */ - if (arg0->cursor != 0) { + if (arg0->state != 0) { gDisplayListHead = func_8009BA74( gDisplayListHead, segmented_to_virtual_dupe(D_800E7D54[D_800EFD64[D_802874D8.unk1E]]), arg0->column, arg0->row); @@ -6451,7 +6461,7 @@ void func_800A0EB8(UNUSED struct_8018D9E0_entry* arg0, s32 arg1) { } void func_800A0FA4(struct_8018D9E0_entry* arg0, s32 arg1) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: case 2: case 3: @@ -6474,18 +6484,18 @@ void func_800A10CC(struct_8018D9E0_entry* arg0) { s32 var_s1; s32 index; - switch (arg0->cursor) { + switch (arg0->state) { case 2: case 3: case 4: case 5: gDisplayListHead = draw_box_fill(gDisplayListHead, 0x0000001E, 0x00000032, 0x00000122, 0x0000006E, 0, 0, 0, 0x000000FF); - index = arg0->cursor - 2; - set_text_color(3); + index = arg0->state - 2; + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 4; var_s1++) { // In a perfect world this would be `D_800E7940[index][var_s1]` - func_80093324(0x00000023, 0x41 + (0xD * var_s1), D_800E7940[(index * 4) + var_s1], 0, 0.65f, 0.65f); + print_text_mode_1(0x00000023, 0x41 + (0xD * var_s1), D_800E7940[(index * 4) + var_s1], 0, 0.65f, 0.65f); } break; default: @@ -6504,7 +6514,7 @@ void func_800A11D0(struct_8018D9E0_entry* arg0, s32 arg1, s32 arg2) { } void func_800A12BC(struct_8018D9E0_entry* arg0, MkTexture* arg1) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: case 2: case 4: @@ -6520,7 +6530,7 @@ void func_800A12BC(struct_8018D9E0_entry* arg0, MkTexture* arg1) { void func_800A1350(struct_8018D9E0_entry* arg0) { s32 thing; if (func_800AAFCC(arg0->type - 0x2B) < 0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: case 2: case 4: @@ -6538,7 +6548,7 @@ void func_800A1350(struct_8018D9E0_entry* arg0) { } void func_800A143C(struct_8018D9E0_entry* arg0, s32 arg1) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: case 2: case 3: @@ -6560,7 +6570,7 @@ void func_800A1500(struct_8018D9E0_entry* arg0) { var_a1 = 0; temp_v0 = find_8018D9E0_entry_dupe(0x00000064); - switch (temp_v0->cursor) { /* irregular */ + switch (temp_v0->state) { /* irregular */ case 0: case 1: break; @@ -6643,10 +6653,10 @@ void func_800A1A20(struct_8018D9E0_entry* arg0) { set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); draw_text(0x69, arg0->row + 0x19, gCourseNamesDup[courseId], 0, 0.75f, 0.75f); set_text_color(TEXT_RED); - func_80093324(0x2D, arg0->row + 0x28, (char*) &D_800E77D8, 0, 0.75f, 0.75f); + print_text_mode_1(0x2D, arg0->row + 0x28, (char*) &D_800E77D8, 0, 0.75f, 0.75f); func_800936B8(0xA5, arg0->row + 0x28, sCourseLengths[courseId], 1, 0.75f, 0.75f); set_text_color(TEXT_YELLOW); - func_80093324(0xA0, arg0->row + 0x86, D_800E7728[0], 0, 0.75f, 0.75f); + print_text_mode_1(0xA0, arg0->row + 0x86, gBestTimeText[0], 0, 0.75f, 0.75f); // Print the 3 Lap Time Trial records for (recordType = TIME_TRIAL_3LAP_RECORD_1, rowOffset = 0; recordType < TIME_TRIAL_1LAP_RECORD; recordType++, rowOffset += 0xD) { @@ -6654,7 +6664,7 @@ void func_800A1A20(struct_8018D9E0_entry* arg0) { func_800A474C(recordType, 0x96, arg0->row + rowOffset + 0x92); } set_text_color(TEXT_YELLOW); - func_80093324(0xA0, arg0->row + 0xD5, D_800E7728[1], 0, 0.75f, 0.75f); + print_text_mode_1(0xA0, arg0->row + 0xD5, gBestTimeText[1], 0, 0.75f, 0.75f); func_800A474C(TIME_TRIAL_1LAP_RECORD, 0x96, arg0->row + 0xE1); } @@ -6693,12 +6703,12 @@ void func_800A1BE0(struct_8018D9E0_entry* arg0) { } } if (var_s1 != 0) { - set_text_color(0); + set_text_color(TEXT_BLUE); gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, 0x96); - func_80093358(0x00000025, 0x3F + (0xD * var_s0), D_800E7834[var_s0], 0, 0.6f, 0.6f); + print_text_mode_2(0x00000025, 0x3F + (0xD * var_s0), D_800E7834[var_s0], 0, 0.6f, 0.6f); } else { set_text_color(var_s2); - func_80093324(0x00000025, 0x3F + (0xD * var_s0), D_800E7834[var_s0], 0, 0.6f, 0.6f); + print_text_mode_1(0x00000025, 0x3F + (0xD * var_s0), D_800E7834[var_s0], 0, 0.6f, 0.6f); } } sp78.column = 0x001F; @@ -6717,13 +6727,13 @@ void func_800A1DE0(struct_8018D9E0_entry* arg0) { s32 var_s1; UNUSED char* wut; - set_text_color(1); + set_text_color(TEXT_GREEN); for (var_s1 = 0; var_s1 < 3; var_s1++) { // Removing `wut` introduces counter intuitive changes to how this loop is handled - // Also, in a perfect world this would be `D_800E7848[gCourseRecordsMenuSelection - 1][var_s1]` - wut = D_800E7848[(gCourseRecordsMenuSelection - 1) * 3 + var_s1]; - func_80093324(0x0000001B, 0x3C + (0xD * var_s1), D_800E7848[(gCourseRecordsMenuSelection - 1) * 3 + var_s1], 0, - 0.65f, 0.65f); + // Also, in a perfect world this would be `gEraseBestGhostText[gCourseRecordsMenuSelection - 1][var_s1]` + wut = gEraseBestGhostText[(gCourseRecordsMenuSelection - 1) * 3 + var_s1]; + print_text_mode_1(0x0000001B, 0x3C + (0xD * var_s1), + gEraseBestGhostText[(gCourseRecordsMenuSelection - 1) * 3 + var_s1], 0, 0.65f, 0.65f); } for (var_s1 = 0; var_s1 < 2; var_s1++) { @@ -6734,7 +6744,7 @@ void func_800A1DE0(struct_8018D9E0_entry* arg0) { var_a0 = 1; } set_text_color(var_a0); - func_80093324(0x00000043, 0x6E + (0xD * var_s1), D_800E7840[var_s1], 0, 0.65f, 0.65f); + print_text_mode_1(0x00000043, 0x6E + (0xD * var_s1), D_800E7840[var_s1], 0, 0.65f, 0.65f); } sp58.column = 0x003B; @@ -6748,7 +6758,7 @@ void func_800A1F30(UNUSED struct_8018D9E0_entry* unused) { set_text_color(TEXT_RED); for (row = 0x49, text = 0; row < 0x69; row += 0x10, text++) { - func_80093324(0x2A, row, D_800E7860[text], 0, 0.75f, 0.75f); + print_text_mode_1(0x2A, row, D_800E7860[text], 0, 0.75f, 0.75f); } } @@ -6784,24 +6794,24 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { case 0x18: /* switch 1 */ for (stackPadding0 = 0; stackPadding0 < 4; stackPadding0++) { set_text_color_rainbow_if_selected(D_8018EDEC - 0x15, stackPadding0, 3); - func_80093324(0x00000032, 0x55 + (0x23 * stackPadding0), D_800E7868[stackPadding0], 0, 0.9f, 1.0f); + print_text_mode_1(0x00000032, 0x55 + (0x23 * stackPadding0), D_800E7868[stackPadding0], 0, 0.9f, 1.0f); if (stackPadding0 == (D_8018EDEC - 0x15)) { spE0.column = 0x0032; spE0.row = 0x55 + (0x23 * stackPadding0); } } - set_text_color(1); + set_text_color(TEXT_GREEN); draw_text(0x000000E6, 0x00000078, gSoundModeNames[gSoundMode], 0, 1.0f, 1.0f); break; case 0x1E: /* switch 1 */ case 0x1F: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (stackPadding0 = 0; stackPadding0 < 3; stackPadding0++) { - func_80093324(0x00000028, 0x55 + (0x14 * stackPadding0), D_800E7878[stackPadding0], 0, 1.0f, 1.0f); + print_text_mode_1(0x00000028, 0x55 + (0x14 * stackPadding0), D_800E7878[stackPadding0], 0, 1.0f, 1.0f); } for (stackPadding0 = 0; stackPadding0 < 2; stackPadding0++) { set_text_color_rainbow_if_selected(D_8018EDEC - 0x1E, stackPadding0, 1); - func_80093324(0x00000084, 0x96 + (0x19 * stackPadding0), D_800E7840[stackPadding0], 0, 1.0f, 1.0f); + print_text_mode_1(0x00000084, 0x96 + (0x19 * stackPadding0), D_800E7840[stackPadding0], 0, 1.0f, 1.0f); if (stackPadding0 == (D_8018EDEC - 0x1E)) { spE0.column = 0x0084; spE0.row = 0x96 + (0x19 * stackPadding0); @@ -6809,19 +6819,19 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { } break; case 0x20: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (stackPadding0 = 0; stackPadding0 < 3; stackPadding0++) { - func_80093324(0x00000032, 0x55 + (0x14 * stackPadding0), D_800E7884[stackPadding0], 0, 1.0f, 1.0f); + print_text_mode_1(0x00000032, 0x55 + (0x14 * stackPadding0), D_800E7884[stackPadding0], 0, 1.0f, 1.0f); } break; case 0x2A: /* switch 1 */ case 0x2B: /* switch 1 */ case 0x2C: /* switch 1 */ case 0x2D: /* switch 1 */ - set_text_color(2); + set_text_color(TEXT_RED); var_s1 = D_8018EDEC - 0x2A; for (stackPadding0 = 0; stackPadding0 < 3; stackPadding0++) { - func_80093324(0x00000032, 0x55 + (0x14 * stackPadding0), D_800E78D0[(var_s1 * 3) + stackPadding0], 0, + print_text_mode_1(0x00000032, 0x55 + (0x14 * stackPadding0), D_800E78D0[(var_s1 * 3) + stackPadding0], 0, 0.9f, 0.9f); } break; @@ -6829,27 +6839,27 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { case 0x35: /* switch 1 */ case 0x36: /* switch 1 */ case 0x37: /* switch 1 */ - set_text_color(2); + set_text_color(TEXT_RED); var_s1 = D_8018EDEC - 0x34; for (stackPadding0 = 0; stackPadding0 < 4; stackPadding0++) { - func_80093324(0x00000023, 0x55 + (0x14 * stackPadding0), D_800E7890[(var_s1 * 4) + stackPadding0], 0, + print_text_mode_1(0x00000023, 0x55 + (0x14 * stackPadding0), D_800E7890[(var_s1 * 4) + stackPadding0], 0, 0.8f, 0.8f); } break; case 0x41: /* switch 1 */ case 0x42: /* switch 1 */ - set_text_color(2); + set_text_color(TEXT_RED); var_s1 = D_8018EDEC - 0x41; for (stackPadding0 = 0; stackPadding0 < 3; stackPadding0++) { - func_80093324(0x00000041, 0x55 + (0x14 * stackPadding0), D_800E7900[(var_s1 * 3) + stackPadding0], 0, + print_text_mode_1(0x00000041, 0x55 + (0x14 * stackPadding0), D_800E7900[(var_s1 * 3) + stackPadding0], 0, 0.9f, 0.9f); } break; case 0x46: /* switch 1 */ case 0x47: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (stackPadding0 = 0; stackPadding0 < 3; stackPadding0++) { - func_80093324(0x00000050, 0x55 + (0x14 * stackPadding0), D_800E7A48[stackPadding0], 0, 1.0f, 1.0f); + print_text_mode_1(0x00000050, 0x55 + (0x14 * stackPadding0), D_800E7A48[stackPadding0], 0, 1.0f, 1.0f); } break; case 0x28: /* switch 1 */ @@ -6874,7 +6884,7 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { set_text_color(var_s4 + 1); draw_text(0x000000A0, 0x00000055, D_800E7920[var_s4], 0, 0.6f, 0.6f); for (var_s1 = 0; var_s1 < 2; var_s1++) { - set_text_color(3); + set_text_color(TEXT_YELLOW); draw_text(0x5C + (0x82 * var_s1), 0x0000007D, D_800E7918[var_s1], 0, 0.75f, 0.75f); for (var_s2 = 0; var_s2 < 2; var_s2++) { if (var_s1 != var_s4) { @@ -6886,19 +6896,19 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { } else if ((var_s4 != 0) && (var_s2 == arg0->unk20)) { set_text_color((s32) gGlobalTimer % 3); } else { - set_text_color(1); + set_text_color(TEXT_GREEN); } convert_number_to_ascii(var_s2 + 1, &spB8[0]); - func_80093324(0x20 + (0x89 * var_s1), 0x96 + (0x1E * var_s2), &spB8[1], 0, 0.6f, 0.6f); + print_text_mode_1(0x20 + (0x89 * var_s1), 0x96 + (0x1E * var_s2), &spB8[1], 0, 0.6f, 0.6f); if (var_s1 == 0) { var_v1 = &D_8018EE10[var_s2]; } else { var_v1 = &((struct_8018EE10_entry*) D_8018D9C0)[var_s2]; } if (var_v1->ghostDataSaved == 0) { - func_80093324(0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), D_800E7A44, 0, 0.5f, 0.5f); + print_text_mode_1(0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), D_800E7A44, 0, 0.5f, 0.5f); } else { - func_80093324( + print_text_mode_1( 0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), gCourseNamesDup2[gCupCourseOrder[var_v1->courseIndex / 4][var_v1->courseIndex % 4]], 0, 0.5f, 0.5f); @@ -6908,36 +6918,36 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { break; case 0x38: /* switch 1 */ case 0x39: /* switch 1 */ - set_text_color(2); + set_text_color(TEXT_RED); for (var_s1 = 0; var_s1 < 2; var_s1++) { draw_text(0x000000A0, 0x4D + (0x14 * var_s1), D_800E7928[var_s1], 0, 0.8f, 0.8f); } for (var_s1 = 0; var_s1 < 2; var_s1++) { - set_text_color(3); + set_text_color(TEXT_YELLOW); draw_text(0x5C + (0x82 * var_s1), 0x0000007D, D_800E7918[var_s1], 0, 0.75f, 0.75f); for (var_s2 = 0; var_s2 != 2; var_s2++) { if (var_s1 == 0) { if (var_s2 == arg0->unk1C) { set_text_color((s32) gGlobalTimer % 3); } else { - set_text_color(1); + set_text_color(TEXT_GREEN); } } else if (var_s2 == arg0->unk20) { set_text_color((s32) gGlobalTimer % 3); } else { - set_text_color(1); + set_text_color(TEXT_GREEN); } convert_number_to_ascii(var_s2 + 1, &spA8[0]); - func_80093324(0x20 + (0x89 * var_s1), 0x96 + (0x1E * var_s2), &spA8[1], 0, 0.6f, 0.6f); + print_text_mode_1(0x20 + (0x89 * var_s1), 0x96 + (0x1E * var_s2), &spA8[1], 0, 0.6f, 0.6f); if (var_s1 == 0) { var_v1 = &D_8018EE10[var_s2]; } else { var_v1 = &((struct_8018EE10_entry*) D_8018D9C0)[var_s2]; } if (var_v1->ghostDataSaved == 0) { - func_80093324(0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), D_800E7A44, 0, 0.5f, 0.5f); + print_text_mode_1(0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), D_800E7A44, 0, 0.5f, 0.5f); } else { - func_80093324( + print_text_mode_1( 0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), gCourseNamesDup2[gCupCourseOrder[var_v1->courseIndex / 4][var_v1->courseIndex % 4]], 0, 0.5f, 0.5f); @@ -6951,45 +6961,45 @@ void func_800A1FB0(struct_8018D9E0_entry* arg0) { spE0.row = 0x00D2; } text_rainbow_effect((D_8018EDEC - 0x38), var_s2, TEXT_YELLOW); - func_80093324(0x6E + (0x32 * var_s2), 0x000000D2, D_800E7930[var_s2], 0, 0.75f, 0.75f); + print_text_mode_1(0x6E + (0x32 * var_s2), 0x000000D2, D_800E7930[var_s2], 0, 0.75f, 0.75f); } break; case 0x3A: /* switch 1 */ case 0x3B: /* switch 1 */ case 0x3C: /* switch 1 */ var_s5 = (D_8018EDEC - 0x3A) / 2; - set_text_color(2); + set_text_color(TEXT_RED); draw_text(0x000000A0, 0x00000055, D_800E7938[var_s5], 0, 1.0f, 1.0f); for (var_s1 = 0; var_s1 < 2; var_s1++) { - set_text_color(3); + set_text_color(TEXT_YELLOW); draw_text(0x5C + (0x82 * var_s1), 0x0000007D, D_800E7918[var_s1], 0, 0.75f, 0.75f); for (var_s2 = 0; var_s2 < 2; var_s2++) { if (var_s1 == 0) { if (var_s2 == arg0->unk1C) { if (var_s5 == 0) { - 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 (var_s2 == arg0->unk20) { - set_text_color(2); + set_text_color(TEXT_RED); } else { - set_text_color(1); + set_text_color(TEXT_GREEN); } convert_number_to_ascii(var_s2 + 1, &sp98[0]); - func_80093324(0x20 + (0x89 * var_s1), 0x96 + (0x1E * var_s2), &sp98[1], 0, 0.6f, 0.6f); + print_text_mode_1(0x20 + (0x89 * var_s1), 0x96 + (0x1E * var_s2), &sp98[1], 0, 0.6f, 0.6f); if (var_s1 == 0) { var_v1 = &D_8018EE10[var_s2]; } else { var_v1 = &((struct_8018EE10_entry*) D_8018D9C0)[var_s2]; } if (var_v1->ghostDataSaved == 0) { - func_80093324(0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), D_800E7A44, 0, 0.5f, 0.5f); + print_text_mode_1(0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), D_800E7A44, 0, 0.5f, 0.5f); } else { - func_80093324( + print_text_mode_1( 0x2A + (var_s1 * 0x89), 0x96 + (0x1E * var_s2), gCourseNamesDup2[gCupCourseOrder[var_v1->courseIndex / 4][var_v1->courseIndex % 4]], 0, 0.5f, 0.5f); @@ -7063,11 +7073,11 @@ void func_800A2EB8(struct_8018D9E0_entry* arg0) { sp70[var_s2] = gPlayers[gGPCurrentRacePlayerIdByRank[var_s2]].characterId; } set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); - func_80093324(arg0->column + 0x1E, arg0->row + 0x19, "results", 0, 1.0f, 1.0f); + print_text_mode_1(arg0->column + 0x1E, arg0->row + 0x19, "results", 0, 1.0f, 1.0f); set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); - func_80093324(arg0->column + 0x2C, arg0->row + 0x28, "round", 0, 0.7f, 0.7f); + print_text_mode_1(arg0->column + 0x2C, arg0->row + 0x28, "round", 0, 0.7f, 0.7f); convert_number_to_ascii(gCourseIndexInCup + 1, sp68); - func_80093324(arg0->column + 0x57, arg0->row + 0x28, &sp68[1], 0, 0.7f, 0.7f); + print_text_mode_1(arg0->column + 0x57, arg0->row + 0x28, &sp68[1], 0, 0.7f, 0.7f); for (var_s2 = 0; var_s2 < 4; var_s2++) { if (gGPCurrentRacePlayerIdByRank[var_s2] < gPlayerCount) { var_a0 = (s32) gGlobalTimer % 3; @@ -7108,14 +7118,14 @@ void func_800A32B4(s32 arg0, s32 arg1, s32 characterId, s32 rank) { sp3C[2] = '.'; sp3C[3] = '\0'; func_800939C8(arg0 - 1, arg1, &sp3C[1], -4, 0.7f, 0.7f); - func_80093324(arg0 + 0xA, arg1, D_800E76A8[characterId], 0, 0.65f, 0.7f); + print_text_mode_1(arg0 + 0xA, arg1, D_800E76A8[characterId], 0, 0.65f, 0.7f); convert_number_to_ascii((s32) (sp50 / 60.0f), sp3C); func_800939C8(arg0 + 0x42, arg1, sp3C, 0, 0.7f, 0.7f); convert_number_to_ascii((s32) sp50 % 60, sp3C); - func_80093324(arg0 + 0x4E, arg1, "'", 0, 0.7f, 0.7f); + print_text_mode_1(arg0 + 0x4E, arg1, "'", 0, 0.7f, 0.7f); func_800939C8(arg0 + 0x56, arg1, sp3C, 0, 0.7f, 0.7f); convert_number_to_ascii((s32) ((f64) sp50 * 100.0) % 100, sp3C); - func_80093324(arg0 + 0x62, arg1, "\"", 0, 0.7f, 0.7f); + print_text_mode_1(arg0 + 0x62, arg1, "\"", 0, 0.7f, 0.7f); func_800939C8(arg0 + 0x6A, arg1, sp3C, 0, 0.7f, 0.7f); } @@ -7132,8 +7142,8 @@ void func_800A34A8(struct_8018D9E0_entry* arg0) { s32 rank; s32 test; - if (arg0->cursor != 0) { - if (arg0->cursor < 9) { + if (arg0->state != 0) { + if (arg0->state < 9) { for (rank = 0; rank < 8; rank++) { sp80[rank] = gPlayers[gGPCurrentRacePlayerIdByRank[rank]].characterId; } @@ -7141,14 +7151,14 @@ void func_800A34A8(struct_8018D9E0_entry* arg0) { func_800A3A10(sp80); func_800A3A10(gCharacterIdByGPOverallRank); } - set_text_color(4); - func_80093324(arg0->column + 0x19, 0x19 - arg0->row, "driver's points", 0, 0.8f, 0.8f); - set_text_color(5); - func_80093324(arg0->column + 0x36, 0x28 - arg0->row, "round", 0, 0.7f, 0.7f); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); + print_text_mode_1(arg0->column + 0x19, 0x19 - arg0->row, "driver's points", 0, 0.8f, 0.8f); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); + print_text_mode_1(arg0->column + 0x36, 0x28 - arg0->row, "round", 0, 0.7f, 0.7f); convert_number_to_ascii(gCourseIndexInCup + 1, sp78); - func_80093324(arg0->column + 0x61, (0x28 & 0xFFFFFFFF) - arg0->row, &sp78[1], 0, 0.7f, 0.7f); + print_text_mode_1(arg0->column + 0x61, (0x28 & 0xFFFFFFFF) - arg0->row, &sp78[1], 0, 0.7f, 0.7f); for (rank = 0; rank < 4; rank++) { - test = arg0->cursor; + test = arg0->state; if ((test != 8) && (test != 9)) { var_v0 = 0; } else { @@ -7159,7 +7169,7 @@ void func_800A34A8(struct_8018D9E0_entry* arg0) { } } if (var_v0 == 0) { - if (arg0->cursor < 9) { + if (arg0->state < 9) { var_v0 = gGPCurrentRacePlayerIdByRank[rank]; var_v1 = 0; } else { @@ -7177,7 +7187,7 @@ void func_800A34A8(struct_8018D9E0_entry* arg0) { } } for (rank = 4; rank < NUM_PLAYERS; rank++) { - test = arg0->cursor; + test = arg0->state; if ((test != 8) && (test != 9)) { var_v0 = 0; } else { @@ -7188,7 +7198,7 @@ void func_800A34A8(struct_8018D9E0_entry* arg0) { } } if (var_v0 == 0) { - if (arg0->cursor < 9) { + if (arg0->state < 9) { var_v0 = gGPCurrentRacePlayerIdByRank[rank]; } else { var_v0 = D_80164478[sp80[rank]]; @@ -7202,7 +7212,7 @@ void func_800A34A8(struct_8018D9E0_entry* arg0) { func_800A3ADC(arg0, 0xBE - arg0->column, arg0->row + (rank * 0x10) + 0x5A, sp80[rank], rank, sp80); } } - set_text_color(5); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); temp_s0_3 = ((get_string_width(gCupNames[gCupSelection]) + 8) * 0.6f) / 2; draw_text((-(s32) (((get_string_width(D_800E76CC[gCCSelection]) + 8) * 0.6f) / 2) - arg0->column) + 0xE6, arg0->row + 0xE1, gCupNames[D_800DC540], 0, 0.6f, 0.6f); @@ -7249,7 +7259,7 @@ void func_800A3ADC(struct_8018D9E0_entry* arg0, s32 arg1, s32 arg2, s32 characte char sp34[4]; s32 phi_v1; - if (arg0->cursor < 9) { + if (arg0->state < 9) { convert_number_to_ascii(arg4 + 1, sp34); } else { for (phi_v1 = arg4; phi_v1 > 0; phi_v1--) { @@ -7263,13 +7273,13 @@ void func_800A3ADC(struct_8018D9E0_entry* arg0, s32 arg1, s32 arg2, s32 characte sp34[2] = '.'; sp34[3] = '\0'; func_800939C8(arg1, arg2, &sp34[1], -4, 0.7f, 0.7f); - func_80093324(arg1 + 0xA, arg2, D_800E76A8[characterId], 0, 0.7f, 0.7f); + print_text_mode_1(arg1 + 0xA, arg2, D_800E76A8[characterId], 0, 0.7f, 0.7f); convert_number_to_ascii(gGPPointsByCharacterId[characterId], sp34); func_800939C8(arg1 + 0x47, arg2, sp34, 0, 0.7f, 0.7f); - if ((arg4 < 4) && (arg0->cursor < 9)) { + if ((arg4 < 4) && (arg0->state < 9)) { convert_number_to_ascii(D_8018D9BC[arg4], sp34); sp34[0] = '+'; - func_80093324(arg1 + 0x5A, arg2, sp34, 0, 0.7f, 0.7f); + print_text_mode_1(arg1 + 0x5A, arg2, sp34, 0, 0.7f, 0.7f); } } @@ -7281,18 +7291,18 @@ void func_800A3C84(struct_8018D9E0_entry* arg0) { draw_text(arg0->column + 0x43, arg0->row + 0x19, gCourseNamesDup[gCupCourseOrder[gCupSelection][gCourseIndexInCup]], 0, 0.6f, 0.6f); set_text_color(TEXT_YELLOW); - draw_text(arg0->column + 0x46, arg0->row + 0x28, D_800E7730, 0, 0.75f, 0.75f); + draw_text(arg0->column + 0x46, arg0->row + 0x28, gLapTimeText, 0, 0.75f, 0.75f); for (recordType = 0, rowOffset = 0; recordType < TIME_TRIAL_3LAP_RECORD_5; recordType += 1, rowOffset += 0xF) { func_800A4550(recordType, arg0->column + 0x17, arg0->row + rowOffset + 0x37); } set_text_color(TEXT_YELLOW); - func_80093324(0xB4 - arg0->column, arg0->row + 0x86, D_800E7728[0], 0, 0.75f, 0.75f); + print_text_mode_1(0xB4 - arg0->column, arg0->row + 0x86, gBestTimeText[0], 0, 0.75f, 0.75f); for (recordType = 0, rowOffset = 0; recordType < TIME_TRIAL_1LAP_RECORD; recordType += 1, rowOffset += 0xD) { set_text_color(TEXT_RED); func_800A474C(recordType, 0xAA - arg0->column, arg0->row + rowOffset + 0x92); } set_text_color(TEXT_YELLOW); - func_80093324(0xB4 - arg0->column, arg0->row + 0xD5, D_800E7728[1], 0, 0.75f, 0.75f); + print_text_mode_1(0xB4 - arg0->column, arg0->row + 0xD5, gBestTimeText[1], 0, 0.75f, 0.75f); func_800A474C(TIME_TRIAL_1LAP_RECORD, 0xAA - arg0->column, arg0->row + 0xE1); } @@ -7309,7 +7319,7 @@ void func_800A3E60(struct_8018D9E0_entry* arg0) { Unk_D_800E70A0* var_v0_5; char sp60[3]; - var_v0 = arg0->cursor; + var_v0 = arg0->state; if (var_v0 == 0) { return; } @@ -7317,26 +7327,26 @@ void func_800A3E60(struct_8018D9E0_entry* arg0) { return; } - set_text_color(4); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); draw_text(arg0->column + 0x55, 0x19 - arg0->row, gCourseNamesDup[gCupCourseOrder[gCupSelection][gCourseIndexInCup]], 0, 0.6f, 0.6f); - set_text_color(3); - draw_text(arg0->column + 0x55, 0x28 - arg0->row, D_800E7730, 0, 0.75f, 0.75f); + set_text_color(TEXT_YELLOW); + draw_text(arg0->column + 0x55, 0x28 - arg0->row, gLapTimeText, 0, 0.75f, 0.75f); for (var_s1 = 0; var_s1 < 4; var_s1++) { func_800A4550(var_s1, arg0->column + 0x26, ((0xF * var_s1) - arg0->row) + 0x37); } - switch (arg0->cursor) { /* switch 1 */ - case 1: /* switch 1 */ - case 5: /* switch 1 */ - case 6: /* switch 1 */ - case 7: /* switch 1 */ - case 8: /* switch 1 */ - case 9: /* switch 1 */ - case 10: /* switch 1 */ - case 30: /* switch 1 */ + switch (arg0->state) { /* switch 1 */ + case 1: /* switch 1 */ + case 5: /* switch 1 */ + case 6: /* switch 1 */ + case 7: /* switch 1 */ + case 8: /* switch 1 */ + case 9: /* switch 1 */ + case 10: /* switch 1 */ + case 30: /* switch 1 */ for (var_s1 = 0; var_s1 < 6; var_s1++) { var_v1 = 0; - text_rainbow_effect(arg0->cursor - 5, var_s1, 1); + text_rainbow_effect(arg0->state - 5, var_s1, 1); switch (var_s1) { /* switch 3; irregular */ case 4: /* switch 3 */ if (D_80162DF8 == 1) { @@ -7350,13 +7360,13 @@ void func_800A3E60(struct_8018D9E0_entry* arg0) { break; } if (var_v1 != 0) { - set_text_color(0); + set_text_color(TEXT_BLUE); gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, 0x96); - func_80093358(0xB2 - arg0->column, arg0->row + (0xD * var_s1) + 0x93, gTextPauseButton[var_s1 + 1], - 0, 0.75f, 0.75f); + print_text_mode_2(0xB2 - arg0->column, arg0->row + (0xD * var_s1) + 0x93, gMenuText[var_s1 + 1], 0, + 0.75f, 0.75f); } else { - func_80093324(0xB2 - arg0->column, arg0->row + (0xD * var_s1) + 0x93, gTextPauseButton[var_s1 + 1], - 0, 0.75f, 0.75f); + print_text_mode_1(0xB2 - arg0->column, arg0->row + (0xD * var_s1) + 0x93, gMenuText[var_s1 + 1], 0, + 0.75f, 0.75f); } } break; @@ -7366,26 +7376,26 @@ void func_800A3E60(struct_8018D9E0_entry* arg0) { case 14: /* switch 1 */ case 15: /* switch 1 */ case 16: /* switch 1 */ - set_text_color(3); - var_v1 = arg0->cursor - 11; + set_text_color(TEXT_YELLOW); + var_v1 = arg0->state - 11; for (var_s1 = 0; var_s1 < 7; var_s1++) { - func_80093324(0x000000A2, 0x8C + (0xD * var_s1), D_800E798C[(var_v1 * 7) + var_s1], 0, 0.6f, 0.6f); + print_text_mode_1(0x000000A2, 0x8C + (0xD * var_s1), D_800E798C[(var_v1 * 7) + var_s1], 0, 0.6f, 0.6f); } break; case 17: /* switch 1 */ case 18: /* switch 1 */ - set_text_color(1); + set_text_color(TEXT_GREEN); for (var_s1 = 0; var_s1 < 2; var_s1++) { - func_80093324(0x000000A5, arg0->row + (0xD * var_s1) + 0x8C, D_800E7A3C[var_s1], 0, 0.7f, 0.7f); + print_text_mode_1(0x000000A5, arg0->row + (0xD * var_s1) + 0x8C, D_800E7A3C[var_s1], 0, 0.7f, 0.7f); } for (var_s1 = 0; var_s1 < 2; var_s1++) { - text_rainbow_effect(arg0->cursor - 0x11, var_s1, 1); + text_rainbow_effect(arg0->state - 0x11, var_s1, 1); convert_number_to_ascii(var_s1 + 1, sp60); - func_80093324(0xB1 - arg0->column, 0xAA + (0x1E * var_s1), &sp60[1], 0, 0.6f, 0.6f); + print_text_mode_1(0xB1 - arg0->column, 0xAA + (0x1E * var_s1), &sp60[1], 0, 0.6f, 0.6f); if (D_8018EE10[var_s1].ghostDataSaved == 0) { - func_80093324(0xBB - arg0->column, 0xAA + (0x1E * var_s1), D_800E7A44, 0, 0.45f, 0.45f); + print_text_mode_1(0xBB - arg0->column, 0xAA + (0x1E * var_s1), D_800E7A44, 0, 0.45f, 0.45f); } else { - func_80093324(0xBB - arg0->column, 0xAA + (0x1E * var_s1), + print_text_mode_1(0xBB - arg0->column, 0xAA + (0x1E * var_s1), gCourseNamesDup2[gCupCourseOrder[D_8018EE10[var_s1].courseIndex / 4] [D_8018EE10[var_s1].courseIndex % 4]], 0, 0.45f, 0.45f); @@ -7393,52 +7403,52 @@ void func_800A3E60(struct_8018D9E0_entry* arg0) { } break; case 19: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_80093324(0x000000AA, (0xD * var_s1) + 0x93, D_800E7A48[var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x000000AA, (0xD * var_s1) + 0x93, D_800E7A48[var_s1], 0, 0.8f, 0.8f); } break; case 20: /* switch 1 */ case 21: /* switch 1 */ if (var_s1 && var_s1) {} - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_80093324(0x000000A3, arg0->row + (0xD * var_s1) + 0x8C, D_800E7A60[var_s1], 0, 0.67f, 0.67f); + print_text_mode_1(0x000000A3, arg0->row + (0xD * var_s1) + 0x8C, D_800E7A60[var_s1], 0, 0.67f, 0.67f); } for (var_s1 = 0; var_s1 < 2; var_s1++) { - text_rainbow_effect(arg0->cursor - 0x14, var_s1, 1); - func_80093324(0xC8 - arg0->column, 0xB9 + (0xF * var_s1), D_800E7A6C[var_s1], 0, 0.75f, 0.75f); + text_rainbow_effect(arg0->state - 0x14, var_s1, 1); + print_text_mode_1(0xC8 - arg0->column, 0xB9 + (0xF * var_s1), D_800E7A6C[var_s1], 0, 0.75f, 0.75f); } break; case 25: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_80093324(0x000000A3, (0xD * var_s1) + 0x93, D_800E7A74[var_s1], 0, 0.67f, 0.67f); + print_text_mode_1(0x000000A3, (0xD * var_s1) + 0x93, D_800E7A74[var_s1], 0, 0.67f, 0.67f); } break; case 26: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 2; var_s1++) { - func_80093324(0x000000AA, (0xD * var_s1) + 0x93, D_800E7A80[var_s1], 0, 0.75f, 0.75f); + print_text_mode_1(0x000000AA, (0xD * var_s1) + 0x93, D_800E7A80[var_s1], 0, 0.75f, 0.75f); } break; } - switch (arg0->cursor) { /* switch 2 */ - case 5: /* switch 2 */ - case 6: /* switch 2 */ - case 7: /* switch 2 */ - case 8: /* switch 2 */ - case 9: /* switch 2 */ - case 10: /* switch 2 */ - var_v0_5 = &D_800E7390[arg0->cursor - 5]; + switch (arg0->state) { /* switch 2 */ + case 5: /* switch 2 */ + case 6: /* switch 2 */ + case 7: /* switch 2 */ + case 8: /* switch 2 */ + case 9: /* switch 2 */ + case 10: /* switch 2 */ + var_v0_5 = &D_800E7390[arg0->state - 5]; break; case 17: /* switch 2 */ case 18: /* switch 2 */ - var_v0_5 = &D_800E73C0[arg0->cursor - 17]; + var_v0_5 = &D_800E73C0[arg0->state - 17]; break; case 20: /* switch 2 */ case 21: /* switch 2 */ - var_v0_5 = &D_800E73D0[arg0->cursor - 20]; + var_v0_5 = &D_800E73D0[arg0->state - 20]; break; case 30: /* switch 2 */ var_v0_5 = &D_800E7390[arg0->unk1C - 5]; @@ -7461,12 +7471,12 @@ void func_800A4550(s32 lapNumber, s32 column, s32 row) { if (lapNumber < 3) { sp40 = playerHUD[PLAYER_ONE].lapDurations[lapNumber]; - set_text_color(2); + set_text_color(TEXT_RED); } else { sp40 = playerHUD[PLAYER_ONE].someTimer; - set_text_color(1); + set_text_color(TEXT_GREEN); } - func_800936B8(column + 0x21, row, D_800E7734[lapNumber], 0, 0.7f, 0.7f); + func_800936B8(column + 0x21, row, gPrefixTimeText[lapNumber], 0, 0.7f, 0.7f); temp_v0_2 = find_8018D9E0_entry_dupe(0x000000BB); if (lapNumber < 3) { if (temp_v0_2->unk20 & (1 << lapNumber)) { @@ -7484,10 +7494,10 @@ void func_800A4550(s32 lapNumber, s32 column, s32 row) { set_text_color(textColor); get_time_record_minutes(sp40, sp34); func_800939C8(column + 0x2C, row, sp34, 0, 0.7f, 0.7f); - func_80093324(column + 0x37, row, "'", 0, 0.7f, 0.7f); + print_text_mode_1(column + 0x37, row, "'", 0, 0.7f, 0.7f); get_time_record_seconds(sp40, sp34); func_800939C8(column + 0x40, row, sp34, 0, 0.7f, 0.7f); - func_80093324(column + 0x4B, row, "\"", 0, 0.7f, 0.7f); + print_text_mode_1(column + 0x4B, row, "\"", 0, 0.7f, 0.7f); get_time_record_centiseconds(sp40, sp34); func_800939C8(column + 0x55, row, sp34, 0, 0.7f, 0.7f); } @@ -7551,11 +7561,11 @@ void func_800A474C(s32 recordType, s32 column, s32 row) { temp_t0 = timeRecord & 0xFFFFF; get_time_record_minutes(temp_t0, sp38); func_800939C8(column + 0x27, row, sp38, 0, 0.65f, 0.65f); - func_80093324(column + 0x32, row, "'", 0, 0.65f, 0.65f); + print_text_mode_1(column + 0x32, row, "'", 0, 0.65f, 0.65f); if (!textColor) {} get_time_record_seconds(temp_t0, sp38); func_800939C8(column + 0x3B, row, sp38, 0, 0.65f, 0.65f); - func_80093324(column + 0x46, row, "\"", 0, 0.65f, 0.65f); + print_text_mode_1(column + 0x46, row, "\"", 0, 0.65f, 0.65f); get_time_record_centiseconds(temp_t0, sp38); func_800939C8(column + 0x50, row, sp38, 0, 0.65f, 0.65f); if (temp_t0 < 0x927C0) { @@ -7619,31 +7629,31 @@ void render_pause_menu_time_trials(struct_8018D9E0_entry* arg0) { draw_text(0x000000A0, 0x00000050, gCourseNamesDup[gCupCourseOrder[gCupSelection][gCourseIndexInCup]], 0, 1.0f, 1.0f); set_text_color(TEXT_RED); - draw_text(0x0000009D, 0x00000060, D_800E7728[0], 0, 0.8f, 0.8f); + draw_text(0x0000009D, 0x00000060, gBestTimeText[0], 0, 0.8f, 0.8f); temp_a0 = func_800B4E24(TIME_TRIAL_3LAP_RECORD_1); temp_a0 &= 0xFFFFF; get_time_record_minutes(temp_a0, sp68); func_800939C8(0x0000007F, 0x0000006D, sp68, 0, 0.8f, 0.8f); - func_80093324(0x0000008E, 0x0000006D, "'", 0, 0.8f, 0.8f); + print_text_mode_1(0x0000008E, 0x0000006D, "'", 0, 0.8f, 0.8f); get_time_record_seconds(temp_a0, sp68); func_800939C8(0x00000098, 0x0000006D, sp68, 0, 0.8f, 0.8f); - func_80093324(0x000000A7, 0x0000006D, "\"", 0, 0.8f, 0.8f); + print_text_mode_1(0x000000A7, 0x0000006D, "\"", 0, 0.8f, 0.8f); get_time_record_centiseconds(temp_a0, sp68); func_800939C8(0x000000B3, 0x0000006D, sp68, 0, 0.8f, 0.8f); - draw_text(0x0000009D, 0x0000007C, D_800E7728[1], 0, 0.8f, 0.8f); + draw_text(0x0000009D, 0x0000007C, gBestTimeText[1], 0, 0.8f, 0.8f); temp_a0 = func_800B4F2C(); temp_a0 &= 0xFFFFF; get_time_record_minutes(temp_a0, sp68); func_800939C8(0x0000007F, 0x00000089, sp68, 0, 0.8f, 0.8f); - func_80093324(0x0000008E, 0x00000089, "'", 0, 0.8f, 0.8f); + print_text_mode_1(0x0000008E, 0x00000089, "'", 0, 0.8f, 0.8f); get_time_record_seconds(temp_a0, sp68); func_800939C8(0x00000098, 0x00000089, sp68, 0, 0.8f, 0.8f); - func_80093324(0x000000A7, 0x00000089, "\"", 0, 0.8f, 0.8f); + print_text_mode_1(0x000000A7, 0x00000089, "\"", 0, 0.8f, 0.8f); get_time_record_centiseconds(temp_a0, sp68); func_800939C8(0x000000B3, 0x00000089, sp68, 0, 0.8f, 0.8f); for (var_s0 = 0; var_s0 < 5; var_s0++) { - text_rainbow_effect(arg0->cursor - 11, var_s0, TEXT_GREEN); - func_80093324(D_800E8538[zero].column, D_800E8538[zero].row + (13 * var_s0), gTextPauseButton[var_s0], 0, 0.75f, + text_rainbow_effect(arg0->state - 11, var_s0, TEXT_GREEN); + print_text_mode_1(D_800E8538[zero].column, D_800E8538[zero].row + (13 * var_s0), gMenuText[var_s0], 0, 0.75f, 0.75f); } } @@ -7672,8 +7682,8 @@ void render_pause_menu_versus(struct_8018D9E0_entry* arg0) { } else { var_s1 = var_s0; } - text_rainbow_effect(arg0->cursor - 0x15, var_s0, TEXT_YELLOW); - func_80093324(temp_s3->column - 2, temp_s3->row + (13 * var_s0), gTextPauseButton[var_s1], 0, 0.75f, 0.75f); + text_rainbow_effect(arg0->state - 0x15, var_s0, TEXT_YELLOW); + print_text_mode_1(temp_s3->column - 2, temp_s3->row + (13 * var_s0), gMenuText[var_s1], 0, 0.75f, 0.75f); } } @@ -7707,8 +7717,8 @@ void render_pause_grand_prix(struct_8018D9E0_entry* arg0) { draw_text(160, temp_s3->row - 30, gCourseNamesDup[gCupCourseOrder[gCupSelection][gCourseIndexInCup]], 0, 1.0f, 1.0f); for (var_s0 = 0; var_s0 < 2; var_s0++) { - text_rainbow_effect(arg0->cursor - 31, var_s0, TEXT_YELLOW); - func_80093324(temp_s3->column, temp_s3->row + (var_s0 * 13), gTextPauseButton[var_s0 * 4], 0, 0.75f, 0.75f); + text_rainbow_effect(arg0->state - 31, var_s0, TEXT_YELLOW); + print_text_mode_1(temp_s3->column, temp_s3->row + (var_s0 * 13), gMenuText[var_s0 * 4], 0, 0.75f, 0.75f); } } @@ -7736,8 +7746,8 @@ void render_pause_battle(struct_8018D9E0_entry* arg0) { } else { var_s1 = var_a1; } - text_rainbow_effect(arg0->cursor - 0x29, var_a1, TEXT_YELLOW); - func_80093324(temp_s3->column - 2, temp_s3->row + 13 * var_a1, gTextPauseButton[var_s1], 0, 0.75f, 0.75f); + text_rainbow_effect(arg0->state - 0x29, var_a1, TEXT_YELLOW); + print_text_mode_1(temp_s3->column - 2, temp_s3->row + 13 * var_a1, gMenuText[var_s1], 0, 0.75f, 0.75f); } } @@ -7778,7 +7788,7 @@ void func_800A54EC(void) { } whyTheSequel = D_800F0B50[why]; sp50.column = var_v1->column - 8; - sp50.row = (var_v1->row + ((sp48->cursor - whyTheSequel) * 0xD)) - 8; + sp50.row = (var_v1->row + ((sp48->state - whyTheSequel) * 0xD)) - 8; func_800A66A8(sp48, &sp50); } @@ -7800,16 +7810,16 @@ void func_800A5738(struct_8018D9E0_entry* arg0) { Unk_D_800E70A0* var_v0_9; char sp5C[3]; - if (arg0->cursor == 0) { + if (arg0->state == 0) { if ((arg0->unk1C >= 0x1E) && ((gGlobalTimer / 16) % 2)) { - why = get_string_width(gTextPauseButton[5]) * 0.8f; + why = get_string_width(gMenuText[REPLAY]) * 0.8f; gDisplayListHead = draw_box(gDisplayListHead, 0x000000C0, 0x00000021, (s32) (why) + 0xC6, 0x00000032, 0, 0, 0, 0x00000096); - set_text_color(1); - func_80093324(0x000000BF, 0x00000030, gTextPauseButton[5], 0, 0.8f, 0.8f); + set_text_color(TEXT_GREEN); + print_text_mode_1(0x000000BF, 0x00000030, gMenuText[REPLAY], 0, 0.8f, 0.8f); } } else { - if (arg0->cursor == 1) { + if (arg0->state == 1) { var_s1 = arg0->unk1C; var_s2 = (s32) (arg0->unk1C * 0xFF) / 140; } else { @@ -7818,44 +7828,44 @@ void func_800A5738(struct_8018D9E0_entry* arg0) { } gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x0000013F, 0x000000EF, 0, 0, 0, var_s1); gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, var_s2); - set_text_color(3); + set_text_color(TEXT_YELLOW); func_80093754(0x000000A0, 0x00000050, gCourseNamesDup[gCupCourseOrder[gCupSelection][gCourseIndexInCup]], 0, 1.0f, 1.0f); - switch (arg0->cursor) { /* switch 1 */ - case 1: /* switch 1 */ - case 11: /* switch 1 */ - case 12: /* switch 1 */ - case 13: /* switch 1 */ - case 14: /* switch 1 */ - case 15: /* switch 1 */ - case 16: /* switch 1 */ - set_text_color(2); - func_80093754(0x0000009D, 0x00000060, D_800E7728[0], 0, 0.8f, 0.8f); + switch (arg0->state) { /* switch 1 */ + case 1: /* switch 1 */ + case 11: /* switch 1 */ + case 12: /* switch 1 */ + case 13: /* switch 1 */ + case 14: /* switch 1 */ + case 15: /* switch 1 */ + case 16: /* switch 1 */ + set_text_color(TEXT_RED); + func_80093754(0x0000009D, 0x00000060, gBestTimeText[0], 0, 0.8f, 0.8f); temp_a0 = func_800B4E24(0); temp_a0 &= 0xFFFFF; get_time_record_minutes(temp_a0, sp84); text_draw(0x0000007F, 0x0000006D, sp84, 0, 0.8f, 0.8f); - func_80093358(0x0000008E, 0x0000006D, "'", 0, 0.8f, 0.8f); + print_text_mode_2(0x0000008E, 0x0000006D, "'", 0, 0.8f, 0.8f); get_time_record_seconds(temp_a0, sp84); text_draw(0x00000098, 0x0000006D, sp84, 0, 0.8f, 0.8f); - func_80093358(0x000000A7, 0x0000006D, "\"", 0, 0.8f, 0.8f); + print_text_mode_2(0x000000A7, 0x0000006D, "\"", 0, 0.8f, 0.8f); get_time_record_centiseconds(temp_a0, sp84); text_draw(0x000000B3, 0x0000006D, sp84, 0, 0.8f, 0.8f); - func_80093754(0x0000009D, 0x0000007C, D_800E7728[1], 0, 0.8f, 0.8f); + func_80093754(0x0000009D, 0x0000007C, gBestTimeText[1], 0, 0.8f, 0.8f); temp_a0 = func_800B4F2C(); temp_a0 &= 0xFFFFF; get_time_record_minutes(temp_a0, sp84); text_draw(0x0000007F, 0x00000089, sp84, 0, 0.8f, 0.8f); - func_80093358(0x0000008E, 0x00000089, "'", 0, 0.8f, 0.8f); + print_text_mode_2(0x0000008E, 0x00000089, "'", 0, 0.8f, 0.8f); get_time_record_seconds(temp_a0, sp84); text_draw(0x00000098, 0x00000089, sp84, 0, 0.8f, 0.8f); - func_80093358(0x000000A7, 0x00000089, "\"", 0, 0.8f, 0.8f); + print_text_mode_2(0x000000A7, 0x00000089, "\"", 0, 0.8f, 0.8f); get_time_record_centiseconds(temp_a0, sp84); text_draw(0x000000B3, 0x00000089, sp84, 0, 0.8f, 0.8f); for (var_s1 = 0; var_s1 < 6; var_s1++) { - text_rainbow_effect(arg0->cursor - 0xB, var_s1, TEXT_GREEN); - func_80093358(D_800E8538[zero].column, D_800E8538[zero].row + (0xD * var_s1), - gTextPauseButton[var_s1 + 1], 0, 0.75f, 0.75f); + text_rainbow_effect(arg0->state - 0xB, var_s1, TEXT_GREEN); + print_text_mode_2(D_800E8538[zero].column, D_800E8538[zero].row + (0xD * var_s1), gMenuText[var_s1 + 1], + 0, 0.75f, 0.75f); } break; case 21: /* switch 1 */ @@ -7864,26 +7874,26 @@ void func_800A5738(struct_8018D9E0_entry* arg0) { case 24: /* switch 1 */ case 25: /* switch 1 */ case 26: /* switch 1 */ - set_text_color(3); - temp_v0 = arg0->cursor - 0x15; + set_text_color(TEXT_YELLOW); + temp_v0 = arg0->state - 0x15; for (var_s1 = 0; var_s1 < 7; var_s1++) { - func_80093324(0x0000004D, 0x6E + (0xD * var_s1), D_800E798C[(temp_v0 * 7) + var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x0000004D, 0x6E + (0xD * var_s1), D_800E798C[(temp_v0 * 7) + var_s1], 0, 0.8f, 0.8f); } break; case 30: /* switch 1 */ case 31: /* switch 1 */ - set_text_color(1); + set_text_color(TEXT_GREEN); for (var_s1 = 0; var_s1 < 2; var_s1++) { - func_80093324(0x0000005A, arg0->row + (0xD * var_s1) + 0x6E, D_800E7A3C[var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x0000005A, arg0->row + (0xD * var_s1) + 0x6E, D_800E7A3C[var_s1], 0, 0.8f, 0.8f); } for (var_s1 = 0; var_s1 < 2; var_s1++) { - text_rainbow_effect(arg0->cursor - 0x1E, var_s1, TEXT_GREEN); + text_rainbow_effect(arg0->state - 0x1E, var_s1, TEXT_GREEN); convert_number_to_ascii(var_s1 + 1, sp5C); - func_80093324(0x5A - arg0->column, (0x96 + (0x14 * var_s1)), &sp5C[1], 0, 0.75f, 0.75f); + print_text_mode_1(0x5A - arg0->column, (0x96 + (0x14 * var_s1)), &sp5C[1], 0, 0.75f, 0.75f); if (D_8018EE10[var_s1].ghostDataSaved == 0) { - func_80093324(0x69 - arg0->column, (0x96 + (0x14 * var_s1)), D_800E7A44, 0, 0.75f, 0.75f); + print_text_mode_1(0x69 - arg0->column, (0x96 + (0x14 * var_s1)), D_800E7A44, 0, 0.75f, 0.75f); } else { - func_80093324(0x69 - arg0->column, (0x96 + (0x14 * var_s1)), + print_text_mode_1(0x69 - arg0->column, (0x96 + (0x14 * var_s1)), gCourseNamesDup2[gCupCourseOrder[D_8018EE10[var_s1].courseIndex / 4] [D_8018EE10[var_s1].courseIndex % 4]], 0, 0.75f, 0.75f); @@ -7891,52 +7901,52 @@ void func_800A5738(struct_8018D9E0_entry* arg0) { } break; case 32: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_80093324(0x00000064, (0xD * var_s1) + 0x6E, D_800E7A48[var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x00000064, (0xD * var_s1) + 0x6E, D_800E7A48[var_s1], 0, 0.8f, 0.8f); } break; case 35: /* switch 1 */ case 36: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_80093324(0x00000055, arg0->row + (0xD * var_s1) + 0x6E, D_800E7A60[var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x00000055, arg0->row + (0xD * var_s1) + 0x6E, D_800E7A60[var_s1], 0, 0.8f, 0.8f); } for (var_s1 = 0; var_s1 < 2; var_s1++) { - text_rainbow_effect(arg0->cursor - 0x23, var_s1, TEXT_GREEN); - func_80093324(0x7D - arg0->column, 0x9B + (0xF * var_s1), D_800E7A6C[var_s1], 0, 0.8f, 0.8f); + text_rainbow_effect(arg0->state - 0x23, var_s1, TEXT_GREEN); + print_text_mode_1(0x7D - arg0->column, 0x9B + (0xF * var_s1), D_800E7A6C[var_s1], 0, 0.8f, 0.8f); } break; case 40: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_80093324(0x00000055, (0xD * var_s1) + 0x6E, D_800E7A74[var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x00000055, (0xD * var_s1) + 0x6E, D_800E7A74[var_s1], 0, 0.8f, 0.8f); } break; case 41: /* switch 1 */ - set_text_color(3); + set_text_color(TEXT_YELLOW); for (var_s1 = 0; var_s1 < 2; var_s1++) { - func_80093324(0x0000005D, (0xD * var_s1) + 0x6E, D_800E7A80[var_s1], 0, 0.8f, 0.8f); + print_text_mode_1(0x0000005D, (0xD * var_s1) + 0x6E, D_800E7A80[var_s1], 0, 0.8f, 0.8f); } break; } - switch (arg0->cursor) { /* switch 2 */ - case 11: /* switch 2 */ - case 12: /* switch 2 */ - case 13: /* switch 2 */ - case 14: /* switch 2 */ - case 15: /* switch 2 */ - case 16: /* switch 2 */ - var_v0_9 = &D_800E73E0[arg0->cursor - 11]; + switch (arg0->state) { /* switch 2 */ + case 11: /* switch 2 */ + case 12: /* switch 2 */ + case 13: /* switch 2 */ + case 14: /* switch 2 */ + case 15: /* switch 2 */ + case 16: /* switch 2 */ + var_v0_9 = &D_800E73E0[arg0->state - 11]; break; case 30: /* switch 2 */ case 31: /* switch 2 */ - var_v0_9 = &D_800E7410[arg0->cursor - 30]; + var_v0_9 = &D_800E7410[arg0->state - 30]; break; case 35: /* switch 2 */ case 36: /* switch 2 */ if (0) {} // wtf? - var_v0_9 = &D_800E7420[arg0->cursor - 35]; + var_v0_9 = &D_800E7420[arg0->state - 35]; break; default: return; @@ -7970,23 +7980,23 @@ void func_800A6154(struct_8018D9E0_entry* arg0) { s32 var_s0; s32 var_s1; - if (arg0->cursor == 0) { + if (arg0->state == 0) { gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x0000013F, 0x000000EF, 0, 0, 0, arg0->unk1C); - set_text_color(3); + set_text_color(TEXT_YELLOW); gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, (arg0->unk1C * 0xFF) / 100); for (var_s1 = 0, var_s0 = 0x96; var_s0 < 0xBE; var_s1++, var_s0 += 0x14) { - func_80093358(0x0000008C, var_s0, gTextPauseButton[(var_s1 * 3) + 1], 0, 1.0f, 1.0f); + print_text_mode_2(0x0000008C, var_s0, gMenuText[(var_s1 * 3) + 1], 0, 1.0f, 1.0f); } } else { gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x0000013F, 0x000000EF, 0, 0, 0, 0x00000064); for (var_s1 = 0, var_s0 = 0x96; var_s1 < 2; var_s1++, var_s0 += 0x14) { - text_rainbow_effect(arg0->cursor - 0xB, var_s1, TEXT_YELLOW); - func_80093324(0x0000008C, var_s0, gTextPauseButton[(var_s1 * 3) + 1], 0, 1.0f, 1.0f); + text_rainbow_effect(arg0->state - 0xB, var_s1, TEXT_YELLOW); + print_text_mode_1(0x0000008C, var_s0, gMenuText[(var_s1 * 3) + 1], 0, 1.0f, 1.0f); } } - if (arg0->cursor >= 0xB) { + if (arg0->state >= 0xB) { sp6C.column = 0x0084; - sp6C.row = (arg0->cursor * 0x14) - 0x4E; + sp6C.row = (arg0->state * 0x14) - 0x4E; func_800A66A8(arg0, &sp6C); } if (arg0->unk20 > 0) { @@ -8002,17 +8012,17 @@ void func_800A638C(struct_8018D9E0_entry* arg0) { s32 var_s1; UNUSED s8** var_s2; - if (arg0->cursor == 0) { + if (arg0->state == 0) { gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x0000013F, 0x000000EF, 0, 0, 0, arg0->unk1C); - set_text_color(5); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, (arg0->unk1C * 0xFF) / 100); func_80093754(0x000000A0, arg0->row + 0x1E, D_800E7778[gModeSelection / 3], 0, 1.0f, 1.0f); } else { gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x0000013F, 0x000000EF, 0, 0, 0, 0x00000064); - set_text_color(5); + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); draw_text(0x000000A0, arg0->row + 0x1E, D_800E7778[gModeSelection / 3], 0, 1.0f, 1.0f); } - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ default: var_a1 = 0x000000FF; break; @@ -8038,12 +8048,12 @@ void func_800A638C(struct_8018D9E0_entry* arg0) { default: break; } - if (arg0->cursor >= 10) { + if (arg0->state >= 10) { for (var_s1 = 0; var_s1 < 4; var_s1++) { - text_rainbow_effect(arg0->cursor - 0xA, var_s1, TEXT_GREEN); - func_80093324(0x00000069, 0xAE + (0xF * var_s1), gTextPauseButton[var_s1 + 1], 0, 0.8f, 0.8f); + text_rainbow_effect(arg0->state - 0xA, var_s1, TEXT_GREEN); + print_text_mode_1(0x00000069, 0xAE + (0xF * var_s1), gMenuText[var_s1 + 1], 0, 0.8f, 0.8f); } - func_800A66A8(arg0, &D_800E7360[arg0->cursor - 10]); + func_800A66A8(arg0, &D_800E7360[arg0->state - 10]); } } @@ -8121,7 +8131,7 @@ void func_800A69C8(UNUSED struct_8018D9E0_entry* arg0) { var_s4 = &gNmiUnknown4[var_s0]; break; } - temp_s3 = D_800E7720[var_v1]; + temp_s3 = gWinLoseText[var_v1]; if (var_v1 != 0) { set_text_color(TEXT_BLUE); } else { @@ -8180,7 +8190,7 @@ void func_800A6D94(s32 arg0, s32 arg1, u8* arg2) { } thing = arg2[arg1]; if (var_v0 != 0) { - set_text_color(0); + set_text_color(TEXT_BLUE); } else { set_text_color(gGlobalTimer % 3); } @@ -8237,7 +8247,7 @@ void func_800A70E8(struct_8018D9E0_entry* arg0) { s32 loopIndex; s32 stringIndex; - if (arg0->cursor == 1) { + if (arg0->state == 1) { var_s0 = get_string_width(D_800E7A34[0]) * 0.45f; temp_f6 = get_string_width(D_800E7A34[1]) * 0.45f; if (var_s0 < temp_f6) { @@ -8252,14 +8262,14 @@ void func_800A70E8(struct_8018D9E0_entry* arg0) { gDPSetPrimColor(gDisplayListHead++, 0, 0, 0x00, 0x00, 0x00, alpha); set_text_color(TEXT_RED); for (loopIndex = 0x2C, stringIndex = 0; loopIndex < 0x40; loopIndex += 0xA, stringIndex++) { - func_80093358(0x000000C0, loopIndex, D_800E7A34[stringIndex], 0, 0.45f, 0.45f); + print_text_mode_2(0x000000C0, loopIndex, D_800E7A34[stringIndex], 0, 0.45f, 0.45f); } } } // Shading layer of the grand prix podium result screen void func_800A7258(struct_8018D9E0_entry* arg0) { - if (arg0->cursor == 0) { + if (arg0->state == 0) { // If shading layer is fading in gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, arg0->unk1C); } else { @@ -8322,12 +8332,12 @@ void func_800A761C(struct_8018D9E0_entry* arg0) { temp_a0 = D_802874D8.unk1D + 1; func_800A79F4(temp_a0, sp3C); - sp48 = ((get_string_width(D_800E7AA4[0]) + 5) * 1.2f) / 2; - sp44 = ((get_string_width(D_800E7AA4[temp_a0]) + 5) * 1.2f) / 2; - set_text_color(5); - draw_text(arg0->column - sp44, arg0->row, D_800E7AA4[0], 0, 1.2f, 1.2f); + sp48 = ((get_string_width(gPlaceText[0]) + 5) * 1.2f) / 2; + sp44 = ((get_string_width(gPlaceText[temp_a0]) + 5) * 1.2f) / 2; + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); + draw_text(arg0->column - sp44, arg0->row, gPlaceText[0], 0, 1.2f, 1.2f); set_text_color((s32) gGlobalTimer % 3); - draw_text(arg0->column + sp48, arg0->row, D_800E7AA4[temp_a0], 0, 1.2f, 1.2f); + draw_text(arg0->column + sp48, arg0->row, gPlaceText[temp_a0], 0, 1.2f, 1.2f); convert_number_to_ascii(temp_a0, sp3C); func_800939C8((arg0->column + sp48) - 0x18, arg0->row, &sp3C[1], 0, 2.0f, 2.0f); } @@ -8346,7 +8356,7 @@ void func_800A7790(struct_8018D9E0_entry* arg0) { arg0->unk24 * someScaling, someScaling); } else { someScaling = D_802850C0[creditIndex].textScaling; - func_80093324(arg0->column, arg0->row, D_802854B0[creditIndex], arg0->unk1C * someScaling, + print_text_mode_1(arg0->column, arg0->row, D_802854B0[creditIndex], arg0->unk1C * someScaling, arg0->unk24 * someScaling, someScaling); } } @@ -8478,11 +8488,11 @@ void func_800A7A4C(s32 arg0) { case 0xD4: /* switch 8 */ func_800A97BC(var_s1); break; - case 0x5: /* switch 8 */ - switch (var_s1->cursor) { /* switch 9; irregular */ - case 0: /* switch 9 */ + case 0x5: /* switch 8 */ + switch (var_s1->state) { /* switch 9; irregular */ + case 0: /* switch 9 */ if (gControllerFive->button & R_TRIG) { - var_s1->cursor = (s32) 1U; + var_s1->state = (s32) 1U; play_sound2(SOUND_ACTION_PING); } else { var_s1->visible = 0; @@ -8940,15 +8950,15 @@ void func_800A874C(struct_8018D9E0_entry* arg0) { s32 temp_s1; UNUSED u32 var_v0; u32 var_s2; - set_text_color(1); + set_text_color(TEXT_GREEN); var_s2 = arg0->type == 0x00000065 ? func_800B4E24(0) : func_800B4F2C(); temp_s1 = var_s2 & 0xFFFFF; get_time_record_minutes((temp_s1 ^ 0), sp58); text_draw(arg0->column + 5, arg0->row + 0x21, sp58, 0, 0.6f, 0.65f); - func_80093324(arg0->column + 0xE, arg0->row + 0x21, "'", 0, 0.6f, 0.65f); + print_text_mode_1(arg0->column + 0xE, arg0->row + 0x21, "'", 0, 0.6f, 0.65f); get_time_record_seconds(temp_s1, sp58); text_draw(arg0->column + 0x16, arg0->row + 0x21, sp58, 0, 0.6f, 0.65f); - func_80093324(arg0->column + 0x20, arg0->row + 0x21, "\"", 0, 0.6f, 0.65f); + print_text_mode_1(arg0->column + 0x20, arg0->row + 0x21, "\"", 0, 0.6f, 0.65f); get_time_record_centiseconds(temp_s1, sp58); text_draw(arg0->column + 0x29, arg0->row + 0x21, sp58, 0, 0.6f, 0.65f); var_s2 = (u32) temp_s1 < 0x927C0U ? var_s2 >> 0x14 : 8; @@ -9043,15 +9053,15 @@ void func_800A8CA4(struct_8018D9E0_entry* arg0) { void func_800A8E14(UNUSED struct_8018D9E0_entry* arg0) { set_text_color(TEXT_YELLOW); draw_text(0x98, 0x44, D_800E77A8[0], 0, 1.0f, 1.0f); - func_80093324(0x17, 0x58, D_800E77A8[1], 0, 0.7f, 0.8f); - func_80093324(0x17, 0x6A, D_800E77A8[2], 0, 0.7f, 0.8f); + print_text_mode_1(0x17, 0x58, D_800E77A8[1], 0, 0.7f, 0.8f); + print_text_mode_1(0x17, 0x6A, D_800E77A8[2], 0, 0.7f, 0.8f); } void func_800A8EC0(struct_8018D9E0_entry* arg0) { if (arg0->unk20 != 0) { func_8009A76C(arg0->D_8018DEE0_index, arg0->column, arg0->row, -1); set_text_color(TEXT_YELLOW); - func_80093324(arg0->column + 0x20, arg0->row + 0x28, D_800E7678[arg0->unk20], 0, 0.7f, 0.7f); + print_text_mode_1(arg0->column + 0x20, arg0->row + 0x28, gCupText[arg0->unk20], 0, 0.7f, 0.7f); } } @@ -9258,7 +9268,7 @@ void func_800A94C8(struct_8018D9E0_entry* arg0, s32 columnTarget, s32 arg2) { void func_800A954C(struct_8018D9E0_entry* arg0) { // Cycle lasts 26 (0x1A) frames - if (arg0->cursor == 0) { + if (arg0->state == 0) { // Move highlight from yellow to red arg0->unk20 = (s32) (u32) ((((f32) (0xC - arg0->unk1C) * 127.0f) / 12.0f) + 128.0f); } else { @@ -9269,7 +9279,7 @@ void func_800A954C(struct_8018D9E0_entry* arg0) { if (arg0->unk1C >= 0xC) { // Every 13 (0xC) frames reverse direction arg0->unk1C = 0; - arg0->cursor ^= 1; + arg0->state ^= 1; } } @@ -9298,8 +9308,8 @@ void func_800A9710(struct_8018D9E0_entry* arg0) { phi_v0 = 0; break; } - if (phi_v0 != arg0->cursor) { - arg0->cursor = phi_v0; + if (phi_v0 != arg0->state) { + arg0->state = phi_v0; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(D_800E7D34[phi_v0])); } } @@ -9405,13 +9415,13 @@ void func_800A9A98(struct_8018D9E0_entry* arg0) { } void func_800A9B9C(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: func_800AA280(arg0); break; case 1: func_800AA280(arg0); - arg0->cursor = 4; + arg0->state = 4; /* fallthrough */ case 4: if (arg0->unk1C > 0) { @@ -9421,11 +9431,11 @@ void func_800A9B9C(struct_8018D9E0_entry* arg0) { } } else { arg0->unk1C = 0; - arg0->cursor = 0; + arg0->state = 0; } break; case 2: - arg0->cursor = 3; + arg0->state = 3; break; case 3: default: @@ -9434,22 +9444,22 @@ void func_800A9B9C(struct_8018D9E0_entry* arg0) { } void func_800A9C40(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: func_800AA280(arg0); if ((gPlayerCount + 0xA) == arg0->type) { - arg0->cursor = 2; + arg0->state = 2; } else { - arg0->cursor = 1; + arg0->state = 1; } break; case 4: if ((gPlayerCount + 0xA) == arg0->type) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = 0; break; } - arg0->cursor = 1; + arg0->state = 1; case 1: func_800AA280(arg0); if ((gMainMenuSelectionDepth == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || @@ -9466,7 +9476,7 @@ void func_800A9C40(struct_8018D9E0_entry* arg0) { break; case 3: if ((gPlayerCount + 0xA) == arg0->type) { - arg0->cursor = 2; + arg0->state = 2; } break; case 2: @@ -9484,7 +9494,7 @@ void func_800A9D5C(struct_8018D9E0_entry* arg0) { arg0->priority = 6; } - switch (arg0->cursor) { + switch (arg0->state) { case 2: if ((gMainMenuSelectionDepth == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (gMainMenuSelectionDepth == TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT)) { @@ -9498,7 +9508,7 @@ void func_800A9D5C(struct_8018D9E0_entry* arg0) { temp_v0 = &D_800E70A0[arg0->type - 0xA]; func_800A91D8(arg0, temp_v0->column, temp_v0->row); if ((arg0->column == temp_v0->column) && (arg0->row == temp_v0->row)) { - arg0->cursor = 0; + arg0->state = 0; } /* fallthrough */ case 0: @@ -9541,8 +9551,8 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { } temp_a1 = gGameModePlayerSelection[gPlayerCount - 1][D_800E86AC[gPlayerCount - 1]]; - switch (arg0->cursor) { /* switch 5; irregular */ - case 0: /* switch 5 */ + switch (arg0->state) { /* switch 5; irregular */ + case 0: /* switch 5 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; } else { @@ -9556,7 +9566,7 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { arg0->column = temp_v0->column; arg0->row = (D_800E86AC[gPlayerCount - 1] * 0x12) + temp_v0->row + 0x41; arg0->unk1C = 0; - arg0->cursor = 1; + arg0->state = 1; break; case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 2 */ case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 2 */ @@ -9566,7 +9576,7 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { arg0->row = (D_800E86AC[gPlayerCount - 1] * 0x12) + temp_v0->row + temp_v1_2->row; arg0->unk1C = arg0->row - temp_v0->row; arg0->visible = 1; - arg0->cursor = 2; + arg0->state = 2; break; default: /* switch 2 */ arg0->visible = 0; @@ -9583,10 +9593,10 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 3 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; - arg0->cursor = 0; + arg0->state = 0; } else { if (arg0->unk20 != D_800E86AC[gPlayerCount - 1]) { - arg0->cursor = 0; + arg0->state = 0; } temp_v0 = func_800AAE68(); arg0->column = temp_v0->column + arg0->unk1C; @@ -9594,14 +9604,14 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { func_800A92E8(arg0, temp_v0->column + temp_v1_2->column); arg0->unk1C = arg0->column - temp_v0->column; if (arg0->unk1C == temp_v1_2->column) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = arg0->row - temp_v0->row; } } break; default: /* switch 3 */ arg0->visible = 0; - arg0->cursor = 0; + arg0->state = 0; break; } break; @@ -9614,10 +9624,10 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: /* switch 4 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; - arg0->cursor = 0; + arg0->state = 0; } else { if (arg0->unk20 != D_800E86AC[gPlayerCount - 1]) { - arg0->cursor = 0; + arg0->state = 0; } temp_v0 = func_800AAE68(); temp_v1_2 = &D_800E70E8[arg0->type - sp24]; @@ -9630,7 +9640,7 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) { break; default: /* switch 4 */ arg0->visible = 0; - arg0->cursor = 0; + arg0->state = 0; break; } break; @@ -9660,13 +9670,13 @@ void func_800AA2EC(struct_8018D9E0_entry* arg0) { case DATA_SELECTION: case PLAYER_NUM_SELECTION: case GAME_MODE_SELECTION: - arg0->cursor = 0; + arg0->state = 0; break; case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: case CONFIRM_OK_SELECTION: case CONFIRM_OK_SELECTION_FROM_BACK_OUT: case TIME_TRIALS_DATA_SELECTION_FROM_BACK_OUT: - if (arg0->cursor != 0) { + if (arg0->state != 0) { break; } if (gPlayerCount != 1) { @@ -9683,7 +9693,7 @@ void func_800AA2EC(struct_8018D9E0_entry* arg0) { case 5: /* switch 1 */ break; case 0: /* switch 1 */ - arg0->cursor = 1; + arg0->state = 1; var_t1 = 1; break; case 2: /* switch 1 */ @@ -9697,7 +9707,7 @@ void func_800AA2EC(struct_8018D9E0_entry* arg0) { if (var_t1 == 0) { if (gControllerPak1State == 0) { if (check_for_controller_pak(0) == 0) { - arg0->cursor = 2; + arg0->state = 2; break; } temp_v0 = osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, 0); @@ -9705,14 +9715,14 @@ void func_800AA2EC(struct_8018D9E0_entry* arg0) { switch (temp_v0) { case PFS_ERR_NOPACK: case PFS_ERR_DEVICE: - arg0->cursor = 2; + arg0->state = 2; break; case PFS_ERR_ID_FATAL: - arg0->cursor = 3; + arg0->state = 3; break; case PFS_ERR_CONTRFAIL: default: - arg0->cursor = 3; + arg0->state = 3; break; } return; @@ -9721,29 +9731,29 @@ void func_800AA2EC(struct_8018D9E0_entry* arg0) { } if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) == 0) { - arg0->cursor = 1; + arg0->state = 1; break; } if (osPfsNumFiles(&gControllerPak1FileHandle, &gControllerPak1NumFilesUsed, &gControllerPak1MaxWriteableFiles) != 0) { - arg0->cursor = 3; + arg0->state = 3; break; } if (osPfsFreeBlocks(&gControllerPak1FileHandle, &gControllerPak1NumPagesFree) != 0) { - arg0->cursor = 3; + arg0->state = 3; break; } gControllerPak1NumPagesFree = (s32) gControllerPak1NumPagesFree >> 8; } if (gControllerPak1MaxWriteableFiles >= gControllerPak1NumFilesUsed) { - arg0->cursor = 5; + arg0->state = 5; break; } if (gControllerPak1NumPagesFree >= 0x79) { - arg0->cursor = 1; + arg0->state = 1; break; } - arg0->cursor = 5; + arg0->state = 5; } break; default: @@ -9857,9 +9867,9 @@ void func_800AA69C(struct_8018D9E0_entry* arg0) { } void func_800AAA9C(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 3: - arg0->cursor = 1; + arg0->state = 1; /* fallthrough */ case 1: if (D_8018EDEE == 3) { @@ -9875,15 +9885,15 @@ void func_800AAA9C(struct_8018D9E0_entry* arg0) { /* fallthrough */ case 0: if (func_800AAFCC(arg0->type - 0x2B) >= 0) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = 0; } else { - arg0->cursor = 1; + arg0->state = 1; } break; case 4: if (func_800AAFCC(arg0->type - 0x2B) >= 0) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = 0; } break; @@ -9894,14 +9904,14 @@ void func_800AAA9C(struct_8018D9E0_entry* arg0) { } void func_800AAB90(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 1: if (arg0->unk1C > 0) { - arg0->cursor = 3; + arg0->state = 3; } break; case 2: - arg0->cursor = 4; + arg0->state = 4; break; case 3: if (arg0->unk1C > 0) { @@ -9911,7 +9921,7 @@ void func_800AAB90(struct_8018D9E0_entry* arg0) { } } else { arg0->unk1C = 0; - arg0->cursor = 0; + arg0->state = 0; } break; case 0: @@ -9930,7 +9940,7 @@ void func_800AAC18(struct_8018D9E0_entry* arg0) { Unk_D_800E70A0* var_t0; temp_a1 = arg0->type - 0x2B; - switch (arg0->cursor) { + switch (arg0->state) { case 0: if (D_8018EDEE == 3) { temp_v0 = func_800AAFCC(temp_a1); @@ -9938,7 +9948,7 @@ void func_800AAC18(struct_8018D9E0_entry* arg0) { var_t0 = &D_800E7188[(gScreenModeSelection * 4) + temp_v0]; arg0->column = (s32) var_t0->column; arg0->row = (s32) var_t0->row; - arg0->cursor = 2; + arg0->state = 2; arg0->unk8 = 2; func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(D_800E8340[temp_a1])); } @@ -9952,7 +9962,7 @@ void func_800AAC18(struct_8018D9E0_entry* arg0) { break; case 2: case 4: - if (arg0->cursor == 2) { + if (arg0->state == 2) { temp_v0 = func_800AAFCC(temp_a1); if (temp_v0 >= 0) { var_t0 = &D_800E7188[(gScreenModeSelection * 4) + temp_v0]; @@ -9960,11 +9970,11 @@ void func_800AAC18(struct_8018D9E0_entry* arg0) { } else { var_t0 = &D_800E7108[0][temp_a1]; if ((var_t0->column == arg0->column) && (var_t0->row == arg0->row)) { - arg0->cursor = 0; + arg0->state = 0; return; } } - if ((arg0->cursor != 2) || (arg0->unk8 != 1)) { + if ((arg0->state != 2) || (arg0->unk8 != 1)) { func_800A91D8(arg0, (s32) var_t0->column, (s32) var_t0->row); } break; @@ -10081,7 +10091,7 @@ escape: s32 func_800AAF70(s32 arg0) { struct_8018D9E0_entry* temp; temp = func_800AAEB4(arg0); - return temp->cursor; + return temp->state; } void func_800AAF94(struct_8018D9E0_entry* arg0, s32 arg1) { @@ -10111,9 +10121,9 @@ s32 func_800AAFCC(s32 arg0) { } void func_800AB020(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 1: - arg0->cursor = 4; + arg0->state = 4; /* fallthrough */ case 4: if (arg0->unk1C > 0) { @@ -10123,11 +10133,11 @@ void func_800AB020(struct_8018D9E0_entry* arg0) { } } else { arg0->unk1C = 0; - arg0->cursor = 0; + arg0->state = 0; } break; case 2: - arg0->cursor = 3; + arg0->state = 3; break; case 0: case 3: @@ -10137,21 +10147,21 @@ void func_800AB020(struct_8018D9E0_entry* arg0) { } void func_800AB098(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: if ((gCupSelection + 0x53) == arg0->type) { - arg0->cursor = 2; + arg0->state = 2; } else { - arg0->cursor = 1; + arg0->state = 1; } break; case 4: if ((gCupSelection + 0x53) == arg0->type) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = 0; break; } else { - arg0->cursor = 1; + arg0->state = 1; } // Purposeful fallthrough case 1: @@ -10164,7 +10174,7 @@ void func_800AB098(struct_8018D9E0_entry* arg0) { break; case 3: if ((gCupSelection + 0x53) == arg0->type) { - arg0->cursor = 2; + arg0->state = 2; } break; case 2: @@ -10182,7 +10192,7 @@ void func_800AB164(struct_8018D9E0_entry* arg0) { arg0->priority = 4; } - switch (arg0->cursor) { + switch (arg0->state) { case 0: thing = &D_800E7148[arg0->type - 0x53]; arg0->column = thing->column; @@ -10195,7 +10205,7 @@ void func_800AB164(struct_8018D9E0_entry* arg0) { thing = &D_800E7148[arg0->type - 0x53]; func_800A91D8(arg0, thing->column, thing->row); if ((arg0->column == thing->column) && (arg0->row == thing->row)) { - arg0->cursor = 0; + arg0->state = 0; } break; case 1: @@ -10238,7 +10248,7 @@ void func_800AB314(struct_8018D9E0_entry* arg0) { switch (gModeSelection) { default: if (D_8018EDEC != one) { - arg0->cursor = 0; + arg0->state = 0; arg0->unk20 = 0; for (var_a1 = 0; var_a1 < 4; var_a1++) { if (gCourseIndexInCup == var_a1) { @@ -10251,7 +10261,7 @@ void func_800AB314(struct_8018D9E0_entry* arg0) { } } } else { - arg0->cursor = 3; + arg0->state = 3; for (var_a1 = 0; var_a1 < 4; var_a1++) { sp24[var_a1]->visible = one; sp24[var_a1]->priority = 6; @@ -10259,12 +10269,12 @@ void func_800AB314(struct_8018D9E0_entry* arg0) { } break; case 0: - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ case 0: if ((arg0->unk1C / 4) == gCupSelection) { arg0->unk20++; if (arg0->unk20 >= 0x33) { - arg0->cursor = one; + arg0->state = one; arg0->unk20 = 0; var_v0 = gCupSelection * 4; arg0->unk1C = var_v0 + 1; @@ -10274,13 +10284,13 @@ void func_800AB314(struct_8018D9E0_entry* arg0) { arg0->unk1C = gCupSelection * 4; } if (D_8018EDEC == 3) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk20 = 0; } break; case 1: if ((arg0->unk1C / 4) != gCupSelection) { - arg0->cursor = 0; + arg0->state = 0; arg0->unk20 = 0; arg0->unk1C = 0; } else { @@ -10290,7 +10300,7 @@ void func_800AB314(struct_8018D9E0_entry* arg0) { arg0->unk1C = (gCupSelection * 4) + (((arg0->unk1C % 4) + one) % 4); } else { if (D_8018EDEC == 3) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk20 = 0; } } @@ -10299,24 +10309,24 @@ void func_800AB314(struct_8018D9E0_entry* arg0) { case 2: arg0->unk20++; if (arg0->unk20 >= 0x1A) { - arg0->cursor = 3; + arg0->state = 3; arg0->unk20 = 0; } if (D_8018EDEC != 3) { - arg0->cursor = 0; + arg0->state = 0; arg0->unk20 = 0; arg0->unk1C = 0; } break; case 3: if (D_8018EDEC != 3) { - arg0->cursor = 0; + arg0->state = 0; arg0->unk20 = 0; arg0->unk1C = 0; } break; } - switch (arg0->cursor) { + switch (arg0->state) { case 0: case 1: for (var_a1 = 0; var_a1 < 4; var_a1++) { @@ -10387,18 +10397,18 @@ void func_800AB9B0(struct_8018D9E0_entry* arg0) { arg0->column = (s32) D_800E7268->column; arg0->row = D_800E7268->row; } - temp_v1 = &D_800E7268[arg0->cursor]; - switch (arg0->cursor) { /* irregular */ + temp_v1 = &D_800E7268[arg0->state]; + switch (arg0->state) { /* irregular */ case 0: func_800A91D8(arg0, (s32) temp_v1->column, (s32) temp_v1->row); if (D_8018EDEC == 3) { - arg0->cursor = 1; + arg0->state = 1; } break; case 1: func_800A91D8(arg0, (s32) temp_v1->column, (s32) temp_v1->row); if (D_8018EDEC == 1) { - arg0->cursor = 0; + arg0->state = 0; } break; } @@ -10472,10 +10482,10 @@ void func_800ABC38(struct_8018D9E0_entry* arg0) { void func_800ABCF4(struct_8018D9E0_entry* arg0) { f64 temp_f0; - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ case 0: arg0->column = 0; - arg0->cursor = 1; + arg0->state = 1; arg0->unk20 = (get_string_width(gCupNames[D_800DC540]) / 2) + 0xA0; /* fallthrough */ case 1: @@ -10486,7 +10496,7 @@ void func_800ABCF4(struct_8018D9E0_entry* arg0) { } arg0->unk24 = (f32) (((f64) arg0->unk1C * 0.05) + 1.0); if (arg0->column >= (arg0->unk20 - 0x14)) { - arg0->cursor = 2; + arg0->state = 2; arg0->D_8018DEE0_index = 0; } break; @@ -10532,10 +10542,10 @@ void func_800ABEAC(struct_8018D9E0_entry* arg0) { } void func_800ABF68(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = 0x140; - arg0->cursor = 1; + arg0->state = 1; arg0->unk20 = 0xA0 - (get_string_width(gCourseNames[gCurrentCourseId]) / 2); /* fallthrough */ case 1: @@ -10546,7 +10556,7 @@ void func_800ABF68(struct_8018D9E0_entry* arg0) { } arg0->unk24 = (arg0->unk1C * 0.05) + 1.0; if ((arg0->unk20 + 0x14) >= arg0->column) { - arg0->cursor = 2; + arg0->state = 2; arg0->D_8018DEE0_index = 0; } break; @@ -10563,10 +10573,10 @@ void func_800ABF68(struct_8018D9E0_entry* arg0) { } void func_800AC128(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = 0x00000140; - arg0->cursor = 1; + arg0->state = 1; /* fallthrough */ case 1: func_800A940C(arg0, 0x00000064); @@ -10576,7 +10586,7 @@ void func_800AC128(struct_8018D9E0_entry* arg0) { } arg0->unk24 = (f32) (((f64) arg0->unk1C * 0.07) + 0.6); if (arg0->column == 0x00000064) { - arg0->cursor = 2; + arg0->state = 2; arg0->D_8018DEE0_index = 0; } break; @@ -10585,7 +10595,7 @@ void func_800AC128(struct_8018D9E0_entry* arg0) { arg0->unk1C = 0; arg0->unk24 = (f32) (1.5 - ((arg0->D_8018DEE0_index - 0xF) * 0.004 * (arg0->D_8018DEE0_index - 0xF))); if ((arg0->D_8018DEE0_index >= 0x10) && ((f64) arg0->unk24 < 0.8)) { - arg0->cursor = 3; + arg0->state = 3; arg0->D_8018DEE0_index = 0; } break; @@ -10607,23 +10617,23 @@ void func_800AC300(struct_8018D9E0_entry* arg0) { } void func_800AC324(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = 0x14A; - arg0->cursor = 1; + arg0->state = 1; func_800921B4(); break; case 1: func_800A9208(arg0, 0xA0); if (arg0->column == 0xA0) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk20 = 0; } break; case 2: arg0->unk20++; if (((D_8018D9D8 != 0) || (arg0->unk20 >= 0x5B)) && (D_800DDB24 != 0)) { - arg0->cursor = 3; + arg0->state = 3; arg0->unk1C = arg0->column; add_8018D9E0_entry(0xAB, 0, 0, 0); } @@ -10650,10 +10660,10 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { s32 var_a1; s32 var_t1; - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = -0x000000A0; - arg0->cursor = 1; + arg0->state = 1; for (var_a1 = 0; var_a1 < 4; var_a1++) { D_8018D9BC[var_a1] = gGPPointRewards[var_a1]; } @@ -10673,7 +10683,7 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { } else { arg0->unk20 = 0; arg0->column = 0; - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = 0; D_800DC5EC->screenStartX = 0x00F0; D_800DC5F0->screenStartX = 0x0050; @@ -10683,7 +10693,7 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { arg0->column = 0; arg0->unk1C++; if (((D_8018D9D8 != 0) || (arg0->unk1C >= 0x1F)) && (D_800DDB24 != 0)) { - arg0->cursor = 3; + arg0->state = 3; arg0->unk1C = 0; arg0->unk20 = 0; } @@ -10693,7 +10703,7 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { case 5: case 6: var_t1 = 0; - var_a1 = arg0->cursor - 3; + var_a1 = arg0->state - 3; arg0->unk1C++; if (((arg0->unk1C % 3) == 0) || (D_8018D9D8 != 0)) { if (D_8018D9BC[var_a1] > 0) { @@ -10713,17 +10723,17 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { if (var_t1 != 0) { arg0->unk20 = 0; arg0->unk1C = 0; - if (arg0->cursor < 6) { - arg0->cursor++; + if (arg0->state < 6) { + arg0->state++; } else { - arg0->cursor = 7; + arg0->state = 7; } } break; case 7: arg0->unk1C++; if ((((D_8018D9D8 != 0) && (arg0->unk1C >= 0xB)) || (arg0->unk1C >= 0x3D)) && (D_800DDB24 != 0)) { - arg0->cursor = 8; + arg0->state = 8; arg0->unk1C = 0; } break; @@ -10733,7 +10743,7 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { arg0->unk1C += 5; } if (arg0->unk1C >= 0x29) { - arg0->cursor = 9; + arg0->state = 9; } break; case 9: @@ -10742,7 +10752,7 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { arg0->unk1C -= 5; } if (arg0->unk1C <= 0) { - arg0->cursor = 0x0000000A; + arg0->state = 0x0000000A; arg0->unk1C = 0; if (gCourseIndexInCup == 3) { for (var_a1 = 0; var_a1 < 8; var_a1++) { @@ -10757,14 +10767,14 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { case 10: arg0->unk1C++; if (arg0->unk1C > 0) { - arg0->cursor = 0x0000000B; + arg0->state = 0x0000000B; arg0->unk1C = 0; func_800921B4(); } break; case 11: if ((D_8018D9D8 != 0) && (D_800DDB24 != 0)) { - arg0->cursor = 0x0000000C; + arg0->state = 0x0000000C; arg0->unk20 = arg0->row; play_sound2(SOUND_ACTION_NEXT_COURSE); } @@ -10777,7 +10787,7 @@ void func_800AC458(struct_8018D9E0_entry* arg0) { D_800DC5F0->screenStartY -= 0x10; } else { arg0->unk20 = 0; - arg0->cursor = 0x0000000D; + arg0->state = 0x0000000D; arg0->unk1C = 0; D_800DC5EC->screenStartY = 0x012C; D_800DC5F0->screenStartY = -0x003C; @@ -10795,16 +10805,16 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC458.s") #endif void func_800AC978(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ case 0: arg0->column = 0x14A; - arg0->cursor = 1; + arg0->state = 1; arg0->unk1C = 0xFF; break; case 1: func_800A9208(arg0, 0xA0); if (arg0->column == 0xA0) { - arg0->cursor = 2; + arg0->state = 2; } break; case 2: @@ -10818,13 +10828,13 @@ void func_800AC978(struct_8018D9E0_entry* arg0) { } void func_800ACA14(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ case 0: if (arg0->unk20 >= 0xB) { arg0->unk1C += 3; } if (arg0->unk1C >= 0x65) { - arg0->cursor = 0x0000000B; + arg0->state = 0x0000000B; arg0->unk1C = 0; } break; @@ -10835,8 +10845,8 @@ void func_800ACA14(struct_8018D9E0_entry* arg0) { } if ((gControllerFive->buttonPressed | gControllerFive->stickPressed) & 0x800) { - if (arg0->cursor >= 0xC) { - arg0->cursor--; + if (arg0->state >= 0xC) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -10845,8 +10855,8 @@ void func_800ACA14(struct_8018D9E0_entry* arg0) { } } if ((gControllerFive->buttonPressed | gControllerFive->stickPressed) & 0x400) { - if (arg0->cursor < 0xC) { - arg0->cursor++; + if (arg0->state < 0xC) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -10874,11 +10884,11 @@ void func_800ACA14(struct_8018D9E0_entry* arg0) { void func_800ACC50(struct_8018D9E0_entry* arg0) { s32 var_s0; - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->unk1C += 3; if (arg0->unk1C >= 0x65) { - arg0->cursor = 1; + arg0->state = 1; arg0->unk1C = 0; for (var_s0 = 0; var_s0 < gPlayerCount; var_s0++) { add_8018D9E0_entry(var_s0 + 0xB1, 0, 0, (s8) (5 - var_s0)); @@ -10886,17 +10896,17 @@ void func_800ACC50(struct_8018D9E0_entry* arg0) { } break; case 1: - if (find_8018D9E0_entry_dupe(0x000000B1)->cursor >= 2) { - arg0->cursor = 2; + if (find_8018D9E0_entry_dupe(0x000000B1)->state >= 2) { + arg0->state = 2; } break; case 2: arg0->unk1C += 0x20; if (arg0->unk1C >= 0x100) { if (gModeSelection == VERSUS) { - arg0->cursor = (s32) D_8018EDF4; + arg0->state = (s32) D_8018EDF4; } else { - arg0->cursor = (s32) D_8018EDF6; + arg0->state = (s32) D_8018EDF6; } arg0->unk1C = 0; } @@ -10907,8 +10917,8 @@ void func_800ACC50(struct_8018D9E0_entry* arg0) { case 13: if (func_800B4520() == 0) { if ((gControllerFive->buttonPressed | gControllerFive->stickPressed) & 0x800) { - if (arg0->cursor >= 0xB) { - arg0->cursor--; + if (arg0->state >= 0xB) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -10917,8 +10927,8 @@ void func_800ACC50(struct_8018D9E0_entry* arg0) { } } if ((gControllerFive->buttonPressed | gControllerFive->stickPressed) & 0x400) { - if (arg0->cursor < 0xD) { - arg0->cursor++; + if (arg0->state < 0xD) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -10930,9 +10940,9 @@ void func_800ACC50(struct_8018D9E0_entry* arg0) { func_8009DFE0(0x0000001E); play_sound2(SOUND_MENU_OK_CLICKED); if (gModeSelection == VERSUS) { - D_8018EDF4 = (s8) arg0->cursor; + D_8018EDF4 = (s8) arg0->state; } else { - D_8018EDF6 = (s8) arg0->cursor; + D_8018EDF6 = (s8) arg0->state; } if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -10954,18 +10964,18 @@ void func_800ACF40(struct_8018D9E0_entry* arg0) { temp_a2 = arg0->type - 0xB1; temp_a1 = D_800EFD64[gCharacterSelections[arg0->type - 0xB1]]; - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = D_800E72F8.column; arg0->row = D_800E72F8.row; - arg0->cursor = 1; + arg0->state = 1; break; case 1: temp_v0_2 = &D_800E7300[((gPlayerCount - 2) * 4) + temp_a2]; func_800A9208(arg0, temp_v0_2->column); func_800A9278(arg0, temp_v0_2->row); if (arg0->column == temp_v0_2->column) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk20 = 0; } break; @@ -10986,10 +10996,10 @@ void func_800ACF40(struct_8018D9E0_entry* arg0) { if (var_v1 == 0) { arg0->unk20++; if (arg0->unk20 >= 0x1F) { - if (find_8018D9E0_entry_dupe(0x000000B0)->cursor >= 2) { + if (find_8018D9E0_entry_dupe(0x000000B0)->state >= 2) { func_8009A640(arg0->D_8018DEE0_index, 0, temp_a2, segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_a1])); - arg0->cursor = 3; + arg0->state = 3; func_800CA24C(temp_a2); func_800C90F4(temp_a2, (gCharacterSelections[temp_a2] * 0x10) + 0x29008007); } @@ -10999,7 +11009,7 @@ void func_800ACF40(struct_8018D9E0_entry* arg0) { case 3: if (D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex >= D_800E8440[temp_a1]) { func_8009A640(arg0->D_8018DEE0_index, 0, temp_a2, segmented_to_virtual_dupe_2(D_800E83A0[temp_a1])); - arg0->cursor = 4; + arg0->state = 4; } break; case 4: @@ -11009,30 +11019,30 @@ void func_800ACF40(struct_8018D9E0_entry* arg0) { } void func_800AD1A4(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = 0x0000014A; - arg0->cursor = 1; + arg0->state = 1; func_800921B4(); add_8018D9E0_entry(0x000000BB, 0, 0, 0); break; case 1: func_800A9208(arg0, 0x000000A0); if (arg0->column == 0x000000A0) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk20 = 0; } break; case 2: arg0->unk20++; if (arg0->unk20 >= 0x15) { - arg0->cursor = 3; + arg0->state = 3; } break; case 3: if (D_8018D9D8 != 0) { func_800921B4(); - arg0->cursor = 4; + arg0->state = 4; arg0->unk1C = arg0->column; add_8018D9E0_entry(0x000000BA, 0, 0, 0); } @@ -11060,10 +11070,10 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { s32 var_a1; s32 index; - switch (arg0->cursor) { /* switch 3; irregular */ - case 0: /* switch 3 */ + switch (arg0->state) { /* switch 3; irregular */ + case 0: /* switch 3 */ arg0->column = -0x000000A0; - arg0->cursor = 1; + arg0->state = 1; for (index = 0; index < 4; index++) { D_8018D9BC[index] = gGPPointRewards[index]; } @@ -11084,9 +11094,9 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { } else { arg0->unk20 = 0; arg0->column = 0; - arg0->cursor = D_8018EDF5; - if ((arg0->cursor == 9) && (D_80162DF8 == 1)) { - arg0->cursor--; + arg0->state = D_8018EDF5; + if ((arg0->state == 9) && (D_80162DF8 == 1)) { + arg0->state--; } D_800DC5EC->screenStartX = 0x00F0; D_800DC5F0->screenStartX = 0x0050; @@ -11100,10 +11110,10 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { case 10: /* switch 3 */ if (func_800B4520() == 0) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { - if (arg0->cursor >= 6) { - arg0->cursor--; - if ((D_80162DF8 == 1) && (arg0->cursor == 9)) { - arg0->cursor--; + if (arg0->state >= 6) { + arg0->state--; + if ((D_80162DF8 == 1) && (arg0->state == 9)) { + arg0->state--; } play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { @@ -11113,13 +11123,13 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { } } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->cursor < 0xA) { - arg0->cursor++; - if ((D_80162DF8 == 1) && (arg0->cursor == 9)) { - arg0->cursor++; + if (arg0->state < 0xA) { + arg0->state++; + if ((D_80162DF8 == 1) && (arg0->state == 9)) { + arg0->state++; } - if ((arg0->cursor == 0x0000000A) && (D_80162DD4 != 0)) { - arg0->cursor -= 2; + if ((arg0->state == 0x0000000A) && (D_80162DD4 != 0)) { + arg0->state -= 2; } else { play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { @@ -11130,7 +11140,7 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { } } if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->cursor == 0x0000000A) { + if (arg0->state == 0x0000000A) { var_v1 = 0; if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11143,7 +11153,7 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { break; case 0: /* switch 4 */ func_800B6708(); - arg0->cursor = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x11; + arg0->state = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x11; var_v1 = 1; play_sound2(SOUND_MENU_SELECT); break; @@ -11159,26 +11169,26 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { if (gControllerPak1State == 0) { switch (func_800B5F30()) { /* switch 2 */ case -1: /* switch 2 */ - arg0->cursor = 0x0000000B; + arg0->state = 0x0000000B; var_v1 = 1; break; case -3: /* switch 2 */ case -2: /* switch 2 */ - arg0->cursor = 0x0000000C; + arg0->state = 0x0000000C; var_v1 = 1; break; case 1: /* switch 2 */ case 11: /* switch 2 */ - arg0->cursor = 0x0000000B; + arg0->state = 0x0000000B; var_v1 = 1; break; case 10: /* switch 2 */ - arg0->cursor = 0x0000000C; + arg0->state = 0x0000000C; var_v1 = 1; break; default: /* switch 2 */ var_v1 = 1; - arg0->cursor = 0x0000000C; + arg0->state = 0x0000000C; break; case 0: break; @@ -11190,29 +11200,29 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) == 0) { func_800B6708(); - arg0->cursor = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x11; + arg0->state = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x11; play_sound2(SOUND_MENU_SELECT); return; } } if (gControllerPak1MaxWriteableFiles >= gControllerPak1NumFilesUsed) { - arg0->cursor = 0x0000000E; + arg0->state = 0x0000000E; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } if (gControllerPak1NumPagesFree >= 0x79) { - arg0->cursor = 0x00000013; + arg0->state = 0x00000013; arg0->unk1C = 0; play_sound2(SOUND_MENU_SELECT); return; } - arg0->cursor = 0x0000000E; + arg0->state = 0x0000000E; play_sound2(SOUND_MENU_FILE_NOT_FOUND); } } else { - arg0->unk1C = arg0->cursor; - D_8018EDF5 = arg0->cursor; - arg0->cursor = 0x0000001E; + arg0->unk1C = arg0->state; + D_8018EDF5 = arg0->state; + arg0->state = 0x0000001E; arg0->unk20 = arg0->row; play_sound2(SOUND_ACTION_NEXT_COURSE); if (arg0->unk24 < 4.2) { @@ -11230,7 +11240,7 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { case 16: /* switch 1 */ case 26: /* switch 1 */ if (gControllerOne->buttonPressed & 0xD000) { - arg0->cursor = 0x0000000A; + arg0->state = 0x0000000A; play_sound2(SOUND_MENU_GO_BACK); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11239,11 +11249,11 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { break; case 17: /* switch 1 */ case 18: /* switch 1 */ - arg0->unk20 = arg0->cursor - 0x11; + arg0->unk20 = arg0->state - 0x11; if (func_800B639C((gCupSelection * 4) + gCourseIndexInCup) != arg0->unk20) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { - if (arg0->cursor >= 0x12) { - arg0->cursor--; + if (arg0->state >= 0x12) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11252,8 +11262,8 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { } } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->cursor < 0x12) { - arg0->cursor++; + if (arg0->state < 0x12) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11263,19 +11273,19 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { } } if (gControllerOne->buttonPressed & 0x4000) { - arg0->cursor = 0x0000000A; + arg0->state = 0x0000000A; play_sound2(SOUND_MENU_GO_BACK); return; } if (gControllerOne->buttonPressed & 0x9000) { thing = &D_8018EE10[arg0->unk20]; if (thing->ghostDataSaved == 0) { - arg0->cursor = 0x00000019; + arg0->state = 0x00000019; arg0->unk1C = 0; } else if (func_800B63F0(arg0->unk20) == 0) { - arg0->cursor = 0x00000010; + arg0->state = 0x00000010; } else { - arg0->cursor = 0x00000014; + arg0->state = 0x00000014; } play_sound2(SOUND_MENU_SELECT); if (arg0->unk24 < 4.2) { @@ -11285,19 +11295,19 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { break; case 19: /* switch 1 */ if ((arg0->unk1C == 1) && (func_800B6A68() != 0)) { - arg0->cursor = 0x0000000F; + arg0->state = 0x0000000F; return; } else { arg0->unk1C++; if (arg0->unk1C >= 2) { - arg0->cursor = 0x00000011; + arg0->state = 0x00000011; } } break; case 20: /* switch 1 */ case 21: /* switch 1 */ - if (((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) && (arg0->cursor >= 0x15)) { - arg0->cursor--; + if (((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) && (arg0->state >= 0x15)) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11305,8 +11315,8 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { arg0->unk8 = -1; } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->cursor < 0x15) { - arg0->cursor++; + if (arg0->state < 0x15) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11315,20 +11325,20 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { } } if (gControllerOne->buttonPressed & 0x4000) { - arg0->cursor = arg0->unk20 + 0x11; + arg0->state = arg0->unk20 + 0x11; play_sound2(SOUND_MENU_GO_BACK); return; } if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->cursor == 0x00000015) { - arg0->cursor = 0x00000019; + if (arg0->state == 0x00000015) { + arg0->state = 0x00000019; arg0->unk1C = 0; play_sound2(SOUND_MENU_SELECT); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; } } else { - arg0->cursor = arg0->unk20 + 0x11; + arg0->state = arg0->unk20 + 0x11; play_sound2(SOUND_MENU_GO_BACK); return; } @@ -11338,19 +11348,19 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { if (arg0->unk1C == 1) { if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) != 0) { - arg0->cursor = 0x0000001A; + arg0->state = 0x0000001A; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } if (func_800B6178(arg0->unk20) != 0) { - arg0->cursor = 0x0000001A; + arg0->state = 0x0000001A; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } } arg0->unk1C++; if (arg0->unk1C >= 2) { - arg0->cursor = 0x0000000A; + arg0->state = 0x0000000A; return; } break; @@ -11384,7 +11394,7 @@ void func_800AD2E8(struct_8018D9E0_entry* arg0) { break; } arg0->unk20 = 0; - arg0->cursor = 0x0000001F; + arg0->state = 0x0000001F; D_800DC5EC->screenStartY = 0x012C; D_800DC5F0->screenStartY = -0x003C; D_8015F894 = 4; @@ -11405,9 +11415,9 @@ void func_800ADF48(struct_8018D9E0_entry* arg0) { struct Controller* controller; if (gIsGamePaused != 0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: - arg0->cursor = D_800F0B50[gModeSelection]; + arg0->state = D_800F0B50[gModeSelection]; break; case 11: case 12: @@ -11427,8 +11437,8 @@ void func_800ADF48(struct_8018D9E0_entry* arg0) { if (func_800B4520() == 0) { controller = &gControllers[gIsGamePaused - 1]; if ((controller->buttonPressed | controller->stickPressed) & 0x800) { - if (D_800F0B50[gModeSelection] < arg0->cursor) { - arg0->cursor--; + if (D_800F0B50[gModeSelection] < arg0->state) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11437,8 +11447,8 @@ void func_800ADF48(struct_8018D9E0_entry* arg0) { } } if ((controller->buttonPressed | controller->stickPressed) & 0x400) { - if (arg0->cursor < D_800F0B54[gModeSelection]) { - arg0->cursor++; + if (arg0->state < D_800F0B54[gModeSelection]) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11447,15 +11457,15 @@ void func_800ADF48(struct_8018D9E0_entry* arg0) { } } if (controller->buttonPressed & B_BUTTON) { - if (arg0->cursor != D_800F0B50[gModeSelection]) { - arg0->cursor = D_800F0B50[gModeSelection]; + if (arg0->state != D_800F0B50[gModeSelection]) { + arg0->state = D_800F0B50[gModeSelection]; play_sound2(SOUND_MENU_GO_BACK); return; } } if (controller->buttonPressed & (START_BUTTON | A_BUTTON)) { - if (arg0->cursor == D_800F0B50[gModeSelection]) { - arg0->cursor = 0; + if (arg0->state == D_800F0B50[gModeSelection]) { + arg0->state = 0; gIsGamePaused = 0; func_8028DF38(); func_800C9F90(0U); @@ -11474,7 +11484,7 @@ void func_800ADF48(struct_8018D9E0_entry* arg0) { break; } } else { - arg0->cursor = 0; + arg0->state = 0; } } @@ -11482,19 +11492,19 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { struct_8018EE10_entry* thing; s32 var_v1; - if (arg0->cursor != 0) { + if (arg0->state != 0) { D_800DC5B8 = 0; } - switch (arg0->cursor) { /* switch 1 */ - case 0: /* switch 1 */ + switch (arg0->state) { /* switch 1 */ + case 0: /* switch 1 */ if (arg0->unk1C < 0x1E) { arg0->unk1C++; } if (gControllerOne->buttonPressed & 0x1000) { - arg0->cursor = 0x0000000F; + arg0->state = 0x0000000F; play_sound2(SOUND_ACTION_GO_BACK_2); } else if (playerHUD[PLAYER_ONE].raceCompleteBool != 0) { - arg0->cursor = 1; + arg0->state = 1; arg0->unk1C = 0; } break; @@ -11503,7 +11513,7 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { case 1: /* switch 1 */ arg0->unk1C += 3; if (arg0->unk1C >= 0x8D) { - arg0->cursor = 0x0000000F; + arg0->state = 0x0000000F; } break; case 11: /* switch 1 */ @@ -11514,8 +11524,8 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { case 16: /* switch 1 */ if (func_800B4520() == 0) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { - if (arg0->cursor >= 0xC) { - arg0->cursor--; + if (arg0->state >= 0xC) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11524,8 +11534,8 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { } } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->cursor < 0x10) { - arg0->cursor++; + if (arg0->state < 0x10) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11534,7 +11544,7 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { } } if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->cursor == 0x00000010) { + if (arg0->state == 0x00000010) { var_v1 = 0; if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11547,7 +11557,7 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { break; case PFS_NO_ERROR: /* switch 3 */ func_800B6708(); - arg0->cursor = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x1E; + arg0->state = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x1E; var_v1 = 1; break; case PFS_ERR_NEW_PACK: /* switch 3 */ @@ -11565,26 +11575,26 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { if (gControllerPak1State == 0) { switch (func_800B5F30()) { /* switch 2 */ case PFS_INVALID_DATA: /* switch 2 */ - arg0->cursor = 0x00000015; + arg0->state = 0x00000015; var_v1 = 1; break; case PFS_FREE_BLOCKS_ERROR: /* switch 2 */ case PFS_NUM_FILES_ERROR: /* switch 2 */ - arg0->cursor = 0x00000016; + arg0->state = 0x00000016; var_v1 = 1; break; case PFS_ERR_NOPACK: /* switch 2 */ case PFS_ERR_DEVICE: /* switch 2 */ - arg0->cursor = 0x00000015; + arg0->state = 0x00000015; var_v1 = 1; break; case PFS_ERR_ID_FATAL: /* switch 2 */ - arg0->cursor = 0x00000016; + arg0->state = 0x00000016; var_v1 = 1; break; default: /* switch 2 */ var_v1 = 1; - arg0->cursor = 0x00000016; + arg0->state = 0x00000016; break; case 0: break; @@ -11596,20 +11606,20 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) == 0) { func_800B6708(); - arg0->cursor = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x1E; + arg0->state = func_800B6348((gCupSelection * 4) + gCourseIndexInCup) + 0x1E; play_sound2(SOUND_MENU_SELECT); return; } } if (gControllerPak1MaxWriteableFiles >= gControllerPak1NumFilesUsed) { - arg0->cursor = 0x00000018; + arg0->state = 0x00000018; play_sound2(SOUND_MENU_FILE_NOT_FOUND); } else if (gControllerPak1NumPagesFree >= 0x79) { - arg0->cursor = 0x00000020; + arg0->state = 0x00000020; arg0->unk1C = 0; play_sound2(SOUND_MENU_SELECT); } else { - arg0->cursor = 0x00000018; + arg0->state = 0x00000018; play_sound2(SOUND_MENU_FILE_NOT_FOUND); } } else { @@ -11632,7 +11642,7 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { case 26: /* switch 1 */ case 41: /* switch 1 */ if (gControllerOne->buttonPressed & 0xD000) { - arg0->cursor = 0x00000010; + arg0->state = 0x00000010; play_sound2(SOUND_MENU_GO_BACK); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11641,11 +11651,11 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { break; case 30: /* switch 1 */ case 31: /* switch 1 */ - arg0->unk20 = (u32) arg0->cursor - 0x1E; + arg0->unk20 = (u32) arg0->state - 0x1E; if (func_800B639C((gCupSelection * 4) + gCourseIndexInCup) != arg0->unk20) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { - if (arg0->cursor >= 0x1F) { - arg0->cursor--; + if (arg0->state >= 0x1F) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11654,8 +11664,8 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { } } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->cursor < 0x1F) { - arg0->cursor++; + if (arg0->state < 0x1F) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11665,17 +11675,17 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { } } if (gControllerOne->buttonPressed & 0x4000) { - arg0->cursor = 0x00000010; + arg0->state = 0x00000010; play_sound2(SOUND_MENU_GO_BACK); } else if (gControllerOne->buttonPressed & 0x9000) { thing = &D_8018EE10[arg0->unk20]; if (thing->ghostDataSaved == 0) { - arg0->cursor = 0x00000028; + arg0->state = 0x00000028; arg0->unk1C = 0; } else if (func_800B63F0(arg0->unk20) == 0) { - arg0->cursor = 0x0000001A; + arg0->state = 0x0000001A; } else { - arg0->cursor = 0x00000023; + arg0->state = 0x00000023; } play_sound2(SOUND_MENU_SELECT); if (arg0->unk24 < 4.2) { @@ -11685,19 +11695,19 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { break; case 32: /* switch 1 */ if ((arg0->unk1C == 1) && (func_800B6A68() != 0)) { - arg0->cursor = 0x00000019; + arg0->state = 0x00000019; } else { arg0->unk1C++; if (arg0->unk1C >= 2) { - arg0->cursor = 0x0000001E; + arg0->state = 0x0000001E; } } break; case 35: /* switch 1 */ case 36: /* switch 1 */ if (((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) && - ((s32) (u32) arg0->cursor >= 0x24)) { - arg0->cursor--; + ((s32) (u32) arg0->state >= 0x24)) { + arg0->state--; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11705,8 +11715,8 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { arg0->unk8 = -1; } if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { - if (arg0->cursor < 0x24) { - arg0->cursor++; + if (arg0->state < 0x24) { + arg0->state++; play_sound2(SOUND_MENU_CURSOR_MOVE); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; @@ -11715,18 +11725,18 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { } } if (gControllerOne->buttonPressed & 0x4000) { - arg0->cursor = arg0->unk20 + 0x1E; + arg0->state = arg0->unk20 + 0x1E; play_sound2(SOUND_MENU_GO_BACK); } else if (gControllerOne->buttonPressed & 0x9000) { - if (arg0->cursor == 0x00000024) { - arg0->cursor = 0x00000028; + if (arg0->state == 0x00000024) { + arg0->state = 0x00000028; arg0->unk1C = 0; play_sound2(SOUND_MENU_SELECT); if (arg0->unk24 < 4.2) { arg0->unk24 += 4.0; } } else { - arg0->cursor = arg0->unk20 + 0x1E; + arg0->state = arg0->unk20 + 0x1E; play_sound2(SOUND_MENU_GO_BACK); } } @@ -11735,43 +11745,43 @@ void func_800AE218(struct_8018D9E0_entry* arg0) { if (arg0->unk1C == 1) { if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, (u8*) gGameName, (u8*) gExtCode, &gControllerPak1FileNote) != 0) { - arg0->cursor = 0x00000029; + arg0->state = 0x00000029; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } if (func_800B6178(arg0->unk20) != 0) { - arg0->cursor = 0x00000029; + arg0->state = 0x00000029; play_sound2(SOUND_MENU_FILE_NOT_FOUND); return; } } arg0->unk1C++; if (arg0->unk1C >= 2) { - arg0->cursor = 0x00000010; + arg0->state = 0x00000010; } break; } } void func_800AEC54(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = (get_string_width(D_800E7780) / 2) + 0x140; arg0->row = 0x000000DA; - arg0->cursor = 1; + arg0->state = 1; func_800C90F4(0U, (D_80162DE4 * 0x10) + 0x29008001); break; case 1: func_800A9208(arg0, 0x000000A0); if (arg0->column == 0x000000A0) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk1C = 0; } break; case 2: arg0->unk1C++; if (arg0->unk1C >= 0x3D) { - arg0->cursor = 3; + arg0->state = 3; arg0->unk1C = 0; } break; @@ -11784,8 +11794,8 @@ void func_800AEC54(struct_8018D9E0_entry* arg0) { // Purposeful fallthrough case 3: func_800A94C8(arg0, 0x000000A0, -1); - if (((arg0->column + 0x14) == -(get_string_width(D_800E7780) / 2)) && (arg0->cursor == 3)) { - arg0->cursor = 4; + if (((arg0->column + 0x14) == -(get_string_width(D_800E7780) / 2)) && (arg0->state == 3)) { + arg0->state = 4; } break; default: @@ -11842,13 +11852,13 @@ void func_800AEF14(struct_8018D9E0_entry* arg0) { } void func_800AEF74(struct_8018D9E0_entry* arg0) { - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ case 0: if (D_80162DF8 == 1) { - arg0->cursor = 1; + arg0->state = 1; arg0->unk1C = 0; } else if (playerHUD[PLAYER_ONE].raceCompleteBool == (s8) 1) { - arg0->cursor = 2; + arg0->state = 2; } break; case 2: @@ -11856,7 +11866,7 @@ void func_800AEF74(struct_8018D9E0_entry* arg0) { case 1: arg0->unk1C += 1; if (playerHUD[PLAYER_ONE].raceCompleteBool == 1) { - arg0->cursor = 2; + arg0->state = 2; } break; } @@ -11865,12 +11875,12 @@ void func_800AEF74(struct_8018D9E0_entry* arg0) { void func_800AF004(struct_8018D9E0_entry* arg0) { UNUSED s32 temp_t1; - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->unk1C += 3; if (arg0->unk1C >= 0x65) { arg0->unk1C = 0; - arg0->cursor = 1; + arg0->state = 1; gCupSelection %= 4; gCCSelection %= 4; add_8018D9E0_entry(0x0000012C, 0, 0, 4); @@ -11883,15 +11893,15 @@ void func_800AF004(struct_8018D9E0_entry* arg0) { arg0->unk1C += 1; if (arg0->unk1C >= 9) { arg0->unk1C = 0; - arg0->cursor++; - add_8018D9E0_entry(arg0->cursor + 0x12B, 0, 0, 4); + arg0->state++; + add_8018D9E0_entry(arg0->state + 0x12B, 0, 0, 4); } break; case 5: arg0->unk1C += 1; if ((arg0->unk1C >= 0x65) && ((gControllerFive->buttonPressed != 0) || (gControllerFive->stickPressed != 0))) { - arg0->cursor = 6; + arg0->state = 6; arg0->unk1C = 0; if (D_802874D8.unk1D < 3) { play_sound2(SOUND_MENU_OK_CLICKED); @@ -11904,7 +11914,7 @@ void func_800AF004(struct_8018D9E0_entry* arg0) { func_8009DFE0(0x0000001E); func_800CA330(0x19U); func_800CA388(0x19U); - arg0->cursor = 7; + arg0->state = 7; break; case 7: default: @@ -11916,18 +11926,18 @@ void func_800AF1AC(struct_8018D9E0_entry* arg0) { Unk_D_800E70A0* temp_v0_2; s32 idx = arg0->type - 0x12C; - switch (arg0->cursor) { /* irregular */ + switch (arg0->state) { /* irregular */ case 0: temp_v0_2 = &D_800E7458[idx]; arg0->column = temp_v0_2->column; arg0->row = temp_v0_2->row; - arg0->cursor = 1; + arg0->state = 1; break; case 1: temp_v0_2 = &D_800E7480[idx]; func_800A91D8(arg0, temp_v0_2->column, temp_v0_2->row); if ((arg0->column == temp_v0_2->column) && (arg0->row == temp_v0_2->row)) { - arg0->cursor = 2; + arg0->state = 2; } break; case 2: @@ -11944,18 +11954,18 @@ void func_800AF270(struct_8018D9E0_entry* arg0) { temp_v1 = arg0->type - 0x12C; sp30 = D_802874D8.unk1E; temp_v0 = D_800EFD64[sp30]; - switch (arg0->cursor) { + switch (arg0->state) { case 0: thing = &D_800E7458[temp_v1]; arg0->column = thing->column; arg0->row = thing->row; - arg0->cursor = 1; + arg0->state = 1; break; case 1: thing = &D_800E7480[temp_v1]; func_800A91D8(arg0, thing->column, thing->row); if ((arg0->column == thing->column) && (arg0->row == thing->row)) { - arg0->cursor = 2; + arg0->state = 2; arg0->unk20 = 0; } break; @@ -11963,12 +11973,12 @@ void func_800AF270(struct_8018D9E0_entry* arg0) { arg0->unk20++; if (arg0->unk20 >= 0x1F) { if (D_802874D8.unk1D >= 3) { - arg0->cursor = 4; + arg0->state = 4; func_800CA0B8(); func_800C90F4(0U, (sp30 * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x03)); func_800CA0A0(); } else { - arg0->cursor = 3; + arg0->state = 3; func_8009A640(arg0->D_8018DEE0_index, 0, sp30, segmented_to_virtual_dupe_2(gCharacterCelebrateAnimation[temp_v0])); func_800CA0B8(); @@ -11980,7 +11990,7 @@ void func_800AF270(struct_8018D9E0_entry* arg0) { case 3: if (D_8018DEE0[arg0->D_8018DEE0_index].sequenceIndex >= D_800E8440[temp_v0]) { func_8009A640(arg0->D_8018DEE0_index, 0, sp30, segmented_to_virtual_dupe_2(D_800E83A0[temp_v0])); - arg0->cursor = 4; + arg0->state = 4; } break; case 4: @@ -12006,10 +12016,10 @@ void func_800AF4DC(struct_8018D9E0_entry* arg0) { temp_v0 = arg0->type - 0x190; temp_v1 = &D_802850C0[temp_v0]; arg0->row = temp_v1->row; - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = temp_v1->startingColumn; - arg0->cursor = 1; + arg0->state = 1; arg0->unk20 = temp_v1->columnExtra + (get_string_width(D_802854B0[temp_v0]) * temp_v1->textScaling / 2); /* fallthrough */ case 1: @@ -12020,7 +12030,7 @@ void func_800AF4DC(struct_8018D9E0_entry* arg0) { } arg0->unk24 = (arg0->unk1C * 0.05) + 1.0; if (arg0->column >= (arg0->unk20 - 0x14)) { - arg0->cursor = 2; + arg0->state = 2; arg0->D_8018DEE0_index = 0; } break; @@ -12031,12 +12041,12 @@ void func_800AF4DC(struct_8018D9E0_entry* arg0) { arg0->unk24 = ((arg0->D_8018DEE0_index - 0xA) * 0.0085 * (arg0->D_8018DEE0_index - 0xA)) + 0.4; if ((arg0->D_8018DEE0_index >= 9) && ((f64) arg0->unk24 > 1)) { arg0->unk24 = 1.0f; - arg0->cursor = 3; + arg0->state = 3; } break; case 3: if ((u8) D_8018ED91 != 0) { - arg0->cursor = 4; + arg0->state = 4; } break; case 4: @@ -12058,10 +12068,10 @@ void func_800AF740(struct_8018D9E0_entry* arg0) { temp_v0 = arg0->type - 0x190; temp_v1 = &D_802850C0[temp_v0]; arg0->row = temp_v1->row; - switch (arg0->cursor) { + switch (arg0->state) { case 0: arg0->column = temp_v1->startingColumn; - arg0->cursor = 1; + arg0->state = 1; arg0->unk20 = temp_v1->columnExtra - (get_string_width(D_802854B0[temp_v0]) * temp_v1->textScaling / 2); /* fallthrough */ case 1: @@ -12072,7 +12082,7 @@ void func_800AF740(struct_8018D9E0_entry* arg0) { } arg0->unk24 = (arg0->unk1C * 0.05) + 1.0; if ((arg0->unk20 + 0x14) >= arg0->column) { - arg0->cursor = 2; + arg0->state = 2; arg0->D_8018DEE0_index = 0; } break; @@ -12083,12 +12093,12 @@ void func_800AF740(struct_8018D9E0_entry* arg0) { arg0->unk24 = ((arg0->D_8018DEE0_index - 0xA) * 0.0085 * (arg0->D_8018DEE0_index - 0xA)) + 0.4; if ((arg0->D_8018DEE0_index >= 9) && ((f64) arg0->unk24 > 1)) { arg0->unk24 = 1.0f; - arg0->cursor = 3; + arg0->state = 3; } break; case 3: if ((u8) D_8018ED91 != 0) { - arg0->cursor = 4; + arg0->state = 4; } break; case 4: diff --git a/src/code_80091750.h b/src/code_80091750.h index c35039dbf..906741bfd 100644 --- a/src/code_80091750.h +++ b/src/code_80091750.h @@ -22,9 +22,9 @@ it last longer See `func_80096CD8` for the actual drawing of the static */ typedef struct { - /* 0x00 */ s32 type; // id maybe? - /* 0x04 */ s32 cursor; // sound mode, maybe some other stuff - /* 0x08 */ s32 unk8; // This is used but I can't tell what for + /* 0x00 */ s32 type; // id maybe? + /* 0x04 */ s32 state; // sound mode, maybe some other stuff + /* 0x08 */ s32 unk8; // This is used but I can't tell what for /* 0x0C */ s32 column; /* 0x10 */ s32 row; /* 0x14 */ u8 priority; // priority/depth/z-level. Higher values are drawn on top of lower values @@ -124,8 +124,8 @@ s32 get_string_width(char*); void set_text_color(s32); void func_800930E4(s32, s32, char*); void print_text0(s32, s32, char*, s32, f32, f32, s32); -void func_80093324(s32, s32, char*, s32, f32, f32); -void func_80093358(s32, s32, char*, s32, f32, f32); +void print_text_mode_1(s32, s32, char*, s32, f32, f32); +void print_text_mode_2(s32, s32, char*, s32, f32, f32); void print_text1(s32, s32, char*, s32, f32, f32, s32); void func_800936B8(s32, s32, char*, s32, f32, f32); void draw_text(s32, s32, char*, s32, f32, f32); @@ -494,7 +494,7 @@ extern char* gDebugCourseNames[]; extern const s8 gPerCupIndexByCourseId[]; // D_800EFD50 extern const s8 D_800EFD64[]; extern s8 gCupSelectionByCourseId[]; -extern char* D_800E7678[]; +extern char* gCupText[]; extern char* gDebugCharacterNames[]; extern char* D_800E76A8[]; extern char* D_800E76CC[]; @@ -502,12 +502,12 @@ extern char* D_800E76DC[]; extern char* gDebugScreenModeNames[]; extern char* gDebugSoundModeNames[]; extern char* gSoundModeNames[]; // D_800E7710 -extern char* D_800E7720[]; -extern char* D_800E7728[]; -extern char* D_800E7730; -extern char* D_800E7734[]; +extern char* gWinLoseText[]; +extern char* gBestTimeText[]; +extern char* gLapTimeText; +extern char* gPrefixTimeText[]; extern char* D_800E7744[]; -extern char* gTextPauseButton[]; +extern char* gMenuText[]; extern char* D_800E7778[]; extern char D_800E7780[]; extern char* D_800E77A0[]; @@ -517,7 +517,7 @@ extern char D_800E77D8[]; extern char* sCourseLengths[]; extern char* D_800E7834[]; extern char* D_800E7840[]; -extern char* D_800E7848[]; +extern char* gEraseBestGhostText[]; extern char* D_800E7860[]; extern char* D_800E7868[]; extern char* D_800E7878[]; @@ -545,7 +545,7 @@ extern char* D_800E7A80[]; extern char* D_800E7A88[]; extern char* D_800E7A98; extern char* D_800E7A9C[]; -extern char* D_800E7AA4[]; +extern char* gPlaceText[]; extern const s8 gGPPointRewards[]; extern const s8 D_800F0B1C[]; extern const s8 D_800F0B28[]; diff --git a/src/menus.c b/src/menus.c index 1dcb6e5c2..c956ec34e 100644 --- a/src/menus.c +++ b/src/menus.c @@ -252,20 +252,20 @@ void options_menu_act(struct Controller* controller, u16 arg1) { sp2C = true; sp38->unk8 = -1; } - if (sp2C && gSoundMode != sp38->cursor) { + if (sp2C && gSoundMode != sp38->state) { gSaveData.main.saveInfo.soundMode = gSoundMode; write_save_data_grand_prix_points_and_sound_mode(); update_save_data_backup(); - sp38->cursor = gSoundMode; + sp38->state = gSoundMode; } if (btnAndStick & B_BUTTON) { func_8009E280(); play_sound2(SOUND_MENU_GO_BACK); - if (gSoundMode != sp38->cursor) { + if (gSoundMode != sp38->state) { gSaveData.main.saveInfo.soundMode = gSoundMode; write_save_data_grand_prix_points_and_sound_mode(); update_save_data_backup(); - sp38->cursor = gSoundMode; + sp38->state = gSoundMode; } return; } @@ -305,7 +305,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { switch (sp2C) { case PFS_INVALID_DATA: D_8018EDEC = 0x46; - sp38->cursor = 0; + sp38->state = 0; play_sound2(SOUND_MENU_SELECT); break; case PFS_NO_ERROR: @@ -482,7 +482,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { D_8018EDEC = 0x38; } else { D_8018EDEC = 0x3A; - sp38->cursor = 0; + sp38->state = 0; } play_sound2(SOUND_MENU_SELECT); } @@ -534,7 +534,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } else { D_8018EDEC = 0x3A; play_sound2(SOUND_MENU_SELECT); - sp38->cursor = 0; + sp38->state = 0; } } // return? @@ -542,9 +542,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } case 0x3A: { if (arg1 == 0) { - sp38->cursor += 1; + sp38->state += 1; } - if (sp38->cursor >= 3) { + if (sp38->state >= 3) { D_8018EDEC = 0x3B; } break; @@ -576,9 +576,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) { } case 0x46: { if (arg1 == 0) { - sp38->cursor += 1; + sp38->state += 1; } - if (sp38->cursor >= 3) { + if (sp38->state >= 3) { D_8018EDEC = 0x47; } break;