Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sound update stuff

Browse source
This commit is contained in:
ElijahZAwesome 2018-01-23 17:58:08 -06:00
parent a2aa5c428d
commit 6370ea9014
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -27,6 +27,7 @@ include $(DEVKITARM)/3ds_rules
# - <libctru folder>/default_icon.png # - <libctru folder>/default_icon.png
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
TARGET := result/Minicraft3DS TARGET := result/Minicraft3DS
ICON_TARGET := icons-banners/icon
BUILD := build BUILD := build
SOURCES := source source/minizip SOURCES := source source/minizip
DATA := data DATA := data
@ -106,13 +107,7 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
ifeq ($(strip $(ICON)),) ifeq ($(strip $(ICON)),)
icons := $(wildcard *.png) icons := $(wildcard *.png)
ifneq (,$(findstring $(TARGET).png,$(icons))) export APP_ICON := $(TOPDIR)/$(ICON_TARGET).png
export APP_ICON := $(TOPDIR)/$(TARGET).png
else
ifneq (,$(findstring /icons-banners/icon.png,$(icons)))
export APP_ICON := $(TOPDIR)/icons-banners/icon.png
endif
endif
else else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif

2
source/Globals.c
View file

@ -1,7 +1,7 @@
#include "Globals.h" #include "Globals.h"
#include "Menu.h" #include "Menu.h"
char versionText[34] = "Version 1.4"; char versionText[34] = "Version 1.4.1";
char fpsstr[34]; char fpsstr[34];
u8 currentMenu = 0; u8 currentMenu = 0;
bool UnderStrengthEffect = false; bool UnderStrengthEffect = false;

26
source/Sound.c
View file

@ -47,20 +47,20 @@ void updateMusic(int lvl, int time) {
} }
void loadSounds() { void loadSounds() {
loadSound(&snd_playerHurt, "resources/playerhurt.raw"); loadSound(&snd_playerHurt, "/resources/playerhurt.raw");
loadSound(&snd_playerDeath, "resources/playerdeath.raw"); loadSound(&snd_playerDeath, "/resources/playerdeath.raw");
loadSound(&snd_monsterHurt, "resources/monsterhurt.raw"); loadSound(&snd_monsterHurt, "/resources/monsterhurt.raw");
loadSound(&snd_test, "resources/test.raw"); loadSound(&snd_test, "/resources/test.raw");
loadSound(&snd_pickup, "resources/pickup.raw"); loadSound(&snd_pickup, "/resources/pickup.raw");
loadSound(&snd_bossdeath, "resources/bossdeath.raw"); loadSound(&snd_bossdeath, "/resources/bossdeath.raw");
loadSound(&snd_craft, "resources/craft.raw"); loadSound(&snd_craft, "/resources/craft.raw");
loadSound(&music_menu, "resources/music/menu.raw"); loadSound(&music_menu, "/resources/music/menu.raw");
loadSound(&music_floor0, "resources/music/floor0.raw"); loadSound(&music_floor0, "/resources/music/floor0.raw");
loadSound(&music_floor1, "resources/music/floor1.raw"); loadSound(&music_floor1, "/resources/music/floor1.raw");
loadSound(&music_floor1_night, "resources/music/floor1_night.raw"); loadSound(&music_floor1_night, "/resources/music/floor1_night.raw");
loadSound(&music_floor23, "resources/music/floor2_3.raw"); loadSound(&music_floor23, "/resources/music/floor2_3.raw");
loadSound(&music_floor4, "resources/music/floor4.raw"); loadSound(&music_floor4, "/resources/music/floor4.raw");
} }
void freeSounds(){ void freeSounds(){