Add script to repack ppark.narc, delete res/prebuilt/arc/ppark.narc

pret · Jan 12, 2025 · c3328af · c3328af
1 parent f4659a7
commit c3328af
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 3 deletions.
diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1
@@ -291,7 +291,7 @@ adcb9634923530fd7f217a131a3949f556f4f324 *res/prebuilt/arc/email_gra.narc
 0832d441d7e543e14d68e9df7e9118b472d67833 *res/field/encounters/encdata_ex.narc
 d534f791217a311610812b18ef674a326ecdd2ac *res/prebuilt/arc/manene.narc
 ad5fefc4758eba86f6f647e506531d6cfe9c9ce5 *res/prebuilt/arc/plgym_ghost.narc
-89b24d0c67f2cb089800613d5a0254a124d98ba6 *res/prebuilt/arc/ppark.narc
+89b24d0c67f2cb089800613d5a0254a124d98ba6 *res/pokemon/ppark.narc
 9b0b19798338e63d907a95c35be4b302778192f1 *res/prebuilt/arc/ship_demo.narc
 91559385ad608514630650e1f1e94206048bc3a8 *res/prebuilt/arc/ship_demo_pl.narc
 114d4f20de27a95ad930b246bb6f62a6d7295fe5 *res/prebuilt/arc/tv.narc

diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf
@@ -447,7 +447,13 @@ RomSpec
 	HostRoot res/prebuilt
 	File arc/manene.narc
 	File arc/plgym_ghost.narc
-	File arc/ppark.narc
+
+	Root /arc
+	HostRoot res/pokemon
+	File ppark.narc
+
+	Root /
+	HostRoot res/prebuilt
 	File arc/ship_demo.narc
 	File arc/ship_demo_pl.narc
 	File arc/tv.narc

diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build
@@ -838,6 +838,20 @@ gen_species_headers = custom_target('gen_species_headers',
     ]
 )
 
+ppark_narc = custom_target('ppark.narc',
+    output: 'ppark.narc',
+    input: personal_files,
+    env: json2bin_env,
+    depends: [ py_consts_generators ],
+    command: [
+        catching_show_data_py,
+        '--narc', narc_exe,
+        '--source-dir', '@CURRENT_SOURCE_DIR@',
+        '--private-dir', '@PRIVATE_DIR@',
+        '--output-dir', '@OUTDIR@',
+    ]
+)
+
 nitrofs_files += pl_personal_narc
 nitrofs_files += evo_narc
 nitrofs_files += pl_poke_icon_narc
@@ -851,3 +865,4 @@ nitrofs_files += shinzukan_narc
 nitrofs_files += pl_growtbl_narc
 nitrofs_files += pokedex_data_narc
 nitrofs_files += pokedex_data_giratina_altered_narc
+nitrofs_files += ppark_narc
diff --git a/res/prebuilt/arc/meson.build b/res/prebuilt/arc/meson.build
@@ -8,7 +8,6 @@ prebuilt_files = [
     'email_gra.narc',
     'manene.narc',
     'plgym_ghost.narc',
-    'ppark.narc',
     'ship_demo_pl.narc',
     'ship_demo.narc',
     'tv.narc'

diff --git a/res/prebuilt/arc/ppark.narc b/res/prebuilt/arc/ppark.narc
diff --git a/tools/json2bin/catching_show_data.py b/tools/json2bin/catching_show_data.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+import pathlib
+import json2bin as j2b
+
+from consts import (
+    species,
+    catching_show
+)
+
+def parse_catching_show_data(cs_data: dict, _size: int, _consts: type = None) -> bytes:
+    binary = bytearray([])
+    binary.extend(j2b.parse_int(cs_data['catching_points'], 1))
+    binary.extend(j2b.parse_int(cs_data['rarity'], 1))
+    binary.extend(j2b.parse_int(cs_data['unused'], 2))
+    return binary
+
+
+SCHEMA = j2b.Parser() \
+    .register('catching_show_data.pal_park_land_area', 1, j2b.parse_const, catching_show.PalParkLandArea) \
+    .register('catching_show_data.pal_park_water_area', 1, j2b.parse_const, catching_show.PalParkWaterArea) \
+    .register('catching_show_data', 1, parse_catching_show_data)
+
+
+def indexer(file_path: pathlib.Path) -> int:
+    name = file_path.parent.stem.upper()
+    return species.PokemonSpecies[f'SPECIES_{name}'].value
+
+
+args = j2b.ARGPARSER.parse_args()
+j2b.json2bin(args.source_dir,
+             SCHEMA,
+             args.private_dir,
+             args.output_dir,
+             indexer,
+             glob_pattern='**/data.json',
+             narc_name='ppark',
+             narc_packer=args.narc,
+             output_mode=j2b.OutputMode.SINGLE_FILE,
+             skip_stems=['forms', '000', 'bad_egg', 'egg'])
diff --git a/tools/json2bin/meson.build b/tools/json2bin/meson.build
@@ -17,3 +17,4 @@ encdata_ex_elusive_rod_py = find_program('encdata_ex_elusive_rod.py', native: tr
 encdata_ex_honey_trees_py = find_program('encdata_ex_honey_trees.py', native: true)
 encdata_ex_trophy_garden_py = find_program('encdata_ex_trophy_garden.py', native: true)
 encdata_ex_great_marsh_py = find_program('encdata_ex_great_marsh.py', native: true)
+catching_show_data_py = find_program('catching_show_data.py', native: true)