diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 27012f1e5..f12ad71be 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -218,7 +218,7 @@ e22f0296444ce01e0b7619f73a8cf2016b2307b4 *res/prebuilt/graphic/oekaki.narc dd0663e46347230d1d1b9eb8b583cee9acc10f31 *res/prebuilt/graphic/pl_bag_gra.narc 0929061d78710595aa53796ecffe3545f8406d82 *res/fonts/pl_font.narc d397dbd087737151aa8bea242016c626afb55fa5 *res/prebuilt/graphic/pl_plist_gra.narc -883e6afb310f0ab02c26f2026cba1c76210bb3ac *res/prebuilt/graphic/pl_pst_gra.narc +883e6afb310f0ab02c26f2026cba1c76210bb3ac *res/graphics/pokemon_summary_screen/pl_pst_gra.narc c16faeeeee494830c720d1f795a141cacfe49121 *res/prebuilt/graphic/pl_wifinote.narc 298fd1d0ab31efd35cb00b977f69eacbfb8a8da8 *res/graphics/windows/pl_winframe.narc b9f77b38cc07a6754fc00a7c1830d86c88d45aa6 *res/prebuilt/graphic/plist_gra.narc diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index bc0c93446..32007d29b 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -329,7 +329,13 @@ RomSpec Root / HostRoot res/prebuilt File graphic/pl_plist_gra.narc - File graphic/pl_pst_gra.narc + + Root /graphic/ + HostRoot res/graphics/pokemon_summary_screen + File pl_pst_gra.narc + + Root / + HostRoot res/prebuilt File graphic/pl_wifinote.narc Root /graphic diff --git a/res/graphics/meson.build b/res/graphics/meson.build index 45198f727..bf69ba75e 100644 --- a/res/graphics/meson.build +++ b/res/graphics/meson.build @@ -1,3 +1,4 @@ subdir('options_menu') +subdir('pokemon_summary_screen') subdir('signposts') subdir('windows') diff --git a/res/graphics/pokemon_summary_screen/a_button.png b/res/graphics/pokemon_summary_screen/a_button.png new file mode 100644 index 000000000..749cb4dd4 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/a_button.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/balls_0.pal b/res/graphics/pokemon_summary_screen/balls/balls_0.pal new file mode 100644 index 000000000..6976b8c9a --- /dev/null +++ b/res/graphics/pokemon_summary_screen/balls/balls_0.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +106 131 98 +74 65 57 +246 255 255 +230 230 205 +255 164 156 +255 106 98 +213 65 57 +238 164 238 +197 106 238 +164 74 205 +255 238 148 +255 205 74 +255 172 41 +139 131 123 +189 189 164 +106 98 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/balls/balls_1.pal b/res/graphics/pokemon_summary_screen/balls/balls_1.pal new file mode 100644 index 000000000..1ae84ffbb --- /dev/null +++ b/res/graphics/pokemon_summary_screen/balls/balls_1.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +106 131 98 +74 65 57 +246 255 255 +230 230 205 +156 213 213 +106 197 189 +65 156 148 +180 197 98 +98 189 106 +65 139 65 +255 197 164 +205 164 131 +172 131 98 +156 148 139 +189 189 164 +106 98 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/balls/balls_2.pal b/res/graphics/pokemon_summary_screen/balls/balls_2.pal new file mode 100644 index 000000000..90a2049c2 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/balls/balls_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +106 131 98 +74 65 57 +246 255 255 +230 230 205 +255 164 156 +255 106 98 +213 65 57 +180 189 213 +123 131 255 +90 98 205 +255 238 148 +255 205 74 +255 172 41 +139 131 123 +189 189 164 +106 98 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/balls/balls_3.pal b/res/graphics/pokemon_summary_screen/balls/balls_3.pal new file mode 100644 index 000000000..8127c84bf --- /dev/null +++ b/res/graphics/pokemon_summary_screen/balls/balls_3.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +90 180 213 +74 65 57 +255 255 255 +255 246 172 +246 197 213 +238 148 189 +131 115 164 +213 255 156 +139 213 106 +65 156 65 +255 222 246 +246 156 90 +255 90 8 +156 131 255 +213 205 156 +98 98 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/balls/cherish_ball.png b/res/graphics/pokemon_summary_screen/balls/cherish_ball.png new file mode 100644 index 000000000..516785b81 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/cherish_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/dive_ball.png b/res/graphics/pokemon_summary_screen/balls/dive_ball.png new file mode 100644 index 000000000..7a38483fa Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/dive_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/dusk_ball.png b/res/graphics/pokemon_summary_screen/balls/dusk_ball.png new file mode 100644 index 000000000..167c5a6a9 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/dusk_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/great_ball.png b/res/graphics/pokemon_summary_screen/balls/great_ball.png new file mode 100644 index 000000000..3cb32a3e5 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/great_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/heal_ball.png b/res/graphics/pokemon_summary_screen/balls/heal_ball.png new file mode 100644 index 000000000..1557fe55b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/heal_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/luxury_ball.png b/res/graphics/pokemon_summary_screen/balls/luxury_ball.png new file mode 100644 index 000000000..b55a148bc Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/luxury_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/master_ball.png b/res/graphics/pokemon_summary_screen/balls/master_ball.png new file mode 100644 index 000000000..ab2b9704c Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/master_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/nest_ball.png b/res/graphics/pokemon_summary_screen/balls/nest_ball.png new file mode 100644 index 000000000..de986424a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/nest_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/net_ball.png b/res/graphics/pokemon_summary_screen/balls/net_ball.png new file mode 100644 index 000000000..1064f6a47 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/net_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/poke_ball.png b/res/graphics/pokemon_summary_screen/balls/poke_ball.png new file mode 100644 index 000000000..1ef8b7177 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/poke_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/premier_ball.png b/res/graphics/pokemon_summary_screen/balls/premier_ball.png new file mode 100644 index 000000000..97a27844a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/premier_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/quick_ball.png b/res/graphics/pokemon_summary_screen/balls/quick_ball.png new file mode 100644 index 000000000..13f907a84 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/quick_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/repeat_ball.png b/res/graphics/pokemon_summary_screen/balls/repeat_ball.png new file mode 100644 index 000000000..b8666d028 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/repeat_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/safari_ball.png b/res/graphics/pokemon_summary_screen/balls/safari_ball.png new file mode 100644 index 000000000..06255499a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/safari_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/timer_ball.png b/res/graphics/pokemon_summary_screen/balls/timer_ball.png new file mode 100644 index 000000000..5feef7a9a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/timer_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/balls/ultra_ball.png b/res/graphics/pokemon_summary_screen/balls/ultra_ball.png new file mode 100644 index 000000000..2269447b1 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/balls/ultra_ball.png differ diff --git a/res/graphics/pokemon_summary_screen/condition_arrow.png b/res/graphics/pokemon_summary_screen/condition_arrow.png new file mode 100644 index 000000000..f311797d1 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/condition_arrow.png differ diff --git a/res/graphics/pokemon_summary_screen/condition_arrow_anim.json b/res/graphics/pokemon_summary_screen/condition_arrow_anim.json new file mode 100644 index 000000000..db543ad2a --- /dev/null +++ b/res/graphics/pokemon_summary_screen/condition_arrow_anim.json @@ -0,0 +1,23 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }], + "resultCount": 1, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/condition_arrow_cell.json b/res/graphics/pokemon_summary_screen/condition_arrow_cell.json new file mode 100644 index 000000000..0ee2120a3 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/condition_arrow_cell.json @@ -0,0 +1,44 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/condition_dot.png b/res/graphics/pokemon_summary_screen/condition_dot.png new file mode 100644 index 000000000..ea294611e Binary files /dev/null and b/res/graphics/pokemon_summary_screen/condition_dot.png differ diff --git a/res/graphics/pokemon_summary_screen/condition_dot_anim.json b/res/graphics/pokemon_summary_screen/condition_dot_anim.json new file mode 100644 index 000000000..d32e56aee --- /dev/null +++ b/res/graphics/pokemon_summary_screen/condition_dot_anim.json @@ -0,0 +1,75 @@ +{ + "labelEnabled": true, + "sequenceCount": 5, + "frameCount": 5, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 1 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 4 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }, { + "resultType": 0, + "index": 3 + }, { + "resultType": 0, + "index": 4 + }], + "resultCount": 5, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4"], + "labelCount": 5 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/condition_dot_cell.json b/res/graphics/pokemon_summary_screen/condition_dot_cell.json new file mode 100644 index 000000000..3aa4fc3a7 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/condition_dot_cell.json @@ -0,0 +1,180 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 5, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 1, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 3, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4"], + "labelCount": 5 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/condition_dot_flash.png b/res/graphics/pokemon_summary_screen/condition_dot_flash.png new file mode 100644 index 000000000..fc78e3b8e Binary files /dev/null and b/res/graphics/pokemon_summary_screen/condition_dot_flash.png differ diff --git a/res/graphics/pokemon_summary_screen/condition_dot_flash_anim.json b/res/graphics/pokemon_summary_screen/condition_dot_flash_anim.json new file mode 100644 index 000000000..dd058da6b --- /dev/null +++ b/res/graphics/pokemon_summary_screen/condition_dot_flash_anim.json @@ -0,0 +1,62 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 9, + "sequences": [{ + "frameCount": 9, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 8, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 64, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }, { + "resultType": 0, + "index": 3 + }, { + "resultType": 0, + "index": 4 + }, { + "resultType": 0, + "index": 5 + }], + "resultCount": 6, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/condition_dot_flash_cell.json b/res/graphics/pokemon_summary_screen/condition_dot_flash_cell.json new file mode 100644 index 000000000..c2926947e --- /dev/null +++ b/res/graphics/pokemon_summary_screen/condition_dot_flash_cell.json @@ -0,0 +1,214 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 6, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/dummy121.png b/res/graphics/pokemon_summary_screen/dummy121.png new file mode 100644 index 000000000..6251b3dda Binary files /dev/null and b/res/graphics/pokemon_summary_screen/dummy121.png differ diff --git a/res/graphics/pokemon_summary_screen/marking_circle.png b/res/graphics/pokemon_summary_screen/marking_circle.png new file mode 100644 index 000000000..bc7403d8e Binary files /dev/null and b/res/graphics/pokemon_summary_screen/marking_circle.png differ diff --git a/res/graphics/pokemon_summary_screen/marking_diamond.png b/res/graphics/pokemon_summary_screen/marking_diamond.png new file mode 100644 index 000000000..80e0c3cf0 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/marking_diamond.png differ diff --git a/res/graphics/pokemon_summary_screen/marking_heart.png b/res/graphics/pokemon_summary_screen/marking_heart.png new file mode 100644 index 000000000..a704c8a28 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/marking_heart.png differ diff --git a/res/graphics/pokemon_summary_screen/marking_square.png b/res/graphics/pokemon_summary_screen/marking_square.png new file mode 100644 index 000000000..2e1758054 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/marking_square.png differ diff --git a/res/graphics/pokemon_summary_screen/marking_star.png b/res/graphics/pokemon_summary_screen/marking_star.png new file mode 100644 index 000000000..1ae4cf3fc Binary files /dev/null and b/res/graphics/pokemon_summary_screen/marking_star.png differ diff --git a/res/graphics/pokemon_summary_screen/marking_triangle.png b/res/graphics/pokemon_summary_screen/marking_triangle.png new file mode 100644 index 000000000..ca68c0161 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/marking_triangle.png differ diff --git a/res/graphics/pokemon_summary_screen/markings_anim.json b/res/graphics/pokemon_summary_screen/markings_anim.json new file mode 100644 index 000000000..f27cb6240 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/markings_anim.json @@ -0,0 +1,36 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 2, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 1 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }], + "resultCount": 2, + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/markings_cell.json b/res/graphics/pokemon_summary_screen/markings_cell.json new file mode 100644 index 000000000..381b26da4 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/markings_cell.json @@ -0,0 +1,78 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 2, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 3, + "minX": -4, + "minY": -4, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 252, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 1, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/meson.build b/res/graphics/pokemon_summary_screen/meson.build new file mode 100644 index 000000000..be8a636db --- /dev/null +++ b/res/graphics/pokemon_summary_screen/meson.build @@ -0,0 +1,239 @@ +# Tiles and tilemaps +tiles_ncgr = ncgr_gen.process(files('tiles_main.png','tiles_sub.png'), + extra_args: [ + '-sopc', + '-version101', + ], +) + +tilemaps_nscr = copy_gen.process(files( + 'tiles_sub.NSCR', + 'page_info.NSCR', + 'page_memo.NSCR', + 'page_skills.NSCR', + 'page_battle_moves.NSCR', + 'page_condition.NSCR', + 'page_contest_moves.NSCR', + 'page_ribbons.NSCR', + 'page_exit.NSCR', + 'move_info.NSCR', + 'page_battle_moves_select_mode.NSCR', + 'page_contest_moves_select_mode.NSCR', +)) + +# Sprite images +sprites_png_sopc = files( + 'sub_buttons.png', +) + +sprites_png_clobbersize = files( + 'condition_arrow.png', + 'a_button.png', + 'ribbon_arrow.png', + 'condition_dot.png', + 'condition_dot_flash.png', + 'marking_circle.png', + 'marking_star.png', + 'marking_diamond.png', + 'marking_square.png', + 'marking_triangle.png', + 'marking_heart.png', + 'shiny_and_pokerus_cured_icon.png', + 'tab_arrow.png', + 'status_icons.png', + 'sheen.png', + 'ribbon_cursor.png', + 'dummy121.png', + 'ribbon_flash.png', + 'tabs.png', + 'move_cursor.png', + 'pokerus_icon.png', +) + +balls_dir = 'balls/' + +balls_png = files( + balls_dir / 'master_ball.png', + balls_dir / 'ultra_ball.png', + balls_dir / 'great_ball.png', + balls_dir / 'poke_ball.png', + balls_dir / 'safari_ball.png', + balls_dir / 'net_ball.png', + balls_dir / 'dive_ball.png', + balls_dir / 'nest_ball.png', + balls_dir / 'repeat_ball.png', + balls_dir / 'timer_ball.png', + balls_dir / 'luxury_ball.png', + balls_dir / 'premier_ball.png', + balls_dir / 'dusk_ball.png', + balls_dir / 'heal_ball.png', + balls_dir / 'quick_ball.png', + balls_dir / 'cherish_ball.png', +) + +ribbons_dir = 'ribbons/' + +ribbons_png = files( + ribbons_dir / 'hoenn_champion.png', + ribbons_dir / 'hoenn_contest.png', + ribbons_dir / 'hoenn_contest_super.png', + ribbons_dir / 'hoenn_contest_hyper.png', + ribbons_dir / 'hoenn_contest_master.png', + ribbons_dir / 'hoenn_victory.png', + ribbons_dir / 'hoenn_winning.png', + ribbons_dir / 'hoenn_artist.png', + ribbons_dir / 'hoenn_effort.png', + ribbons_dir / 'hoenn_marine_land_sky.png', + ribbons_dir / 'hoenn_country_national.png', + ribbons_dir / 'hoenn_earth_world.png', + ribbons_dir / 'dummy_12.png', + ribbons_dir / 'dummy_13.png', + ribbons_dir / 'dummy_14.png', + ribbons_dir / 'dummy_15.png', + ribbons_dir / 'sinnoh_champion.png', + ribbons_dir / 'sinnoh_contest.png', + ribbons_dir / 'sinnoh_contest_great.png', + ribbons_dir / 'sinnoh_contest_ultra.png', + ribbons_dir / 'sinnoh_contest_master.png', + ribbons_dir / 'ability.png', + ribbons_dir / 'great_ability.png', + ribbons_dir / 'double_ability.png', + ribbons_dir / 'multi_ability.png', + ribbons_dir / 'pair_ability.png', + ribbons_dir / 'world_ability.png', + ribbons_dir / 'alert.png', + ribbons_dir / 'shock.png', + ribbons_dir / 'downcast.png', + ribbons_dir / 'careless.png', + ribbons_dir / 'relax.png', + ribbons_dir / 'snooze.png', + ribbons_dir / 'smile.png', + ribbons_dir / 'gorgeous.png', + ribbons_dir / 'royal.png', + ribbons_dir / 'gorgeous_royal.png', + ribbons_dir / 'footprint.png', + ribbons_dir / 'record.png', + ribbons_dir / 'history.png', + ribbons_dir / 'legend.png', + ribbons_dir / 'red.png', + ribbons_dir / 'green.png', + ribbons_dir / 'blue.png', + ribbons_dir / 'festival.png', + ribbons_dir / 'carnival.png', + ribbons_dir / 'classic.png', + ribbons_dir / 'premier.png', +) + +sprites_ncgr_sopc = ncgr_gen.process(sprites_png_sopc, + extra_args: [ + '-version101', + '-sopc', + ], +) + +sprites_ncgr_clobbersize = ncgr_gen.process( + sprites_png_clobbersize, + balls_png, + ribbons_png, + extra_args: [ + '-version101', + '-clobbersize', + ], +) + +# Sprite cells +sprites_cell_json = files( + 'condition_arrow_cell.json', + 'ribbon_arrow_cell.json', + 'condition_dot_cell.json', + 'condition_dot_flash_cell.json', + 'markings_cell.json', + 'tab_arrow_cell.json', + 'status_icons_cell.json', + 'sheen_cell.json', + ribbons_dir / 'ribbons_cell.json', + 'ribbon_flash_cell.json', + 'ribbon_cursor_cell.json', + 'tabs_cell.json', + 'move_cursor_cell.json', + 'pokerus_icon_cell.json', +) + +sprites_ncer = ncer_gen.process(sprites_cell_json) + +# Sprite anims +sprites_anim_json = files( + 'condition_arrow_anim.json', + 'ribbon_arrow_anim.json', + 'condition_dot_anim.json', + 'condition_dot_flash_anim.json', + 'markings_anim.json', + 'tab_arrow_anim.json', + 'status_icons_anim.json', + 'sheen_anim.json', + ribbons_dir / 'ribbons_anim.json', + 'ribbon_flash_anim.json', + 'ribbon_cursor_anim.json', + 'tabs_anim.json', + 'move_cursor_anim.json', + 'pokerus_icon_anim.json', +) + +sprites_nanr = nanr_gen.process(sprites_anim_json) + +# Palettes +palettes_pal_4bpp = files( + 'tiles_main.pal', + 'tiles_sub.pal', + balls_dir / 'balls_0.pal', + balls_dir / 'balls_1.pal', + balls_dir / 'balls_2.pal', + balls_dir / 'balls_3.pal', + 'status_icons.pal', + 'sprites.pal', +) + +palettes_nclr_4bpp = nclr_gen.process(palettes_pal_4bpp, + extra_args: [ + '-bitdepth', '4', + ], +) + +palettes_pal_8bpp = files( + ribbons_dir / 'ribbons.pal', +) + +palettes_nclr_8bpp = nclr_gen.process(palettes_pal_8bpp, + extra_args: [ + '-bitdepth', '8', + ], +) + +pokemon_summary_screen_order = files('pokemon_summary_screen.order') +pokemon_summary_screen_narc = custom_target('pl_pst_gra.narc', + output: [ + 'pl_pst_gra.narc', + 'pl_pst_gra.naix', + ], + input: [ + tiles_ncgr, + tilemaps_nscr, + sprites_ncgr_sopc, + sprites_ncgr_clobbersize, + sprites_ncer, + sprites_nanr, + palettes_nclr_4bpp, + palettes_nclr_8bpp, + pokemon_summary_screen_order, + ], + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT0@', + '--order', pokemon_summary_screen_order, + '--naix', + ] +) + +nitrofs_files += pokemon_summary_screen_narc[0] +naix_headers += pokemon_summary_screen_narc[1] diff --git a/res/graphics/pokemon_summary_screen/move_cursor.png b/res/graphics/pokemon_summary_screen/move_cursor.png new file mode 100644 index 000000000..fa5fe76c2 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/move_cursor.png differ diff --git a/res/graphics/pokemon_summary_screen/move_cursor_anim.json b/res/graphics/pokemon_summary_screen/move_cursor_anim.json new file mode 100644 index 000000000..12d316fc3 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/move_cursor_anim.json @@ -0,0 +1,36 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 2, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 1 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }], + "resultCount": 2, + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/move_cursor_cell.json b/res/graphics/pokemon_summary_screen/move_cursor_cell.json new file mode 100644 index 000000000..e49717ba0 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/move_cursor_cell.json @@ -0,0 +1,118 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 2, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 63, + "maxY": 15, + "minX": -64, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 63, + "maxY": 15, + "minX": -64, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 448, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/move_info.NSCR b/res/graphics/pokemon_summary_screen/move_info.NSCR new file mode 100644 index 000000000..e6d0f0344 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/move_info.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_battle_moves.NSCR b/res/graphics/pokemon_summary_screen/page_battle_moves.NSCR new file mode 100644 index 000000000..dc1e95914 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_battle_moves.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_battle_moves_select_mode.NSCR b/res/graphics/pokemon_summary_screen/page_battle_moves_select_mode.NSCR new file mode 100644 index 000000000..3f0f12c4e Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_battle_moves_select_mode.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_condition.NSCR b/res/graphics/pokemon_summary_screen/page_condition.NSCR new file mode 100644 index 000000000..8bff6bf2f Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_condition.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_contest_moves.NSCR b/res/graphics/pokemon_summary_screen/page_contest_moves.NSCR new file mode 100644 index 000000000..a1db06176 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_contest_moves.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_contest_moves_select_mode.NSCR b/res/graphics/pokemon_summary_screen/page_contest_moves_select_mode.NSCR new file mode 100644 index 000000000..423c8f3ae Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_contest_moves_select_mode.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_exit.NSCR b/res/graphics/pokemon_summary_screen/page_exit.NSCR new file mode 100644 index 000000000..dd4d1422b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_exit.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_info.NSCR b/res/graphics/pokemon_summary_screen/page_info.NSCR new file mode 100644 index 000000000..c81b9f5e3 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_info.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_memo.NSCR b/res/graphics/pokemon_summary_screen/page_memo.NSCR new file mode 100644 index 000000000..ef67d0c22 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_memo.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_ribbons.NSCR b/res/graphics/pokemon_summary_screen/page_ribbons.NSCR new file mode 100644 index 000000000..622f52338 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_ribbons.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/page_skills.NSCR b/res/graphics/pokemon_summary_screen/page_skills.NSCR new file mode 100644 index 000000000..17e16ebac Binary files /dev/null and b/res/graphics/pokemon_summary_screen/page_skills.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/pokemon_summary_screen.order b/res/graphics/pokemon_summary_screen/pokemon_summary_screen.order new file mode 100644 index 000000000..9c144d8ee --- /dev/null +++ b/res/graphics/pokemon_summary_screen/pokemon_summary_screen.order @@ -0,0 +1,137 @@ +tiles_main.NCGR +tiles_main.NCLR +sub_buttons.NCGR +page_info.NSCR +page_memo.NSCR +page_skills.NSCR +page_battle_moves.NSCR +page_condition.NSCR +page_contest_moves.NSCR +page_ribbons.NSCR +page_exit.NSCR +move_info.NSCR +page_battle_moves_select_mode.NSCR +page_contest_moves_select_mode.NSCR +tiles_sub.NCLR +tiles_sub.NSCR +tiles_sub.NCGR +condition_arrow_anim.NANR +condition_arrow_cell.NCER +condition_arrow.NCGR +a_button.NCGR +master_ball.NCGR +ultra_ball.NCGR +great_ball.NCGR +poke_ball.NCGR +safari_ball.NCGR +net_ball.NCGR +dive_ball.NCGR +nest_ball.NCGR +repeat_ball.NCGR +timer_ball.NCGR +luxury_ball.NCGR +premier_ball.NCGR +dusk_ball.NCGR +heal_ball.NCGR +quick_ball.NCGR +cherish_ball.NCGR +balls_0.NCLR +balls_1.NCLR +balls_2.NCLR +balls_3.NCLR +ribbon_arrow_anim.NANR +ribbon_arrow_cell.NCER +ribbon_arrow.NCGR +condition_dot_anim.NANR +condition_dot_cell.NCER +condition_dot.NCGR +condition_dot_flash_anim.NANR +condition_dot_flash_cell.NCER +condition_dot_flash.NCGR +markings_anim.NANR +markings_cell.NCER +marking_circle.NCGR +marking_star.NCGR +marking_diamond.NCGR +marking_square.NCGR +marking_triangle.NCGR +marking_heart.NCGR +shiny_and_pokerus_cured_icon.NCGR +tab_arrow_anim.NANR +tab_arrow_cell.NCER +tab_arrow.NCGR +status_icons_anim.NANR +status_icons_cell.NCER +status_icons.NCGR +status_icons.NCLR +sheen_anim.NANR +sheen_cell.NCER +sheen.NCGR +sprites.NCLR +ribbons_anim.NANR +ribbons_cell.NCER +hoenn_champion.NCGR +hoenn_contest.NCGR +hoenn_contest_super.NCGR +hoenn_contest_hyper.NCGR +hoenn_contest_master.NCGR +hoenn_victory.NCGR +hoenn_winning.NCGR +hoenn_artist.NCGR +hoenn_effort.NCGR +hoenn_marine_land_sky.NCGR +hoenn_country_national.NCGR +hoenn_earth_world.NCGR +dummy_12.NCGR +dummy_13.NCGR +dummy_14.NCGR +dummy_15.NCGR +sinnoh_champion.NCGR +sinnoh_contest.NCGR +sinnoh_contest_great.NCGR +sinnoh_contest_ultra.NCGR +sinnoh_contest_master.NCGR +ability.NCGR +great_ability.NCGR +double_ability.NCGR +multi_ability.NCGR +pair_ability.NCGR +world_ability.NCGR +alert.NCGR +shock.NCGR +downcast.NCGR +careless.NCGR +relax.NCGR +snooze.NCGR +smile.NCGR +gorgeous.NCGR +royal.NCGR +gorgeous_royal.NCGR +footprint.NCGR +record.NCGR +history.NCGR +legend.NCGR +red.NCGR +green.NCGR +blue.NCGR +festival.NCGR +carnival.NCGR +classic.NCGR +premier.NCGR +ribbon_cursor.NCGR +dummy121.NCGR +ribbon_flash_anim.NANR +ribbon_flash_cell.NCER +ribbon_flash.NCGR +ribbon_cursor_cell.NCER +ribbon_cursor_anim.NANR +tabs_anim.NANR +tabs_cell.NCER +tabs.NCGR +move_cursor_anim.NANR +move_cursor_cell.NCER +move_cursor.NCGR +pokerus_icon_anim.NANR +pokerus_icon_cell.NCER +pokerus_icon.NCGR +ribbons.NCLR diff --git a/res/graphics/pokemon_summary_screen/pokerus_icon.png b/res/graphics/pokemon_summary_screen/pokerus_icon.png new file mode 100644 index 000000000..1cd2e5cb3 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/pokerus_icon.png differ diff --git a/res/graphics/pokemon_summary_screen/pokerus_icon_anim.json b/res/graphics/pokemon_summary_screen/pokerus_icon_anim.json new file mode 100644 index 000000000..a3c7c4f00 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/pokerus_icon_anim.json @@ -0,0 +1,23 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }], + "resultCount": 1, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/pokerus_icon_cell.json b/res/graphics/pokemon_summary_screen/pokerus_icon_cell.json new file mode 100644 index 000000000..bb9b0b850 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/pokerus_icon_cell.json @@ -0,0 +1,64 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 7, + "minX": -20, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 492, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbon_arrow.png b/res/graphics/pokemon_summary_screen/ribbon_arrow.png new file mode 100644 index 000000000..b10c7374c Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbon_arrow.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbon_arrow_anim.json b/res/graphics/pokemon_summary_screen/ribbon_arrow_anim.json new file mode 100644 index 000000000..d0178878c --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbon_arrow_anim.json @@ -0,0 +1,100 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 12, + "sequences": [{ + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 1 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 7 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 5 + }] + }], + "animationResults": [{ + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 1 + }, { + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 2 + }, { + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 3 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": -1 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": -2 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": -3 + }], + "resultCount": 8, + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbon_arrow_cell.json b/res/graphics/pokemon_summary_screen/ribbon_arrow_cell.json new file mode 100644 index 000000000..132f79710 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbon_arrow_cell.json @@ -0,0 +1,78 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 2, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbon_cursor.png b/res/graphics/pokemon_summary_screen/ribbon_cursor.png new file mode 100644 index 000000000..645853261 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbon_cursor.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbon_cursor_anim.json b/res/graphics/pokemon_summary_screen/ribbon_cursor_anim.json new file mode 100644 index 000000000..2cd09ec5d --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbon_cursor_anim.json @@ -0,0 +1,23 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }], + "resultCount": 1, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbon_cursor_cell.json b/res/graphics/pokemon_summary_screen/ribbon_cursor_cell.json new file mode 100644 index 000000000..4bdc6b48b --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbon_cursor_cell.json @@ -0,0 +1,104 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 23, + "maxY": 23, + "minX": -24, + "minY": -24, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": 232, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 232, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 488, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbon_flash.png b/res/graphics/pokemon_summary_screen/ribbon_flash.png new file mode 100644 index 000000000..b274a0488 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbon_flash.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbon_flash_anim.json b/res/graphics/pokemon_summary_screen/ribbon_flash_anim.json new file mode 100644 index 000000000..7deaf3834 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbon_flash_anim.json @@ -0,0 +1,80 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 11, + "sequences": [{ + "frameCount": 11, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 2, + "resultId": 0 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 2, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 7 + }, { + "frameDelay": 2, + "resultId": 8 + }, { + "frameDelay": 2, + "resultId": 9 + }, { + "frameDelay": 32, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }, { + "resultType": 0, + "index": 3 + }, { + "resultType": 0, + "index": 4 + }, { + "resultType": 0, + "index": 5 + }, { + "resultType": 0, + "index": 6 + }, { + "resultType": 0, + "index": 7 + }, { + "resultType": 0, + "index": 8 + }, { + "resultType": 0, + "index": 9 + }], + "resultCount": 10, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbon_flash_cell.json b/res/graphics/pokemon_summary_screen/ribbon_flash_cell.json new file mode 100644 index 000000000..6e02a536b --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbon_flash_cell.json @@ -0,0 +1,350 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 10, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 28, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbons/ability.png b/res/graphics/pokemon_summary_screen/ribbons/ability.png new file mode 100644 index 000000000..437232850 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/ability.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/alert.png b/res/graphics/pokemon_summary_screen/ribbons/alert.png new file mode 100644 index 000000000..bd9a931b4 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/alert.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/blue.png b/res/graphics/pokemon_summary_screen/ribbons/blue.png new file mode 100644 index 000000000..dde3c3236 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/blue.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/careless.png b/res/graphics/pokemon_summary_screen/ribbons/careless.png new file mode 100644 index 000000000..6e944cdfc Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/careless.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/carnival.png b/res/graphics/pokemon_summary_screen/ribbons/carnival.png new file mode 100644 index 000000000..fd3acdc0d Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/carnival.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/classic.png b/res/graphics/pokemon_summary_screen/ribbons/classic.png new file mode 100644 index 000000000..ee3edc99b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/classic.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/double_ability.png b/res/graphics/pokemon_summary_screen/ribbons/double_ability.png new file mode 100644 index 000000000..13d6e365b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/double_ability.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/downcast.png b/res/graphics/pokemon_summary_screen/ribbons/downcast.png new file mode 100644 index 000000000..e2d3b487b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/downcast.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/dummy_12.png b/res/graphics/pokemon_summary_screen/ribbons/dummy_12.png new file mode 100644 index 000000000..15eb9866a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/dummy_12.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/dummy_13.png b/res/graphics/pokemon_summary_screen/ribbons/dummy_13.png new file mode 100644 index 000000000..d35844bff Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/dummy_13.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/dummy_14.png b/res/graphics/pokemon_summary_screen/ribbons/dummy_14.png new file mode 100644 index 000000000..b8dd809dd Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/dummy_14.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/dummy_15.png b/res/graphics/pokemon_summary_screen/ribbons/dummy_15.png new file mode 100644 index 000000000..c7dc8a9f6 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/dummy_15.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/festival.png b/res/graphics/pokemon_summary_screen/ribbons/festival.png new file mode 100644 index 000000000..221da890d Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/festival.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/footprint.png b/res/graphics/pokemon_summary_screen/ribbons/footprint.png new file mode 100644 index 000000000..98a812f54 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/footprint.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/gorgeous.png b/res/graphics/pokemon_summary_screen/ribbons/gorgeous.png new file mode 100644 index 000000000..becf6a6a1 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/gorgeous.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/gorgeous_royal.png b/res/graphics/pokemon_summary_screen/ribbons/gorgeous_royal.png new file mode 100644 index 000000000..a27f5919b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/gorgeous_royal.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/great_ability.png b/res/graphics/pokemon_summary_screen/ribbons/great_ability.png new file mode 100644 index 000000000..c69a81c7a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/great_ability.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/green.png b/res/graphics/pokemon_summary_screen/ribbons/green.png new file mode 100644 index 000000000..dde3c3236 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/green.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/history.png b/res/graphics/pokemon_summary_screen/ribbons/history.png new file mode 100644 index 000000000..69493504e Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/history.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_artist.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_artist.png new file mode 100644 index 000000000..32be50ca8 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_artist.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_champion.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_champion.png new file mode 100644 index 000000000..7aa33c3d5 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_champion.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest.png new file mode 100644 index 000000000..ff1a18e37 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_hyper.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_hyper.png new file mode 100644 index 000000000..a0687feef Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_hyper.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_master.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_master.png new file mode 100644 index 000000000..33acea019 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_master.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_super.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_super.png new file mode 100644 index 000000000..f6baff5cb Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_contest_super.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_country_national.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_country_national.png new file mode 100644 index 000000000..af9b1c264 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_country_national.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_earth_world.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_earth_world.png new file mode 100644 index 000000000..15eb9866a Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_earth_world.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_effort.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_effort.png new file mode 100644 index 000000000..3a4b6c0a6 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_effort.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_marine_land_sky.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_marine_land_sky.png new file mode 100644 index 000000000..e22b94ea3 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_marine_land_sky.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_victory.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_victory.png new file mode 100644 index 000000000..03e992884 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_victory.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/hoenn_winning.png b/res/graphics/pokemon_summary_screen/ribbons/hoenn_winning.png new file mode 100644 index 000000000..da06f269d Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/hoenn_winning.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/legend.png b/res/graphics/pokemon_summary_screen/ribbons/legend.png new file mode 100644 index 000000000..669b69004 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/legend.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/multi_ability.png b/res/graphics/pokemon_summary_screen/ribbons/multi_ability.png new file mode 100644 index 000000000..5483eaafb Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/multi_ability.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/pair_ability.png b/res/graphics/pokemon_summary_screen/ribbons/pair_ability.png new file mode 100644 index 000000000..6dbf6514d Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/pair_ability.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/premier.png b/res/graphics/pokemon_summary_screen/ribbons/premier.png new file mode 100644 index 000000000..53d8df163 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/premier.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/record.png b/res/graphics/pokemon_summary_screen/ribbons/record.png new file mode 100644 index 000000000..72b637303 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/record.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/red.png b/res/graphics/pokemon_summary_screen/ribbons/red.png new file mode 100644 index 000000000..dde3c3236 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/red.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/relax.png b/res/graphics/pokemon_summary_screen/ribbons/relax.png new file mode 100644 index 000000000..e2d3b487b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/relax.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/ribbons.pal b/res/graphics/pokemon_summary_screen/ribbons/ribbons.pal new file mode 100644 index 000000000..fb70af945 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbons/ribbons.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 197 246 +74 74 82 +139 139 156 +222 222 230 +255 255 255 +246 246 98 +197 197 98 +156 156 32 +197 65 65 +238 90 65 +164 98 205 +197 106 255 +0 0 0 +0 197 255 +0 0 0 +0 0 0 +197 197 246 +74 74 82 +139 139 156 +222 222 230 +255 255 255 +246 246 98 +197 197 98 +156 156 32 +98 123 197 +98 156 255 +0 0 0 +0 0 0 +0 0 0 +98 238 0 +74 90 180 +90 115 238 +197 197 246 +74 74 82 +139 139 156 +222 222 230 +255 255 255 +246 246 98 +197 197 98 +156 156 32 +205 115 131 +246 156 172 +197 98 82 +238 139 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 246 +74 74 82 +139 139 156 +222 222 230 +255 255 255 +246 246 98 +197 197 98 +156 156 32 +106 213 82 +180 246 115 +156 156 172 +222 222 205 +0 0 0 +139 139 213 +148 106 82 +205 172 98 +197 197 246 +74 74 82 +139 139 156 +222 222 230 +255 255 255 +246 246 98 +197 197 98 +156 156 32 +197 164 65 +255 222 65 +189 189 57 +238 238 65 +0 0 0 +238 90 65 +90 139 230 +90 172 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/ribbons/ribbons_anim.json b/res/graphics/pokemon_summary_screen/ribbons/ribbons_anim.json new file mode 100644 index 000000000..2cd09ec5d --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbons/ribbons_anim.json @@ -0,0 +1,23 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 1, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }], + "resultCount": 1, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbons/ribbons_cell.json b/res/graphics/pokemon_summary_screen/ribbons/ribbons_cell.json new file mode 100644 index 000000000..e34bedb98 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/ribbons/ribbons_cell.json @@ -0,0 +1,44 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 1, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 240, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/ribbons/royal.png b/res/graphics/pokemon_summary_screen/ribbons/royal.png new file mode 100644 index 000000000..b24ffd6f0 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/royal.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/shock.png b/res/graphics/pokemon_summary_screen/ribbons/shock.png new file mode 100644 index 000000000..e2d3b487b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/shock.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/sinnoh_champion.png b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_champion.png new file mode 100644 index 000000000..cf5585c5b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_champion.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest.png b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest.png new file mode 100644 index 000000000..23a02e969 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_great.png b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_great.png new file mode 100644 index 000000000..e2a0dd665 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_great.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_master.png b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_master.png new file mode 100644 index 000000000..1b2f5aad8 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_master.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_ultra.png b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_ultra.png new file mode 100644 index 000000000..c23da36d1 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/sinnoh_contest_ultra.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/smile.png b/res/graphics/pokemon_summary_screen/ribbons/smile.png new file mode 100644 index 000000000..e2d3b487b Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/smile.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/snooze.png b/res/graphics/pokemon_summary_screen/ribbons/snooze.png new file mode 100644 index 000000000..bd9a931b4 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/snooze.png differ diff --git a/res/graphics/pokemon_summary_screen/ribbons/world_ability.png b/res/graphics/pokemon_summary_screen/ribbons/world_ability.png new file mode 100644 index 000000000..6edda9ec2 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/ribbons/world_ability.png differ diff --git a/res/graphics/pokemon_summary_screen/sheen.png b/res/graphics/pokemon_summary_screen/sheen.png new file mode 100644 index 000000000..8832aba72 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/sheen.png differ diff --git a/res/graphics/pokemon_summary_screen/sheen_anim.json b/res/graphics/pokemon_summary_screen/sheen_anim.json new file mode 100644 index 000000000..1644d7f26 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/sheen_anim.json @@ -0,0 +1,56 @@ +{ + "labelEnabled": true, + "sequenceCount": 1, + "frameCount": 7, + "sequences": [{ + "frameCount": 7, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 3, + "resultId": 0 + }, { + "frameDelay": 3, + "resultId": 1 + }, { + "frameDelay": 3, + "resultId": 2 + }, { + "frameDelay": 3, + "resultId": 3 + }, { + "frameDelay": 3, + "resultId": 4 + }, { + "frameDelay": 3, + "resultId": 5 + }, { + "frameDelay": 3, + "resultId": 0 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }, { + "resultType": 0, + "index": 3 + }, { + "resultType": 0, + "index": 4 + }, { + "resultType": 0, + "index": 5 + }], + "resultCount": 6, + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/sheen_cell.json b/res/graphics/pokemon_summary_screen/sheen_cell.json new file mode 100644 index 000000000..d6b4522b0 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/sheen_cell.json @@ -0,0 +1,214 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 6, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 10, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/shiny_and_pokerus_cured_icon.png b/res/graphics/pokemon_summary_screen/shiny_and_pokerus_cured_icon.png new file mode 100644 index 000000000..233b9dcd0 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/shiny_and_pokerus_cured_icon.png differ diff --git a/res/graphics/pokemon_summary_screen/sprites.pal b/res/graphics/pokemon_summary_screen/sprites.pal new file mode 100644 index 000000000..1bdd5b208 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/sprites.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +205 213 197 +74 65 57 +246 255 255 +230 230 205 +255 164 156 +255 106 98 +213 65 57 +238 164 238 +197 106 238 +164 74 205 +255 238 148 +255 205 74 +255 172 41 +139 131 123 +189 189 164 +106 98 90 +205 213 197 +74 65 57 +246 255 255 +246 74 41 +213 230 131 +131 222 139 +115 189 115 +164 238 205 +148 230 230 +131 213 213 +180 189 213 +139 148 255 +106 115 222 +238 164 238 +213 123 255 +164 74 205 +205 213 197 +74 65 57 +246 255 255 +255 0 0 +255 205 197 +246 172 164 +255 131 123 +255 255 156 +246 246 98 +222 205 0 +230 230 180 +197 197 148 +180 180 131 +255 246 246 +255 222 255 +255 189 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/status_icons.pal b/res/graphics/pokemon_summary_screen/status_icons.pal new file mode 100644 index 000000000..885256f55 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/status_icons.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +156 180 238 +156 164 139 +106 115 98 +82 90 74 +49 205 205 +0 156 156 +0 106 106 +255 213 41 +238 172 0 +189 123 0 +255 156 139 +230 90 74 +180 0 0 +115 0 0 +197 65 205 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/graphics/pokemon_summary_screen/status_icons.png b/res/graphics/pokemon_summary_screen/status_icons.png new file mode 100644 index 000000000..d4dc40880 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/status_icons.png differ diff --git a/res/graphics/pokemon_summary_screen/status_icons_anim.json b/res/graphics/pokemon_summary_screen/status_icons_anim.json new file mode 100644 index 000000000..09177de80 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/status_icons_anim.json @@ -0,0 +1,101 @@ +{ + "labelEnabled": true, + "sequenceCount": 7, + "frameCount": 7, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 1 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 5 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 6 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }, { + "resultType": 0, + "index": 3 + }, { + "resultType": 0, + "index": 4 + }, { + "resultType": 0, + "index": 5 + }, { + "resultType": 0, + "index": 6 + }], + "resultCount": 7, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/status_icons_cell.json b/res/graphics/pokemon_summary_screen/status_icons_cell.json new file mode 100644 index 000000000..364bf63b1 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/status_icons_cell.json @@ -0,0 +1,388 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 7, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 3, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 5, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 9, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 11, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 15, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 17, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": -1, + "minX": -16, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 496, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 18, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/sub_buttons.png b/res/graphics/pokemon_summary_screen/sub_buttons.png new file mode 100644 index 000000000..b5d69bd38 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/sub_buttons.png differ diff --git a/res/graphics/pokemon_summary_screen/tab_arrow.png b/res/graphics/pokemon_summary_screen/tab_arrow.png new file mode 100644 index 000000000..6b81c3a10 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/tab_arrow.png differ diff --git a/res/graphics/pokemon_summary_screen/tab_arrow_anim.json b/res/graphics/pokemon_summary_screen/tab_arrow_anim.json new file mode 100644 index 000000000..10b0547a9 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/tab_arrow_anim.json @@ -0,0 +1,100 @@ +{ + "labelEnabled": true, + "sequenceCount": 2, + "frameCount": 12, + "sequences": [{ + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 3 + }, { + "frameDelay": 4, + "resultId": 2 + }, { + "frameDelay": 4, + "resultId": 1 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 7 + }, { + "frameDelay": 4, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 5 + }] + }], + "animationResults": [{ + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -1, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -2, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -3, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 1, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 2, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 3, + "positionY": 0 + }], + "resultCount": 8, + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/tab_arrow_cell.json b/res/graphics/pokemon_summary_screen/tab_arrow_cell.json new file mode 100644 index 000000000..98f8f2efc --- /dev/null +++ b/res/graphics/pokemon_summary_screen/tab_arrow_cell.json @@ -0,0 +1,78 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 2, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 7, + "minX": -4, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 2 + }, + "maxX": 3, + "maxY": 7, + "minX": -4, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 508, + "RotationScaling": 8, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/tabs.png b/res/graphics/pokemon_summary_screen/tabs.png new file mode 100644 index 000000000..839756a47 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/tabs.png differ diff --git a/res/graphics/pokemon_summary_screen/tabs_anim.json b/res/graphics/pokemon_summary_screen/tabs_anim.json new file mode 100644 index 000000000..451a31d92 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/tabs_anim.json @@ -0,0 +1,218 @@ +{ + "labelEnabled": true, + "sequenceCount": 16, + "frameCount": 16, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 1 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 5 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 6 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 7 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 8 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 9 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 10 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 11 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 12 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 13 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 14 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 15 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }, { + "resultType": 0, + "index": 4 + }, { + "resultType": 0, + "index": 3 + }, { + "resultType": 0, + "index": 5 + }, { + "resultType": 0, + "index": 6 + }, { + "resultType": 0, + "index": 7 + }, { + "resultType": 0, + "index": 8 + }, { + "resultType": 0, + "index": 9 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }], + "resultCount": 16, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime4", "CellAnime3", "CellAnime5", "CellAnime6", "CellAnime14", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime11", "CellAnime10", "CellAnime12", "CellAnime13", "CellAnime15"], + "labelCount": 16 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/tabs_cell.json b/res/graphics/pokemon_summary_screen/tabs_cell.json new file mode 100644 index 000000000..7c155880a --- /dev/null +++ b/res/graphics/pokemon_summary_screen/tabs_cell.json @@ -0,0 +1,714 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 16, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 28, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 38, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 50, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 54, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 56, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 62, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 66, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 68, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 15, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 504, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 74, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 248, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 78, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime4", "CellAnime3", "CellAnime5", "CellAnime6", "CellAnime14", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime11", "CellAnime10", "CellAnime12", "CellAnime13", "CellAnime15"], + "labelCount": 16 +} \ No newline at end of file diff --git a/res/graphics/pokemon_summary_screen/tiles_main.pal b/res/graphics/pokemon_summary_screen/tiles_main.pal new file mode 100644 index 000000000..d608088af --- /dev/null +++ b/res/graphics/pokemon_summary_screen/tiles_main.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +255 255 205 +246 255 255 +115 106 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +8 246 180 +213 230 131 +131 222 139 +115 189 115 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 238 205 +148 230 230 +131 213 213 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 189 213 +139 148 255 +106 115 222 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +255 98 82 +115 189 255 +255 205 82 +139 230 139 +255 98 205 +238 164 238 +213 123 255 +164 74 205 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 98 90 +255 205 197 +246 172 164 +255 131 123 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +230 222 148 +205 197 205 +180 172 255 +255 148 255 +255 98 205 +255 255 189 +246 246 98 +222 205 0 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 180 +197 197 148 +180 180 131 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +255 255 255 +0 0 0 +32 106 230 +74 148 255 +255 180 82 +255 205 82 +255 222 98 +213 230 123 +197 213 106 +189 189 82 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +255 255 255 +255 255 156 +246 246 98 +222 205 0 +148 189 238 +123 164 230 +82 123 189 +189 164 255 +172 123 213 +164 74 205 +205 213 197 +0 0 0 +74 65 57 +172 197 255 +222 230 246 +246 246 197 +246 255 255 +115 106 98 +0 0 0 +0 0 0 +255 180 230 +255 98 230 +255 222 98 +255 246 246 +255 222 255 +255 213 222 +205 213 197 +156 180 238 +205 213 197 +164 172 148 +106 115 98 +0 0 0 +98 255 98 +24 197 32 +255 222 0 +238 172 0 +255 156 156 +255 74 57 +41 238 230 +0 156 156 +255 255 255 +65 49 41 +106 115 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 246 98 +230 222 148 +205 197 205 +180 172 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 197 106 +16 24 32 +172 189 189 +0 115 255 +123 189 238 +238 32 16 +255 172 189 +255 148 189 +255 222 230 +41 213 24 +156 238 139 +0 0 0 +0 0 0 +0 0 0 +82 82 82 +255 255 255 diff --git a/res/graphics/pokemon_summary_screen/tiles_main.png b/res/graphics/pokemon_summary_screen/tiles_main.png new file mode 100644 index 000000000..be8601c24 Binary files /dev/null and b/res/graphics/pokemon_summary_screen/tiles_main.png differ diff --git a/res/graphics/pokemon_summary_screen/tiles_sub.NSCR b/res/graphics/pokemon_summary_screen/tiles_sub.NSCR new file mode 100644 index 000000000..45bcfa00c Binary files /dev/null and b/res/graphics/pokemon_summary_screen/tiles_sub.NSCR differ diff --git a/res/graphics/pokemon_summary_screen/tiles_sub.pal b/res/graphics/pokemon_summary_screen/tiles_sub.pal new file mode 100644 index 000000000..b0abeab63 --- /dev/null +++ b/res/graphics/pokemon_summary_screen/tiles_sub.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +205 197 189 +156 156 156 +148 148 148 +139 139 139 +255 230 197 +246 222 139 +230 205 123 +222 189 106 +213 172 98 +0 0 0 +0 0 0 +255 115 115 +106 164 197 +115 164 213 +98 148 189 +74 115 164 +205 197 189 +230 255 156 +205 255 131 +164 222 90 +131 189 57 +82 164 8 +180 255 255 +139 246 213 +98 213 172 +74 180 148 +32 148 106 +255 131 131 +255 172 123 +123 180 213 +115 164 205 +106 139 172 +205 197 189 +197 238 255 +180 213 255 +164 189 255 +139 164 246 +106 131 230 +255 222 255 +246 180 255 +205 139 222 +189 123 205 +180 90 180 +255 131 131 +255 172 123 +123 180 213 +115 164 205 +106 139 172 +205 197 189 +255 238 230 +255 205 197 +246 156 148 +230 115 106 +213 74 65 +255 255 172 +246 246 131 +255 213 82 +230 189 90 +197 164 49 +255 131 131 +255 172 123 +123 180 213 +115 164 205 +106 139 172 +205 197 189 +246 246 172 +222 222 148 +189 189 115 +164 164 90 +131 131 57 +255 238 255 +255 197 255 +246 156 222 +230 106 180 +222 65 98 +255 131 131 +255 172 123 +123 180 213 +115 164 205 +106 139 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 115 164 +82 131 172 +98 148 189 +106 164 205 +123 172 222 +255 115 115 +230 213 98 +246 230 139 +222 205 98 +238 197 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +74 115 164 +82 131 172 +98 148 189 +106 164 205 +123 172 222 +246 222 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 131 131 +255 172 123 +246 230 139 +230 172 106 +238 197 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +205 197 189 +197 255 123 +180 238 106 +164 222 90 +148 205 74 +139 197 65 +156 255 230 +139 246 213 +98 213 172 +74 180 148 +49 156 123 +255 131 131 +255 172 123 +246 230 139 +139 139 74 +189 148 74 +205 197 189 +197 222 255 +180 205 255 +164 189 255 +148 172 255 +131 156 255 +238 172 246 +222 156 238 +205 139 222 +197 131 213 +180 115 197 +255 115 115 +255 172 123 +246 230 139 +230 172 106 +238 197 123 +205 197 189 +255 180 172 +255 164 156 +255 148 139 +246 131 123 +238 123 115 +255 246 115 +255 230 98 +255 213 82 +255 197 65 +230 189 82 +255 115 115 +255 172 123 +246 230 139 +230 172 106 +238 197 123 +205 197 189 +222 222 148 +205 205 131 +189 189 115 +180 180 106 +172 172 98 +255 189 255 +255 172 246 +255 164 230 +255 148 222 +246 131 205 +255 115 115 +255 172 123 +246 230 139 +230 172 106 +238 197 123 diff --git a/res/graphics/pokemon_summary_screen/tiles_sub.png b/res/graphics/pokemon_summary_screen/tiles_sub.png new file mode 100644 index 000000000..30371a6ec Binary files /dev/null and b/res/graphics/pokemon_summary_screen/tiles_sub.png differ diff --git a/res/prebuilt/graphic/meson.build b/res/prebuilt/graphic/meson.build index 16ce8f11f..22295526b 100644 --- a/res/prebuilt/graphic/meson.build +++ b/res/prebuilt/graphic/meson.build @@ -28,7 +28,6 @@ prebuilt_files = [ 'opening.narc', 'pl_bag_gra.narc', 'pl_plist_gra.narc', - 'pl_pst_gra.narc', 'pl_wifinote.narc', 'plist_gra.narc', 'pmsi.narc', diff --git a/res/prebuilt/graphic/pl_pst_gra.narc b/res/prebuilt/graphic/pl_pst_gra.narc deleted file mode 100644 index ca7872e9d..000000000 Binary files a/res/prebuilt/graphic/pl_pst_gra.narc and /dev/null differ