Merge pull request 'merge fix' (#146) from nutbuster/SnootGame:p7_naomi_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/146

game/script.rpy

@@ -372,7 +372,7 @@ image trish prom bass flip = im.Flip("trish/trish prom bass.png", horizontal=Tru
 image trish smug flip = im.Flip("trish/trish smug.png", horizontal=True)
 image naser smug flip = im.Flip("naser/naser smug.png", horizontal=True)
 image rosa future flip = im.Flip("rosa/rosa future.png", horizontal=True)
-image jin flip = im.Flip("other/jin.png", horizontal=True)
+image jinflip = im.Flip("other/jin.png", horizontal=True)
 image farnsworth flip = im.Flip("other/farnsworth.png", horizontal=True)
 image carldelewski flip = im.Flip("other/carldelewski.png", horizontal=True)
 image fangdad unimpressed flip = im.Flip("fangparents/fangdad unimpressed.png", horizontal=True)
@@ -802,7 +802,7 @@ image elliot_raptor_buttonpress = im.FactorScale(im.Crop(im.FactorScale("images/
 image elliot_raptor_success = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost_suc.png", 1.0),(737,200,440,655)), 0.692)
 image elliot_raptor_wait = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost_wait.png", 1.0),(737,200,440,655)), 0.692)
 image elliot_raptor = im.FactorScale(im.Crop(im.FactorScale("images/other/phoneshitpost/elliot_raptor_shitpost1.png", 1.0),(737,200,440,655)), 0.692)
-image anonphonetoplayer = "images/other/phoneshitpost/anonphonetoplayer.png" 
+image anonphonetoplayer = "images/other/phoneshitpost/anonphonetoplayer.png"
 image baseanonphone = "images/anon/Other/anonphone.png"
 image anonblack_mid = im.Crop("images/other/black.png",740,200,300,450)
 
@@ -879,7 +879,7 @@ layeredimage fangphonevideocall:
          "fangphonelayer2"
 
 
-#Anon's phone 
+#Anon's phone
 layeredimage layeredanonphone:
    always:
       "baseanonphone"
@@ -903,7 +903,7 @@ layeredimage layeredanonphone:
 
       attribute shitpost_elliot:
          "elliot_raptor"
-      
+
       attribute shitpost_elliotbp:
          "elliot_raptor_buttonpress"
 

game/script/x3-PTA-meeting.rpy

@@ -273,7 +273,7 @@ label chapter_x3:
 
     pause 1
 
-    show jin flip behind spears at scenter:
+    show jinflip behind spears at scenter:
         xalign 0.5
     with dissolve
     pause 0.5
@@ -296,7 +296,7 @@ label chapter_x3:
     carl "I KNEWS YOU WERE FAKIN’ IT!"
 
 
-    show jin flip:
+    show jinflip:
         ease_cubic 0.5 xalign 0.3
     Tsuki "Aye habbu no curue watto yo meano."
     window hide

game/script/x8-naomi-tribulations.rpy

@@ -129,15 +129,15 @@ label chapter_x8:
         xalign 1.6
     Nas "Nothing! Nothing at all Naomi!"
 
-    Nas "Just uh{cps=*.15}...{cps} ah, damn it{cps=*.15}...{cps}"
+    Nas "Just uh{cps=*.15}...{/cps} ah, damn it{cps=*.15}...{/cps}"
 
     show naser sad flip with dissolve
     "Naser’s shoulders slump down and he heaves out a heavy sigh."
     stop music fadeout 5.0
-    Nas "I’ve been uh{cps=*.15}...{cps} Thinking about this a lot, Naomi{cps=*.15}...{/cps}"
+    Nas "I’ve been uh{cps=*.15}...{/cps} Thinking about this a lot, Naomi{cps=*.15}...{/cps}"
 
 
-    Nas "I uh{cps=*.15}...{cps} Wanna take a break{cps=*.15}...{cps}"
+    Nas "I uh{cps=*.15}...{/cps} Wanna take a break{cps=*.15}...{/cps}"
 
     "A break?"
 
@@ -152,7 +152,7 @@ label chapter_x8:
     pause 0.5
     "O-oh."
     show naomi sad with dissolve
-    "I{cps=*.15}...{cps}"
+    "I{cps=*.15}...{/cps}"
 
     N "I see{cps=*.15}...{/cps}"
 
@@ -208,7 +208,7 @@ label chapter_x8:
 
     "I can’t even focus on a single calamitous thought with so many firing through me."
 
-    "The thought of being away from Naser, of things just ending{cps=*.15}...{cps}"
+    "The thought of being away from Naser, of things just ending{cps=*.15}...{/cps}"
 
     N "{b}*sob*{/b}"
 
@@ -265,9 +265,9 @@ label chapter_x8:
     "He gives me a warm smile and a pat on the shoulder and leaves to let me get acquainted with the new space."
 
     hide spears with easeoutleft
-    "Looks like there’s already a few forms to fill out{cps=*.15}...{cps}"
+    "Looks like there’s already a few forms to fill out{cps=*.15}...{/cps}"
 
-    "Oh? There’s a letter in here, too{cps=*.15}...{cps}"
+    "Oh? There’s a letter in here, too{cps=*.15}...{/cps}"
 
     ##fade in cg
     #this one music pops on purpose
@@ -305,7 +305,7 @@ label chapter_x8:
 
     "That was me. I hope no one else heard that."
 
-    "But, but, but{cps=*.15}...{cps}"
+    "But, but, but{cps=*.15}...{/cps}"
     pause 0.5
     "Naser is{cps=*.15}...{/cps}"
     pause 0.5