From 0f5119d4a9a004bfa7a3c38693be5823918c5f89 Mon Sep 17 00:00:00 2001
From: pingus <65916635+pinguupinguu@users.noreply.github.com>
Date: Thu, 23 Feb 2023 13:00:34 -0500
Subject: [PATCH] use clock addresses instead of health

---
 ...e Teenage Witch A Twitch in Time!.rascript | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/Playstation/Sabrina the Teenage Witch A Twitch in Time!.rascript b/Playstation/Sabrina the Teenage Witch A Twitch in Time!.rascript
index 7a5ebd7..aa1541d 100644
--- a/Playstation/Sabrina the Teenage Witch A Twitch in Time!.rascript	
+++ b/Playstation/Sabrina the Teenage Witch A Twitch in Time!.rascript	
@@ -101,10 +101,9 @@ achievement(
     points=10,
     id=292620,
     trigger=
-        map_ID() == 3 &&
+        
         save_protection() &&
-        clear_level() &&
-        bob_health() == 0
+        clock_virgo() > prev(clock_virgo())
 )
 achievement(
     "Into Egypt We Go!",
@@ -131,11 +130,9 @@ achievement(
     "Beat Ra in Tomb Construction Site and collect the Sagittarius clock piece!",
     points=10,
     id=292623,
-    trigger=
-        map_ID() == 6 &&
+    trigger=        
         save_protection() &&
-        clear_level() &&
-        ra_rainmaker_health() == 0
+        clock_saggitarius() > prev(clock_saggitarius())
 )
 achievement(
     "A Formal Trip to Japan!",
@@ -194,10 +191,8 @@ achievement(
     points=10,
     id=292629,
     trigger=
-        map_ID() == 0xc &&
         save_protection() &&
-        clear_level() &&
-        ra_rainmaker_health() == 0
+        clock_libra() > prev(clock_libra())
 )
 achievement(
     "The Final Matching Showdown!",
@@ -344,6 +339,4 @@ achievement(
 )
 // $0C8566: [8bit] Costume Equipped
 //          0x00=Default
-//          0x02=Cavewoman
-
-
+//          0x02=Cavewoman
\ No newline at end of file