From 0c532b8c5f53a6fe7139bf55e0ec417e45daccf4 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Tue, 6 Feb 2018 09:27:47 +0100
Subject: [PATCH] refine race file script

---
 Lua/data/item values early.lua |  4 ++++
 Lua/data/item values.lua       |  4 ++++
 Lua/lib/addrs/M/JP10.lua       |  1 +
 Lua/lib/addrs/M/common.lua     |  1 +
 Lua/setup race file.lua        | 24 +++++++++++++++---------
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Lua/data/item values early.lua b/Lua/data/item values early.lua
index 3edeb5d..ea0e247 100644
--- a/Lua/data/item values early.lua	
+++ b/Lua/data/item values early.lua	
@@ -46,4 +46,8 @@ return {
     captains        = 0x60,
     giants          = 0x65,
     fierce_deity    = 0x51,
+
+    kokiri_sword    = 0x6C,
+    razor_sword     = 0x6D,
+    gilded_sword    = 0x6E,
 }
diff --git a/Lua/data/item values.lua b/Lua/data/item values.lua
index 7fbc2db..32cb24e 100755
--- a/Lua/data/item values.lua	
+++ b/Lua/data/item values.lua	
@@ -46,4 +46,8 @@ return {
     captains        = 0x44,
     giants          = 0x49,
     fierce_deity    = 0x35,
+
+    kokiri_sword    = 0x4D,
+    razor_sword     = 0x4E,
+    gilded_sword    = 0x4F,
 }
diff --git a/Lua/lib/addrs/M/JP10.lua b/Lua/lib/addrs/M/JP10.lua
index 9b330e9..2e6c1ea 100755
--- a/Lua/lib/addrs/M/JP10.lua
+++ b/Lua/lib/addrs/M/JP10.lua
@@ -41,6 +41,7 @@ return {
     rupee_accumulator   = AL(0x4078, 2),
     spring_water_timers = AL(0x41D8, 0xC0),
     pictograph_picture  = AL(0x1390, 0x2BC0),
+    current_save        = AL(0x3F50, 4),
     title_screen_mod    = AL(0x3F5C, 4),
     entrance_mod        = AL(0x3F60, 4),
     voidout_type        = AL(0x3F64, 4),
diff --git a/Lua/lib/addrs/M/common.lua b/Lua/lib/addrs/M/common.lua
index 400a282..c1a44f8 100755
--- a/Lua/lib/addrs/M/common.lua
+++ b/Lua/lib/addrs/M/common.lua
@@ -404,6 +404,7 @@ return {
     warp_destination    = AG(0x18878, 4),
     fade_type           = AG(0x1887F, 1),
     entrance_entered    = AG(0x18B48, 1),
+    fade_timer          = AG(0x18C01, 1),
 
     link_actor = setmetatable({
         item_in_hand    = AA(0x148, 1),
diff --git a/Lua/setup race file.lua b/Lua/setup race file.lua
index 5519907..e09a202 100644
--- a/Lua/setup race file.lua	
+++ b/Lua/setup race file.lua	
@@ -1,4 +1,3 @@
-print('hi mom')
 require "lib.setup"
 require "boilerplate"
 local a = require "addrs"
@@ -17,11 +16,18 @@ end
 
 require "flag manager"
 
--- TODO: just force a song of time cutscene to reset most things
+-- TODO: re-enable this once i stop it from breaking on (J).
+--for i=a.link.addr, a.link.addr + a.link.type - 1, 4 do W4(i, 0) end
 
-for i=a.link.addr, a.link.addr + a.link.type - 1, 4 do
-    W4(i, 0)
-end
+-- new stuff
+if a.current_save() == 0xFF then a.current_save(2) end
+a.warp_begin(1)
+a.warp_destination(0xD800)
+a.cutscene_status_2(3)
+a.target_style(1)
+a.sot_count(1)
+--a.fade_timer(0x3C) -- doesn't help...
+-- TODO: force dialog after scene is loaded with SoT stored? could be nice
 
 a.exit_value(0xD800)
 --a.mask_worn(0)
@@ -35,7 +41,7 @@ a.time(0x3FFF)
 a.transformation(4)
 a.have_tatl(1)
 --a.owl_save(0)
-a.sot_count(2)
+--a.sot_count(2)
 a.max_hearts(0x30)
 a.hearts(0x30)
 a.magic_level(1)
@@ -47,9 +53,9 @@ a.has_normal_magic(1)
 --a.owls_hit(0)
 for k, f in pairs(inv) do f(-1) end
 for k, f in pairs(masks) do f(-1) end
-inv.b_button_item(0x4D) -- TODO: add to item values table
-inv.b_button_goron(0x4D)
-inv.b_button_zora(0x4D)
+inv.b_button_item(iv.kokiri_sword)
+inv.b_button_goron(iv.kokiri_sword)
+inv.b_button_zora(iv.kokiri_sword)
 inv.b_button_deku(iv.deku_nuts)
 inv.c_left_item(iv.ocarina)
 inv.c_down_item(-1)