Change a variety of constants to defines (#257)

* Change a variety of constants to defines

* Add notes regarding menu columns

* Change unknown type to known types

1 files changed, 47 insertions, 52 deletions

diff --git a/src/camera.c b/src/camera.c
index e703fbb60..aa795fb51 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -12,14 +12,14 @@ Camera *camera4 = &cameras[3];
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_80014DE4(s32, s32, s32, Camera *);           /* extern */
-extern ? D_80152300;
+void func_80014DE4(s32, s32, s32, Camera *);           /* extern */
+extern u16 D_80152300;
 extern ? D_80164498;
-extern ? D_80164678;
+extern s16 D_80164678;
 extern ? D_801649D8;
 extern ? D_801649E8;
 extern ? D_801649F8;
-extern ? D_80164A08;
+extern s32 D_80164A08;
 extern ? D_80164A18;
 extern s32 D_80164A2C;
 extern f32 D_80164A30;
@@ -98,11 +98,10 @@ void func_8001C4D0(f32 posX, f32 posY, f32 posZ, s16 rot, u32 arg4, s32 cameraId
         temp_v1 = &gPlayerOne[cameraId];
         temp_a3->unk2C = (s16) temp_v1->unk_02E;
         temp_a3->unk_AC = temp_v1->unk_02E;
-        temp_v0 = gActiveScreenMode;
-        switch (temp_v0) {                          /* switch 1; irregular */
-        case 0:                                     /* switch 1 */
-        case 2:                                     /* switch 1 */
-            if (gModeSelection == 3) {
+        switch (gActiveScreenMode) {                          /* switch 1; irregular */
+        case SCREEN_MODE_1P:                                     /* switch 1 */
+        case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:                                     /* switch 1 */
+            if (gModeSelection == BATTLE) {
                 temp_a3->unk_30[0] = 0.0f;
                 temp_a3->unk_3C[0] = 0.0f;
                 temp_a3->unk_3C[1] = 0.0f;
@@ -119,8 +118,8 @@ void func_8001C4D0(f32 posX, f32 posY, f32 posZ, s16 rot, u32 arg4, s32 cameraId
                 temp_a3->unk_3C[2] = 70.0f;
             }
             break;
-        case 1:                                     /* switch 1 */
-            if (gModeSelection == 3) {
+        case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:                                     /* switch 1 */
+            if (gModeSelection == BATTLE) {
                 temp_a3->unk_30[0] = 0.0f;
                 temp_a3->unk_3C[0] = 0.0f;
                 temp_a3->unk_3C[1] = 0.0f;
@@ -136,8 +135,8 @@ void func_8001C4D0(f32 posX, f32 posY, f32 posZ, s16 rot, u32 arg4, s32 cameraId
                 temp_a3->unk_30[2] = -35.0f;
             }
             break;
-        case 3:                                     /* switch 1 */
-            if (gModeSelection == 3) {
+        case SCREEN_MODE_3P_4P_SPLITSCREEN:                                     /* switch 1 */
+            if (gModeSelection == BATTLE) {
                 temp_a3->unk_30[0] = 0.0f;
                 temp_a3->unk_3C[0] = 0.0f;
                 temp_a3->unk_3C[1] = 0.0f;
@@ -223,7 +222,7 @@ void func_8001CA24(Player *player, f32 arg1) {
 
 #ifdef MIPS_TO_C
 //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
-? func_802B6540(f32 *, ?, f32, ?, s32);             /* extern */
+void func_802B6540(f32 *, ?, f32, ?, s32);             /* extern */
 extern f32 D_80164A30;
 s16 gCurrentCourseId;                               /* unable to generate initializer */
 
@@ -292,7 +291,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001CA78.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
-? func_802B6540(f32 *, ?, ?, ?, s32);               /* extern */
+void func_802B6540(f32 *, ?, ?, ?, s32);               /* extern */
 extern ? D_80164A38;
 extern ? D_80164A48;
 extern ? D_80164A78;
@@ -412,8 +411,7 @@ void func_8001CCEC(Player *player, Camera *camera, f32 *arg2, f32 *arg3, f32 *ar
         }
     }
     if ((player->unk_0CA & 0x100) == 0x100) {
-        temp_v0 = gActiveScreenMode;
-        if ((temp_v0 == 1) || (temp_v0 == 2) || (temp_v0 == 3)) {
+        if ((gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL) || (gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL) || (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN)) {
             temp_a0_5 = var_s2 + &D_80164A90;
             sp38 = temp_a0_5;
             sp3C = var_v1_2;
@@ -498,7 +496,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001CCEC.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_802B6540(f32 *, f32, ?, f32, s32);           /* extern */
+void func_802B6540(f32 *, f32, ?, f32, s32);           /* extern */
 extern ? D_80164A90;
 extern ? D_80164AA0;
 
@@ -555,7 +553,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001D53C.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_802B6540(f32 *, ?, f32, ?, s32);             /* extern */
+void func_802B6540(f32 *, ?, f32, ?, s32);             /* extern */
 
 void func_8001D794(Player *player, Camera *camera, f32 *arg2, f32 *arg3, f32 *arg4, f32 *arg5, s16 arg6) {
     f32 sp6C;
@@ -597,7 +595,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001D794.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_802B6540(f32 *, ?, ?, ?, s32);               /* extern */
+void func_802B6540(f32 *, ?, ?, ?, s32);               /* extern */
 extern ? D_80164A38;
 extern ? D_80164A48;
 extern ? D_80164A78;
@@ -780,7 +778,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001D944.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_8001CA78(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
+void func_8001CA78(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
 
 void func_8001E0C4(Camera *camera, Player *player, s8 arg2) {
     f32 sp84;
@@ -854,7 +852,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001E0C4.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_8001CCEC(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
+void func_8001CCEC(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
 
 void func_8001E45C(Camera *camera, Player *player, s8 arg2) {
     f32 sp94;
@@ -955,7 +953,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001E45C.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_8001D53C(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
+void func_8001D53C(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
 
 void func_8001E8E8(Camera *camera, Player *player, s8 arg2) {
     f32 sp8C;
@@ -993,7 +991,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001E8E8.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_8001D944(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
+void func_8001D944(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
 
 void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
     f32 sp94;
@@ -1094,16 +1092,16 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001EA0C.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_80019ED0();                                  /* extern */
-? func_8001A0A4(s16 *, Camera *, Player *, s8, s32); /* extern */
-? func_8001A0DC(s16 *, Camera *, Player *, s8, s32); /* extern */
-? func_8001A588(u16 *, Camera *, Player *, s8, s32); /* extern */
-? func_8001E0C4(Camera *, Player *, s8);            /* extern */
-? func_8001E45C(Camera *, Player *, s8);            /* extern */
-? func_8001E8E8(Camera *, Player *, s8);            /* extern */
-? func_8001EA0C(Camera *, Player *, s8);            /* extern */
-? func_8001F87C(s32);                               /* extern */
-extern ? D_80152300;
+void func_80019ED0();                                  /* extern */
+void func_8001A0A4(s16 *, Camera *, Player *, s8, s32); /* extern */
+void func_8001A0DC(s16 *, Camera *, Player *, s8, s32); /* extern */
+void func_8001A588(u16 *, Camera *, Player *, s8, s32); /* extern */
+void func_8001E0C4(Camera *, Player *, s8);            /* extern */
+void func_8001E45C(Camera *, Player *, s8);            /* extern */
+void func_8001E8E8(Camera *, Player *, s8);            /* extern */
+void func_8001EA0C(Camera *, Player *, s8);            /* extern */
+void func_8001F87C(s32);                               /* extern */
+extern u16 D_80152300;
 extern u16 D_8015F894;
 extern s8 D_80164A88;
 extern s8 D_80164A89;
@@ -1137,9 +1135,8 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
     if (camera == camera4) {
         var_s0 = 3;
     }
-    temp_v0 = gModeSelection;
-    switch (temp_v0) {                              /* irregular */
-    case 0:
+    switch (gModeSelection) {                              /* irregular */
+    case GRAND_PRIX:
         if (((player->unk_000 & 0x800) == 0x800) || (D_800DC51C == 1)) {
             *(&D_80152300 + (var_s0 * 2)) = 3;
         } else if (D_800DC5FC == 1) {
@@ -1148,7 +1145,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
             func_8001A0DC((var_s0 * 2) + &D_80152300, camera, player, arg2, var_s0);
         }
         break;
-    case 3:
+    case BATTLE:
         if ((D_800DC51C == (u16) 1) || ((D_8015F894 == 2) && (D_80164A89 == 1))) {
             if (D_80164A88 == 0) {
                 func_80019ED0();
@@ -1172,7 +1169,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
             *sp2C = 9;
         }
         break;
-    case 1:
+    case TIME_TRIALS:
         if (((gPlayerOne->unk_000 & 0x800) == 0x800) || (D_800DC51C == (u16) 1)) {
             D_80152300.unk0 = 3;
             *(&D_80152300 + 2) = 3;
@@ -1191,7 +1188,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
             *sp2C = 1;
         }
         break;
-    case 2:
+    case VERSUS:
         if (((player->unk_000 & 0x800) == 0x800) || (D_800DC51C == (u16) 1) || (D_8015F894 == 2)) {
             *(&D_80152300 + (var_s0 * 2)) = 3;
         } else {
@@ -1246,7 +1243,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001EE98.s")
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
 f32 func_80014EE4(f32, s32, s32);                   /* extern */
 extern ? D_80164498;
-extern ? D_80164A08;
+extern s32 D_80164A08[4];
 
 void func_8001F394(Player *player, f32 *arg1) {
     s32 sp2C;
@@ -1281,8 +1278,7 @@ void func_8001F394(Player *player, f32 *arg1) {
     if (player == gPlayerFour) {
         sp2C = 3;
     }
-    temp_t3 = sp2C * 4;
-    temp_v1 = temp_t3 + &D_80164A08;
+    temp_v1 = D_80164A08[sp2C];
     if (*temp_v1 == 0) {
         if (player->unk_00C & 0x40000) {
             *temp_v1 = 1;
@@ -1384,12 +1380,11 @@ block_51:
         }
         break;
     }
-    temp_v0_4 = gActiveScreenMode;
-    switch (temp_v0_4) {                            /* switch 1; irregular */
+    switch (gActiveScreenMode) {                            /* switch 1; irregular */
     default:                                        /* switch 1 */
         var_f2 = sp34;
         break;
-    case 0:                                         /* switch 1 */
+    case SCREEN_MODE_1P:                                         /* switch 1 */
         temp_v0_5 = D_80164A28;
         if (temp_v0_5 == 1) {
             *(&D_80164498 + temp_t3) = 40.0f;
@@ -1409,9 +1404,9 @@ block_51:
 block_66:
         var_f2 = var_f0;
         break;
-    case 1:                                         /* switch 1 */
-    case 2:                                         /* switch 1 */
-    case 3:                                         /* switch 1 */
+    case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:                                         /* switch 1 */
+    case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:                                         /* switch 1 */
+    case SCREEN_MODE_3P_4P_SPLITSCREEN:                                         /* switch 1 */
         var_f0 = func_80014EE4(*arg1, sp2C);
         goto block_66;
     }
@@ -1424,7 +1419,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001F394.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-extern ? D_80152300;
+extern u16 D_80152300;
 extern s32 D_80164A2C;
 
 void func_8001F87C(s32 cameraId) {
@@ -1433,10 +1428,10 @@ void func_8001F87C(s32 cameraId) {
     s32 var_a1;
     u16 temp_v0;
 
-    if (gActiveScreenMode == 0) {
+    if (gActiveScreenMode == SCREEN_MODE_1P) {
         var_a1 = 0;
         var_a2 = gPlayerOne;
-        if (gModeSelection == 0) {
+        if (gModeSelection == GRAND_PRIX) {
 loop_3:
             temp_v0 = var_a2->unk_000;
             if (!(temp_v0 & 0x200) && !(temp_v0 & 0x80)) {