Rename some fields to be suffixed with "num" for consistency

src/include/game/game_0b0420.h

@@ -41,7 +41,7 @@ u32 func0f0b1af0(void);
 u32 func0f0b1c24(void);
 u32 func0f0b1c78(void);
 u32 func0f0b1ce8(void);
-f32 func0f0b1d28(u8 *weapon_id);
+f32 func0f0b1d28(u8 *weaponnum);
 u32 func0f0b1e28(void);
 u32 func0f0b1e68(void);
 u32 func0f0b1ea8(void);

src/include/game/game_19c990.h

@@ -8,7 +8,7 @@ extern s32 g_FrWeaponNum;
 extern u8 var800888a0;
 
 bool ciIsTourDone(void);
-u8 ciGetFiringRangeScore(s32 weapon_id);
+u8 ciGetFiringRangeScore(s32 weaponnum);
 u32 func0f19c9e4(void);
 u32 frIsWeaponFound(s32 weapon);
 void frSetWeaponFound(s32 weaponnum);

src/include/game/mplayer.h

@@ -21,8 +21,8 @@ u32 func0f188930(void);
 s32 func0f188a84(struct mpteaminfo *info);
 u32 func0f188bcc(void);
 u32 mpGetNumWeaponOptions(void);
-char *mpGetWeaponLabel(s32 weapon_id);
-void mpSetWeaponSlot(s32 slot, s32 weapon_id);
+char *mpGetWeaponLabel(s32 weaponnum);
+void mpSetWeaponSlot(s32 slot, s32 weaponnum);
 s32 mpGetWeaponSlot(s32 slot);
 u32 func0f188e24(void);
 s32 mpCountWeaponSetThing(s32 weaponsetindex);
@@ -52,7 +52,7 @@ s32 mpGetHeadUnlockValue(u8 headnum);
 s32 mpGetBeauHeadId(u8 headnum);
 u32 mpGetNumBodies(void);
 s32 mpGetBodyId(u8 bodynum);
-s32 mpGetBodyIndexByBodyId(u16 bodyid);
+s32 mpGetBodyIndexByBodyId(u16 bodynum);
 char *mpGetBodyName(u8 bodynum);
 u8 mpGetBodyUnk06(u8 bodynum);
 s32 mpBodyGetMpHeadIndex(s32 bodynum);
@@ -66,7 +66,7 @@ bool mpIsTrackUnlocked(s32 tracknum);
 s32 mpGetTrackSlotIndex(s32 tracknum);
 s32 mpGetTrackNumAtSlotIndex(s32 slotindex);
 s32 func0f18c200(void);
-s32 mpGetTrackAudioId(s32 slotindex);
+s32 mpGetTrackMusicNum(s32 slotindex);
 char *mpGetTrackName(s32 slotindex);
 void mpSetUsingMultipleTunes(bool enable);
 bool mpGetUsingMultipleTunes(void);

src/include/game/propobj.h

@@ -276,8 +276,8 @@ u32 func0f08b27c(void);
 u32 func0f08b658(void);
 struct weaponobj *func0f08b880(u32 model, u32 weaponnum, struct chrdata *chr);
 void chrSetWeaponFlag4(struct chrdata *chr, s32 slot);
-struct prop *func0f08b8e8(struct chrdata *chr, s32 weapon_id, s32 arg2, u32 flags, s32 arg4, s32 arg5);
-struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weapon_id, u32 flags);
+struct prop *func0f08b8e8(struct chrdata *chr, s32 weaponnum, s32 arg2, u32 flags, s32 arg4, s32 arg5);
+struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags);
 u32 func0f08bb3c(void);
 void func0f08bb5c(struct prop *prop, bool firing, s32 room);
 s32 func0f08bc5c(struct prop *prop);

src/include/types.h

@@ -858,7 +858,7 @@ struct defaultobj {
 	/*0x00*/ u16 extrascale;
 	/*0x02*/ u8 hidden2;
 	/*0x03*/ u8 type;
-	/*0x04*/ s16 obj;
+	/*0x04*/ s16 modelnum;
 	/*0x06*/ s16 pad;
 	/*0x08*/ u32 flags;
 	/*0x0c*/ u32 flags2;
@@ -935,7 +935,7 @@ struct ammocrateobj { // objtype 0x07
 
 struct weaponobj { // objtype 0x08
 	struct defaultobj base;
-	/*0x5c*/ u8 weapon_id;
+	/*0x5c*/ u8 weaponnum;
 	/*0x5d*/ s8 unk5d;
 	/*0x5e*/ s8 unk5e;
 	/*0x5f*/ u8 dragonthrown;
@@ -2764,7 +2764,7 @@ struct weapon {
 };
 
 struct cutscene {
-	u16 stage_id;
+	u16 stage;
 	u16 mission;
 	u32 scene;
 	u16 name;
@@ -2827,7 +2827,7 @@ struct mpweaponset {
 };
 
 struct mphead {
-	s16 headid;
+	s16 headnum;
 	u8 unlockvalue;
 };
 
@@ -2840,21 +2840,21 @@ struct mpsimulant {
 };
 
 struct mpbody {
-	s16 bodyid;
+	s16 bodynum;
 	s16 name;
-	s16 headid;
+	s16 headnum;
 	u8 unk06;
 };
 
 struct mptrack {
-	u16 audioid : 7;
+	u16 musicnum : 7;
 	u16 duration : 9;
 	s16 name;
 	s16 unlockstage;
 };
 
 struct stageoverviewentry {
-	u32 stage_id;
+	u32 stage;
 	u8 unk04;
 	u16 name1; // "dataDyne Central"
 	u16 name2; // " - Defection"
@@ -2862,7 +2862,7 @@ struct stageoverviewentry {
 };
 
 struct stagemusic {
-	u16 stage_id;
+	u16 stage;
 	s16 main_music;
 	s16 sfx_music;
 	s16 x_music;