From 6370ea901421934c2130ea5a972eebbeab010645 Mon Sep 17 00:00:00 2001
From: ElijahZAwesome <elijahbansley@monroe.k12.wi.us>
Date: Tue, 23 Jan 2018 17:58:08 -0600
Subject: [PATCH] Sound update stuff

---
 Makefile         |  9 ++-------
 source/Globals.c |  2 +-
 source/Sound.c   | 26 +++++++++++++-------------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 6d6edbe..d6e88ea 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ include $(DEVKITARM)/3ds_rules
 #     - <libctru folder>/default_icon.png
 #---------------------------------------------------------------------------------
 TARGET		:=	result/Minicraft3DS
+ICON_TARGET :=  icons-banners/icon
 BUILD		:=	build
 SOURCES		:=	source source/minizip
 DATA		:=	data
@@ -106,13 +107,7 @@ export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 
 ifeq ($(strip $(ICON)),)
 	icons := $(wildcard *.png)
-	ifneq (,$(findstring $(TARGET).png,$(icons)))
-		export APP_ICON := $(TOPDIR)/$(TARGET).png
-	else
-		ifneq (,$(findstring /icons-banners/icon.png,$(icons)))
-			export APP_ICON := $(TOPDIR)/icons-banners/icon.png
-		endif
-	endif
+	export APP_ICON := $(TOPDIR)/$(ICON_TARGET).png
 else
 	export APP_ICON := $(TOPDIR)/$(ICON)
 endif
diff --git a/source/Globals.c b/source/Globals.c
index 1f86494..69da0ee 100644
--- a/source/Globals.c
+++ b/source/Globals.c
@@ -1,7 +1,7 @@
 #include "Globals.h"
 #include "Menu.h"
 
-char versionText[34] = "Version 1.4";
+char versionText[34] = "Version 1.4.1";
 char fpsstr[34];
 u8 currentMenu = 0;
 bool UnderStrengthEffect = false;
diff --git a/source/Sound.c b/source/Sound.c
index 9e44817..dd5be02 100644
--- a/source/Sound.c
+++ b/source/Sound.c
@@ -47,20 +47,20 @@ void updateMusic(int lvl, int time) {
 }
 
 void loadSounds() {
-	loadSound(&snd_playerHurt, "resources/playerhurt.raw");
-	loadSound(&snd_playerDeath, "resources/playerdeath.raw");
-	loadSound(&snd_monsterHurt, "resources/monsterhurt.raw");
-	loadSound(&snd_test, "resources/test.raw");
-	loadSound(&snd_pickup, "resources/pickup.raw");
-	loadSound(&snd_bossdeath, "resources/bossdeath.raw");
-	loadSound(&snd_craft, "resources/craft.raw");
+	loadSound(&snd_playerHurt, "/resources/playerhurt.raw");
+	loadSound(&snd_playerDeath, "/resources/playerdeath.raw");
+	loadSound(&snd_monsterHurt, "/resources/monsterhurt.raw");
+	loadSound(&snd_test, "/resources/test.raw");
+	loadSound(&snd_pickup, "/resources/pickup.raw");
+	loadSound(&snd_bossdeath, "/resources/bossdeath.raw");
+	loadSound(&snd_craft, "/resources/craft.raw");
 	
-	loadSound(&music_menu, "resources/music/menu.raw");
-	loadSound(&music_floor0, "resources/music/floor0.raw");
-	loadSound(&music_floor1, "resources/music/floor1.raw");
-	loadSound(&music_floor1_night, "resources/music/floor1_night.raw");
-	loadSound(&music_floor23, "resources/music/floor2_3.raw");
-	loadSound(&music_floor4, "resources/music/floor4.raw");
+	loadSound(&music_menu, "/resources/music/menu.raw");
+	loadSound(&music_floor0, "/resources/music/floor0.raw");
+	loadSound(&music_floor1, "/resources/music/floor1.raw");
+	loadSound(&music_floor1_night, "/resources/music/floor1_night.raw");
+	loadSound(&music_floor23, "/resources/music/floor2_3.raw");
+	loadSound(&music_floor4, "/resources/music/floor4.raw");
 }
 
 void freeSounds(){