From a6f7abff4189e2df76c42f4b547325bde3b5ad02 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 10 Nov 2024 15:19:34 -0500 Subject: [PATCH 1/5] Add rule to build sbox_gra_00000000.NCLR --- files/data/sbox_gra.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/files/data/sbox_gra.mk b/files/data/sbox_gra.mk index c5d645eee..e596ec44e 100644 --- a/files/data/sbox_gra.mk +++ b/files/data/sbox_gra.mk @@ -5,6 +5,7 @@ SBOX_GRA_FILES := \ sbox_gra_00000000.NCLR \ sbox_gra_00000001.NCGR +4BPP_NOPAD_PCMP_NCLR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000000.NCLR VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000001.NCGR $(SBOX_GRA_NARC): $(addprefix $(SBOX_GRA_DIR)/,$(SBOX_GRA_FILES)) From e79e1c377172ba45dc0fe04fc580159a7186205b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 10 Nov 2024 15:21:49 -0500 Subject: [PATCH 2/5] Delete files/data/sbox_gra/sbox_gra_00000000.NCLR --- files/data/sbox_gra/sbox_gra_00000000.NCLR | Bin 90 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 files/data/sbox_gra/sbox_gra_00000000.NCLR diff --git a/files/data/sbox_gra/sbox_gra_00000000.NCLR b/files/data/sbox_gra/sbox_gra_00000000.NCLR deleted file mode 100644 index e88a7d0ddee8bcb33b3696894f88becdd89003d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmWIYarXQFkAX3Yfq_AQfr%j`#3#T4$Yus&5KsVO0U(yIxm)d}%O8EWdX??{XnC+$ gmf<-|LpKh^d({^l1ALtWgn;T88Q$;X0MZN$08^$DX#fBK From 1fde0d56bcf0ea379ada6127d9beb727a5e5c8f3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 10 Nov 2024 15:33:48 -0500 Subject: [PATCH 3/5] Update sbox_gra.mk --- files/data/sbox_gra.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/files/data/sbox_gra.mk b/files/data/sbox_gra.mk index e596ec44e..f53a011c5 100644 --- a/files/data/sbox_gra.mk +++ b/files/data/sbox_gra.mk @@ -8,6 +8,8 @@ SBOX_GRA_FILES := \ 4BPP_NOPAD_PCMP_NCLR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000000.NCLR VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000001.NCGR +$(SBOX_GRA_DIR)/sbox_gra_00000000.NCLR: $(SBOX_GRA_DIR)/sbox_gra_00000001.png + $(SBOX_GRA_NARC): $(addprefix $(SBOX_GRA_DIR)/,$(SBOX_GRA_FILES)) clean-sbox-gra: From 5e4f00bb31d98be403b9c12de4923684e417bc8c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 10 Nov 2024 15:52:52 -0500 Subject: [PATCH 4/5] this rule needs to be explicit --- files/data/sbox_gra.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/files/data/sbox_gra.mk b/files/data/sbox_gra.mk index f53a011c5..e7ae521ba 100644 --- a/files/data/sbox_gra.mk +++ b/files/data/sbox_gra.mk @@ -9,6 +9,7 @@ SBOX_GRA_FILES := \ VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000001.NCGR $(SBOX_GRA_DIR)/sbox_gra_00000000.NCLR: $(SBOX_GRA_DIR)/sbox_gra_00000001.png + $(GFX) $< $@ $(GFX_FLAGS) $(SBOX_GRA_NARC): $(addprefix $(SBOX_GRA_DIR)/,$(SBOX_GRA_FILES)) From 8ccfa660d583a72e1388b8092faee7307501580a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2024 18:31:11 -0500 Subject: [PATCH 5/5] simplify sbox_gra filename; add .knarcorder --- files/data/sbox_gra.mk | 11 ++++------- files/data/sbox_gra/.gitignore | 1 + files/data/sbox_gra/.knarcorder | 2 ++ .../{sbox_gra_00000001.png => sbox_gra.png} | Bin src/touchscreen_list_menu.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 files/data/sbox_gra/.knarcorder rename files/data/sbox_gra/{sbox_gra_00000001.png => sbox_gra.png} (100%) diff --git a/files/data/sbox_gra.mk b/files/data/sbox_gra.mk index e7ae521ba..8e2df127d 100644 --- a/files/data/sbox_gra.mk +++ b/files/data/sbox_gra.mk @@ -2,14 +2,11 @@ SBOX_GRA_DIR := files/data/sbox_gra SBOX_GRA_NARC := $(SBOX_GRA_DIR).narc SBOX_GRA_FILES := \ - sbox_gra_00000000.NCLR \ - sbox_gra_00000001.NCGR + sbox_gra.NCLR \ + sbox_gra.NCGR -4BPP_NOPAD_PCMP_NCLR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000000.NCLR -VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000001.NCGR - -$(SBOX_GRA_DIR)/sbox_gra_00000000.NCLR: $(SBOX_GRA_DIR)/sbox_gra_00000001.png - $(GFX) $< $@ $(GFX_FLAGS) +4BPP_NOPAD_PCMP_NCLR_FILES += $(SBOX_GRA_DIR)/sbox_gra.NCLR +VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra.NCGR $(SBOX_GRA_NARC): $(addprefix $(SBOX_GRA_DIR)/,$(SBOX_GRA_FILES)) diff --git a/files/data/sbox_gra/.gitignore b/files/data/sbox_gra/.gitignore index 11b7e7e2a..574e26f1d 100644 --- a/files/data/sbox_gra/.gitignore +++ b/files/data/sbox_gra/.gitignore @@ -1 +1,2 @@ *.NCGR +*.NCLR diff --git a/files/data/sbox_gra/.knarcorder b/files/data/sbox_gra/.knarcorder new file mode 100644 index 000000000..75e892cd2 --- /dev/null +++ b/files/data/sbox_gra/.knarcorder @@ -0,0 +1,2 @@ +sbox_gra.NCLR +sbox_gra.NCGR diff --git a/files/data/sbox_gra/sbox_gra_00000001.png b/files/data/sbox_gra/sbox_gra.png similarity index 100% rename from files/data/sbox_gra/sbox_gra_00000001.png rename to files/data/sbox_gra/sbox_gra.png diff --git a/src/touchscreen_list_menu.c b/src/touchscreen_list_menu.c index 0b2e0283f..41eed71ba 100644 --- a/src/touchscreen_list_menu.c +++ b/src/touchscreen_list_menu.c @@ -33,9 +33,9 @@ TouchscreenListMenuSpawner *TouchscreenListMenuSpawner_Create(HeapID heapId, Pal TouchscreenListMenuSpawner *ret = AllocFromHeap(heapId, sizeof(TouchscreenListMenuSpawner)); MI_CpuClear8(ret, sizeof(TouchscreenListMenuSpawner)); ret->heapId = heapId; - ret->charDataRaw = GfGfxLoader_LoadFromNarc(NARC_data_sbox_gra, NARC_sbox_gra_sbox_gra_00000001_NCGR, FALSE, heapId, FALSE); + ret->charDataRaw = GfGfxLoader_LoadFromNarc(NARC_data_sbox_gra, NARC_sbox_gra_sbox_gra_NCGR, FALSE, heapId, FALSE); NNS_G2dGetUnpackedBGCharacterData(ret->charDataRaw, &ret->pCharData); - ret->plttDataRaw = GfGfxLoader_LoadFromNarc(NARC_data_sbox_gra, NARC_sbox_gra_sbox_gra_00000000_NCLR, FALSE, heapId, FALSE); + ret->plttDataRaw = GfGfxLoader_LoadFromNarc(NARC_data_sbox_gra, NARC_sbox_gra_sbox_gra_NCLR, FALSE, heapId, FALSE); NNS_G2dGetUnpackedPaletteData(ret->plttDataRaw, &ret->pPlttData); ret->paletteData = paletteData; return ret;