Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

2021-04-12 13:32:14 -05:00
parent ade6dfc416 960b8de237
commit 160f0732dd
62 changed files with 2829 additions and 380 deletions
--- a/source/gui/randomize/generation.py
+++ b/source/gui/randomize/generation.py
@@ -66,7 +66,7 @@ def generation_page(parent,settings):
    # FIXME: Translate these
    def RomSelect():
        rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
-        self.widgets[widget].storageVar.set(rom)
+        self.widgets["rom"].storageVar.set(rom)
    # dialog button
    self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='Select Rom', command=RomSelect)