Merge pull request #354 from pret/hotfix/sbox_gra

Add rule to build sbox_gra_00000000.NCLR
pret · Nov 14, 2024 · 9bba6cc · 9bba6cc
2 parents 16624cf + 8af4788
commit 9bba6cc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/files/data/sbox_gra.mk b/files/data/sbox_gra.mk
@@ -2,10 +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
 
-VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000001.NCGR
+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
@@ -1 +1,2 @@
 *.NCGR
+*.NCLR
diff --git a/files/data/sbox_gra/.knarcorder 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 → files/data/sbox_gra/sbox_gra.png b/files/data/sbox_gra/sbox_gra_00000001.png → files/data/sbox_gra/sbox_gra.png
diff --git a/files/data/sbox_gra/sbox_gra_00000000.NCLR b/files/data/sbox_gra/sbox_gra_00000000.NCLR
diff --git 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;