bad commit messages incorporated

i made a bunch of changes and
totally forgot to commit them for like a year, sorry!

Lua/cheat menu.lua

@@ -1,3 +1,5 @@
+require = depend or require
+
 require "lib.setup"
 require "boilerplate"
 require "addrs"
@@ -250,7 +252,7 @@ local time_menu = oot and 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}),
-        Oneshot("Disable time flow (Scene)", Setter{[addrs.scene_time_speed]=0}),
+        --Oneshot("Disable time flow (Scene)", Setter{[addrs.scene_time_speed]=0}),
         Oneshot("Timestop glitch", timestop),
         Text(""),
         Back(),

Lua/data/actor names.lua

@@ -515,7 +515,7 @@ return {
     [0x1FD]="Biggoron",
     [0x1FE]="Hot Spring Water",
     [0x1FF]="Gabora (Assistant)",
-    [0x200]="Invader Poe", -- aliens?
+    [0x200]="Invader Poe", -- aliens? controls romani/cremia schedules?
     [0x201]="Goron Elder's Son",
     [0x202]="Anju",
     [0x203]=unset,

Lua/inject.lua

@@ -167,7 +167,8 @@ local asms = {
     ['O EUDB MQ'] = {'print.asm'},
 
 --  ['M US10'] = {'beta.asm'},
-    ['M US10'] = {'spawn mm.asm'},
+--  ['M US10'] = {'spawn mm.asm'},
+    ['M US10'] = {'_.asm'},
     ['M JP10'] = {'spawn mm early.asm'},
 }
 

Lua/lib/addrs/basics.lua

@@ -17,6 +17,12 @@ return {
         actor  = 0x39A4F0,
         LLsize = 0x10,
     },
+    ["M USGC64"] = {
+        save   = 0x1ED830,
+        global = 0x381260,
+        actor  = 0x39A4F0,
+        LLsize = 0x10,
+    },
     ["M EU10"] = {
         save   = 0x1E6B50,
         global = 0x3DDFC0,

Lua/lib/addrs/versions.lua

@@ -57,4 +57,5 @@ return { -- md5 and sha1 hashes of .z64s
 
     -- Hacks
     ["8B88986EC8A637ED8C2FC5BF956FA949479B3430"] = "O BQ11", -- beta quest "V1" (no fix)
+    ["FE2453E7BA38454F9C8BF219B0B89AE614CD08E9"] = "M USGC64",
 }

Lua/menus/progress.lua

@@ -242,7 +242,7 @@ return oot and Menu{
         Oneshot("Z Targeting: Hold",   Setter{[a.target_style]=1}),
         Text(""),
         Oneshot("Setup First Cycle", first_cycle),
-        Oneshot("Setup Race File", Setter{[dofile]="race.lua"}),
+        Oneshot("Setup Race File", Setter{[dofile]="setup race file.lua"}),
         Text(""),
         Oneshot("Set Bombers Code to 12345", Setter{
             [a.bombers_code[1]]=1,

Lua/setup race file.lua

@@ -1,3 +1,4 @@
+print('hi mom')
 require "lib.setup"
 require "boilerplate"
 local a = require "addrs"
@@ -63,16 +64,16 @@ masks.deku(iv.deku)
 --for k, f in pairs(quantities) do f(0) end
 a.upgrades(0x00120000) -- deku nut 20 and deku stick 10
 a.quest_items(0x10003000)
-AL(0x3D7, 5) -- unknown
+AL(0x3D7, 1)(5) -- unknown
 scene_flag_set(9, 0, 10)
 scene_flag_set(94, 2, 0)
 scene_flag_set(111, 4, 10)
-AL(0xE6C, 0x1D4C) -- unknown
+AL(0xE6C, 4)(0x1D4C) -- unknown
-AL(0xE70, 0x1D4C) -- unknown
+AL(0xE70, 4)(0x1D4C) -- unknown
-AL(0xE74, 0x1DB0) -- unknown
+AL(0xE74, 4)(0x1DB0) -- unknown
-AL(0xEE8, 0x0013000A) -- unknown
+AL(0xEE8, 4)(0x0013000A) -- unknown
-AL(0xEEC, 0x1770) -- unknown
+AL(0xEEC, 4)(0x1770) -- unknown
-AL(0xEF4, 0x000A0027) -- unknown
+AL(0xEF4, 4)(0x000A0027) -- unknown
 event_flag_set(2, 5)
 event_flag_set(2, 4)
 event_flag_set(2, 3)

dumptext.py

@@ -126,10 +126,10 @@ def parse_jp_text(f):
             if verbose:
                 bs += b'[no skip]'
         elif x == 0x81BC: # 0x1B
-            if verbose:
+            if True or verbose:
                 bs += b'[two-choice]'
         elif x == 0x81B8: # 0x1C
-            if verbose:
+            if True or verbose:
                 bs += b'[three-choice]'
         elif x == 0x86A4: # 0x1D
             bs += b'[weight]'
@@ -413,7 +413,7 @@ import sys
 args = sys.argv[1:]
 
 # OoT NTSC 1.0
-dirname = 'ad69c91157f6705e8ab06c79fe08aad47bb57ba7'
+dirname = 'dump/oot-US10-ad69c91157f6705e8ab06c79fe08aad47bb57ba7'
 codefile = dirname+'/0027 V00A87000 code'
 jp_start = 0xF98AC
 en_start = 0xFD9EC