From f6d20caa4bd99b4f5b982bdf604ac9c60cee751f Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sun, 15 Nov 2015 08:41:40 -0800
Subject: [PATCH] OoT soft reset... kinda

---
 Lua/addrs/O/common.lua |  1 +
 Lua/cheat menu.lua     | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Lua/addrs/O/common.lua b/Lua/addrs/O/common.lua
index f115c69..7665e86 100644
--- a/Lua/addrs/O/common.lua
+++ b/Lua/addrs/O/common.lua
@@ -128,6 +128,7 @@ return {
     buttons_enabled     = AL(0x13E2, 4), -- lol unaligned access
     event_inf           = AL(0x13FA, 0x8),
     magic_max           = AL(0x13F4, 2),
+    entrance_mod_setter = AL(0x1412, 2),
 
     buttons             = AG(0x14, 2),
     scene_number        = AG(0xA4, 2),
diff --git a/Lua/cheat menu.lua b/Lua/cheat menu.lua
index cf676c8..478ae62 100755
--- a/Lua/cheat menu.lua	
+++ b/Lua/cheat menu.lua	
@@ -113,11 +113,19 @@ end
 
 local soft_reset = Callbacks()
 function soft_reset:on()
-    if oot then return end
-    addrs.warp_begin(0x14)
-    addrs.warp_destination(0x1C00)
-    addrs.fade_type(0x0B)
-    addrs.entrance_mod_setter(0xFFFA)
+    if oot then
+        -- FIXME: Link voids out on title screen.
+        -- need to load title screen save?
+        addrs.warp_begin(0x14)
+        addrs.warp_destination(0x00CD)
+        addrs.fade_type(0x0B)
+        addrs.entrance_mod_setter(0xFFF3)
+    else
+        addrs.warp_begin(0x14)
+        addrs.warp_destination(0x1C00)
+        addrs.fade_type(0x0B)
+        addrs.entrance_mod_setter(0xFFFA)
+    end
 end
 
 local save_pos = Callbacks()