th

Author: UmedMuzl

archipelago/Options.py

@@ -37,7 +37,7 @@ class Goal(Choice):
     - pearls: Find a certain number of Pearls to win. See goal_quantity option for more info.
     - bosses: Defeat a certain number of bosses to win. See goal_quantity option for more info.
     - bonuses: Complete a certain number of Bonus Barrels to win. Automatically disables auto_complete_bonus_barrels if set. See goal_quantity option for more info.
-    - treasure_hurry: Run down the timer by collecting treasure! You win when the timer reaches 0.
+    - treasure_hurry: Run down the timer by collecting treasure! You win when the timer reaches 0. If you beat Helm, the wincon automatically changes to beating K. Rool.
     - krools_challenge: K. Rool's ship does not spawn until you collect All keys, Defeat All bosses, Play all Bonus Barrels, and collect All Blueprints.
     - kill_the_rabbit: Kill the rabbit in Chunky's igloo in Caves. Turn it to Ash. Simple as that.
     """

base-hack/assets/displays/treasurechest.png

@@ -1706,7 +1706,7 @@ def patchAssembly(ROM_COPY, spoiler):
     # Fix Null Lag Boost
     writeHook(ROM_COPY, 0x806CCA90, Overlay.Static, "fixNullLagBoost", offset_dict)
 
-    if settings.win_condition_spawns_ship:
+    if settings.win_condition_spawns_ship and not (settings.helm_hurry and settings.archipelago):
         writeValue(ROM_COPY, 0x80029706, Overlay.Menu, getHiSym("k_rool_text"), offset_dict)
         writeValue(ROM_COPY, 0x8002970A, Overlay.Menu, getLoSym("k_rool_text"), offset_dict)
         writeFloatUpper(ROM_COPY, 0x800296D2, Overlay.Menu, 280, offset_dict)

randomizer/Patching/ASMPatcher.py

@@ -705,9 +705,8 @@ def writeWinConImage(settings: Settings, image: Image, ROM_COPY: LocalROM):
 def showWinCondition(settings: Settings, ROM_COPY: LocalROM):
     """Alter the image that's shown on the main menu to display the win condition."""
     win_con = settings.win_condition_item
-    if win_con == WinConditionComplex.beat_krool:
-        # Default, don't alter image
-        return
+    helmhurry = settings.helm_hurry and settings.archipelago
+
     if win_con == WinConditionComplex.krools_challenge:
         images = [
             (0x903, 0, 1),
@@ -728,6 +727,11 @@ def showWinCondition(settings: Settings, ROM_COPY: LocalROM):
             output_image.paste(local_img, (pos_x, pos_y), local_img)
         output_image = output_image.resize((32, 32)).transpose(Image.FLIP_TOP_BOTTOM)
         writeWinConImage(settings, output_image, ROM_COPY)
+    if helmhurry:
+        output_image = Image.open(BytesIO(js.getFile("base-hack/assets/displays/treasurechest.png")))
+        output_image = output_image.resize((32, 32))
+        writeWinConImage(settings, output_image, ROM_COPY)
+        return
     if win_con == WinConditionComplex.get_key8:
         output_image = Image.open(BytesIO(js.getFile("base-hack/assets/displays/key8.png")))
         output_image = output_image.resize((32, 32))