fixes

pinguupinguu · Oct 7, 2023 · e3327ba · e3327ba
1 parent d97b8bc
commit e3327ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Nintendo DS/LEGO Star Wars III The Clone Wars.rascript b/Nintendo DS/LEGO Star Wars III The Clone Wars.rascript
@@ -331,7 +331,7 @@ for i in range(0, 12){
         points=10,
         trigger=
             utility_protections() &&
-            prev(my_array) < 9 &&
+            prev(my_array) <= 9 &&
             measured(my_array == 10)
     )
 }

diff --git a/SG-1000/Champion Billiards.rascript b/SG-1000/Champion Billiards.rascript
@@ -66,7 +66,7 @@ achievement(
     trigger=
         game_state() == in_game &&
         player_cnt() == 1 &&
-        balls() - prev(balls()) == 1
+        any_of(range(0x20, 0xc0, 0x20), b => prev(byte(b)) != 0xa && byte(b) == 0xa)
 )
 function ball_not_loaded() => byte(0x012c) == 0
 rich_presence_conditional_display(ball_not_loaded(), "Booting...")

diff --git a/SG-1000/Safari Race.rascript b/SG-1000/Safari Race.rascript
@@ -27,7 +27,7 @@ function in_demo_pause() => unless(demo_active())
 function section() => byte(0x007b)
 function distance() => word(0x02c1)
 function tires() => byte(0x02d0)
-function clear_lvl(goal) => prev(section()) == goal && section() == goal + 1
+function clear_lvl(goal) => prev(section()) == goal && section() == goal + 1 && byte(0x7a) != 1
 achievement(
     "First Road Trip",
     "Clear Section 1",
@@ -49,6 +49,7 @@ achievement(
     trigger=
         clear_lvl(3)
 )
+function timer() => word(0x2ef)
 achievement(
     "Roads & Trials",
     "Clear Section 1 in under 4:00",
@@ -66,8 +67,7 @@ achievement(
     trigger=
         !demo_active() &&
         section() == 2 &&
-        time_hours() < 8 &&
-        time_min() < 0x30 && //BCD
+        timer() < 0x730 &&
         trigger_when(prev(distance()) < 0x2000 && distance() == 0x2000)
 )
 achievement(
@@ -77,8 +77,7 @@ achievement(
     trigger=
         !demo_active() &&
         section() == 3 &&
-        time_hours() < 0x11 && //BCD
-        time_min() < 0x30 && //BCD
+        timer() < 0x1130 &&
         trigger_when(prev(distance()) < 0x3000 && distance() == 0x3000)
 )
 achievement(