diff --git a/CREDITS b/CREDITS
index e64335c..6581e2d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1 +1,2 @@
Panel Graphics are based off http://thewolfbunny.deviantart.com/art/Pokemon-Puzzle-Challenge-Panels-TA-Style-510289235 by TheWolfBunny
+flarn2006 for BmpFont, I was too lazy to roll my own and he'd already done implemented BFF fonts.
diff --git a/Makefile b/Makefile
index e64fb5d..77cb68f 100644
--- a/Makefile
+++ b/Makefile
@@ -141,6 +141,8 @@ APP_DESCRIPTION := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
APP_AUTHOR := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
APP_PRODUCT_CODE := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
APP_UNIQUE_ID := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
+APP_ICON := $(TOPDIR)/$(ICON)
+APP_ROMFS := $(TOPDIR)/$(ROMFS)
ifneq ("$(wildcard $(TOPDIR)/$(BANNER_IMAGE).cgfx)","")
BANNER_IMAGE_FILE := $(TOPDIR)/$(BANNER_IMAGE).cgfx
BANNER_IMAGE_ARG := -ci $(BANNER_IMAGE_FILE)
@@ -163,23 +165,19 @@ OUTPUT_NAME := $(subst $(SPACE),,$(APP_TITLE))
OUTPUT_DIR := $(TOPDIR)/$(OUTPUT)
OUTPUT_FILE := $(OUTPUT_DIR)/$(OUTPUT_NAME)
-APP_ICON := $(TOPDIR)/$(ICON)
-APP_ROMFS := $(TOPDIR)/$(ROMFS)
-
-COMMON_MAKEROM_PARAMS := -rsf $(RSF) -target t -exefslogo -elf $(OUTPUT_FILE).elf -icon icon.icn -banner banner.bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(APP_UNIQUE_ID)" -DAPP_ROMFS="$(APP_ROMFS)" -DAPP_SYSTEM_MODE="64MB" -DAPP_SYSTEM_MODE_EXT="Legacy"
+COMMON_MAKEROM_PARAMS := -rsf $(RSF) -target t -exefslogo -elf $(OUTPUT_FILE).elf -icon icon.icn -banner banner.bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(APP_UNIQUE_ID)" -DAPP_SYSTEM_MODE="64MB" -DAPP_SYSTEM_MODE_EXT="Legacy" -DAPP_ROMFS="$(APP_ROMFS)"
ifeq ($(OS),Windows_NT)
MAKEROM = makerom.exe
BANNERTOOL = bannertool.exe
+ 3DSTOOL = 3dstool.exe
else
MAKEROM = makerom
BANNERTOOL = bannertool
+ 3DSTOOL = 3dstool
endif
-_3DSXFLAGS += --smdh=$(OUTPUT_FILE).smdh
-ifneq ("$(wildcard $(TOPDIR)/$(ROMFS))","")
- _3DSXFLAGS += --romfs=$(TOPDIR)/$(ROMFS)
-endif
+_3DSXFLAGS += --smdh=$(OUTPUT_FILE).smdh --romfs=$(TOPDIR)/$(ROMFS)
#---------------------------------------------------------------------------------
# Main Targets
@@ -202,7 +200,7 @@ $(OUTPUT_FILE).3ds: $(OUTPUT_FILE).elf banner.bnr icon.icn
@echo "built ... $(notdir $@)"
$(OUTPUT_FILE).cia: $(OUTPUT_FILE).elf banner.bnr icon.icn
- @$(MAKEROM) -f cia -o $(OUTPUT_FILE).cia -DAPP_ENCRYPTED=false $(COMMON_MAKEROM_PARAMS)
+ $(MAKEROM) -f cia -o $(OUTPUT_FILE).cia -DAPP_ENCRYPTED=false $(COMMON_MAKEROM_PARAMS)
@echo "built ... $(notdir $@)"
$(OUTPUT_FILE).zip: $(OUTPUT_FILE).smdh $(OUTPUT_FILE).3dsx
@@ -257,6 +255,7 @@ spunch : $(OUTPUT_FILE).cia
@echo $(notdir $<)
@nin10kit -mode=rgba8 -output_dir=../build $(basename $<) $<
+
-include $(DEPENDS)
#---------------------------------------------------------------------------------
diff --git a/README.md b/README.md
index 54f26fc..0f2add1 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ New Gameplay features
## Compiling
### Prerequisites
* Compiling cia and 3ds targets requires having [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/bannertool) in your $PATH
-* [sf2dlib](https://github.com/xerpi/sf2dlib) is required along with devkitPro and [ctrulib](https://github.com/smealum/ctrulib)
+* [sf2dlib](https://github.com/xerpi/sf2dlib) is required along with devkitPro and [ctrulib](https://github.com/smealum/ctrulib)
* Lastly [nin10kit](https://github.com/TricksterGuy/nin10kit) is required to be installed and in your $PATH
1) Once all of the above is in order simply type make and you will get .elf for citra, .3dsx for homebrew launcher, .cia for emunand, and .3ds for gateway/sky3ds.
@@ -38,4 +38,4 @@ New Gameplay features
## Credits
Panel Graphics are based off http://thewolfbunny.deviantart.com/art/Pokemon-Puzzle-Challenge-Panels-TA-Style-510289235 by TheWolfBunny
-Text is generated from http://mifki.com/df/fontgen.html
+Text is generated from http://www.codehead.co.uk/cbfg/, and using flarn2006's SF2DBmpFont library to render it.
diff --git a/bottomless-block-barrage.cbp b/bottomless-block-barrage.cbp
index cb6523b..d03b93a 100644
--- a/bottomless-block-barrage.cbp
+++ b/bottomless-block-barrage.cbp
@@ -182,6 +182,7 @@
+
@@ -206,6 +207,8 @@
+
+
@@ -364,6 +367,8 @@
+
+
diff --git a/bottomless-block-barrage.layout b/bottomless-block-barrage.layout
index cfeb8ca..2631a59 100644
--- a/bottomless-block-barrage.layout
+++ b/bottomless-block-barrage.layout
@@ -2,69 +2,79 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -72,79 +82,89 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -152,44 +172,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
@@ -197,79 +222,84 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
diff --git a/graphics/font_gfx.png b/graphics/font_gfx.png
deleted file mode 100644
index 880c592..0000000
Binary files a/graphics/font_gfx.png and /dev/null differ
diff --git a/resources/template.rsf b/resources/template.rsf
index 9cebd15..9d5ab28 100644
--- a/resources/template.rsf
+++ b/resources/template.rsf
@@ -4,7 +4,6 @@ BasicInfo:
Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
RomFs:
- # Specifies the root path of the read only file system to include in the ROM.
RootPath : $(APP_ROMFS)
TitleInfo:
@@ -17,19 +16,19 @@ Option:
MediaFootPadding : false # If true CCI files are created with padding
EnableCrypt : $(APP_ENCRYPTED) # Enables encryption for NCCH and CIA
EnableCompress : true # Compresses where applicable (currently only exefs:/.code)
-
+
AccessControlInfo:
CoreVersion : 2
# Exheader Format Version
DescVersion : 2
-
+
# Minimum Required Kernel Version (below is for 4.5.0)
ReleaseKernelMajor : "02"
- ReleaseKernelMinor : "33"
+ ReleaseKernelMinor : "33"
# ExtData
- UseExtSaveData : false # enables ExtData
+ UseExtSaveData : false # enables ExtData
#ExtSaveDataId : 0x300 # only set this when the ID is different to the UniqueId
# FS:USER Archive Access Permissions
@@ -37,7 +36,7 @@ AccessControlInfo:
FileSystemAccess:
#- CategorySystemApplication
#- CategoryHardwareCheck
- - CategoryFileSystemTool
+ #- CategoryFileSystemTool
#- Debug
#- TwlCardBackup
#- TwlNandData
@@ -79,16 +78,16 @@ AccessControlInfo:
SystemModeExt : $(APP_SYSTEM_MODE_EXT) # Legacy(Default)/124MB/178MB Legacy:Use Old3DS SystemMode
CpuSpeed : 804MHz # 256MHz(Default)/804MHz
EnableL2Cache : true # false(default)/true
- CanAccessCore2 : true
+ CanAccessCore2 : true
# Virtual Address Mappings
IORegisterMapping:
- 1ff00000-1ff7ffff # DSP memory
- MemoryMapping:
+ MemoryMapping:
- 1f000000-1f5fffff:r # VRAM
# Accessible SVCs, :
- SystemCallAccess:
+ SystemCallAccess:
ArbitrateAddress: 34
Backdoor: 123
Break: 60
@@ -183,7 +182,7 @@ SystemControlInfo:
# Modules that run services listed above should be included below
# Maximum 48 dependencies
# :
- Dependency:
+ Dependency:
ac: 0x0004013000002402
act: 0x0004013000003802
am: 0x0004013000001502
diff --git a/romfs/font/Arial Black.bff b/romfs/font/Arial_Black.bff
similarity index 100%
rename from romfs/font/Arial Black.bff
rename to romfs/font/Arial_Black.bff
diff --git a/source/main.cpp b/source/main.cpp
index e5a27df..ebdad2f 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -9,22 +9,24 @@
#include
#include
-#include "font_gfx.h"
#include "windowskin.h"
Scene* current_scene = NULL;
std::unique_ptr font;
+
int main()
{
- romfsInit();
+ romfsInit();
sf2d_init();
sf2d_set_clear_color(RGBA8(0x0, 0x0, 0x0, 0xFF));
sf2d_set_3D(0);
- font.reset(new Font("/Arial Black.bff"));
- if (font->valid())
- Window::set_skin(windowskin, TEXFMT_RGBA8, SF2D_PLACE_RAM);
+ font.reset(new Font("romfs:/Arial_Black.bff"));
+ if (!font->valid()) abort();
+ Window::set_skin(windowskin, TEXFMT_RGBA8, SF2D_PLACE_RAM);
+
+
std::unique_ptr scene;
current_scene = new TitleScene();
@@ -49,3 +51,4 @@ int main()
romfsExit();
return 0;
}
+