From d4a517f63b6ffb4036a41b93839d783069c17966 Mon Sep 17 00:00:00 2001
From: nutbuster <nutbuster@cock.li>
Date: Sat, 9 Oct 2021 20:26:33 +1100
Subject: [PATCH] """ -> # & merge fix

---
 game/script.rpy         | 17 ++++++++---------
 game/src/cg_gallery.rpy | 11 ++++++-----
 game/src/mod_menu.rpy   |  4 ++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/game/script.rpy b/game/script.rpy
index 6e414c1..e33d1f9 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -335,16 +335,15 @@ image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=Tru
 image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True)
 image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
 image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
-"""
-double surprised
-<<<<<<< B's
-image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
-=======
-image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
-image naser surprised = "naser/naserintermediaryshocked.png"
 
->>>>>>> N's
-"""
+#double surprised
+#<<<<<<< B's
+#image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
+#=======
+#image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
+#image naser surprised = "naser/naserintermediaryshocked.png"
+#
+#>>>>>>> N's
 
 #other flips
 image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)
diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy
index a6930a7..2fa7541 100644
--- a/game/src/cg_gallery.rpy
+++ b/game/src/cg_gallery.rpy
@@ -158,17 +158,18 @@ screen cg_gallery(flag, __yoffset = 0, origin = 'CG'):
                         textbutton _(cp['name']) text_color gui.selected_color text_xalign 0.5
                     else:
                         if cp['eval'] is None:
-                            textbutton _(cp['name']) action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5
+                            textbutton _(cp['name']) activate_sound "audio/ui/uiClick.wav" action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5
                         elif eval(cp['eval']):
-                            textbutton _(cp['name']) action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5
+                            textbutton _(cp['name']) activate_sound "audio/ui/uiClick.wav" action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5
                         else:
                             textbutton _(cp['name']) text_xalign 0.5
-                textbutton _("Return") action ShowMenu('main_menu') text_xalign 0.5
+                textbutton _("Return") activate_sound "audio/ui/uiBack.wav" action ShowMenu('main_menu') text_xalign 0.5
 
                 if _in_replay:
-                    textbutton _("End Replay") action EndReplay(confirm=True)
+                    textbutton _("End Replay") activate_sound "audio/ui/uiBack.wav" action EndReplay(confirm=True)
                 elif not main_menu:
-                    textbutton _("Main Menu") action MainMenu()
+                    textbutton _("Main Menu") activate_sound "audio/ui/uiBack.wav" action MainMenu()
+
 
         transform:
             zoom 0.95
diff --git a/game/src/mod_menu.rpy b/game/src/mod_menu.rpy
index 88cc2e6..3180fbc 100644
--- a/game/src/mod_menu.rpy
+++ b/game/src/mod_menu.rpy
@@ -10,6 +10,10 @@ screen mod_menu_button(filename, label, function):
         xmaximum 600
         ymaximum 129
         action function
+        if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label:
+            activate_sound "audio/ui/uiBack.wav"
+        else:
+            activate_sound "audio/ui/uiClick.wav"
         fixed:
             add filename xalign 0.5 yalign 0.5 zoom 0.9
             text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34