From 860efe41bdca8256ac068cce1ee7552ca9c36902 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 16 Jun 2016 01:37:38 -0700 Subject: [PATCH] Finally got romfs working... --- CREDITS | 1 + Makefile | 17 +- README.md | 4 +- bottomless-block-barrage.cbp | 5 + bottomless-block-barrage.layout | 234 ++++++++++-------- graphics/font_gfx.png | Bin 8144 -> 0 bytes resources/template.rsf | 19 +- .../font/{Arial Black.bff => Arial_Black.bff} | Bin source/main.cpp | 13 +- 9 files changed, 165 insertions(+), 128 deletions(-) delete mode 100644 graphics/font_gfx.png rename romfs/font/{Arial Black.bff => Arial_Black.bff} (100%) 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 @@