furthening the tweakening

Lua/A common.lua

@@ -53,7 +53,7 @@ end
 
 return {
     link                = A(link, 0x4000),
-    area_mod            = AL(0x02, 2), -- TODO: rename to exit_value?
+    exit_value          = AL(0x02, 2),
     intro_completed     = AL(0x05, 1),
     cutscene_status     = AL(0x0A, 2),
     time                = AL(0x0C, 2),
@@ -63,7 +63,7 @@ return {
     day                 = AL(0x18, 4),
     day_again           = AL(0x1C, 4),
     transformation      = AL(0x20, 1),
-    zeroth_day          = AL(0x23, 1), -- TODO: rename to owl_save
+    owl_save            = AL(0x23, 1), -- "zeroth day" effect
     ZELDA3              = AL(0x24, 6),
     sot_count           = AL(0x2A, 2),
     name                = AL(0x2C, 8),
@@ -90,6 +90,7 @@ return {
     keys_sht            = AL(0xCB, 1),
     keys_gbt            = AL(0xCC, 1),
     keys_stt            = AL(0xCD, 1),
+    doubled_hearts      = AL(0xD3, 1), -- set to 20 by the game
     fairies_wft         = AL(0xD4, 1),
     fairies_sht         = AL(0xD5, 1),
     fairies_gbt         = AL(0xD6, 1),
@@ -97,6 +98,8 @@ return {
     strange_string      = AL(0xDE, 6),
     scene_flags_save    = AL(0x470, 0x960),
   --clock_town_map      = AL(0xEB2, 1),
+    slulltula_count_wf  = AL(0xEC0, 2),
+    slulltula_count_gb  = AL(0xEC2, 2),
     banked_rupees       = AL(0xEDE, 2),
     archery             = AL(0xF00, 1),
     chateau_romani      = AL(0xF06, 1), -- 8
@@ -188,7 +191,7 @@ return {
         giants          = AL(0x9E, 1),
         fierce_deity    = AL(0x9F, 1),
     },
-    counts = {
+    quantities = {
         arrows          = AL(0xA1, 1),
         bombs           = AL(0xA6, 1),
         bombchu         = AL(0xA7, 1),

Lua/actor lister.lua

@@ -2,6 +2,9 @@ require "boilerplate"
 local addrs = require "addrs"
 local actor_names = require "actor names"
 
+-- bizhawk lua has some nasty memory leaks at the moment,
+-- so instead of creating an object every time,
+-- using a template to offset from will do for now.
 local actor_t = Actor(0)
 
 function get_actor_count(i)
@@ -37,15 +40,14 @@ while true do
     T(0, 1, ("sum:%3i"):format(any), nil, "bottomright")
 
     if any == 0 then
-        if #seen_strs_sorted > 0 then -- lazy way of doing this once
-            for i = 1, 5 do
-                print()
-            end
-        end
         seen = {}
         seen_strs = {}
         seen_strs_sorted = {}
-        --console.clear()
+        if last_any ~= any then
+            print()
+            print("# actors wiped #")
+            print()
+        end
     end
 
     local seen_new = false

Lua/actor names.lua

@@ -68,10 +68,10 @@ return {
     [0x03E]="Blue Bubble",
     [0x03F]="Fountain Water",
     [0x040]=unset,
-    [0x041]="Trees & Bushes",
+    [0x041]="Foliage",
     [0x042]=unset,
     [0x043]="Gomess",
-    [0x044]="Gomess Bats", -- TODO: verify
+    [0x044]="Gomess Bats",
     [0x045]=unset,
     [0x046]=unset,
     [0x047]="Beamos",
@@ -270,8 +270,8 @@ return {
     [0x108]=unset,
     [0x109]="Dragonfly",
     [0x10A]=unset,
-    [0x10B]="? Obj_Grass", -- seen: lens cave
+    [0x10B]="? Obj_Grass", -- probably just some helper code
-    [0x10C]="? Obj_Grass_Carry", -- seen: lens cave, termina field clock tower
+    [0x10C]="? Obj_Grass_Carry", -- two per area with grass, one follows link when carrying grass
     [0x10D]="Grass Cluster", -- used for loading
     [0x10E]=unset,
     [0x10F]=unset,

Lua/oneshot.lua

@@ -3,11 +3,11 @@ local addrs = require "addrs"
 require "item values"
 local inv = addrs.inventory
 local masks = addrs.masks
-local counts = addrs.counts
+local quantities = addrs.quantities
 _=addrs.target_style and addrs.target_style(1)
 --addrs.buttons_enabled   (0)
 --addrs.infinite_sword(1)
-addrs.zeroth_day    (1)
+addrs.owl_save      (1)
 addrs.sot_count     (0)
 _=addrs.bubble_timer and addrs.bubble_timer(0)
 --
@@ -15,6 +15,7 @@ addrs.sword_shield  (0x23)
 addrs.quiver_bag    (0x1B)
 addrs.hearts        (16*20)
 addrs.max_hearts    (16*20)
+addrs.doubled_hearts(20)
 addrs.owls_hit      (0xFFFF)
 addrs.map_visible   (0xFFFF)
 addrs.map_visited   (0xFFFF)
@@ -55,6 +56,9 @@ addrs.fairies_sht(69)
 addrs.fairies_gbt(69)
 addrs.fairies_stt(69)
 
+--addrs.slulltula_count_wf(69)
+--addrs.slulltula_count_gb(69)
+
 --inv.b_button        (0x4F) -- don't really need this
 inv.ocarina         (0x00)
 inv.bow             (0x01)
@@ -111,10 +115,10 @@ masks.captains      (mv.captains     )
 masks.giants        (mv.giants       )
 masks.fierce_deity  (mv.fierce_deity )
 
-counts.arrows       (69)
+quantities.arrows       (69)
-counts.bombs        (69)
+quantities.bombs        (69)
-counts.bombchu      (69)
+quantities.bombchu      (69)
-counts.sticks       (69)
+quantities.sticks       (69)
-counts.nuts         (69)
+quantities.nuts         (69)
-counts.beans        (69)
+quantities.beans        (69)
-counts.kegs         (69)
+quantities.kegs         (69)