From 8fb0adf401417fe0c226758a29d10af6d209bdab Mon Sep 17 00:00:00 2001 From: Pk11 Date: Wed, 16 Dec 2020 23:45:48 -0600 Subject: [PATCH] Make .dsi file with title ID, .nds without (#77) --- .gitignore | 1 + Makefile | 10 +++++++++- azure-pipelines.yml | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ce6eae5..58b245c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ */build +*.dsi *.nds *.cia *.elf diff --git a/Makefile b/Makefile index 26d153c..a937b8a 100644 --- a/Makefile +++ b/Makefile @@ -120,6 +120,8 @@ export GAME_TITLE := $(TARGET) .PHONY: bootloader bootstub clean arm7/$(TARGET).elf arm9/$(TARGET).elf all: bootloader bootstub $(TARGET).nds + +dsi: $(TARGET).dsi dist: all @rm -fr hbmenu @@ -131,8 +133,14 @@ dist: all $(TARGET).nds: $(TARGET).arm7 $(TARGET).arm9 ndstool -c $(TARGET).nds -7 $(TARGET).arm7.elf -9 $(TARGET).arm9.elf \ -b icon.bmp "GodMode9i;RocketRobz" \ - -g HGMA 00 "GODMODE9I" -z 80040000 -u 00030004 + -z 80040000 -u 00030004 python2 fix_ndsheader.py $(CURDIR)/$(TARGET).nds + +$(TARGET).dsi: $(TARGET).arm7 $(TARGET).arm9 + ndstool -c $(TARGET).dsi -7 $(TARGET).arm7.elf -9 $(TARGET).arm9.elf \ + -b icon.bmp "GodMode9i;RocketRobz" \ + -g HGMA 00 "GODMODE9I" -z 80040000 -u 00030004 + python2 fix_ndsheader.py $(CURDIR)/$(TARGET).dsi $(TARGET).arm7: arm7/$(TARGET).elf cp arm7/$(TARGET).elf $(TARGET).arm7.elf diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33bb5ef..d45274e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,13 +37,14 @@ steps: export DEVKITPRO="/opt/devkitpro" export DEVKITARM="/opt/devkitpro/devkitARM" sudo cp libmm7.a /opt/devkitpro/libnds/lib/libmm7.a - make + make all dsi displayName: 'Build GodMode9i' - script: | chmod +x make_cia - ./make_cia --srl="GodMode9i.nds" --id_0=$(git rev-parse --short=7 HEAD) --tikID=$(git rev-parse --short=16 HEAD) + ./make_cia --srl="GodMode9i.dsi" --id_0=$(git rev-parse --short=7 HEAD) --tikID=$(git rev-parse --short=16 HEAD) mkdir GodMode9i/ + cp GodMode9i.dsi GodMode9i/ cp GodMode9i.nds GodMode9i/ cp GodMode9i.cia GodMode9i/ 7z a GodMode9i.7z GodMode9i/