init

Author: Alex Nordstrom

worlds/ladx/LADXR/generator.py

@@ -30,6 +30,7 @@
 from .patches import maptweaks as _
 from .patches import chest as _
 from .patches import bomb as _
+from .patches import powder as _
 from .patches import rooster as _
 from .patches import shop as _
 from .patches import trendy as _
@@ -233,6 +234,8 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     # patches.reduceRNG.slowdownThreeOfAKind(rom)
     patches.reduceRNG.fixHorseHeads(rom)
     patches.bomb.onlyDropBombsWhenHaveBombs(rom)
+    if ladxr_settings.blockfreepowder:
+        patches.powder.onlyGivePowderWhenHavePowder(rom)
     if ladxr_settings.musicchange == 'always':
         patches.aesthetics.noSwordMusic(rom)
     patches.aesthetics.reduceMessageLengths(rom, random)

worlds/ladx/LADXR/patches/powder.py

@@ -0,0 +1,13 @@
+from ..assembler import ASM
+
+
+# remove calls to GiveInventoryItem(_trampoline)
+def onlyGivePowderWhenHavePowder(rom):
+    # trendy game
+    rom.patch(0x04, 0x366B, ASM("call $3E6B"), b"", fill_nop=True)
+
+    # floating powder
+    rom.patch(0x06, 0x3BC1, ASM("call $3E6B"), b"", fill_nop=True)
+
+    # standing powder
+    rom.patch(0x03, 0x2356, ASM("call $6472"), b"", fill_nop=True)

worlds/ladx/LADXR/settings.py

@@ -225,6 +225,7 @@ def __init__(self, settings_dict):
                 options=[('guessbyname', 'g', 'Guess By Name'), ('indicateprogression', 'p', 'Indicate Progression')], default="guessbyname", aesthetic=True),
             Setting('aptitlescreen', 'User options', 'a', 'AP Title Screen', description="", default=True),
             Setting('textshuffle', 'User options', 'a', 'Text Shuffle', description="", default=False),
+            Setting('blockfreepowder', 'User options', 'a', 'Block Free Powder', description="", default=False),
         ]
         self.__by_key = {s.key: s for s in self.__all}
 

worlds/ladx/Options.py

@@ -593,6 +593,19 @@ class StabilizeItemPool(DefaultOffToggle):
     rich_text_doc = True
 
 
+class BlockFreePowder(DefaultOffToggle, LADXROption):
+    """
+    Trendy game, floating, and freestanding magic powder won't do anything
+    unless you have received/found the magic powder item.
+
+    This has no logic implications, because these powder pickups are never
+    considered in logic.
+    """
+    display_name = "Block Free Powder"
+    rich_text_doc = True
+    ladxr_name = 'blockfreepowder'
+
+
 class ForeignItemIcons(Choice, LADXROption):
     """
     Choose how to display foreign items.
@@ -616,6 +629,7 @@ class ForeignItemIcons(Choice, LADXROption):
         TarinsGift,
         HardMode,
         TrendyGame,
+        BlockFreePowder,
     ]),
     OptionGroup("World Layout", [
         Overworld,
@@ -689,6 +703,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
     tarins_gift: TarinsGift
     overworld: Overworld
     stabilize_item_pool: StabilizeItemPool
+    block_free_powder: BlockFreePowder
     start_inventory_from_pool: StartInventoryPool
 
     warp_improvements: Removed