diff --git a/res/pokemon/.shared/icon_palette.NCLR b/res/pokemon/.shared/icon_palette.NCLR deleted file mode 100644 index 7a085a4bd4..0000000000 Binary files a/res/pokemon/.shared/icon_palette.NCLR and /dev/null differ diff --git a/res/pokemon/.shared/pl_poke_icon.pal b/res/pokemon/.shared/pl_poke_icon.pal new file mode 100644 index 0000000000..184104edc3 --- /dev/null +++ b/res/pokemon/.shared/pl_poke_icon.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +74 156 57 +131 131 115 +189 189 189 +255 255 255 +189 164 65 +246 246 41 +213 98 65 +246 148 41 +139 123 255 +98 74 205 +238 115 156 +255 180 164 +164 197 255 +106 172 156 +98 98 90 +65 65 65 +90 139 205 +115 115 115 +189 189 189 +255 255 255 +123 156 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 90 +246 230 41 +246 246 172 +213 213 106 +230 74 41 +98 98 90 +65 65 65 +98 156 131 +123 123 123 +189 189 180 +255 255 255 +115 115 205 +164 172 246 +180 131 90 +238 197 139 +197 172 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +189 41 156 +98 98 90 +65 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build index a930de7c76..32155ee4e5 100644 --- a/res/pokemon/meson.build +++ b/res/pokemon/meson.build @@ -9,7 +9,7 @@ otherpoke_index = {} # otherpoke uses a unique, non-uniform structure # pl_poke_icon has some shared files that are listed at the beginning # of the NARC. poke_icon_shared = files( - '.shared/icon_palette.NCLR', + '.shared/pl_poke_icon.pal', '.shared/pl_poke_icon_anim_01.json', '.shared/pl_poke_icon_cell_01.json', '.shared/pl_poke_icon_anim_02.json', diff --git a/tools/scripts/make_pl_poke_icon.py b/tools/scripts/make_pl_poke_icon.py index a43fe8bec6..e31778653a 100644 --- a/tools/scripts/make_pl_poke_icon.py +++ b/tools/scripts/make_pl_poke_icon.py @@ -36,7 +36,7 @@ bin_dest_dir = private_dir / 'pl_poke_icon_work' bin_dest_dir.mkdir(parents=True, exist_ok=True) -shutil.copy(shared_dir / 'icon_palette.NCLR', bin_dest_dir / '0000.NCLR') +subprocess.run([args.nitrogfx, shared_dir / 'pl_poke_icon.pal', bin_dest_dir / '0000.NCLR', '-bitdepth', '4']) for i in range(3): anim_file_src = shared_dir / f'pl_poke_icon_anim_{i+1:02}.json'