Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add rule to build sbox_gra_00000000.NCLR #354

Merged
merged 7 commits into from
Nov 14, 2024
Merged

Add rule to build sbox_gra_00000000.NCLR #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6f7abf
Add rule to build sbox_gra_00000000.NCLR
PikalaxALT Nov 10, 2024
e79e1c3
Delete files/data/sbox_gra/sbox_gra_00000000.NCLR
PikalaxALT Nov 10, 2024
1fde0d5
Update sbox_gra.mk
PikalaxALT Nov 10, 2024
5e4f00b
this rule needs to be explicit
PikalaxALT Nov 10, 2024
8ccfa66
simplify sbox_gra filename; add .knarcorder
PikalaxALT Nov 11, 2024
6e4c030
Merge branch 'master' into hotfix/sbox_gra
adrienntindall Nov 14, 2024
8af4788
Merge branch 'master' into hotfix/sbox_gra
adrienntindall Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions files/data/sbox_gra.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
1 change: 1 addition & 0 deletions files/data/sbox_gra/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.NCGR
*.NCLR
2 changes: 2 additions & 0 deletions files/data/sbox_gra/.knarcorder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sbox_gra.NCLR
sbox_gra.NCGR
0 files/data/sbox_gra/sbox_gra_00000001.png → files/data/sbox_gra/sbox_gra.png
View file
Open in desktop
File renamed without changes
Binary file removed files/data/sbox_gra/sbox_gra_00000000.NCLR
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/touchscreen_list_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down