BetterAEP: Emulate patch "CustomSaveLoad" which depends on BetterAEP

Author: florianessl

src/game_config_game.h

@@ -50,6 +50,7 @@ struct Game_ConfigGame {
 	ConfigParam<int> patch_anti_lag_switch{ "Anti-Lag Switch", "Disable event page refreshes when switch is set", "Patch", "AntiLagSwitch", 0 };
 	ConfigParam<int> patch_direct_menu{ "Direct Menu", " Allows direct access to subscreens of the default menu", "Patch", "DirectMenu", 0 };
 	ConfigParam<int> patch_better_aep{ "BetterAEP", "Emulates the \"BetterAEP\" patch, commonly used for custom title screens.", "Patch", "BetterAEP", 0 };
+	ConfigParam<int> patch_custom_save_load{ "BetterAEP", "Emulates the \"BetterAEP\" addon which allows for saving/loading by save slot.", "Patch", "BetterAEP.CustomSaveLoad", 0 };
 
 	// Command line only
 	BoolConfigParam patch_support{ "Support patches", "When OFF all patch support is disabled", "", "", true };

src/game_interpreter.cpp

@@ -2044,11 +2044,19 @@ bool Game_Interpreter::CommandEndEventProcessing(lcf::rpg::EventCommand const& /
 	if (auto var_id = Player::game_config.patch_better_aep.Get()) {
 		switch (Main_Data::game_variables->Get(var_id)) {
 			case 1:
+				if (var_id = Player::game_config.patch_custom_save_load.Get()) {
+					if (auto save_slot = Main_Data::game_variables->Get(var_id) > 0) {
+						_async_op = MakeLoadOp("CustomSaveLoad", save_slot);
+						return true;
+					}
+				}
 				Scene::instance->SetRequestedScene(std::make_shared<Scene_Load>());
 				return true;
 			case 2:
 				Player::exit_flag = true;
 				return true;
+			default:
+				break;
 		}
 	}
 

src/game_interpreter_map.cpp

@@ -776,6 +776,13 @@ bool Game_Interpreter_Map::CommandOpenSaveMenu(lcf::rpg::EventCommand const& com
 	auto& frame = GetFrame();
 	auto& index = frame.current_command;
 
+	if (auto var_id = Player::game_config.patch_custom_save_load.Get()) {
+		if (auto save_slot = Main_Data::game_variables->Get(var_id) > 0) {
+			_async_op = AsyncOp::MakeSave(save_slot, -1);
+			return true;
+		}
+	}
+
 	Scene::instance->SetRequestedScene(std::make_shared<Scene_Save>());
 
 	int current_system_function = 0;