Skip to content

Commit

Permalink
extract sbox_gra.narc; static methods
Browse files Browse the repository at this point in the history
  • Loading branch information
PikalaxALT committed Oct 20, 2024
1 parent 7fbde01 commit bf6459f
Show file tree
Hide file tree
Showing 11 changed files with 142 additions and 117 deletions.
2 changes: 2 additions & 0 deletions files/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ a/1/4/1
a/1/5/0
a/1/5/2
a/1/6/3
a/1/6/5
a/1/6/9
a/1/7/2
a/1/7/4
Expand Down Expand Up @@ -80,4 +81,5 @@ graphic/camera_viewfinder.narc
application/guinness.narc
demo/intro/intro.narc
data/namein.narc
data/sbox_gra.narc
*.NCLR
Binary file removed files/a/1/6/5
Binary file not shown.
17 changes: 17 additions & 0 deletions files/data/sbox_gra.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
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

VERSION101_SOPC_NCGR_FILES += $(SBOX_GRA_DIR)/sbox_gra_00000001.NCGR

$(SBOX_GRA_NARC): $(addprefix $(SBOX_GRA_DIR)/,$(SBOX_GRA_FILES))

clean-sbox-gra:
$(RM) $(SBOX_GRA_NARC) $(addprefix $(SBOX_GRA_DIR)/,$(SBOX_GRA_FILES))

.PHONY: clean-sbox-gra
clean-filesystem: clean-sbox-gra

1 change: 1 addition & 0 deletions files/data/sbox_gra/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.NCGR
1 change: 1 addition & 0 deletions files/data/sbox_gra/.knarcignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.png
Binary file added files/data/sbox_gra/sbox_gra_00000000.NCLR
Binary file not shown.
Binary file added files/data/sbox_gra/sbox_gra_00000001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions filesystem.mk
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ $(eval $(call arc_strip_name,files/fielddata/tsurepoke/tp_param.narc,files/a/1/4
$(eval $(call arc_strip_name,files/fielddata/graphic/preview_graphic/preview_graphic.narc,files/a/1/5/0))
$(eval $(call arc_strip_name,files/system/touch_subwindow.narc,files/a/1/5/2))
$(eval $(call arc_strip_name,files/data/gs_areawindow.narc,files/a/1/6/3))
$(eval $(call arc_strip_name,files/data/sbox_gra.narc,files/a/1/6/5))
$(eval $(call arc_strip_name,files/poketool/personal/performance.narc,files/a/1/6/9))
$(eval $(call arc_strip_name,files/application/annon/puzzle_gra.narc,files/a/1/7/2))
$(eval $(call arc_strip_name,files/demo/legend.narc,files/a/1/7/4))
Expand Down Expand Up @@ -521,6 +522,7 @@ include files/graphic/camera_viewfinder.mk
include files/application/guinness.mk
include files/demo/intro/intro.mk
include files/data/namein.mk
include files/data/sbox_gra.mk

$(filter-out $(DIFF_ARCS) $(FS_RULE_OVERRIDES),$(NITROFS_FILES)): ;

Expand Down
2 changes: 1 addition & 1 deletion include/filesystem_files_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ typedef enum NarcId {
NARC_a_1_6_2 = 162,
NARC_data_gs_areawindow = 163,
NARC_a_1_6_4 = 164,
NARC_a_1_6_5 = 165,
NARC_data_sbox_gra = 165,
NARC_a_1_6_6 = 166,
NARC_a_1_6_7 = 167,
NARC_a_1_6_8 = 168,
Expand Down
16 changes: 8 additions & 8 deletions include/unk_02018424.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "touchscreen.h"

typedef struct Ov122_021E9282 {
u8 unk0_0 : 1;
u8 unk0_1 : 7;
u8 wrapAround : 1;
u8 unk0_1 : 7;
u8 unk1;
u8 bgId;
u8 plttOffset;
Expand Down Expand Up @@ -46,15 +46,15 @@ struct UnkStruct_020185FC {
Ov122_021E7488 unk_04;
Window *windows;
TouchscreenHitbox *touchscreenHitboxes;
u8 unk_24;
u8 unk_25;
u8 cursorPos;
u8 animActive;
u8 width;
u8 unk_27_0 : 1;
u8 unk_27_1 : 7;
u8 silent : 1;
u8 isTouch : 7;
u8 x;
u8 y;
u8 unk_2A;
u8 unk_2B;
u8 selection;
u8 animTimer;
HeapID heapId;
UnkFunc_020185FC callback;
void *callbackArg;
Expand Down
Loading

0 comments on commit bf6459f

Please sign in to comment.