Misc Cleanup 3 (#1268)

* begin more cleanup

* more enums

* typo

* ==

* fix go.h

* fix RaceDogInfo struct

* PR Review

* PR Suggestions

* missed one

* missed even more

* fix params

* fix number

include/z64.h

@@ -657,7 +657,7 @@ typedef struct {
 #define FLASHROM_REQUEST_WRITE 1
 #define FLASHROM_REQUEST_READ 2
 
-enum fram_command {
+typedef enum framCommand {
     /* Does nothing for FRAM_COMMAND_SET_MODE_READ_AND_STATUS, FRAM_MODE_NOP, FRAM_COMMAND_SET_MODE_STATUS_AND_STATUS
        Initializes fram to 0xFF in FRAM_MODE_ERASE
        Writes Contents in FLASHRAM_MODE_WRITE
@@ -681,15 +681,15 @@ enum fram_command {
     FRAM_COMMAND_SET_MODE_READ_AND_STATUS = 0xF0000000,
     /* unk */
     FRAM_COMMAND_UNK_ERASE_OPERATION = 0x3C000000
-};
+} framCommand;
 
-enum fram_mode {
-    FRAM_MODE_NOP = 0,
-    FRAM_MODE_ERASE,
-    FRAM_MODE_WRITE,
-    FRAM_MODE_READ,
-    FRAM_MODE_STATUS
-};
+typedef enum framMode {
+    /* 0 */ FRAM_MODE_NOP,
+    /* 1 */ FRAM_MODE_ERASE,
+    /* 2 */ FRAM_MODE_WRITE,
+    /* 3 */ FRAM_MODE_READ,
+    /* 4 */ FRAM_MODE_STATUS
+} framMode;
 
 typedef enum {
     /* 0 */ VI_MODE_EDIT_STATE_INACTIVE,

include/z64actor.h

@@ -317,7 +317,7 @@ typedef struct EnAObj {
 
 typedef enum {
     /* 0 */ AOBJ_SIGNPOST_OBLONG,
-    /* 1 */ AOBJ_SIGNPOST_ARROW,
+    /* 1 */ AOBJ_SIGNPOST_ARROW
 } AObjType;
 
 #define AOBJ_GET_TEXTID(thisx) ((((thisx)->params >> 8) & 0xFF) | 0x300)

include/z64audio.h

@@ -105,7 +105,7 @@ typedef enum {
     /* 1 */ SOUNDMODE_HEADSET,
     /* 2 */ SOUNDMODE_SURROUND_EXTERNAL,
     /* 3 */ SOUNDMODE_MONO,
-    /* 4 */ SOUNDMODE_SURROUND,
+    /* 4 */ SOUNDMODE_SURROUND
 } SoundMode;
 
 typedef enum {

include/z64camera.h

@@ -361,7 +361,7 @@ typedef enum {
     /* 0x12 */ CAM_DATA_18,
     /* 0x13 */ CAM_DATA_19,
     /* 0x14 */ CAM_DATA_20,
-    /* 0x15 */ CAM_DATA_21,
+    /* 0x15 */ CAM_DATA_21
 } CameraDataType;
 
 /*================================

include/z64item.h

@@ -19,7 +19,7 @@ typedef enum {
     /* 2 */ EQUIP_VALUE_SWORD_RAZOR,
     /* 3 */ EQUIP_VALUE_SWORD_GILDED,
     /* 4 */ EQUIP_VALUE_SWORD_DIETY,
-    /* 5 */ EQUIP_VALUE_SWORD_MAX,
+    /* 5 */ EQUIP_VALUE_SWORD_MAX
 } EquipValueSword;
 
 typedef enum {

include/z64math.h

@@ -105,13 +105,13 @@ typedef VecSphGeo VecGeo;
 typedef enum {
     /* 0 */ OLIB_ADD_COPY, // Copy `b` to dest
     /* 1 */ OLIB_ADD_OFFSET, // Add `a` and `b` to dest, and also add the yaw of `a` to the dest
-    /* 2 */ OLIB_ADD, // Add `a` and `b` to dest
+    /* 2 */ OLIB_ADD // Add `a` and `b` to dest
 } OlibVec3fAdd;
 
 typedef enum {
     /* 0 */ OLIB_DIFF_COPY, // Copy `b` to dest
     /* 1 */ OLIB_DIFF_OFFSET, // Sub `a` and `b` to dest, and also subs the yaw of `a` to the dest
-    /* 2 */ OLIB_DIFF, // Sub `a` and `b` to dest
+    /* 2 */ OLIB_DIFF // Sub `a` and `b` to dest
 } OlibVec3fDiff;
 
 #define LERPIMP(v0, v1, t) ((v0) + (((v1) - (v0)) * (t)))

include/z64player.h

@@ -962,7 +962,7 @@ typedef enum PlayerUnkAA5 {
     /* 2 */ PLAYER_UNKAA5_2,
     /* 3 */ PLAYER_UNKAA5_3,
     /* 4 */ PLAYER_UNKAA5_4,
-    /* 5 */ PLAYER_UNKAA5_5,
+    /* 5 */ PLAYER_UNKAA5_5
 } PlayerUnkAA5;
 
 typedef void (*PlayerActionFunc)(struct Player* this, struct PlayState* play);

include/z64save.h

@@ -87,7 +87,7 @@ typedef enum {
     /*  5 */ TIMER_ID_ENV_HAZARD, // environmental hazard timer (underwater or hot room)
     /*  6 */ TIMER_ID_GORON_RACE_UNUSED,
     /*  7 */ TIMER_ID_MAX,
-    /* 99 */ TIMER_ID_NONE = 99,
+    /* 99 */ TIMER_ID_NONE = 99
 } TimerId;
 
 typedef enum {
@@ -1569,7 +1569,7 @@ typedef enum {
     /* 0 */ DUNGEON_INDEX_WOODFALL_TEMPLE,
     /* 1 */ DUNGEON_INDEX_SNOWHEAD_TEMPLE,
     /* 2 */ DUNGEON_INDEX_GREAT_BAY_TEMPLE,
-    /* 3 */ DUNGEON_INDEX_STONE_TOWER_TEMPLE, // Also applies to Inverted Stone Tower Temple
+    /* 3 */ DUNGEON_INDEX_STONE_TOWER_TEMPLE // Also applies to Inverted Stone Tower Temple
 } DungeonIndex;
 
 void Sram_ActivateOwl(u8 owlId);

include/z64schedule.h

@@ -50,13 +50,13 @@ typedef enum {
     /* 0x0F */ SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_S,  // Branches if the current time is less than the command time, short range branch
     /* 0x10 */ SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_L,  // Branches if the current time is less than the command time, long range branch
     /* 0x11 */ SCHEDULE_CMD_ID_BRANCH_S,             // Always branch, short range branch
-    /* 0x12 */ SCHEDULE_CMD_ID_BRANCH_L,             // Always branch, long range branch
+    /* 0x12 */ SCHEDULE_CMD_ID_BRANCH_L              // Always branch, long range branch
 } ScheduleCommandId;
 
 typedef enum {
     /* 0 */ SCHEDULE_CHECK_MISC_ROOM_KEY,
     /* 1 */ SCHEDULE_CHECK_MISC_LETTER_TO_KAFEI,
-    /* 2 */ SCHEDULE_CHECK_MISC_MASK_ROMANI,
+    /* 2 */ SCHEDULE_CHECK_MISC_MASK_ROMANI
 } ScheduleCheckMisc;
 
 typedef struct {

include/z64transition.h

@@ -68,7 +68,7 @@ typedef struct {
 
 typedef enum {
     /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1,
-    /* 2 */ TRANS_INSTANCE_TYPE_FILL_IN,
+    /* 2 */ TRANS_INSTANCE_TYPE_FILL_IN
 } TransitionInstanceType;
 
 #define TRANS_INSTANCE_TYPE_FADE_FLASH 3

include/z_fireobj.h

@@ -61,7 +61,7 @@ typedef enum FireState {
     /* 0 */ FIRE_STATE_GROWING,
     /* 1 */ FIRE_STATE_SHRINKING,
     /* 2 */ FIRE_STATE_FULLY_LIT,
-    /* 3 */ FIRE_STATE_NOT_LIT,
+    /* 3 */ FIRE_STATE_NOT_LIT
 } FireState;
 
 #define FIRE_FLAG_WATER_EXTINGUISHABLE (1 << 0)