diff --git a/build.bat b/build.bat index 472a4ed..4470051 100755 --- a/build.bat +++ b/build.bat @@ -5,9 +5,10 @@ echo Creating banner... bannertool.exe makebanner -i icons-banners/banner.png -a icons-banners/audio.wav -o icons-banners/banner.bnr echo Creating icon... bannertool.exe makesmdh -s "Minicraft3DS" -l "3DS Homebrew port of Notch's ludum dare game 'Minicraft', updated." -p "Davideesk/Andre111/ElijahZAwesome" -i icons-banners/icon.png -o icons-banners/icon.icn -echo Creating CIA... +echo Creating ROMFS... 3dstool -cvtf romfs icons-banners/romfs.bin --romfs-dir romfs/ -makerom -f cia -o result/Minicraft3DS.cia -DAPP_ENCRYPTED=false -rsf icons-banners/Minicraft3DS.rsf -target t -exefslogo -elf result/Minicraft3DS.elf -icon icons-banners/icon.icn -banner icons-banners/banner.bnr -romfs romfs.bin +echo Creating CIA... +makerom -f cia -o result/Minicraft3DS.cia -DAPP_ENCRYPTED=false -rsf icons-banners/Minicraft3DS.rsf -target t -exefslogo -elf result/Minicraft3DS.elf -icon icons-banners/icon.icn -banner icons-banners/banner.bnr -romfs icons-banners/romfs.bin echo Creating 3DS/CCI... -makerom -f cci -o result/Minicraft3DS.3ds -DAPP_ENCRYPTED=true -rsf icons-banners/Minicraft3DS.rsf -target t -exefslogo -elf result/Minicraft3DS.elf -icon icons-banners/icon.icn -banner icons-banners/banner.bnr -romfs romfs.bin +makerom -f cci -o result/Minicraft3DS.3ds -DAPP_ENCRYPTED=true -rsf icons-banners/Minicraft3DS.rsf -target t -exefslogo -elf result/Minicraft3DS.elf -icon icons-banners/icon.icn -banner icons-banners/banner.bnr -romfs icons-banners/romfs.bin pause \ No newline at end of file diff --git a/icons-banners/romfs.bin b/icons-banners/romfs.bin new file mode 100644 index 0000000..20e6c8f Binary files /dev/null and b/icons-banners/romfs.bin differ diff --git a/source/Ingame.c b/source/Ingame.c index 825342b..d4e82e5 100644 --- a/source/Ingame.c +++ b/source/Ingame.c @@ -368,6 +368,7 @@ void renderGame() { } void exitGame() { + romfsExit(); networkDisconnect(); synchronizerReset(); diff --git a/source/Sound.c b/source/Sound.c index 92f7526..15bd2c6 100755 --- a/source/Sound.c +++ b/source/Sound.c @@ -5,7 +5,6 @@ int soundListenerX; int soundListenerY; void loadSound(Sound * snd, char * filename){ - romfsInit(); FILE *file = fopen(filename, "rb"); if(file != NULL){ fseek(file, 0, SEEK_END); @@ -15,7 +14,6 @@ void loadSound(Sound * snd, char * filename){ fread(snd->buffer, 1, snd->size, file); } fclose(file); - romfsExit(); } void playSound(Sound snd){ @@ -72,20 +70,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, "romfs:/resources/playerhurt.raw"); + loadSound(&snd_playerDeath, "romfs:/resources/playerdeath.raw"); + loadSound(&snd_monsterHurt, "romfs:/resources/monsterhurt.raw"); + loadSound(&snd_test, "romfs:/resources/test.raw"); + loadSound(&snd_pickup, "romfs:/resources/pickup.raw"); + loadSound(&snd_bossdeath, "romfs:/resources/bossdeath.raw"); + loadSound(&snd_craft, "romfs:/resources/craft.raw"); loadSound(&music_menu, "romfs:/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_floor0, "romfs:/resources/music/floor0.raw"); + loadSound(&music_floor1, "romfs:/resources/music/floor1.raw"); + loadSound(&music_floor1_night, "romfs:/resources/music/floor1_night.raw"); + loadSound(&music_floor23, "romfs:/resources/music/floor2_3.raw"); + loadSound(&music_floor4, "romfs:/resources/music/floor4.raw"); } void freeSounds(){ diff --git a/source/main.c b/source/main.c index 6ccc1e4..e021925 100755 --- a/source/main.c +++ b/source/main.c @@ -85,6 +85,7 @@ extern int xscr, yscr; char debugText[34]; char bossHealthText[34]; int main() { + romfsInit(); cfguInit(); CFGU_GetSystemModel(&MODEL_3DS); FILE * file;