diff --git a/include/applications/pokedex/pokedex_graphics.h b/include/applications/pokedex/pokedex_graphics.h index f063409f3c..b2cb967308 100644 --- a/include/applications/pokedex/pokedex_graphics.h +++ b/include/applications/pokedex/pokedex_graphics.h @@ -131,7 +131,7 @@ BOOL PokedexGraphics_TakeCursorTransformStep(CursorTransformation *cursorTransfo NARC *PokedexGraphics_GetNARC(PokedexGraphicData *pokedexGraphicData); u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapID heapID); void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapID heapID); -void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID); +void *PokedexGraphics_GetGraphicNarcTilemapData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID); void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapID heapID); void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapID heapID); void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, NARC *narc); diff --git a/platinum.us/filesys.csv b/platinum.us/filesys.csv index 8d63564cb5..a5caf2bcbc 100644 --- a/platinum.us/filesys.csv +++ b/platinum.us/filesys.csv @@ -331,7 +331,7 @@ res/prebuilt/contest/graphic/contest_obj.narc,/contest/graphic/contest_obj.narc res/prebuilt/demo/title/op_demo.narc,/demo/title/op_demo.narc res/graphics/title_screen/titledemo.narc,/demo/title/titledemo.narc res/field/trades/fld_trade.narc,/fielddata/pokemon_trade/fld_trade.narc -res/prebuilt/resource/eng/zukan/zukan.narc,/resource/eng/zukan/zukan.narc +res/graphics/pokedex/zukan.narc,/resource/eng/zukan/zukan.narc res/prebuilt/resource/eng/batt_rec/batt_rec_gra.narc,/resource/eng/batt_rec/batt_rec_gra.narc res/prebuilt/resource/eng/wifi_lobby_minigame/wlmngm_tool.narc,/resource/eng/wifi_lobby_minigame/wlmngm_tool.narc res/prebuilt/resource/eng/frontier_graphic/frontier_bg.narc,/resource/eng/frontier_graphic/frontier_bg.narc diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index a825b088f0..5b8aa10aaa 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -330,7 +330,7 @@ cec363028fa6bc6240f9c8da7ab8f9e8bb1b1465 *res/prebuilt/contest/graphic/contest_o 7fa87d90ba039f67221a43782bf6a1a1107d5947 *res/prebuilt/demo/title/op_demo.narc d7e86fadf59a54f922fc7cf65ae65fa326b8429e *res/graphics/title_screen/titledemo.narc 32a0989a18cc7f3eb17c5949adecb3f057a84eea *res/field/trades/fld_trade.narc -d4b6f9731b808a613338005f59959325ce1e3ac9 *res/prebuilt/resource/eng/zukan/zukan.narc +d4b6f9731b808a613338005f59959325ce1e3ac9 *res/graphics/pokedex/zukan.narc 7e85af57b27fa4a0829b24550fc6c0dd275cf994 *res/prebuilt/resource/eng/batt_rec/batt_rec_gra.narc 2994f2955035001a22a1f225c68bfa809e4c85bf *res/prebuilt/resource/eng/wifi_lobby_minigame/wlmngm_tool.narc 6be171e5d73a8ce4f6e262e6be0dd47c9bb95e41 *res/prebuilt/resource/eng/frontier_graphic/frontier_bg.narc diff --git a/res/graphics/meson.build b/res/graphics/meson.build index 8a5fad7fa2..0660b9297b 100644 --- a/res/graphics/meson.build +++ b/res/graphics/meson.build @@ -7,6 +7,7 @@ subdir('naming_screen') subdir('options_menu') subdir('party_menu') subdir('poffin_case') +subdir('pokedex') subdir('pokemon_summary_screen') subdir('scroll_prompts') subdir('shop_menu') diff --git a/res/graphics/pokedex/area_day.pal b/res/graphics/pokedex/area_day.pal new file mode 100644 index 0000000000..5be39be31a --- /dev/null +++ b/res/graphics/pokedex/area_day.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +148 238 131 +0 0 0 +0 0 0 +115 213 230 +139 222 238 +139 222 238 +139 222 238 +139 222 238 +115 213 230 +115 213 230 +0 0 0 +115 213 230 +106 189 230 +98 156 238 +115 213 230 +197 164 90 +148 238 131 +0 0 0 +0 0 0 +139 205 222 +148 205 222 +148 205 222 +148 205 222 +148 205 222 +139 205 222 +139 213 222 +0 0 0 +139 197 222 +131 180 222 +115 148 222 +139 197 222 +197 164 90 +148 238 131 +0 0 0 +0 0 0 +123 180 222 +139 197 222 +180 230 238 +139 180 222 +139 180 222 +131 197 222 +172 230 238 +0 0 0 +123 180 222 +115 156 213 +106 131 213 +123 180 222 +197 164 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 +148 238 131 +0 0 0 +0 0 0 +115 213 230 +139 222 238 +139 222 238 +139 222 238 +139 222 238 +115 213 230 +115 213 230 +0 0 0 +115 213 230 +106 189 230 +98 156 238 +115 213 230 +189 255 156 +148 238 131 +0 0 0 +0 0 0 +139 205 222 +148 205 222 +148 205 222 +148 205 222 +148 205 222 +139 205 222 +139 213 222 +0 0 0 +139 197 222 +131 180 222 +115 148 222 +139 197 222 +189 255 156 +148 238 131 +0 0 0 +0 0 0 +123 180 222 +139 197 222 +180 230 238 +139 180 222 +139 180 222 +131 197 222 +172 230 238 +0 0 0 +123 180 222 +115 156 213 +106 131 213 +123 180 222 +189 255 156 diff --git a/res/graphics/pokedex/area_map.NSCR b/res/graphics/pokedex/area_map.NSCR new file mode 100644 index 0000000000..d3dff227a0 Binary files /dev/null and b/res/graphics/pokedex/area_map.NSCR differ diff --git a/res/graphics/pokedex/area_morning.pal b/res/graphics/pokedex/area_morning.pal new file mode 100644 index 0000000000..475164c6cd --- /dev/null +++ b/res/graphics/pokedex/area_morning.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +148 238 131 +0 0 0 +0 0 0 +164 189 213 +156 180 205 +156 180 205 +156 180 205 +164 189 213 +156 189 213 +156 205 205 +0 0 0 +156 180 205 +148 164 205 +131 139 197 +156 180 205 +197 164 90 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +123 123 123 +148 238 131 +0 0 0 +0 0 0 +139 205 222 +148 205 222 +148 205 222 +148 205 222 +148 205 222 +139 205 222 +139 213 222 +0 0 0 +139 197 222 +131 180 222 +115 148 222 +139 197 222 +197 164 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 diff --git a/res/graphics/pokedex/area_night.pal b/res/graphics/pokedex/area_night.pal new file mode 100644 index 0000000000..e9e9c39e02 --- /dev/null +++ b/res/graphics/pokedex/area_night.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +148 238 131 +0 0 0 +0 0 0 +131 139 205 +139 172 205 +222 238 238 +131 139 205 +131 139 205 +139 172 205 +222 238 238 +0 0 0 +131 139 205 +123 123 189 +115 106 180 +131 139 205 +197 164 90 +148 238 131 +0 0 0 +0 0 0 +123 180 222 +139 197 222 +180 230 238 +139 180 222 +139 180 222 +123 197 222 +172 230 238 +0 0 0 +123 180 222 +115 156 213 +106 131 213 +123 180 222 +197 164 90 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +98 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/area_sub.NSCR b/res/graphics/pokedex/area_sub.NSCR new file mode 100644 index 0000000000..dcf5e8232a Binary files /dev/null and b/res/graphics/pokedex/area_sub.NSCR differ diff --git a/res/graphics/pokedex/background_scroll_default.pal b/res/graphics/pokedex/background_scroll_default.pal new file mode 100644 index 0000000000..932f0294b7 --- /dev/null +++ b/res/graphics/pokedex/background_scroll_default.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +148 230 148 +16 24 32 +255 255 255 +164 156 74 +106 106 106 +82 82 82 +213 213 139 +139 139 139 +238 197 74 +82 82 82 +255 106 115 +172 172 172 +255 255 255 +82 82 82 +213 189 98 +255 255 230 +172 213 189 +16 24 32 +172 189 189 +0 0 0 +131 131 98 +90 164 164 +255 255 255 +139 164 213 +246 246 255 +172 197 230 +255 246 131 +74 90 131 +123 123 90 +115 115 82 +197 246 255 +222 255 255 +148 230 148 +16 24 32 +172 189 189 +0 0 0 +238 180 189 +180 82 90 +115 0 49 +189 164 32 +255 255 255 +246 230 82 +255 246 131 +222 0 0 +255 139 8 +255 172 65 +255 205 213 +246 230 230 +255 189 246 +16 24 32 +172 189 189 +0 0 0 +255 230 230 +255 230 164 +246 246 148 +213 189 98 +238 197 148 +205 180 131 +189 164 164 +82 98 65 +180 164 131 +164 139 139 +205 180 123 +213 180 139 +148 230 148 +16 24 32 +172 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +205 189 172 +255 255 255 +197 115 90 +255 98 98 +0 0 0 +164 139 139 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +49 90 90 +255 255 255 +197 246 255 +0 0 0 +0 0 0 +148 148 115 +131 131 98 +123 123 90 +115 115 82 +115 115 82 +98 156 106 +222 255 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 115 123 +255 148 164 +0 0 0 +0 0 0 +115 0 49 +180 82 90 +255 106 115 +16 24 32 +255 255 255 +172 189 189 +16 24 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 238 +0 0 0 +255 255 255 +115 0 49 +180 82 90 +115 0 49 +197 98 106 +180 82 90 +238 197 74 +82 82 82 +246 139 148 +238 139 148 +255 255 255 +148 49 49 +180 82 90 +238 139 148 +148 230 148 +16 24 32 +255 255 255 +164 156 74 +106 106 106 +82 82 82 +213 213 139 +139 139 139 +238 197 74 +82 82 82 +255 106 115 +172 172 172 +255 255 255 +82 82 82 +213 189 98 +255 255 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 189 246 +16 24 32 +172 189 189 +0 0 0 +255 230 230 +255 230 164 +222 230 255 +98 139 255 +255 246 213 +255 222 131 +255 213 131 +16 74 189 +246 180 98 +148 123 82 +205 180 123 +255 238 156 +148 230 148 +16 24 32 +255 255 255 +49 65 189 +222 131 0 +164 98 0 +123 148 230 +238 172 98 +255 197 131 +82 82 82 +115 197 255 +255 205 148 +255 255 255 +82 82 82 +82 106 238 +172 189 246 +189 197 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +49 90 90 +255 255 255 +197 246 255 +0 0 0 +0 0 0 +115 131 164 +98 123 164 +82 123 156 +65 115 156 +65 115 156 +98 156 106 diff --git a/res/graphics/pokedex/background_scroll_national.pal b/res/graphics/pokedex/background_scroll_national.pal new file mode 100644 index 0000000000..f9378193d1 --- /dev/null +++ b/res/graphics/pokedex/background_scroll_national.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 189 246 +16 24 32 +172 189 189 +0 0 0 +255 230 230 +255 230 164 +172 172 172 +106 106 106 +255 246 246 +189 172 172 +189 164 164 +90 65 65 +172 148 148 +164 139 139 +205 180 123 +213 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/background_scroll_sinnoh.pal b/res/graphics/pokedex/background_scroll_sinnoh.pal new file mode 100644 index 0000000000..911c003c83 --- /dev/null +++ b/res/graphics/pokedex/background_scroll_sinnoh.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 189 246 +16 24 32 +172 189 189 +0 0 0 +255 213 213 +255 205 205 +230 106 139 +180 82 90 +164 189 172 +156 164 106 +164 172 115 +131 32 41 +139 148 98 +148 123 82 +180 148 172 +180 189 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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/background_sub_1.pal b/res/graphics/pokedex/background_sub_1.pal new file mode 100644 index 0000000000..274faf790f --- /dev/null +++ b/res/graphics/pokedex/background_sub_1.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +238 189 139 +189 139 32 +255 255 255 +222 197 148 +0 0 0 +0 0 0 +213 238 180 +172 197 139 +0 0 0 +82 74 123 +131 98 180 +246 230 172 +189 139 32 +246 197 90 +238 180 106 +156 115 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +238 189 139 +65 197 213 +255 255 255 +164 230 238 +0 0 0 +0 0 0 +213 197 246 +172 123 238 +0 0 0 +82 74 123 +131 98 180 +213 255 255 +32 164 172 +32 222 246 +8 205 222 +74 131 139 +238 189 139 +189 139 32 +255 255 255 +222 197 148 +0 0 0 +0 0 0 +213 197 246 +172 123 238 +0 0 0 +82 74 123 +131 98 180 +246 230 172 +189 139 32 +238 180 106 +238 180 106 +156 115 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +57 90 115 +0 0 0 +255 213 0 +255 255 246 +255 255 255 +123 131 131 +213 148 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 diff --git a/res/graphics/pokedex/background_sub_2.pal b/res/graphics/pokedex/background_sub_2.pal new file mode 100644 index 0000000000..c4c48d941b --- /dev/null +++ b/res/graphics/pokedex/background_sub_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +238 189 139 +65 197 213 +255 255 255 +164 230 238 +0 0 0 +0 0 0 +213 238 180 +172 197 139 +0 0 0 +82 74 123 +131 98 180 +213 255 255 +32 164 172 +32 222 246 +8 205 222 +74 131 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/background_sub_3.pal b/res/graphics/pokedex/background_sub_3.pal new file mode 100644 index 0000000000..231524c8e7 --- /dev/null +++ b/res/graphics/pokedex/background_sub_3.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +238 189 139 +189 139 32 +255 255 255 +222 197 148 +0 0 0 +0 0 0 +213 238 180 +172 197 139 +0 0 0 +82 74 123 +131 98 180 +246 230 172 +189 139 32 +238 180 106 +238 180 106 +156 115 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/banner.png b/res/graphics/pokedex/banner.png new file mode 100644 index 0000000000..c13c6c4364 Binary files /dev/null and b/res/graphics/pokedex/banner.png differ diff --git a/res/graphics/pokedex/banner_anim.json b/res/graphics/pokedex/banner_anim.json new file mode 100644 index 0000000000..38b25da7c7 --- /dev/null +++ b/res/graphics/pokedex/banner_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": ["CellAnime17"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokedex/banner_cell.json b/res/graphics/pokedex/banner_cell.json new file mode 100644 index 0000000000..40a299b0d2 --- /dev/null +++ b/res/graphics/pokedex/banner_cell.json @@ -0,0 +1,44 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 1, + "mappingType": 2, + "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": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime17"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokedex/banner_default.pal b/res/graphics/pokedex/banner_default.pal new file mode 100644 index 0000000000..2d3f3d6125 --- /dev/null +++ b/res/graphics/pokedex/banner_default.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +205 205 246 +106 106 115 +238 238 238 +255 255 255 +0 0 0 +0 148 255 +255 255 197 +156 139 98 +255 115 115 +255 164 164 +255 255 255 +123 115 106 +41 115 172 +32 139 222 +148 189 156 +255 255 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/banner_national.pal b/res/graphics/pokedex/banner_national.pal new file mode 100644 index 0000000000..cbaee30109 --- /dev/null +++ b/res/graphics/pokedex/banner_national.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +74 74 74 +0 0 0 +131 131 115 +148 148 106 +255 255 255 +123 131 131 +213 148 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 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +106 57 0 +0 0 0 +238 139 0 +255 205 148 +255 255 255 +123 131 131 +213 148 90 diff --git a/res/graphics/pokedex/banner_register.pal b/res/graphics/pokedex/banner_register.pal new file mode 100644 index 0000000000..e9eee8a127 --- /dev/null +++ b/res/graphics/pokedex/banner_register.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +131 123 41 +0 0 0 +213 189 98 +255 255 230 +255 255 255 +123 131 131 +213 148 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 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +32 98 148 +0 0 0 +0 98 246 +82 197 255 +255 255 255 +123 131 131 +213 148 90 diff --git a/res/graphics/pokedex/banner_sinnoh.NSCR b/res/graphics/pokedex/banner_sinnoh.NSCR new file mode 100644 index 0000000000..f96d355c44 Binary files /dev/null and b/res/graphics/pokedex/banner_sinnoh.NSCR differ diff --git a/res/graphics/pokedex/banner_sinnoh.pal b/res/graphics/pokedex/banner_sinnoh.pal new file mode 100644 index 0000000000..0f6838b89f --- /dev/null +++ b/res/graphics/pokedex/banner_sinnoh.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +131 123 41 +0 0 0 +213 189 98 +255 255 230 +255 255 255 +123 131 131 +213 148 90 +255 213 205 +172 189 189 +16 24 32 +197 238 246 +156 189 255 +189 238 180 +255 255 255 +172 205 156 +246 246 255 +197 255 189 +255 255 213 +131 172 246 +197 180 98 +106 148 205 +222 255 213 +213 246 205 +148 238 131 +0 0 0 +0 0 0 +115 213 230 +139 222 238 +139 222 238 +139 222 238 +139 222 238 +115 213 230 +115 213 230 +0 0 0 +115 213 230 +106 189 230 +98 156 238 +115 213 230 +197 164 90 +255 205 238 +172 189 189 +238 230 222 +189 238 180 +197 255 189 +255 255 255 +131 197 246 +189 222 230 +238 255 255 +131 131 205 +172 172 246 +222 255 213 +213 246 205 +172 197 164 +238 246 230 +222 238 213 +246 222 189 +65 197 213 +164 230 238 +255 255 255 +0 0 0 +0 0 0 +213 238 180 +172 197 139 +0 0 0 +82 74 123 +131 156 123 +213 255 255 +32 164 172 +32 222 246 +8 205 222 +74 131 139 +238 189 139 +65 197 213 +164 230 238 +255 255 255 +0 0 0 +0 0 0 +213 238 180 +172 197 139 +0 0 0 +82 74 123 +131 156 123 +213 255 255 +32 164 172 +32 222 246 +8 205 222 +74 131 139 +189 98 213 +41 148 172 +32 115 230 +98 213 222 +57 172 131 +98 222 139 +139 197 98 +57 205 139 +57 156 246 +246 106 65 +41 238 255 +255 148 49 +255 205 65 +172 222 32 +148 98 82 +74 255 32 +148 213 255 +148 148 115 +255 255 255 +255 115 106 +255 98 98 +255 90 90 +205 197 189 +213 90 90 +106 90 74 +213 213 172 +106 74 24 +197 164 90 +238 238 213 +172 172 139 +213 213 172 +238 238 197 +238 255 189 +0 148 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 +230 222 189 +255 255 222 +0 0 0 +0 0 0 +238 238 197 +230 230 164 +139 139 255 +115 115 115 +123 123 131 +0 0 0 +74 123 139 +65 115 131 +41 222 189 +90 205 197 +41 197 230 +0 0 0 +255 255 164 +222 255 213 +213 246 205 +139 139 139 +123 123 123 +106 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +238 238 197 +131 123 65 +255 255 255 +222 222 222 +172 172 164 +156 156 148 +148 139 131 +131 115 98 +222 222 148 +180 180 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +16 24 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 139 205 +172 189 189 +16 24 32 +255 255 255 +98 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 98 213 +41 148 172 +164 131 230 +98 213 222 +57 172 131 +98 222 139 +139 197 98 +57 205 139 +57 156 246 +246 106 65 +41 238 255 +255 148 49 +255 205 65 +172 222 32 +148 98 82 +74 255 32 +148 213 255 +189 156 131 +255 255 255 +255 115 106 +255 98 98 +255 90 90 +213 205 197 +213 90 90 +131 115 98 +255 205 131 +115 189 90 +189 255 156 +238 230 180 +255 164 98 +255 189 123 +255 238 148 diff --git a/res/graphics/pokedex/buttons.pal b/res/graphics/pokedex/buttons.pal new file mode 100644 index 0000000000..a2642a2b51 --- /dev/null +++ b/res/graphics/pokedex/buttons.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +205 205 246 +205 205 164 +98 98 98 +98 98 98 +213 164 205 +189 189 189 +115 115 123 +164 65 156 +197 8 8 +246 8 8 +255 90 90 +180 106 49 +255 238 180 +0 0 0 +255 255 197 +255 255 255 +238 197 213 +131 131 139 +238 238 238 +255 255 255 +0 0 0 +222 222 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 +197 246 189 +131 131 139 +238 238 238 +255 255 255 +255 255 255 +0 0 0 +0 0 0 +156 98 164 +0 0 0 +115 98 74 +189 172 115 +205 255 238 +74 156 139 +90 222 213 +82 205 189 +65 139 123 +246 222 189 +131 131 139 +238 238 238 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +156 98 164 +0 0 0 +115 98 74 +189 172 115 +230 255 222 +98 156 74 +131 222 98 +131 205 106 +90 139 65 +205 230 156 +131 131 139 +238 238 238 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +156 98 164 +0 0 0 +115 98 74 +189 172 115 +213 230 255 +106 148 246 +164 189 255 +148 172 255 +98 123 172 +197 246 189 +156 115 32 +246 222 172 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +156 98 164 +0 0 0 +115 98 74 +189 172 115 +246 230 172 +189 139 32 +246 197 90 +238 180 106 +156 115 32 +205 230 156 +205 139 139 +115 115 123 +115 115 123 +255 255 255 +205 139 139 +115 115 123 +156 98 164 +0 0 0 +115 98 74 +189 172 115 +255 197 189 +230 98 82 +246 156 148 +246 139 131 +180 65 65 +205 205 255 +189 189 164 +98 90 106 +98 90 106 +197 148 197 +172 172 189 +106 106 131 +148 57 156 +197 8 8 +246 8 8 +238 90 115 +172 98 49 +238 213 180 +0 0 0 +238 230 197 +238 230 246 +213 205 255 +172 172 172 +98 90 123 +98 90 123 +172 131 197 +156 148 180 +98 90 139 +139 49 164 +197 8 8 +246 8 8 +213 82 131 +172 98 49 +213 189 172 +0 0 0 +213 205 189 +213 205 230 +213 205 255 +156 148 172 +90 82 139 +90 82 139 +156 115 189 +139 131 180 +90 82 148 +123 41 164 +197 8 8 +246 8 8 +189 74 148 +164 90 49 +197 164 164 +0 0 0 +189 180 189 +189 180 213 +115 255 164 +16 24 32 +172 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 246 255 +205 222 255 +189 222 255 +230 238 255 +222 230 255 +255 255 255 +246 222 189 +180 180 180 +115 115 123 +115 115 123 +0 0 0 +180 180 180 +115 115 123 +156 98 164 +0 0 0 +115 98 74 +189 172 115 +255 255 255 +148 148 148 +197 197 197 +189 189 189 +115 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/res/graphics/pokedex/cry_bar.png b/res/graphics/pokedex/cry_bar.png new file mode 100644 index 0000000000..086ce3c2b6 Binary files /dev/null and b/res/graphics/pokedex/cry_bar.png differ diff --git a/res/graphics/pokedex/cry_bar_anim.json b/res/graphics/pokedex/cry_bar_anim.json new file mode 100644 index 0000000000..d922e1c487 --- /dev/null +++ b/res/graphics/pokedex/cry_bar_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": 4, + "resultId": 0 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "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/pokedex/cry_bar_cell.json b/res/graphics/pokedex/cry_bar_cell.json new file mode 100644 index 0000000000..9f7f60c805 --- /dev/null +++ b/res/graphics/pokedex/cry_bar_cell.json @@ -0,0 +1,78 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 2, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": 0, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": 0, + "minY": 0, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 1, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokedex/cry_button.NSCR b/res/graphics/pokedex/cry_button.NSCR new file mode 100644 index 0000000000..04438ff4f7 Binary files /dev/null and b/res/graphics/pokedex/cry_button.NSCR differ diff --git a/res/graphics/pokedex/cry_dials.png b/res/graphics/pokedex/cry_dials.png new file mode 100644 index 0000000000..c34072146c Binary files /dev/null and b/res/graphics/pokedex/cry_dials.png differ diff --git a/res/graphics/pokedex/cry_dials_anim.json b/res/graphics/pokedex/cry_dials_anim.json new file mode 100644 index 0000000000..ba36d99e72 --- /dev/null +++ b/res/graphics/pokedex/cry_dials_anim.json @@ -0,0 +1,254 @@ +{ + "labelEnabled": true, + "sequenceCount": 7, + "frameCount": 43, + "sequences": [{ + "frameCount": 9, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 9 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 10 + }, { + "frameDelay": 4, + "resultId": 11 + }, { + "frameDelay": 3, + "resultId": 12 + }, { + "frameDelay": 3, + "resultId": 13 + }, { + "frameDelay": 4, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 15 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 15 + }, { + "frameDelay": 4, + "resultId": 14 + }, { + "frameDelay": 3, + "resultId": 13 + }, { + "frameDelay": 3, + "resultId": 12 + }, { + "frameDelay": 4, + "resultId": 11 + }, { + "frameDelay": 1, + "resultId": 10 + }] + }, { + "frameCount": 9, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 2, + "resultId": 8 + }, { + "frameDelay": 2, + "resultId": 7 + }, { + "frameDelay": 2, + "resultId": 6 + }, { + "frameDelay": 2, + "resultId": 5 + }, { + "frameDelay": 2, + "resultId": 4 + }, { + "frameDelay": 2, + "resultId": 3 + }, { + "frameDelay": 2, + "resultId": 2 + }, { + "frameDelay": 2, + "resultId": 1 + }, { + "frameDelay": 2, + "resultId": 0 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 4, + "resultId": 17 + }, { + "frameDelay": 3, + "resultId": 18 + }, { + "frameDelay": 3, + "resultId": 19 + }, { + "frameDelay": 4, + "resultId": 20 + }, { + "frameDelay": 1, + "resultId": 21 + }] + }, { + "frameCount": 6, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 1, + "frameData": [{ + "frameDelay": 1, + "resultId": 21 + }, { + "frameDelay": 4, + "resultId": 20 + }, { + "frameDelay": 3, + "resultId": 19 + }, { + "frameDelay": 3, + "resultId": 18 + }, { + "frameDelay": 4, + "resultId": 17 + }, { + "frameDelay": 1, + "resultId": 16 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 19 + }, { + "resultType": 0, + "index": 20 + }, { + "resultType": 0, + "index": 21 + }, { + "resultType": 0, + "index": 18 + }, { + "resultType": 0, + "index": 17 + }, { + "resultType": 0, + "index": 16 + }], + "resultCount": 22, + "labels": ["CellAnime0", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime1", "CellAnime41", "CellAnime411"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokedex/cry_dials_cell.json b/res/graphics/pokedex/cry_dials_cell.json new file mode 100644 index 0000000000..dcb5c693fc --- /dev/null +++ b/res/graphics/pokedex/cry_dials_cell.json @@ -0,0 +1,998 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 22, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": -25, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": -17, + "maxY": 15, + "minX": -32, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": -9, + "maxY": 15, + "minX": -24, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": -1, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": 15, + "minX": -8, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": 0, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 15, + "minX": 8, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 31, + "maxY": 15, + "minX": 16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": 24, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 12 + }, + "maxX": 31, + "maxY": 31, + "minX": -32, + "minY": -32, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 152, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 168, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 184, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 152, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 184, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 168, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 200, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 216, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 152, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 232, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 184, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 200, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 216, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 152, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 17, + "maxY": 17, + "minX": -19, + "minY": -19, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -19, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -19, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 232, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -14, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 184, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime1", "CellAnime41", "CellAnime411"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokedex/cry_sub.NSCR b/res/graphics/pokedex/cry_sub.NSCR new file mode 100644 index 0000000000..667ca92663 Binary files /dev/null and b/res/graphics/pokedex/cry_sub.NSCR differ diff --git a/res/graphics/pokedex/cry_sub.pal b/res/graphics/pokedex/cry_sub.pal new file mode 100644 index 0000000000..c2a0804bd8 --- /dev/null +++ b/res/graphics/pokedex/cry_sub.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +148 213 255 +148 148 115 +255 255 255 +255 189 106 +255 172 98 +255 164 82 +205 197 189 +255 148 49 +106 90 74 +213 213 172 +106 74 24 +197 164 115 +238 238 213 +172 172 139 +213 213 172 +238 238 197 +148 213 255 +148 148 115 +255 255 255 +255 115 106 +255 98 98 +255 90 90 +205 197 189 +213 90 90 +106 90 74 +213 213 172 +106 74 24 +197 164 115 +238 238 213 +172 172 139 +213 213 172 +238 238 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 +148 213 255 +189 156 131 +255 255 255 +255 189 106 +255 172 98 +255 164 82 +213 205 197 +255 148 49 +131 115 98 +255 205 131 +115 189 90 +189 255 156 +238 230 180 +255 164 98 +255 189 123 +255 238 148 +148 213 255 +189 156 131 +255 255 255 +255 115 106 +255 98 98 +255 90 90 +213 205 197 +213 90 90 +131 115 98 +255 205 131 +115 189 90 +189 255 156 +238 230 180 +255 164 98 +255 189 123 +255 238 148 diff --git a/res/graphics/pokedex/cry_wheel.NSCR b/res/graphics/pokedex/cry_wheel.NSCR new file mode 100644 index 0000000000..260465beae Binary files /dev/null and b/res/graphics/pokedex/cry_wheel.NSCR differ diff --git a/res/graphics/pokedex/cry_wheel.png b/res/graphics/pokedex/cry_wheel.png new file mode 100644 index 0000000000..71b1147ebc Binary files /dev/null and b/res/graphics/pokedex/cry_wheel.png differ diff --git a/res/graphics/pokedex/cursor.png b/res/graphics/pokedex/cursor.png new file mode 100644 index 0000000000..e905775882 Binary files /dev/null and b/res/graphics/pokedex/cursor.png differ diff --git a/res/graphics/pokedex/cursor_anim.json b/res/graphics/pokedex/cursor_anim.json new file mode 100644 index 0000000000..c82287576d --- /dev/null +++ b/res/graphics/pokedex/cursor_anim.json @@ -0,0 +1,146 @@ +{ + "labelEnabled": true, + "sequenceCount": 4, + "frameCount": 16, + "sequences": [{ + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 0 + }, { + "frameDelay": 6, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 6, + "resultId": 1 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 3 + }, { + "frameDelay": 6, + "resultId": 4 + }, { + "frameDelay": 6, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 4 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 6, + "resultId": 7 + }, { + "frameDelay": 6, + "resultId": 8 + }, { + "frameDelay": 6, + "resultId": 7 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 9 + }, { + "frameDelay": 6, + "resultId": 10 + }, { + "frameDelay": 6, + "resultId": 11 + }, { + "frameDelay": 6, + "resultId": 10 + }] + }], + "animationResults": [{ + "resultType": 2, + "index": 0, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 0, + "positionX": -1, + "positionY": -1 + }, { + "resultType": 2, + "index": 0, + "positionX": -2, + "positionY": -2 + }, { + "resultType": 2, + "index": 1, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 1, + "positionX": 1, + "positionY": -1 + }, { + "resultType": 2, + "index": 1, + "positionX": 2, + "positionY": -2 + }, { + "resultType": 2, + "index": 2, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 2, + "positionX": -1, + "positionY": 1 + }, { + "resultType": 2, + "index": 2, + "positionX": -2, + "positionY": 2 + }, { + "resultType": 2, + "index": 3, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 3, + "positionX": 1, + "positionY": 1 + }, { + "resultType": 2, + "index": 3, + "positionX": 2, + "positionY": 2 + }], + "resultCount": 12, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/graphics/pokedex/cursor_cell.json b/res/graphics/pokedex/cursor_cell.json new file mode 100644 index 0000000000..bc152ce28a --- /dev/null +++ b/res/graphics/pokedex/cursor_cell.json @@ -0,0 +1,146 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 4, + "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": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 16, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": true, + "hvFlip": true, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 24, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], + "labelCount": 4 +} \ No newline at end of file diff --git a/res/graphics/pokedex/dummy1.NSCR b/res/graphics/pokedex/dummy1.NSCR new file mode 100644 index 0000000000..28f3acff42 Binary files /dev/null and b/res/graphics/pokedex/dummy1.NSCR differ diff --git a/res/graphics/pokedex/dummy1.pal b/res/graphics/pokedex/dummy1.pal new file mode 100644 index 0000000000..295172bc4c --- /dev/null +++ b/res/graphics/pokedex/dummy1.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +255 189 246 +16 24 32 +172 189 189 +0 0 0 +255 230 230 +255 230 164 +255 255 230 +230 222 139 +255 246 246 +189 172 172 +189 164 164 +90 65 65 +172 148 148 +164 139 139 +205 180 123 +213 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/dummy1.png b/res/graphics/pokedex/dummy1.png new file mode 100644 index 0000000000..915ca2aa86 Binary files /dev/null and b/res/graphics/pokedex/dummy1.png differ diff --git a/res/graphics/pokedex/dummy2.NSCR b/res/graphics/pokedex/dummy2.NSCR new file mode 100644 index 0000000000..0190c45540 Binary files /dev/null and b/res/graphics/pokedex/dummy2.NSCR differ diff --git a/res/graphics/pokedex/dummy2.pal b/res/graphics/pokedex/dummy2.pal new file mode 100644 index 0000000000..6e97903131 --- /dev/null +++ b/res/graphics/pokedex/dummy2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +148 238 131 +230 238 172 +230 238 172 +230 238 172 +0 0 0 +0 0 0 +0 0 0 +230 238 172 +0 0 0 +230 238 172 +230 238 172 +230 238 172 +230 238 172 +230 238 172 +230 238 172 +230 238 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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/dummy2.png b/res/graphics/pokedex/dummy2.png new file mode 100644 index 0000000000..46ff66023c Binary files /dev/null and b/res/graphics/pokedex/dummy2.png differ diff --git a/res/graphics/pokedex/dummy3.NSCR b/res/graphics/pokedex/dummy3.NSCR new file mode 100644 index 0000000000..5299d7fe49 Binary files /dev/null and b/res/graphics/pokedex/dummy3.NSCR differ diff --git a/res/graphics/pokedex/dummy3.pal b/res/graphics/pokedex/dummy3.pal new file mode 100644 index 0000000000..296cf0e30a --- /dev/null +++ b/res/graphics/pokedex/dummy3.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +222 222 255 +172 189 189 +16 24 32 +0 0 0 +82 189 106 +106 164 255 +197 222 255 +238 238 238 +123 115 106 +57 90 115 +0 0 0 +255 213 0 +255 255 246 +255 255 255 +123 131 131 +213 148 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/pokedex/dummy3.png b/res/graphics/pokedex/dummy3.png new file mode 100644 index 0000000000..00d6d88df8 Binary files /dev/null and b/res/graphics/pokedex/dummy3.png differ diff --git a/res/graphics/pokedex/dungeon_highlight.png b/res/graphics/pokedex/dungeon_highlight.png new file mode 100644 index 0000000000..f747b57cd8 Binary files /dev/null and b/res/graphics/pokedex/dungeon_highlight.png differ diff --git a/res/graphics/pokedex/dungeon_highlight_anim.json b/res/graphics/pokedex/dungeon_highlight_anim.json new file mode 100644 index 0000000000..bb8ae1f33d --- /dev/null +++ b/res/graphics/pokedex/dungeon_highlight_anim.json @@ -0,0 +1,88 @@ +{ + "labelEnabled": true, + "sequenceCount": 6, + "frameCount": 6, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 5 + }] + }], + "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", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"], + "labelCount": 6 +} \ No newline at end of file diff --git a/res/graphics/pokedex/dungeon_highlight_cell.json b/res/graphics/pokedex/dungeon_highlight_cell.json new file mode 100644 index 0000000000..5df1b073d5 --- /dev/null +++ b/res/graphics/pokedex/dungeon_highlight_cell.json @@ -0,0 +1,294 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 6, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 4, + "maxY": 31, + "minX": -11, + "minY": -32, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 4, + "maxY": 31, + "minX": -11, + "minY": -32, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 2, + "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": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "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": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 4, + "maxY": 13, + "minX": -11, + "minY": -14, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 16, + "Size": 1 + }, + "Attr2": { + "CharName": 5, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 5, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 4, + "maxY": 13, + "minX": -11, + "minY": -14, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 16, + "Size": 1 + }, + "Attr2": { + "CharName": 5, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -14, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -11, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 5, + "Priority": 0, + "Palette": 2 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"], + "labelCount": 6 +} \ No newline at end of file diff --git a/res/graphics/pokedex/entry_main.png b/res/graphics/pokedex/entry_main.png new file mode 100644 index 0000000000..dfaaa6f7d4 Binary files /dev/null and b/res/graphics/pokedex/entry_main.png differ diff --git a/res/graphics/pokedex/entry_sub.png b/res/graphics/pokedex/entry_sub.png new file mode 100644 index 0000000000..089bd1de42 Binary files /dev/null and b/res/graphics/pokedex/entry_sub.png differ diff --git a/res/graphics/pokedex/foreign_entry_window.NSCR b/res/graphics/pokedex/foreign_entry_window.NSCR new file mode 100644 index 0000000000..59a3198be3 Binary files /dev/null and b/res/graphics/pokedex/foreign_entry_window.NSCR differ diff --git a/res/graphics/pokedex/foreign_summary_window.NSCR b/res/graphics/pokedex/foreign_summary_window.NSCR new file mode 100644 index 0000000000..ef6265b171 Binary files /dev/null and b/res/graphics/pokedex/foreign_summary_window.NSCR differ diff --git a/res/graphics/pokedex/form_display_box.png b/res/graphics/pokedex/form_display_box.png new file mode 100644 index 0000000000..d6b3f3fce4 Binary files /dev/null and b/res/graphics/pokedex/form_display_box.png differ diff --git a/res/graphics/pokedex/form_display_box_anim.json b/res/graphics/pokedex/form_display_box_anim.json new file mode 100644 index 0000000000..efed2a4b75 --- /dev/null +++ b/res/graphics/pokedex/form_display_box_anim.json @@ -0,0 +1,70 @@ +{ + "labelEnabled": true, + "sequenceCount": 3, + "frameCount": 6, + "sequences": [{ + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 0 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 6, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 6, + "resultId": 3 + }, { + "frameDelay": 6, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 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": 0, + "index": 2 + }], + "resultCount": 5, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2"], + "labelCount": 3 +} \ No newline at end of file diff --git a/res/graphics/pokedex/form_display_box_cell.json b/res/graphics/pokedex/form_display_box_cell.json new file mode 100644 index 0000000000..1677d2c541 --- /dev/null +++ b/res/graphics/pokedex/form_display_box_cell.json @@ -0,0 +1,672 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 3, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 21 + }, + "maxX": 51, + "maxY": 63, + "minX": -52, + "minY": -56, + "oamCount": 15, + "OAM": [{ + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 25, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 26, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 34, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 38, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 39, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 41, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 43, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 45, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 46, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 47, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 49, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 50, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 21 + }, + "maxX": 51, + "maxY": 63, + "minX": -52, + "minY": -56, + "oamCount": 15, + "OAM": [{ + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 75, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 77, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 85, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 89, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 90, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 92, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 94, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -52, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 97, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 99, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": 56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 44, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 100, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2"], + "labelCount": 3 +} \ No newline at end of file diff --git a/res/graphics/pokedex/forms_sub.NSCR b/res/graphics/pokedex/forms_sub.NSCR new file mode 100644 index 0000000000..d1c0a18c67 Binary files /dev/null and b/res/graphics/pokedex/forms_sub.NSCR differ diff --git a/res/graphics/pokedex/height_check_main.NSCR b/res/graphics/pokedex/height_check_main.NSCR new file mode 100644 index 0000000000..9120f10bd1 Binary files /dev/null and b/res/graphics/pokedex/height_check_main.NSCR differ diff --git a/res/graphics/pokedex/info.pal b/res/graphics/pokedex/info.pal new file mode 100644 index 0000000000..92af9bb978 --- /dev/null +++ b/res/graphics/pokedex/info.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +197 246 189 +98 123 172 +180 205 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 115 74 +156 189 115 +213 222 255 +106 148 246 +164 189 255 +139 172 255 +98 123 172 +197 246 189 +156 115 32 +246 222 164 +255 255 255 +0 0 0 +0 0 0 +213 197 246 +0 0 0 +82 74 123 +90 115 74 +156 189 115 +246 230 172 +189 139 32 +246 197 90 +238 180 106 +156 115 32 +205 255 246 +156 98 172 +238 180 255 +255 255 255 +0 0 0 +180 180 197 +106 106 106 +180 180 180 +255 255 255 +90 115 74 +156 189 115 +255 213 255 +213 106 246 +238 164 255 +230 139 255 +156 98 172 +205 255 246 +189 123 82 +255 222 213 +255 255 255 +0 0 0 +156 0 0 +106 106 106 +255 164 164 +255 115 115 +90 115 74 +156 189 115 +246 230 205 +230 139 82 +246 205 164 +238 180 131 +189 123 82 +246 222 189 +74 131 139 +213 246 246 +255 255 255 +0 0 0 +0 0 0 +213 197 246 +0 0 0 +82 74 123 +82 74 123 +131 98 180 +213 255 255 +32 164 172 +32 222 246 +8 205 222 +74 131 139 +32 197 246 +255 255 255 +180 180 180 +98 98 106 +0 0 0 +255 255 189 +255 255 90 +238 205 41 +255 205 189 +255 180 148 +255 139 74 +115 106 180 +131 139 197 +98 156 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/info_entry_window.NSCR b/res/graphics/pokedex/info_entry_window.NSCR new file mode 100644 index 0000000000..0ca5d61594 Binary files /dev/null and b/res/graphics/pokedex/info_entry_window.NSCR differ diff --git a/res/graphics/pokedex/info_footprint_window.NSCR b/res/graphics/pokedex/info_footprint_window.NSCR new file mode 100644 index 0000000000..1c1dd23568 Binary files /dev/null and b/res/graphics/pokedex/info_footprint_window.NSCR differ diff --git a/res/graphics/pokedex/info_language_buttons.png b/res/graphics/pokedex/info_language_buttons.png new file mode 100644 index 0000000000..9b133ca2b1 Binary files /dev/null and b/res/graphics/pokedex/info_language_buttons.png differ diff --git a/res/graphics/pokedex/info_language_buttons_anim.json b/res/graphics/pokedex/info_language_buttons_anim.json new file mode 100644 index 0000000000..4efc1fc9cb --- /dev/null +++ b/res/graphics/pokedex/info_language_buttons_anim.json @@ -0,0 +1,244 @@ +{ + "labelEnabled": true, + "sequenceCount": 14, + "frameCount": 20, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 5 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 6 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 7 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 8 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 9 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 10 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 11 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 12 + }, { + "frameDelay": 4, + "resultId": 13 + }, { + "frameDelay": 6, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 15 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 2, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 4, + "resultId": 17 + }, { + "frameDelay": 6, + "resultId": 18 + }, { + "frameDelay": 1, + "resultId": 19 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 2, + "index": 12, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 12, + "positionX": 0, + "positionY": -2 + }, { + "resultType": 2, + "index": 13, + "positionX": 0, + "positionY": -4 + }, { + "resultType": 2, + "index": 13, + "positionX": 0, + "positionY": -2 + }, { + "resultType": 2, + "index": 14, + "positionX": 0, + "positionY": 0 + }, { + "resultType": 2, + "index": 14, + "positionX": 0, + "positionY": -2 + }, { + "resultType": 2, + "index": 15, + "positionX": 0, + "positionY": -4 + }, { + "resultType": 2, + "index": 15, + "positionX": 0, + "positionY": -2 + }], + "resultCount": 20, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13"], + "labelCount": 14 +} \ No newline at end of file diff --git a/res/graphics/pokedex/info_language_buttons_cell.json b/res/graphics/pokedex/info_language_buttons_cell.json new file mode 100644 index 0000000000..1913087c6c --- /dev/null +++ b/res/graphics/pokedex/info_language_buttons_cell.json @@ -0,0 +1,794 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 16, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 16, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 16, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13"], + "labelCount": 14 +} \ No newline at end of file diff --git a/res/graphics/pokedex/info_main.NSCR b/res/graphics/pokedex/info_main.NSCR new file mode 100644 index 0000000000..6b7da82c14 Binary files /dev/null and b/res/graphics/pokedex/info_main.NSCR differ diff --git a/res/graphics/pokedex/info_species_window.NSCR b/res/graphics/pokedex/info_species_window.NSCR new file mode 100644 index 0000000000..7de4a5625d Binary files /dev/null and b/res/graphics/pokedex/info_species_window.NSCR differ diff --git a/res/graphics/pokedex/info_sub.NSCR b/res/graphics/pokedex/info_sub.NSCR new file mode 100644 index 0000000000..53a78f4297 Binary files /dev/null and b/res/graphics/pokedex/info_sub.NSCR differ diff --git a/res/graphics/pokedex/info_sub_pressed.NSCR b/res/graphics/pokedex/info_sub_pressed.NSCR new file mode 100644 index 0000000000..d2fb598819 Binary files /dev/null and b/res/graphics/pokedex/info_sub_pressed.NSCR differ diff --git a/res/graphics/pokedex/info_sub_unpressed.NSCR b/res/graphics/pokedex/info_sub_unpressed.NSCR new file mode 100644 index 0000000000..d0dc453a4e Binary files /dev/null and b/res/graphics/pokedex/info_sub_unpressed.NSCR differ diff --git a/res/graphics/pokedex/map_fullmoon_island.NSCR b/res/graphics/pokedex/map_fullmoon_island.NSCR new file mode 100644 index 0000000000..50e3e78ac3 Binary files /dev/null and b/res/graphics/pokedex/map_fullmoon_island.NSCR differ diff --git a/res/graphics/pokedex/map_newmoon_island.NSCR b/res/graphics/pokedex/map_newmoon_island.NSCR new file mode 100644 index 0000000000..e071362ce9 Binary files /dev/null and b/res/graphics/pokedex/map_newmoon_island.NSCR differ diff --git a/res/graphics/pokedex/map_seabreak_path.NSCR b/res/graphics/pokedex/map_seabreak_path.NSCR new file mode 100644 index 0000000000..6d5050989f Binary files /dev/null and b/res/graphics/pokedex/map_seabreak_path.NSCR differ diff --git a/res/graphics/pokedex/map_spring_path.NSCR b/res/graphics/pokedex/map_spring_path.NSCR new file mode 100644 index 0000000000..c619d231f9 Binary files /dev/null and b/res/graphics/pokedex/map_spring_path.NSCR differ diff --git a/res/graphics/pokedex/meson.build b/res/graphics/pokedex/meson.build new file mode 100644 index 0000000000..5efdac0bac --- /dev/null +++ b/res/graphics/pokedex/meson.build @@ -0,0 +1,298 @@ +# Tiles and tilemaps +tiles_png_4bpp = files( + 'scroll_main_background.png', + 'scroll_sub_background.png', + 'dummy1.png', + 'dummy2.png', + 'dummy3.png', + 'entry_main.png', + 'entry_sub.png', +) + +tiles_png_8bpp = files( + 'scroll_wheel.png', + 'cry_wheel.png', +) + +tiles_ncgr_4bpp = ncgr_lz_gen.process( + tiles_png_4bpp, + extra_args: [ + '-version101', + '-sopc', + '-bitdepth', '4', + '-nopad', + ], +) + +tiles_ncgr_8bpp = ncgr_lz_gen.process( + tiles_png_8bpp, + extra_args: [ + '-version101', + '-sopc', + '-bitdepth', '8', + '-nopad', + ], +) + +scanned_png = files( + 'weight_scale.png', +) + +tilemaps_nscr = files( + 'scroll_wheel.NSCR', + 'scroll_main_background.NSCR', + 'register_species_window.NSCR', + 'search_sinnoh.NSCR', + 'scroll_sub.NSCR', + 'search_national.NSCR', + 'search_filter.NSCR', + 'search_filter_order.NSCR', + 'search_filter_name.NSCR', + 'search_filter_type.NSCR', + 'search_filter_form.NSCR', + 'dummy1.NSCR', + 'dummy2.NSCR', + 'info_main.NSCR', + 'info_species_window.NSCR', + 'info_footprint_window.NSCR', + 'dummy3.NSCR', + 'info_entry_window.NSCR', + 'foreign_entry_window.NSCR', + 'foreign_summary_window.NSCR', + 'banner_sinnoh.NSCR', + 'forms_sub.NSCR', + 'page_panel.NSCR', + 'info_sub_unpressed.NSCR', + 'size_sub.NSCR', + 'info_sub.NSCR', + 'info_sub_pressed.NSCR', + 'area_map.NSCR', + 'map_newmoon_island.NSCR', + 'map_seabreak_path.NSCR', + 'map_fullmoon_island.NSCR', + 'map_spring_path.NSCR', + 'area_sub.NSCR', + 'cry_button.NSCR', + 'cry_sub.NSCR', + 'cry_wheel.NSCR', + 'weight_check_main.NSCR', + 'height_check_main.NSCR', + 'search_main.NSCR', +) + +tilemaps_nscr = lz_gen.process( + tilemaps_nscr, + extra_args: [ + '-nopad', + ], +) + +# sprite images +sprites_png_mappingtype0 = files( + 'scroll_buttons.png', + 'page_buttons.png', + 'info_language_buttons.png', + 'size_buttons_pressed.png', + 'cry_dials.png', + 'search_buttons.png', + 'search_button_forms.png', +) +sprites_png_mappingtype0_cell = files( + 'time_day_icons.png', + 'cursor.png', +) + +sprites_png_mappingtype128 = files( + 'cry_bar.png', + 'size_check_icons.png', + 'dungeon_highlight.png', + 'form_display_box.png', +) +sprites_png_mappingtype128_cell = files( + 'name_tag.png', + 'search_body_shapes.png', + 'banner.png', + 'type_icons.png', + 'unseen_icon.png', +) + +scanned_ncgr = ncgr_lz_gen.process( + scanned_png, + extra_args: [ + '-version101', + '-scan', + '-sopc', + '-nopad', + ], +) + +sprites_ncgr_mappingtype0 = ncgr_lz_gen.process( + sprites_png_mappingtype0, + extra_args: [ + '-version101', + '-clobbersize', + '-mappingtype', '0', + '-convertTo4Bpp', + '-nopad', + ], +) + +sprites_ncgr_mappingtype0_cell = ncgr_cell_lz_gen.process( + sprites_png_mappingtype0_cell, + extra_args: [ + '-version101', + '-clobbersize', + '-mappingtype', '0', + '-convertTo4Bpp', + '-nopad', + ], +) + +sprites_ncgr_mappingtype128 = ncgr_lz_gen.process( + sprites_png_mappingtype128, + extra_args: [ + '-version101', + '-clobbersize', + '-mappingtype', '128', + '-convertTo4Bpp', + '-nopad', + ], +) + +sprites_ncgr_mappingtype128_cell = ncgr_cell_lz_gen.process( + sprites_png_mappingtype128_cell, + extra_args: [ + '-version101', + '-clobbersize', + '-mappingtype', '128', + '-convertTo4Bpp', + '-nopad', + ], +) + +# Sprite cells +sprites_cell_json = files( + 'name_tag_cell.json', + 'search_body_shapes_cell.json', + 'scroll_buttons_cell.json', + 'banner_cell.json', + 'type_icons_cell.json', + 'size_check_icons_cell.json', + 'page_buttons_cell.json', + 'info_language_buttons_cell.json', + 'size_buttons_pressed_cell.json', + 'time_day_icons_cell.json', + 'dungeon_highlight_cell.json', + 'unseen_icon_cell.json', + 'cry_dials_cell.json', + 'cry_bar_cell.json', + 'cursor_cell.json', + 'form_display_box_cell.json', + 'search_buttons_cell.json', + 'search_button_forms_cell.json', +) + +sprites_ncer = ncer_lz_gen.process( + sprites_cell_json, + extra_args: [ + '-nopad', + ], +) + +# Sprite anims +sprites_anim_json = files( + 'name_tag_anim.json', + 'search_body_shapes_anim.json', + 'scroll_buttons_anim.json', + 'banner_anim.json', + 'type_icons_anim.json', + 'size_check_icons_anim.json', + 'page_buttons_anim.json', + 'info_language_buttons_anim.json', + 'size_buttons_pressed_anim.json', + 'time_day_icons_anim.json', + 'dungeon_highlight_anim.json', + 'unseen_icon_anim.json', + 'cry_dials_anim.json', + 'cry_bar_anim.json', + 'cursor_anim.json', + 'form_display_box_anim.json', + 'search_buttons_anim.json', + 'search_button_forms_anim.json', +) + +sprites_nanr = nanr_lz_gen.process( + sprites_anim_json, + extra_args: [ + '-nopad', + ], +) + +# Palettes +palettes_pal = files( + 'background_scroll_default.pal', + 'background_scroll_sinnoh.pal', + 'dummy1.pal', + 'buttons.pal', + 'register.pal', + 'search.pal', + 'banner_sinnoh.pal', + 'dummy2.pal', + 'background_sub_1.pal', + 'background_sub_2.pal', + 'background_sub_3.pal', + 'info.pal', + 'banner_default.pal', + 'type_icons.pal', + 'size_check_icons.pal', + 'area_morning.pal', + 'area_day.pal', + 'area_night.pal', + 'cry_sub.pal', + 'banner_register.pal', + 'banner_national.pal', + 'background_scroll_national.pal', + 'dummy3.pal', + 'cry_dials.png', + 'cry_bar.png', + 'cursor.png', + 'form_display_box.png', +) + +palettes_nclr = nclr_gen.process(palettes_pal, + extra_args: [ + '-bitdepth', '4', + ], +) + +pokedex_order = files('pokedex.order') +pokedex_graphics_narc = custom_target('zukan.narc', + output: [ + 'zukan.narc', + 'zukan.naix.h', + ], + input: [ + tiles_ncgr_4bpp, + tiles_ncgr_8bpp, + tilemaps_nscr, + sprites_ncgr_mappingtype0, + sprites_ncgr_mappingtype0_cell, + sprites_ncgr_mappingtype128, + sprites_ncgr_mappingtype128_cell, + scanned_ncgr, + sprites_ncer, + sprites_nanr, + palettes_nclr, + pokedex_order, + ], + command: [ + narc_exe, 'create', + '--naix', + '--order', pokedex_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += pokedex_graphics_narc +naix_headers += pokedex_graphics_narc[1] diff --git a/res/graphics/pokedex/name_tag.png b/res/graphics/pokedex/name_tag.png new file mode 100644 index 0000000000..0293afe13b Binary files /dev/null and b/res/graphics/pokedex/name_tag.png differ diff --git a/res/graphics/pokedex/name_tag_anim.json b/res/graphics/pokedex/name_tag_anim.json new file mode 100644 index 0000000000..f27cb62403 --- /dev/null +++ b/res/graphics/pokedex/name_tag_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/pokedex/name_tag_cell.json b/res/graphics/pokedex/name_tag_cell.json new file mode 100644 index 0000000000..285d3ed948 --- /dev/null +++ b/res/graphics/pokedex/name_tag_cell.json @@ -0,0 +1,98 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 2, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 63, + "maxY": 15, + "minX": -64, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 1, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 8, + "Priority": 1, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1"], + "labelCount": 2 +} \ No newline at end of file diff --git a/res/graphics/pokedex/page_buttons.png b/res/graphics/pokedex/page_buttons.png new file mode 100644 index 0000000000..1aece4540d Binary files /dev/null and b/res/graphics/pokedex/page_buttons.png differ diff --git a/res/graphics/pokedex/page_buttons_anim.json b/res/graphics/pokedex/page_buttons_anim.json new file mode 100644 index 0000000000..207bd8ba98 --- /dev/null +++ b/res/graphics/pokedex/page_buttons_anim.json @@ -0,0 +1,196 @@ +{ + "labelEnabled": true, + "sequenceCount": 6, + "frameCount": 24, + "sequences": [{ + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 1, + "resultId": 7 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 8 + }, { + "frameDelay": 4, + "resultId": 9 + }, { + "frameDelay": 6, + "resultId": 10 + }, { + "frameDelay": 1, + "resultId": 11 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 12 + }, { + "frameDelay": 4, + "resultId": 13 + }, { + "frameDelay": 6, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 15 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 4, + "resultId": 17 + }, { + "frameDelay": 6, + "resultId": 18 + }, { + "frameDelay": 1, + "resultId": 19 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 20 + }, { + "frameDelay": 4, + "resultId": 21 + }, { + "frameDelay": 6, + "resultId": 22 + }, { + "frameDelay": 1, + "resultId": 23 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 16 + }, { + "resultType": 0, + "index": 17 + }, { + "resultType": 0, + "index": 18 + }, { + "resultType": 0, + "index": 19 + }, { + "resultType": 0, + "index": 20 + }, { + "resultType": 0, + "index": 21 + }, { + "resultType": 0, + "index": 22 + }, { + "resultType": 0, + "index": 23 + }], + "resultCount": 24, + "labels": ["CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6"], + "labelCount": 6 +} \ No newline at end of file diff --git a/res/graphics/pokedex/page_buttons_cell.json b/res/graphics/pokedex/page_buttons_cell.json new file mode 100644 index 0000000000..2ddcbbcc00 --- /dev/null +++ b/res/graphics/pokedex/page_buttons_cell.json @@ -0,0 +1,1786 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 24, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 68, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 68, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 68, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 68, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -15, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 60, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 3 + } + }] + }], + "labels": ["CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6"], + "labelCount": 6 +} \ No newline at end of file diff --git a/res/graphics/pokedex/page_panel.NSCR b/res/graphics/pokedex/page_panel.NSCR new file mode 100644 index 0000000000..273a7421bf Binary files /dev/null and b/res/graphics/pokedex/page_panel.NSCR differ diff --git a/res/graphics/pokedex/pokedex.order b/res/graphics/pokedex/pokedex.order new file mode 100644 index 0000000000..f002f8840f --- /dev/null +++ b/res/graphics/pokedex/pokedex.order @@ -0,0 +1,130 @@ +background_scroll_default.NCLR +background_scroll_sinnoh.NCLR +dummy1.NCLR +buttons.NCLR +register.NCLR +search.NCLR +banner_sinnoh.NCLR +dummy2.NCLR +background_sub_1.NCLR +background_sub_2.NCLR +background_sub_3.NCLR +info.NCLR +banner_default.NCLR +type_icons.NCLR +size_check_icons.NCLR +area_morning.NCLR +area_day.NCLR +area_night.NCLR +cry_dials.NCLR +cry_bar.NCLR +cry_sub.NCLR +cursor.NCLR +form_display_box.NCLR +banner_register.NCLR +banner_national.NCLR +background_scroll_national.NCLR +dummy3.NCLR +scroll_wheel.NCGR.lz +scroll_main_background.NCGR.lz +scroll_sub_background.NCGR.lz +dummy1.NCGR.lz +dummy2.NCGR.lz +dummy3.NCGR.lz +entry_main.NCGR.lz +entry_sub.NCGR.lz +cry_wheel.NCGR.lz +weight_scale.NCGR.lz +scroll_wheel.NSCR.lz +scroll_main_background.NSCR.lz +register_species_window.NSCR.lz +search_sinnoh.NSCR.lz +scroll_sub.NSCR.lz +search_national.NSCR.lz +search_filter.NSCR.lz +search_filter_order.NSCR.lz +search_filter_name.NSCR.lz +search_filter_type.NSCR.lz +search_filter_form.NSCR.lz +dummy1.NSCR.lz +dummy2.NSCR.lz +info_main.NSCR.lz +info_species_window.NSCR.lz +info_footprint_window.NSCR.lz +dummy3.NSCR.lz +info_entry_window.NSCR.lz +foreign_entry_window.NSCR.lz +foreign_summary_window.NSCR.lz +banner_sinnoh.NSCR.lz +forms_sub.NSCR.lz +page_panel.NSCR.lz +info_sub_unpressed.NSCR.lz +size_sub.NSCR.lz +info_sub.NSCR.lz +info_sub_pressed.NSCR.lz +area_map.NSCR.lz +map_newmoon_island.NSCR.lz +map_seabreak_path.NSCR.lz +map_fullmoon_island.NSCR.lz +map_spring_path.NSCR.lz +area_sub.NSCR.lz +cry_button.NSCR.lz +cry_sub.NSCR.lz +cry_wheel.NSCR.lz +weight_check_main.NSCR.lz +height_check_main.NSCR.lz +search_main.NSCR.lz +name_tag_cell.NCER.lz +name_tag_anim.NANR.lz +name_tag.NCGR.lz +search_body_shapes_cell.NCER.lz +search_body_shapes_anim.NANR.lz +search_body_shapes.NCGR.lz +scroll_buttons_cell.NCER.lz +scroll_buttons_anim.NANR.lz +scroll_buttons.NCGR.lz +banner_cell.NCER.lz +banner_anim.NANR.lz +banner.NCGR.lz +type_icons_cell.NCER.lz +type_icons_anim.NANR.lz +type_icons.NCGR.lz +size_check_icons_cell.NCER.lz +size_check_icons_anim.NANR.lz +size_check_icons.NCGR.lz +page_buttons_cell.NCER.lz +page_buttons_anim.NANR.lz +page_buttons.NCGR.lz +info_language_buttons_cell.NCER.lz +info_language_buttons_anim.NANR.lz +info_language_buttons.NCGR.lz +size_buttons_pressed_cell.NCER.lz +size_buttons_pressed_anim.NANR.lz +size_buttons_pressed.NCGR.lz +time_day_icons_cell.NCER.lz +time_day_icons_anim.NANR.lz +time_day_icons.NCGR.lz +dungeon_highlight_cell.NCER.lz +dungeon_highlight_anim.NANR.lz +dungeon_highlight.NCGR.lz +unseen_icon_cell.NCER.lz +unseen_icon_anim.NANR.lz +unseen_icon.NCGR.lz +cry_dials_anim.NANR.lz +cry_dials.NCGR.lz +cry_dials_cell.NCER.lz +cry_bar_anim.NANR.lz +cry_bar.NCGR.lz +cry_bar_cell.NCER.lz +cursor_anim.NANR.lz +cursor.NCGR.lz +cursor_cell.NCER.lz +form_display_box_anim.NANR.lz +form_display_box.NCGR.lz +form_display_box_cell.NCER.lz +search_buttons_anim.NANR.lz +search_buttons.NCGR.lz +search_buttons_cell.NCER.lz +search_button_forms_anim.NANR.lz +search_button_forms.NCGR.lz +search_button_forms_cell.NCER.lz diff --git a/res/graphics/pokedex/register.pal b/res/graphics/pokedex/register.pal new file mode 100644 index 0000000000..250266801f --- /dev/null +++ b/res/graphics/pokedex/register.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +213 213 238 +0 0 0 +255 255 255 +115 0 49 +180 82 90 +115 0 49 +205 106 115 +205 106 115 +238 197 74 +82 82 82 +246 139 148 +238 139 148 +255 255 255 +148 49 49 +180 82 90 +238 139 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 230 148 +16 24 32 +255 255 255 +164 156 74 +106 106 106 +82 82 82 +246 246 172 +139 139 139 +238 197 74 +82 82 82 +255 106 115 +172 172 172 +255 255 255 +82 82 82 +213 189 98 +255 255 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 238 +0 0 0 +255 255 255 +164 57 172 +197 98 222 +164 57 172 +205 123 246 +205 123 246 +230 180 164 +82 82 82 +197 189 255 +230 172 255 +255 255 255 +148 49 148 +197 98 222 +230 172 255 diff --git a/res/graphics/pokedex/register_species_window.NSCR b/res/graphics/pokedex/register_species_window.NSCR new file mode 100644 index 0000000000..1a44d3ea24 Binary files /dev/null and b/res/graphics/pokedex/register_species_window.NSCR differ diff --git a/res/graphics/pokedex/scroll_buttons.png b/res/graphics/pokedex/scroll_buttons.png new file mode 100644 index 0000000000..dee75a8056 Binary files /dev/null and b/res/graphics/pokedex/scroll_buttons.png differ diff --git a/res/graphics/pokedex/scroll_buttons_anim.json b/res/graphics/pokedex/scroll_buttons_anim.json new file mode 100644 index 0000000000..a5bb32730e --- /dev/null +++ b/res/graphics/pokedex/scroll_buttons_anim.json @@ -0,0 +1,178 @@ +{ + "labelEnabled": true, + "sequenceCount": 6, + "frameCount": 21, + "sequences": [{ + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 1, + "resultId": 7 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 8 + }, { + "frameDelay": 4, + "resultId": 9 + }, { + "frameDelay": 6, + "resultId": 10 + }, { + "frameDelay": 1, + "resultId": 11 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 12 + }, { + "frameDelay": 4, + "resultId": 13 + }, { + "frameDelay": 6, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 15 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 4, + "resultId": 17 + }, { + "frameDelay": 6, + "resultId": 18 + }, { + "frameDelay": 1, + "resultId": 19 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 20 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 16 + }, { + "resultType": 0, + "index": 17 + }, { + "resultType": 0, + "index": 18 + }, { + "resultType": 0, + "index": 19 + }, { + "resultType": 0, + "index": 20 + }], + "resultCount": 21, + "labels": ["CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime0"], + "labelCount": 6 +} \ No newline at end of file diff --git a/res/graphics/pokedex/scroll_buttons_cell.json b/res/graphics/pokedex/scroll_buttons_cell.json new file mode 100644 index 0000000000..b41e0ea3f9 --- /dev/null +++ b/res/graphics/pokedex/scroll_buttons_cell.json @@ -0,0 +1,4084 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 21, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 1, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 128, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 128, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 1, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 55, + "maxY": 39, + "minX": -48, + "minY": -40, + "oamCount": 17, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 144, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 1, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 55, + "maxY": 39, + "minX": -48, + "minY": -40, + "oamCount": 17, + "OAM": [{ + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 144, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 55, + "maxY": 39, + "minX": -48, + "minY": -40, + "oamCount": 17, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 144, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 208, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 208, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 208, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 208, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 55, + "maxY": 39, + "minX": -48, + "minY": -40, + "oamCount": 17, + "OAM": [{ + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 144, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 160, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 176, + "Priority": 1, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 56, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 1, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 128, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 128, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 112, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 1, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 55, + "maxY": 23, + "minX": -48, + "minY": -24, + "oamCount": 13, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 24, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 1, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -48, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 72, + "Priority": 1, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 240, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 244, + "Priority": 1, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 240, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 260, + "Priority": 1, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 240, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 276, + "Priority": 1, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 240, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 260, + "Priority": 1, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 292, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 244, + "Priority": 1, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 292, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 260, + "Priority": 1, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 292, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 276, + "Priority": 1, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 292, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 260, + "Priority": 1, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 296, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime0"], + "labelCount": 6 +} \ No newline at end of file diff --git a/res/graphics/pokedex/scroll_main_background.NSCR b/res/graphics/pokedex/scroll_main_background.NSCR new file mode 100644 index 0000000000..8060822705 Binary files /dev/null and b/res/graphics/pokedex/scroll_main_background.NSCR differ diff --git a/res/graphics/pokedex/scroll_main_background.png b/res/graphics/pokedex/scroll_main_background.png new file mode 100644 index 0000000000..0ece33b8d9 Binary files /dev/null and b/res/graphics/pokedex/scroll_main_background.png differ diff --git a/res/graphics/pokedex/scroll_sub.NSCR b/res/graphics/pokedex/scroll_sub.NSCR new file mode 100644 index 0000000000..21e7cf6dd2 Binary files /dev/null and b/res/graphics/pokedex/scroll_sub.NSCR differ diff --git a/res/graphics/pokedex/scroll_sub_background.png b/res/graphics/pokedex/scroll_sub_background.png new file mode 100644 index 0000000000..4ee0f55799 Binary files /dev/null and b/res/graphics/pokedex/scroll_sub_background.png differ diff --git a/res/graphics/pokedex/scroll_wheel.NSCR b/res/graphics/pokedex/scroll_wheel.NSCR new file mode 100644 index 0000000000..980301b5f1 Binary files /dev/null and b/res/graphics/pokedex/scroll_wheel.NSCR differ diff --git a/res/graphics/pokedex/scroll_wheel.png b/res/graphics/pokedex/scroll_wheel.png new file mode 100644 index 0000000000..76132e3fff Binary files /dev/null and b/res/graphics/pokedex/scroll_wheel.png differ diff --git a/res/graphics/pokedex/search.pal b/res/graphics/pokedex/search.pal new file mode 100644 index 0000000000..93d4db4fe7 --- /dev/null +++ b/res/graphics/pokedex/search.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +213 213 238 +0 0 0 +255 255 255 +115 0 49 +180 82 90 +115 0 49 +205 106 115 +205 106 115 +180 82 90 +82 82 82 +180 82 90 +238 139 148 +180 82 90 +180 82 90 +180 82 90 +238 139 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 238 +0 0 0 +255 255 255 +164 57 172 +197 98 222 +164 57 172 +205 123 246 +205 123 246 +197 98 222 +82 82 82 +197 98 222 +230 172 255 +197 98 222 +197 98 222 +197 98 222 +230 172 255 diff --git a/res/graphics/pokedex/search_body_shapes.png b/res/graphics/pokedex/search_body_shapes.png new file mode 100644 index 0000000000..2b32bdf32b Binary files /dev/null and b/res/graphics/pokedex/search_body_shapes.png differ diff --git a/res/graphics/pokedex/search_body_shapes_anim.json b/res/graphics/pokedex/search_body_shapes_anim.json new file mode 100644 index 0000000000..68444176c6 --- /dev/null +++ b/res/graphics/pokedex/search_body_shapes_anim.json @@ -0,0 +1,244 @@ +{ + "labelEnabled": true, + "sequenceCount": 18, + "frameCount": 18, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 5 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 6 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 7 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 8 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 9 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 10 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 11 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 12 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 13 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 14 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 15 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 16 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 17 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 16 + }, { + "resultType": 0, + "index": 17 + }], + "resultCount": 18, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13", "CellAnime14", "CellAnime15", "CellAnime16", "CellAnime17"], + "labelCount": 18 +} \ No newline at end of file diff --git a/res/graphics/pokedex/search_body_shapes_cell.json b/res/graphics/pokedex/search_body_shapes_cell.json new file mode 100644 index 0000000000..42dc839271 --- /dev/null +++ b/res/graphics/pokedex/search_body_shapes_cell.json @@ -0,0 +1,642 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 18, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 63, + "maxY": 15, + "minX": -64, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 1, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 8, + "Priority": 1, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 16, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 7, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 21, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 25, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 29, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 33, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 37, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 41, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 45, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 49, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 53, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 57, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 61, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 65, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 69, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 73, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 12 + }, + "maxX": 31, + "maxY": 31, + "minX": -32, + "minY": -32, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 77, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13", "CellAnime14", "CellAnime15", "CellAnime16", "CellAnime17"], + "labelCount": 18 +} \ No newline at end of file diff --git a/res/graphics/pokedex/search_button_forms.png b/res/graphics/pokedex/search_button_forms.png new file mode 100644 index 0000000000..cf0c5b26a0 Binary files /dev/null and b/res/graphics/pokedex/search_button_forms.png differ diff --git a/res/graphics/pokedex/search_button_forms_anim.json b/res/graphics/pokedex/search_button_forms_anim.json new file mode 100644 index 0000000000..a8323d28ee --- /dev/null +++ b/res/graphics/pokedex/search_button_forms_anim.json @@ -0,0 +1,444 @@ +{ + "labelEnabled": true, + "sequenceCount": 14, + "frameCount": 56, + "sequences": [{ + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 4 + }, { + "frameDelay": 4, + "resultId": 5 + }, { + "frameDelay": 6, + "resultId": 6 + }, { + "frameDelay": 1, + "resultId": 7 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 8 + }, { + "frameDelay": 4, + "resultId": 9 + }, { + "frameDelay": 6, + "resultId": 10 + }, { + "frameDelay": 1, + "resultId": 11 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 12 + }, { + "frameDelay": 4, + "resultId": 13 + }, { + "frameDelay": 6, + "resultId": 14 + }, { + "frameDelay": 1, + "resultId": 15 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 16 + }, { + "frameDelay": 4, + "resultId": 17 + }, { + "frameDelay": 6, + "resultId": 18 + }, { + "frameDelay": 1, + "resultId": 19 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 20 + }, { + "frameDelay": 4, + "resultId": 21 + }, { + "frameDelay": 6, + "resultId": 22 + }, { + "frameDelay": 1, + "resultId": 23 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 24 + }, { + "frameDelay": 4, + "resultId": 25 + }, { + "frameDelay": 6, + "resultId": 26 + }, { + "frameDelay": 1, + "resultId": 27 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 28 + }, { + "frameDelay": 4, + "resultId": 29 + }, { + "frameDelay": 6, + "resultId": 30 + }, { + "frameDelay": 1, + "resultId": 31 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 32 + }, { + "frameDelay": 4, + "resultId": 33 + }, { + "frameDelay": 6, + "resultId": 34 + }, { + "frameDelay": 1, + "resultId": 35 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 36 + }, { + "frameDelay": 4, + "resultId": 37 + }, { + "frameDelay": 6, + "resultId": 38 + }, { + "frameDelay": 1, + "resultId": 39 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 40 + }, { + "frameDelay": 4, + "resultId": 41 + }, { + "frameDelay": 6, + "resultId": 42 + }, { + "frameDelay": 1, + "resultId": 43 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 44 + }, { + "frameDelay": 4, + "resultId": 45 + }, { + "frameDelay": 6, + "resultId": 46 + }, { + "frameDelay": 1, + "resultId": 47 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 48 + }, { + "frameDelay": 4, + "resultId": 49 + }, { + "frameDelay": 6, + "resultId": 50 + }, { + "frameDelay": 1, + "resultId": 51 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 52 + }, { + "frameDelay": 4, + "resultId": 53 + }, { + "frameDelay": 6, + "resultId": 54 + }, { + "frameDelay": 1, + "resultId": 55 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 16 + }, { + "resultType": 0, + "index": 17 + }, { + "resultType": 0, + "index": 18 + }, { + "resultType": 0, + "index": 19 + }, { + "resultType": 0, + "index": 20 + }, { + "resultType": 0, + "index": 21 + }, { + "resultType": 0, + "index": 22 + }, { + "resultType": 0, + "index": 23 + }, { + "resultType": 0, + "index": 24 + }, { + "resultType": 0, + "index": 25 + }, { + "resultType": 0, + "index": 26 + }, { + "resultType": 0, + "index": 27 + }, { + "resultType": 0, + "index": 28 + }, { + "resultType": 0, + "index": 29 + }, { + "resultType": 0, + "index": 30 + }, { + "resultType": 0, + "index": 31 + }, { + "resultType": 0, + "index": 32 + }, { + "resultType": 0, + "index": 33 + }, { + "resultType": 0, + "index": 34 + }, { + "resultType": 0, + "index": 35 + }, { + "resultType": 0, + "index": 36 + }, { + "resultType": 0, + "index": 37 + }, { + "resultType": 0, + "index": 38 + }, { + "resultType": 0, + "index": 39 + }, { + "resultType": 0, + "index": 40 + }, { + "resultType": 0, + "index": 41 + }, { + "resultType": 0, + "index": 42 + }, { + "resultType": 0, + "index": 43 + }, { + "resultType": 0, + "index": 44 + }, { + "resultType": 0, + "index": 45 + }, { + "resultType": 0, + "index": 46 + }, { + "resultType": 0, + "index": 47 + }, { + "resultType": 0, + "index": 48 + }, { + "resultType": 0, + "index": 49 + }, { + "resultType": 0, + "index": 50 + }, { + "resultType": 0, + "index": 51 + }, { + "resultType": 0, + "index": 52 + }, { + "resultType": 0, + "index": 53 + }, { + "resultType": 0, + "index": 54 + }, { + "resultType": 0, + "index": 55 + }], + "resultCount": 56, + "labels": ["CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13", "CellAnime14", "CellAnime15", "CellAnime16", "CellAnime17", "CellAnime18"], + "labelCount": 14 +} \ No newline at end of file diff --git a/res/graphics/pokedex/search_button_forms_cell.json b/res/graphics/pokedex/search_button_forms_cell.json new file mode 100644 index 0000000000..8e2a16415e --- /dev/null +++ b/res/graphics/pokedex/search_button_forms_cell.json @@ -0,0 +1,2794 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 56, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 4 + }, + "maxX": 7, + "maxY": 10, + "minX": -8, + "minY": -5, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 8, + "minX": -8, + "minY": -7, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 6, + "minX": -8, + "minY": -9, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 3 + }, + "maxX": 7, + "maxY": 8, + "minX": -8, + "minY": -7, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 10, + "minX": -20, + "minY": -5, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 8, + "minX": -20, + "minY": -7, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 6, + "minX": -20, + "minY": -9, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 8, + "minX": -20, + "minY": -7, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 4, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 7, + "maxY": 23, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 21, + "minX": -8, + "minY": -10, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 19, + "minX": -8, + "minY": -12, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 21, + "minX": -8, + "minY": -10, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 19, + "maxY": 15, + "minX": -20, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 13, + "minX": -20, + "minY": -10, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 11, + "minX": -20, + "minY": -12, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 13, + "minX": -20, + "minY": -10, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 20, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 13, + "minX": -16, + "minY": -18, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 15, + "maxY": 11, + "minX": -16, + "minY": -20, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 15, + "maxY": 9, + "minX": -16, + "minY": -22, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -22, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -22, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 15, + "maxY": 11, + "minX": -16, + "minY": -20, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 12, + "minX": -20, + "minY": -11, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -11, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 43, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 10, + "minX": -20, + "minY": -13, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 3, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 3, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -13, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 43, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 11, + "maxY": 8, + "minX": -20, + "minY": -15, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 1, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 1, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -15, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 43, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 11, + "maxY": 10, + "minX": -20, + "minY": -13, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 3, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 3, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -13, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -20, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 43, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": 15, + "minX": -8, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": 13, + "minX": -8, + "minY": -18, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 11, + "minX": -8, + "minY": -20, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 7, + "maxY": 13, + "minX": -8, + "minY": -18, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 10, + "minX": -12, + "minY": -5, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 59, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 8, + "minX": -12, + "minY": -7, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 59, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 6, + "minX": -12, + "minY": -9, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 59, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 19, + "maxY": 8, + "minX": -12, + "minY": -7, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 59, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 7, + "maxY": 23, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 21, + "minX": -8, + "minY": -10, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 19, + "minX": -8, + "minY": -12, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 21, + "minX": -8, + "minY": -10, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 13, + "maxY": 15, + "minX": -10, + "minY": -8, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 0, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 75, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 77, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 81, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 13, + "minX": -10, + "minY": -10, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 75, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 77, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 81, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 11, + "minX": -10, + "minY": -12, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 75, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 77, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 81, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 13, + "minX": -10, + "minY": -10, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -2, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 75, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 77, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 81, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 11, + "maxY": 16, + "minX": -12, + "minY": -7, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 83, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 87, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 89, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 11, + "maxY": 14, + "minX": -12, + "minY": -9, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 83, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 87, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 89, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 11, + "maxY": 12, + "minX": -12, + "minY": -11, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -11, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 83, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -11, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 87, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 89, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 11, + "maxY": 14, + "minX": -12, + "minY": -9, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 83, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 4, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 87, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -12, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 89, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 14, + "minX": -10, + "minY": -9, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 91, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -9, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 92, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 7, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 12, + "minX": -10, + "minY": -11, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 91, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -11, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 92, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 10, + "minX": -10, + "minY": -13, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 3, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 91, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -13, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 92, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 3, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 5 + }, + "maxX": 13, + "maxY": 12, + "minX": -10, + "minY": -11, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 6, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 91, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -11, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 92, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": 5, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -10, + "RotationScaling": 0, + "Size": 0 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 13, + "minX": -16, + "minY": -18, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -18, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 15, + "maxY": 11, + "minX": -16, + "minY": -20, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 15, + "maxY": 9, + "minX": -16, + "minY": -22, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -22, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -22, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 15, + "maxY": 11, + "minX": -16, + "minY": -20, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 98, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 7, + "maxY": 23, + "minX": -8, + "minY": -8, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 106, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 21, + "minX": -8, + "minY": -10, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 106, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 19, + "minX": -8, + "minY": -12, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 106, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 7, + "maxY": 21, + "minX": -8, + "minY": -10, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 106, + "Priority": 0, + "Palette": 6 + } + }] + }], + "labels": ["CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13", "CellAnime14", "CellAnime15", "CellAnime16", "CellAnime17", "CellAnime18"], + "labelCount": 14 +} \ No newline at end of file diff --git a/res/graphics/pokedex/search_buttons.png b/res/graphics/pokedex/search_buttons.png new file mode 100644 index 0000000000..0c80a0488e Binary files /dev/null and b/res/graphics/pokedex/search_buttons.png differ diff --git a/res/graphics/pokedex/search_buttons_anim.json b/res/graphics/pokedex/search_buttons_anim.json new file mode 100644 index 0000000000..878b5c550e --- /dev/null +++ b/res/graphics/pokedex/search_buttons_anim.json @@ -0,0 +1,221 @@ +{ + "labelEnabled": true, + "sequenceCount": 7, + "frameCount": 28, + "sequences": [{ + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 4 + }, { + "frameDelay": 1, + "resultId": 5 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 6 + }, { + "frameDelay": 4, + "resultId": 7 + }, { + "frameDelay": 6, + "resultId": 8 + }, { + "frameDelay": 1, + "resultId": 9 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 10 + }, { + "frameDelay": 4, + "resultId": 11 + }, { + "frameDelay": 6, + "resultId": 12 + }, { + "frameDelay": 1, + "resultId": 13 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 14 + }, { + "frameDelay": 4, + "resultId": 15 + }, { + "frameDelay": 6, + "resultId": 16 + }, { + "frameDelay": 1, + "resultId": 17 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 18 + }, { + "frameDelay": 4, + "resultId": 19 + }, { + "frameDelay": 6, + "resultId": 20 + }, { + "frameDelay": 1, + "resultId": 21 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 22 + }, { + "frameDelay": 4, + "resultId": 23 + }, { + "frameDelay": 6, + "resultId": 24 + }, { + "frameDelay": 1, + "resultId": 25 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 16 + }, { + "resultType": 0, + "index": 17 + }, { + "resultType": 0, + "index": 18 + }, { + "resultType": 0, + "index": 19 + }, { + "resultType": 0, + "index": 20 + }, { + "resultType": 0, + "index": 21 + }, { + "resultType": 0, + "index": 22 + }, { + "resultType": 0, + "index": 23 + }, { + "resultType": 0, + "index": 24 + }, { + "resultType": 0, + "index": 25 + }], + "resultCount": 26, + "labels": ["CellAnime01", "CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime19"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokedex/search_buttons_cell.json b/res/graphics/pokedex/search_buttons_cell.json new file mode 100644 index 0000000000..3621772ea2 --- /dev/null +++ b/res/graphics/pokedex/search_buttons_cell.json @@ -0,0 +1,1774 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 26, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -16, + "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": 11 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 11 + }, + "maxX": 39, + "maxY": 15, + "minX": -40, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 40, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -40, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 31, + "maxY": 15, + "minX": -32, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 31, + "maxY": 15, + "minX": -32, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 31, + "maxY": 15, + "minX": -32, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 9 + }, + "maxX": 31, + "maxY": 15, + "minX": -32, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 15, + "minX": -24, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 15, + "minX": -24, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 15, + "minX": -24, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 15, + "minX": -24, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 72, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 5 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -6, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 80, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -10, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 3, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -8, + "RotationScaling": 8, + "Size": 1 + }, + "Attr2": { + "CharName": 76, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 2 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 88, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 8 + }, + "maxX": 27, + "maxY": 15, + "minX": -28, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -28, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 104, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 8 + }, + "maxX": 27, + "maxY": 15, + "minX": -28, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 11 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -28, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 11 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 8 + }, + "maxX": 27, + "maxY": 15, + "minX": -28, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -28, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 136, + "Priority": 0, + "Palette": 6 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 8 + }, + "maxX": 27, + "maxY": 15, + "minX": -28, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 6 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -28, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 120, + "Priority": 0, + "Palette": 6 + } + }] + }], + "labels": ["CellAnime01", "CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime19"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokedex/search_filter.NSCR b/res/graphics/pokedex/search_filter.NSCR new file mode 100644 index 0000000000..a267592ab0 Binary files /dev/null and b/res/graphics/pokedex/search_filter.NSCR differ diff --git a/res/graphics/pokedex/search_filter_form.NSCR b/res/graphics/pokedex/search_filter_form.NSCR new file mode 100644 index 0000000000..c7ca24ee4f Binary files /dev/null and b/res/graphics/pokedex/search_filter_form.NSCR differ diff --git a/res/graphics/pokedex/search_filter_name.NSCR b/res/graphics/pokedex/search_filter_name.NSCR new file mode 100644 index 0000000000..69c4dbdff5 Binary files /dev/null and b/res/graphics/pokedex/search_filter_name.NSCR differ diff --git a/res/graphics/pokedex/search_filter_order.NSCR b/res/graphics/pokedex/search_filter_order.NSCR new file mode 100644 index 0000000000..7c5fd063ee Binary files /dev/null and b/res/graphics/pokedex/search_filter_order.NSCR differ diff --git a/res/graphics/pokedex/search_filter_type.NSCR b/res/graphics/pokedex/search_filter_type.NSCR new file mode 100644 index 0000000000..54f1c4b1e0 Binary files /dev/null and b/res/graphics/pokedex/search_filter_type.NSCR differ diff --git a/res/graphics/pokedex/search_main.NSCR b/res/graphics/pokedex/search_main.NSCR new file mode 100644 index 0000000000..bb2d7098e5 Binary files /dev/null and b/res/graphics/pokedex/search_main.NSCR differ diff --git a/res/graphics/pokedex/search_national.NSCR b/res/graphics/pokedex/search_national.NSCR new file mode 100644 index 0000000000..0f1ae55932 Binary files /dev/null and b/res/graphics/pokedex/search_national.NSCR differ diff --git a/res/graphics/pokedex/search_sinnoh.NSCR b/res/graphics/pokedex/search_sinnoh.NSCR new file mode 100644 index 0000000000..598af6477a Binary files /dev/null and b/res/graphics/pokedex/search_sinnoh.NSCR differ diff --git a/res/graphics/pokedex/size_buttons_pressed.png b/res/graphics/pokedex/size_buttons_pressed.png new file mode 100644 index 0000000000..ba15d1ae18 Binary files /dev/null and b/res/graphics/pokedex/size_buttons_pressed.png differ diff --git a/res/graphics/pokedex/size_buttons_pressed_anim.json b/res/graphics/pokedex/size_buttons_pressed_anim.json new file mode 100644 index 0000000000..29f90fd65b --- /dev/null +++ b/res/graphics/pokedex/size_buttons_pressed_anim.json @@ -0,0 +1,97 @@ +{ + "labelEnabled": true, + "sequenceCount": 3, + "frameCount": 12, + "sequences": [{ + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 1 + }, { + "frameDelay": 6, + "resultId": 2 + }, { + "frameDelay": 1, + "resultId": 3 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 4 + }, { + "frameDelay": 6, + "resultId": 5 + }, { + "frameDelay": 1, + "resultId": 6 + }] + }, { + "frameCount": 4, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 1, + "resultId": 0 + }, { + "frameDelay": 4, + "resultId": 7 + }, { + "frameDelay": 6, + "resultId": 8 + }, { + "frameDelay": 1, + "resultId": 9 + }] + }], + "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": ["CellAnime2", "CellAnime3", "CellAnime0"], + "labelCount": 3 +} \ No newline at end of file diff --git a/res/graphics/pokedex/size_buttons_pressed_cell.json b/res/graphics/pokedex/size_buttons_pressed_cell.json new file mode 100644 index 0000000000..7375141e36 --- /dev/null +++ b/res/graphics/pokedex/size_buttons_pressed_cell.json @@ -0,0 +1,1230 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 10, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 0 + }, + "maxX": 0, + "maxY": 0, + "minX": 0, + "minY": 0, + "oamCount": 0, + "OAM": [] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 22 + }, + "maxX": 79, + "maxY": 35, + "minX": -80, + "minY": -36, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -80, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -36, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -80, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 22 + }, + "maxX": 79, + "maxY": 35, + "minX": -80, + "minY": -36, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 160, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -80, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -36, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -80, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 22 + }, + "maxX": 79, + "maxY": 35, + "minX": -80, + "minY": -36, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -12, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 4, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -80, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -36, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 16, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -20, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -80, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 24 + }, + "maxX": 59, + "maxY": 71, + "minX": -60, + "minY": -56, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -60, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -60, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 24 + }, + "maxX": 59, + "maxY": 71, + "minX": -60, + "minY": -56, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -60, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -60, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 24 + }, + "maxX": 59, + "maxY": 71, + "minX": -60, + "minY": -56, + "oamCount": 4, + "OAM": [{ + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -4, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -60, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -60, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 33 + }, + "maxX": 119, + "maxY": 55, + "minX": -120, + "minY": -56, + "oamCount": 8, + "OAM": [{ + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 56, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 56, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -120, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -120, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 33 + }, + "maxX": 119, + "maxY": 55, + "minX": -120, + "minY": -56, + "oamCount": 8, + "OAM": [{ + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 160, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 160, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 192, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 56, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 56, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -120, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -120, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 224, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 33 + }, + "maxX": 119, + "maxY": 55, + "minX": -120, + "minY": -56, + "oamCount": 8, + "OAM": [{ + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 32, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -56, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 56, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 56, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": 24, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -120, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -40, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -120, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 96, + "Priority": 0, + "Palette": 1 + } + }] + }], + "labels": ["CellAnime2", "CellAnime3", "CellAnime0"], + "labelCount": 3 +} \ No newline at end of file diff --git a/res/graphics/pokedex/size_check_icons.pal b/res/graphics/pokedex/size_check_icons.pal new file mode 100644 index 0000000000..330f1719ad --- /dev/null +++ b/res/graphics/pokedex/size_check_icons.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +205 255 213 +90 82 82 +123 115 106 +65 65 65 +172 205 139 +205 222 189 +131 172 82 +230 148 255 +246 213 255 +189 74 230 +255 0 0 +255 0 0 +0 0 0 +98 106 106 +255 255 255 +123 131 131 +205 205 246 +172 164 123 +246 213 65 +0 0 0 +205 205 213 +0 148 255 +255 255 197 +156 139 98 +255 115 115 +255 164 164 +255 255 255 +123 115 106 +41 115 172 +32 139 222 +148 189 156 +255 255 139 +172 180 255 +213 189 180 +98 98 98 +98 98 98 +0 0 0 +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 +255 205 205 +246 115 115 +197 189 156 +98 115 189 +189 57 74 +222 106 123 +57 65 82 +57 98 139 +156 189 255 +90 131 230 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 255 +156 197 156 +197 106 156 +197 57 65 +238 106 106 +57 65 82 +57 98 139 +255 222 90 +238 148 197 +205 205 222 +205 156 57 +123 65 65 +222 164 123 +255 213 189 +0 0 0 +172 164 205 +238 238 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/pokedex/size_check_icons.png b/res/graphics/pokedex/size_check_icons.png new file mode 100644 index 0000000000..6bfb630a5b Binary files /dev/null and b/res/graphics/pokedex/size_check_icons.png differ diff --git a/res/graphics/pokedex/size_check_icons_anim.json b/res/graphics/pokedex/size_check_icons_anim.json new file mode 100644 index 0000000000..c5426ddb5b --- /dev/null +++ b/res/graphics/pokedex/size_check_icons_anim.json @@ -0,0 +1,101 @@ +{ + "labelEnabled": true, + "sequenceCount": 7, + "frameCount": 7, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 5 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "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": ["CellAnime18", "CellAnime19", "CellAnime20", "CellAnime22", "CellAnime23", "CellAnime24", "CellAnime25"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokedex/size_check_icons_cell.json b/res/graphics/pokedex/size_check_icons_cell.json new file mode 100644 index 0000000000..f081d51c49 --- /dev/null +++ b/res/graphics/pokedex/size_check_icons_cell.json @@ -0,0 +1,328 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 7, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 3, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": true, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 17 + }, + "maxX": 63, + "maxY": 15, + "minX": -64, + "minY": -16, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": 0, + "RotationScaling": 8, + "Size": 3 + }, + "Attr2": { + "CharName": 7, + "Priority": 0, + "Palette": 2 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -64, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 7, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 15, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 6 + }, + "maxX": 15, + "maxY": 15, + "minX": -16, + "minY": -16, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -16, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 19, + "Priority": 0, + "Palette": 4 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 31, + "maxY": 47, + "minX": -32, + "minY": -48, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 23, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -48, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 31, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 15 + }, + "maxX": 31, + "maxY": 47, + "minX": -32, + "minY": -48, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": 16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 47, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -48, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 55, + "Priority": 0, + "Palette": 0 + } + }] + }], + "labels": ["CellAnime18", "CellAnime19", "CellAnime20", "CellAnime22", "CellAnime23", "CellAnime24", "CellAnime25"], + "labelCount": 7 +} \ No newline at end of file diff --git a/res/graphics/pokedex/size_sub.NSCR b/res/graphics/pokedex/size_sub.NSCR new file mode 100644 index 0000000000..5327695f1a Binary files /dev/null and b/res/graphics/pokedex/size_sub.NSCR differ diff --git a/res/graphics/pokedex/time_day_icons.png b/res/graphics/pokedex/time_day_icons.png new file mode 100644 index 0000000000..e1e20d5f9e Binary files /dev/null and b/res/graphics/pokedex/time_day_icons.png differ diff --git a/res/graphics/pokedex/time_day_icons_anim.json b/res/graphics/pokedex/time_day_icons_anim.json new file mode 100644 index 0000000000..7fb686b6b0 --- /dev/null +++ b/res/graphics/pokedex/time_day_icons_anim.json @@ -0,0 +1,49 @@ +{ + "labelEnabled": true, + "sequenceCount": 3, + "frameCount": 3, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }], + "animationResults": [{ + "resultType": 0, + "index": 0 + }, { + "resultType": 0, + "index": 1 + }, { + "resultType": 0, + "index": 2 + }], + "resultCount": 3, + "labels": ["CellAnime4", "CellAnime5", "CellAnime6"], + "labelCount": 3 +} \ No newline at end of file diff --git a/res/graphics/pokedex/time_day_icons_cell.json b/res/graphics/pokedex/time_day_icons_cell.json new file mode 100644 index 0000000000..78cce77009 --- /dev/null +++ b/res/graphics/pokedex/time_day_icons_cell.json @@ -0,0 +1,112 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 3, + "mappingType": 0, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 12 + }, + "maxX": 31, + "maxY": 31, + "minX": -32, + "minY": -32, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 12 + }, + "maxX": 31, + "maxY": 31, + "minX": -32, + "minY": -32, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 64, + "Priority": 0, + "Palette": 5 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 12 + }, + "maxX": 31, + "maxY": 31, + "minX": -32, + "minY": -32, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 128, + "Priority": 0, + "Palette": 5 + } + }] + }], + "labels": ["CellAnime4", "CellAnime5", "CellAnime6"], + "labelCount": 3 +} \ No newline at end of file diff --git a/res/graphics/pokedex/type_icons.pal b/res/graphics/pokedex/type_icons.pal new file mode 100644 index 0000000000..37ac232275 --- /dev/null +++ b/res/graphics/pokedex/type_icons.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +180 255 180 +189 189 172 +238 238 222 +156 148 123 +90 205 246 +189 238 255 +49 164 189 +49 222 213 +197 255 255 +57 156 139 +189 189 213 +238 238 238 +148 148 180 +90 98 98 +255 255 255 +115 123 123 +205 255 213 +255 57 172 +255 156 222 +197 41 139 +148 238 131 +222 246 197 +90 189 74 +205 164 74 +222 205 148 +148 123 57 +230 230 0 +255 246 213 +180 172 16 +90 98 98 +255 255 255 +115 123 123 +205 255 213 +255 115 115 +255 172 172 +213 65 65 +106 156 255 +205 222 255 +49 115 197 +255 148 49 +255 197 148 +197 106 32 +172 115 255 +213 180 255 +123 90 180 +90 98 98 +255 255 255 +115 123 123 +205 255 213 +148 139 139 +189 180 172 +106 106 106 +164 205 139 +222 230 205 +123 156 82 +230 148 255 +246 213 255 +189 74 230 +255 0 0 +255 0 0 +0 0 0 +90 98 98 +255 255 255 +115 123 123 +205 205 246 +172 164 123 +246 213 65 +0 0 0 +0 0 0 +0 148 255 +255 255 197 +156 139 98 +255 115 115 +255 164 164 +255 255 255 +123 115 106 +41 115 172 +32 139 222 +148 189 156 +255 255 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/pokedex/type_icons.png b/res/graphics/pokedex/type_icons.png new file mode 100644 index 0000000000..54e05ea01e Binary files /dev/null and b/res/graphics/pokedex/type_icons.png differ diff --git a/res/graphics/pokedex/type_icons_anim.json b/res/graphics/pokedex/type_icons_anim.json new file mode 100644 index 0000000000..776006343d --- /dev/null +++ b/res/graphics/pokedex/type_icons_anim.json @@ -0,0 +1,244 @@ +{ + "labelEnabled": true, + "sequenceCount": 18, + "frameCount": 18, + "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 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 2 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 3 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 4 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 5 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 6 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 7 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 8 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 9 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 10 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 11 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 12 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 13 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 14 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 15 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 16 + }] + }, { + "frameCount": 1, + "loopStartFrame": 0, + "animationElement": 0, + "animationType": 1, + "playbackMode": 2, + "frameData": [{ + "frameDelay": 4, + "resultId": 17 + }] + }], + "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 + }, { + "resultType": 0, + "index": 10 + }, { + "resultType": 0, + "index": 11 + }, { + "resultType": 0, + "index": 12 + }, { + "resultType": 0, + "index": 13 + }, { + "resultType": 0, + "index": 14 + }, { + "resultType": 0, + "index": 15 + }, { + "resultType": 0, + "index": 16 + }, { + "resultType": 0, + "index": 17 + }], + "resultCount": 18, + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13", "CellAnime14", "CellAnime15", "CellAnime16", "CellAnime21"], + "labelCount": 18 +} \ No newline at end of file diff --git a/res/graphics/pokedex/type_icons_cell.json b/res/graphics/pokedex/type_icons_cell.json new file mode 100644 index 0000000000..d592678e88 --- /dev/null +++ b/res/graphics/pokedex/type_icons_cell.json @@ -0,0 +1,1062 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 18, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 2, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 3, + "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": 5, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 6, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 8, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 9, + "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": 11, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 12, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 14, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 15, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 17, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 18, + "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": 20, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 21, + "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": 23, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 24, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 26, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 27, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 29, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 30, + "Priority": 0, + "Palette": 3 + } + }, { + "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": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 33, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 35, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 36, + "Priority": 0, + "Palette": 3 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 38, + "Priority": 0, + "Palette": 3 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 39, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 41, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 42, + "Priority": 0, + "Palette": 0 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 44, + "Priority": 0, + "Palette": 0 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 45, + "Priority": 0, + "Palette": 1 + } + }, { + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 8, + "RotationScaling": 0, + "Size": 1 + }, + "Attr2": { + "CharName": 47, + "Priority": 0, + "Palette": 1 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 7 + }, + "maxX": 23, + "maxY": 7, + "minX": -24, + "minY": -8, + "oamCount": 2, + "OAM": [{ + "Attr0": { + "YCoordinate": -8, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -24, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 48, + "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": 50, + "Priority": 0, + "Palette": 2 + } + }] + }, { + "cellAttrs": { + "hFlip": false, + "vFlip": true, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 24 + }, + "maxX": 73, + "maxY": 15, + "minX": -86, + "minY": -36, + "oamCount": 6, + "OAM": [{ + "Attr0": { + "YCoordinate": -36, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -86, + "RotationScaling": 16, + "Size": 3 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -36, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -22, + "RotationScaling": 16, + "Size": 3 + }, + "Attr2": { + "CharName": 59, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -36, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 42, + "RotationScaling": 16, + "Size": 2 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -86, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 51, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 1 + }, + "Attr1": { + "XCoordinate": -22, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 59, + "Priority": 0, + "Palette": 4 + } + }, { + "Attr0": { + "YCoordinate": -16, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": 42, + "RotationScaling": 0, + "Size": 2 + }, + "Attr2": { + "CharName": 67, + "Priority": 0, + "Palette": 4 + } + }] + }], + "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5", "CellAnime6", "CellAnime7", "CellAnime8", "CellAnime9", "CellAnime10", "CellAnime11", "CellAnime12", "CellAnime13", "CellAnime14", "CellAnime15", "CellAnime16", "CellAnime21"], + "labelCount": 18 +} \ No newline at end of file diff --git a/res/graphics/pokedex/unseen_icon.png b/res/graphics/pokedex/unseen_icon.png new file mode 100644 index 0000000000..8ebd026493 Binary files /dev/null and b/res/graphics/pokedex/unseen_icon.png differ diff --git a/res/graphics/pokedex/unseen_icon_anim.json b/res/graphics/pokedex/unseen_icon_anim.json new file mode 100644 index 0000000000..2cd09ec5dd --- /dev/null +++ b/res/graphics/pokedex/unseen_icon_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/pokedex/unseen_icon_cell.json b/res/graphics/pokedex/unseen_icon_cell.json new file mode 100644 index 0000000000..393d8ea946 --- /dev/null +++ b/res/graphics/pokedex/unseen_icon_cell.json @@ -0,0 +1,44 @@ +{ + "labelEnabled": true, + "extended": true, + "vramTransferEnabled": false, + "cellCount": 1, + "mappingType": 2, + "cells": [{ + "cellAttrs": { + "hFlip": false, + "vFlip": false, + "hvFlip": false, + "boundingRect": true, + "boundingSphereRadius": 12 + }, + "maxX": 31, + "maxY": 31, + "minX": -32, + "minY": -32, + "oamCount": 1, + "OAM": [{ + "Attr0": { + "YCoordinate": -32, + "Rotation": false, + "SizeDisable": false, + "Mode": 0, + "Mosaic": false, + "Colours": 16, + "Shape": 0 + }, + "Attr1": { + "XCoordinate": -32, + "RotationScaling": 0, + "Size": 3 + }, + "Attr2": { + "CharName": 0, + "Priority": 0, + "Palette": 10 + } + }] + }], + "labels": ["CellAnime0"], + "labelCount": 1 +} \ No newline at end of file diff --git a/res/graphics/pokedex/weight_check_main.NSCR b/res/graphics/pokedex/weight_check_main.NSCR new file mode 100644 index 0000000000..d747f17e57 Binary files /dev/null and b/res/graphics/pokedex/weight_check_main.NSCR differ diff --git a/res/graphics/pokedex/weight_scale.png b/res/graphics/pokedex/weight_scale.png new file mode 100644 index 0000000000..28f19b1765 Binary files /dev/null and b/res/graphics/pokedex/weight_scale.png differ diff --git a/res/meson.build b/res/meson.build index 6e0a7412cb..f168dd4bc1 100644 --- a/res/meson.build +++ b/res/meson.build @@ -26,6 +26,16 @@ ncgr_lz_gen = generator(nitrogfx_exe, output: '@BASENAME@.NCGR.lz', ) +ncgr_cell_lz_gen = generator(nitrogfx_exe, + arguments: [ + '@INPUT@', + '@OUTPUT@', + '-cell', '@CURRENT_SOURCE_DIR@/@BASENAME@_cell.json', + '@EXTRA_ARGS@', + ], + output: '@BASENAME@.NCGR.lz', +) + nclr_gen = generator(nitrogfx_exe, arguments: [ '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@', ], output: '@BASENAME@.NCLR', diff --git a/res/prebuilt/resource/eng/meson.build b/res/prebuilt/resource/eng/meson.build index c88081a62a..386b507fdf 100644 --- a/res/prebuilt/resource/eng/meson.build +++ b/res/prebuilt/resource/eng/meson.build @@ -3,4 +3,3 @@ subdir('frontier_graphic') subdir('pms_aikotoba') subdir('scratch') subdir('wifi_lobby_minigame') -subdir('zukan') diff --git a/res/prebuilt/resource/eng/zukan/meson.build b/res/prebuilt/resource/eng/zukan/meson.build deleted file mode 100644 index 847e5c0da6..0000000000 --- a/res/prebuilt/resource/eng/zukan/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -prebuilt_files = [ - 'zukan.narc' -] - -foreach f : prebuilt_files - nitrofs_files += fs.copyfile(f) -endforeach \ No newline at end of file diff --git a/res/prebuilt/resource/eng/zukan/zukan.narc b/res/prebuilt/resource/eng/zukan/zukan.narc deleted file mode 100644 index 00428b2dc8..0000000000 Binary files a/res/prebuilt/resource/eng/zukan/zukan.narc and /dev/null differ diff --git a/src/applications/pokedex/crysub.c b/src/applications/pokedex/crysub.c index 94d0201a16..b53befdd12 100644 --- a/src/applications/pokedex/crysub.c +++ b/src/applications/pokedex/crysub.c @@ -33,6 +33,7 @@ #include "unk_02012744.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" /* @@ -837,15 +838,15 @@ static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapID { NNSG2dScreenData *screenData; - PokedexGraphics_LoadGraphicNarcCharacterData(*graphicData, 34, (*graphicData)->bgConfig, BG_LAYER_SUB_2, 0, 0, TRUE, heapID); - void *tileMap = PokedexGraphics_GetGraphicNarcScreenData(*graphicData, 71, TRUE, &screenData, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*graphicData, entry_sub_NCGR_lz, (*graphicData)->bgConfig, BG_LAYER_SUB_2, 0, 0, TRUE, heapID); + void *tileMap = PokedexGraphics_GetGraphicNarcTilemapData(*graphicData, cry_sub_NSCR_lz, TRUE, &screenData, heapID); Bg_LoadToTilemapRect((*graphicData)->bgConfig, BG_LAYER_SUB_2, screenData->rawData, 0, 0, screenData->screenWidth / 8, screenData->screenHeight / 8); Heap_Free(tileMap); Bg_ScheduleTilemapTransfer((*graphicData)->bgConfig, BG_LAYER_SUB_2); - PokedexGraphics_LoadGraphicNarcCharacterData(*graphicData, 35, (*graphicData)->bgConfig, BG_LAYER_SUB_3, 0, 0, TRUE, heapID); - tileMap = PokedexGraphics_GetGraphicNarcScreenData(*graphicData, 72, TRUE, &screenData, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*graphicData, cry_wheel_NCGR_lz, (*graphicData)->bgConfig, BG_LAYER_SUB_3, 0, 0, TRUE, heapID); + tileMap = PokedexGraphics_GetGraphicNarcTilemapData(*graphicData, cry_wheel_NSCR_lz, TRUE, &screenData, heapID); Bg_LoadToTilemapRect((*graphicData)->bgConfig, BG_LAYER_SUB_3, screenData->rawData, 0, 0, screenData->screenWidth / 8, screenData->screenHeight / 8); Heap_Free(tileMap); @@ -867,18 +868,18 @@ static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, Poke PokedexGraphicData *graphicsData = *graphics; NARC *narc = PokedexGraphics_GetNARC(*graphics); - pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(graphicsData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], narc, 113, TRUE, 113 + CRYSUB_GRAPHIC_ID, NNS_G2D_VRAM_TYPE_2DSUB, heapID); + pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(graphicsData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], narc, cry_dials_NCGR_lz, TRUE, cry_dials_NCGR_lz + CRYSUB_GRAPHIC_ID, NNS_G2D_VRAM_TYPE_2DSUB, heapID); SpriteTransfer_RequestCharAtEnd(pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_CHAR]); SpriteResource_ReleaseData(pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_CHAR]); - pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(graphicsData->spriteResourceCollection[1], narc, 18, FALSE, 18 + CRYSUB_GRAPHIC_ID, NNS_G2D_VRAM_TYPE_2DSUB, 3, heapID); + pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(graphicsData->spriteResourceCollection[1], narc, cry_dials_NCLR, FALSE, cry_dials_NCLR + CRYSUB_GRAPHIC_ID, NNS_G2D_VRAM_TYPE_2DSUB, 3, heapID); SpriteTransfer_RequestPlttFreeSpace(pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_PLTT]); SpriteResource_ReleaseData(pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_PLTT]); - pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(graphicsData->spriteResourceCollection[SPRITE_RESOURCE_CELL], narc, 114, TRUE, 114 + CRYSUB_GRAPHIC_ID, SPRITE_RESOURCE_CELL, heapID); - pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(graphicsData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], narc, 112, TRUE, 112 + CRYSUB_GRAPHIC_ID, SPRITE_RESOURCE_ANIM, heapID); + pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(graphicsData->spriteResourceCollection[SPRITE_RESOURCE_CELL], narc, cry_dials_cell_NCER_lz, TRUE, cry_dials_cell_NCER_lz + CRYSUB_GRAPHIC_ID, SPRITE_RESOURCE_CELL, heapID); + pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(graphicsData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], narc, cry_dials_anim_NANR_lz, TRUE, cry_dials_anim_NANR_lz + CRYSUB_GRAPHIC_ID, SPRITE_RESOURCE_ANIM, heapID); } static void FreeDialSpriteResource(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics) @@ -899,7 +900,7 @@ static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, Pokedex SpriteListTemplate spriteListTemplate; PokedexGraphicData *graphicData = *graphics; - SpriteResourcesHeader_Init(&spriteResourcesHeader, 113 + CRYSUB_GRAPHIC_ID, 18 + CRYSUB_GRAPHIC_ID, 114 + CRYSUB_GRAPHIC_ID, 112 + CRYSUB_GRAPHIC_ID, 0xffffffff, 0xffffffff, FALSE, 2, graphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], graphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], graphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], graphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); + SpriteResourcesHeader_Init(&spriteResourcesHeader, cry_dials_NCGR_lz + CRYSUB_GRAPHIC_ID, cry_dials_NCLR + CRYSUB_GRAPHIC_ID, cry_dials_cell_NCER_lz + CRYSUB_GRAPHIC_ID, cry_dials_anim_NANR_lz + CRYSUB_GRAPHIC_ID, 0xffffffff, 0xffffffff, FALSE, 2, graphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], graphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], graphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], graphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); spriteListTemplate.list = graphicData->spriteList; spriteListTemplate.resourceData = &spriteResourcesHeader; @@ -975,7 +976,7 @@ static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, Pokedex PokedexDisplayBox displayBox; PokedexGraphicData *graphicData = *graphics; - SpriteResource *palette = SpriteResourceCollection_Find(graphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], 18 + CRYSUB_GRAPHIC_ID); + SpriteResource *palette = SpriteResourceCollection_Find(graphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], cry_dials_NCLR + CRYSUB_GRAPHIC_ID); displayBox.textMan = graphicData->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(palette, NULL); @@ -1332,7 +1333,7 @@ static void SetLoop(PokedexCrySubPageData *pokedexCrySubPageData, BOOL loop) static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID) { - pokedexCrySubGraphics->backgroundPalette = PokedexGraphics_GetGraphicNarcPaletteData(*graphicData, 20, &pokedexCrySubGraphics->paletteData, heapID); + pokedexCrySubGraphics->backgroundPalette = PokedexGraphics_GetGraphicNarcPaletteData(*graphicData, cry_sub_NCLR, &pokedexCrySubGraphics->paletteData, heapID); } static void FreeCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics) diff --git a/src/applications/pokedex/ov21_021D5AEC.c b/src/applications/pokedex/ov21_021D5AEC.c index a923a98b8f..7b77e0d4ab 100644 --- a/src/applications/pokedex/ov21_021D5AEC.c +++ b/src/applications/pokedex/ov21_021D5AEC.c @@ -32,6 +32,7 @@ #include "text.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -613,7 +614,7 @@ static BOOL ov21_021D6108(UnkStruct_ov21_021D5B68 *param0, int param1) static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int heapID) { - PokedexGraphics_LoadGraphicNarcPaletteData(param1, 0, 0, 0, 0, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(param1, background_scroll_default_NCLR, 0, 0, 0, heapID); ov21_021D62E4(param1, heapID); ov21_021D637C(param0, param1, heapID, PokedexSort_IsNationalDex(param2->unk_04)); ov21_021D63DC(param1, heapID, PokedexSort_NumEncountered(param2->unk_04), PokedexSort_NumCaught(param2->unk_04)); @@ -647,9 +648,9 @@ static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p NNSG2dPaletteData *v1; u8 *v2; - PokedexGraphics_LoadGraphicNarcPaletteData(param1, 4, 0, 0, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(param1, register_NCLR, 0, 0, 32, heapID); - v0 = PokedexGraphics_GetGraphicNarcPaletteData(param1, 0, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcPaletteData(param1, background_scroll_default_NCLR, &v1, heapID); v2 = (u8 *)v1->pRawData; DC_FlushRange(v2, 16 * 32); @@ -681,14 +682,14 @@ static void ov21_021D62E4(PokedexGraphicData *param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(param0, 28, param0->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param0, scroll_main_background_NCGR_lz, param0->bgConfig, 3, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0, 38, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0, scroll_main_background_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0, 39, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0, register_species_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->bgConfig, 3, v1->rawData, 1, 4, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -699,15 +700,15 @@ static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p { int v0; - PokedexGraphics_LoadGraphicNarcCharacterData(param1, 28, param1->bgConfig, 2, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param1, scroll_main_background_NCGR_lz, param1->bgConfig, 2, 0, 0, TRUE, heapID); if (param3 == 1) { - v0 = 42; + v0 = search_national_NSCR_lz; } else { - v0 = 40; + v0 = search_sinnoh_NSCR_lz; } - param0->unk_D8 = PokedexGraphics_GetGraphicNarcScreenData(param1, v0, 1, ¶m0->unk_DC, heapID); + param0->unk_D8 = PokedexGraphics_GetGraphicNarcTilemapData(param1, v0, TRUE, ¶m0->unk_DC, heapID); } static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0) @@ -763,13 +764,13 @@ static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int heapID) static void ov21_021D6580(UnkStruct_ov21_021D71A8 *param0) { - SpriteResource *v0 = SpriteResourceCollection_Find(param0->unk_80[0], 81); + SpriteResource *v0 = SpriteResourceCollection_Find(param0->unk_80[0], search_body_shapes_NCGR_lz); SpriteTransfer_ResetCharTransfer(v0); - v0 = SpriteResourceCollection_Find(param0->unk_80[1], 3); + v0 = SpriteResourceCollection_Find(param0->unk_80[1], buttons_NCLR); SpriteTransfer_ResetPlttTransfer(v0); - v0 = SpriteResourceCollection_Find(param0->unk_80[0], 111); + v0 = SpriteResourceCollection_Find(param0->unk_80[0], unseen_icon_NCGR_lz); SpriteTransfer_ResetCharTransfer(v0); SpriteResourceCollection_Delete(param0->unk_80[0]); @@ -783,26 +784,26 @@ static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p SpriteResource *v0; NARC *v1 = PokedexGraphics_GetNARC(param1); - v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_80[0], v1, 81, 1, 81, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_80[0], v1, search_body_shapes_NCGR_lz, TRUE, search_body_shapes_NCGR_lz, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(v0); SpriteResource_ReleaseData(v0); - v0 = SpriteResourceCollection_AddPaletteFrom(param0->unk_80[1], v1, 3, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 12, param2); + v0 = SpriteResourceCollection_AddPaletteFrom(param0->unk_80[1], v1, buttons_NCLR, FALSE, buttons_NCLR, NNS_G2D_VRAM_TYPE_2DMAIN, 12, param2); SpriteTransfer_RequestPlttFreeSpace(v0); SpriteResource_ReleaseData(v0); - SpriteResourceCollection_AddFrom(param0->unk_80[2], v1, 79, 1, 79, 2, param2); - SpriteResourceCollection_AddFrom(param0->unk_80[3], v1, 80, 1, 80, 3, param2); - SpriteResourcesHeader_Init(¶m0->unk_90, 81, 3, 79, 80, 0xffffffff, 0xffffffff, 0, 2, param0->unk_80[0], param0->unk_80[1], param0->unk_80[2], param0->unk_80[3], NULL, NULL); + SpriteResourceCollection_AddFrom(param0->unk_80[2], v1, search_body_shapes_cell_NCER_lz, TRUE, search_body_shapes_cell_NCER_lz, 2, param2); + SpriteResourceCollection_AddFrom(param0->unk_80[3], v1, search_body_shapes_anim_NANR_lz, TRUE, search_body_shapes_anim_NANR_lz, 3, param2); + SpriteResourcesHeader_Init(¶m0->unk_90, search_body_shapes_NCGR_lz, buttons_NCLR, search_body_shapes_cell_NCER_lz, search_body_shapes_anim_NANR_lz, 0xffffffff, 0xffffffff, FALSE, 2, param0->unk_80[0], param0->unk_80[1], param0->unk_80[2], param0->unk_80[3], NULL, NULL); - v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_80[0], v1, 111, 1, 111, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + v0 = SpriteResourceCollection_AddTilesFrom(param0->unk_80[0], v1, unseen_icon_NCGR_lz, TRUE, unseen_icon_NCGR_lz, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(v0); SpriteResource_ReleaseData(v0); - SpriteResourceCollection_AddFrom(param0->unk_80[2], v1, 109, 1, 109, 2, param2); - SpriteResourceCollection_AddFrom(param0->unk_80[3], v1, 110, 1, 110, 3, param2); - SpriteResourcesHeader_Init(¶m0->unk_B4, 111, 3, 109, 110, 0xffffffff, 0xffffffff, 0, 2, param0->unk_80[0], param0->unk_80[1], param0->unk_80[2], param0->unk_80[3], NULL, NULL); + SpriteResourceCollection_AddFrom(param0->unk_80[2], v1, unseen_icon_cell_NCER_lz, TRUE, unseen_icon_cell_NCER_lz, 2, param2); + SpriteResourceCollection_AddFrom(param0->unk_80[3], v1, unseen_icon_anim_NANR_lz, TRUE, unseen_icon_anim_NANR_lz, 3, param2); + SpriteResourcesHeader_Init(¶m0->unk_B4, unseen_icon_NCGR_lz, buttons_NCLR, unseen_icon_cell_NCER_lz, unseen_icon_anim_NANR_lz, 0xffffffff, 0xffffffff, FALSE, 2, param0->unk_80[0], param0->unk_80[1], param0->unk_80[2], param0->unk_80[3], NULL, NULL); } static void ov21_021D6744(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2) diff --git a/src/applications/pokedex/ov21_021D76B0.c b/src/applications/pokedex/ov21_021D76B0.c index fcfa5d6a87..a85210ae04 100644 --- a/src/applications/pokedex/ov21_021D76B0.c +++ b/src/applications/pokedex/ov21_021D76B0.c @@ -33,6 +33,7 @@ #include "touch_screen_actions.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -533,19 +534,19 @@ static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D NNSG2dScreenData *v1; BgConfig *v2 = (*param0)->bgConfig; - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 0, 4, 0, 0, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, background_scroll_default_NCLR, 4, 0, 0, heapID); if (param1->unk_1C->unk_04->unk_1740 == 1) { - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 1, 4, 3 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, background_scroll_sinnoh_NCLR, 4, 3 * 32, 32, heapID); } else { if (PokedexSort_IsNationalDex(param1->unk_1C->unk_04) == 1) { - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 25, 4, 3 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, background_scroll_national_NCLR, 4, 3 * 32, 32, heapID); } } - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 29, v2, 6, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, scroll_sub_background_NCGR_lz, v2, 6, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 41, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, scroll_sub_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(v2, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -557,18 +558,18 @@ static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(*param1); - param0->unk_2C[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 84, 1, 84 + 1000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_2C[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, scroll_buttons_NCGR_lz, TRUE, scroll_buttons_NCGR_lz + 1000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_2C[0]); SpriteResource_ReleaseData(param0->unk_2C[0]); - param0->unk_2C[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 3, 0, 3 + 1000, NNS_G2D_VRAM_TYPE_2DSUB, 12, param2); + param0->unk_2C[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, buttons_NCLR, FALSE, buttons_NCLR + 1000, NNS_G2D_VRAM_TYPE_2DSUB, 12, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_2C[1]); SpriteResource_ReleaseData(param0->unk_2C[1]); - param0->unk_2C[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 82, 1, 82 + 1000, 2, param2); - param0->unk_2C[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 83, 1, 83 + 1000, 3, param2); + param0->unk_2C[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, scroll_buttons_cell_NCER_lz, TRUE, scroll_buttons_cell_NCER_lz + 1000, 2, param2); + param0->unk_2C[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, scroll_buttons_anim_NANR_lz, TRUE, scroll_buttons_anim_NANR_lz + 1000, 3, param2); } static void ov21_021D7E3C(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1) @@ -589,7 +590,7 @@ static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData ** SpriteListTemplate v1; PokedexGraphicData *v2 = *param1; - SpriteResourcesHeader_Init(&v0, 84 + 1000, 3 + 1000, 82 + 1000, 83 + 1000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, scroll_buttons_NCGR_lz + 1000, buttons_NCLR + 1000, scroll_buttons_cell_NCER_lz + 1000, scroll_buttons_anim_NANR_lz + 1000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -674,7 +675,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData ** GF_ASSERT(param0->unk_00[0]); - v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], 3 + 1000); + v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], buttons_NCLR + 1000); displayBox.textMan = v3->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v2, NULL); @@ -757,9 +758,9 @@ static void ov21_021D820C(PokedexGraphicData **param0, int heapID) NNSG2dScreenData *v1; BgConfig *v2 = (*param0)->bgConfig; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 27, v2, 7, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, scroll_wheel_NCGR_lz, v2, 7, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 37, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, scroll_wheel_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(v2, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); diff --git a/src/applications/pokedex/ov21_021D94BC.c b/src/applications/pokedex/ov21_021D94BC.c index 02c185eae5..3fbc88eb20 100644 --- a/src/applications/pokedex/ov21_021D94BC.c +++ b/src/applications/pokedex/ov21_021D94BC.c @@ -31,6 +31,7 @@ #include "touch_screen_actions.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -582,9 +583,9 @@ static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_ void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, 29, param0->unk_00->bgConfig, 6, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, scroll_sub_background_NCGR_lz, param0->unk_00->bgConfig, 6, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 75, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, search_main_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -2279,18 +2280,18 @@ static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_E4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 125, 1, 125 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_E4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, search_buttons_NCGR_lz, TRUE, search_buttons_NCGR_lz + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_E4[0]); SpriteResource_ReleaseData(param0->unk_E4[0]); - param0->unk_E4[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 3, 0, 3 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, 6, param2); + param0->unk_E4[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, buttons_NCLR, FALSE, buttons_NCLR + 16000, NNS_G2D_VRAM_TYPE_2DSUB, 6, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_E4[1]); SpriteResource_ReleaseData(param0->unk_E4[1]); - param0->unk_E4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 126, 1, 126 + 16000, 2, param2); - param0->unk_E4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 124, 1, 124 + 16000, 3, param2); + param0->unk_E4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, search_buttons_cell_NCER_lz, TRUE, search_buttons_cell_NCER_lz + 16000, 2, param2); + param0->unk_E4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, search_buttons_anim_NANR_lz, TRUE, search_buttons_anim_NANR_lz + 16000, 3, param2); } static void ov21_021DB5DC(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) @@ -2311,13 +2312,13 @@ static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_F4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 128, 1, 128 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_F4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, search_button_forms_NCGR_lz, TRUE, search_button_forms_NCGR_lz + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_F4[0]); SpriteResource_ReleaseData(param0->unk_F4[0]); - param0->unk_F4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 129, 1, 129 + 16000, 2, param2); - param0->unk_F4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 127, 1, 127 + 16000, 3, param2); + param0->unk_F4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, search_button_forms_cell_NCER_lz, TRUE, search_button_forms_cell_NCER_lz + 16000, 2, param2); + param0->unk_F4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, search_button_forms_anim_NANR_lz, TRUE, search_button_forms_anim_NANR_lz + 16000, 3, param2); } static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) @@ -2337,7 +2338,7 @@ static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 PokedexGraphicData *v2 = param1->unk_00; int v3; - SpriteResourcesHeader_Init(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, search_buttons_NCGR_lz + 16000, buttons_NCLR + 16000, search_buttons_cell_NCER_lz + 16000, search_buttons_anim_NANR_lz + 16000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -2362,7 +2363,7 @@ static void ov21_021DB79C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 PokedexGraphicData *v2 = param1->unk_00; int v3; - SpriteResourcesHeader_Init(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, search_buttons_NCGR_lz + 16000, buttons_NCLR + 16000, search_buttons_cell_NCER_lz + 16000, search_buttons_anim_NANR_lz + 16000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -2587,7 +2588,7 @@ static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 PokedexGraphicData *v2 = param1->unk_00; int v3, v4; - SpriteResourcesHeader_Init(&v0, 128 + 16000, 3 + 16000, 129 + 16000, 127 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, search_button_forms_NCGR_lz + 16000, buttons_NCLR + 16000, search_button_forms_cell_NCER_lz + 16000, search_button_forms_anim_NANR_lz + 16000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -2673,7 +2674,7 @@ static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 SpriteResource *v1; PokedexGraphicData *v2 = param1->unk_00; - v1 = SpriteResourceCollection_Find(v2->spriteResourceCollection[1], 3 + 16000); + v1 = SpriteResourceCollection_Find(v2->spriteResourceCollection[1], buttons_NCLR + 16000); displayBox.textMan = v2->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v1, NULL); @@ -2698,7 +2699,7 @@ static void ov21_021DBE3C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95 SpriteResource *v1; PokedexGraphicData *v2 = param1->unk_00; - v1 = SpriteResourceCollection_Find(v2->spriteResourceCollection[1], 3 + 16000); + v1 = SpriteResourceCollection_Find(v2->spriteResourceCollection[1], buttons_NCLR + 16000); displayBox.textMan = v2->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v1, NULL); diff --git a/src/applications/pokedex/ov21_021DC9BC.c b/src/applications/pokedex/ov21_021DC9BC.c index 40f7f9466c..ffe20fa77a 100644 --- a/src/applications/pokedex/ov21_021DC9BC.c +++ b/src/applications/pokedex/ov21_021DC9BC.c @@ -29,6 +29,7 @@ #include "sprite_util.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" #define TERMINALVALUE 0xffff @@ -491,36 +492,36 @@ static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_ void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, 33, param0->unk_00->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, entry_main_NCGR_lz, param0->unk_00->bgConfig, 3, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 64, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, area_map_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); if (param1->unk_00->newmoonIslandVisible) { - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 65, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, map_newmoon_island_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 13, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); } if (param1->unk_00->seabreakPathVisible) { - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 66, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, map_seabreak_path_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 28, 7, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); } if (param1->unk_00->fullmoonIslandVisible) { - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 67, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, map_fullmoon_island_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 11, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); } if (param1->unk_00->springPathVisible) { - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 68, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, map_spring_path_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 25, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -534,25 +535,25 @@ static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - mapDisplay->unk_B4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 108, 1, 108 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + mapDisplay->unk_B4[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, dungeon_highlight_NCGR_lz, TRUE, dungeon_highlight_NCGR_lz + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(mapDisplay->unk_B4[0]); SpriteResource_ReleaseData(mapDisplay->unk_B4[0]); - mapDisplay->unk_B4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 106, 1, 106 + 6000, 2, heapID); - mapDisplay->unk_B4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 107, 1, 107 + 6000, 3, heapID); - mapDisplay->unk_D0[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 93, 1, 93 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + mapDisplay->unk_B4[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, dungeon_highlight_cell_NCER_lz, TRUE, dungeon_highlight_cell_NCER_lz + 6000, 2, heapID); + mapDisplay->unk_B4[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, dungeon_highlight_anim_NANR_lz, TRUE, dungeon_highlight_anim_NANR_lz + 6000, 3, heapID); + mapDisplay->unk_D0[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, size_check_icons_NCGR_lz, TRUE, size_check_icons_NCGR_lz + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(mapDisplay->unk_D0[0]); SpriteResource_ReleaseData(mapDisplay->unk_D0[0]); - mapDisplay->unk_D0[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 14, 0, 14 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); + mapDisplay->unk_D0[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, size_check_icons_NCLR, FALSE, size_check_icons_NCLR + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); SpriteTransfer_RequestPlttFreeSpace(mapDisplay->unk_D0[1]); SpriteResource_ReleaseData(mapDisplay->unk_D0[1]); - mapDisplay->unk_D0[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 91, 1, 91 + 6000, 2, heapID); - mapDisplay->unk_D0[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 92, 1, 92 + 6000, 3, heapID); + mapDisplay->unk_D0[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, size_check_icons_cell_NCER_lz, TRUE, size_check_icons_cell_NCER_lz + 6000, 2, heapID); + mapDisplay->unk_D0[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, size_check_icons_anim_NANR_lz, TRUE, size_check_icons_anim_NANR_lz + 6000, 3, heapID); } static void ov21_021DD114(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1) @@ -578,7 +579,7 @@ static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 PokedexGraphicData *v2 = param1->unk_00; int v3; - SpriteResourcesHeader_Init(&v0, 93 + 6000, 14 + 6000, 91 + 6000, 92 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, size_check_icons_NCGR_lz + 6000, size_check_icons_NCLR + 6000, size_check_icons_cell_NCER_lz + 6000, size_check_icons_anim_NANR_lz + 6000, 0xffffffff, 0xffffffff, FALSE, 1, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -591,7 +592,7 @@ static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 mapDisplay->AreaUnknownCellActor = SpriteList_Add(&v1); Sprite_SetAnim(mapDisplay->AreaUnknownCellActor, 2); - SpriteResourcesHeader_Init(&v0, 108 + 6000, 14 + 6000, 106 + 6000, 107 + 6000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, dungeon_highlight_NCGR_lz + 6000, size_check_icons_NCLR + 6000, dungeon_highlight_cell_NCER_lz + 6000, dungeon_highlight_anim_NANR_lz + 6000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -633,7 +634,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 GF_ASSERT(mapDisplay->AreaUnknownCellActor); - v2 = SpriteResourceCollection_Find(param1->unk_00->spriteResourceCollection[1], 14 + 6000); + v2 = SpriteResourceCollection_Find(param1->unk_00->spriteResourceCollection[1], size_check_icons_NCLR + 6000); displayBox.textMan = v3->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v2, NULL); @@ -801,8 +802,8 @@ static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 { Window_FillTilemap(¶m1->unk_00->window, 0); - mapDisplay->unk_7F4 = PokedexGraphics_GetGraphicNarcCharacterData(param1->unk_00, 30, 1, &mapDisplay->unk_7F8, heapID); - mapDisplay->unk_7FC = PokedexGraphics_GetGraphicNarcCharacterData(param1->unk_00, 31, 1, &mapDisplay->unk_800, heapID); + mapDisplay->unk_7F4 = PokedexGraphics_GetGraphicNarcCharacterData(param1->unk_00, dummy1_NCGR_lz, TRUE, &mapDisplay->unk_7F8, heapID); + mapDisplay->unk_7FC = PokedexGraphics_GetGraphicNarcCharacterData(param1->unk_00, dummy2_NCGR_lz, TRUE, &mapDisplay->unk_800, heapID); Window_SetPalette(¶m1->unk_00->window, 8); } diff --git a/src/applications/pokedex/ov21_021DDD2C.c b/src/applications/pokedex/ov21_021DDD2C.c index 405689ff0e..51f701a10e 100644 --- a/src/applications/pokedex/ov21_021DDD2C.c +++ b/src/applications/pokedex/ov21_021DDD2C.c @@ -29,6 +29,8 @@ #include "touch_screen_actions.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" + typedef struct { PokedexScreenManager *unk_00; PokedexSortData *unk_04; @@ -381,9 +383,9 @@ static void ov21_021DE13C(PokedexGraphicData **param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 34, (*param0)->bgConfig, 6, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_sub_NCGR_lz, (*param0)->bgConfig, 6, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 69, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, area_sub_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -395,13 +397,13 @@ static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(*param1); - param0->unk_04[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 105, 1, 105 + 6000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_04[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, time_day_icons_NCGR_lz, TRUE, time_day_icons_NCGR_lz + 6000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_04[0]); SpriteResource_ReleaseData(param0->unk_04[0]); - param0->unk_04[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 103, 1, 103 + 6000, 2, param2); - param0->unk_04[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 104, 1, 104 + 6000, 3, param2); + param0->unk_04[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, time_day_icons_cell_NCER_lz, TRUE, time_day_icons_cell_NCER_lz + 6000, 2, param2); + param0->unk_04[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, time_day_icons_anim_NANR_lz, TRUE, time_day_icons_anim_NANR_lz + 6000, 3, param2); } static void ov21_021DE224(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1) @@ -421,7 +423,7 @@ static void ov21_021DE258(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData ** SpriteListTemplate v1; PokedexGraphicData *v2 = *param1; - SpriteResourcesHeader_Init(&v0, 105 + 6000, 11 + 2100, 103 + 6000, 104 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, time_day_icons_NCGR_lz + 6000, info_NCLR + 2100, time_day_icons_cell_NCER_lz + 6000, time_day_icons_anim_NANR_lz + 6000, 0xffffffff, 0xffffffff, FALSE, 1, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -604,7 +606,7 @@ static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData ** Heap_Free(param0->unk_14); } - param0->unk_14 = PokedexGraphics_GetGraphicNarcPaletteData(*param1, 15 + param0->unk_18, ¶m0->unk_20, heapID); + param0->unk_14 = PokedexGraphics_GetGraphicNarcPaletteData(*param1, area_morning_NCLR + param0->unk_18, ¶m0->unk_20, heapID); param0->unk_28 = 0; if (param0->unk_18 > v0) { @@ -620,7 +622,7 @@ static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData ** Heap_Free(param0->unk_14); } - param0->unk_14 = PokedexGraphics_GetGraphicNarcPaletteData(*param1, 15 + param0->unk_1C, ¶m0->unk_20, heapID); + param0->unk_14 = PokedexGraphics_GetGraphicNarcPaletteData(*param1, area_morning_NCLR + param0->unk_1C, ¶m0->unk_20, heapID); param0->unk_28 = 0; if (param0->unk_18 < param0->unk_1C) { diff --git a/src/applications/pokedex/ov21_021DE668.c b/src/applications/pokedex/ov21_021DE668.c index d32ccca000..43e16bd60a 100644 --- a/src/applications/pokedex/ov21_021DE668.c +++ b/src/applications/pokedex/ov21_021DE668.c @@ -35,6 +35,7 @@ #include "text.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -385,21 +386,21 @@ static void ov21_021DEA44(PokedexGraphicData **param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 33, (*param0)->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_main_NCGR_lz, (*param0)->bgConfig, 3, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 50, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_main_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 51, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_species_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 52, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_footprint_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 54, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_entry_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); Bg_ScheduleTilemapTransfer((*param0)->bgConfig, 3); @@ -498,18 +499,18 @@ static void ov21_021DED7C(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** int v4 = GetSharedFootprintCells(); int v5 = GetSharedFootprintAnims(); - param0->unk_24[0] = SpriteResourceCollection_AddTiles(v0->spriteResourceCollection[0], v1, v2, 1, 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0->unk_24[0] = SpriteResourceCollection_AddTiles(v0->spriteResourceCollection[0], v1, v2, TRUE, 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_24[0]); SpriteResource_ReleaseData(param0->unk_24[0]); - param0->unk_24[1] = SpriteResourceCollection_AddPalette(v0->spriteResourceCollection[1], v1, v3, 0, 4000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); + param0->unk_24[1] = SpriteResourceCollection_AddPalette(v0->spriteResourceCollection[1], v1, v3, FALSE, 4000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_24[1]); SpriteResource_ReleaseData(param0->unk_24[1]); - param0->unk_24[2] = SpriteResourceCollection_Add(v0->spriteResourceCollection[2], v1, v4, 1, 4000, 2, param2); - param0->unk_24[3] = SpriteResourceCollection_Add(v0->spriteResourceCollection[3], v1, v5, 1, 4000, 3, param2); + param0->unk_24[2] = SpriteResourceCollection_Add(v0->spriteResourceCollection[2], v1, v4, TRUE, 4000, 2, param2); + param0->unk_24[3] = SpriteResourceCollection_Add(v0->spriteResourceCollection[3], v1, v5, TRUE, 4000, 3, param2); } static void ov21_021DEE38(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1) @@ -534,7 +535,7 @@ static void ov21_021DEE80(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** SpriteListTemplate v1; PokedexGraphicData *v2 = *param1; - SpriteResourcesHeader_Init(&v0, 4000, 4000, 4000, 4000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, 4000, 4000, 4000, 4000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -588,18 +589,18 @@ static void ov21_021DEFA8(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(*param1); - param0->unk_14[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0->unk_14[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, type_icons_NCGR_lz, TRUE, type_icons_NCGR_lz + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_14[0]); SpriteResource_ReleaseData(param0->unk_14[0]); - param0->unk_14[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 13, 0, 13 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param2); + param0->unk_14[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, type_icons_NCLR, FALSE, type_icons_NCLR + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_14[1]); SpriteResource_ReleaseData(param0->unk_14[1]); - param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 88, 1, 88 + 4000, 2, param2); - param0->unk_14[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 89, 1, 89 + 4000, 3, param2); + param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, type_icons_cell_NCER_lz, TRUE, type_icons_cell_NCER_lz + 4000, 2, param2); + param0->unk_14[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, type_icons_anim_NANR_lz, TRUE, type_icons_anim_NANR_lz + 4000, 3, param2); } static void ov21_021DF054(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData **param1) @@ -628,7 +629,7 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** type1 = PokedexGraphics_GetAnimIDfromType(type1); type2 = PokedexGraphics_GetAnimIDfromType(type2); - SpriteResourcesHeader_Init(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, type_icons_NCGR_lz + 4000, type_icons_NCLR + 4000, type_icons_cell_NCER_lz + 4000, type_icons_anim_NANR_lz + 4000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -652,7 +653,7 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** } } -// This maps the type to an animation ID used in the Pokedex graphics. See zukan.narc -> files 88 (NCER), 89 (NANR), 90 (NCGR) +// This maps the type to an animation ID used in the Pokedex graphics. See zukan.narc -> files type_icons_cell_NCER_lz, type_icons_anim_NANR_lz, type_icons_NCGR_lz int PokedexGraphics_GetAnimIDfromType(int monType) { int animID; @@ -736,7 +737,7 @@ static void ov21_021DF214(UnkStruct_ov21_021DF374 *param0, PokedexGraphicData ** PokedexDisplayBox displayBox; SpriteResource *v6; - SpriteResourcesHeader_Init(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, type_icons_NCGR_lz + 4000, type_icons_NCLR + 4000, type_icons_cell_NCER_lz + 4000, type_icons_anim_NANR_lz + 4000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; diff --git a/src/applications/pokedex/ov21_021DF734.c b/src/applications/pokedex/ov21_021DF734.c index 7c55efeec8..eb90312fb7 100644 --- a/src/applications/pokedex/ov21_021DF734.c +++ b/src/applications/pokedex/ov21_021DF734.c @@ -29,6 +29,7 @@ #include "sprite_util.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -423,9 +424,9 @@ static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, 33, param0->unk_00->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, entry_main_NCGR_lz, param0->unk_00->bgConfig, 3, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 50, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, info_main_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -514,18 +515,18 @@ static void ov21_021DFD1C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 122, 1, 122 + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, form_display_box_NCGR_lz, TRUE, form_display_box_NCGR_lz + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_10[0]); SpriteResource_ReleaseData(param0->unk_10[0]); - param0->unk_10[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 22, 0, 22 + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); + param0->unk_10[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, form_display_box_NCLR, FALSE, form_display_box_NCLR + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_10[1]); SpriteResource_ReleaseData(param0->unk_10[1]); - param0->unk_10[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 123, 1, 123 + 14000, 2, param2); - param0->unk_10[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 121, 1, 121 + 14000, 3, param2); + param0->unk_10[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, form_display_box_cell_NCER_lz, TRUE, form_display_box_cell_NCER_lz + 14000, 2, param2); + param0->unk_10[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, form_display_box_anim_NANR_lz, TRUE, form_display_box_anim_NANR_lz + 14000, 3, param2); } static void ov21_021DFDC8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1) @@ -548,7 +549,7 @@ static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 int v3, v4; int v5; - SpriteResourcesHeader_Init(&v0, 122 + 14000, 22 + 14000, 123 + 14000, 121 + 14000, 0xffffffff, 0xffffffff, 0, 3, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, form_display_box_NCGR_lz + 14000, form_display_box_NCLR + 14000, form_display_box_cell_NCER_lz + 14000, form_display_box_anim_NANR_lz + 14000, 0xffffffff, 0xffffffff, FALSE, 3, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; diff --git a/src/applications/pokedex/ov21_021E0C68.c b/src/applications/pokedex/ov21_021E0C68.c index ea2355adfe..d76f329899 100644 --- a/src/applications/pokedex/ov21_021E0C68.c +++ b/src/applications/pokedex/ov21_021E0C68.c @@ -29,6 +29,7 @@ #include "text.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -383,23 +384,23 @@ static void ov21_021E0FBC(PokedexGraphicData **param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 33, (*param0)->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_main_NCGR_lz, (*param0)->bgConfig, 3, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 50, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_main_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 51, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_species_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 55, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, foreign_entry_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 56, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, foreign_summary_window_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -479,18 +480,18 @@ static void ov21_021E127C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(*param1); - param0->unk_08[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0->unk_08[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, type_icons_NCGR_lz, TRUE, type_icons_NCGR_lz + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_08[0]); SpriteResource_ReleaseData(param0->unk_08[0]); - param0->unk_08[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 13, 0, 13 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param2); + param0->unk_08[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, type_icons_NCLR, FALSE, type_icons_NCLR + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_08[1]); SpriteResource_ReleaseData(param0->unk_08[1]); - param0->unk_08[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 88, 1, 88 + 4000, 2, param2); - param0->unk_08[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 89, 1, 89 + 4000, 3, param2); + param0->unk_08[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, type_icons_cell_NCER_lz, TRUE, type_icons_cell_NCER_lz + 4000, 2, param2); + param0->unk_08[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, type_icons_anim_NANR_lz, TRUE, type_icons_anim_NANR_lz + 4000, 3, param2); } static void ov21_021E1328(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1) @@ -516,7 +517,7 @@ static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData ** PokedexDisplayBox displayBox; SpriteResource *v6; - SpriteResourcesHeader_Init(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, type_icons_NCGR_lz + 4000, type_icons_NCLR + 4000, type_icons_cell_NCER_lz + 4000, type_icons_anim_NANR_lz + 4000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; diff --git a/src/applications/pokedex/ov21_021E1924.c b/src/applications/pokedex/ov21_021E1924.c index 5369922a54..ee4d6504c4 100644 --- a/src/applications/pokedex/ov21_021E1924.c +++ b/src/applications/pokedex/ov21_021E1924.c @@ -36,6 +36,7 @@ #include "unk_02012744.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -618,8 +619,8 @@ static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** { int v0; - PokedexGraphics_LoadGraphicNarcPaletteData(*param1, 9, 4, 4 * 32, 32, heapID); - PokedexGraphics_LoadGraphicNarcPaletteData(*param1, 9, 4, 5 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param1, background_sub_2_NCLR, 4, 4 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param1, background_sub_2_NCLR, 4, 5 * 32, 32, heapID); ov21_021E2458(param0); ov21_021E256C(param0, param1); ov21_021E226C(param0, param1); @@ -636,19 +637,19 @@ static void ov21_021E20A4(PokedexGraphicData **param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 34, (*param0)->bgConfig, 6, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_sub_NCGR_lz, (*param0)->bgConfig, 6, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 62, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_sub_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 60, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_sub_unpressed_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((132 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 63, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, info_sub_pressed_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((76 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -660,20 +661,20 @@ static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(v0); - param0->unk_40[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 102, 1, 102 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_40[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, size_buttons_pressed_NCGR_lz, TRUE, size_buttons_pressed_NCGR_lz + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_40[0]); SpriteResource_ReleaseData(param0->unk_40[0]); - param0->unk_40[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 100, 1, 100 + 5000, 2, param2); - param0->unk_40[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 101, 1, 101 + 5000, 3, param2); - param0->unk_70[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 99, 1, 99 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_40[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, size_buttons_pressed_cell_NCER_lz, TRUE, size_buttons_pressed_cell_NCER_lz + 5000, 2, param2); + param0->unk_40[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, size_buttons_pressed_anim_NANR_lz, TRUE, size_buttons_pressed_anim_NANR_lz + 5000, 3, param2); + param0->unk_70[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, info_language_buttons_NCGR_lz, TRUE, info_language_buttons_NCGR_lz + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_70[0]); SpriteResource_ReleaseData(param0->unk_70[0]); - param0->unk_70[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 97, 1, 97 + 5000, 2, param2); - param0->unk_70[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 98, 1, 98 + 5000, 3, param2); + param0->unk_70[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, info_language_buttons_cell_NCER_lz, TRUE, info_language_buttons_cell_NCER_lz + 5000, 2, param2); + param0->unk_70[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, info_language_buttons_anim_NANR_lz, TRUE, info_language_buttons_anim_NANR_lz + 5000, 3, param2); } static void ov21_021E226C(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1) @@ -698,7 +699,7 @@ static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** PokedexGraphicData *v2 = *param1; int v3; - SpriteResourcesHeader_Init(&v0, 102 + 5000, 11 + 2100, 100 + 5000, 101 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, size_buttons_pressed_NCGR_lz + 5000, info_NCLR + 2100, size_buttons_pressed_cell_NCER_lz + 5000, size_buttons_pressed_anim_NANR_lz + 5000, 0xffffffff, 0xffffffff, FALSE, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -720,7 +721,7 @@ static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** param0->unk_00[1] = SpriteList_Add(&v1); Sprite_SetAnim(param0->unk_00[1], 0); - SpriteResourcesHeader_Init(&v0, 99 + 5000, 11 + 2100, 97 + 5000, 98 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, info_language_buttons_NCGR_lz + 5000, info_NCLR + 2100, info_language_buttons_cell_NCER_lz + 5000, info_language_buttons_anim_NANR_lz + 5000, 0xffffffff, 0xffffffff, FALSE, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.resourceData = &v0; v1.position.y = 176 << FX32_SHIFT; @@ -778,7 +779,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData ** GF_ASSERT(param0->unk_00[0]); - v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], 11 + 2100); + v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], info_NCLR + 2100); displayBox.textMan = v3->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v2, NULL); @@ -919,21 +920,21 @@ static void ov21_021E26A0(PokedexGraphicData **param0, Sprite *param1, PokedexTe case 1: if (*param6 != 0) { v3 = 1; - v4 = 9; + v4 = background_sub_2_NCLR; *param6 = 0; } break; case 2: if (*param6 != 1) { v3 = 1; - v4 = 10; + v4 = background_sub_3_NCLR; *param6 = 1; } break; case 3: if (*param6 != 2) { v3 = 1; - v4 = 8; + v4 = background_sub_1_NCLR; *param6 = 2; } break; diff --git a/src/applications/pokedex/ov21_021E29DC.c b/src/applications/pokedex/ov21_021E29DC.c index 25566715d9..7467f6cdac 100644 --- a/src/applications/pokedex/ov21_021E29DC.c +++ b/src/applications/pokedex/ov21_021E29DC.c @@ -36,6 +36,7 @@ #include "touch_screen_actions.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -627,15 +628,15 @@ static void ov21_021E30E4(PokedexGraphicData **param0, const UnkStruct_ov21_021E void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 6, 0, 0, 0, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, banner_sinnoh_NCLR, 0, 0, 0, heapID); if (PokedexSort_IsNationalDex(param1->unk_04) == 1) { - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 24, 0, 0, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, banner_national_NCLR, 0, 0, 32, heapID); } - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 33, (*param0)->bgConfig, 2, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_main_NCGR_lz, (*param0)->bgConfig, 2, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 57, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, banner_sinnoh_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -647,18 +648,18 @@ static void ov21_021E3178(PokedexGraphicData **param0, UnkStruct_ov21_021E326C * PokedexGraphicData *v0 = *param0; NARC *v1 = PokedexGraphics_GetNARC(*param0); - param1->unk_18[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 87, 1, 87 + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param1->unk_18[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, banner_NCGR_lz, TRUE, banner_NCGR_lz + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param1->unk_18[0]); SpriteResource_ReleaseData(param1->unk_18[0]); - param1->unk_18[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 12, 0, 12 + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); + param1->unk_18[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, banner_default_NCLR, FALSE, banner_default_NCLR + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); SpriteTransfer_RequestPlttFreeSpace(param1->unk_18[1]); SpriteResource_ReleaseData(param1->unk_18[1]); - param1->unk_18[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 85, 1, 85 + 2000, 2, param2); - param1->unk_18[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 86, 1, 86 + 2000, 3, param2); + param1->unk_18[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, banner_cell_NCER_lz, TRUE, banner_cell_NCER_lz + 2000, 2, param2); + param1->unk_18[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, banner_anim_NANR_lz, TRUE, banner_anim_NANR_lz + 2000, 3, param2); } static void ov21_021E3224(PokedexGraphicData **param0, UnkStruct_ov21_021E326C *param1) @@ -1197,16 +1198,16 @@ static void ov21_021E3960(PokedexGraphicData **param0, const UnkStruct_ov21_021E NNSG2dScreenData *v1; if (param1->unk_04->unk_30) { - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 6, 4, 0, 0, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, banner_sinnoh_NCLR, 4, 0, 0, heapID); if (PokedexSort_IsNationalDex(param1->unk_08) == 1) { - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 24, 4, 0, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, banner_national_NCLR, 4, 0, 32, heapID); } } - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 34, (*param0)->bgConfig, 5, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_sub_NCGR_lz, (*param0)->bgConfig, 5, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 59, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, page_panel_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 5, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -1218,18 +1219,18 @@ static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(*param1); - param0->unk_18[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 96, 1, 96 + 2100, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_18[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, page_buttons_NCGR_lz, TRUE, page_buttons_NCGR_lz + 2100, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_18[0]); SpriteResource_ReleaseData(param0->unk_18[0]); - param0->unk_18[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 11, 0, 11 + 2100, NNS_G2D_VRAM_TYPE_2DSUB, 6, param2); + param0->unk_18[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, info_NCLR, FALSE, info_NCLR + 2100, NNS_G2D_VRAM_TYPE_2DSUB, 6, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_18[1]); SpriteResource_ReleaseData(param0->unk_18[1]); - param0->unk_18[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 94, 1, 94 + 2100, 2, param2); - param0->unk_18[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 95, 1, 95 + 2100, 3, param2); + param0->unk_18[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, page_buttons_cell_NCER_lz, TRUE, page_buttons_cell_NCER_lz + 2100, 2, param2); + param0->unk_18[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, page_buttons_anim_NANR_lz, TRUE, page_buttons_anim_NANR_lz + 2100, 3, param2); } static void ov21_021E3AAC(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1) @@ -1252,7 +1253,7 @@ static void ov21_021E3AF0(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData ** PokedexGraphicData *v2 = *param1; int v3; - SpriteResourcesHeader_Init(&v0, 96 + 2100, 11 + 2100, 94 + 2100, 95 + 2100, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, page_buttons_NCGR_lz + 2100, info_NCLR + 2100, page_buttons_cell_NCER_lz + 2100, page_buttons_anim_NANR_lz + 2100, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; diff --git a/src/applications/pokedex/ov21_021E3FFC.c b/src/applications/pokedex/ov21_021E3FFC.c index c4b887540d..236ca8d256 100644 --- a/src/applications/pokedex/ov21_021E3FFC.c +++ b/src/applications/pokedex/ov21_021E3FFC.c @@ -25,6 +25,8 @@ #include "sprite_transfer.h" #include "sprite_util.h" +#include "res/graphics/pokedex/zukan.naix.h" + typedef struct { int *unk_00; PokedexSortData *unk_04; @@ -511,8 +513,8 @@ static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_ void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, 33, param0->unk_00->bgConfig, 3, 0, 0, 1, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 70, 1, &v1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, entry_main_NCGR_lz, param0->unk_00->bgConfig, 3, 0, 0, TRUE, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, cry_button_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -532,18 +534,18 @@ static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 PokedexGraphicData *v0 = param1->unk_00; NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00); - param0->unk_314[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 116, 1, 116 + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0->unk_314[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, cry_bar_NCGR_lz, TRUE, cry_bar_NCGR_lz + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_314[0]); SpriteResource_ReleaseData(param0->unk_314[0]); - param0->unk_314[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, 19, 0, 19 + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); + param0->unk_314[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v1, cry_bar_NCLR, FALSE, cry_bar_NCLR + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); SpriteTransfer_RequestPlttFreeSpace(param0->unk_314[1]); SpriteResource_ReleaseData(param0->unk_314[1]); - param0->unk_314[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 117, 1, 117 + 11000, 2, param2); - param0->unk_314[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 115, 1, 115 + 11000, 3, param2); + param0->unk_314[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, cry_bar_cell_NCER_lz, TRUE, cry_bar_cell_NCER_lz + 11000, 2, param2); + param0->unk_314[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, cry_bar_anim_NANR_lz, TRUE, cry_bar_anim_NANR_lz + 11000, 3, param2); } static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1) @@ -566,7 +568,7 @@ static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41 PokedexGraphicData *v2 = param1->unk_00; int v3, v4; - SpriteResourcesHeader_Init(&v0, 116 + 11000, 19 + 11000, 117 + 11000, 115 + 11000, 0xffffffff, 0xffffffff, 0, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, cry_bar_NCGR_lz + 11000, cry_bar_NCLR + 11000, cry_bar_cell_NCER_lz + 11000, cry_bar_anim_NANR_lz + 11000, 0xffffffff, 0xffffffff, FALSE, 0, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; diff --git a/src/applications/pokedex/ov21_021E68F4.c b/src/applications/pokedex/ov21_021E68F4.c index 6f39795663..25ecb3d136 100644 --- a/src/applications/pokedex/ov21_021E68F4.c +++ b/src/applications/pokedex/ov21_021E68F4.c @@ -32,6 +32,7 @@ #include "unk_02012744.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -496,8 +497,8 @@ static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** { int v0; - PokedexGraphics_LoadGraphicNarcPaletteData(*param1, 9, 4, 4 * 32, 32, heapID); - PokedexGraphics_LoadGraphicNarcPaletteData(*param1, 9, 4, 5 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param1, background_sub_2_NCLR, 4, 4 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param1, background_sub_2_NCLR, 4, 5 * 32, 32, heapID); ov21_021E70BC(param0); ov21_021E71B8(param0, param1); ov21_021E6FD8(param0, param1); @@ -514,9 +515,9 @@ static void ov21_021E6EF0(PokedexGraphicData **param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 34, (*param0)->bgConfig, 6, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_sub_NCGR_lz, (*param0)->bgConfig, 6, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 61, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, size_sub_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -528,13 +529,13 @@ static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(*param1); - param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 102, 1, 102 + 9000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_10[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, size_buttons_pressed_NCGR_lz, TRUE, size_buttons_pressed_NCGR_lz + 9000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_10[0]); SpriteResource_ReleaseData(param0->unk_10[0]); - param0->unk_10[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 100, 1, 100 + 9000, 2, param2); - param0->unk_10[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 101, 1, 101 + 9000, 3, param2); + param0->unk_10[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, size_buttons_pressed_cell_NCER_lz, TRUE, size_buttons_pressed_cell_NCER_lz + 9000, 2, param2); + param0->unk_10[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, size_buttons_pressed_anim_NANR_lz, TRUE, size_buttons_pressed_anim_NANR_lz + 9000, 3, param2); } static void ov21_021E6FD8(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1) @@ -554,7 +555,7 @@ static void ov21_021E700C(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** PokedexGraphicData *v2 = *param1; int v3; - SpriteResourcesHeader_Init(&v0, 102 + 9000, 11 + 2100, 100 + 9000, 101 + 9000, 0xffffffff, 0xffffffff, 0, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, size_buttons_pressed_NCGR_lz + 9000, info_NCLR + 2100, size_buttons_pressed_cell_NCER_lz + 9000, size_buttons_pressed_anim_NANR_lz + 9000, 0xffffffff, 0xffffffff, FALSE, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -599,7 +600,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData ** GF_ASSERT(param0->unk_00[0]); - v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], 11 + 2100); + v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], info_NCLR + 2100); displayBox.textMan = v3->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v2, NULL); @@ -662,21 +663,21 @@ static void ov21_021E71D0(PokedexGraphicData **param0, Sprite *param1, PokedexTe case 1: if (*param6 != 0) { v3 = 1; - v4 = 9; + v4 = background_sub_2_NCLR; *param6 = 0; } break; case 2: if (*param6 != 1) { v3 = 1; - v4 = 10; + v4 = background_sub_3_NCLR; *param6 = 1; } break; case 3: if (*param6 != 2) { v3 = 1; - v4 = 8; + v4 = background_sub_1_NCLR; *param6 = 2; } break; diff --git a/src/applications/pokedex/ov21_021E737C.c b/src/applications/pokedex/ov21_021E737C.c index bf1e982bb4..5f368bb687 100644 --- a/src/applications/pokedex/ov21_021E737C.c +++ b/src/applications/pokedex/ov21_021E737C.c @@ -34,6 +34,7 @@ #include "text.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -523,9 +524,9 @@ static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_ void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, 33, param0->unk_00->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(param0->unk_00, entry_main_NCGR_lz, param0->unk_00->bgConfig, 3, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(param0->unk_00, 73, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(param0->unk_00, weight_check_main_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -563,12 +564,12 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v9, v3, 0, 8000, 2, heapID); param0->unk_14[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v9, v4, 0, 8000, 3, heapID); - param0->unk_24[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v7, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + param0->unk_24[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v7, size_check_icons_NCGR_lz, TRUE, size_check_icons_NCGR_lz + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(param0->unk_24[0]); SpriteResource_ReleaseData(param0->unk_24[0]); - param0->unk_24[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v7, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); + param0->unk_24[1] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], v7, size_check_icons_NCLR, FALSE, size_check_icons_NCLR + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); SpriteTransfer_RequestPlttFreeSpace(param0->unk_24[1]); @@ -576,8 +577,8 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 param0->unk_C0 = Heap_Alloc(heapID, 32 * 5); } - param0->unk_24[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v7, 91, 1, 91 + 7000, 2, heapID); - param0->unk_24[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v7, 92, 1, 92 + 7000, 3, heapID); + param0->unk_24[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v7, size_check_icons_cell_NCER_lz, TRUE, size_check_icons_cell_NCER_lz + 7000, 2, heapID); + param0->unk_24[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v7, size_check_icons_anim_NANR_lz, TRUE, size_check_icons_anim_NANR_lz + 7000, 3, heapID); NARC_dtor(v9); } @@ -617,7 +618,7 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 int species = PokedexSort_CurrentSpecies(param2->unk_00); int v7 = PokedexSort_DefaultForm(param2->unk_00, species); - SpriteResourcesHeader_Init(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 3, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, size_check_icons_NCGR_lz + 7000, size_check_icons_NCLR + 7000, size_check_icons_cell_NCER_lz + 7000, size_check_icons_anim_NANR_lz + 7000, 0xffffffff, 0xffffffff, FALSE, 3, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -655,7 +656,7 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 param0->unk_0C[1] = SpriteList_Add(&v1); Sprite_SetAnim(param0->unk_0C[1], 0); - SpriteResourcesHeader_Init(&v0, SpriteResource_GetID(param0->unk_14[0]), SpriteResource_GetID(param0->unk_14[1]), SpriteResource_GetID(param0->unk_14[2]), SpriteResource_GetID(param0->unk_14[3]), 0xffffffff, 0xffffffff, 0, 3, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, SpriteResource_GetID(param0->unk_14[0]), SpriteResource_GetID(param0->unk_14[1]), SpriteResource_GetID(param0->unk_14[2]), SpriteResource_GetID(param0->unk_14[3]), 0xffffffff, 0xffffffff, FALSE, 3, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -752,8 +753,8 @@ static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int heapID) SoftwareSpriteCharsTemplate v0; SoftwareSpritePaletteTemplate v1; - param0->unk_10 = PokedexGraphics_GetGraphicNarcCharacterData(param0->unk_00, 36, 1, ¶m0->unk_18, heapID); - param0->unk_14 = PokedexGraphics_GetGraphicNarcPaletteData(param0->unk_00, 6, ¶m0->unk_1C, heapID); + param0->unk_10 = PokedexGraphics_GetGraphicNarcCharacterData(param0->unk_00, weight_scale_NCGR_lz, TRUE, ¶m0->unk_18, heapID); + param0->unk_14 = PokedexGraphics_GetGraphicNarcPaletteData(param0->unk_00, banner_sinnoh_NCLR, ¶m0->unk_1C, heapID); v0.softSpriteMan = param0->unk_00->unk_164; v0.charsData = param0->unk_18; diff --git a/src/applications/pokedex/ov21_021E8484.c b/src/applications/pokedex/ov21_021E8484.c index 677e98afcd..805795c8ed 100644 --- a/src/applications/pokedex/ov21_021E8484.c +++ b/src/applications/pokedex/ov21_021E8484.c @@ -31,6 +31,7 @@ #include "unk_02012744.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -469,7 +470,7 @@ static void ov21_021E894C(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData ** { int v0; - PokedexGraphics_LoadGraphicNarcPaletteData(*param1, 9, 4, 4 * 32, 32, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param1, background_sub_2_NCLR, 4, 4 * 32, 32, heapID); ov21_021E8B34(param0); ov21_021E8BDC(param0, param1); ov21_021E8A74(param0, param1); @@ -486,9 +487,9 @@ static void ov21_021E898C(PokedexGraphicData **param0, int heapID) void *v0; NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 34, (*param0)->bgConfig, 6, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_sub_NCGR_lz, (*param0)->bgConfig, 6, 0, 0, TRUE, heapID); - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 58, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, forms_sub_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -500,13 +501,13 @@ static void ov21_021E89F4(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData ** PokedexGraphicData *v0 = *param1; NARC *v1 = PokedexGraphics_GetNARC(v0); - param0->unk_08[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, 102, 1, 102 + 13000, NNS_G2D_VRAM_TYPE_2DSUB, param2); + param0->unk_08[0] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], v1, size_buttons_pressed_NCGR_lz, TRUE, size_buttons_pressed_NCGR_lz + 13000, NNS_G2D_VRAM_TYPE_2DSUB, param2); SpriteTransfer_RequestCharAtEnd(param0->unk_08[0]); SpriteResource_ReleaseData(param0->unk_08[0]); - param0->unk_08[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, 100, 1, 100 + 13000, 2, param2); - param0->unk_08[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, 101, 1, 101 + 13000, 3, param2); + param0->unk_08[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v1, size_buttons_pressed_cell_NCER_lz, TRUE, size_buttons_pressed_cell_NCER_lz + 13000, 2, param2); + param0->unk_08[3] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], v1, size_buttons_pressed_anim_NANR_lz, TRUE, size_buttons_pressed_anim_NANR_lz + 13000, 3, param2); } static void ov21_021E8A74(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData **param1) @@ -526,7 +527,7 @@ static void ov21_021E8AA8(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData ** PokedexGraphicData *v2 = *param1; int v3; - SpriteResourcesHeader_Init(&v0, 102 + 13000, 11 + 2100, 100 + 13000, 101 + 13000, 0xffffffff, 0xffffffff, 0, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, size_buttons_pressed_NCGR_lz + 13000, info_NCLR + 2100, size_buttons_pressed_cell_NCER_lz + 13000, size_buttons_pressed_anim_NANR_lz + 13000, 0xffffffff, 0xffffffff, FALSE, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -563,7 +564,7 @@ static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData ** GF_ASSERT(param0->unk_00[0]); - v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], 11 + 2100); + v2 = SpriteResourceCollection_Find(v3->spriteResourceCollection[1], info_NCLR + 2100); displayBox.textMan = v3->textMan; displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(v2, NULL); @@ -614,21 +615,21 @@ static void ov21_021E8BE8(PokedexGraphicData **param0, Sprite *param1, PokedexTe case 1: if (*param6 != 0) { v3 = 1; - v4 = 9; + v4 = background_sub_2_NCLR; *param6 = 0; } break; case 2: if (*param6 != 1) { v3 = 1; - v4 = 10; + v4 = background_sub_3_NCLR; *param6 = 1; } break; case 3: if (*param6 != 2) { v3 = 1; - v4 = 8; + v4 = background_sub_1_NCLR; *param6 = 2; } break; diff --git a/src/applications/pokedex/ov21_021E8D48.c b/src/applications/pokedex/ov21_021E8D48.c index 3b57dc361b..2f31bea3fb 100644 --- a/src/applications/pokedex/ov21_021E8D48.c +++ b/src/applications/pokedex/ov21_021E8D48.c @@ -32,6 +32,7 @@ #include "text.h" #include "vram_transfer.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -50,8 +51,8 @@ typedef struct { } UnkStruct_ov21_021E968C; typedef struct { - void *unk_00[2]; - NNSG2dPaletteData *unk_08[2]; + void *paletteBuffers[2]; + NNSG2dPaletteData *paletteData[2]; int unk_10; int unk_14[2]; int unk_1C; @@ -418,34 +419,34 @@ static void ov21_021E92B0(PokedexSpeciesLabel *pokedexSpeciesLabel) static void ov21_021E92C4(SpriteResource **param0, SpriteResourceCollection **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { - param0[0] = SpriteResourceCollection_AddTiles(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0[0] = SpriteResourceCollection_AddTiles(param1[0], param3, param4, TRUE, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0[0]); SpriteResource_ReleaseData(param0[0]); - param0[1] = SpriteResourceCollection_AddPalette(param1[1], param3, param5, 0, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param8, param2); + param0[1] = SpriteResourceCollection_AddPalette(param1[1], param3, param5, FALSE, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param8, param2); SpriteTransfer_RequestPlttFreeSpace(param0[1]); SpriteResource_ReleaseData(param0[1]); - param0[2] = SpriteResourceCollection_Add(param1[2], param3, param6, 1, param9, 2, param2); - param0[3] = SpriteResourceCollection_Add(param1[3], param3, param7, 1, param9, 3, param2); + param0[2] = SpriteResourceCollection_Add(param1[2], param3, param6, TRUE, param9, 2, param2); + param0[3] = SpriteResourceCollection_Add(param1[3], param3, param7, TRUE, param9, 3, param2); } static void ov21_021E9344(SpriteResource **param0, SpriteResourceCollection **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9) { - param0[0] = SpriteResourceCollection_AddTilesFrom(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2); + param0[0] = SpriteResourceCollection_AddTilesFrom(param1[0], param3, param4, TRUE, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2); SpriteTransfer_RequestCharAtEnd(param0[0]); SpriteResource_ReleaseData(param0[0]); - param0[1] = SpriteResourceCollection_AddPaletteFrom(param1[1], param3, param5, 0, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param8, param2); + param0[1] = SpriteResourceCollection_AddPaletteFrom(param1[1], param3, param5, FALSE, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param8, param2); SpriteTransfer_RequestPlttFreeSpace(param0[1]); SpriteResource_ReleaseData(param0[1]); - param0[2] = SpriteResourceCollection_AddFrom(param1[2], param3, param6, 1, param9, 2, param2); - param0[3] = SpriteResourceCollection_AddFrom(param1[3], param3, param7, 1, param9, 3, param2); + param0[2] = SpriteResourceCollection_AddFrom(param1[2], param3, param6, TRUE, param9, 2, param2); + param0[3] = SpriteResourceCollection_AddFrom(param1[3], param3, param7, TRUE, param9, 3, param2); } static void ov21_021E93C4(SpriteResource **param0, SpriteResourceCollection **param1) @@ -461,7 +462,7 @@ static void ov21_021E93C4(SpriteResource **param0, SpriteResourceCollection **pa static void ov21_021E93F8(SpriteResource **param0, SpriteResourceCollection **param1, SpriteResourcesHeader *param2, int param3) { - SpriteResourcesHeader_Init(param2, SpriteResource_GetID(param0[0]), SpriteResource_GetID(param0[1]), SpriteResource_GetID(param0[2]), SpriteResource_GetID(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL); + SpriteResourcesHeader_Init(param2, SpriteResource_GetID(param0[0]), SpriteResource_GetID(param0[1]), SpriteResource_GetID(param0[2]), SpriteResource_GetID(param0[3]), 0xffffffff, 0xffffffff, FALSE, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL); } static void ov21_021E9458(UnkStruct_ov21_021E94F8 *param0, SpriteResourceCollection **param1, int param2, int param3) @@ -560,7 +561,7 @@ static void ov21_021E95B0(UnkStruct_ov21_021E95B0 *param0) static void ov21_021E95BC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollection **param1, int param2, int param3, NARC *param4) { - ov21_021E9344(param0->unk_08, param1, param3, param4, 90, 13, 88, 89, 5, 17000); + ov21_021E9344(param0->unk_08, param1, param3, param4, type_icons_NCGR_lz, type_icons_NCLR, type_icons_cell_NCER_lz, type_icons_anim_NANR_lz, 5, 17000); } static void ov21_021E95EC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollection **param1) @@ -617,25 +618,25 @@ static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2) void *v0; NNSG2dScreenData *v1; - Graphics_LoadPaletteFromOpenNARC(param2, 6, 0, 0, 0, param1); - Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 33, param0, 3, 0, 0, 1, param1); + Graphics_LoadPaletteFromOpenNARC(param2, banner_sinnoh_NCLR, 0, 0, 0, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, entry_main_NCGR_lz, param0, 3, 0, 0, 1, param1); - v0 = Graphics_GetScrnDataFromOpenNARC(param2, 50, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, info_main_NSCR_lz, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = Graphics_GetScrnDataFromOpenNARC(param2, 51, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, info_species_window_NSCR_lz, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = Graphics_GetScrnDataFromOpenNARC(param2, 52, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, info_footprint_window_NSCR_lz, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); - v0 = Graphics_GetScrnDataFromOpenNARC(param2, 54, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, info_entry_window_NSCR_lz, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -647,9 +648,9 @@ static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2) void *v0; NNSG2dScreenData *v1; - Graphics_LoadTilesToBgLayerFromOpenNARC(param2, 33, param0, 2, 0, 0, 1, param1); + Graphics_LoadTilesToBgLayerFromOpenNARC(param2, entry_main_NCGR_lz, param0, 2, 0, 0, 1, param1); - v0 = Graphics_GetScrnDataFromOpenNARC(param2, 57, 1, &v1, param1); + v0 = Graphics_GetScrnDataFromOpenNARC(param2, banner_sinnoh_NSCR_lz, 1, &v1, param1); Bg_LoadToTilemapRect(param0, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -762,17 +763,17 @@ static void ov21_021E9A38(void) CharTransfer_Free(); } -static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param2, NARC *param3) +static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int heapID, int param2, NARC *param3) { int v0; if (param2 == 0) { - param0->unk_00[0] = Graphics_GetPlttDataFromOpenNARC(param3, 23, ¶m0->unk_08[0], param1); + param0->paletteBuffers[0] = Graphics_GetPlttDataFromOpenNARC(param3, banner_register_NCLR, ¶m0->paletteData[0], heapID); } else { - param0->unk_00[0] = Graphics_GetPlttDataFromOpenNARC(param3, 24, ¶m0->unk_08[0], param1); + param0->paletteBuffers[0] = Graphics_GetPlttDataFromOpenNARC(param3, banner_national_NCLR, ¶m0->paletteData[0], heapID); } - param0->unk_00[1] = Graphics_GetPlttDataFromOpenNARC(param3, 26, ¶m0->unk_08[1], param1); + param0->paletteBuffers[1] = Graphics_GetPlttDataFromOpenNARC(param3, dummy3_NCLR, ¶m0->paletteData[1], heapID); param0->unk_10 = 0; param0->unk_1C = 0; @@ -804,7 +805,7 @@ static void ov21_021E9AC8(UnkStruct_ov21_021E9A9C *param0) int v0; for (v0 = 0; v0 < 2; v0++) { - Heap_Free(param0->unk_00[0]); + Heap_Free(param0->paletteBuffers[0]); } memset(param0, 0, sizeof(UnkStruct_ov21_021E9A9C)); @@ -812,11 +813,11 @@ static void ov21_021E9AC8(UnkStruct_ov21_021E9A9C *param0) static void ov21_021E9AE8(UnkStruct_ov21_021E9A9C *param0, int param1) { - DC_FlushRange((void *)param0->unk_08[param1]->pRawData, 1 * 32); - GX_LoadBGPltt(param0->unk_08[param1]->pRawData, 0 * 32, 1 * 32); + DC_FlushRange((void *)param0->paletteData[param1]->pRawData, 1 * 32); + GX_LoadBGPltt(param0->paletteData[param1]->pRawData, 0 * 32, 1 * 32); } static void ov21_021E9B08(UnkStruct_ov21_021E9A9C *param0, int param1) { - VramTransfer_Request(NNS_GFD_DST_2D_BG_PLTT_MAIN, 0 * 32, param0->unk_08[param1]->pRawData, 1 * 32); + VramTransfer_Request(NNS_GFD_DST_2D_BG_PLTT_MAIN, 0 * 32, param0->paletteData[param1]->pRawData, 1 * 32); } diff --git a/src/applications/pokedex/pokedex_graphics.c b/src/applications/pokedex/pokedex_graphics.c index 1fe6bbbc82..800f487c56 100644 --- a/src/applications/pokedex/pokedex_graphics.c +++ b/src/applications/pokedex/pokedex_graphics.c @@ -11,6 +11,8 @@ #include "sys_task.h" #include "unk_02012744.h" +#include "res/graphics/pokedex/zukan.naix.h" + static void InitBackgrounds(BgConfig *bgConfig, enum HeapID heapID); static void FreeBackgrounds(BgConfig *bgConfig); static void InitWindow(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID); @@ -496,7 +498,7 @@ void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraph } } -void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID) +void *PokedexGraphics_GetGraphicNarcTilemapData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID) { void *graphicFile = LoadGraphicsFile(pokedexGraphicData, memberIndex, isCompressed, heapID); @@ -724,34 +726,34 @@ static void InitSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData, enu PokedexSpeciesLabel *pokedexSpeciesLabel = &pokedexGraphicData->pokedexSpeciesLabel; NARC *pokedexGraphicsNARC = PokedexGraphics_GetNARC(pokedexGraphicData); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicsNARC, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicsNARC, name_tag_NCGR_lz, TRUE, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR]); SpriteResource_ReleaseData(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR]); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicsNARC, 3, 0, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicsNARC, buttons_NCLR, FALSE, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); SpriteTransfer_RequestPlttFreeSpace(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT]); SpriteResource_ReleaseData(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT]); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicsNARC, 76, 1, 3000, 2, heapID); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphicsNARC, 77, 1, 3000, 3, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicsNARC, name_tag_cell_NCER_lz, TRUE, 3000, SPRITE_RESOURCE_CELL, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphicsNARC, name_tag_anim_NANR_lz, TRUE, 3000, SPRITE_RESOURCE_ANIM, heapID); } void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, NARC *narc) { - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(spriteResourceCollection[SPRITE_RESOURCE_CHAR], narc, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(spriteResourceCollection[SPRITE_RESOURCE_CHAR], narc, name_tag_NCGR_lz, TRUE, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR]); SpriteResource_ReleaseData(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR]); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(spriteResourceCollection[SPRITE_RESOURCE_PLTT], narc, 3, 0, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(spriteResourceCollection[SPRITE_RESOURCE_PLTT], narc, buttons_NCLR, FALSE, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID); SpriteTransfer_RequestPlttFreeSpace(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT]); SpriteResource_ReleaseData(pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_PLTT]); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(spriteResourceCollection[SPRITE_RESOURCE_CELL], narc, 76, 1, 3000, 2, heapID); - pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(spriteResourceCollection[SPRITE_RESOURCE_ANIM], narc, 77, 1, 3000, 3, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(spriteResourceCollection[SPRITE_RESOURCE_CELL], narc, name_tag_cell_NCER_lz, TRUE, 3000, SPRITE_RESOURCE_CELL, heapID); + pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(spriteResourceCollection[SPRITE_RESOURCE_ANIM], narc, name_tag_anim_NANR_lz, TRUE, 3000, SPRITE_RESOURCE_ANIM, heapID); } static void FreeSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData) @@ -783,7 +785,7 @@ static void InitSpeciesLabel(PokedexGraphicData *pokedexGraphicData, enum HeapID SpriteResourcesHeader spriteResourcesHeader; SpriteListTemplate spriteListTemplate; - SpriteResourcesHeader_Init(&spriteResourcesHeader, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, 0, pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); + SpriteResourcesHeader_Init(&spriteResourcesHeader, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, FALSE, 0, pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); spriteListTemplate.list = pokedexGraphicData->spriteList; spriteListTemplate.resourceData = &spriteResourcesHeader; @@ -830,7 +832,7 @@ void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, S SpriteResourcesHeader spriteResourcesHeader; SpriteListTemplate spriteListTemplate; - SpriteResourcesHeader_Init(&spriteResourcesHeader, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, headerPriority, spriteResourceCollection[SPRITE_RESOURCE_CHAR], spriteResourceCollection[SPRITE_RESOURCE_PLTT], spriteResourceCollection[SPRITE_RESOURCE_CELL], spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); + SpriteResourcesHeader_Init(&spriteResourcesHeader, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, FALSE, headerPriority, spriteResourceCollection[SPRITE_RESOURCE_CHAR], spriteResourceCollection[SPRITE_RESOURCE_PLTT], spriteResourceCollection[SPRITE_RESOURCE_CELL], spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); spriteListTemplate.list = spriteList; spriteListTemplate.resourceData = &spriteResourcesHeader; @@ -892,18 +894,18 @@ static void InitCursorGraphics(PokedexGraphicData *pokedexGraphicData, enum Heap PokedexCursorGraphics *pokedexCursorGraphics = &pokedexGraphicData->cursorGraphics; NARC *pokedexGraphicsNARC = PokedexGraphics_GetNARC(pokedexGraphicData); - pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicsNARC, 119, 1, 12000, NNS_G2D_VRAM_TYPE_2DSUB, heapID); + pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicsNARC, cursor_NCGR_lz, TRUE, 12000, NNS_G2D_VRAM_TYPE_2DSUB, heapID); SpriteTransfer_RequestCharAtEnd(pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_CHAR]); SpriteResource_ReleaseData(pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_CHAR]); - pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicsNARC, 21, 0, 12000, NNS_G2D_VRAM_TYPE_2DSUB, 1, heapID); + pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicsNARC, cursor_NCLR, FALSE, 12000, NNS_G2D_VRAM_TYPE_2DSUB, 1, heapID); SpriteTransfer_RequestPlttFreeSpace(pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_PLTT]); SpriteResource_ReleaseData(pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_PLTT]); - pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicsNARC, 120, 1, 12000, 2, heapID); - pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphicsNARC, 118, 1, 12000, 3, heapID); + pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicsNARC, cursor_cell_NCER_lz, TRUE, 12000, SPRITE_RESOURCE_CELL, heapID); + pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphicsNARC, cursor_anim_NANR_lz, TRUE, 12000, SPRITE_RESOURCE_ANIM, heapID); } static void FreeCursorGraphics(PokedexGraphicData *pokedexGraphicData) @@ -925,7 +927,7 @@ static void InitCursor(PokedexGraphicData *pokedexGraphicData, enum HeapID heapI SpriteListTemplate spriteListTemplate; PokedexCursorGraphics *pokedexCursorGraphics = &pokedexGraphicData->cursorGraphics; - SpriteResourcesHeader_Init(&resourceData, 12000, 12000, 12000, 12000, 0xffffffff, 0xffffffff, 0, 0, pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); + SpriteResourcesHeader_Init(&resourceData, 12000, 12000, 12000, 12000, 0xffffffff, 0xffffffff, FALSE, 0, pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); spriteListTemplate.list = pokedexGraphicData->spriteList; spriteListTemplate.resourceData = &resourceData; diff --git a/src/applications/pokedex/pokedex_height_check.c b/src/applications/pokedex/pokedex_height_check.c index c98c5daac3..026243752c 100644 --- a/src/applications/pokedex/pokedex_height_check.c +++ b/src/applications/pokedex/pokedex_height_check.c @@ -30,6 +30,7 @@ #include "strbuf.h" #include "text.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" typedef struct { @@ -324,9 +325,9 @@ static void DisplayBackground(PokedexGraphicData **param0, const UnkStruct_ov21_ { NNSG2dScreenData *v1; - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 33, (*param0)->bgConfig, 3, 0, 0, 1, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, entry_main_NCGR_lz, (*param0)->bgConfig, 3, 0, 0, TRUE, heapID); - void *v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 74, 1, &v1, heapID); + void *v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, height_check_main_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -338,18 +339,18 @@ static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, Poked PokedexGraphicData *v0 = *param1; NARC *pokedexGraphicsNarc = PokedexGraphics_GetNARC(v0); - heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], pokedexGraphicsNarc, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphicsNarc, size_check_icons_NCGR_lz, TRUE, size_check_icons_NCGR_lz + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]); SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]); - heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], pokedexGraphicsNarc, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); + heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphicsNarc, size_check_icons_NCLR, FALSE, size_check_icons_NCLR + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); SpriteTransfer_RequestPlttFreeSpace(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]); SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]); - heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], pokedexGraphicsNarc, 91, 1, 91 + 7000, 2, heapID); - heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID); + heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphicsNarc, size_check_icons_cell_NCER_lz, TRUE, size_check_icons_cell_NCER_lz + 7000, SPRITE_RESOURCE_CELL, heapID); + heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphicsNarc, size_check_icons_anim_NANR_lz, TRUE, size_check_icons_anim_NANR_lz + 7000, SPRITE_RESOURCE_ANIM, heapID); } static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1) @@ -358,10 +359,10 @@ static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicDa SpriteTransfer_ResetCharTransfer(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]); SpriteTransfer_ResetPlttTransfer(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[0], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[1], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[2], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CELL]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_CHAR], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_PLTT], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_CELL], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CELL]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_ANIM], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM]); } static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapID heapID) @@ -371,7 +372,7 @@ static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, Pokedex PokedexGraphicData *v2 = *param1; int species = PokedexSort_CurrentSpecies(param2->unk_04); - SpriteResourcesHeader_Init(&trainerResource, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 1, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&trainerResource, size_check_icons_NCGR_lz + 7000, size_check_icons_NCLR + 7000, size_check_icons_cell_NCER_lz + 7000, size_check_icons_anim_NANR_lz + 7000, 0xffffffff, 0xffffffff, FALSE, 1, v2->spriteResourceCollection[SPRITE_RESOURCE_CHAR], v2->spriteResourceCollection[SPRITE_RESOURCE_PLTT], v2->spriteResourceCollection[SPRITE_RESOURCE_CELL], v2->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); trainerCellParams.list = v2->spriteList; trainerCellParams.resourceData = &trainerResource; diff --git a/src/applications/pokedex/pokedex_search.c b/src/applications/pokedex/pokedex_search.c index 713c5fb414..f2c22a5eab 100644 --- a/src/applications/pokedex/pokedex_search.c +++ b/src/applications/pokedex/pokedex_search.c @@ -29,6 +29,7 @@ #include "strbuf.h" #include "text.h" +#include "res/graphics/pokedex/zukan.naix.h" #include "res/text/bank/pokedex.h" #define EXITSEARCH (1 << 1) @@ -552,8 +553,8 @@ static void ClearScreen(PokedexSearchDisplay *searchDisplay, PokedexGraphicData static void ov21_021D8B8C(PokedexGraphicData **param0, const PokedexSearchSettings *searchSettings, enum HeapID heapID) { - PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 28, (*param0)->bgConfig, 3, 0, 0, 1, heapID); - PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 5, 0, 0, 32, heapID); + PokedexGraphics_LoadGraphicNarcCharacterData(*param0, scroll_main_background_NCGR_lz, (*param0)->bgConfig, 3, 0, 0, TRUE, heapID); + PokedexGraphics_LoadGraphicNarcPaletteData(*param0, search_NCLR, 0, 0, 32, heapID); } static void GetDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID, int param4) @@ -561,12 +562,12 @@ static void GetDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicDat int mapIndex; if (param4 == 1) { - mapIndex = 42; + mapIndex = search_national_NSCR_lz; } else { - mapIndex = 40; + mapIndex = search_sinnoh_NSCR_lz; } - searchDisplay->tileMap = PokedexGraphics_GetGraphicNarcScreenData(*param1, mapIndex, 1, &searchDisplay->screenData, heapID); + searchDisplay->tileMap = PokedexGraphics_GetGraphicNarcTilemapData(*param1, mapIndex, TRUE, &searchDisplay->screenData, heapID); } static void FreeDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1) @@ -589,18 +590,18 @@ static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphi PokedexGraphicData *v0 = *param1; NARC *pokedexGraphics = PokedexGraphics_GetNARC(v0); - searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[0], pokedexGraphics, 81, 1, 81 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_CHAR], pokedexGraphics, search_body_shapes_NCGR_lz, TRUE, search_body_shapes_NCGR_lz + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); SpriteTransfer_RequestCharAtEnd(searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]); SpriteResource_ReleaseData(searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]); - searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[1], pokedexGraphics, 3, 0, 3 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, 12, heapID); + searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_PLTT], pokedexGraphics, buttons_NCLR, FALSE, buttons_NCLR + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, 12, heapID); SpriteTransfer_RequestPlttFreeSpace(searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]); SpriteResource_ReleaseData(searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]); - searchDisplay->searchGraphics[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], pokedexGraphics, 79, 1, 79 + 15000, SPRITE_RESOURCE_CELL, heapID); - searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[3], pokedexGraphics, 80, 1, 80 + 15000, SPRITE_RESOURCE_ANIM, heapID); + searchDisplay->searchGraphics[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_CELL], pokedexGraphics, search_body_shapes_cell_NCER_lz, TRUE, search_body_shapes_cell_NCER_lz + 15000, SPRITE_RESOURCE_CELL, heapID); + searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphics, search_body_shapes_anim_NANR_lz, TRUE, search_body_shapes_anim_NANR_lz + 15000, SPRITE_RESOURCE_ANIM, heapID); } static void FreeSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1) @@ -610,10 +611,10 @@ static void FreeSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraph SpriteTransfer_ResetCharTransfer(searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]); SpriteTransfer_ResetPlttTransfer(searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[0], searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[1], searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[2], searchDisplay->searchGraphics[SPRITE_RESOURCE_CELL]); - SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_CHAR], searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_PLTT], searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_CELL], searchDisplay->searchGraphics[SPRITE_RESOURCE_CELL]); + SpriteResourceCollection_Remove(v0->spriteResourceCollection[SPRITE_RESOURCE_ANIM], searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM]); } static void InitCellActors(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID) @@ -622,7 +623,7 @@ static void InitCellActors(PokedexSearchDisplay *searchDisplay, PokedexGraphicDa SpriteListTemplate v1; PokedexGraphicData *v2 = *param1; - SpriteResourcesHeader_Init(&v0, 81 + 15000, 3 + 15000, 79 + 15000, 80 + 15000, 0xffffffff, 0xffffffff, 0, 2, v2->spriteResourceCollection[0], v2->spriteResourceCollection[1], v2->spriteResourceCollection[2], v2->spriteResourceCollection[3], NULL, NULL); + SpriteResourcesHeader_Init(&v0, search_body_shapes_NCGR_lz + 15000, buttons_NCLR + 15000, search_body_shapes_cell_NCER_lz + 15000, search_body_shapes_anim_NANR_lz + 15000, 0xffffffff, 0xffffffff, FALSE, 2, v2->spriteResourceCollection[SPRITE_RESOURCE_CHAR], v2->spriteResourceCollection[SPRITE_RESOURCE_PLTT], v2->spriteResourceCollection[SPRITE_RESOURCE_CELL], v2->spriteResourceCollection[SPRITE_RESOURCE_ANIM], NULL, NULL); v1.list = v2->spriteList; v1.resourceData = &v0; @@ -760,7 +761,7 @@ static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum int y; int mapIndex; - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, 43, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, search_filter_NSCR_lz, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); @@ -768,25 +769,25 @@ static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum switch (filterMethod) { case FM_ORDER: y = 6; - mapIndex = 44; + mapIndex = search_filter_order_NSCR_lz; break; case FM_NAME: y = 9; - mapIndex = 45; + mapIndex = search_filter_name_NSCR_lz; break; case FM_TYPE: y = 12; - mapIndex = 46; + mapIndex = search_filter_type_NSCR_lz; break; case FM_FORM: y = 17; - mapIndex = 47; + mapIndex = search_filter_form_NSCR_lz; break; default: break; } - v0 = PokedexGraphics_GetGraphicNarcScreenData(*param0, mapIndex, 1, &v1, heapID); + v0 = PokedexGraphics_GetGraphicNarcTilemapData(*param0, mapIndex, TRUE, &v1, heapID); Bg_LoadToTilemapRect((*param0)->bgConfig, 3, v1->rawData, 6, y, v1->screenWidth / 8, v1->screenHeight / 8); Heap_Free(v0); diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 4cfe21de45..057d7e4dfe 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -215,33 +215,9 @@ static void ConvertFromTiles4BppCell(unsigned char *src, unsigned char *dest, in } } -static uint32_t ConvertFromScanned4Bpp(unsigned char *src, unsigned char *dest, int fileSize, bool invertColours, bool scanFrontToBack) +static void ConvertScanned4Bpp(unsigned char *src, unsigned char *dest, int charDataSize, bool invertColours, bool convertTo8Bpp, int palIndex) { - uint32_t encValue = 0; - if (scanFrontToBack) { - encValue = (src[1] << 8) | src[0]; - for (int i = 0; i < fileSize; i += 2) - { - uint16_t val = src[i] | (src[i + 1] << 8); - val ^= (encValue & 0xFFFF); - src[i] = val; - src[i + 1] = val >> 8; - encValue = encValue * 1103515245; - encValue = encValue + 24691; - } - } else { - encValue = (src[fileSize - 1] << 8) | src[fileSize - 2]; - for (int i = fileSize; i > 0; i -= 2) - { - uint16_t val = (src[i - 1] << 8) | src[i - 2]; - val ^= (encValue & 0xFFFF); - src[i - 1] = (val >> 8); - src[i - 2] = val; - encValue = encValue * 1103515245; - encValue = encValue + 24691; - } - } - for (int i = 0; i < fileSize; i++) + for (int i = 0; i < charDataSize; i++) { unsigned char srcPixelPair = src[i]; unsigned char leftPixel = srcPixelPair & 0xF; @@ -252,9 +228,16 @@ static uint32_t ConvertFromScanned4Bpp(unsigned char *src, unsigned char *dest, rightPixel = 15 - rightPixel; } - dest[i] = (leftPixel << 4) | rightPixel; + if (convertTo8Bpp) + { + *dest++ = ((palIndex - 1) << 4) | leftPixel; + *dest++ = ((palIndex - 1) << 4) | rightPixel; + } + else + { + *dest++ = (leftPixel << 4) | rightPixel; + } } - return encValue; } static void ConvertFromTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int chunksWide, int colsPerChunk, int rowsPerChunk, bool invertColors) @@ -330,43 +313,33 @@ static void ConvertFromTiles8BppCell(unsigned char *src, unsigned char *dest, in } } -static uint32_t ConvertFromScanned8Bpp(unsigned char *src, unsigned char *dest, int fileSize, bool invertColours, bool scanFrontToBack) +static void ConvertScanned8Bpp(unsigned char *src, unsigned char *dest, int charDataSize, bool invertColors, bool convertTo4Bpp) { - uint32_t encValue = 0; - if (scanFrontToBack) { - encValue = (src[1] << 8) | src[0]; - for (int i = 0; i < fileSize; i += 2) - { - uint16_t val = src[i] | (src[i + 1] << 8); - val ^= (encValue & 0xFFFF); - src[i] = val; - src[i + 1] = val >> 8; - encValue = encValue * 1103515245; - encValue = encValue + 24691; - } - } else { - encValue = (src[fileSize - 1] << 8) | src[fileSize - 2]; - for (int i = fileSize; i > 0; i -= 2) - { - uint16_t val = (src[i - 1] << 8) | src[i - 2]; - val ^= (encValue & 0xFFFF); - src[i - 1] = (val >> 8); - src[i - 2] = val; - encValue = encValue * 1103515245; - encValue = encValue + 24691; - } - } - for (int i = 0; i < fileSize; i++) + charDataSize *= convertTo4Bpp + 1; + for (int i = 0; i < charDataSize; i++) { - unsigned char srcPixel = src[i]; + if (convertTo4Bpp) + { + unsigned char leftPixel = src[i++] & 0xF; + unsigned char rightPixel = src[i] & 0xF; - if (invertColours) { - srcPixel = 255 - srcPixel; + if (invertColors) { + leftPixel = 15 - leftPixel; + rightPixel = 15 - rightPixel; + } + + *dest++ = (rightPixel << 4) | leftPixel; } + else + { + unsigned char srcPixel = src[i]; - dest[i] = srcPixel; + if (invertColors) { + srcPixel = 255 - srcPixel; + } + *dest++ = srcPixel; + } } - return encValue; } static void ConvertToTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int chunksWide, int colsPerChunk, int rowsPerChunk, bool invertColors) @@ -426,42 +399,6 @@ static void ConvertToTiles4Bpp(unsigned char *src, unsigned char *dest, int numT } } -static void ConvertToScanned4Bpp(unsigned char *src, unsigned char *dest, int fileSize, bool invertColours, uint32_t encValue, uint32_t scanMode) -{ - for (int i = 0; i < fileSize; i++) - { - unsigned char srcPixelPair = src[i]; - unsigned char leftPixel = srcPixelPair & 0xF; - unsigned char rightPixel = srcPixelPair >> 4; - if (invertColours) { - leftPixel = 15 - leftPixel; - rightPixel = 15 - rightPixel; - } - dest[i] = (leftPixel << 4) | rightPixel; - } - - if (scanMode == 2) { // front to back - for (int i = fileSize - 1; i > 0; i -= 2) - { - uint16_t val = dest[i - 1] | (dest[i] << 8); - encValue = (encValue - 24691) * 4005161829; - val ^= (encValue & 0xFFFF); - dest[i] = (val >> 8); - dest[i - 1] = val; - } - } - else if (scanMode == 1) { - for (int i = 1; i < fileSize; i += 2) - { - uint16_t val = (dest[i] << 8) | dest[i - 1]; - encValue = (encValue - 24691) * 4005161829; - val ^= (encValue & 0xFFFF); - dest[i] = (val >> 8); - dest[i - 1] = val; - } - } -} - static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int chunksWide, int colsPerChunk, int rowsPerChunk, bool invertColors, bool convertTo4Bpp) { int tilesSoFar = 0; @@ -507,6 +444,59 @@ static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numT } } +static uint32_t Decode(unsigned char *src, int charDataSize, uint32_t encodeMode) +{ + uint32_t encValue = 0; + if (encodeMode == 2) { // front to back + encValue = (src[1] << 8) | src[0]; + for (int i = 0; i < charDataSize; i += 2) + { + uint16_t val = src[i] | (src[i + 1] << 8); + val ^= (encValue & 0xFFFF); + src[i] = val; + src[i + 1] = val >> 8; + encValue = encValue * 1103515245; + encValue = encValue + 24691; + } + } else if (encodeMode == 1) { // back to front + encValue = (src[charDataSize - 1] << 8) | src[charDataSize - 2]; + for (int i = charDataSize; i > 0; i -= 2) + { + uint16_t val = (src[i - 1] << 8) | src[i - 2]; + val ^= (encValue & 0xFFFF); + src[i - 1] = (val >> 8); + src[i - 2] = val; + encValue = encValue * 1103515245; + encValue = encValue + 24691; + } + } + return encValue; +} + +static void Encode(unsigned char *dest, int charDataSize, uint32_t encValue, uint32_t encodeMode) +{ + if (encodeMode == 2) { // front to back + for (int i = charDataSize - 1; i > 0; i -= 2) + { + uint16_t val = dest[i - 1] | (dest[i] << 8); + encValue = (encValue - 24691) * 4005161829; + val ^= (encValue & 0xFFFF); + dest[i] = (val >> 8); + dest[i - 1] = val; + } + } + else if (encodeMode == 1) { // back to front + for (int i = 1; i < charDataSize; i += 2) + { + uint16_t val = (dest[i] << 8) | dest[i - 1]; + encValue = (encValue - 24691) * 4005161829; + val ^= (encValue & 0xFFFF); + dest[i] = (val >> 8); + dest[i - 1] = val; + } + } +} + void ReadImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, bool invertColors) { int tileSize = bitDepth * 8; // number of bytes per tile @@ -549,7 +539,7 @@ void ReadImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int ro free(buffer); } -uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, bool invertColors, bool scanFrontToBack, bool convertTo8Bpp, int palIndex, bool verbose) +uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, bool invertColors, uint32_t encodeMode, bool convertTo8Bpp, int palIndex, bool verbose) { int fileSize; unsigned char *buffer = ReadWholeFile(path, &fileSize); @@ -599,7 +589,7 @@ uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, if (scanned) { - printf("-scanned "); + printf("-scan "); } if (charHeader[0x15] == 1) { @@ -607,13 +597,13 @@ uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, } } - if (bitDepth == 4 && (scanned || !convertTo8Bpp)) + if (bitDepth == 4 && !convertTo8Bpp) { image->palette.numColors = 16; } int tileSize = bitDepth * 8; // number of bytes per tile - if (bitDepth == 4 && convertTo8Bpp && !scanned) + if (bitDepth == 4 && convertTo8Bpp) tileSize *= 2; if (tilesWide == 0) { @@ -638,7 +628,7 @@ uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, image->width = tilesWide * 8; image->height = tilesTall * 8; - image->bitDepth = !scanned && convertTo8Bpp ? 8 : bitDepth; + image->bitDepth = convertTo8Bpp ? 8 : bitDepth; image->pixels = calloc(tilesWide * tilesTall, tileSize); if (image->pixels == NULL) @@ -647,15 +637,20 @@ uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int chunksWide = tilesWide / colsPerChunk; // how many chunks side-by-side are needed for the full width of the image uint32_t key = 0; + uint32_t charDataSize = ReadS32(charHeader, 0x4) - 0x20; // read explicitly to account for possible SOPC chunk + if (encodeMode) + { + key = Decode(imageData, charDataSize, encodeMode); + } if (scanned) { switch (bitDepth) { case 4: - key = ConvertFromScanned4Bpp(imageData, image->pixels, fileSize - 0x30, invertColors, scanFrontToBack); + ConvertScanned4Bpp(imageData, image->pixels, charDataSize, invertColors, convertTo8Bpp, palIndex); break; case 8: - key = ConvertFromScanned8Bpp(imageData, image->pixels, fileSize - 0x30, invertColors, scanFrontToBack); + ConvertScanned8Bpp(imageData, image->pixels, charDataSize, invertColors, false); break; } } @@ -1085,8 +1080,8 @@ void WriteImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int ro } void WriteNtrImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, - bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc, bool vram, uint32_t scanMode, - uint32_t mappingType, uint32_t key, bool wrongSize, bool convertTo4Bpp, int rotate) + bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc, bool vram, bool scan, + uint32_t encodeMode, uint32_t mappingType, uint32_t key, bool wrongSize, bool convertTo4Bpp, int rotate) { FILE *fp = fopen(path, "wb"); @@ -1094,7 +1089,7 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); int tileSize = bitDepth * 8; // number of bytes per tile - if (bitDepth == 8 && convertTo4Bpp && !scanMode) + if (bitDepth == 8 && convertTo4Bpp) tileSize /= 2; if (image->width % 8 != 0) @@ -1127,15 +1122,15 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int int chunksWide = tilesWide / colsPerChunk; // how many chunks side-by-side are needed for the full width of the image - if (scanMode) + if (scan) { switch (bitDepth) { case 4: - ConvertToScanned4Bpp(image->pixels, pixelBuffer, bufferSize, invertColors, key, scanMode); + ConvertScanned4Bpp(image->pixels, pixelBuffer, bufferSize, invertColors, false, 0); break; case 8: - FATAL_ERROR("8Bpp not supported yet.\n"); + ConvertScanned8Bpp(image->pixels, pixelBuffer, bufferSize, invertColors, convertTo4Bpp); break; } } @@ -1153,6 +1148,10 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int break; } } + if (encodeMode) + { + Encode(pixelBuffer, bufferSize, key, encodeMode); + } WriteGenericNtrHeader(fp, "RGCN", bufferSize + (sopc ? 0x30 : 0x20) + (wrongSize ? -8 : 0), byteOrder, version101, sopc ? 2 : 1); @@ -1212,7 +1211,7 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int charHeader[18] = val; } - if (scanMode) + if (scan) { charHeader[20] = 1; //implies BMP } diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h index aa6b8bb3ea..63e4dc29bc 100644 --- a/tools/nitrogfx/gfx.h +++ b/tools/nitrogfx/gfx.h @@ -51,12 +51,12 @@ struct Image { }; void ReadImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, bool invertColors); -uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, bool invertColors, bool scanFrontToBack, bool convertTo8Bpp, int palIndex, bool verbose); +uint32_t ReadNtrImage(char *path, int tilesWide, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, bool invertColors, uint32_t encodeMode, bool convertTo8Bpp, int palIndex, bool verbose); void ApplyCellsToImage(char *cellFilePath, struct Image *image, bool toPNG, bool snap, bool noSkip, bool convertBpp); void WriteImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int rowsPerChunk, const char *embedName, struct Image *image, bool invertColors); void WriteNtrImage(char *path, int numTiles, int bitDepth, int colsPerChunk, int rowsPerChunk, struct Image *image, - bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc, bool vram, uint32_t scanMode, - uint32_t mappingType, uint32_t key, bool wrongSize, bool convertTo4Bpp, int rotate); + bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc, bool vram, bool scan, + uint32_t encodeMode, uint32_t mappingType, uint32_t key, bool wrongSize, bool convertTo4Bpp, int rotate); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth, int palIndex, bool inverted, bool convertTo8Bpp); diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 4dba129cf2..70ac643c16 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -88,7 +88,7 @@ void ConvertNtrToPng(char *inputPath, char *outputPath, struct NtrToPngOptions * image.hasPalette = false; } - uint32_t key = ReadNtrImage(inputPath, options->width, 0, options->colsPerChunk, options->rowsPerChunk, &image, !image.hasPalette, options->scanFrontToBack, options->convertTo8Bpp, options->palIndex, options->verbose); + uint32_t key = ReadNtrImage(inputPath, options->width, 0, options->colsPerChunk, options->rowsPerChunk, &image, !image.hasPalette, options->encodeMode, options->convertTo8Bpp, options->palIndex, options->verbose); if (key) { @@ -163,7 +163,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * ReadPng(inputPath, &image); uint32_t key = 0; - if (options->scanMode) + if (options->encodeMode) { char* string = malloc(strlen(inputPath) + 5); sprintf(string, "%s.key", inputPath); @@ -186,8 +186,8 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->colsPerChunk, options->rowsPerChunk, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, - options->sopc, options->vramTransfer, options->scanMode, options->mappingType, key, options->wrongSize, - options->convertTo4Bpp, options->rotate); + options->sopc, options->vramTransfer, options->scan, options->encodeMode, options->mappingType, + key, options->wrongSize, options->convertTo4Bpp, options->rotate); FreeImage(&image); } @@ -285,11 +285,11 @@ void HandleNtrToPngCommand(char *inputPath, char *outputPath, int argc, char **a options.colsPerChunk = 1; options.rowsPerChunk = 1; options.palIndex = 1; - options.scanFrontToBack = false; options.handleEmpty = false; options.noSkip = false; options.convertTo8Bpp = false; options.verbose = false; + options.encodeMode = 0; for (int i = 3; i < argc; i++) { @@ -390,9 +390,17 @@ void HandleNtrToPngCommand(char *inputPath, char *outputPath, int argc, char **a if (options.rowsPerChunk < 1) FATAL_ERROR("rows per chunk must be positive.\n"); } - else if (strcmp(option, "-scanfronttoback") == 0) + else if (strcmp(option, "-encodebacktofront") == 0) { - options.scanFrontToBack = true; + if (options.encodeMode != 0) + FATAL_ERROR("Encode mode specified more than once.\n-encodebacktofront goes back to front as in DP, -encodefronttoback goes front to back as in PtHGSS\n"); + options.encodeMode = 1; + } + else if (strcmp(option, "-encodefronttoback") == 0) + { + if (options.encodeMode != 0) + FATAL_ERROR("Encode mode specified more than once.\n-encodebacktofront goes back to front as in DP, -encodefronttoback goes front to back as in PtHGSS\n"); + options.encodeMode = 2; } else if (strcmp(option, "-handleempty") == 0) { @@ -517,7 +525,8 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a options.byteOrder = true; options.version101 = false; options.sopc = false; - options.scanMode = 0; + options.scan = false; + options.encodeMode = 0; options.handleEmpty = false; options.vramTransfer = false; options.mappingType = 0; @@ -613,17 +622,21 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a { options.sopc = true; } - else if (strcmp(option, "-scanned") == 0) + else if (strcmp(option, "-scan") == 0) { - if (options.scanMode != 0) - FATAL_ERROR("Scan mode specified more than once.\n-scanned goes back to front as in DP, -scanfronttoback goes front to back as in PtHGSS\n"); - options.scanMode = 1; + options.scan = true; } - else if (strcmp(option, "-scanfronttoback") == 0) + else if (strcmp(option, "-encodebacktofront") == 0) { - if (options.scanMode != 0) - FATAL_ERROR("Scan mode specified more than once.\n-scanned goes back to front as in DP, -scanfronttoback goes front to back as in PtHGSS\n"); - options.scanMode = 2; + if (options.encodeMode != 0) + FATAL_ERROR("Encode mode specified more than once.\n-encodebacktofront goes back to front as in DP, -encodefronttoback goes front to back as in PtHGSS\n"); + options.encodeMode = 1; + } + else if (strcmp(option, "-encodefronttoback") == 0) + { + if (options.encodeMode != 0) + FATAL_ERROR("Encode mode specified more than once.\n-encodebacktofront goes back to front as in DP, -encodefronttoback goes front to back as in PtHGSS\n"); + options.encodeMode = 2; } else if (strcmp(option, "-wrongsize") == 0) { options.wrongSize = true; diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h index 46c787ab78..03e9387c57 100644 --- a/tools/nitrogfx/options.h +++ b/tools/nitrogfx/options.h @@ -35,7 +35,8 @@ struct PngToNtrOptions { bool byteOrder; bool version101; bool sopc; - uint32_t scanMode; + bool scan; + uint32_t encodeMode; bool wrongSize; bool handleEmpty; bool vramTransfer; @@ -55,10 +56,10 @@ struct NtrToPngOptions { int colsPerChunk; int rowsPerChunk; int palIndex; - bool scanFrontToBack; bool handleEmpty; bool convertTo8Bpp; bool verbose; + uint32_t encodeMode; }; struct CellVramTransferData { diff --git a/tools/scripts/make_pl_otherpoke.py b/tools/scripts/make_pl_otherpoke.py index 919f74a1bb..f3654ddea0 100755 --- a/tools/scripts/make_pl_otherpoke.py +++ b/tools/scripts/make_pl_otherpoke.py @@ -44,7 +44,8 @@ for i in range(args.sprite_entries): args.nitrogfx, infile, target, - '-scanfronttoback' + '-encodefronttoback', + '-scan', ]) # The next batch of files should all be palettes @@ -72,13 +73,15 @@ subprocess.run([ args.nitrogfx, sub_back, private_dir / f'pl_otherpoke_{i:04}.NCGR', - '-scanfronttoback' + '-encodefronttoback', + '-scan', ]) subprocess.run([ args.nitrogfx, sub_front, private_dir / f'pl_otherpoke_{(i+1):04}.NCGR', - '-scanfronttoback' + '-encodefronttoback', + '-scan', ]) subprocess.run([ args.nitrogfx, @@ -92,7 +95,8 @@ subprocess.run([ args.nitrogfx, shadows, private_dir / f'pokemon_shadows.NCGR', - '-scanfronttoback' + '-encodefronttoback', + '-scan', ]) subprocess.run([ args.nitrogfx, diff --git a/tools/scripts/make_pl_pokegra.py b/tools/scripts/make_pl_pokegra.py index a67c8aed66..9c989cc3f1 100755 --- a/tools/scripts/make_pl_pokegra.py +++ b/tools/scripts/make_pl_pokegra.py @@ -51,7 +51,8 @@ for i, subdir in enumerate(SPECIES_DIRS): args.nitrogfx, source_file, target_file, - '-scanfronttoback' + '-encodefronttoback', + '-scan', ]) else: subprocess.run(['touch', target_file])