Various Forms Data (#226)

* Defined species for Shaymin's Sky Form and Giratina's Origin Form

* Defined the sprites for Shaymin's and Giratina's forms

* Added coordinates and entries for the forms of Shaymin and Giratina in the sprite data tables

* Set the InGame names for Shaymin's and Giratina's forms

* Added the base stats of Shaymin's and Giratina's forms

* Set the level up learnsets for the forms of Shaymin and Giratina

* Defined the paths of the sprites for the forms of Shaymin and Giratina

* Linked the icons to the species of Shaymin's and Giratina's forms

* Added the sprites of Shaymin's Sky Form and Giratina's Origin Form

* Added the icons of Shaymin's and Giratina's forms

* Fixed silly mistakes.

* Alright, fixed silly mistakes. For good now.

* Added the data for a lot of Pokémon's forms.
-Darmanitan Zen Mode
-Tornadus, Thundurus and Landorus Therian Forms
-Meloetta Pirouette Form
-Aegislash Blade Form
-Hoopa Unbound Form
-Minior Core Form
-Wishiwashi School Form

* Added the sprites of the Pokémon forms that were just inserted

* Added the sprites for the Black and White Forms of Kyurem
This commit is contained in:
LOuroboros 2020-01-01 11:07:56 -03:00 committed by DizzyEggg
parent 055460449e
commit d1d3ca5312
88 changed files with 1308 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 518 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
72 56 48
232 224 128
16 16 16
248 248 248
144 128 80
176 160 88
40 40 48
128 112 200
80 72 112
152 152 152
72 72 72
152 128 80
192 176 128
240 240 240
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
40 40 48
136 136 136
16 16 16
248 248 248
64 64 64
88 88 88
40 40 48
248 224 96
144 136 56
176 48 48
72 8 24
152 128 80
192 176 128
248 88 88
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 804 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 458 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
32 80 96
88 168 192
96 72 56
184 112 64
248 176 104
0 0 0
72 104 120
168 208 240
72 72 80
152 152 160
240 240 240
64 120 144
128 168 200
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 32 88
56 96 200
88 48 104
136 80 152
184 160 232
0 0 0
24 48 48
120 152 160
72 72 80
152 152 160
240 240 240
32 64 144
64 104 120
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 814 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 582 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
24 24 32
48 48 56
184 80 80
136 48 48
72 24 8
80 72 24
80 72 80
224 192 88
120 96 48
168 144 72
184 192 200
136 144 136
240 224 176
8 8 8
104 104 112

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
24 24 24
56 48 40
88 168 192
48 120 136
8 48 72
72 72 72
80 72 56
176 184 192
96 96 104
128 136 144
232 208 168
208 168 88
224 248 248
8 8 8
152 112 64

Binary file not shown.

After

Width:  |  Height:  |  Size: 831 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 623 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
120 168 144
64 64 56
120 104 96
0 0 0
200 192 224
112 48 72
248 112 168
160 152 184
152 128 0
248 232 128
200 184 0
200 72 128
248 248 248
80 72 16
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
120 168 144
88 64 24
152 112 32
0 0 0
248 248 128
88 64 24
192 144 72
184 160 88
152 128 0
248 232 128
200 184 0
136 96 56
248 248 248
80 72 16
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 876 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
56 56 64
56 80 96
168 224 240
120 152 160
32 32 40
16 24 32
128 96 0
248 208 24
152 160 168
104 104 112
224 224 216
64 72 88
48 48 56
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
120 152 160
16 16 16
120 104 96
168 224 240
248 248 248
192 176 168
64 72 88
248 208 24
56 80 96
152 160 168
104 104 112
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
56 56 48
56 56 96
192 200 240
120 144 200
40 40 32
24 24 16
128 32 104
232 64 176
88 120 104
40 72 56
224 224 216
24 48 40
48 48 56
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
120 144 200
16 16 16
96 96 112
192 200 240
248 248 248
168 160 208
32 48 56
232 88 184
56 56 96
88 112 120
48 72 80
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 679 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 613 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
96 72 56
16 16 16
208 88 96
136 112 88
56 40 32
120 112 104
248 248 248
192 176 168
104 40 48
88 48 32
248 136 56
168 88 40
136 56 64
240 192 112
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 176 232
80 48 24
16 16 16
224 104 32
120 72 48
40 16 8
88 112 88
248 248 248
168 184 168
96 48 8
80 56 24
240 152 32
168 96 24
152 72 16
240 200 48
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 801 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
64 64 72
16 16 16
144 120 120
104 88 104
168 80 64
120 48 40
232 120 80
64 48 48
248 248 240
168 176 208
168 64 88
240 152 136
224 80 104
88 80 80
112 96 104

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
56 56 64
16 16 16
112 112 120
88 88 96
176 40 136
64 32 48
232 80 192
64 48 48
248 248 240
184 168 160
168 80 56
232 112 80
200 96 64
80 80 80
128 120 104

Binary file not shown.

After

Width:  |  Height:  |  Size: 437 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
160 48 64
240 240 240
16 16 16
240 152 176
240 96 144
208 40 80
192 24 80
184 24 80
160 32 72
192 24 80
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
40 40 40
240 240 240
16 16 16
152 152 160
88 88 88
56 56 56
248 216 64
48 168 216
240 168 56
144 216 80
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1004 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
136 168 80
88 104 56
176 200 120
160 136 160
72 64 56
16 16 16
248 240 232
216 192 184
248 248 248
56 120 48
120 168 88
160 64 64
216 80 80
112 48 40
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
80 168 152
56 104 96
136 208 192
136 152 160
56 56 72
16 16 16
232 232 240
192 192 208
248 248 248
56 136 112
96 176 152
184 56 56
240 80 80
136 48 32
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
104 104 112
248 248 248
16 16 16
32 24 80
192 176 168
88 72 160
56 48 112
80 128 152
48 80 96
112 184 232
168 128 80
232 200 144
64 56 56
32 32 40
48 104 144

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
112 112 80
248 248 248
16 16 16
64 24 72
176 176 152
144 72 160
88 48 104
64 96 136
24 40 64
128 152 200
208 144 48
248 200 112
56 56 56
32 32 32
80 104 200

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 647 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
104 64 120
64 32 80
144 96 168
16 16 16
112 104 112
248 248 248
192 176 168
48 80 40
112 160 80
248 200 120
72 120 56
184 136 80
120 88 56
232 56 16
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
72 56 112
40 32 72
96 88 144
16 16 16
72 80 72
248 248 248
136 152 144
48 64 24
104 160 32
232 176 80
64 112 24
208 112 24
120 64 32
216 56 40
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 966 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 72 128
112 152 240
152 208 248
112 240 240
16 16 16
160 192 240
64 104 216
16 96 192
16 32 56
24 72 96
120 128 136
248 248 248
200 208 208
64 232 240
96 136 240

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
8 96 152
56 160 248
128 200 224
224 208 112
16 16 16
112 200 248
16 112 240
24 136 200
0 48 72
0 88 112
144 128 24
248 240 104
216 192 64
248 248 248
40 152 248

View File

@ -897,8 +897,19 @@
// TODO: forms
#define SPECIES_PRIMAL_KYOGRE 888
#define SPECIES_PRIMAL_GROUDON 889
#define SPECIES_SHAYMIN_SKY 890
#define SPECIES_GIRATINA_ORIGIN 891
#define SPECIES_DARMANITAN_ZEN 892
#define SPECIES_TORNADUS_THERIAN 893
#define SPECIES_THUNDURUS_THERIAN 894
#define SPECIES_LANDORUS_THERIAN 895
#define SPECIES_MELOETTA_PIROUETTE 896
#define SPECIES_AEGISLASH_BLADE 897
#define SPECIES_HOOPA_UNBOUND 898
#define SPECIES_MINIOR_CORE 899
#define SPECIES_WISHIWASHI_SCHOOL 900
#define SPECIES_EGG 890
#define SPECIES_EGG 901
#define NUM_SPECIES SPECIES_EGG
// Unown forms, not actual species

View File

@ -3653,6 +3653,59 @@ extern const u32 gMonBackPic_AlolanMarowak[];
extern const u32 gMonPalette_AlolanMarowak[];
extern const u32 gMonShinyPalette_AlolanMarowak[];
extern const u32 gMonFrontPic_ShayminSky[];
extern const u32 gMonBackPic_ShayminSky[];
extern const u32 gMonPalette_ShayminSky[];
extern const u32 gMonShinyPalette_ShayminSky[];
extern const u32 gMonFrontPic_GiratinaOrigin[];
extern const u32 gMonBackPic_GiratinaOrigin[];
extern const u32 gMonPalette_GiratinaOrigin[];
extern const u32 gMonShinyPalette_GiratinaOrigin[];
extern const u32 gMonFrontPic_DarmanitanZen[];
extern const u32 gMonBackPic_DarmanitanZen[];
extern const u32 gMonPalette_DarmanitanZen[];
extern const u32 gMonShinyPalette_DarmanitanZen[];
extern const u32 gMonFrontPic_TornadusTherian[];
extern const u32 gMonBackPic_TornadusTherian[];
extern const u32 gMonPalette_TornadusTherian[];
extern const u32 gMonShinyPalette_TornadusTherian[];
extern const u32 gMonFrontPic_ThundurusTherian[];
extern const u32 gMonBackPic_ThundurusTherian[];
extern const u32 gMonPalette_ThundurusTherian[];
extern const u32 gMonShinyPalette_ThundurusTherian[];
extern const u32 gMonFrontPic_LandorusTherian[];
extern const u32 gMonBackPic_LandorusTherian[];
extern const u32 gMonPalette_LandorusTherian[];
extern const u32 gMonShinyPalette_LandorusTherian[];
extern const u32 gMonFrontPic_MeloettaPirouette[];
extern const u32 gMonBackPic_MeloettaPirouette[];
extern const u32 gMonPalette_MeloettaPirouette[];
extern const u32 gMonShinyPalette_MeloettaPirouette[];
extern const u32 gMonFrontPic_AegislashBlade[];
extern const u32 gMonBackPic_AegislashBlade[];
extern const u32 gMonPalette_AegislashBlade[];
extern const u32 gMonShinyPalette_AegislashBlade[];
extern const u32 gMonFrontPic_HoopaUnbound[];
extern const u32 gMonBackPic_HoopaUnbound[];
extern const u32 gMonPalette_HoopaUnbound[];
extern const u32 gMonShinyPalette_HoopaUnbound[];
extern const u32 gMonFrontPic_MiniorCore[];
extern const u32 gMonBackPic_MiniorCore[];
extern const u32 gMonPalette_MiniorCore[];
extern const u32 gMonShinyPalette_MiniorCore[];
extern const u32 gMonFrontPic_WishiwashiSchool[];
extern const u32 gMonBackPic_WishiwashiSchool[];
extern const u32 gMonPalette_WishiwashiSchool[];
extern const u32 gMonShinyPalette_WishiwashiSchool[];
extern const u32 gMonFrontPic_KyuremBlack[];
extern const u32 gMonBackPic_KyuremBlack[];
extern const u32 gMonPalette_KyuremBlack[];
extern const u32 gMonShinyPalette_KyuremBlack[];
extern const u32 gMonFrontPic_KyuremWhite[];
extern const u32 gMonBackPic_KyuremWhite[];
extern const u32 gMonPalette_KyuremWhite[];
extern const u32 gMonShinyPalette_KyuremWhite[];
extern const u8 gMonIcon_QuestionMark[];
extern const u8 gMonIcon_Bulbasaur[];
extern const u8 gMonIcon_Ivysaur[];
@ -4571,6 +4624,20 @@ extern const u8 gMonIcon_AlolanMuk[];
extern const u8 gMonIcon_AlolanExeggutor[];
extern const u8 gMonIcon_AlolanMarowak[];
extern const u8 gMonIcon_ShayminSky[];
extern const u8 gMonIcon_GiratinaOrigin[];
extern const u8 gMonIcon_DarmanitanZen[];
extern const u8 gMonIcon_TornadusTherian[];
extern const u8 gMonIcon_ThundurusTherian[];
extern const u8 gMonIcon_LandorusTherian[];
extern const u8 gMonIcon_MeloettaPirouette[];
extern const u8 gMonIcon_AegislashBlade[];
extern const u8 gMonIcon_HoopaUnbound[];
extern const u8 gMonIcon_MiniorCore[];
extern const u8 gMonIcon_WishiwashiSchool[];
extern const u8 gMonIcon_KyuremBlack[];
extern const u8 gMonIcon_KyuremWhite[];
extern const u8 gMonFootprint_QuestionMark[];
extern const u8 gMonFootprint_Bulbasaur[];
extern const u8 gMonFootprint_Ivysaur[];

View File

@ -3616,6 +3616,59 @@ const u32 gMonBackPic_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_maro
const u32 gMonPalette_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_marowak/normal.gbapal.lz");
const u32 gMonShinyPalette_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_marowak/shiny.gbapal.lz");
const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front_sky.4bpp.lz");
const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/back_sky.4bpp.lz");
const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/normal_sky.gbapal.lz");
const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/shiny_sky.gbapal.lz");
const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/anim_front_origin.4bpp.lz");
const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/back_origin.4bpp.lz");
const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/normal_origin.gbapal.lz");
const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/shiny_origin.gbapal.lz");
const u32 gMonFrontPic_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front_zen.4bpp.lz");
const u32 gMonBackPic_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/back_zen.4bpp.lz");
const u32 gMonPalette_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/normal_zen.gbapal.lz");
const u32 gMonShinyPalette_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny_zen.gbapal.lz");
const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/anim_front_therian.4bpp.lz");
const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/back_therian.4bpp.lz");
const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/normal_therian.gbapal.lz");
const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/shiny_therian.gbapal.lz");
const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/anim_front_therian.4bpp.lz");
const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/back_therian.4bpp.lz");
const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/normal_therian.gbapal.lz");
const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/shiny_therian.gbapal.lz");
const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/anim_front_therian.4bpp.lz");
const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/back_therian.4bpp.lz");
const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/normal_therian.gbapal.lz");
const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/shiny_therian.gbapal.lz");
const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/front_pirouette.4bpp.lz");
const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/back_pirouette.4bpp.lz");
const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/normal_pirouette.gbapal.lz");
const u32 gMonShinyPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/shiny_pirouette.gbapal.lz");
const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/front_blade.4bpp.lz");
const u32 gMonBackPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/back_blade.4bpp.lz");
const u32 gMonPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/normal_blade.gbapal.lz");
const u32 gMonShinyPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/shiny_blade.gbapal.lz");
const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/front_unbound.4bpp.lz");
const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/back_unbound.4bpp.lz");
const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/normal_unbound.gbapal.lz");
const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/shiny_unbound.gbapal.lz");
const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/front_core.4bpp.lz");
const u32 gMonBackPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/back_core.4bpp.lz");
const u32 gMonPalette_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/normal_core.gbapal.lz");
const u32 gMonShinyPalette_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/shiny_core.gbapal.lz");
const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/front_school.4bpp.lz");
const u32 gMonBackPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/back_school.4bpp.lz");
const u32 gMonPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/normal_school.gbapal.lz");
const u32 gMonShinyPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/shiny_school.gbapal.lz");
const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front_black.4bpp.lz");
const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/back_black.4bpp.lz");
const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/normal_black.gbapal.lz");
const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/shiny_black.gbapal.lz");
const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front_white.4bpp.lz");
const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/back_white.4bpp.lz");
const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/normal_white.gbapal.lz");
const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/shiny_white.gbapal.lz");
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp");
const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp");
@ -4534,6 +4587,20 @@ const u8 gMonIcon_AlolanMuk[] = INCBIN_U8("graphics/pokemon/alolan_muk/icon.4bpp
const u8 gMonIcon_AlolanExeggutor[] = INCBIN_U8("graphics/pokemon/alolan_exeggutor/icon.4bpp");
const u8 gMonIcon_AlolanMarowak[] = INCBIN_U8("graphics/pokemon/alolan_marowak/icon.4bpp");
const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/icon_sky.4bpp");
const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/icon_origin.4bpp");
const u8 gMonIcon_DarmanitanZen[] = INCBIN_U8("graphics/pokemon/darmanitan/icon_zen.4bpp");
const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/icon_therian.4bpp");
const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/icon_therian.4bpp");
const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/landorus/icon_therian.4bpp");
const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/meloetta/icon_pirouette.4bpp");
const u8 gMonIcon_AegislashBlade[] = INCBIN_U8("graphics/pokemon/aegislash/icon_blade.4bpp");
const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/icon_unbound.4bpp");
const u8 gMonIcon_MiniorCore[] = INCBIN_U8("graphics/pokemon/minior/icon_core.4bpp");
const u8 gMonIcon_WishiwashiSchool[] = INCBIN_U8("graphics/pokemon/wishiwashi/icon_school.4bpp");
const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/icon_black.4bpp");
const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/icon_white.4bpp");
const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp");
const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp");

View File

@ -22206,4 +22206,274 @@ const struct BaseStats gBaseStats[] =
.abilityHidden = ABILITY_ROCK_HEAD,
.bodyColor = BODY_COLOR_PURPLE,
},
[SPECIES_SHAYMIN_SKY] =
{
.baseHP = 100,
.baseAttack = 103,
.baseDefense = 75,
.baseSpeed = 127,
.baseSpAttack = 120,
.baseSpDefense = 75,
.type1 = TYPE_GRASS,
.type2 = TYPE_FLYING,
.catchRate = 45,
.expYield = 270,
.evYield_HP = 3,
.evYield_SpAttack = 0,
.item1 = ITEM_NONE, // ITEM_LUM_BERRY,
.item2 = ITEM_NONE, // ITEM_LUM_BERRY,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 100,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE},
.bodyColor = BODY_COLOR_GREEN,
},
[SPECIES_GIRATINA_ORIGIN] =
{
.baseHP = 150,
.baseAttack = 120,
.baseDefense = 100,
.baseSpeed = 90,
.baseSpAttack = 120,
.baseSpDefense = 100,
.type1 = TYPE_GHOST,
.type2 = TYPE_DRAGON,
.catchRate = 3,
.expYield = 306,
.evYield_HP = 3,
.evYield_SpAttack = 0,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_LEVITATE, ABILITY_NONE},
.bodyColor = BODY_COLOR_BLACK,
},
[SPECIES_DARMANITAN_ZEN] =
{
.baseHP = 105,
.baseAttack = 30,
.baseDefense = 105,
.baseSpeed = 55,
.baseSpAttack = 140,
.baseSpDefense = 105,
.type1 = TYPE_FIRE,
.type2 = TYPE_PSYCHIC,
.catchRate = 60,
.expYield = 168,
.evYield_Attack = 2,
.evYield_SpAttack = 0,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_ZEN_MODE, ABILITY_NONE}, // Change
.bodyColor = BODY_COLOR_RED,
},
[SPECIES_TORNADUS_THERIAN] =
{
.baseHP = 79,
.baseAttack = 100,
.baseDefense = 80,
.baseSpeed = 121,
.baseSpAttack = 110,
.baseSpDefense = 90,
.type1 = TYPE_FLYING,
.type2 = TYPE_FLYING,
.catchRate = 3,
.expYield = 261,
.evYield_Attack = 3,
.evYield_SpAttack = 0,
.genderRatio = MON_MALE,
.eggCycles = 120,
.friendship = 90,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_REGENERATOR, ABILITY_NONE},
.bodyColor = BODY_COLOR_GREEN,
},
[SPECIES_THUNDURUS_THERIAN] =
{
.baseHP = 79,
.baseAttack = 105,
.baseDefense = 70,
.baseSpeed = 101,
.baseSpAttack = 145,
.baseSpDefense = 80,
.type1 = TYPE_ELECTRIC,
.type2 = TYPE_FLYING,
.catchRate = 3,
.expYield = 261,
.evYield_Attack = 3,
.evYield_SpAttack = 0,
.genderRatio = MON_MALE,
.eggCycles = 120,
.friendship = 90,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_VOLT_ABSORB, ABILITY_NONE},
.bodyColor = BODY_COLOR_BLUE,
},
[SPECIES_LANDORUS_THERIAN] =
{
.baseHP = 89,
.baseAttack = 145,
.baseDefense = 90,
.baseSpeed = 91,
.baseSpAttack = 105,
.baseSpDefense = 80,
.type1 = TYPE_GROUND,
.type2 = TYPE_FLYING,
.catchRate = 3,
.expYield = 270,
.evYield_SpAttack = 3,
.genderRatio = MON_MALE,
.eggCycles = 120,
.friendship = 90,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_INTIMIDATE, ABILITY_NONE},
.bodyColor = BODY_COLOR_BROWN,
},
[SPECIES_MELOETTA_PIROUETTE] =
{
.baseHP = 100,
.baseAttack = 128,
.baseDefense = 90,
.baseSpeed = 128,
.baseSpAttack = 77,
.baseSpDefense = 77,
.type1 = TYPE_NORMAL,
.type2 = TYPE_FIGHTING,
.catchRate = 3,
.expYield = 270,
.evYield_Speed = 1,
.evYield_SpAttack = 1,
.evYield_SpDefense = 1,
.item1 = ITEM_NONE, // ITEM_STAR_PIECE,
.item2 = ITEM_NONE, // ITEM_STAR_PIECE,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 100,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_SERENE_GRACE, ABILITY_NONE},
.bodyColor = BODY_COLOR_WHITE,
},
[SPECIES_AEGISLASH_BLADE] =
{
.baseHP = 60,
.baseAttack = 150,
.baseDefense = 50,
.baseSpeed = 60,
.baseSpAttack = 150,
.baseSpDefense = 50,
.type1 = TYPE_STEEL,
.type2 = TYPE_GHOST,
.catchRate = 45,
.expYield = 234,
.evYield_Defense = 2,
.evYield_SpAttack = 0,
.evYield_SpDefense = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_MINERAL,
.eggGroup2 = EGG_GROUP_MINERAL,
.abilities = {ABILITY_STANCE_CHANGE, ABILITY_NONE},
.bodyColor = BODY_COLOR_BROWN,
},
[SPECIES_HOOPA_UNBOUND] =
{
.baseHP = 80,
.baseAttack = 160,
.baseDefense = 60,
.baseSpeed = 80,
.baseSpAttack = 170,
.baseSpDefense = 130,
.type1 = TYPE_PSYCHIC,
.type2 = TYPE_DARK,
.catchRate = 3,
.expYield = 270,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 100,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.abilities = {ABILITY_MAGICIAN, ABILITY_NONE},
.bodyColor = BODY_COLOR_PURPLE,
},
[SPECIES_MINIOR_CORE] =
{
.baseHP = 60,
.baseAttack = 100,
.baseDefense = 60,
.baseSpeed = 120,
.baseSpAttack = 100,
.baseSpDefense = 60,
.type1 = TYPE_ROCK,
.type2 = TYPE_FLYING,
.catchRate = 30,
.expYield = 154,
.evYield_Defense = 1,
.evYield_SpAttack = 0,
.evYield_SpDefense = 1,
.item2 = ITEM_NONE, // ITEM_STAR_PIECE,
.genderRatio = MON_GENDERLESS,
.eggCycles = 25,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_MINERAL,
.eggGroup2 = EGG_GROUP_MINERAL,
.abilities = {ABILITY_SHIELDS_DOWN, ABILITY_NONE},
.bodyColor = BODY_COLOR_BROWN,
},
[SPECIES_WISHIWASHI_SCHOOL] =
{
.baseHP = 45,
.baseAttack = 140,
.baseDefense = 130,
.baseSpeed = 30,
.baseSpAttack = 140,
.baseSpDefense = 135,
.type1 = TYPE_WATER,
.type2 = TYPE_WATER,
.catchRate = 60,
.expYield = 61,
.evYield_HP = 1,
.evYield_SpAttack = 0,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
.growthRate = GROWTH_FAST,
.eggGroup1 = EGG_GROUP_WATER_2,
.eggGroup2 = EGG_GROUP_WATER_2,
.abilities = {ABILITY_SCHOOLING, ABILITY_NONE},
.bodyColor = BODY_COLOR_BLUE,
},
};

View File

@ -892,4 +892,16 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_ALOLAN_MUK] = sAlolanMukLevelUpLearnset,
[SPECIES_ALOLAN_EXEGGUTOR] = sAlolanExeggutorLevelUpLearnset,
[SPECIES_ALOLAN_MAROWAK] = sAlolanMarowakLevelUpLearnset,
// Forms
[SPECIES_SHAYMIN_SKY] = sShayminLevelUpLearnset,
[SPECIES_GIRATINA_ORIGIN] = sGiratinaLevelUpLearnset,
[SPECIES_DARMANITAN_ZEN] = sDarmanitanLevelUpLearnset,
[SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset,
[SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset,
[SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset,
[SPECIES_MELOETTA_PIROUETTE] = sMeloettaLevelUpLearnset,
[SPECIES_AEGISLASH_BLADE] = sAegislashLevelUpLearnset,
[SPECIES_HOOPA_UNBOUND] = sHoopaLevelUpLearnset,
[SPECIES_MINIOR_CORE] = sMiniorLevelUpLearnset,
[SPECIES_WISHIWASHI_SCHOOL] = sWishiwashiLevelUpLearnset,
};

View File

@ -4524,4 +4524,70 @@ const struct MonCoords gMonBackPicCoords[] =
.size = 0x66,
.y_offset = 0x8,
},
// Forms
[SPECIES_SHAYMIN_SKY] =
{
.size = 0x65,
.y_offset = 0x5,
},
[SPECIES_GIRATINA_ORIGIN] =
{
.size = 0x65,
.y_offset = 0x5,
},
[SPECIES_DARMANITAN_ZEN] =
{
.size = 0x66,
.y_offset = 0x12,
},
[SPECIES_TORNADUS_THERIAN] =
{
.size = 0x66,
.y_offset = 0x3,
},
[SPECIES_THUNDURUS_THERIAN] =
{
.size = 0x66,
.y_offset = 0x7,
},
[SPECIES_LANDORUS_THERIAN] =
{
.size = 0x66,
.y_offset = 0x7,
},
[SPECIES_MELOETTA_PIROUETTE] =
{
.size = 0x66,
.y_offset = 0x8,
},
[SPECIES_AEGISLASH_BLADE] =
{
.size = 0x66,
.y_offset = 0x9,
},
[SPECIES_HOOPA_UNBOUND] =
{
.size = 0x66,
.y_offset = 0x4,
},
[SPECIES_MINIOR_CORE] =
{
.size = 0x66,
.y_offset = 0x12,
},
[SPECIES_WISHIWASHI_SCHOOL] =
{
.size = 0x66,
.y_offset = 0x8,
},
[SPECIES_KYUREM_BLACK] =
{
.size = 0x66,
.y_offset = 0x3,
},
[SPECIES_KYUREM_WHITE] =
{
.size = 0x66,
.y_offset = 0x3,
},
};

View File

@ -891,6 +891,20 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(ALOLAN_MUK, gMonBackPic_AlolanMuk),
SPECIES_SPRITE(ALOLAN_EXEGGUTOR, gMonBackPic_AlolanExeggutor),
SPECIES_SPRITE(ALOLAN_MAROWAK, gMonBackPic_AlolanMarowak),
SPECIES_SPRITE(SHAYMIN_SKY, gMonBackPic_ShayminSky),
SPECIES_SPRITE(GIRATINA_ORIGIN, gMonBackPic_GiratinaOrigin),
SPECIES_SPRITE(DARMANITAN_ZEN, gMonBackPic_DarmanitanZen),
SPECIES_SPRITE(TORNADUS_THERIAN, gMonBackPic_TornadusTherian),
SPECIES_SPRITE(THUNDURUS_THERIAN, gMonBackPic_ThundurusTherian),
SPECIES_SPRITE(LANDORUS_THERIAN, gMonBackPic_LandorusTherian),
SPECIES_SPRITE(MELOETTA_PIROUETTE, gMonBackPic_MeloettaPirouette),
SPECIES_SPRITE(AEGISLASH_BLADE, gMonBackPic_AegislashBlade),
SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound),
SPECIES_SPRITE(MINIOR_CORE, gMonBackPic_MiniorCore),
SPECIES_SPRITE(WISHIWASHI_SCHOOL, gMonBackPic_WishiwashiSchool),
SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack),
SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite),
SPECIES_SPRITE(UNOWN_A, gMonBackPic_UnownA),
SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB),

View File

@ -118,5 +118,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_MEGA_GYARADOS] = 6,
[SPECIES_MEGA_PINSIR] = 4,
[SPECIES_MEGA_ALAKAZAM] = 7,
// Forms
[SPECIES_GIRATINA_ORIGIN] = 7,
[SPECIES_THUNDURUS_THERIAN] = 7,
};

View File

@ -8308,6 +8308,84 @@ static const union AnimCmd sAnim_ALOLAN_MAROWAK_1[] =
ANIMCMD_END,
};
static const union AnimCmd sAnim_SHAYMIN_SKY_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_GIRATINA_ORIGIN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_DARMANITAN_ZEN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_TORNADUS_THERIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_THUNDURUS_THERIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_LANDORUS_THERIAN_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_MELOETTA_PIROUETTE_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_AEGISLASH_BLADE_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_HOOPA_UNBOUND_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_MINIOR_CORE_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_WISHIWASHI_SCHOOL_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_KYUREM_BLACK_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_KYUREM_WHITE_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd *const sAnims_NONE[] ={
sAnim_GeneralFrame0,
sAnim_NONE_1,
@ -12928,6 +13006,71 @@ static const union AnimCmd *const sAnims_ALOLAN_MAROWAK[] ={
sAnim_ALOLAN_MAROWAK_1,
};
static const union AnimCmd *const sAnims_SHAYMIN_SKY[] ={
sAnim_GeneralFrame0,
sAnim_SHAYMIN_SKY_1,
};
static const union AnimCmd *const sAnims_GIRATINA_ORIGIN[] ={
sAnim_GeneralFrame0,
sAnim_GIRATINA_ORIGIN_1,
};
static const union AnimCmd *const sAnims_DARMANITAN_ZEN[] ={
sAnim_GeneralFrame0,
sAnim_DARMANITAN_ZEN_1,
};
static const union AnimCmd *const sAnims_TORNADUS_THERIAN[] ={
sAnim_GeneralFrame0,
sAnim_TORNADUS_THERIAN_1,
};
static const union AnimCmd *const sAnims_THUNDURUS_THERIAN[] ={
sAnim_GeneralFrame0,
sAnim_THUNDURUS_THERIAN_1,
};
static const union AnimCmd *const sAnims_LANDORUS_THERIAN[] ={
sAnim_GeneralFrame0,
sAnim_LANDORUS_THERIAN_1,
};
static const union AnimCmd *const sAnims_MELOETTA_PIROUETTE[] ={
sAnim_GeneralFrame0,
sAnim_MELOETTA_PIROUETTE_1,
};
static const union AnimCmd *const sAnims_AEGISLASH_BLADE[] ={
sAnim_GeneralFrame0,
sAnim_AEGISLASH_BLADE_1,
};
static const union AnimCmd *const sAnims_HOOPA_UNBOUND[] ={
sAnim_GeneralFrame0,
sAnim_HOOPA_UNBOUND_1,
};
static const union AnimCmd *const sAnims_MINIOR_CORE[] ={
sAnim_GeneralFrame0,
sAnim_MINIOR_CORE_1,
};
static const union AnimCmd *const sAnims_WISHIWASHI_SCHOOL[] ={
sAnim_GeneralFrame0,
sAnim_WISHIWASHI_SCHOOL_1,
};
static const union AnimCmd *const sAnims_KYUREM_BLACK[] ={
sAnim_GeneralFrame0,
sAnim_KYUREM_BLACK_1,
};
static const union AnimCmd *const sAnims_KYUREM_WHITE[] ={
sAnim_GeneralFrame0,
sAnim_KYUREM_WHITE_1,
};
#define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name
#define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
@ -13822,5 +13965,18 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(ALOLAN_MUK),
ANIM_CMD(ALOLAN_EXEGGUTOR),
ANIM_CMD(ALOLAN_MAROWAK),
ANIM_CMD(SHAYMIN_SKY),
ANIM_CMD(GIRATINA_ORIGIN),
ANIM_CMD(DARMANITAN_ZEN),
ANIM_CMD(TORNADUS_THERIAN),
ANIM_CMD(THUNDURUS_THERIAN),
ANIM_CMD(LANDORUS_THERIAN),
ANIM_CMD(MELOETTA_PIROUETTE),
ANIM_CMD(AEGISLASH_BLADE),
ANIM_CMD(HOOPA_UNBOUND),
ANIM_CMD(MINIOR_CORE),
ANIM_CMD(WISHIWASHI_SCHOOL),
ANIM_CMD(KYUREM_BLACK),
ANIM_CMD(KYUREM_WHITE),
};

View File

@ -4432,6 +4432,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = 0,
.y_offset = 6,
},
// Alolan Forms
[SPECIES_ALOLAN_RATTATA] =
{
.size = 0x44,
@ -4522,4 +4523,70 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = 0x76,
.y_offset = 0x8,
},
// Forms
[SPECIES_SHAYMIN_SKY] =
{
.size = 0x87,
.y_offset = 0x7,
},
[SPECIES_GIRATINA_ORIGIN] =
{
.size = 0x87,
.y_offset = 0x2,
},
[SPECIES_DARMANITAN_ZEN] =
{
.size = 0x87,
.y_offset = 0x9,
},
[SPECIES_TORNADUS_THERIAN] =
{
.size = 0x87,
.y_offset = 0x2,
},
[SPECIES_THUNDURUS_THERIAN] =
{
.size = 0x87,
.y_offset = 0x0,
},
[SPECIES_LANDORUS_THERIAN] =
{
.size = 0x87,
.y_offset = 0x2,
},
[SPECIES_MELOETTA_PIROUETTE] =
{
.size = 0x87,
.y_offset = 0x3,
},
[SPECIES_AEGISLASH_BLADE] =
{
.size = 0x87,
.y_offset = 0x1,
},
[SPECIES_HOOPA_UNBOUND] =
{
.size = 0x87,
.y_offset = 0x1,
},
[SPECIES_MINIOR_CORE] =
{
.size = 0x87,
.y_offset = 0x9,
},
[SPECIES_WISHIWASHI_SCHOOL] =
{
.size = 0x87,
.y_offset = 0x3,
},
[SPECIES_KYUREM_BLACK] =
{
.size = 0x87,
.y_offset = 0x0,
},
[SPECIES_KYUREM_WHITE] =
{
.size = 0x87,
.y_offset = 0x0,
},
};

View File

@ -892,6 +892,20 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(ALOLAN_EXEGGUTOR, gMonFrontPic_AlolanExeggutor),
SPECIES_SPRITE(ALOLAN_MAROWAK, gMonFrontPic_AlolanMarowak),
SPECIES_SPRITE(SHAYMIN_SKY, gMonFrontPic_ShayminSky),
SPECIES_SPRITE(GIRATINA_ORIGIN, gMonFrontPic_GiratinaOrigin),
SPECIES_SPRITE(DARMANITAN_ZEN, gMonFrontPic_DarmanitanZen),
SPECIES_SPRITE(TORNADUS_THERIAN, gMonFrontPic_TornadusTherian),
SPECIES_SPRITE(THUNDURUS_THERIAN, gMonFrontPic_ThundurusTherian),
SPECIES_SPRITE(LANDORUS_THERIAN, gMonFrontPic_LandorusTherian),
SPECIES_SPRITE(MELOETTA_PIROUETTE, gMonFrontPic_MeloettaPirouette),
SPECIES_SPRITE(AEGISLASH_BLADE, gMonFrontPic_AegislashBlade),
SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound),
SPECIES_SPRITE(MINIOR_CORE, gMonFrontPic_MiniorCore),
SPECIES_SPRITE(WISHIWASHI_SCHOOL, gMonFrontPic_WishiwashiSchool),
SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack),
SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite),
SPECIES_SPRITE(UNOWN_A, gMonFrontPic_UnownA),
SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB),
SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC),

View File

@ -892,6 +892,20 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(ALOLAN_EXEGGUTOR, gMonPalette_AlolanExeggutor),
SPECIES_PAL(ALOLAN_MAROWAK, gMonPalette_AlolanMarowak),
SPECIES_PAL(SHAYMIN_SKY, gMonPalette_ShayminSky),
SPECIES_PAL(GIRATINA_ORIGIN, gMonPalette_GiratinaOrigin),
SPECIES_PAL(DARMANITAN_ZEN, gMonPalette_DarmanitanZen),
SPECIES_PAL(TORNADUS_THERIAN, gMonPalette_TornadusTherian),
SPECIES_PAL(THUNDURUS_THERIAN, gMonPalette_ThundurusTherian),
SPECIES_PAL(LANDORUS_THERIAN, gMonPalette_LandorusTherian),
SPECIES_PAL(MELOETTA_PIROUETTE, gMonPalette_MeloettaPirouette),
SPECIES_PAL(AEGISLASH_BLADE, gMonPalette_AegislashBlade),
SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound),
SPECIES_PAL(MINIOR_CORE, gMonPalette_MiniorCore),
SPECIES_PAL(WISHIWASHI_SCHOOL, gMonPalette_WishiwashiSchool),
SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack),
SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite),
SPECIES_PAL(UNOWN_A, gMonPalette_Unown),
SPECIES_PAL(UNOWN_B, gMonPalette_Unown),
SPECIES_PAL(UNOWN_C, gMonPalette_Unown),

View File

@ -892,6 +892,20 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(ALOLAN_EXEGGUTOR, gMonShinyPalette_AlolanExeggutor),
SPECIES_SHINY_PAL(ALOLAN_MAROWAK, gMonShinyPalette_AlolanMarowak),
SPECIES_SHINY_PAL(SHAYMIN_SKY, gMonShinyPalette_ShayminSky),
SPECIES_SHINY_PAL(GIRATINA_ORIGIN, gMonShinyPalette_GiratinaOrigin),
SPECIES_SHINY_PAL(DARMANITAN_ZEN, gMonShinyPalette_DarmanitanZen),
SPECIES_SHINY_PAL(TORNADUS_THERIAN, gMonShinyPalette_TornadusTherian),
SPECIES_SHINY_PAL(THUNDURUS_THERIAN, gMonShinyPalette_ThundurusTherian),
SPECIES_SHINY_PAL(LANDORUS_THERIAN, gMonShinyPalette_LandorusTherian),
SPECIES_SHINY_PAL(MELOETTA_PIROUETTE, gMonShinyPalette_MeloettaPirouette),
SPECIES_SHINY_PAL(AEGISLASH_BLADE, gMonShinyPalette_AegislashBlade),
SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound),
SPECIES_SHINY_PAL(MINIOR_CORE, gMonShinyPalette_MiniorCore),
SPECIES_SHINY_PAL(WISHIWASHI_SCHOOL, gMonShinyPalette_WishiwashiSchool),
SPECIES_SHINY_PAL(KYUREM_BLACK, gMonShinyPalette_KyuremBlack),
SPECIES_SHINY_PAL(KYUREM_WHITE, gMonShinyPalette_KyuremWhite),
SPECIES_SHINY_PAL(UNOWN_A, gMonShinyPalette_Unown),
SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown),
SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown),

View File

@ -891,4 +891,16 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_ALOLAN_MUK] = _("Muk"),
[SPECIES_ALOLAN_EXEGGUTOR] = _("Exeggutor"),
[SPECIES_ALOLAN_MAROWAK] = _("Marowak"),
[SPECIES_SHAYMIN_SKY] = _("Shaymin"),
[SPECIES_GIRATINA_ORIGIN] = _("Giratina"),
[SPECIES_DARMANITAN_ZEN] = _("Darmanitan"),
[SPECIES_TORNADUS_THERIAN] = _("Tornadus"),
[SPECIES_THUNDURUS_THERIAN] = _("Thundurus"),
[SPECIES_LANDORUS_THERIAN] = _("Landorus"),
[SPECIES_MELOETTA_PIROUETTE] = _("Meloetta"),
[SPECIES_AEGISLASH_BLADE] = _("Aegislash"),
[SPECIES_HOOPA_UNBOUND] = _("Hoopa"),
[SPECIES_MINIOR_CORE] = _("Minior"),
[SPECIES_WISHIWASHI_SCHOOL] = _("Wishiwashi"),
};

View File

@ -914,6 +914,19 @@ const u8 *const gMonIconTable[] =
[SPECIES_ALOLAN_MUK] = gMonIcon_AlolanMuk,
[SPECIES_ALOLAN_EXEGGUTOR] = gMonIcon_AlolanExeggutor,
[SPECIES_ALOLAN_MAROWAK] = gMonIcon_AlolanMarowak,
[SPECIES_SHAYMIN_SKY] = gMonIcon_ShayminSky,
[SPECIES_GIRATINA_ORIGIN] = gMonIcon_GiratinaOrigin,
[SPECIES_DARMANITAN_ZEN] = gMonIcon_DarmanitanZen,
[SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian,
[SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian,
[SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian,
[SPECIES_MELOETTA_PIROUETTE] = gMonIcon_MeloettaPirouette,
[SPECIES_AEGISLASH_BLADE] = gMonIcon_AegislashBlade,
[SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound,
[SPECIES_MINIOR_CORE] = gMonIcon_MiniorCore,
[SPECIES_WISHIWASHI_SCHOOL] = gMonIcon_WishiwashiSchool,
[SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack,
[SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite,
[SPECIES_UNOWN_A] = gMonIcon_UnownA,
[SPECIES_UNOWN_B] = gMonIcon_UnownB,
[SPECIES_UNOWN_C] = gMonIcon_UnownC,
@ -1834,6 +1847,19 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ALOLAN_MUK] = 0,
[SPECIES_ALOLAN_EXEGGUTOR] = 1,
[SPECIES_ALOLAN_MAROWAK] = 1,
[SPECIES_SHAYMIN_SKY] = 1,
[SPECIES_GIRATINA_ORIGIN] = 0,
[SPECIES_DARMANITAN_ZEN] = 0,
[SPECIES_TORNADUS_THERIAN] = 1,
[SPECIES_THUNDURUS_THERIAN] = 0,
[SPECIES_LANDORUS_THERIAN] = 0,
[SPECIES_MELOETTA_PIROUETTE] = 0,
[SPECIES_AEGISLASH_BLADE] = 2,
[SPECIES_HOOPA_UNBOUND] = 0,
[SPECIES_MINIOR_CORE] = 0,
[SPECIES_WISHIWASHI_SCHOOL] = 0,
[SPECIES_KYUREM_BLACK] = 0,
[SPECIES_KYUREM_WHITE] = 0,
[SPECIES_UNOWN_A ... SPECIES_UNOWN_QMARK] = 0,
[SPECIES_EGG] = 1,
};