Set names from remaining mplayer functions

src/include/data.h

@@ -485,7 +485,7 @@ extern struct menudialogdef g_HtmOptionsMenuDialog;
 extern struct menudialogdef g_PacOptionsMenuDialog;
 extern struct menudialogdef g_MpScenarioMenuDialog;
 extern struct menudialogdef g_MpQuickTeamScenarioMenuDialog;
-extern s32 var80087260;
+extern s32 g_MpReturningFromMatch;
 extern bool g_MpEnableMusicSwitching;
 extern struct mpweapon g_MpWeapons[NUM_MPWEAPONS];
 extern struct mphead g_MpHeads[VERSION == VERSION_JPN_FINAL ? 74 : 75];

src/include/game/mplayer/mplayer.h

@@ -8,8 +8,8 @@ f32 mp_handicap_to_value(u8 handicap);
 void mp_start_match(void);
 void mp_reset(void);
 void mp_calculate_team_is_only_ai(void);
-void func0f187fbc(s32 playernum);
-void func0f187fec(void);
+void mp_init_handicaps(s32 playernum);
+void mp_init_limits(void);
 void mp_player_set_defaults(s32 playernum, bool autonames);
 void mp_init(void);
 void mp_get_teams_with_default_name(u8 *mask);
@@ -19,18 +19,18 @@ s32 mp_calculate_team_score_limit(void);
 void mp_apply_limits(void);
 s32 mp_get_player_rankings(struct ranking *rankings);
 s32 mp_get_team_rankings(struct ranking *rankings);
-s32 func0f188bcc(void);
+s32 mp_get_num_mpweapons(void);
 s32 mp_get_num_weapon_options(void);
 char *mp_get_weapon_label(s32 weaponnum);
 void mp_set_weapon_slot(s32 slot, s32 mpweaponnum);
 s32 mp_get_weapon_slot(s32 slot);
 struct mpweapon *mp_get_mp_weapon_by_location(s32 locationindex);
-s32 func0f189058(bool full);
-s32 func0f189088(void);
-char *mp_get_weapon_set_name(s32 arg0);
-void mp_set_weapon_set(s32 weaponsetnum);
-void func0f1895e8(void);
-s32 mp_get_weapon_set(void);
+s32 mp_get_num_weaponset_slots(bool full);
+s32 mp_get_custom_weaponset_slot(void);
+char *mp_get_weaponset_name_by_slotnum(s32 arg0);
+void mp_set_weaponset_slotnum(s32 weaponsetnum);
+void mp_apply_weaponset_if_standard(void);
+s32 mp_get_weaponset_slotnum(void);
 bool mp_is_paused(void);
 void mp_set_paused(u8 mode);
 Gfx *mp_render_modal_text(Gfx *gdl);
@@ -75,10 +75,10 @@ bool mp_has_unused_bot_slots(void);
 bool mp_is_sim_slot_enabled(s32 slot);
 s32 mp_find_bot_profile(s32 type, s32 difficulty);
 void mp_generate_bot_names(void);
-s32 mp_player_get_index(struct chrdata *chr);
-struct chrdata *mp_get_chr_from_player_index(s32 index);
-s32 func0f18d074(s32 index);
-s32 func0f18d0e8(s32 arg0);
+s32 mp_chr_to_chrindex(struct chrdata *chr);
+struct chrdata *mp_chrindex_to_chr(s32 index);
+s32 mp_chrindex_to_chrslot(s32 index);
+s32 mp_chrslot_to_chrindex(s32 arg0);
 void mpplayerfile_get_overview(char *arg0, char *name, u32 *playtime);
 s32 mpplayerfile_save(s32 playernum, s32 device, s32 fileid, u16 deviceserial);
 s32 mpplayerfile_load(s32 playernum, s32 device, s32 arg2, u16 deviceserial);
@@ -86,7 +86,7 @@ s32 mp_get_num_presets(void);
 s32 mp_get_num_unlocked_presets(void);
 char *mp_get_preset_name_by_slot(s32 slot);
 void mp_apply_config(struct mpconfigfull *mpconfig);
-void mp0f18dec4(s32 arg0);
+void mp_load_preset_by_slotnum(s32 arg0);
 void mpsetupfile_get_overview(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 *scenarionum);
 s32 mpsetupfile_save(s32 device, s32 filenum, u16 deviceserial);
 s32 mpsetupfile_load(s32 device, s32 filenum, u16 deviceserial);

src/include/game/mplayer/setup.h

@@ -8,16 +8,16 @@ char *mp_get_current_player_name(struct menuitem *item);
 s16 mp_choose_random_stage(void);
 MenuItemHandlerResult mp_bot_difficulty_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data);
 char *mp_menu_title_edit_simulant(struct menudialogdef *dialogdef);
-char *func0f17e318(struct menudialogdef *dialogdef);
-MenuDialogHandlerResult menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
+char *menutext_mp_challenge_name(struct menudialogdef *dialogdef);
+MenuDialogHandlerResult menudialog_mp_confirm_challenge(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
 MenuItemHandlerResult mp_challenges_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data);
 char *mp_menu_text_challenge_name(struct menuitem *item);
 MenuDialogHandlerResult mp_combat_challenges_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
 char *mp_menu_text_save_player_or_copy(struct menuitem *item);
 char *mp_menu_text_arena_name(struct menuitem *item);
 void mp_configure_quick_team_simulants(void);
-void func0f17f428(void);
-void func0f17fcb0(s32 silent);
+void mp_apply_quickstart(void);
+void mp_open_advanced_setup(s32 silent);
 MenuItemHandlerResult menuhandler_mp_slow_motion(s32 operation, struct menuitem *item, union handlerdata *data);
 void htb_add_pad(s16 padnum);
 void htb_remove_ammo_crate_at_pad(s16 padnum);

src/include/types.h

@@ -3084,12 +3084,7 @@ struct mpweaponset {
 	/*0x00*/ u16 name;
 	/*0x02*/ u8 slots[NUM_MPWEAPONSLOTS];
 	/*0x08*/ u8 requirefeatures[4];
-	/*0x0c*/ u8 unk0c;
-	/*0x0d*/ u8 unk0d;
-	/*0x0e*/ u8 unk0e;
-	/*0x0f*/ u8 unk0f;
-	/*0x10*/ u8 unk10;
-	/*0x11*/ u8 unk11;
+	/*0x0c*/ u8 slotsiflocked[NUM_MPWEAPONSLOTS];
 };
 
 struct mphead {
@@ -3722,7 +3717,7 @@ struct menudata_main {
 struct menudata_mpsetup {
 	u32 slotindex;
 	u32 slotcount;
-	u32 unke24;
+	u32 botprofileindex;
 };
 
 struct menudata_mppause {