bump bizhawk version

Lua/cheat menu.lua

@@ -11,30 +11,16 @@ require "flag manager"
 
 -- TODO: make OoT versions for most of these menus
 
---[[ control schemes:
+--[[ control scheme:
-normal:         (alt_input = false; eat_input = false)
-    L opens the menu
-    L selects menu items
-    D-Pad navigates up/down items and left/right through pages
-alternate:      (alt_input = true;  eat_input = false)
-    L+R opens/closes the menu
-    L goes back a menu (or closes)
-    R selects menu items
-    L+Z hides the menu without closing (FIXME: interferes with back button)
-    D-Pad navigates
-greedy:         (alt_input = false; eat_input = true)
     L opens/closes the menu
-    while the menu is open, the game receives no inputs
+    (while the menu is open, the game is paused)
     D-Pad/Joystick/C-Buttons navigate through items and pages
     A select menu items
     B/R go back a menu (or closes)
     Z hides the menu without closing
-    TODO: joystick, a/b button etc
-greedy alt:     (alt_input = true;  eat_input = true)
-    same as greedy but pauses the game while in menu
-    (enables run_while_paused)
 --]]
 
+-- don't change these; the other modes are mostly broken:
 local run_while_paused = true
 local alt_input = true
 local eat_input = true

Lua/lib/addrs/M/BB.lua

@@ -0,0 +1 @@
+return {}

Lua/lib/addrs/M/USGC64.lua

@@ -0,0 +1 @@
+return {}

Lua/lib/addrs/O/BB.lua

@@ -0,0 +1 @@
+return {}

Lua/lib/addrs/O/BB2.lua

@@ -0,0 +1 @@
+return {}

Lua/lib/addrs/O/CNIQ BB.lua

@@ -0,0 +1 @@
+return {}

Lua/lib/addrs/O/ENIQ BB.lua

@@ -0,0 +1 @@
+return {}

Lua/lib/addrs/addrs.lua

@@ -11,9 +11,9 @@ local same = {
 rawset(_G, 'Actor', function() end)
 
 return function(hash)
-    local version = versions[hash] or VERSION_OVERRIDE
+    local version = versions[hash] or rawget(_G, 'VERSION_OVERRIDE')
     if version == nil then
-        error('unknown rom')
+        error('unknown ROM; try setting VERSION_OVERRIDE')
         return
     end
     local v = version:sub(1, 2)

Lua/lib/addrs/basics.lua

@@ -168,5 +168,40 @@ return {
         global = 0x1C8A10,
         actor  = 0x1DAFD0,
         LLsize = 0x30,
-    }
+    },
+
+    ["O BB"] = {
+        save   = 0x11B228,
+        global = 0x1C9720,
+        actor  = 0x1DBC70,
+        LLsize = 0x10,
+    },
+
+    ["O BB2"] = {
+        save   = 0x11B188,
+        global = 0x1C96A0,
+        actor  = 0x1DBBF0,
+        LLsize = 0x10,
+    },
+
+    ["M BB"] = {
+        save   = 0x1EFA70,
+        global = 0x3E6EE0,
+        actor  = 0x400170,
+        LLsize = 0x10,
+    },
+
+    ["O CNIQ BB"] = {
+        save   = 0x137F40,
+        global = 0x1D5A20,
+        actor  = 0x1E7F70,
+        LLsize = 0x10,
+    },
+
+    ["O ENIQ BB"] = {
+        save   = 0x137E00,
+        global = 0x1D58E0,
+        actor  = 0x1E7E30,
+        LLsize = 0x10,
+    },
 }

Lua/lib/addrs/versions.lua

@@ -72,7 +72,21 @@ return { -- md5 and sha1 hashes of .z64s
     ["50BEBEDAD9E0F10746A52B07239E47FA6C284D03"] = "O EUDB MQ", -- NZLE
     ["DD14E143C4275861FE93EA79D0C02E36AE8C6C2F"] = "O JPGC MQ",
 
-    -- Hacks
+    -- hacks
     ["8B88986EC8A637ED8C2FC5BF956FA949479B3430"] = "O BQ11", -- beta quest "V1" (no fix)
     ["FE2453E7BA38454F9C8BF219B0B89AE614CD08E9"] = "M USGC64",
+
+    -- leaked builds
+    ["D0C048E282D8760F2806E7912AFF35AF"] = "O BB",
+    ["6C2747FF2A0D4FE923E200E04D819708"] = "O BB2",
+    ["7FFC69CBB2704B27C68B73063925BDB0"] = "M BB",
+    ["4CDB19D8C05327C9494A1FE8F836BFC3DC0B386E"] = "O BB",
+    ["699F3F0F18D56BFA2830B2E582B6FC9570EDD108"] = "O BB2",
+    ["30E35977B09FCBD881BE78A6AEAC0B0418B36372"] = "M BB",
+
+    -- leaked iQue builds
+    ["058BD5D3A6ED7F10EED123ABBFEE8348"] = "O CNIQ BB",
+    ["656207C4A7D131E7AB2D0C52A6166E1C"] = "O ENIQ BB",
+    ["7371679F6BD8F5275D559F20D895724CAD115B91"] = "O CNIQ BB",
+    ["9F9214AA614C56D5BE93ADFFE104D58CE391FAD5"] = "O ENIQ BB",
 }

Lua/lib/menu input handlers.lua

@@ -46,8 +46,8 @@ local function handle_eat_input(handle, ctrl, pressed)
             ctrl.enter = ctrl.A
         end
 
-        joypad.set({}, 1)
+        --joypad.set({}, 1)
-        joypad.setanalog({["X Axis"]=false, ["Y Axis"]=false}, 1)
+        --joypad.setanalog({["X Axis"]=false, ["Y Axis"]=false}, 1)
     end
     handle:update(ctrl, pressed)
 end

README.md

@@ -14,7 +14,7 @@ on the wikis][cm] hosted at CloudModding.
 ## Lua Scripts
 
 this repo contains a ton of Lua scripts
-written for [version 2.2.2 of Bizhawk.][bizhawk]
+written for [version 2.4.2 of Bizhawk.][bizhawk]
 all the scripts you'll want to use are in the root Lua directory,
 and their dependencies are in further subdirectories.
 that means, if you want to use a script,

z64dump.py

@@ -72,7 +72,7 @@ def dump_wrap(data, fn, size):
     except Exception as e:
         lament(fn, e)
         kind = None
-    if kind is not None:
+    else:
         fn += '.' + kind
     dump_as(data, fn, size)