fixing battle parallel event calls after merge resolution

Author: MakoInfused

src/game_interpreter.h

@@ -411,6 +411,7 @@ inline void Game_Interpreter::Push(Game_Event* ev, const lcf::rpg::EventPage* pa
 template<InterpreterExecutionType type_ex>
 inline void Game_Interpreter::Push(Game_CommonEvent* ev) {
 	static_assert(type_ex == InterpreterExecutionType::AutoStart || type_ex == InterpreterExecutionType::Parallel
+		|| type_ex == InterpreterExecutionType::BattleStart || type_ex == InterpreterExecutionType::BattleParallel
 		|| type_ex == InterpreterExecutionType::Call || type_ex == InterpreterExecutionType::DeathHandler
 		|| type_ex == InterpreterExecutionType::DebugCall || type_ex == InterpreterExecutionType::ManiacHook, "Unexpected ExecutionType for CommonEvent"
 	);

src/scene_battle_rpg2k3.cpp

@@ -979,7 +979,7 @@ void Scene_Battle_Rpg2k3::vUpdate() {
 			if (!parallel_interpreter.IsRunning()) {
 				for (auto common_event : battle_parallel_events)
 				{
-					parallel_interpreter.Push<InterpreterExecutionType::Parallel>(common_event);
+					parallel_interpreter.Push<InterpreterExecutionType::BattleParallel>(common_event);
 				}
 			}
 		}
@@ -1132,7 +1132,7 @@ void Scene_Battle_Rpg2k3::CallBattleBeginCommonEvents() {
 			if (data_common_event.trigger == data_common_event.Trigger_maniac_battle_start) {
 				Game_CommonEvent* common_event = lcf::ReaderUtil::GetElement(Game_Map::GetCommonEvents(), data_common_event.ID);
 
-				Game_Battle::GetInterpreterBattle().Push<InterpreterExecutionType::Parallel>(common_event);
+				Game_Battle::GetInterpreterBattle().Push<InterpreterExecutionType::BattleParallel>(common_event);
 			}
 			else if (data_common_event.trigger == data_common_event.Trigger_maniac_battle_parallel) {
 				Game_CommonEvent* common_event = lcf::ReaderUtil::GetElement(Game_Map::GetCommonEvents(), data_common_event.ID);