Bit of renaming and cleanup (#433)

* Match func_80086AFC

* Bit of renaming

* Minor cleanup

* Minor cleanup

src/lights.c

@@ -78,9 +78,9 @@ ObjectLight *func_80031CAC(Object *light, LevelObjectEntry_RgbaLight *lightEntry
     newLight = NULL;
     if (gNumActiveLights < gMaxLights) {
         newLight = gActiveLights[gNumActiveLights++];
-        newLight->unk0 = ((s32) (lightEntry->unk8 & 0xF0) >> 4);
+        newLight->unk0 = (lightEntry->unk8 & 0xF0) >> 4;
         newLight->type = lightEntry->unk8 & 0xF;
-        newLight->unk1 = ((s32) (lightEntry->unk9 & 0xE0) >> 5);
+        newLight->unk1 = (lightEntry->unk9 & 0xE0) >> 5;
         newLight->unk2 = lightEntry->unk9 & 0x1F;
         newLight->enabled = TRUE;
         newLight->owner = NULL;
@@ -92,9 +92,9 @@ ObjectLight *func_80031CAC(Object *light, LevelObjectEntry_RgbaLight *lightEntry
             newLight->y = light->segment.trans.y_position;
             newLight->z = light->segment.trans.z_position;
         } else {
-            newLight->x = (f32) lightEntry->common.x;
-            newLight->y = (f32) lightEntry->common.y;
-            newLight->z = (f32) lightEntry->common.z;
+            newLight->x = lightEntry->common.x;
+            newLight->y = lightEntry->common.y;
+            newLight->z = lightEntry->common.z;
         }
         newLight->unk1C = lightEntry->unkA << 16;
         newLight->unk2C = 0;

src/menu.h

@@ -254,7 +254,7 @@ typedef struct unk80126A80 {
 } unk80126A80;
 
 /* Size: 0x10 bytes */
-typedef struct unk800861C8 {
+typedef struct SaveFileData {
   /* 0x00 */ u8 saveFileType; //SaveFileType enum
   /* 0x01 */ u8 unk1;
   /* 0x02 */ u8 unk2;
@@ -262,9 +262,9 @@ typedef struct unk800861C8 {
   /* 0x04 */ s16 compressedFilename;
   /* 0x06 */ u8 controllerIndex;
   /* 0x07 */ u8 saveFileNumber;
-  /* 0x08 */ char *unk8;
+  /* 0x08 */ char *saveFileExt;
   /* 0x0C */ u32 fileSize; // Game Data File Size
-} unk800861C8;
+} SaveFileData;
 
 // Size: 12 bytes
 typedef struct unk80126878 {
@@ -308,7 +308,7 @@ typedef struct TitleScreenDemos {
 
 /* Size 0x10 bytes */
 typedef struct TrackRenderDetails {
-  /* 0x00 */ u8 *hubName;
+  /* 0x00 */ char *hubName;
   /* 0x04 */ u8 *trackName;
   /* 0x08 */ s16 xOff;
   /* 0x0A */ s16 yOff;
@@ -348,8 +348,8 @@ void unload_big_font_1(void);
 void menu_audio_options_init(void);
 void func_800851FC(void);
 void menu_save_options_init(void);
-SIDeviceStatus func_800860A8(s32 controllerIndex, s32 *arg1, unk800861C8 *arg2, s32 *arg3, s32 fileSize, s32 arg5);
-void func_800861C8(unk800861C8 *arg0, s32 *arg1);
+SIDeviceStatus func_800860A8(s32 controllerIndex, s32 *arg1, SaveFileData *arg2, s32 *arg3, s32 fileSize, s32 arg5);
+void func_800861C8(SaveFileData *arg0, s32 *arg1);
 s32 func_800874D0(s32 buttonsPressed, s32 arg1);
 s32 func_800875E4(s32 buttonsPressed, s32 arg1);
 s32 func_800876CC(s32 buttonsPressed, s32 arg1);
@@ -503,7 +503,7 @@ void func_8008E4EC(void);
 SIDeviceStatus func_800862C4(void);
 void func_8009C6D4(s32 arg0);
 s32 func_80087734(s32 buttonsPressed, s32 yAxis);
-void func_800853D0(unk800861C8 *arg0, s32 x, s32 y);
+void func_800853D0(SaveFileData *arg0, s32 x, s32 y);
 void render_track_select(s32 x, s32 y, char *hubName, char *trackName, s32 rectOpacity, s32 imageId, s32 copyViewPort, DrawTexture *arg7, s32 arg8);
 void func_80093D40(UNUSED s32 updateRate);
 s32 func_80095728(Gfx **dlist, MatrixS **matrices, Vertex **vertices, s32 updateRate);
@@ -516,6 +516,10 @@ void func_80085B9C(UNUSED s32 updateRate);
 void draw_menu_elements(s32 flags, MenuElement *elems, f32 scale);
 void render_file_select_menu(UNUSED s32 updateRate);
 void func_800871D8(SIDeviceStatus deviceStatus);
+SIDeviceStatus func_80086AFC(void);
+void render_track_select_setup_ui(s32 updateRate);
+void func_80098EBC(s32 updateRate);
+void func_80096978(UNUSED s32 updateRate, f32 opacity);
 
 // Non Matching functions below here
 void load_menu_text(s32 language); // Non Matching
@@ -523,7 +527,6 @@ s32 menu_controller_pak_loop(s32 updateRate);
 void menu_game_select_init(void);
 void func_8008FF1C(s32 updateRate);
 void func_80090918(s32 updateRate);
-void render_track_select_setup_ui(s32 updateRate);
 void func_80092188(s32 updateRate);
 void trim_filename_string(char *input, char *output);
 void menu_ghost_data_init(void);
@@ -545,9 +548,7 @@ s32 func_8008F618(Gfx **dlist, MatrixS **mtx);
 void func_80080BC8(Gfx **);
 void func_80080E90(Gfx **dList, s32 startX, s32 startY, s32 width, s32 height, s32 borderWidth, s32 borderHeight, s32 colour0, s32 colour1, s32 colour2, s32 colour3);
 void func_80084854(void);
-SIDeviceStatus func_80086AFC(void);
 void func_80098774(s32);
-void func_80096978(s32, f32);
 void func_80094D28(UNUSED s32 updateRate);
 
 typedef enum MenuTextures {

src/save_data.h

@@ -46,7 +46,7 @@ typedef enum {
     SAVE_FILE_TYPE_UNK1, //GAMD on cartridge save?
     SAVE_FILE_TYPE_UNK2, //TIMD saved on cartridge>
     SAVE_FILE_TYPE_GAME_DATA, //GAMD saved on cpak?
-    SAVE_FILE_TYPE_TIME_DATA, //TIMD saved on cpak>
+    SAVE_FILE_TYPE_TIME_DATA, //TIMD saved on cpak?
     SAVE_FILE_TYPE_GHOST_DATA, //GHSS
     SAVE_FILE_TYPE_UNKNOWN, //Possibly from another game?
     SAVE_FILE_TYPE_UNK7,

src/thread3_main.h

@@ -135,7 +135,7 @@ void update_menu_scene(s32 arg0);
 void load_level_for_menu(s32 levelId, s32 numberOfPlayers, s32 cutsceneId);
 void calc_and_alloc_heap_for_settings(void);
 void init_racer_headers(void);
-void clear_lap_records(Settings *settings, s32 arg1);
+void clear_lap_records(Settings *settings, s32 flags);
 void clear_game_progress(Settings *settings);
 void reset_save_data(void);
 Settings *get_settings(void);

tools/permuter_settings.toml

@@ -7,10 +7,15 @@ compiler_type = "ido"
 "fast3d_cmd" = "void"
 "OS_PHYSICAL_TO_K0" = "void *"
 "_SHIFTL" = "unsigned int"
-"G_IM_.*" = "unsigned int"
+"G_IM.*" = "unsigned int"
 "KEEPLINEBREAK" = "void"
 "IO_READ" = "volatile unsigned int *"
 "WAIT_ON_IOBUSY" = "void"
+"TEX_FORMAT_.*" = "unsigned int"
+"G_TX_.*" = "unsigned int"
+"TRUE" = "unsigned int"
+"FALSE" = "unsigned int"
+"NULL" = "unsigned int"
 
 [decompme.compilers]
 "./tools/ido-static-recomp/build/5.3/out/cc" = "ido5.3_irix"