diff --git a/include/defines.h b/include/defines.h
index 53157841f..3a59bc635 100644
--- a/include/defines.h
+++ b/include/defines.h
@@ -21,12 +21,16 @@
 // Compiles to -0x1000 in diff.py
 #define PLAYER_HUMAN_AND_CPU PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_CPU | PLAYER_START_SEQUENCE
 
+/**
+ * Options for gModeSelection
+**/
 #define GRAND_PRIX  0
 #define TIME_TRIALS 1
 #define VERSUS      2
-#define BATTTLE     3
+#define BATTLE      3
 
 /**
+ * Options for gCCSelection
  * CC stands for cubic-centimetres.
  * It measures engine displacement composed from
  * cylinder volume.
@@ -39,5 +43,16 @@
 #define CC_EXTRA    3
 #define CC_BATTLE   4
 
+/**
+ * Options for gCupSelection
+ * There is a "cup" for battle mode, probably so that
+ * the battle courses could be displayed in the same
+ * way race courses are.
+**/
+#define MUSHROOM_CUP 0
+#define FLOWER_CUP   1
+#define STAR_CUP     2
+#define SPECIAL_CUP  3
+#define BATTLE_CUP   4
 
 #endif // DEFINES_H
diff --git a/src/audio/external.c b/src/audio/external.c
index 7b8d8681b..8e745337e 100644
--- a/src/audio/external.c
+++ b/src/audio/external.c
@@ -4076,10 +4076,10 @@ void func_800C76C0(u8 arg0) {
             func_800C5578((arg0 * 0x3C) + &D_800E9F7C, *(&D_800E9E94 + sp38));
             temp_v0 = gModeSelection;
             *(&D_800E9E74 + sp38) = 0;
-            if (temp_v0 != 0) {
-                if (temp_v0 != 1) {
-                    if (temp_v0 != 2) {
-                        if (temp_v0 != 3) {
+            if (temp_v0 != GRAND_PRIX) {
+                if (temp_v0 != TIME_TRIALS) {
+                    if (temp_v0 != VERSUS) {
+                        if (temp_v0 != BATTLE) {
 
                         } else {
                             temp_v0_2 = D_800EA1C0;
@@ -4260,10 +4260,10 @@ block_23:
         phi_a3 = 1;
         phi_v0_2 = temp_v0_11;
         if (phi_v1_2 == 0x1E) {
-            if (temp_v0_11 != 0) {
-                if (temp_v0_11 != 1) {
-                    if (temp_v0_11 != 2) {
-                        if (temp_v0_11 != 3) {
+            if (temp_v0_11 != GRAND_PRIX) {
+                if (temp_v0_11 != TIME_TRIALS) {
+                    if (temp_v0_11 != VERSUS) {
+                        if (temp_v0_11 != BATTLE) {
 
                         }
                     } else {
diff --git a/src/code_800029B0.c b/src/code_800029B0.c
index cf9dea38c..76a06d905 100644
--- a/src/code_800029B0.c
+++ b/src/code_800029B0.c
@@ -165,7 +165,7 @@ void func_80002A18(void) {
     func_80091FA4();
     func_8029E158();
 
-    if (gModeSelection != BATTTLE) {
+    if (gModeSelection != BATTLE) {
         D_8015F8D0.unk4 = (f32) (D_80164490->unk2 - 15);;
         D_8015F8D0.unk8 = D_80164490->unk4;
         if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c
index db5802cf3..4c100020e 100644
--- a/src/code_80005FD0.c
+++ b/src/code_80005FD0.c
@@ -453,9 +453,9 @@ void set_places(void) {
     s32 phi_t3_15;
 
     temp_v0 = gModeSelection;
-    if ((temp_v0 != 0) && (temp_v0 != 1)) {
-        if (temp_v0 != 2) {
-            if (temp_v0 != 3) {
+    if ((temp_v0 != GRAND_PRIX) && (temp_v0 != TIME_TRIALS)) {
+        if (temp_v0 != VERSUS) {
+            if (temp_v0 != BATTLE) {
                 return;
             }
             // Duplicate return node #82. Try simplifying control flow for better match
@@ -976,9 +976,9 @@ void func_800070F4(void) {
     s32 phi_a3_6;
 
     temp_v0 = gModeSelection;
-    if ((temp_v0 != 0) && (temp_v0 != 1)) {
-        if (temp_v0 != 2) {
-            if (temp_v0 != 3) {
+    if ((temp_v0 != GRAND_PRIX) && (temp_v0 != TIME_TRIALS)) {
+        if (temp_v0 != VERSUS) {
+            if (temp_v0 != BATTLE) {
                 return;
             }
             // Duplicate return node #37. Try simplifying control flow for better match
@@ -1597,10 +1597,10 @@ void func_80007D04(s32 arg0, void *arg1) {
             goto block_25;
         }
         temp_v1_2 = gCCSelection;
-        if (temp_v1_2 != 0) {
-            if (temp_v1_2 != 1) {
-                if (temp_v1_2 != 2) {
-                    if (temp_v1_2 != 3) {
+        if (temp_v1_2 != CC_50) {
+            if (temp_v1_2 != CC_100) {
+                if (temp_v1_2 != CC_150) {
+                    if (temp_v1_2 != CC_EXTRA) {
                         phi_v0 = 0;
                     } else {
                         phi_v0 = 8;
@@ -1841,10 +1841,10 @@ void func_80008424(s32 arg0, f32 arg1, void *arg2) {
         }
         temp_v0_2 = gCCSelection;
         phi_f0 = D_800ECF9C;
-        if (temp_v0_2 != 0) {
-            if (temp_v0_2 != 1) {
-                if (temp_v0_2 != 2) {
-                    if (temp_v0_2 != 3) {
+        if (temp_v0_2 != CC_50) {
+            if (temp_v0_2 != CC_100) {
+                if (temp_v0_2 != CC_150) {
+                    if (temp_v0_2 != CC_EXTRA) {
 
                     }
                 } else {
@@ -3034,8 +3034,8 @@ void func_80009B60(s32 arg0) {
                 func_800099EC(arg0, sp40);
                 temp_v0_5 = gModeSelection;
                 D_80162FD0 = 0;
-                if (temp_v0_5 != 0) {
-                    if ((temp_v0_5 != 1) && (temp_v0_5 != 2) && (temp_v0_5 != 3)) {
+                if (temp_v0_5 != GRAND_PRIX) {
+                    if ((temp_v0_5 != TIME_TRIALS) && (temp_v0_5 != VERSUS) && (temp_v0_5 != BATTLE)) {
 
                     }
                 }
@@ -9943,7 +9943,7 @@ void func_80014DE4(s32 arg0) {
     temp_v1 = temp_v0 + &D_80164678;
     *temp_v1 = *(&D_80164670 + temp_v0);
     temp_a1 = gModeSelection;
-    if ((temp_a1 != 1) && ((gCourseSelection == 0) || (D_800DC51C == 1))) {
+    if ((temp_a1 != TIME_TRIALS) && ((gCourseSelection == 0) || (D_800DC51C == 1))) {
         goto block_8;
     }
     temp_a2 = *temp_v1;
@@ -9959,7 +9959,7 @@ block_8:
     temp_a2_2->unk0 = 0;
     temp_a2_2->unk2 = 0;
     temp_a2_2->unk4 = 0;
-    if ((temp_a1 == 1) && (D_8018EDFC == 0)) {
+    if ((temp_a1 == TIME_TRIALS) && (D_8018EDFC == 0)) {
         *temp_v1 = 0;
     }
     D_80164668 = 0;
@@ -12463,8 +12463,8 @@ void func_8001A588(s32 arg0, void *arg1, u16 *arg2, s8 arg3, s32 cameraId) {
         }
     }
     temp_v0 = gModeSelection;
-    if ((temp_v0 != 3) && (*(&D_80164680 + (cameraId * 2)) == -1) && ((*arg2 & 0x800) != 0) && (D_801646CC == 0) && (D_801646C8 == 0)) {
-        if (temp_v0 == 2) {
+    if ((temp_v0 != BATTLE) && (*(&D_80164680 + (cameraId * 2)) == -1) && ((*arg2 & 0x800) != 0) && (D_801646CC == 0) && (D_801646C8 == 0)) {
+        if (temp_v0 == VERSUS) {
             func_8001A220(0, phi_s0, cameraId);
         } else {
             func_8001A124(0, phi_s0, cameraId);
@@ -13360,7 +13360,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001C14C.s")
 extern u16 D_80163E2A;
 
 void func_8001C3C4(void) {
-    if (gCurrentCourseId == 0x14) {
+    if (gCurrentCourseId == COURSE_AWARD_CEREMONY) {
         if (D_80163E2A >= 0x10) {
             func_80057114(3);
             return;
diff --git a/src/code_8001C4D0.c b/src/code_8001C4D0.c
index 062fcfcd3..af8aa649d 100644
--- a/src/code_8001C4D0.c
+++ b/src/code_8001C4D0.c
@@ -122,7 +122,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) {
                 if (temp_v0 != 2) {
                     if (temp_v0 != 3) {
 
-                    } else if (gModeSelection == BATTTLE) {
+                    } else if (gModeSelection == BATTLE) {
                         cameras[cameraId].unk4 = (bitwise s32) 0.0f;
                         cameras[cameraId].unk7 = (bitwise s32) 0.0f;
                         cameras[cameraId].unk8 = (bitwise s32) 0.0f;
@@ -140,7 +140,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) {
                 } else {
                     goto block_7;
                 }
-            } else if (gModeSelection == BATTTLE) {
+            } else if (gModeSelection == BATTLE) {
                 cameras[cameraId].unk4 = (bitwise s32) 0.0f;
                 cameras[cameraId].unk7 = (bitwise s32) 0.0f;
                 cameras[cameraId].unk8 = (bitwise s32) 0.0f;
@@ -157,7 +157,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) {
             }
         } else {
 block_7:
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 cameras[cameraId].unk4 = (bitwise s32) 0.0f;
                 cameras[cameraId].unk7 = (bitwise s32) 0.0f;
                 cameras[cameraId].unk8 = (bitwise s32) 0.0f;
@@ -1274,10 +1274,10 @@ void func_8001EE98(void *arg0, s32 arg1, s8 arg2) {
         phi_s0 = 3;
     }
     temp_v0 = gModeSelection;
-    if (temp_v0 != 0) {
-        if (temp_v0 != 1) {
-            if (temp_v0 != 2) {
-                if (temp_v0 != 3) {
+    if (temp_v0 != GRAND_PRIX) {
+        if (temp_v0 != TIME_TRIALS) {
+            if (temp_v0 != VERSUS) {
+                if (temp_v0 != BATTLE) {
 
                 } else if ((D_800DC51C == 1) || ((D_8015F894 == 2) && (D_80164A89 == 1))) {
                     if (D_80164A88 == 0) {
@@ -1583,7 +1583,7 @@ void func_8001F87C(s32 arg0) {
     if (D_800DC52C == 0) {
         phi_a2 = D_800DC4DC;
         phi_a1 = 0;
-        if (gModeSelection == 0) {
+        if (gModeSelection == GRAND_PRIX) {
 loop_3:
             temp_v0 = phi_a2->unk_000;
             if (((temp_v0 & 0x200) == 0) && ((temp_v0 & 0x80) == 0)) {
diff --git a/src/code_8001F980.c b/src/code_8001F980.c
index f5f08a7d2..58785648f 100644
--- a/src/code_8001F980.c
+++ b/src/code_8001F980.c
@@ -1137,7 +1137,7 @@ void func_8002276C(void) {
                 return;
             }
             temp_v0_2 = gModeSelection;
-            if ((temp_v0_2 == 2) || (temp_v0_2 == 3)) {
+            if ((temp_v0_2 == VERSUS) || (temp_v0_2 == BATTLE)) {
                 func_80022A98(D_800DC4DC, 0);
                 func_80022A98(D_800DC4E0, 1);
                 func_80022A98(D_800DC4E4, 2);
@@ -1149,9 +1149,9 @@ void func_8002276C(void) {
             return;
         }
         temp_v0_3 = gModeSelection;
-        if (temp_v0_3 != 0) {
-            if (temp_v0_3 != 1) {
-                if ((temp_v0_3 != 2) && (temp_v0_3 != 3)) {
+        if (temp_v0_3 != GRAND_PRIX) {
+            if (temp_v0_3 != TIME_TRIALS) {
+                if ((temp_v0_3 != VERSUS) && (temp_v0_3 != BATTLE)) {
                     return;
                 }
                 func_80022A98(D_800DC4DC, 0);
@@ -1172,9 +1172,9 @@ void func_8002276C(void) {
         return;
     }
     temp_v0_4 = gModeSelection;
-    if (temp_v0_4 != 0) {
-        if (temp_v0_4 != 1) {
-            if ((temp_v0_4 != 2) && (temp_v0_4 != 3)) {
+    if (temp_v0_4 != GRAND_PRIX) {
+        if (temp_v0_4 != TIME_TRIALS) {
+            if ((temp_v0_4 != VERSUS) && (temp_v0_4 != BATTLE)) {
                 return;
             }
             func_80022A98(D_800DC4DC, 0);
diff --git a/src/code_80027D00.c b/src/code_80027D00.c
index df644b8c5..6077c5aa2 100644
--- a/src/code_80027D00.c
+++ b/src/code_80027D00.c
@@ -643,7 +643,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) {
             phi_a0 = arg0;
 block_17:
         }
-        if ((sp1E == 1) || ((phi_a0->unk_000 & PLAYER_INVISIBLE_OR_BOMB) == PLAYER_INVISIBLE_OR_BOMB) || (gModeSelection == BATTTLE) || (temp_v0_7 = phi_a0->unk_0CA, ((temp_v0_7 & 2) != 0)) || ((temp_v0_7 & 8) != 0) || (*(&D_801633F8 + (arg2 * 2)) == 1)) {
+        if ((sp1E == 1) || ((phi_a0->unk_000 & PLAYER_INVISIBLE_OR_BOMB) == PLAYER_INVISIBLE_OR_BOMB) || (gModeSelection == BATTLE) || (temp_v0_7 = phi_a0->unk_0CA, ((temp_v0_7 & 2) != 0)) || ((temp_v0_7 & 8) != 0) || (*(&D_801633F8 + (arg2 * 2)) == 1)) {
             temp_t4 = phi_a0->unk_0BC & ~0x1000;
             phi_a0->unk_0BC = temp_t4;
             if (((temp_t4 & 0x80) == 0x80) || ((temp_t4 & 0x40) == 0x40) || ((temp_t4 & 0x400) == 0x400) || ((temp_t4 & 0x4000) == 0x4000) || ((temp_t4 & 0x80000) == 0x80000) || ((temp_t4 & 0x800000) == 0x800000) || ((temp_t4 & 0x1000000) == 0x1000000) || ((temp_t4 & 0x2000000) == 0x2000000) || ((temp_t4 & 0x20000) == 0x20000) || ((phi_a0->unk_044 & 0x800) != 0)) {
@@ -747,8 +747,8 @@ void func_80028E70(void *arg0, s32 arg1, s8 arg2, s8 arg3) {
         }
         func_80027DA8(arg2);
         temp_v0_2 = gModeSelection;
-        if ((temp_v0_2 != 1) && (temp_v0_2 != 2)) {
-            if (temp_v0_2 != 3) {
+        if ((temp_v0_2 != TIME_TRIALS) && (temp_v0_2 != VERSUS)) {
+            if (temp_v0_2 != BATTLE) {
                 func_80028864(arg0, arg1, arg2, arg3);
                 // Duplicate return node #12. Try simplifying control flow for better match
                 return;
@@ -6282,7 +6282,7 @@ void func_80033AE0(void *arg0, void *arg1, s8 arg2) {
     arg0->unkFA = temp_t9;
     if (((sp2D0 >= 0x5A) || (sp2D0 < -0x59)) && ((arg0->unk44 & 0x4000) == 0)) {
         temp_v1_4 = arg0->unkBC;
-        if (((temp_v1_4 & 0x10) == 0) && (gCCSelection == CC_150) && (gModeSelection != BATTTLE) && ((temp_v1_4 & 8) == 0) && (((arg0->unk94 / 18.0f) * 216.0f) >= 40.0f) && (arg0->unk204 == 0)) {
+        if (((temp_v1_4 & 0x10) == 0) && (gCCSelection == CC_150) && (gModeSelection != BATTLE) && ((temp_v1_4 & 8) == 0) && (((arg0->unk94 / 18.0f) * 216.0f) >= 40.0f) && (arg0->unk204 == 0)) {
             arg0->unkC = arg0->unkC | 0x80;
         }
     }
@@ -6622,7 +6622,7 @@ block_125:
             arg0->unk78 = phi_t4;
         }
     }
-    if (gModeSelection == BATTTLE) {
+    if (gModeSelection == BATTLE) {
         arg0->unk78 = arg0->unk78 * D_800EDD80;
     }
 }
@@ -7232,7 +7232,7 @@ void func_80037BB4(void *arg0, void *arg1) {
             arg0->unk2E = arg0->unk2E + temp_v0;
         }
         if ((arg0->unk0 & 0x1000) == 0) {
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 func_800378E8(&sp20, arg1);
                 return;
             }
@@ -7246,7 +7246,7 @@ void func_80037BB4(void *arg0, void *arg1) {
         arg0->unk2E = arg0->unk2E + temp_v0;
     }
     if ((arg0->unk0 & 0x1000) == 0) {
-        if (gModeSelection == BATTTLE) {
+        if (gModeSelection == BATTLE) {
             func_80037A4C(&sp20, arg1);
             return;
         }
@@ -7340,7 +7340,7 @@ block_21:
                 func_80030FC8(arg0);
                 func_80030E00(arg0);
             } else {
-                if (gModeSelection == BATTTLE) {
+                if (gModeSelection == BATTLE) {
                     func_80031F48(arg0, 0x40000000);
                 } else {
                     func_80031F48(arg0, 0x3F800000);
@@ -7500,8 +7500,8 @@ void func_800382DC(void) {
         return;
     }
     temp_v0_2 = gModeSelection;
-    if (temp_v0_2 != 0) {
-        if (temp_v0_2 != 1) {
+    if (temp_v0_2 != GRAND_PRIX) {
+        if (temp_v0_2 != TIME_TRIALS) {
             return;
         }
         if (D_8015F890 != 1) {
diff --git a/src/code_800393C0.c b/src/code_800393C0.c
index d3c6236fc..fb69f2ff2 100644
--- a/src/code_800393C0.c
+++ b/src/code_800393C0.c
@@ -46,7 +46,7 @@ void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg
             player->unk_214 = D_800E261C.unk_00[1][player->characterId];
             break;
 
-        case BATTTLE:
+        case BATTLE:
             player->unk_084 = D_800E2400.unk_00[4][player->characterId];
             player->unk_088 = D_800E24B4.unk_00[4][player->characterId];
             player->unk_210 = D_800E2568.unk_00[4][player->characterId];
@@ -293,7 +293,7 @@ void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg
     func_80295BF8(arg1);
     func_8005D6C0(player);
     func_8006B87C(player, arg1);
-    if (gModeSelection == BATTTLE) {
+    if (gModeSelection == BATTLE) {
         func_8006B7E4(player, arg1);
     }
     func_802B6540(player->unk_150, player->unk_058, player->unk_05C, player->unk_060, player->unk_02E);
@@ -330,7 +330,7 @@ void func_80039AE4(void) {
 
         case 1:
         case 2:
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 D_80165578 = 0x898;
                 D_8016557A = 0;
                 D_8016557C = 0x320;
@@ -356,7 +356,7 @@ void func_80039AE4(void) {
             break;
 
         default:
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 D_80165578 = 0x898;
                 D_8016557A = 0;
                 D_8016557C = 0x320;
@@ -1029,7 +1029,7 @@ void func_8003C0F0(void) {
             break;
     }
 
-    if (gModeSelection != BATTTLE) {
+    if (gModeSelection != BATTLE) {
         func_8000F628();
     }
 }
@@ -1113,7 +1113,7 @@ void func_8003D080(void) {
                         func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 1, 1);
                         break;
 
-                    case BATTTLE:
+                    case BATTLE:
                         func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 9, 0);
                         func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 9, 1);
                         break;
@@ -1126,7 +1126,7 @@ void func_8003D080(void) {
                 break;
 
             case 3:
-                if (gModeSelection == BATTTLE) {
+                if (gModeSelection == BATTLE) {
                     ptr = &D_800DC4E4;
                     func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 9, 0);
                     func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 9, 1);
diff --git a/src/code_800431B0.c b/src/code_800431B0.c
index fa8434ae3..88da8f657 100644
--- a/src/code_800431B0.c
+++ b/src/code_800431B0.c
@@ -5335,7 +5335,7 @@ void func_8004F168(s32 arg0, s32 arg1, s32 arg2) {
         temp_a0 = ((*(&D_8018D2C0 + temp_t0) + D_8018D2F0) - (D_8018D2B0 / 2)) + D_8018D2E0 + (temp_v1->posX * temp_f0);
         temp_a1 = ((*(&D_8018D2D8 + temp_t0) + D_8018D2F8) - (D_8018D2B8 / 2)) + D_8018D2E8 + temp_f12;
         if (arg2 != 8) {
-            if ((D_801643B8[arg1] == 0) && (temp_v0 = gModeSelection, (temp_v0 != 3)) && (temp_v0 != 1)) {
+            if ((D_801643B8[arg1] == 0) && (temp_v0 = gModeSelection, (temp_v0 != BATTLE)) && (temp_v0 != TIME_TRIALS)) {
                 func_80046424(temp_f12, temp_a0, temp_a1, (temp_v1->unk_02E + 0x8000) & 0xFFFF, 0x3F800000, (arg2 << 7) + &D_0D02CCD8, &D_0D005470, 8, 8, 8, 8);
                 return;
             }
@@ -5388,12 +5388,12 @@ void func_8004F3E4(s32 arg0) {
     s16 *phi_s0_5;
 
     temp_v0 = gModeSelection;
-    if (temp_v0 != 0) {
+    if (temp_v0 != GRAND_PRIX) {
         phi_s1 = 0;
         phi_s1_2 = 0;
-        if (temp_v0 != 1) {
-            if (temp_v0 != 2) {
-                if (temp_v0 != 3) {
+        if (temp_v0 != TIME_TRIALS) {
+            if (temp_v0 != VERSUS) {
+                if (temp_v0 != BATTLE) {
                     return;
                 }
                 temp_v1 = gPlayerCountSelection1;
@@ -5684,7 +5684,7 @@ void func_8004FA78(s32 arg0) {
     void *phi_s2;
 
     temp_v0 = gModeSelection;
-    if ((temp_v0 != 2) && (temp_v0 != 3)) {
+    if ((temp_v0 != VERSUS) && (temp_v0 != BATTLE)) {
         temp_s4 = (arg0 * 0x84) + &D_8018CA70;
         if (D_8018D320 == temp_s4->unk71) {
             phi_s3 = &D_80165658;
diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index 84e2c13d7..4418f48b6 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -439,7 +439,7 @@ void func_800588F4(s32 arg0) {
     if (D_80165730 != 0) {
         func_80053E6C(arg0);
     }
-    if (gModeSelection == BATTTLE) {
+    if (gModeSelection == BATTLE) {
         func_80056AC0(arg0);
     }
 }
@@ -767,7 +767,7 @@ void func_800590D4(void) {
     s32 temp_v0;
     s32 temp_v1;
 
-    if ((D_8018D2A4 != 0) && (temp_v1 = gModeSelection, (temp_v1 != 3))) {
+    if ((D_8018D2A4 != 0) && (temp_v1 = gModeSelection, (temp_v1 != BATTLE))) {
         temp_v0 = gPlayerCountSelection1;
         if (temp_v0 != 1) {
             if (temp_v0 != 2) {
@@ -844,14 +844,14 @@ void func_800591B4(void) {
                 if ((D_800DC51C == 0) && (D_801657E8 != 0)) {
                     if (D_80165800 != 0) {
                         func_8004EE54(0);
-                        if (gModeSelection != BATTTLE) {
+                        if (gModeSelection != BATTLE) {
                             func_8004F020(0);
                         }
                         func_8004F3E4(0);
                     }
                     if ((D_800DC530 == 1) && (D_80165801 != 0)) {
                         func_8004EE54(1);
-                        if (gModeSelection != BATTTLE) {
+                        if (gModeSelection != BATTLE) {
                             func_8004F020(1);
                         }
                         func_8004F3E4(1);
@@ -942,7 +942,7 @@ extern ? D_80165800;
 extern s32 D_8018D188;
 
 void func_80059488(s32 arg0) {
-    if ((gModeSelection != BATTTLE) && (*(&D_80165800 + arg0) == 0) && (D_8018D188 != 0)) {
+    if ((gModeSelection != BATTLE) && (*(&D_80165800 + arg0) == 0) && (D_8018D188 != 0)) {
         func_8004FA78();
         func_8004E78C(arg0);
     }
@@ -1019,7 +1019,7 @@ void func_80059560(s32 arg0) {
     void *temp_v0;
     void *temp_v0_2;
 
-    if (gModeSelection != BATTTLE) {
+    if (gModeSelection != BATTLE) {
         if ((D_801657F8 != 0) && (D_8018D188 != 0)) {
             temp_v0 = (arg0 * 0x84) + &D_8018CA70;
             sp3C = temp_v0;
@@ -1714,14 +1714,14 @@ void func_8005A3C0(s32 arg2) {
                         D_80165800.unk0 = (D_80165800.unk0 + 1) & 1;
                         phi_a1 = 1;
                         phi_a2 = 3;
-                        if (gModeSelection != BATTTLE) {
+                        if (gModeSelection != BATTLE) {
                             D_801657F0 = (D_801657F0 + 1) & 1;
                             phi_a1 = 1;
                             phi_a2 = 3;
                         }
                     }
                 } else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->unk6 & 1) != 0) || (phi_a2 = 3, ((D_800DC4C4->unk6 & 1) != 0))) {
-                    if (gModeSelection != BATTTLE) {
+                    if (gModeSelection != BATTLE) {
                         D_801657F0 = (D_801657F0 + 1) & 1;
                     }
                     D_801657E4 = (D_801657E4 + 1) & 1;
@@ -1730,7 +1730,7 @@ void func_8005A3C0(s32 arg2) {
                 }
             } else {
                 phi_a2 = 3;
-                if (gModeSelection != BATTTLE) {
+                if (gModeSelection != BATTLE) {
                     if ((D_800DC4BC->buttonPressed & 1) != 0) {
                         D_80165800.unk0 = (D_80165800.unk0 + 1) & 1;
                         phi_a1 = 1;
@@ -3380,7 +3380,7 @@ extern s32 D_8016439C;
 extern s32 lapCount;
 
 void func_8005D0FC(s32 arg0) {
-    if (gModeSelection != BATTTLE) {
+    if (gModeSelection != BATTLE) {
         if (arg0 != 0) {
             if (arg0 != 1) {
                 if (arg0 != 2) {
@@ -11993,7 +11993,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
             phi_s2 = temp_s2;
         } while (temp_s2 < 0xA);
     }
-    if ((gModeSelection == BATTTLE) && ((arg0->unk2 & (2 << sp44)) != 0)) {
+    if ((gModeSelection == BATTLE) && ((arg0->unk2 & (2 << sp44)) != 0)) {
         func_8006BA94(arg0, arg1, arg2);
     }
 }
@@ -12116,7 +12116,7 @@ void func_8006E058(void) {
                 return;
             }
             temp_v0_2 = gModeSelection;
-            if ((temp_v0_2 == 2) || (temp_v0_2 == 3)) {
+            if ((temp_v0_2 == VERSUS) || (temp_v0_2 == BATTLE)) {
                 func_8006E420(D_800DC4DC, 0, 0);
                 func_8006E420(D_800DC4E0, 1, 0);
                 func_8006E420(D_800DC4E4, 2, 0);
@@ -12128,9 +12128,9 @@ void func_8006E058(void) {
             return;
         }
         temp_v0_3 = gModeSelection;
-        if (temp_v0_3 != 0) {
-            if (temp_v0_3 != 1) {
-                if ((temp_v0_3 != 2) && (temp_v0_3 != 3)) {
+        if (temp_v0_3 != GRAND_PRIX) {
+            if (temp_v0_3 != TIME_TRIALS) {
+                if ((temp_v0_3 != VERSUS) && (temp_v0_3 != BATTLE)) {
                     return;
                 }
                 func_8006E420(D_800DC4DC, 0, 0);
@@ -12157,9 +12157,9 @@ void func_8006E058(void) {
         return;
     }
     temp_v0_4 = gModeSelection;
-    if (temp_v0_4 != 0) {
-        if (temp_v0_4 != 1) {
-            if ((temp_v0_4 != 2) && (temp_v0_4 != 3)) {
+    if (temp_v0_4 != GRAND_PRIX) {
+        if (temp_v0_4 != TIME_TRIALS) {
+            if ((temp_v0_4 != VERSUS) && (temp_v0_4 != BATTLE)) {
                 return;
             }
             func_8006E420(D_800DC4DC, 0, 0);
@@ -12230,7 +12230,7 @@ void func_8006E420(u16 *arg0, s8 arg1, s8 arg2) {
             temp_s0 = phi_s0 + 1;
             phi_s0 = temp_s0;
         } while (temp_s0 < 0xA);
-        if (gModeSelection == BATTTLE) {
+        if (gModeSelection == BATTLE) {
             func_8006B9CC(arg0, arg1);
         }
     }
diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c
index acb34f57a..35c626faf 100644
--- a/src/code_8006E9C0.c
+++ b/src/code_8006E9C0.c
@@ -636,7 +636,7 @@ void func_8006F8CC(void) {
         D_80165800.unk0 = D_80165800.unk1;
         temp_a0 = D_8018EDF3;
         if (temp_a0 == 4) {
-            if (gModeSelection != BATTTLE) {
+            if (gModeSelection != BATTLE) {
                 D_801657E4 = 1;
                 D_801657F0 = 1;
                 D_801657F8 = 1;
@@ -650,7 +650,7 @@ void func_8006F8CC(void) {
             D_801657E8 = 0;
             D_801657F8 = 1;
         } else if (temp_a0 == 2) {
-            if (gModeSelection != BATTTLE) {
+            if (gModeSelection != BATTLE) {
                 D_80165800.unk1 = 0;
                 D_801657E4 = 1;
                 D_801657F0 = 1;
@@ -839,12 +839,12 @@ void func_8006FA94(void) {
             }
         } else if (D_800DC530 == 1) {
             temp_v0 = gModeSelection;
-            if (temp_v0 == 0) {
+            if (temp_v0 == GRAND_PRIX) {
                 D_8018D114 = 2;
                 D_8018D178 = 0x96;
                 D_8018D180 = 0xF0;
                 D_8018D2AC = 0x3C;
-            } else if (temp_v0 == 2) {
+            } else if (temp_v0 == VERSUS) {
                 D_8018D114 = 3;
                 D_8018D178 = 0x1E;
                 D_8018D180 = 0x1E;
@@ -857,9 +857,9 @@ void func_8006FA94(void) {
             }
         } else {
             temp_v0_2 = gModeSelection;
-            if (temp_v0_2 == 0) {
+            if (temp_v0_2 == GRAND_PRIX) {
                 D_8018D114 = 5;
-            } else if (temp_v0_2 == 2) {
+            } else if (temp_v0_2 == VERSUS) {
                 D_8018D114 = 6;
             } else {
                 D_8018D114 = 7;
@@ -1487,11 +1487,10 @@ void func_80070780(void) {
         D_80165750 = 0xB;
         D_80165758 = &D_800E5894;
         temp_v0 = gCCSelection;
-        if (temp_v0 != 0) {
-            if (temp_v0 != 1) {
-                if (temp_v0 != 2) {
-                    if (temp_v0 != 3) {
-
+        if (temp_v0 != CC_50) {
+            if (temp_v0 != CC_100) {
+                if (temp_v0 != CC_150) {
+                    if (temp_v0 != CC_EXTRA) {
                     }
                 } else {
                     D_80165750 = 0xC;
@@ -1728,10 +1727,10 @@ void func_80070780(void) {
             phi_s1_8 = &D_80183EA0;
             if ((temp_v0_10 == 1) || ((temp_v0_10 == 2) && (gModeSelection == VERSUS))) {
                 temp_v0_11 = gCCSelection;
-                if (temp_v0_11 != 0) {
-                    if (temp_v0_11 != 1) {
-                        if (temp_v0_11 != 2) {
-                            if (temp_v0_11 != 3) {
+                if (temp_v0_11 != CC_50) {
+                    if (temp_v0_11 != CC_100) {
+                        if (temp_v0_11 != CC_150) {
+                            if (temp_v0_11 != CC_EXTRA) {
 
                             } else {
                                 D_8018D1C8 = 5;
@@ -2055,8 +2054,8 @@ void func_80071428(void) {
     temp_v1_2 = gModeSelection;
     D_8018D3C0 = 0x50;
     D_801657A2 = 0x333;
-    if (temp_v1_2 != 0) {
-        if (temp_v1_2 != 1) {
+    if (temp_v1_2 != GRAND_PRIX) {
+        if (temp_v1_2 != TIME_TRIALS) {
             return;
         }
         D_80165638 = (func_800B4F2C(0, 40.0f, &D_8018D3DC, 1, 0x78, 0x28) & 0xFFFFF) - 1;
@@ -2142,9 +2141,9 @@ void func_80071818(void) {
     temp_v1 = gModeSelection;
     D_8018D3C0 = 0x28;
     D_801657A2 = 0x666;
-    if (temp_v1 != 0) {
-        if (temp_v1 != 2) {
-            if (temp_v1 != 3) {
+    if (temp_v1 != GRAND_PRIX) {
+        if (temp_v1 != VERSUS) {
+            if (temp_v1 != BATTLE) {
                 return;
             }
             goto block_7;
@@ -2218,7 +2217,7 @@ void func_80071A20(void) {
     D_8018CA70.unkDC = 0x7F;
     D_8018CA70.unkDE = 0x101;
     D_8018CA70.unkE4 = 0xDA;
-    if (gModeSelection == BATTTLE) {
+    if (gModeSelection == BATTLE) {
         D_8018CA70.unk44 = 0x5E;
         D_8018CA70.unkC8 = 0xD0;
     }
@@ -2233,9 +2232,9 @@ void func_80071A20(void) {
     temp_v0 = gModeSelection;
     D_8018D3C0 = 0x28;
     D_801657A2 = 0x666;
-    if (temp_v0 != 0) {
-        if (temp_v0 != 2) {
-            if (temp_v0 != 3) {
+    if (temp_v0 != GRAND_PRIX) {
+        if (temp_v0 != VERSUS) {
+            if (temp_v0 != BATTLE) {
                 return;
             }
             goto block_9;
@@ -2343,7 +2342,7 @@ void func_80071C28(void) {
     D_8018CA70.unk1EC = 0xD4;
     D_8018CA70.unk1F8 = 0xC8;
     D_8018CA70.unk1FA = 0xC0;
-    if (gModeSelection == BATTTLE) {
+    if (gModeSelection == BATTLE) {
         D_8018CA70.unk44 = 0xC8;
         D_8018CA70.unkC8 = 0xC8;
         D_8018CA70.unk14C = 0xB8;
diff --git a/src/code_80071F00.c b/src/code_80071F00.c
index aea173223..ad67d6a62 100644
--- a/src/code_80071F00.c
+++ b/src/code_80071F00.c
@@ -6260,7 +6260,7 @@ u8 gen_random_item(s16 arg0, s16 arg1) {
     D_801658FD = (random_int(0x64) + (D_801658FD + D_801658FF) + gRaceFrameCounter) % 0x64;
     temp_v1 = gModeSelection;
     phi_a1 = &D_801658FD;
-    if (temp_v1 == 2) {
+    if (temp_v1 == VERSUS) {
         temp_v0 = gPlayerCountSelection1;
         if (temp_v0 != 2) {
             if (temp_v0 != 3) {
@@ -6280,7 +6280,7 @@ block_8:
             phi_a1 = &D_801658FD;
         }
         phi_v1 = *((arg0 * 0x64) + sp18 + *phi_a1);
-    } else if (temp_v1 == 3) {
+    } else if (temp_v1 == BATTLE) {
         phi_v1 = *(D_801658FD + lookup_item(&D_0D008B14));
     } else {
         if (arg1 == 0) {
@@ -7774,7 +7774,7 @@ void func_8007D360(s32 arg0, s32 arg1) {
     temp_s0_2->unkC2 = 0;
     func_8008B80C(arg0, 0, 0, 0);
     temp_s0_2->unkB0 = 0;
-    if (gCCSelection < 2) {
+    if (gCCSelection < CC_150) {
         temp_v0_6 = random_int(4);
         temp_f10 = temp_v0_6;
         phi_f10 = temp_f10;
@@ -7857,11 +7857,11 @@ void func_8007D794(void) {
     s32 temp_v0;
 
     temp_v0 = gCCSelection;
-    if (temp_v0 == 0) {
+    if (temp_v0 == CC_50) {
         func_80089A04(0x3F000000, 0x3E4CCCCD);
         return;
     }
-    if (temp_v0 == 1) {
+    if (temp_v0 == CC_100) {
         func_80089A04(0x3ECCCCCD, 0x3E19999A);
         return;
     }
@@ -8113,7 +8113,7 @@ void func_8007DDC0(s32 arg0) {
     }
     if (temp_s0->unk4C == 0) {
         temp_v0_3 = gCCSelection;
-        if ((temp_v0_3 == 0) || (temp_v0_3 == 1) || (temp_v0_3 == 2) || (temp_v0_3 == 3)) {
+        if ((temp_v0_3 == CC_50) || (temp_v0_3 == CC_100) || (temp_v0_3 == CC_150) || (temp_v0_3 == CC_EXTRA)) {
             sp2C = D_800EEF40;
         }
         func_8008A6DC(arg0, sp2C);
@@ -8214,7 +8214,7 @@ void func_8007E00C(s32 arg0) {
         arg0 = temp_a2;
         func_8007278C(temp_a0, 0xD2, temp_a2);
         if (D_80165594 == 0) {
-            if (gCCSelection < 2) {
+            if (gCCSelection < CC_150) {
                 func_8007D714(1);
                 func_8007D714(1);
             } else {
@@ -8321,7 +8321,7 @@ void func_8007E1F4(s32 arg0) {
     }
     if (temp_s0->unk4C == 0) {
         temp_v0_3 = gCCSelection;
-        if ((temp_v0_3 == 0) || (temp_v0_3 == 1) || (temp_v0_3 == 2) || (temp_v0_3 == 3)) {
+        if ((temp_v0_3 == CC_50) || (temp_v0_3 == CC_100) || (temp_v0_3 == CC_150) || (temp_v0_3 == CC_EXTRA)) {
             sp2C = 0x442F0000;
         }
         func_8008A6DC(arg0, sp2C);
@@ -8398,7 +8398,7 @@ void func_8007E3EC(s32 arg0) {
     case 4:
         func_8007278C(0xD2);
         if (D_80165598 == 0) {
-            if (gCCSelection < 2) {
+            if (gCCSelection < CC_150) {
                 func_8007D714(2);
                 return;
             }
@@ -13751,7 +13751,7 @@ void func_80086700(s32 arg0) {
     void *temp_v1;
     void *phi_v0;
 
-    if (gCCSelection < 2) {
+    if (gCCSelection < CC_150) {
         temp_v0 = D_802874F5;
         if (temp_v0 != 0) {
             if (temp_v0 != 1) {
diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c
index cebf2762c..36ed485c1 100644
--- a/src/code_8008C1D0.c
+++ b/src/code_8008C1D0.c
@@ -290,7 +290,7 @@ void func_8008C62C(Player *player, s8 arg1) {
         if (player->unk_236 == 0) {
             player->unk_0A8 = 0x2000;
             func_8008C6D0(player, arg1);
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 func_8006B8B4(player, arg1);
             }
         }
@@ -469,7 +469,7 @@ void func_8008C9EC(void *arg0, s8 arg1) {
         if (((temp_t7 & 0xFFFF) / (0x10000 / (0x168 / (*(&sp30 + (temp_v1 * 2)) / 182)))) == 0) {
             arg0->unkB2 = temp_v1 - 1;
             if (arg0->unkB2 <= 0) {
-                if (gModeSelection == BATTTLE) {
+                if (gModeSelection == BATTLE) {
                     func_8006B8B4(arg0, arg1, &sp30);
                 }
                 func_8008C8C4(arg0, arg1);
@@ -486,7 +486,7 @@ void func_8008C9EC(void *arg0, s8 arg1) {
             arg0->unkB2 = temp_v1_2 - 1;
             if (arg0->unkB2 <= 0) {
                 func_8008C8C4(arg0, arg1);
-                if (gModeSelection == BATTTLE) {
+                if (gModeSelection == BATTLE) {
                     func_8006B8B4(arg0, arg1);
                 }
             }
@@ -1303,7 +1303,7 @@ void func_8008DF98(void *arg0, s8 arg1) {
     } else {
         func_800098FC(arg1, arg0);
     }
-    if (gModeSelection == BATTTLE) {
+    if (gModeSelection == BATTLE) {
         func_8006B8B4(arg0, arg1);
     }
 }
@@ -1479,7 +1479,7 @@ void func_8008E4A4(void *arg0, s8 arg1) {
         if ((*(&D_80165460 + (temp_a1 * 4)) == 1) && ((temp_t3 & 0x4000) == 0x4000)) {
             arg0->unk9C = arg0->unk9C + 100.0f;
         }
-        if (gModeSelection == BATTTLE) {
+        if (gModeSelection == BATTLE) {
             func_8006B8B4(temp_a1, 3);
             return;
         }
@@ -1499,7 +1499,7 @@ void func_8008E4A4(void *arg0, s8 arg1) {
             temp_v0_2->unk20 = 1;
             temp_v0_2->unk30 = 1;
             arg0->unk42 = 0;
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 arg1 = temp_a1;
                 func_8006B8B4(temp_a1, 3);
                 phi_a1 = arg1;
@@ -1645,7 +1645,7 @@ void func_8008E8D8(void *arg0, s8 arg1) {
         if ((*(&D_80165460 + (arg1 * 4)) == 1) && ((arg0->unk0 & 0x4000) == 0x4000)) {
             arg0->unk9C = arg0->unk9C + 100.0f;
         }
-        if (gModeSelection == BATTTLE) {
+        if (gModeSelection == BATTLE) {
             func_8006B8B4(arg1);
             return;
         }
@@ -1668,7 +1668,7 @@ void func_8008E8D8(void *arg0, s8 arg1) {
             if ((*(&D_80165460 + (arg1 * 4)) == 1) && ((arg0->unk0 & 0x4000) == 0x4000)) {
                 arg0->unk9C = arg0->unk9C + 100.0f;
             }
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 func_8006B8B4(arg1);
             }
         }
@@ -2083,7 +2083,7 @@ void func_8008F494(void *arg0, s8 arg1) {
     temp_v0 = arg0->unkBC;
     temp_a2 = arg0;
     temp_a0 = temp_a2;
-    if ((((temp_v0 & 0x80) != 0) || ((temp_v0 & 0x40) != 0) || ((temp_v0 << 7) < 0) || ((temp_v0 << 6) < 0) || ((temp_v0 & 0x400) != 0)) && (gModeSelection == BATTTLE)) {
+    if ((((temp_v0 & 0x80) != 0) || ((temp_v0 & 0x40) != 0) || ((temp_v0 << 7) < 0) || ((temp_v0 << 6) < 0) || ((temp_v0 & 0x400) != 0)) && (gModeSelection == BATTLE)) {
         temp_a2->unk44 = temp_a2->unk44 | 0x8000;
     }
     arg0 = temp_a2;
@@ -3164,7 +3164,7 @@ block_41:
                 if ((arg0->unk0 & 0x4000) != 0) {
                     func_800C9018(arg1, 0x100FA28);
                 }
-                if (gModeSelection == BATTTLE) {
+                if (gModeSelection == BATTLE) {
                     func_8006B8B4(arg0, arg1);
                 }
                 arg0->unkCA = arg0->unkCA & 0xFFFD;
diff --git a/src/code_80091750.c b/src/code_80091750.c
index bc3f37af5..23481a40d 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -2247,7 +2247,7 @@ void func_80094C60(void) {
         case 13:
             func_8009E650(0x25, 0, 0, 2);
             func_8009E650(0x52, 0, 0, 6);
-            if (gModeSelection != BATTTLE) {
+            if (gModeSelection != BATTLE) {
                 func_8009E650(0x53, 0, 0, 4);
                 func_8009E650(0x54, 0, 0, 4);
                 func_8009E650(0x55, 0, 0, 4);
@@ -2269,13 +2269,13 @@ void func_80094C60(void) {
             func_8009E650(0x5E, 0, 0, 8);
             temp_v0 = gModeSelection;
             phi_v0 = temp_v0;
-            if (temp_v0 == 1) {
+            if (temp_v0 == TIME_TRIALS) {
                 func_8009E650(0x65, 0, 0, 8);
                 func_8009E650(0x66, 0, 0, 8);
                 func_8009E650(0x69, 0, 0, 8);
                 phi_v0 = gModeSelection;
             }
-            if (phi_v0 == 0) {
+            if (phi_v0 == GRAND_PRIX) {
                 func_8009E650(0x68, 0, 0, 8);
                 func_8009E650(0x67, 0, 0, 5);
             }
@@ -6546,7 +6546,7 @@ void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) {
     s32 phi_ra;
 
     temp_v0 = gModeSelection;
-    if ((temp_v0 == 0) || (temp_v0 == 1)) {
+    if ((temp_v0 == GRAND_PRIX) || (temp_v0 == TIME_TRIALS)) {
         temp_v0_4 = arg0 * 8;
         temp_v1_2 = temp_v0_4 + &D_8018E7E8;
         temp_a0_2 = temp_v0_4 + &D_8018E810;
@@ -6690,9 +6690,9 @@ void func_8009CE64(s32 *arg0, s32 arg2, s32 arg3) {
     phi_a2 = arg3;
     if (temp_v0 == 5) {
         temp_v1 = gCCSelection;
-        if ((temp_v1 != 2) && (temp_v1 != 3)) {
+        if ((temp_v1 != CC_150) && (temp_v1 != CC_EXTRA)) {
 
-        } else if ((D_802874F5 < 3) && (gCupSelection == 3)) {
+        } else if ((D_802874F5 < 3) && (gCupSelection == SPECIAL_CUP)) {
             phi_a1 = 1;
         }
         if (phi_a1 != 0) {
@@ -6989,7 +6989,7 @@ block_74:
                 gModeSelection = GRAND_PRIX;
             }
         } else {
-            gModeSelection = BATTTLE;
+            gModeSelection = BATTLE;
             if (gPlayerCountSelection1 == 1) {
                 D_8018EDF3 = 2;
                 D_800DC530 = 1;
@@ -7062,7 +7062,7 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) {
     u32 phi_t2;
 
     temp_v0 = gModeSelection;
-    if ((temp_v0 == 0) || (temp_v0 == 1)) {
+    if ((temp_v0 == GRAND_PRIX) || (temp_v0 == TIME_TRIALS)) {
         temp_v0_4 = arg0 * 8;
         temp_a0_2 = temp_v0_4 + &D_8018E810;
         temp_v1_2 = temp_v0_4 + &D_8018E7E8;
@@ -7158,7 +7158,7 @@ void func_8009D998(s32 arg0) {
     s32 phi_t3;
 
     temp_v0 = gModeSelection;
-    if ((temp_v0 == 0) || (temp_v0 == 1)) {
+    if ((temp_v0 == GRAND_PRIX) || (temp_v0 == TIME_TRIALS)) {
         temp_v0_4 = arg0 * 8;
         temp_v1_2 = temp_v0_4 + &D_8018E7E8;
         temp_a0_2 = temp_v0_4 + &D_8018E810;
@@ -8454,8 +8454,8 @@ loop_3:
             temp_a1_2 = *(&D_800EFD64 + *(&D_800E85F7 + arg0));
             temp_a3 = arg0 - 0xB1;
             phi_v1_4 = 0;
-            if (temp_v0_7 != 2) {
-                if (temp_v0_7 != 3) {
+            if (temp_v0_7 != VERSUS) {
+                if (temp_v0_7 != BATTLE) {
                     phi_a2 = arg0 * 4;
                 } else {
                     temp_t8 = arg0 * 4;
@@ -10212,7 +10212,6 @@ void func_800A1FB0(void *arg0) {
     s16 phi_s2_6;
     void *phi_v1_3;
     s8 phi_v1_4;
-
     gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x140, 0xF0, 0, 0, 0, 0x64);
     temp_v1 = D_8018EDEC;
     phi_v1_4 = temp_v1;
@@ -11601,10 +11600,10 @@ void func_800A4B38(void) {
 
     if (D_800DC5FC != 0) {
         temp_v0 = gModeSelection;
-        if (temp_v0 != 0) {
-            if (temp_v0 != 1) {
-                if (temp_v0 != 2) {
-                    if (temp_v0 != 3) {
+        if (temp_v0 != GRAND_PRIX) {
+            if (temp_v0 != TIME_TRIALS) {
+                if (temp_v0 != VERSUS) {
+                    if (temp_v0 != BATTLE) {
                         return;
                     }
                     func_800A5360();
@@ -11913,10 +11912,10 @@ void func_800A54EC(void) {
         temp_v1_2->unk0 = 0x1030040;
         temp_v1_2->unk4 = (gGfxPool + (D_80164AF0 << 6) + 0xFAC0) & 0x1FFFFFFF;
         D_80164AF0 = D_80164AF0 + 1;
-        if (temp_t2 != 0) {
-            if (temp_t2 != 1) {
-                if (temp_t2 != 2) {
-                    if (temp_t2 != 3) {
+        if (temp_t2 != GRAND_PRIX) {
+            if (temp_t2 != TIME_TRIALS) {
+                if (temp_t2 != VERSUS) {
+                    if (temp_t2 != BATTLE) {
                         phi_v1 = sp4C;
                     } else {
                         phi_v1 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8600;
@@ -12576,8 +12575,8 @@ void func_800A69C8(s32 arg0) {
             phi_v1 = 0;
             phi_v1 = 0;
             phi_v1 = 0;
-            if (temp_v0 != 2) {
-                if (temp_v0 != 3) {
+            if (temp_v0 != VERSUS) {
+                if (temp_v0 != BATTLE) {
 
                 } else {
                     if (phi_s0 != D_800DC5E8) {
@@ -12634,8 +12633,8 @@ void func_800A6BEC(s32 arg0) {
     if (temp_v1 > 0) {
         do {
             temp_v0 = gModeSelection;
-            if (temp_v0 != 2) {
-                if (temp_v0 != 3) {
+            if (temp_v0 != VERSUS) {
+                if (temp_v0 != BATTLE) {
 
                 } else {
                     func_800A6D94(3, phi_s0, D_8015F8C8);
@@ -12675,8 +12674,8 @@ void func_800A6CC0(s32 arg0) {
     if (temp_v1 > 0) {
         do {
             temp_v0 = gModeSelection;
-            if (temp_v0 != 2) {
-                if (temp_v0 != 3) {
+            if (temp_v0 != VERSUS) {
+                if (temp_v0 != BATTLE) {
 
                 } else {
                     func_800A6D94(4, phi_s0, D_8015F8CC);
@@ -16809,7 +16808,6 @@ void func_800ACC50(void *arg0) {
     void *phi_a1;
     u16 phi_v1;
     void *phi_a1_2;
-
     temp_t6 = arg0->unk4;
     temp_a1 = arg0;
     switch (temp_t6) {
diff --git a/src/code_800AF9B0.c b/src/code_800AF9B0.c
index 222fe52e5..899faeb7f 100644
--- a/src/code_800AF9B0.c
+++ b/src/code_800AF9B0.c
@@ -1926,7 +1926,7 @@ void func_800B28C8(void) {
             }
             gCCSelection = temp_v0;
             D_800DC648 = 1;
-            if (temp_v0 == 3) {
+            if (temp_v0 == CC_EXTRA) {
                 gIsMirrorMode = 1;
                 return;
             }
@@ -1943,7 +1943,7 @@ void func_800B28C8(void) {
     }
     gCCSelection = temp_v0;
     D_800DC648 = 1;
-    if (temp_v0 == 3) {
+    if (temp_v0 == CC_EXTRA) {
         gIsMirrorMode = 1;
         return;
     }
@@ -2405,8 +2405,8 @@ void func_800B3B58(void *arg0, u16 arg1) {
                 }
                 if ((phi_a2 & 0x4000) != 0) {
                     temp_v0_2 = gModeSelection;
-                    if (temp_v0_2 != 0) {
-                        if (temp_v0_2 != 3) {
+                    if (temp_v0_2 != GRAND_PRIX) {
+                        if (temp_v0_2 != BATTLE) {
                             D_8018EDEC = 2;
                         } else {
                             D_8018EDEC = 4;
@@ -2473,7 +2473,7 @@ block_22:
         phi_v1_2 = phi_a2;
         if ((phi_a2 & 0x100) != 0) {
             temp_v0_5 = gCupSelection;
-            if (temp_v0_5 < 3) {
+            if (temp_v0_5 < SPECIAL_CUP) {
                 D_8018EE0A = temp_v0_5;
                 gCupSelection = temp_v0_5 + 1;
                 sp1C = phi_a2;
@@ -2485,7 +2485,7 @@ block_22:
         temp_v0_6 = gCupSelection;
         phi_v0_2 = temp_v0_6;
         phi_a1_2 = &D_8018EDEC;
-        if (((phi_v1_2 & 0x200) != 0) && (temp_v0_6 > 0)) {
+        if (((phi_v1_2 & 0x200) != 0) && (temp_v0_6 > MUSHROOM_CUP)) {
             D_8018EE0A = temp_v0_6;
             gCupSelection = temp_v0_6 - 1;
             sp1C = phi_v1_2;
@@ -2588,7 +2588,7 @@ void func_800B3F74(u32 arg0) {
     case 10:
         gIsMirrorMode = 0;
         gEnableDebugMode = 0;
-        gCupSelection = 0;
+        gCupSelection = MUSHROOM_CUP;
         gCourseSelection = 0;
         D_8018EDF7 = 0;
         if (D_8018EDF3 <= 0) {
@@ -2720,13 +2720,13 @@ void func_800B3F74(u32 arg0) {
         break;
     case 3:
     case 13:
-        if (gModeSelection == BATTTLE) {
+        if (gModeSelection == BATTLE) {
             gCupSelection = 4;
             D_800DC540 = 4;
             D_8018EDEC = 4;
         } else {
-            if (gCupSelection == 4) {
-                gCupSelection = 0;
+            if (gCupSelection == BATTLE_CUP) {
+                gCupSelection = MUSHROOM_CUP;
             }
             D_8018EDEC = 1;
         }
diff --git a/src/code_8028DF00.c b/src/code_8028DF00.c
index 1d6114d90..16e792308 100644
--- a/src/code_8028DF00.c
+++ b/src/code_8028DF00.c
@@ -303,7 +303,7 @@ void func_8028E438(void) {
                 D_800DC5EC->screenHeight = temp_v0->screenHeight;
                 D_800DC5EC->screenStartX = temp_v0->screenStartX;
                 D_800DC5EC->screenStartY = temp_v0->screenStartY;
-                if (gModeSelection == BATTTLE) {
+                if (gModeSelection == BATTLE) {
                     func_80092604();
                 } else if (gModeSelection == VERSUS) {
                     func_80092604();
@@ -986,7 +986,7 @@ block_20:
         phi_s3 += 0xDD8;
         phi_s2 = temp_s2;
         if (temp_s2 == 4) {
-            if ((gEnableDebugMode != 0) && (gModeSelection != BATTTLE)) {
+            if ((gEnableDebugMode != 0) && (gModeSelection != BATTLE)) {
                 temp_a1 = D_800DC4BC;
                 if ((temp_a1->buttonPressed & 0x800) != 0) {
                     lapCount->unk0 = 2;
@@ -1130,7 +1130,7 @@ void func_8028FCBC(void) {
             func_8028F4E8();
             break;
         case 3:
-            if (gModeSelection == BATTTLE) {
+            if (gModeSelection == BATTLE) {
                 func_8028E0F0();
             } else {
                 func_8028F3F0();
@@ -1206,7 +1206,7 @@ void func_8028FCBC(void) {
                         func_8028E678();
                         break;
                     case VERSUS:
-                    case BATTTLE:
+                    case BATTLE:
                         func_8028E438();
                         break;
                 }
diff --git a/src/code_80296A50.c b/src/code_80296A50.c
index 32939b262..e91cc498b 100644
--- a/src/code_80296A50.c
+++ b/src/code_80296A50.c
@@ -7731,7 +7731,7 @@ void func_802A3008(void *arg0) {
     gDisplayListHead = temp_v0_5 + 8;
     temp_v0_5->unk4 = -1;
     temp_v0_5->unk0 = 0xBB000001;
-    if (gModeSelection != BATTTLE) {
+    if (gModeSelection != BATTLE) {
         func_80297340(sp48, 1.0f, temp_s1);
     }
     D_8015F8E0 = 0;
diff --git a/src/code_802B0210.c b/src/code_802B0210.c
index 8b2c215f3..98239708a 100644
--- a/src/code_802B0210.c
+++ b/src/code_802B0210.c
@@ -2380,7 +2380,7 @@ block_16:
                     phi_v0_2 = temp_v0_2 - temp_v1_2;
                 }
                 arg0->unk12 = phi_v0_2;
-            } else if (gModeSelection == BATTTLE) {
+            } else if (gModeSelection == BATTLE) {
                 arg0->unk8 = 1000.0f;
                 arg0->unk4 = func_802B3FD0(&gPlayers[temp_t7], arg0);
                 if (arg0->unk4 < 0) {