From bdc5a8be492353120f515a77aba52f43bace083a Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Wed, 19 Apr 2023 01:03:54 +0100
Subject: [PATCH] Bug fixes

* Fixed CGController incompatibility with Ren'py automatic image definition system causing issues with Cho handjob/blowjob CG scenes
* Converted introductory CGs into show statements
* Converted quidditch CGs into show statements
* Converted potions CGs into show statements
* Reviewed and removed redundant CG code
---
 game/scripts/cg/camera.rpy                    | 35 +++++-----
 game/scripts/cg/common.rpy                    | 33 ----------
 .../characters/astoria/events/intro.rpy       | 18 ++----
 game/scripts/characters/cho/events/intro.rpy  | 13 ++--
 .../cho/events/quidditch/gryffindor_match.rpy | 43 ++++++-------
 .../cho/events/quidditch/slytherin_match.rpy  | 57 +++++++++++------
 .../hermione/events/favors/lets_have_sex.rpy  |  4 --
 .../characters/hermione/events/intro.rpy      | 49 +++++++-------
 .../hermione/events/potions/breast_expand.rpy | 24 ++-----
 .../events/potions/polyjuice_luna.rpy         | 18 ++----
 .../characters/hermione/events/tentacles.rpy  |  3 +-
 .../luna/events/favors/inspect_her_body.rpy   | 21 +++---
 .../luna/events/favors/masturbate_for_me.rpy  | 64 ++++++-------------
 game/scripts/characters/luna/events/intro.rpy | 55 +++++++++-------
 .../scripts/characters/susan/events/intro.rpy | 35 ++++++----
 .../scripts/characters/tonks/events/intro.rpy | 25 ++++----
 game/scripts/events/ending.rpy                |  2 -
 17 files changed, 220 insertions(+), 279 deletions(-)

diff --git a/game/scripts/cg/camera.rpy b/game/scripts/cg/camera.rpy
index 800491db..5034c65a 100644
--- a/game/scripts/cg/camera.rpy
+++ b/game/scripts/cg/camera.rpy
@@ -43,13 +43,19 @@ init python:
             self.child = None
 
         def set_imagepath(self, path):
-            self.imagepath = "images/CG/{}/".format(path)
+            self.imagepath = f"images/CG/{path}/".replace("//", "/")
 
         def set_image(self, img, trans=d1):
             p = max(0, self.get_pause())
 
             self.last_image = self.image
-            self.image = img
+
+            if isinstance( (vid := renpy.get_registered_image(img)), Movie ):
+                self.image = vid
+            elif isinstance(img, str) and self.imagepath:
+                self.image = f"{self.imagepath}{img}.webp"
+            else:
+                self.image = img
 
             # Reset last variables to new variables to not redraw the transform.
             self.last_zoom = self.zoom
@@ -66,7 +72,13 @@ init python:
                 renpy.with_statement(trans)
 
         def set_overlay(self, overlay):
-            self.overlay = overlay
+            if (img := renpy.get_registered_image(overlay)):
+                self.overlay = img
+            elif self.imagepath and isinstance(img, str):
+                self.overlay = f"{self.imagepath}{overlay}.webp"
+            else:
+                self.overlay = img
+
             self.redraw(0)
 
         def set_zoom(self, n):
@@ -112,17 +124,9 @@ init python:
                 renpy.pause(t)
 
         def redraw(self, t):
-            if self.image is None:
+            if (d := self.image) is None:
                 return
 
-            if isinstance(self.image, str):
-                d = renpy.get_registered_image(self.image)
-            else:
-                d = self.image
-
-            if d is None and self.imagepath:
-                d = Image("{}{}.webp".format(self.imagepath, self.image))
-
             if isinstance(d, Movie):
                 self.scale = 2.0
                 self.last_type = self.type
@@ -133,7 +137,7 @@ init python:
                 self.type = 0
 
             if self.overlay:
-                overlay = Transform("{}{}.webp".format(self.imagepath, self.overlay), zoom=1.0/self.scale)
+                overlay = Transform(self.overlay, zoom=1.0/self.scale)
                 d = Fixed(d, overlay, fit_first=True)
 
             last_zoom = self.last_zoom * self.scale
@@ -145,10 +149,11 @@ init python:
             return self.child
 
         def get_pause(self):
-            if self.image is None:
+            d = self.image
+
+            if d is None:
                 return 0
 
-            d = renpy.get_registered_image(self.image)
             if isinstance(d, Movie) and renpy.music.is_playing(d.channel):
                 p = renpy.music.get_pos(d.channel) or 0.0
                 t = renpy.music.get_duration(d.channel)
diff --git a/game/scripts/cg/common.rpy b/game/scripts/cg/common.rpy
index 5917c0eb..763d6243 100644
--- a/game/scripts/cg/common.rpy
+++ b/game/scripts/cg/common.rpy
@@ -55,39 +55,6 @@ image CG susan = Fixed(
     AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG sus_doll", zoom=1.2)), "images/CG/common/mask.webp"),
     )
 
-# TODO: Review the code below.
-
-
-
-
-
-
-
-
-
-
-# Miscellaneous CG code
-
-label cg_scene(layer=None, folder=None, trans=d5):
-    hide screen cg
-
-    if folder != None:
-        $ cg_path = "images/CG/"+folder+"/"
-
-    if layer != None:
-        $ cg_image = cg_path+layer+".webp"
-
-    show screen cg
-    with trans
-    return
-
-screen cg():
-    # Used by label cg_scene
-    tag cg_screen
-    zorder 14
-
-    add cg_image xpos 540 xanchor 0.5 ypos 0 # At Screen Center
-
 # Snape CG
 screen snape_groping():
     add "images/CG/scene_01.webp" zoom 0.5
diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy
index e756b8b6..120002fc 100644
--- a/game/scripts/characters/astoria/events/intro.rpy
+++ b/game/scripts/characters/astoria/events/intro.rpy
@@ -492,21 +492,16 @@ label astoria_intro_E3:
 
     $ astoria.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
     $ hermione.set_face(mouth="normal", eyes="closed", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG ast_intro astoria hermione")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    show screen animatedCG
+
+    show CG ast_intro astoria hermione as cg zorder 17:
+        zoom 0.5
     with fade
 
     ast "..." ("annoyed", "base", "worried", "R", xpos="right", ypos="base")
 
     gen "..."
     gen "And who's this?"
-    her "Astoria Greengrass, Sir." ("open", "narrow", "annoyed", "mid")
+    her "Astoria Greengrass, Sir." ("open", "narrow", "annoyed", "mid", flip=False, xpos="base", ypos="base")
     her "You asked me to bring you the person who cast the unforgivable curse, Sir." ("soft", "narrow", "annoyed", "R")
     her "And here she is." ("grin", "base", "angry", "mid")
     gen "I thought it would be some angsty girl who listens to death metal - or something..."
@@ -542,10 +537,9 @@ label astoria_intro_E3:
             $ d_flag_01 = True
             pass
 
-    hide screen animatedCG
+    hide cg
     with fade
-
-    her "But Sir, I'd really like to know what her punishment is going to be!" ("angry", "base", "base", "mid", flip=False, xpos="base", ypos="base", trans=dissolve)
+    her "But Sir, I'd really like to know what her punishment is going to be!" ("angry", "base", "base", "mid")
 
     gen "That's none of your concern." ("base", xpos="far_left", ypos="head")
     her "Yes it is! And I demand to be rewarded!" ("angry", "closed", "angry", "mid")
diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy
index 5ee047dc..e6bc9e01 100644
--- a/game/scripts/characters/cho/events/intro.rpy
+++ b/game/scripts/characters/cho/events/intro.rpy
@@ -51,14 +51,9 @@ label cho_intro_E1:
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
 
     $ cho.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG cho")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    show screen animatedCG
+
+    show CG cho as cg zorder 17:
+        zoom 0.5
     with fade
 
     cho "Good morning, Sir." ("base", "base", "base", "mid", xpos="mid", ypos="base")
@@ -122,7 +117,7 @@ label cho_intro_E1:
            gen "..."
            cho "Anyway..." ("open", "closed", "base", "mid")
 
-    hide screen animatedCG
+    hide cg
     with fade
 
     cho "I'm terribly sorry for bothering you, Sir.{w=0.8} I hope I'm not interrupting anything important." ("open", "base", "worried", "mid")
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index a18eb167..ba765aa3 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -1440,12 +1440,7 @@ label gryffindor_match:
     her "Go after her!" ("scream", "base", "angry", "L")
     nar "Snapping out of it, Harry speeds off after Cho who is now darting between the towers chasing the snitch."
 
-    # Note: We are using double fade effect to hide janky static-to-animation change
-    $ camera.set_imagepath("cho_quidditch2/")
-    $ camera.set_overlay(None)
-    $ camera.set(image="CG quidditch cho_sitting entry", zoom=1.0, pos=(0, 0), initialize=True)
-
-    show screen animatedCG
+    show CG quidditch cho_sitting entry as cg zorder 16
     hide snape_main
     hide hermione_main
     hide tonks_main
@@ -1457,7 +1452,7 @@ label gryffindor_match:
 
     call ctc
 
-    show image "cho_quidditch2 slide cho_siting entry" zorder 17 as cg2
+    show cho_quidditch2 slide cho_siting entry zorder 17 as cg2
     with dissolve
 
     nar "Cho speeds up even more, her skirt clinging on for dear life."
@@ -1473,15 +1468,15 @@ label gryffindor_match:
     gen "The broom, she's become one with the broom!"
     sna "She's what?"
 
-    show image "cho_quidditch2 slide cho_siting" zorder 17 as cg2
+    show cho_quidditch2 slide cho_siting zorder 17 as cg2
     with dissolve
 
     pause 0.5
 
     # Wet sound?
 
-    $ camera.set(zoom=1.0, pos=(0, 0), image="CG quidditch cho_standing", initialize=True, trans=d3)
-    show image "cho_quidditch2 slide cho_standing" zorder 17 as cg2 with dissolve
+    show CG quidditch cho_standing as cg zorder 16
+    show cho_quidditch2 slide cho_standing zorder 17 as cg2 with dissolve
 
     call ctc
 
@@ -1493,28 +1488,28 @@ label gryffindor_match:
     sna "*Cough*... {i}Deletrius{/i}... *Cough*..."
     play sound "sounds/magic4.ogg"
 
-    show image "cho_quidditch2 slide cho_standing_panties" zorder 17 as cg2 with flashbulb
+    show cho_quidditch2 slide cho_standing_panties zorder 17 as cg2 with flashbulb
 
     call ctc
 
-    $ camera.set(image="CG quidditch cho_standing_panties", trans=d3)
+    show CG quidditch cho_standing_panties as cg zorder 16 with d3
 
     ton "Severus!"
     sna "What? I just coughed!"
 
-    hide image cg2
+    hide cg2
     with dissolve
 
     nar "Cho, whose panties are now revealed to the crowd speeds up even further, edging ever so closer towards the snitch."
     qcr "Panties! Panties! Panties!"
     ton "*Cough*... {i}Ventus{/i}... *Cough*..."
     play sound "sounds/magic4.ogg"
-    $ camera.set(image="CG quidditch cho_standing_panties_down", trans=flashbulb)
+    show CG quidditch cho_standing_panties_down as cg zorder 16 with flashbulb
     nar "Suddenly, a strong gust of wind grabs hold of her panties and they slide down to her knees."
 
     call ctc
 
-    show image "cho_quidditch2 slide cho_standing_panties_down" zorder 17 as cg2
+    show cho_quidditch2 slide cho_standing_panties_down zorder 17 as cg2
     with dissolve
 
     call ctc
@@ -1524,8 +1519,8 @@ label gryffindor_match:
 
     call ctc
 
-    $ camera.set(image="CG quidditch cho_standing_smile")
-    hide image cg2
+    show CG quidditch cho_standing_smile as cg zorder 16
+    hide cg2
     with dissolve
 
     nar "The focus now shifted from the snitch to Cho's wet snatch leaves no doubts just how much she's enjoying this."
@@ -1542,11 +1537,11 @@ label gryffindor_match:
 
     play sound "sounds/slick_01.ogg"
 
-    $ camera.set(image="CG quidditch cho_standing_ahegao", trans=kissiris)
+    show CG quidditch cho_standing_ahegao as cg zorder 16 with kissiris
 
     pause .6
 
-    $ camera.set(image="CG quidditch cho_standing_smile", trans=kissiris)
+    show CG quidditch cho_standing_smile as cg zorder 16 with kissiris
 
     her "Harry!"
 
@@ -1560,7 +1555,7 @@ label gryffindor_match:
     gen "That's right, fuck you Snape!!"
     #Cho catches the snitch
 
-    $ camera.set(image="CG quidditch cho_standing_snitch", trans=d3)
+    show CG quidditch cho_standing_snitch as cg zorder 16 with d3
 
     #Crowd cheers
     play sound "sounds/crowd_cheer.ogg"
@@ -1573,11 +1568,11 @@ label gryffindor_match:
     gen "Hell yes!"
 
     #Cho sits back down on the dildo, snitch in hand
-    $ camera.set(image="CG quidditch cho_sitting_snitch", trans=d3)
+    show CG quidditch cho_sitting_snitch as cg zorder 16 with d3
 
     pause 1.0
 
-    show image "cho_quidditch2 slide cho_sitting_snitch" zorder 17 as cg2
+    show cho_quidditch2 slide cho_sitting_snitch zorder 17 as cg2
     with dissolve
 
     call ctc
@@ -1585,8 +1580,8 @@ label gryffindor_match:
     her "How?!?"
     #CG end here
 
-    hide image cg2
-    hide screen animatedCG
+    hide cg
+    hide cg2
     with fade
 
     $ cho.equip(choq_panties_in_hand)
diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
index 105fdfaf..54b04e53 100644
--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@@ -1211,24 +1211,30 @@ label slytherin_match:
     nar "Cho, now with her eyes fixed behind one of the goalposts -- seemingly having spotted the snitch -- gives you a quick glance and a smile as she flies up to Crabbe and Goyle."
 
     # Cho CG
-    $ camera.set_imagepath(None)
-    $ camera.set_image("cho_cg quidditch pose1 open")
-    $ camera.set_overlay(None)
-    $ camera.set(zoom=1.0, pos=(1300, 300), initialize=True)
-    show screen animatedCG
+    show cho_cg quidditch pose1 open as cg zorder 17:
+        zoom 1.0
+        pos (-1300, -600)
     with fade
 
     $ renpy.choice_for_skipping()
 
-    pause 0.2
-    $ camera.set(zoom=0.5, pos=(0, 300), t=3.5)
     cho "Hey boys, check this out..."
-    $ camera.set_image("cho_cg quidditch pose1 base")
     cra "What do you want slut?"
-    $ camera.set(rotate=-15, zoom=0.65, pos=(-100, -120), t=3.0, pause=True)
-    $ camera.set_image("cho_cg quidditch pose2 smirk", trans=d5)
+    show cho_cg quidditch pose1 base as cg zorder 17:
+        zoom 1.0
+        pos (-1300, -600)
+        easein_quad 3.5 zoom 0.5 pos (-500, -550)
+    pause 3.0
+    show cho_cg quidditch pose2 smirk as cg zorder 17:
+        zoom 0.5
+        pos (-500, -550)
+        pause 2.0
+        easein_quad 3.5 zoom 0.3 pos (-60, -130)
+    with d5
     nar "Cho spins around, flaunts her butt and gives them a quick wink."
-    $ camera.set(rotate=0, zoom=0.3, pos=(0, 0), t=2.0, pause=True)
+    show cho_cg quidditch pose2 smirk as cg zorder 17:
+        pos (-60, -130)
+        zoom 0.3
 
     call ctc
 
@@ -1240,14 +1246,18 @@ label slytherin_match:
         cho "Oh yes, let me see those muscly arms of yours..."
 
         call slap_her
-        $ camera.set_image("cho_cg quidditch pose2 slap_left")
+        show cho_cg quidditch pose2 slap_left as cg zorder 17:
+            pos (-60, -130)
+            zoom 0.3
 
         goy "Shut up bitch."
         cho "*Mmm*..."
         cra "What the hell... Is she enjoying it?!"
 
         call slap_her
-        $ camera.set_image("cho_cg quidditch pose2 slap_right")
+        show cho_cg quidditch pose2 slap_right as cg zorder 17:
+            pos (-60, -130)
+            zoom 0.3
 
         cho "Oh, thank you, please spank me more."
 
@@ -1256,10 +1266,14 @@ label slytherin_match:
         goy "Or maybe this little Ravenclaw slut has finally come to her senses, Crabbe."
         goy "No surprise there... Those Ravenclaw cucks got nothing even close to our sheer strength!" #have is correct grammar here but Crabbe and Goyle are dumb shits so
 
-        $ camera.set_image("cho_cg quidditch pose2 open")
+        show cho_cg quidditch pose2 open as cg zorder 17:
+            pos (-60, -130)
+            zoom 0.3
         nar "Cho tightens her butt cheeks and flutters her eyelashes in a way that -- to anyone except Crabbe and Goyle -- would be an obvious distraction tactic."
 
-        $ camera.set_image("cho_cg quidditch pose2 smirk")
+        show cho_cg quidditch pose2 smirk as cg zorder 17:
+            pos (-60, -130)
+            zoom 0.3
     play sound "sounds/crowd_cheer.ogg"
 
     her "And there's a goal for Ravenclaw, ladies and gentlemen!"
@@ -1267,12 +1281,19 @@ label slytherin_match:
 
     call ctc
 
-    $ camera.set_image("cho_cg quidditch pose1 base", trans=d5)
+    show cho_cg quidditch pose1 base as cg zorder 17:
+        pos (-60, -130)
+        zoom 0.3
+    with d5
 
     nar "Malfoy suddenly turns around, surprised that a goal was let in, and then angrily flies up to Crabbe and Goyle."
     malf "What the hell are you guys doing?{w=0.4} Have those bludgers been hitting you too hard?"
     malf "You're supposed to be blocking the goal until that Ravenclaw girl spots the snitch!"
-    $ camera.set_image("cho_cg quidditch pose1 run")
+
+    show cho_cg quidditch pose1 run as cg zorder 17:
+        pos (-60, -130)
+        zoom 0.3
+
     cra "Well, about that..."
     malf "How dare you speak over me, I'm not done with you!"
     cra "But Draco--"
@@ -1286,7 +1307,7 @@ label slytherin_match:
     # End of Cho CG
 
     call her_chibi("stand", 300, 400, flip=True)
-    hide screen animatedCG
+    hide cg
     with fade
 
     # Stop Prediction
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
index 656acd54..9a55a3be 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
@@ -393,9 +393,6 @@ label hg_sex_1:
         rotate (15)
         zoom 1.0
 
-    #$ camera.set(zoom=1.0, pos=(-190, -435), initialize=True)
-    # show screen animatedCG
-
     hide screen blkfade
     with d5
 
@@ -884,7 +881,6 @@ label hg_sex_2:
     # Hermione Setup
     hide hermione_main
 
-    # $ camera.set(zoom=1.0, pos=(-190, -435), initialize=True)
     if _temp_outfit_choice == "naked":
         show her_sex_personal lean_back hold mouth_open eyebrows_base eyes_wide_stare cheeks_blush as cg
     else:
diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy
index 2cf9c5e1..0d678ae2 100644
--- a/game/scripts/characters/hermione/events/intro.rpy
+++ b/game/scripts/characters/hermione/events/intro.rpy
@@ -85,26 +85,27 @@ label hermione_intro_E1:
     call her_walk("desk", "base")
     pause.5
 
-    show screen blkfade
-    with d5
     $ hermione.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
     $ hermione.set_pose("hold_book")
-    $ camera.set_imagepath("her_intro/")
-    $ camera.set_image("CG her_intro hermione")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=1.0, pos=(-1040, -600), initialize=True)
-    hide screen blkfade
-    show screen animatedCG
-    with d5
+    show CG her_intro hermione as cg zorder 17:
+        align (0.5, 0.5)
+        pos (-520, -300)
+    with fade
+
+    show CG her_intro hermione as cg zorder 17:
+        align (0.5, 0.5)
+        pos (-520, -300)
+        easein 5.0 pos (-520, -70)
+        pause 5.0
 
-    $ camera.set(zoom=1.0, pos=(-1040, -35), t=5.0, pause=True)
     her "Good morning, professor."
     gen "(Oh my...)"
 
-    $ camera.set(zoom=0.5, pos=(-270, -150), t=5.0)
+    show CG her_intro hermione as cg zorder 17:
+        zoom 1.0
+        align (0.5, 0.5)
+        pos (-520, -70)
+        easein_quad 3.0 align (0.0, 0.0) pos (0, 0) zoom 0.5
 
     menu:
         "\"Good morning, Hermione.\"" if d_flag_01:
@@ -130,21 +131,21 @@ label hermione_intro_E1:
             gen "................................."
             her ".....*ahem*......" ("open", "closed", "angry", "mid")
 
-    $ camera.set(zoom=0.5, pos=(-270, -150))
-
     play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed
 
     her "I am very busy with my class schedule, but I kept my morning free today so that I could see you, professor." ("open", "base", "base", "mid")
     gen "Right..."
     her "One moment, professor..." ("open", "narrow", "base", "down")
 
-    $ camera.set_image("CG her_intro hermione bendover")
+    show CG her_intro hermione bendover as cg zorder 17
     with d5
+
     nar "Hermione turns around and puts her book down."
     gen "!!!"
 
+
     $ hermione.set_pose(None)
-    $ camera.set_image("CG her_intro hermione")
+    show CG her_intro hermione as cg zorder 17
     with d5
 
     her "That's better... My arms were getting sore." ("open", "closed", "base", "mid")
@@ -277,14 +278,14 @@ label hermione_intro_E1:
 
     her "But you could delegate that task to me--"
 
-    $ camera.set_image("CG her_intro hermione bendover")
+    show CG her_intro hermione bendover as cg zorder 17
     with d5
     nar "Hermione bends down again to pick up her book."
 
     her "--Just put your faith in me, professor."
 
     $ hermione.set_pose("hold_book")
-    $ camera.set_image("CG her_intro hermione")
+    show CG her_intro hermione as cg zorder 17
     with d5
 
     if states.gen.masturbating:
@@ -293,7 +294,7 @@ label hermione_intro_E1:
 
         gen "{size=-4}(Oh crap, that did it!) *Argh*!{/size}"
 
-        hide screen animatedCG
+        hide cg
         hide hermione_main
         hide screen bld1
         with fade
@@ -325,17 +326,17 @@ label hermione_intro_E1:
     her "Really?" ("normal", "squint", "angry", "mid")
     her "*Hmm*..........."
 
-    her "That's a relief! Thank you, professor." ("open", "closed", "angry", "mid")
+    her "That's a relief! Thank you, professor." ("open", "closed", "angry", "mid", xpos="mid")
 
     if not states.gen.masturbating:
-        hide screen animatedCG
+        hide cg
         with fade
 
     if states.gen.masturbating:
         gen "No, no, thank you..." ("base", xpos="far_left", ypos="head")
         her "*Hmm*..." ("normal", "squint", "angry", "mid")
 
-    her "My classes are about to start, so I'd better go now." ("open", "closed", "angry", "mid", xpos="mid")
+    her "My classes are about to start, so I'd better go now." ("open", "closed", "angry", "mid")
     her "Thank you for your time..." ("base", "base", "base", "mid")
     her "Have a good day, professor." ("base", "base", "base", "mid")
 
diff --git a/game/scripts/characters/hermione/events/potions/breast_expand.rpy b/game/scripts/characters/hermione/events/potions/breast_expand.rpy
index f878049b..aa47f6a3 100644
--- a/game/scripts/characters/hermione/events/potions/breast_expand.rpy
+++ b/game/scripts/characters/hermione/events/potions/breast_expand.rpy
@@ -402,15 +402,8 @@ label her_potion_breasts_give:
             gen "About time you noticed..." ("base", xpos="far_left", ypos="head")
             her "Hold on... This means you have..." ("angry", "base", "base", "mid")
 
-            $ camera.set_imagepath("common/")
-            $ camera.set_image("CG hermione")
-            if game.daytime:
-                $ camera.set_overlay("day_overlay")
-            else:
-                $ camera.set_overlay("night_overlay")
-            $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-            hide hermione_main
-            show screen animatedCG
+            show CG hermione as cg zorder 17:
+                zoom 0.5
             with fade
 
             # Strip top/bra
@@ -461,15 +454,8 @@ label her_potion_breasts_give:
             her "Oh my!" ("angry", "wide", "base", "mid", cheeks="blush")
             her "But this means..." ("soft", "wide", "base", "stare", cheeks="blush")
 
-            $ camera.set_imagepath("common/")
-            $ camera.set_image("CG hermione")
-            if game.daytime:
-                $ camera.set_overlay("day_overlay")
-            else:
-                $ camera.set_overlay("night_overlay")
-            $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-            hide hermione_main
-            show screen animatedCG
+            show CG hermione as cg zorder 17:
+                zoom 0.5
             with fade
 
             her "" ("soft", "wide", "base", "down", cheeks="blush")
@@ -638,7 +624,7 @@ label her_potion_breasts_give:
             gen "They don't call me the potions master for nothing..." ("grin", xpos="far_left", ypos="head")
             gen "Now then..." ("base", xpos="far_left", ypos="head")
 
-    hide screen animatedCG
+    hide cg
     with fade
 
     ##Genie asks to touch her breasts##
diff --git a/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy b/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy
index 0da4a588..6dc30744 100644
--- a/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy
+++ b/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy
@@ -234,22 +234,18 @@ label her_potion_luna_give:
     pause 2
 
     play music "music/wallpaper-by-kevin-macleod.ogg" fadein 1 if_changed
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
 
+    show CG luna as cg zorder 17:
+        zoom 0.5
+
+    $ luna.set_face(mouth="disgust", eyes="closed", eyebrows="base", pupils="mid")
     hide screen blkfade
-    show screen animatedCG
     with fade
 
-    pause 2
+    pause 1
 
     if not states.her.ev.potions.polyjuice_luna_drank:
-        lun "*Ughhh*... My head..." ("disgust", "closed", "base", "mid", trans=d3)
+        lun "*Ughhh*... My head..."
         lun "I feel like I'm going to throw up!" ("mad", "narrow", "base", "mid")
         gen "Well you look fine to me!" ("grin", xpos="far_left", ypos="head")
 
@@ -560,7 +556,7 @@ label her_potion_luna_give:
     with d5
     pause .8
     $ luna.wear("all")
-    hide screen animatedCG
+    hide cg
     hide luna_main
     hide screen blkfade
     with d5
diff --git a/game/scripts/characters/hermione/events/tentacles.rpy b/game/scripts/characters/hermione/events/tentacles.rpy
index 61282560..8ea1f7b0 100644
--- a/game/scripts/characters/hermione/events/tentacles.rpy
+++ b/game/scripts/characters/hermione/events/tentacles.rpy
@@ -457,8 +457,8 @@ label tentacle_1: #Public path
     mal "What a slut..."
     fem "That's what I've been telling you!"
     mal2 "Man, I'm going to have to join Gryffindor."
-    hide screen cg
     show screen blkfade
+    hide cg
     with d9
     pause.8
     nar "You place Hermione back onto the desk as the plant that you are occupying slowly wilts and dies."
@@ -493,7 +493,6 @@ label tentacle_1: #Public path
 
     show screen blkfade
     with d9
-    hide cg
     pause.8
 
     return
diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
index d20cd171..e7db1033 100644
--- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
+++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
@@ -176,15 +176,11 @@ label ll_pf_inspect_T2_E1_intro:
 
     lun "Do you think I'll be able to expel them from here, [name_genie_luna]?" ("open", "base", "raised", "mid", cheeks="blush", flip=True)
 
-    $ camera.set_imagepath("lun_intro/")
-    $ camera.set_image("CG lun_intro luna bendover naked")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    $ camera.set(zoom=1.0, pos=(-1040, -600), t=30.0)
-    show screen animatedCG
+    show CG lun_intro luna bendover naked as cg zorder 17:
+        subpixel True
+        zoom 0.5
+        pos (0, 0)
+        easein_quad 15.0 zoom 1.0 pos (-1040, -600)
     with fade
 
     gen "[name_luna_genie]!"
@@ -200,16 +196,15 @@ label ll_pf_inspect_T2_E1_intro:
     gen "*Ah*, Yes...{w=0.4} both of those areas do appear to be very susceptible...{w=0.4} To spurts."
     lun "I knew it!"
 
-
+    lun "" ("grin", "base", "base", "mid", cheeks="blush", flip=False)
     call hide_characters
     call lun_chibi(flip=False)
-    hide screen animatedCG
+    hide cg
     with fade
 
-    lun "" ("grin", "base", "base", "mid", cheeks="blush", flip=False, trans=dissolve)
     nar "Luna turns back around, and as you get a full view of her front, you feel yourself getting close to the edge."
 
-    lun "So that's how you came up with the idea of rubbing your penis, [name_genie_luna]!" ("grin", "wink", "base", "mid", cheeks="blush")
+    lun "So that's how you came up with the idea of rubbing your penis, [name_genie_luna]!" ("grin", "wink", "base", "mid", cheeks="blush", trans=dissolve)
     lun "To bait the Wrackspurts to one spot!" ("crooked_smile", "base", "base", "mid", cheeks="blush")
     lun "Since your penis is a sensitive area, rubbing it gets the Wrackspurts all excited..." ("smile", "closed", "base", "mid", cheeks="blush")
 
diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
index 6d2aebc6..b23e8be8 100644
--- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
+++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
@@ -79,21 +79,20 @@ label ll_pf_masturbate_T3_E1_intro:
     call lun_walk("desk", "base")
 
     $ luna.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.95, pos=(-975, -155), initialize=True)
 
     stop weather fadeout 4
 
+    show CG luna as cg zorder 17:
+        zoom 0.95
+        pos (-975, -155)
     hide screen blkfade
-    show screen animatedCG
     with fade
 
-    $ camera.set(zoom=0.5, pos=(-270, -150), t=5.0)
+    show CG luna as cg zorder 17:
+        zoom 0.95
+        pos (-975, -155)
+        easein_quad 5.0 zoom 0.5 pos (0, 0)
+
     lun "Is here okay?" ("soft", "narrow", "base", "mid")
     gen "Perfect."
     gen "I'll have to explain a few things before we get going, so pay attention..."
@@ -256,7 +255,7 @@ label ll_pf_masturbate_T3_E1_intro:
 
     $ luna.set_pose(None)
 
-    hide screen animatedCG
+    hide cg
 
     hide screen blkfade
     with d5
@@ -360,18 +359,12 @@ label ll_pf_masturbate_T3_E2_intro:
     call lun_walk("desk", "base")
 
     $ luna.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid", cheeks="blush")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
 
     stop weather fadeout 4
 
     hide screen blkfade
-    show screen animatedCG
+    show CG luna as cg zorder 17:
+        zoom 0.5
     with fade
 
     #start of masturbation section (in front of desk CG)
@@ -542,7 +535,7 @@ label ll_pf_masturbate_T3_E2_intro:
 
     lun "*Mmm*...{heart}" ("base", "happyCl", "base", "mid", cheeks="blush")
 
-    hide screen animatedCG
+    hide cg
     show screen blkfade
     with d5
 
@@ -600,14 +593,6 @@ label ll_pf_masturbate_T3_E3_intro:
     nar "Luna quickly whips her clothes off and begins touching herself."
 
     $ luna.set_face(mouth="grin", eyes="narrow", eyebrows="base", pupils="mid", cheeks="blush")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-
     $ luna.set_pose("hand_on_pussy_and_breast")
     $ luna.set_cum(pussy="wet")
     $ luna.strip("clothes")
@@ -615,7 +600,8 @@ label ll_pf_masturbate_T3_E3_intro:
     stop weather fadeout 4
 
     hide screen blkfade
-    show screen animatedCG
+    show CG luna as cg zorder 17:
+        zoom 0.5
     with fade
 
     # hand moving slow
@@ -737,7 +723,7 @@ label ll_pf_masturbate_T3_E3_intro:
     lun "*Ah*..." ("base", "narrow", "base", "up", cheeks="blush")
     lun "Thank you, [name_genie_luna]..." ("base", "closed", "base", "mid", cheeks="blush")
 
-    hide screen animatedCG
+    hide cg
     show screen blkfade
     with d5
 
@@ -822,18 +808,11 @@ label ll_pf_masturbate_T3_E4_repeat:
     call lun_walk("desk", "base")
 
     $ luna.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-
     stop weather fadeout 4
 
     hide screen blkfade
-    show screen animatedCG
+    show CG luna as cg zorder 17:
+        zoom 0.5
     with fade
     #start of masturbation section (in front of desk CG)
 
@@ -973,8 +952,6 @@ label ll_pf_masturbate_T3_E4_repeat:
 
     lun "*Ah*...{heart}" ("grin", "narrow", "base", "up", cheeks="blush")
 
-    $ camera.set_image("CG luna")
-    $ camera.set(zoom=0.5, pos=(-270, -150), t=1.5)
     $ luna.set_pose(None)
     $ luna.strip("clothes")
     #Luna normal doll pose
@@ -987,8 +964,9 @@ label ll_pf_masturbate_T3_E4_repeat:
     lun "Oh, no! Look at what has happened to your floor!" ("mad", "narrow", "base", "down", cheeks="blush")
     gen "I'm sure it's fine, it has seen worse I'm--"
 
-    $ camera.set_image("CG lun_intro luna bendover naked")
-    $ camera.set(zoom=1.0, pos=(-1040, -600), t=10.0)
+    show CG lun_intro luna bendover naked as cg zorder 17:
+        zoom 0.5
+        easein_quad 10.0 zoom 1.0 pos (-1040, -600)
     #Luna naked bent over pose
 
     lun "Now where did I put my spectrespecs..." ("base", "base", "base", "mid")
@@ -1004,7 +982,7 @@ label ll_pf_masturbate_T3_E4_repeat:
     gen "Don't worry about them [name_luna_genie], I'm sure you can get a closer look some other time..."
     lun "Alright..." ("base", "base", "base", "mid")
 
-    hide screen animatedCG
+    hide cg
     show screen blkfade
     with d5
 
diff --git a/game/scripts/characters/luna/events/intro.rpy b/game/scripts/characters/luna/events/intro.rpy
index e0731246..e1a00eb2 100644
--- a/game/scripts/characters/luna/events/intro.rpy
+++ b/game/scripts/characters/luna/events/intro.rpy
@@ -70,22 +70,25 @@ label luna_intro_E1:
     gen "M-My cabbages!" ("angry", xpos="far_left", ypos="head")
 
     $ luna.set_face(mouth="soft", eyes="closed", eyebrows="low", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=1.0, pos=(-1040, -600), initialize=True)
-    show screen animatedCG
+    show CG luna as cg zorder 17:
+        align (0.5, 0.5)
+        pos (-520, -300)
     with fade
 
     gen "Who is--"
-    $ camera.set(zoom=1.0, pos=(-1040, -35), t=5.0, pause=True)
+    show CG luna as cg zorder 17:
+        align (0.5, 0.5)
+        pos (-520, -300)
+        easein_quad 5.0 pos (-520, 150)
 
     gen "... A girl?"
     lun "*Mmh*"
-    $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+
+    show CG luna as cg zorder 17:
+        zoom 1.0
+        align (0.5, 0.5)
+        pos (-520, 150)
+        easein_quad 3.0 align (0.0, 0.0) pos (0, 0) zoom 0.5
 
     gen "What are you doing in my office?"
     gen "Did Snape send you here? Surely--"
@@ -96,11 +99,12 @@ label luna_intro_E1:
     gen "Why would your glasses be in here?"
     gen "Hold on..."
 
-    hide screen animatedCG
+    $ luna.hide()
+    hide cg
     call gen_chibi("stand", 225, "base")
     with fade
 
-    pause 1
+    pause 0.5
 
     call gen_walk(path=[(230, 470), (440, 470), (450, 430)])
     call gen_chibi("stand", 450, "base", flip=False)
@@ -577,30 +581,33 @@ label luna_intro_E2:
     call lun_chibi(flip=True)
     with d3
 
-    $ camera.set_imagepath("lun_intro/")
-    $ camera.set_image("CG lun_intro luna bendover")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    show screen animatedCG
+    show CG lun_intro luna bendover as cg zorder 17:
+        zoom 0.5
     with fade
 
     nar "Luna turns around and bends down slightly, examining the floor tiles, giving you an eyeful of her round butt without realising."
 
     if states.gen.masturbating:
-        $ camera.set(zoom=1.1, pos=(-1055, -600), t=2.0)
+        show CG lun_intro luna bendover as cg zorder 17:
+            subpixel True
+            zoom 0.5
+            pos (0, 0)
+            easein_quad 2.0 zoom 1.0 pos (-1040, -600)
+
         gen "(Holy shit that ass!)"
         nar "{size=+3}*{b}fap{/b}-fap-{b}fap{/b}*{/size}"
         gen "*Ugh*... (I'm getting close.)"
 
-        $ camera.set(zoom=0.5, pos=(-270, -150), t=2.0)
+        show CG lun_intro luna bendover as cg zorder 17:
+            subpixel True
+            zoom 1.0
+            pos (-1040, -600)
+            easein_quad 5.0 zoom 0.5 pos (0, 0)
+
         lun "There's such a strange aura in here..."
         gen "(Yes! It's the aura of me going crazy for you, you fucking slut!)"
         nar "{size=+3}*{b}fap{/b}-fap-{b}fap{/b}*{/size}"
     else:
-        $ camera.set(zoom=0.5, pos=(-270, -150), t=2.0)
         lun "There's such a strange aura in here..."
         lun "It's like a big hollow tree..."
         gen "(Oh, good...{w=0.4} She's a hippie.)" ("base", xpos="far_left", ypos="head")
@@ -609,7 +616,7 @@ label luna_intro_E2:
 
     nar "Luna finally turns to face you."
 
-    hide screen animatedCG
+    hide cg
     with fade
 
 
diff --git a/game/scripts/characters/susan/events/intro.rpy b/game/scripts/characters/susan/events/intro.rpy
index 25dccedf..c0955d9e 100644
--- a/game/scripts/characters/susan/events/intro.rpy
+++ b/game/scripts/characters/susan/events/intro.rpy
@@ -106,14 +106,8 @@ label susan_intro_E1:
     pause.8
 
     $ susan.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG susan")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=1.0, pos=(-1045, -390), initialize=True)
-    show screen animatedCG
+    show CG susan as cg zorder 17:
+        pos (-1045, -390)
     with fade
 
     play sound "sounds/boing03.ogg" #Big boobas
@@ -122,23 +116,35 @@ label susan_intro_E1:
 
     menu:
         "\"Hello, Gorgeous!\"":
-            $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+            show CG susan as cg zorder 17:
+                pos (-1045, -390)
+                ease_quad 3.0 pos (-1045, -150)
+
             sus "*Ehm*..." ("soft", "happy", "base", "downR", cheeks="blush") # Embarrassed.
             sus "H-Hello..." ("open", "happy", "base", "downL", cheeks="blush")
 
         "\"Susan! How great to see you!\"" if d_flag_01:
-            $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+            show CG susan as cg zorder 17:
+                pos (-1045, -390)
+                ease_quad 3.0 pos (-1045, -150)
+
             gen "Where have you been all my life?"
             sus "I--{w=0.4} I've been here at school for a couple of years now, Sir." ("open", "happy", "base", "mid", cheeks="blush")
             gen "You don't say..."
 
         "\"My day just got a whole lot brighter!\"":
-            $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+            show CG susan as cg zorder 17:
+                pos (-1045, -390)
+                ease_quad 3.0 pos (-1045, -150)
+
             sus "Sir?" ("open", "happy", "base", "downL", cheeks="blush")
             gen "(Or should say darker?)"
-            show screen blktone
             gen "(Those tits must cast a huge-ass shadow...)"
-            hide screen blktone
+
+    show CG susan as cg zorder 17:
+        zoom 1.0
+        pos (-1045, -150)
+        ease_quad 3.0 zoom 0.5 pos (0, 0)
 
     sus "Professor Tonks said you wanted to see me?" ("soft", "happy", "base", "downL", cheeks="blush")
     gen "Did she now?"
@@ -164,7 +170,8 @@ label susan_intro_E1:
         sus "I shall return to my dormitory then." ("open", "happy", "base", "right")
         sus "Good--{w=0.4} Good night, sir." ("open", "happyCl", "base", "mid")
 
-    hide screen animatedCG
+    $ susan.hide()
+    hide cg
     with fade
 
     call sus_walk(action="leave")
diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy
index 41423adc..482dca23 100644
--- a/game/scripts/characters/tonks/events/intro.rpy
+++ b/game/scripts/characters/tonks/events/intro.rpy
@@ -71,23 +71,24 @@ label tonks_intro_E1:
     pause.5
 
     $ tonks.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG tonks")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=1.0, pos=(-1040, -35), initialize=True)
-    show screen animatedCG
+    show CG tonks as cg zorder 17:
+        pos (-1040, -35)
     with fade
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
     ton "Thank you, Professor." ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
 
-    $ camera.set(zoom=1.0, pos=(-1040, -600), t=5.0)
+    show CG tonks as cg zorder 17:
+        pos (-1040, -35)
+        ease_quad 5.0 pos (-1040, -600)
+
     gen "(Oh shit,{w=0.1} she's hot...)"
 
-    $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+    show CG tonks as cg zorder 17:
+        zoom 1.0
+        pos (-1040, -600)
+        ease_quad 5.0 pos (0, 0) zoom 0.5
+
     ton "I apologise for arriving unannounced...{w=0.8} And a couple of days late..." ("open", "base", "base", "R")
     gen "Please, I'm glad you could make it."
     ton "I was occupied with some unfinished ministry business. Took me a lot longer to solve than I had anticipated..." ("normal", "narrow", "base", "mid")
@@ -104,7 +105,7 @@ label tonks_intro_E1:
             $ states.gen.masturbating = True
             $ jerked_off_during_tonks_intro = True
             call gen_chibi("jerk_off_behind_desk")
-            hide screen animatedCG
+            hide cg
             with fade
 
             nar "You take out your cock and start jerking off."
@@ -114,7 +115,7 @@ label tonks_intro_E1:
         "-Pay attention-":
             $ states.gen.masturbating = False
             $ jerked_off_during_tonks_intro = False
-            hide screen animatedCG
+            hide cg
             with fade
             gen "Tell me about it..." ("base", xpos="far_left", ypos="head")
 
diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy
index 220bf8c8..592ea11b 100644
--- a/game/scripts/events/ending.rpy
+++ b/game/scripts/events/ending.rpy
@@ -1982,8 +1982,6 @@ label ball_ending_E2:
 
     else:
 
-        label testcg:
-
         # Personal whore ending
         sna "Miss Granger...?" ("snape_03", ypos="head")
         sna "You decided to show up after all? What an unpleasant surprise..." ("snape_04")