Update menu labels, fix none specified bug, ignore autosprint

Author: kielbasiago

args/misc.py

@@ -1,4 +1,3 @@
-from data.movement import MovementActions
 
 
 def name():
@@ -16,11 +15,13 @@ def parse(parser):
     misc.add_argument("-scan", "--scan-all", action = "store_true",
                       help = "All enemies scannable. All characters start with scan learned. Scan costs 0 MP. Useful for testing/debugging")
 
+    from data.movement import ALL
     movement = misc.add_mutually_exclusive_group()
     movement.name = "Movement"
-    movement.add_argument("-move", "--movement", type = str.lower, choices = MovementActions.ALL,
+    movement.add_argument("-move", "--movement", type = str.lower, choices = ALL,
                       help = "Player movement options")
-    movement.add_argument("-as", "--auto-sprint", action = "store_true",
+    # Completely ignore this argument, and default to auto sprint when -move is not defined
+    misc.add_argument("-as", "--auto-sprint", action = "store_true",
                       help = "DEPRECATED - Use `-move as` instead. Player always sprints. Sprint Shoes have no effect")
 
     event_timers = misc.add_mutually_exclusive_group()
@@ -149,8 +150,15 @@ def options(args):
     elif args.flashes_remove_most:
         remove_flashes = "Most"
 
+    from data.movement import key_name, AUTO_SPRINT
+    # Similar logic is present in the init fn of settings/movement.py
+    if args.movement:
+        movement = key_name[args.movement]
+    else:
+        movement = key_name[AUTO_SPRINT]
+
     return [
-        ("Movement", args.movement),
+        ("Movement", movement),
         ("Original Name Display", args.original_name_display),
         ("Random RNG", args.random_rng),
         ("Random Clock", args.random_clock),

data/items.py

@@ -5,7 +5,6 @@
 from constants.items import id_name, name_id
 
 import data.items_asm as items_asm
-from data.movement import MovementActions
 
 class Items():
     ITEM_COUNT = 256
@@ -282,8 +281,10 @@ def get_excluded(self):
             exclude.append(name_id["Exp. Egg"])
         if self.args.no_illuminas:
             exclude.append(name_id["Illumina"])
-        # Sprint shoes are a literal dead item if not ORIGINAL or SPRINT_SHOES_B_DASH
-        if self.args.no_sprint_shoes or self.args.movement in [MovementActions.AUTO_SPRINT, MovementActions.B_DASH]:
+
+        from data.movement import AUTO_SPRINT, B_DASH
+        # Sprint Shoes are a literal dead item if any of these options
+        if self.args.no_sprint_shoes or self.args.movement in [AUTO_SPRINT, B_DASH]:
             exclude.append(name_id["Sprint Shoes"])
         if self.args.no_free_paladin_shields:
             exclude.append(name_id["Paladin Shld"])

data/movement.py

@@ -7,19 +7,28 @@ class MovementSpeed(IntEnum):
     SPRINT = 3  # Original FF6 sprint speed
     DASH = 4    # Custom, move twice as fast as sprint.
 
-class MovementActions:
+ORIGINAL = 'og'
+AUTO_SPRINT = 'as'
+B_DASH = 'bd'
+SPRINT_SHOES_B_DASH = 'ssbd'
+
+name_key = {
     # WALK by default
     # SPRINT with sprint shoes equipped
-    ORIGINAL = 'og'
+    'ORIGINAL' : ORIGINAL,
     # SPRINT by default
     # WALK when holding B
-    AUTO_SPRINT = 'as'
+    'AUTO_SPRINT' : AUTO_SPRINT,
     # SPRINT by default
     # DASH when holding B
-    B_DASH = 'bd'
+    'B-DASH' : B_DASH,
     # SPRINT by default
     # DASH when holding B with sprint shoes equipped
     # WALK when holding B without sprint shoes equipped
-    SPRINT_SHOES_B_DASH = 'ssbd'
+    'SPR SHOE B-DASH' : SPRINT_SHOES_B_DASH,
+}
+
+key_name = {v: k for k, v in name_key.items()}
+
+ALL = [ORIGINAL, AUTO_SPRINT, B_DASH, SPRINT_SHOES_B_DASH]
 
-    ALL = [ORIGINAL, AUTO_SPRINT, B_DASH, SPRINT_SHOES_B_DASH]

settings/movement.py

@@ -1,13 +1,13 @@
-from data.movement import MovementActions, MovementSpeed
 from memory.space import Allocate, Bank, Reserve, Write
 import instruction.asm as asm
+from data.movement import AUTO_SPRINT, B_DASH, ORIGINAL, SPRINT_SHOES_B_DASH, MovementSpeed
 
 class Movement:
     def __init__(self):
         import args
-        self.movement = args.movement or MovementActions.AUTO_SPRINT
+        self.movement = args.movement or AUTO_SPRINT
 
-        if self.movement != MovementActions.ORIGINAL:
+        if self.movement != ORIGINAL:
             self.mod()
 
     def mod(self):
@@ -56,22 +56,21 @@ def get_auto_sprint_src(self):
             asm.BEQ("STORE_DEFAULT"),               # do nothing if b pressed
         ]
 
-
-        if self.movement == MovementActions.AUTO_SPRINT:
+        if self.movement == AUTO_SPRINT:
             src += [
                 "ON_B_BUTTON",
                 asm.LDA(MovementSpeed.WALK, asm.IMM8),
                 asm.BRA("STORE"),
             ]
-        elif self.movement == MovementActions.B_DASH:
+        elif self.movement == B_DASH:
             src += owzers_src
             src += [
                 "ON_B_BUTTON",
                 asm.LDA(MovementSpeed.DASH, asm.IMM8),
                 asm.BRA("STORE"),
             ]
 
-        elif self.movement == MovementActions.SPRINT_SHOES_B_DASH:
+        elif self.movement == SPRINT_SHOES_B_DASH:
             src += owzers_src
             src += [
                 "ON_B_BUTTON",