From 8a562e1cc5834615faf25c748c5fdbb2f5f006e0 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 21 Jul 2019 23:54:30 -0500 Subject: [PATCH] [nostalgia] Update gba-pkg script to use new nost-pack --- scripts/gba-pkg | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/scripts/gba-pkg b/scripts/gba-pkg index 4a1313a9..e2504c69 100755 --- a/scripts/gba-pkg +++ b/scripts/gba-pkg @@ -4,20 +4,18 @@ set -e BIN=./dist/current/bin/ PATH=$BIN:${DEVKITARM}/bin/:$PATH -NOSTALGA_BIN=build/gba-*/src/nostalgia/player/nostalgia.bin -NOSTALGA_MEDIA=nostalgia_media.oxfs -NOSTALGA_GBA=nostalgia.gba +NOSTALGIA_BIN=build/gba-*/src/nostalgia/player/nostalgia.bin +NOSTALGIA_MEDIA=nostalgia_media.oxfs +NOSTALGIA_PROJECT=sample_project +NOSTALGIA_GBA=nostalgia.gba MEDIA_HEADER=media_header.txt -CHARSET_FILE=src/nostalgia/core/studio/charset.png -TILESHEET_TEST_REGION1=media/tilesheet_test_region1.png echo NOSTALGIA_MEDIA_HEADER_________ > $MEDIA_HEADER -oxfs format 32 1k $NOSTALGA_MEDIA -nost-pack -fs $NOSTALGA_MEDIA -img $CHARSET_FILE -inode 101 -tiles 127 -bpp 4 -c -nost-pack -fs $NOSTALGA_MEDIA -img $TILESHEET_TEST_REGION1 -inode 102 -tiles 4 -bpp 4 -c +nost-pack -src $NOSTALGIA_PROJECT -dst $NOSTALGIA_MEDIA -padbin 32 $NOSTALGA_BIN -cat $NOSTALGA_BIN $MEDIA_HEADER $NOSTALGA_MEDIA > $NOSTALGA_GBA -rm -f $MEDIA_HEADER $NOSTALGA_MEDIA -gbafix $NOSTALGA_GBA +padbin 32 $NOSTALGIA_BIN +ls -lh $NOSTALGIA_BIN +cat $NOSTALGIA_BIN $MEDIA_HEADER $NOSTALGIA_MEDIA > $NOSTALGIA_GBA +rm -f $MEDIA_HEADER $NOSTALGIA_MEDIA +gbafix $NOSTALGIA_GBA