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, 44 insertions, 45 deletions

diff --git a/src/code_80086E70.c b/src/code_80086E70.c
index 10419b9e3..3c115fecd 100644
--- a/src/code_80086E70.c
+++ b/src/code_80086E70.c
@@ -404,10 +404,10 @@ UNUSED void func_800880DC(void) {
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165760;
-extern ? D_80165770;
-extern ? D_80165780;
-extern ? D_80165784;
+extern s16 D_80165760;
+extern s16 D_80165770;
+extern s16 D_80165780;
+extern s16 D_80165784;
 extern ? D_80165C94;
 
 void func_800880E4(s32 arg0) {
@@ -448,8 +448,8 @@ void func_80088150(s32 arg0) {
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-extern ? D_80165760;
-extern ? D_80165780;
+extern s16 D_80165760;
+extern s16 D_80165780;
 
 void func_80088178(s32 objectIndex, s32 arg1) {
     s16 temp_a1;
@@ -496,9 +496,9 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088228.s")
 extern s16 D_80165762;
 extern s16 D_80165772;
 extern s16 D_80165782;
-extern ? D_80165C18;
+extern struct_80165C18_entry D_80165C18;
 
-? func_800882B0(s32 arg0, s32 arg1) {
+s32 func_800882B0(s32 arg0, s32 arg1) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f2;
@@ -521,8 +521,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800882B0.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_800880E4();                                  /* extern */
-? func_80088178(s32, ?);                            /* extern */
+void func_800880E4();                                  /* extern */
+void func_80088178(s32, ?);                            /* extern */
 s32 func_800882B0(s32, ?);                          /* extern */
 
 void func_80088364(s32 objectIndex) {
@@ -1000,10 +1000,10 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008933C.s")
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80072180(); // extern
+void func_80072180(); // extern
 s32 func_8007223C(?); // extern
 f32 func_8008933C(Player *, s32, s32, s32); // extern
-? func_800C9060(u8, s32); // extern
+void func_800C9060(u8, s32); // extern
 
 void func_80089474(s32 arg0, u8 arg1, s32 arg2, s32 arg3, s32 arg4) {
     Player *sp18;
@@ -1022,7 +1022,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089474.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_80072180();                                  /* extern */
+void func_80072180();                                  /* extern */
 f32 func_8008933C(Player *, s32, s32, f32);         /* extern */
 extern s32 D_8018D158;
 
@@ -1064,8 +1064,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089820.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_80072180();                                  /* extern */
-? func_8008933C(Player *, s32, s32, f32);           /* extern */
+void func_80072180();                                  /* extern */
+f32 func_8008933C(Player *, s32, s32, f32);           /* extern */
 extern s32 D_8018D158;
 
 void func_80089A04(s32 objectIndex, s32 arg1, f32 arg2) {
@@ -1095,7 +1095,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089A04.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_80072180();                                  /* extern */
+void func_80072180();                                  /* extern */
 extern s32 D_8018D158;
 
 s32 func_80089B50(s32 objectIndex) {
@@ -1140,7 +1140,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089B50.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_80072180();                                  /* extern */
+void func_80072180();                                  /* extern */
 extern s32 D_8018D158;
 
 s32 func_80089CBC(s32 objectIndex, f32 arg1) {
@@ -1180,7 +1180,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089CBC.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_80072180();                                  /* extern */
+void func_80072180();                                  /* extern */
 extern s32 D_8018D158;
 
 s32 func_80089F24(s32 objectIndex) {
@@ -1441,7 +1441,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A920.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008A920();                                  /* extern */
+void func_8008A920();                                  /* extern */
 
 void func_8008A9B8(s32 objectIndex) {
     s32 temp_t9;
@@ -1460,7 +1460,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A9B8.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008A920();                                  /* extern */
+void func_8008A920();                                  /* extern */
 
 void func_8008AA3C(s32 objectIndex) {
     s32 temp_v1;
@@ -1485,7 +1485,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008AA3C.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008A9B8();                                  /* extern */
+void func_8008A9B8();                                  /* extern */
 
 void func_8008AB10(s32 objectIndex) {
     s16 temp_t0;
@@ -1625,11 +1625,11 @@ UNUSED void func_8008AE94(void) {
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165760;
-extern ? D_80165770;
-extern ? D_80165780;
-extern ? D_80165C18;
-extern ? D_80183DC8;
+extern s16 D_80165760;
+extern s16 D_80165770;
+extern s16 D_80165780;
+extern struct_80165C18_entry D_80165C18;
+extern s32 D_80183DC8;
 
 void func_8008AE9C(s32 arg0) {
     f32 temp_f0;
@@ -1674,11 +1674,11 @@ UNUSED void func_8008B030(void) {
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165760;
-extern ? D_80165770;
-extern ? D_80165780;
-extern ? D_80165C18;
-extern ? D_80183DA8;
+extern s16 D_80165760;
+extern s16 D_80165770;
+extern s16 D_80165780;
+extern struct_80165C18_entry D_80165C18;
+extern s32 D_80183DA8;
 
 void func_8008B038(s32 arg0) {
     f32 temp_f0;
@@ -1774,7 +1774,6 @@ extern s16 D_80165780;
 extern s16 D_80165782;
 extern s16 D_80165784;
 extern s16 D_80165786;
-extern ? D_80165C18;
 
 void func_8008B284(s32 arg0) {
     s32 sp0;
@@ -1860,9 +1859,9 @@ void func_8008B44C(s32 arg0) {
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008B1D4(s32);                               /* extern */
-? func_8008B284(s32);                               /* extern */
-? func_8008B3E4();                                  /* extern */
+void func_8008B1D4(s32);                               /* extern */
+void func_8008B284(s32);                               /* extern */
+void func_8008B3E4();                                  /* extern */
 extern f64 D_800EF508;
 extern f64 D_800EF510;
 
@@ -1909,7 +1908,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B478.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008B478(?);                                 /* extern */
+void func_8008B478(?);                                 /* extern */
 
 void func_8008B620(s32 objectIndex) {
     s16 temp_t0;
@@ -1933,7 +1932,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B620.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008B478(?);                                 /* extern */
+void func_8008B478(?);                                 /* extern */
 
 void func_8008B6A4(s32 objectIndex) {
     s16 temp_t0;
@@ -1957,7 +1956,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B6A4.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_8008B620();                                  /* extern */
+void func_8008B620();                                  /* extern */
 extern ? D_80165CC6;
 
 void func_8008B724(s32 objectIndex) {
@@ -1981,7 +1980,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B724.s")
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8008B6A4(); // extern
+void func_8008B6A4(); // extern
 extern ? D_80165CC6;
 
 void func_8008B78C(s32 arg0) {
@@ -2135,8 +2134,8 @@ void func_8008BF18(s32 objectIndex) {
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-extern ? D_80183E40;
-extern ? D_80183E80;
+extern f32 D_80183E40;
+extern s16 D_80183E80;
 
 void func_8008BF64(s32 objectIndex) {
     struct_80165C18_entry *temp_v0;
@@ -2160,10 +2159,10 @@ void func_8008BFC0(s32 objectIndex) {
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-? func_80088228();                                  /* extern */
-? func_80088364();                                  /* extern */
-? func_8008B620();                                  /* extern */
-? func_8008B6A4();                                  /* extern */
+void func_80088228();                                  /* extern */
+void func_80088364();                                  /* extern */
+void func_8008B620();                                  /* extern */
+void func_8008B6A4();                                  /* extern */
 
 void func_8008BFFC(s32 objectIndex) {
     s16 temp_v0;