WIP unpack titledemo.narc

platinum.us/filesys.csv

@@ -329,7 +329,7 @@ res/prebuilt/particledata/pl_etc/pl_etc_particle.narc,/particledata/pl_etc/pl_et
 res/prebuilt/contest/graphic/contest_bg.narc,/contest/graphic/contest_bg.narc
 res/prebuilt/contest/graphic/contest_obj.narc,/contest/graphic/contest_obj.narc
 res/prebuilt/demo/title/op_demo.narc,/demo/title/op_demo.narc
-res/prebuilt/demo/title/titledemo.narc,/demo/title/titledemo.narc
+res/graphics/title_screen/titledemo.narc,/demo/title/titledemo.narc
 res/field/trades/fld_trade.narc,/fielddata/pokemon_trade/fld_trade.narc
 res/prebuilt/resource/eng/zukan/zukan.narc,/resource/eng/zukan/zukan.narc
 res/prebuilt/resource/eng/batt_rec/batt_rec_gra.narc,/resource/eng/batt_rec/batt_rec_gra.narc

platinum.us/filesys.sha1

@@ -328,7 +328,7 @@ ecdb14e0bc6619f114549e6126c8b6934cfc3aeb *res/prebuilt/battle/b_pl_stage/pl_bsdp
 8e3c5c332cff4ae218ce746e59b9221e229d382c *res/prebuilt/contest/graphic/contest_bg.narc
 cec363028fa6bc6240f9c8da7ab8f9e8bb1b1465 *res/prebuilt/contest/graphic/contest_obj.narc
 7fa87d90ba039f67221a43782bf6a1a1107d5947 *res/prebuilt/demo/title/op_demo.narc
-d7e86fadf59a54f922fc7cf65ae65fa326b8429e *res/prebuilt/demo/title/titledemo.narc
+d7e86fadf59a54f922fc7cf65ae65fa326b8429e *res/graphics/title_screen/titledemo.narc
 32a0989a18cc7f3eb17c5949adecb3f057a84eea *res/field/trades/fld_trade.narc
 d4b6f9731b808a613338005f59959325ce1e3ac9 *res/prebuilt/resource/eng/zukan/zukan.narc
 7e85af57b27fa4a0829b24550fc6c0dd275cf994 *res/prebuilt/resource/eng/batt_rec/batt_rec_gra.narc

res/graphics/meson.build

@@ -3,3 +3,4 @@ subdir('pokemon_summary_screen')
 subdir('shop_menu')
 subdir('signposts')
 subdir('windows')
+subdir('title_screen')

res/graphics/title_screen/gf_presents.pal

@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+0 0 0
+16 16 16
+32 32 32
+49 49 49
+74 74 74
+90 90 90
+106 106 106
+123 123 123
+148 148 148
+164 164 164
+180 180 180
+205 205 205
+222 222 222
+238 238 238
+255 255 255
+0 0 0
+0 0 0
+16 16 16
+32 32 32
+49 49 49
+74 74 74
+90 90 90
+106 106 106
+123 123 123
+148 148 148
+164 164 164
+180 180 180
+205 205 205
+222 222 222
+238 238 238
+255 255 255
+0 0 0
+222 16 16
+222 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

res/graphics/title_screen/meson.build

@@ -0,0 +1,100 @@
+pngs_4bpp = files([
+    'bottom_screen_border.png',
+    'top_screen_border.png',
+    'copyright.png',
+])
+pngs_8bpp = files([
+    'logo.png',
+    'logo_jp.png'
+])
+
+png_gf_presents = files('gf_presents.png')
+pal_gf_presents = files('gf_presents.pal')
+
+ncgrs_4bpp = ncgr_gen.process(pngs_4bpp,
+    extra_args: [ '-sopc', '-version101', ],
+)
+
+ncgrs_8bpp = ncgr_gen.process(pngs_8bpp,
+    extra_args: [ '-sopc', '-version101', '-bitdepth', '8', ],
+)
+
+ncgr_gf_presents = ncgr_gen.process(png_gf_presents,
+    extra_args: [ '-sopc', '-version101', ],
+)
+
+nclrs_4bpp = nclr_gen.process(pngs_4bpp,
+    extra_args: [ '-bitdepth', '4', '-invertsize', ],
+)
+
+nclrs_8bpp = nclr_gen.process(pngs_8bpp,
+    extra_args: [ '-bitdepth', '8', '-invertsize', ],
+)
+
+nclr_gf_presents = nclr_gen.process(pal_gf_presents,
+    extra_args: [ '-bitdepth', '4', ],
+)
+
+tilemaps = copy_gen.process(files([
+    'bottom_screen_border.NSCR',
+    'bottom_screen_border_2.NSCR',
+    'top_screen_border.NSCR',
+    'top_screen_border_2.NSCR',
+    'copyright.NSCR',
+    'gf_presents.NSCR',
+    'logo.NSCR',
+    'logo_jp.NSCR'
+]))
+
+models = copy_gen.process(files([
+    'giratina.nsbmd',
+    'giratina_face.nsbmd',
+    'giratina_portal.nsbmd'
+]))
+
+anims = copy_gen.process(files([
+    'giratina.nsbca',
+    'giratina_face.nsbca',
+    'giratina_portal.nsbca'
+]))
+
+tex_anims = copy_gen.process(files([
+    'giratina.nsbta',
+    'giratina_portal.nsbta'
+]))
+
+mat_anims = copy_gen.process(files([
+    'giratina_face.nsbma',
+]))
+
+titledemo_order = files('titledemo.order')
+titledemo_narc = custom_target('titledemo.narc',
+    output: [
+        'titledemo.narc',
+        'titledemo.naix.h',
+    ],
+    input: [
+        ncgrs_4bpp,
+        ncgrs_8bpp,
+        nclrs_4bpp,
+        nclrs_8bpp,
+        nclr_gf_presents,
+        ncgr_gf_presents,
+        tilemaps,
+        titledemo_order,
+        models,
+        anims,
+        tex_anims,
+        mat_anims,
+    ],
+    command: [
+        narc_exe, 'create',
+        '--naix',
+        '--order', titledemo_order,
+        '--output', '@OUTPUT0@',
+        '@PRIVATE_DIR@',
+    ]
+)
+
+nitrofs_files += titledemo_narc
+naix_headers += titledemo_narc[1]

res/graphics/title_screen/titledemo.order

@@ -0,0 +1,29 @@
+giratina.nsbta
+giratina.nsbmd
+giratina.nsbca
+gf_presents.NSCR
+gf_presents.NCLR
+gf_presents.NCGR
+bottom_screen_border.NCLR
+top_screen_border.NCLR
+logo_jp.NCLR
+logo_jp.NCGR
+logo_jp.NSCR
+logo.NCLR
+logo.NCGR
+copyright.NSCR
+copyright.NCLR
+copyright.NCGR
+giratina_portal.nsbmd
+giratina_portal.nsbta
+giratina_portal.nsbca
+giratina_face.nsbmd
+giratina_face.nsbma
+giratina_face.nsbca
+logo.NSCR
+top_screen_border.NCGR
+top_screen_border.NSCR
+top_screen_border_2.NSCR
+bottom_screen_border.NCGR
+bottom_screen_border.NSCR
+bottom_screen_border_2.NSCR

res/prebuilt/demo/title/meson.build

@@ -1,6 +1,6 @@
 prebuilt_files = [
     'op_demo.narc',
-    'titledemo.narc'
+    # 'titledemo.narc'
 ]
 
 foreach f : prebuilt_files

src/overlay077/ov77_021D0D80.c

@@ -932,8 +932,8 @@ static void ov77_021D1CC0(BgConfig *param0, int param1)
         Bg_InitFromTemplate(param0, BG_LAYER_SUB_1, &v0, 0);
     }
 
-    Graphics_LoadTilesToBgLayer(NARC_INDEX_DEMO__TITLE__TITLEDEMO, 23, param0, 5, 0, 0, 0, param1);
-    Graphics_LoadTilemapToBgLayer(NARC_INDEX_DEMO__TITLE__TITLEDEMO, 25, param0, 5, 0, 0, 0, param1);
+    Graphics_LoadTilesToBgLayer(NARC_INDEX_DEMO__TITLE__TITLEDEMO, 23, param0, BG_LAYER_SUB_1, 0, 0, 0, param1);
+    Graphics_LoadTilemapToBgLayer(NARC_INDEX_DEMO__TITLE__TITLEDEMO, 25, param0, BG_LAYER_SUB_1, 0, 0, 0, param1);
 
     G2_BlendNone();
     G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG3, 10, 10);