diff --git a/Lua/addrs/M/EUDB.lua b/Lua/addrs/M/EUDB.lua
index 756e6c4..d6db4d4 100755
--- a/Lua/addrs/M/EUDB.lua
+++ b/Lua/addrs/M/EUDB.lua
@@ -1,3 +1,7 @@
 return {
+    entrance_table      = A(0x20D480, 0),
+    owl_table           = A(0x2107A8, 0),
+    stored_song         = A(0x2107CD, 0),
     mask_mask_bit       = A(0x24405A, 3),
+    scene_time_speed    = A(0x3E4082, 2),
 }
diff --git a/Lua/addrs/M/JP10.lua b/Lua/addrs/M/JP10.lua
index e10b166..f25a00c 100755
--- a/Lua/addrs/M/JP10.lua
+++ b/Lua/addrs/M/JP10.lua
@@ -50,4 +50,8 @@ return {
     screen_scale_enable = AL(0x42EC, 1),
     screen_scale        = AL(0x42F0, 'f'),
     scene_flags_ingame  = AL(0x42F4, 0x960),
+
+    stored_epona        = A(0x1B892F, 1),
+    stored_song         = A(0x1C18ED, 1),
+    scene_time_speed    = A(0x382672, 2),
 }
diff --git a/Lua/addrs/M/US10.lua b/Lua/addrs/M/US10.lua
index b6e2b4b..623b362 100755
--- a/Lua/addrs/M/US10.lua
+++ b/Lua/addrs/M/US10.lua
@@ -13,4 +13,5 @@ return {
     buttons_3           = A(0x1FB870, 2),
     buttons_4           = A(0x1FB876, 2),
     music_speed         = A(0x2050D8, 1),
+    scene_time_speed    = A(0x382502, 2),
 }
diff --git a/Lua/cheat menu.lua b/Lua/cheat menu.lua
index f7617bf..40549bd 100755
--- a/Lua/cheat menu.lua	
+++ b/Lua/cheat menu.lua	
@@ -240,8 +240,7 @@ local time_menu = Menu{
         Oneshot("Time flow: Slow (iSoT)", Setter{[addrs.time_speed]=-2}),
         Oneshot("Time flow: Stopped",     Setter{[addrs.time_speed]=-3}),
         Oneshot("Time flow: Backwards",   Setter{[addrs.time_speed]=-5}),
-        -- TODO: make version-agnostic
-        Oneshot("Disable time flow (Scene)", Setter{[A(0x382502, 2)]=0}),
+        Oneshot("Disable time flow (Scene)", Setter{[addrs.scene_time_speed]=0}),
         --Oneshot("Stop time glitch", stop_time),
         Text(""),
         Back(),