don't overwrite completion time in rjh; sam item requires an attack; …

…don't propagate form through top of babel
DontBaguMe · Aug 26, 2024 · 52ade7a · 52ade7a
1 parent e5f5a7f
commit 52ade7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/iog_randomizer/randomizer/classes.py b/src/iog_randomizer/randomizer/classes.py
@@ -3678,7 +3678,7 @@ def __init__(
             42: [143, 1, False, 0, [], "MineRampSlaveItem", "Diamond Mine: Laborer w/Elevator Key", 0, 0, [[609, 1]]],
             43: [148, 1, False, 0, [], "MineMorgueItem", "Diamond Mine: Morgue", 0, 0, []],
             44: [149, 1, False, 0, [], "MineCombatSlaveItem", "Diamond Mine: Laborer w/Mine Key", 0, 0, [[609, 1]]],
-            45: [150, 1, False, 0, [], "MineSamItem", "Diamond Mine: Sam", 0, 0, []],
+            45: [150, 1, False, 0, [], "MineSamItem", "Diamond Mine: Sam", 0, 0, [[609, 1]]],
 
             46: [721, 2, False, 0, [], "", "Diamond Mine: Appearing Dark Space", 0, 0, []],
             47: [131, 2, False, 0, [], "", "Diamond Mine: Dark Space at Wall", 0, 0, []],
@@ -4488,7 +4488,7 @@ def __init__(
                   []],
             470: [False, [], 2, [6, 22, 0, 226], 0, "Babel: Map 226 (top)", [], False, [], [], [], [], [], [], [], []],
             471: [False, [],       2, [6,22,0,227], 0, "Babel: Map 227 (bottom)", [], False, [], [], [], [], [], [], [], []],
-            472: [False, [], 2, [6, 22, 0, 227], 0, "Babel: Map 227 (top)", [], False, [], [], [], [], [], [], [], []],
+            472: [False, [], 2, [6, 22, 0, 227], 0, "Babel: Map 227 (top)", [], True, [], [], [], [], [], [], [], []],
             473: [False, [], 2, [6, 22, 0, 222], 0, "Babel: Olman's Room", [], False, [], [], [], [], [], [], [], []],
             474: [False, [], 0, [6, 22, 0, 242], 0, "Babel: Castoth", [], False, [], [], [], [], [], [], [], []],
             475: [False, [], 0, [6, 22, 0, 243], 0, "Babel: Viper", [], False, [], [], [], [], [], [], [], []],

diff --git a/src/iog_randomizer/randomizer/iogr_code_overflow.asr b/src/iog_randomizer/randomizer/iogr_code_overflow.asr
@@ -3637,9 +3637,11 @@ lda.l 1+SramMainGoalFrame : beq +
 rtl
 .PostFinalBossCometMap:
 if !SettingRedJewelHunt == 1
-; Reaching this map is the completion criterion
-lda.l SramFrameCounter : sta.l SramMainGoalFrame
-lda.l 1+SramFrameCounter : sta.l 1+SramMainGoalFrame
+; Reaching this map the first time is the completion criterion
+lda.l 1+SramMainGoalFrame : bne +
+  lda.l SramFrameCounter : sta.l SramMainGoalFrame
+  lda.l 1+SramFrameCounter : sta.l 1+SramMainGoalFrame
++:
 endif
 lda #$4000 : tsb $09ec
 jsr .SR_CalculateAndDisplayAllLines

diff --git a/src/iog_randomizer/randomizer/iogr_rom.py b/src/iog_randomizer/randomizer/iogr_rom.py
@@ -12,7 +12,7 @@
 from .models.enums import *
 from .models.randomizer_data import RandomizerData
 
-VERSION = "5.1.2"
+VERSION = "5.1.3"
 MAX_RANDO_RETRIES = 50
 OUTPUT_FOLDER: str = os.path.dirname(os.path.realpath(
     __file__)) + os.path.sep + ".." + os.path.sep + ".." + os.path.sep + "data" + os.path.sep + "output" + os.path.sep