diff --git a/scripts/Main.rb b/scripts/Main.rb
index 77471ef..aa260bd 100644
--- a/scripts/Main.rb
+++ b/scripts/Main.rb
@@ -6,7 +6,7 @@
 
 at_exit do
   Wallpaper.reset
-  save unless ($game_system.map_interpreter.running? || !$scene.is_a?(Scene_Map))
+  save unless $game_switches[99] || ($game_system.map_interpreter.running? || !$scene.is_a?(Scene_Map))
 end
 
 begin
diff --git a/scripts/SaveLoad.rb b/scripts/SaveLoad.rb
index 902ad24..48ae621 100644
--- a/scripts/SaveLoad.rb
+++ b/scripts/SaveLoad.rb
@@ -95,3 +95,7 @@ def quit_game_bed
   $game_system.map_interpreter.index -= 1
   $scene = nil
 end
+
+def quit_game_no_save
+  $scene = nil
+end