--- tashia\dialogues\tashi25j.d	Sat Dec 05 21:54:06 2009
+++ C:\BWP Patchstudio\patched files\tashia\dialogues\tashi25j.d	Fri Jan 29 14:16:03 2016
@@ -3,61 +3,14 @@
 BEGIN tashi25j
 
 IF ~~ THEN BEGIN tash2
   SAY @0
   IF ~~ THEN EXTERN HGWRA01 24
 END
 
-IF ~~ THEN BEGIN rom1
-  SAY @1
-    = @2
-    = @3
-    = @4
-  IF ~~ THEN REPLY @5 GOTO 0
-  IF ~~ THEN REPLY @6 GOTO 1
-  IF ~~ THEN REPLY @7 GOTO 2
-END
-
-IF ~~ THEN BEGIN 0
-  SAY @8
-  IF ~~ THEN EXTERN FINSOL01 TashiaAdd1
-END
-
-IF ~~ THEN BEGIN 1
-  SAY @9
-    = @10
-  IF ~~ THEN EXTERN FINSOL01 TashiaAdd1
-END
-
-IF ~~ THEN BEGIN 2
-  SAY @11
-  IF ~~ THEN GOTO 1
-END
-
-IF ~~ THEN BEGIN rom2
-  SAY @12
-    = @13
-    = @14
-  IF ~~ THEN EXTERN FINSOL01 33
-END
-
-IF ~~ THEN BEGIN noromance2
-  SAY @15
-    = @16
-    = @17
-    = @18
-  IF ~~ THEN EXTERN FINSOL01 33
-END
-
-IF ~~ THEN BEGIN noromance1
-  SAY @19
-    = @20
-COPY_TRANS FINSOL01 27
-END
-
 IF ~~ THEN BEGIN drow1
   SAY @21
     = @22
     = @23
   IF ~~ THEN EXTERN SENGUA01 drow2
 END
 
@@ -132,48 +85,43 @@
 
 EXTEND_TOP FATESP 6
   IF ~!InParty("Tashia")
 !Dead("Tashia")
 Global("TashiaSummoned","GLOBAL",0)~ THEN REPLY @37 DO ~SetGlobal("TashiaSummoned","GLOBAL",1)~ EXTERN FATESP 8
 END
 
-EXTEND_BOTTOM FINSOL01 27
-  IF ~IsValidForPartyDialog("Tashia")
-!Global("TashiaRomanceActive","GLOBAL",2)~ THEN EXTERN ~tashi25j~ noromance1
+I_C_T FINSOL01 27 TashNoromactiveToB1
+==  tashi25j IF ~IsValidForPartyDialog("Tashia")!Global("TashiaRomanceActive","GLOBAL",2)~ THEN @19
+==  tashi25j IF ~IsValidForPartyDialog("Tashia")!Global("TashiaRomanceActive","GLOBAL",2)~ THEN @20
 END
 
-EXTEND_BOTTOM FINSOL01 31
-  IF ~IsValidForPartyDialog("Tashia")
-Global("TashiaRomanceActive","GLOBAL",2)~ THEN EXTERN tashi25j noromance2
+I_C_T FINSOL01 28 TashromactiveToB1
+==  tashi25j IF ~IsValidForPartyDialogue("Tashia")Global("TashiaRomanceActive","GLOBAL",2)~ THEN @1
+==  tashi25j IF ~IsValidForPartyDialogue("Tashia")Global("TashiaRomanceActive","GLOBAL",2)~ THEN @2
+==  tashi25j IF ~IsValidForPartyDialogue("Tashia")Global("TashiaRomanceActive","GLOBAL",2)~ THEN @3
+==  tashi25j IF ~IsValidForPartyDialogue("Tashia")Global("TashiaRomanceActive","GLOBAL",2)~ THEN @4
 END
 
-EXTEND_BOTTOM FINSOL01 32
-  IF ~IsValidForPartyDialog("Tashia")
-Global("TashiaRomanceActive","GLOBAL",2)~ THEN EXTERN tashi25j rom2
+I_C_T  FINSOL01 31 TashromactiveToB2
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @15
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @16
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @17
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @18
+END
+
+I_C_T FINSOL01 32 TashromactiveToB3
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @12
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @13
+==  tashi25j IF ~IsValidForPartyDialog("Tashia") Global("TashiaRomanceActive","GLOBAL",2)~ THEN @14
 END
 
 ADD_TRANS_TRIGGER SENGUA01 4 ~!IsValidForPartyDialog("Tashia")~
 
 EXTEND_BOTTOM SENGUA01 4
   IF ~IsValidForPartyDialog("Tashia")~ THEN EXTERN tashi25j drow1
-END
-
-APPEND FINSOL01
-  IF ~~ THEN BEGIN TashiaAdd1
-    SAY @38  /* #67885 */
-COPY_TRANS FINSOL01 28
-  END
-END
-
-REPLACE FINSOL01
-  IF ~~ THEN BEGIN 28
-    SAY @39
-    IF ~Global("TashiaRomanceActive","GLOBAL",2)~ THEN EXTERN tashi25j rom1
-    IF ~!Global("TashiaRomanceActive","GLOBAL",2)~ THEN EXTERN FINSOL01 TashiaAdd1
-  END
 END
 
 EXTEND_TOP SARVOLO 9 #1
   IF ~InParty("Tashia")
 Global("TashiaRomanceActive","GLOBAL",2)~ THEN REPLY @40 EXTERN SARVOLO voloR1
 END
 
