more renaming; dump a/1/7/5 1st pass

asm/include/overlay_01_021E7FDC.inc

@@ -4,8 +4,8 @@
 .public NARC_Delete
 .public GfGfxLoader_LoadFromOpenNarc
 .public CreateSpriteResourcesHeader
-.public sub_02009E84
+.public SpriteResourceHeaderList_Create
-.public sub_02009F24
+.public SpriteResourceHeaderList_Destroy
 .public G2dRenderer_Init
 .public Create2DGfxResObjMan
 .public Destroy2DGfxResObjMan

asm/include/unk_0200CF18.inc

@@ -5,8 +5,8 @@
 .public NARC_Delete
 .public GfGfxLoader_LoadFromOpenNarc
 .public CreateSpriteResourcesHeader
-.public sub_02009E84
+.public SpriteResourceHeaderList_Create
-.public sub_02009F24
+.public SpriteResourceHeaderList_Destroy
 .public G2dRenderer_Init
 .public Create2DGfxResObjMan
 .public Destroy2DGfxResObjMan

asm/overlay_01_021E7FDC.s

@@ -208,7 +208,7 @@ _021E811A:
 	ldr r2, [r5, r2]
 	ldr r3, [r5, r3]
 	add r1, r4, #0
-	bl sub_02009E84
+	bl SpriteResourceHeaderList_Create
 	mov r1, #0x4b
 	lsl r1, r1, #2
 	str r0, [r5, r1]
@@ -232,7 +232,7 @@ ov01_021E8194: ; 0x021E8194
 	mov r0, #0x4b
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
-	bl sub_02009F24
+	bl SpriteResourceHeaderList_Destroy
 	mov r0, #0x52
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]

asm/overlay_53.s

@@ -5563,7 +5563,14 @@ ov53_021E86F0: ; 0x021E86F0
 	; file boundary
 
 ov53_021E8740: ; 0x021E8740
-	.byte 0x1A, 0x00, 0x1B, 0x00, 0x19, 0x00, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x00, 0x00, 0x00
+	.short 0x001A  // NARC_resdat_resdat_00000026
+	.short 0x001B  // NARC_resdat_resdat_00000027
+	.short 0x0019  // NARC_resdat_resdat_00000025
+	.short 0x0018  // NARC_resdat_resdat_00000024
+	.short 0xFFFF
+	.short 0xFFFF
+	.short 0x004E  // NARC_resdat_resdat_00000078
+	.balign 4, 0
 
 ov53_021E8750: ; 0x021E8750
 	.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00

asm/overlay_54.s

@@ -2361,8 +2361,14 @@ _021E6C30:
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00
 
 ov54_021E6C38: ; 0x021E6C38
-	.byte 0x16, 0x00, 0x17, 0x00, 0x15, 0x00, 0x14, 0x00
+	.short 0x0016  // NARC_resdat_resdat_00000022
-	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x4D, 0x00, 0x00, 0x00
+	.short 0x0017  // NARC_resdat_resdat_00000023
+	.short 0x0015  // NARC_resdat_resdat_00000021
+	.short 0x0014  // NARC_resdat_resdat_00000020
+	.short 0xFFFF
+	.short 0xFFFF
+	.short 0x004D  // NARC_resdat_resdat_00000077
+	.balign 4, 0
 
 ov54_021E6C48: ; 0x021E6C48
 	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

asm/unk_0207EB24.s

@@ -1137,7 +1137,14 @@ _0207F428: .word 0x00000836
 	.rodata
 
 _021018B4:
-	.short 0x0032, 0x0033, 0x0031, 0x0030, 0xFFFF, 0xFFFF, 0x0054, 0x0000
+	.short 0x0032  // NARC_resdat_resdat_00000050
+	.short 0x0033  // NARC_resdat_resdat_00000051
+	.short 0x0031  // NARC_resdat_resdat_00000049
+	.short 0x0030  // NARC_resdat_resdat_00000048
+	.short 0xFFFF
+	.short 0xFFFF
+	.short 0x0054  // NARC_resdat_resdat_00000084
+	.balign 4, 0
 _021018C4:
 	.byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
 	.byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00

asm/unk_0208B1AC.s

@@ -2301,13 +2301,13 @@ _0208C3E0: .word 0x0000050C
 
 	.rodata
 _02103A2C:
-	.short 0x0036
+	.short 0x0036  // NARC_resdat_resdat_00000054
-	.short 0x0037
+	.short 0x0037  // NARC_resdat_resdat_00000055
-	.short 0x0035
+	.short 0x0035  // NARC_resdat_resdat_00000053
-	.short 0x0034
+	.short 0x0034  // NARC_resdat_resdat_00000052
 	.short 0xFFFF
 	.short 0xFFFF
-	.short 0x0055
+	.short 0x0055  // NARC_resdat_resdat_00000085
 	.balign 4, 0
 _02103A3C:
 	.byte 0x73, 0x00, 0x00, 0x00

files/.gitignore

@@ -33,6 +33,7 @@ a/1/4/1
 a/1/6/3
 a/1/6/9
 a/1/7/2
+a/1/7/5
 a/1/8/5
 a/1/9/4
 a/1/9/5
@@ -54,3 +55,4 @@ resource/eng/pms_aikotoba/pms_aikotoba.narc
 data/mmodel/mmodel.narc
 data/mushi/mushi_*.bin
 fielddata/tsurepoke/tp_param.narc
+data/resdat.narc

files/data/resdat.mk

@@ -0,0 +1,8 @@
+DATA_RESDAT_DIR = files/data/resdat
+DATA_RESDAT_NARC = $(DATA_RESDAT_DIR).narc
+
+# temp
+DATA_RESDAT_BIN = $(wildcard $(DATA_RESDAT_DIR)/*.bin)
+
+$(DATA_RESDAT_NARC): $(DATA_RESDAT_BIN)
+	$(KNARC) -d $(DATA_RESDAT_DIR) -p $@ -i