From abc4555912d2f31f7dbe27fbe4094087446b9fbd Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Mon, 23 Mar 2015 01:54:35 -0700
Subject: [PATCH] upgrades work the same in OoT and MM

---
 Lua/addrs/M common.lua | 3 +--
 Lua/oneshot.lua        | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Lua/addrs/M common.lua b/Lua/addrs/M common.lua
index 1261c02..368c1ec 100755
--- a/Lua/addrs/M common.lua	
+++ b/Lua/addrs/M common.lua	
@@ -70,8 +70,7 @@ return {
     inventory_items     = AL(0x70, 24),
     inventory_masks     = AL(0x88, 24),
     inventory_quantities= AL(0xA0, 24),
-    wallet_size         = AL(0xBA, 1), -- 0, 16, 32, unused 48
-    quiver_bag          = AL(0xBB, 1),
+    upgrades            = AL(0xB8, 4),
     quest_items         = AL(0xBC, 4),
     items_wft           = AL(0xC0, 1),
     items_sht           = AL(0xC1, 1),
diff --git a/Lua/oneshot.lua b/Lua/oneshot.lua
index d6127ac..df73f57 100755
--- a/Lua/oneshot.lua
+++ b/Lua/oneshot.lua
@@ -37,20 +37,21 @@ a.doubled_hearts(20)
 a.magic         (0x60)
 a.rupees        (500)
 
+-- nuts, sticks, bombs, wallet, Scale, gauntlets, Bullets, quiver
+--                   ?????????nnnsssbbbwwSSSgggBBBqqq
+a.upgrades(tonumber('00000000010101101110010011011011', 2))
+
 if oot then
     a.tunic_boots  (0xFF) -- normally 0x77
     a.sword_shield (0xF7) -- normally 0x77?
-    a.upgrades     (0x36E458) -- normally ?
     a.quest_items  (0x00FFFFFF)
 
 else
     a.sword_shield  (0x23)
-    a.quiver_bag    (0x1B)
     a.owls_hit      (0xFFFF)
     a.map_visible   (0xFFFF)
     a.map_visited   (0xFFFF)
-    a.wallet_size   (32)
-    a.banked_rupees (9999)
+    a.banked_rupees (5000)
 
     a.lottery_code_1(1*10000 + 2*0x100 + 3)
     a.lottery_code_2(4*10000 + 5*0x100 + 6)