diff --git a/graphics/pokemon/alolan_diglett/back.png b/graphics/pokemon/alolan_diglett/back.png new file mode 100644 index 0000000000..26e060dc34 Binary files /dev/null and b/graphics/pokemon/alolan_diglett/back.png differ diff --git a/graphics/pokemon/alolan_diglett/front.png b/graphics/pokemon/alolan_diglett/front.png new file mode 100644 index 0000000000..a99506bf34 Binary files /dev/null and b/graphics/pokemon/alolan_diglett/front.png differ diff --git a/graphics/pokemon/alolan_diglett/icon.png b/graphics/pokemon/alolan_diglett/icon.png new file mode 100644 index 0000000000..1b575078a3 Binary files /dev/null and b/graphics/pokemon/alolan_diglett/icon.png differ diff --git a/graphics/pokemon/alolan_diglett/normal.pal b/graphics/pokemon/alolan_diglett/normal.pal new file mode 100644 index 0000000000..4f7aafe254 --- /dev/null +++ b/graphics/pokemon/alolan_diglett/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +160 88 88 +248 200 0 +88 48 24 +16 16 16 +216 152 88 +192 112 64 +248 248 248 +208 56 72 +112 0 24 +248 168 144 +248 104 88 +48 32 40 +96 88 96 +144 136 144 +64 48 48 diff --git a/graphics/pokemon/alolan_diglett/shiny.pal b/graphics/pokemon/alolan_diglett/shiny.pal new file mode 100644 index 0000000000..c0ce049798 --- /dev/null +++ b/graphics/pokemon/alolan_diglett/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +128 48 32 +248 200 0 +72 24 16 +16 16 16 +216 104 32 +176 64 32 +248 248 248 +48 80 160 +8 40 120 +128 144 240 +88 104 200 +48 32 40 +96 88 96 +144 136 144 +64 48 48 diff --git a/graphics/pokemon/alolan_dugtrio/back.png b/graphics/pokemon/alolan_dugtrio/back.png new file mode 100644 index 0000000000..e114284819 Binary files /dev/null and b/graphics/pokemon/alolan_dugtrio/back.png differ diff --git a/graphics/pokemon/alolan_dugtrio/front.png b/graphics/pokemon/alolan_dugtrio/front.png new file mode 100644 index 0000000000..313605dc38 Binary files /dev/null and b/graphics/pokemon/alolan_dugtrio/front.png differ diff --git a/graphics/pokemon/alolan_dugtrio/icon.png b/graphics/pokemon/alolan_dugtrio/icon.png new file mode 100644 index 0000000000..2a409cb8d0 Binary files /dev/null and b/graphics/pokemon/alolan_dugtrio/icon.png differ diff --git a/graphics/pokemon/alolan_dugtrio/normal.pal b/graphics/pokemon/alolan_dugtrio/normal.pal new file mode 100644 index 0000000000..2eb41421ba --- /dev/null +++ b/graphics/pokemon/alolan_dugtrio/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +160 88 88 +248 200 0 +216 152 88 +192 112 64 +88 48 24 +248 248 248 +16 16 16 +112 0 24 +248 104 88 +208 56 72 +208 144 8 +48 32 40 +96 88 96 +144 136 144 +216 152 88 diff --git a/graphics/pokemon/alolan_dugtrio/shiny.pal b/graphics/pokemon/alolan_dugtrio/shiny.pal new file mode 100644 index 0000000000..bd46f40bc4 --- /dev/null +++ b/graphics/pokemon/alolan_dugtrio/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +128 48 32 +248 200 0 +216 104 32 +176 64 32 +72 24 16 +248 248 248 +16 16 16 +8 40 120 +88 104 200 +48 80 160 +208 144 8 +48 32 40 +96 88 96 +144 136 144 +216 152 88 diff --git a/graphics/pokemon/alolan_exeggutor/back.png b/graphics/pokemon/alolan_exeggutor/back.png new file mode 100644 index 0000000000..d39d09a4b6 Binary files /dev/null and b/graphics/pokemon/alolan_exeggutor/back.png differ diff --git a/graphics/pokemon/alolan_exeggutor/front.png b/graphics/pokemon/alolan_exeggutor/front.png new file mode 100644 index 0000000000..186ee8b953 Binary files /dev/null and b/graphics/pokemon/alolan_exeggutor/front.png differ diff --git a/graphics/pokemon/alolan_exeggutor/icon.png b/graphics/pokemon/alolan_exeggutor/icon.png new file mode 100644 index 0000000000..723d0a4ead Binary files /dev/null and b/graphics/pokemon/alolan_exeggutor/icon.png differ diff --git a/graphics/pokemon/alolan_exeggutor/normal.pal b/graphics/pokemon/alolan_exeggutor/normal.pal new file mode 100644 index 0000000000..dfcbbf2466 --- /dev/null +++ b/graphics/pokemon/alolan_exeggutor/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 176 232 +56 160 64 +40 96 48 +136 224 112 +16 16 16 +80 192 96 +80 72 56 +208 184 104 +248 240 184 +136 128 48 +248 248 248 +200 104 136 +232 160 200 +144 120 96 +192 176 152 +136 168 64 diff --git a/graphics/pokemon/alolan_exeggutor/shiny.pal b/graphics/pokemon/alolan_exeggutor/shiny.pal new file mode 100644 index 0000000000..c55c7f5917 --- /dev/null +++ b/graphics/pokemon/alolan_exeggutor/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 176 232 +192 96 56 +152 56 16 +248 184 104 +16 16 16 +224 128 72 +136 104 0 +224 168 88 +248 216 104 +160 104 32 +248 248 248 +200 104 136 +232 160 200 +192 160 0 +248 240 40 +136 168 64 diff --git a/graphics/pokemon/alolan_geodude/back.png b/graphics/pokemon/alolan_geodude/back.png new file mode 100644 index 0000000000..b82b575e99 Binary files /dev/null and b/graphics/pokemon/alolan_geodude/back.png differ diff --git a/graphics/pokemon/alolan_geodude/front.png b/graphics/pokemon/alolan_geodude/front.png new file mode 100644 index 0000000000..2b038e3296 Binary files /dev/null and b/graphics/pokemon/alolan_geodude/front.png differ diff --git a/graphics/pokemon/alolan_geodude/icon.png b/graphics/pokemon/alolan_geodude/icon.png new file mode 100644 index 0000000000..1a5f969971 Binary files /dev/null and b/graphics/pokemon/alolan_geodude/icon.png differ diff --git a/graphics/pokemon/alolan_geodude/normal.pal b/graphics/pokemon/alolan_geodude/normal.pal new file mode 100644 index 0000000000..5eb12793fa --- /dev/null +++ b/graphics/pokemon/alolan_geodude/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +80 80 112 +160 168 192 +120 120 152 +16 16 16 +24 32 32 +72 80 80 +40 48 48 +200 216 200 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_geodude/shiny.pal b/graphics/pokemon/alolan_geodude/shiny.pal new file mode 100644 index 0000000000..58b7f7c06b --- /dev/null +++ b/graphics/pokemon/alolan_geodude/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +144 56 24 +248 144 0 +208 88 8 +16 16 16 +24 32 32 +72 80 80 +40 48 48 +200 216 200 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_golem/back.png b/graphics/pokemon/alolan_golem/back.png new file mode 100644 index 0000000000..bda1dfaa6f Binary files /dev/null and b/graphics/pokemon/alolan_golem/back.png differ diff --git a/graphics/pokemon/alolan_golem/front.png b/graphics/pokemon/alolan_golem/front.png new file mode 100644 index 0000000000..7d9b997497 Binary files /dev/null and b/graphics/pokemon/alolan_golem/front.png differ diff --git a/graphics/pokemon/alolan_golem/icon.png b/graphics/pokemon/alolan_golem/icon.png new file mode 100644 index 0000000000..e796f88842 Binary files /dev/null and b/graphics/pokemon/alolan_golem/icon.png differ diff --git a/graphics/pokemon/alolan_golem/normal.pal b/graphics/pokemon/alolan_golem/normal.pal new file mode 100644 index 0000000000..ee4d66f0ea --- /dev/null +++ b/graphics/pokemon/alolan_golem/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +56 56 72 +32 40 48 +88 96 104 +16 16 16 +128 80 40 +240 168 40 +104 120 112 +64 80 72 +40 40 40 +152 160 152 +104 80 80 +184 168 168 +144 136 128 +192 40 40 +232 232 232 diff --git a/graphics/pokemon/alolan_golem/shiny.pal b/graphics/pokemon/alolan_golem/shiny.pal new file mode 100644 index 0000000000..41cedd78fc --- /dev/null +++ b/graphics/pokemon/alolan_golem/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +56 56 72 +32 40 48 +88 96 104 +16 16 16 +128 80 40 +240 168 40 +144 96 40 +112 64 32 +88 40 16 +184 136 32 +128 88 72 +216 168 136 +184 136 104 +192 40 40 +232 232 232 diff --git a/graphics/pokemon/alolan_graveler/back.png b/graphics/pokemon/alolan_graveler/back.png new file mode 100644 index 0000000000..038e7d37bc Binary files /dev/null and b/graphics/pokemon/alolan_graveler/back.png differ diff --git a/graphics/pokemon/alolan_graveler/front.png b/graphics/pokemon/alolan_graveler/front.png new file mode 100644 index 0000000000..d2454334b5 Binary files /dev/null and b/graphics/pokemon/alolan_graveler/front.png differ diff --git a/graphics/pokemon/alolan_graveler/icon.png b/graphics/pokemon/alolan_graveler/icon.png new file mode 100644 index 0000000000..c0a7557ca0 Binary files /dev/null and b/graphics/pokemon/alolan_graveler/icon.png differ diff --git a/graphics/pokemon/alolan_graveler/normal.pal b/graphics/pokemon/alolan_graveler/normal.pal new file mode 100644 index 0000000000..e477581e89 --- /dev/null +++ b/graphics/pokemon/alolan_graveler/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +80 88 88 +120 128 120 +152 160 160 +48 56 56 +16 16 16 +168 192 184 +40 48 40 +80 80 64 +208 128 16 +248 176 40 +120 128 104 +24 24 24 +248 248 248 +200 48 104 +0 0 0 diff --git a/graphics/pokemon/alolan_graveler/shiny.pal b/graphics/pokemon/alolan_graveler/shiny.pal new file mode 100644 index 0000000000..ec4322ca84 --- /dev/null +++ b/graphics/pokemon/alolan_graveler/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 32 0 +152 56 0 +184 88 0 +88 0 0 +16 16 16 +216 144 8 +40 48 40 +80 80 64 +208 128 16 +248 176 40 +120 128 104 +24 24 24 +248 248 248 +200 48 104 +0 0 0 diff --git a/graphics/pokemon/alolan_grimer/back.png b/graphics/pokemon/alolan_grimer/back.png new file mode 100644 index 0000000000..41165aaa83 Binary files /dev/null and b/graphics/pokemon/alolan_grimer/back.png differ diff --git a/graphics/pokemon/alolan_grimer/front.png b/graphics/pokemon/alolan_grimer/front.png new file mode 100644 index 0000000000..42e4660fa3 Binary files /dev/null and b/graphics/pokemon/alolan_grimer/front.png differ diff --git a/graphics/pokemon/alolan_grimer/icon.png b/graphics/pokemon/alolan_grimer/icon.png new file mode 100644 index 0000000000..09d83cb95e Binary files /dev/null and b/graphics/pokemon/alolan_grimer/icon.png differ diff --git a/graphics/pokemon/alolan_grimer/normal.pal b/graphics/pokemon/alolan_grimer/normal.pal new file mode 100644 index 0000000000..d6034f72b6 --- /dev/null +++ b/graphics/pokemon/alolan_grimer/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 176 232 +56 120 80 +64 160 104 +16 72 40 +16 16 16 +88 192 144 +32 64 48 +248 248 248 +40 88 72 +112 72 24 +240 224 40 +192 160 16 +64 80 144 +80 136 200 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_grimer/shiny.pal b/graphics/pokemon/alolan_grimer/shiny.pal new file mode 100644 index 0000000000..60251d8f18 --- /dev/null +++ b/graphics/pokemon/alolan_grimer/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 176 232 +176 136 176 +216 168 216 +96 56 120 +16 16 16 +232 216 232 +120 72 128 +248 248 248 +152 104 152 +112 72 24 +240 224 40 +192 160 16 +64 80 144 +80 136 200 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_marowak/back.png b/graphics/pokemon/alolan_marowak/back.png new file mode 100644 index 0000000000..69e99db6a2 Binary files /dev/null and b/graphics/pokemon/alolan_marowak/back.png differ diff --git a/graphics/pokemon/alolan_marowak/front.png b/graphics/pokemon/alolan_marowak/front.png new file mode 100644 index 0000000000..cfd9e37b41 Binary files /dev/null and b/graphics/pokemon/alolan_marowak/front.png differ diff --git a/graphics/pokemon/alolan_marowak/icon.png b/graphics/pokemon/alolan_marowak/icon.png new file mode 100644 index 0000000000..3ea2a868c3 Binary files /dev/null and b/graphics/pokemon/alolan_marowak/icon.png differ diff --git a/graphics/pokemon/alolan_marowak/normal.pal b/graphics/pokemon/alolan_marowak/normal.pal new file mode 100644 index 0000000000..0c57bcfa7d --- /dev/null +++ b/graphics/pokemon/alolan_marowak/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +40 216 176 +128 224 216 +160 248 240 +24 168 136 +88 88 80 +16 16 16 +248 248 248 +192 192 184 +136 144 120 +32 24 48 +72 64 120 +80 72 136 +168 128 144 +48 48 80 +112 64 80 diff --git a/graphics/pokemon/alolan_marowak/shiny.pal b/graphics/pokemon/alolan_marowak/shiny.pal new file mode 100644 index 0000000000..2b7d10ef9c --- /dev/null +++ b/graphics/pokemon/alolan_marowak/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +40 216 176 +128 224 216 +160 248 240 +24 168 136 +88 88 80 +16 16 16 +248 248 248 +192 192 184 +136 144 120 +88 24 104 +88 80 80 +136 96 192 +64 48 48 +96 64 136 +40 32 32 diff --git a/graphics/pokemon/alolan_meowth/back.png b/graphics/pokemon/alolan_meowth/back.png new file mode 100644 index 0000000000..84eafdae02 Binary files /dev/null and b/graphics/pokemon/alolan_meowth/back.png differ diff --git a/graphics/pokemon/alolan_meowth/front.png b/graphics/pokemon/alolan_meowth/front.png new file mode 100644 index 0000000000..9f174a5979 Binary files /dev/null and b/graphics/pokemon/alolan_meowth/front.png differ diff --git a/graphics/pokemon/alolan_meowth/icon.png b/graphics/pokemon/alolan_meowth/icon.png new file mode 100644 index 0000000000..d4b80eb6b4 Binary files /dev/null and b/graphics/pokemon/alolan_meowth/icon.png differ diff --git a/graphics/pokemon/alolan_meowth/normal.pal b/graphics/pokemon/alolan_meowth/normal.pal new file mode 100644 index 0000000000..4eafb5c8d5 --- /dev/null +++ b/graphics/pokemon/alolan_meowth/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +64 80 88 +16 16 16 +144 160 184 +32 40 56 +152 80 48 +96 120 128 +240 240 240 +224 200 40 +120 128 112 +200 128 56 +176 176 184 +240 240 240 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_meowth/shiny.pal b/graphics/pokemon/alolan_meowth/shiny.pal new file mode 100644 index 0000000000..6a96e4ff62 --- /dev/null +++ b/graphics/pokemon/alolan_meowth/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +40 56 104 +16 16 16 +112 144 208 +32 40 56 +152 80 48 +64 104 160 +240 240 240 +224 200 40 +48 40 88 +200 128 56 +80 56 144 +128 72 200 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_muk/back.png b/graphics/pokemon/alolan_muk/back.png new file mode 100644 index 0000000000..243561d491 Binary files /dev/null and b/graphics/pokemon/alolan_muk/back.png differ diff --git a/graphics/pokemon/alolan_muk/front.png b/graphics/pokemon/alolan_muk/front.png new file mode 100644 index 0000000000..ef2c2e7674 Binary files /dev/null and b/graphics/pokemon/alolan_muk/front.png differ diff --git a/graphics/pokemon/alolan_muk/icon.png b/graphics/pokemon/alolan_muk/icon.png new file mode 100644 index 0000000000..d598fd7283 Binary files /dev/null and b/graphics/pokemon/alolan_muk/icon.png differ diff --git a/graphics/pokemon/alolan_muk/normal.pal b/graphics/pokemon/alolan_muk/normal.pal new file mode 100644 index 0000000000..1d0a33ad5e --- /dev/null +++ b/graphics/pokemon/alolan_muk/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 176 232 +16 72 40 +136 56 72 +248 248 248 +16 16 16 +240 144 208 +136 160 152 +224 88 152 +64 160 104 +32 48 192 +88 192 144 +48 128 224 +240 224 40 +192 160 16 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_muk/shiny.pal b/graphics/pokemon/alolan_muk/shiny.pal new file mode 100644 index 0000000000..405bb947aa --- /dev/null +++ b/graphics/pokemon/alolan_muk/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 176 232 +120 72 128 +136 56 72 +248 248 248 +16 16 16 +240 144 208 +136 160 152 +224 88 152 +192 160 200 +32 48 192 +224 184 232 +48 128 224 +240 224 40 +192 160 16 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_ninetales/back.png b/graphics/pokemon/alolan_ninetales/back.png new file mode 100644 index 0000000000..149d868a53 Binary files /dev/null and b/graphics/pokemon/alolan_ninetales/back.png differ diff --git a/graphics/pokemon/alolan_ninetales/front.png b/graphics/pokemon/alolan_ninetales/front.png new file mode 100644 index 0000000000..22ae9d2c93 Binary files /dev/null and b/graphics/pokemon/alolan_ninetales/front.png differ diff --git a/graphics/pokemon/alolan_ninetales/icon.png b/graphics/pokemon/alolan_ninetales/icon.png new file mode 100644 index 0000000000..71ac99d5a7 Binary files /dev/null and b/graphics/pokemon/alolan_ninetales/icon.png differ diff --git a/graphics/pokemon/alolan_ninetales/normal.pal b/graphics/pokemon/alolan_ninetales/normal.pal new file mode 100644 index 0000000000..c2e7872bef --- /dev/null +++ b/graphics/pokemon/alolan_ninetales/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +88 96 112 +208 240 240 +152 192 184 +40 120 168 +72 160 200 +16 16 16 +144 144 144 +248 248 248 +16 64 112 +200 200 200 +240 240 240 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_ninetales/shiny.pal b/graphics/pokemon/alolan_ninetales/shiny.pal new file mode 100644 index 0000000000..1cc0c611f5 --- /dev/null +++ b/graphics/pokemon/alolan_ninetales/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +112 80 112 +232 216 248 +176 168 200 +168 40 168 +184 80 200 +16 16 16 +136 136 136 +240 240 240 +112 16 104 +200 200 200 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_persian/back.png b/graphics/pokemon/alolan_persian/back.png new file mode 100644 index 0000000000..cdf20d0f7f Binary files /dev/null and b/graphics/pokemon/alolan_persian/back.png differ diff --git a/graphics/pokemon/alolan_persian/front.png b/graphics/pokemon/alolan_persian/front.png new file mode 100644 index 0000000000..83bfb2dc44 Binary files /dev/null and b/graphics/pokemon/alolan_persian/front.png differ diff --git a/graphics/pokemon/alolan_persian/icon.png b/graphics/pokemon/alolan_persian/icon.png new file mode 100644 index 0000000000..75348250d5 Binary files /dev/null and b/graphics/pokemon/alolan_persian/icon.png differ diff --git a/graphics/pokemon/alolan_persian/normal.pal b/graphics/pokemon/alolan_persian/normal.pal new file mode 100644 index 0000000000..639c9164a5 --- /dev/null +++ b/graphics/pokemon/alolan_persian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +16 16 16 +64 64 80 +32 40 56 +64 80 88 +96 120 128 +104 112 144 +152 168 176 +16 128 208 +248 248 248 +16 184 240 +16 72 168 +176 176 176 +88 88 112 +184 192 208 +0 0 0 diff --git a/graphics/pokemon/alolan_persian/shiny.pal b/graphics/pokemon/alolan_persian/shiny.pal new file mode 100644 index 0000000000..fd0e2c259c --- /dev/null +++ b/graphics/pokemon/alolan_persian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +16 16 16 +48 56 120 +32 40 56 +88 40 112 +152 88 184 +80 104 168 +136 160 216 +16 128 208 +248 248 248 +16 184 240 +16 72 168 +176 176 176 +64 72 160 +168 200 232 +0 0 0 diff --git a/graphics/pokemon/alolan_raichu/back.png b/graphics/pokemon/alolan_raichu/back.png new file mode 100644 index 0000000000..abb01054a4 Binary files /dev/null and b/graphics/pokemon/alolan_raichu/back.png differ diff --git a/graphics/pokemon/alolan_raichu/front.png b/graphics/pokemon/alolan_raichu/front.png new file mode 100644 index 0000000000..20c88523f6 Binary files /dev/null and b/graphics/pokemon/alolan_raichu/front.png differ diff --git a/graphics/pokemon/alolan_raichu/icon.png b/graphics/pokemon/alolan_raichu/icon.png new file mode 100644 index 0000000000..d005cf7e1d Binary files /dev/null and b/graphics/pokemon/alolan_raichu/icon.png differ diff --git a/graphics/pokemon/alolan_raichu/normal.pal b/graphics/pokemon/alolan_raichu/normal.pal new file mode 100644 index 0000000000..54ce683465 --- /dev/null +++ b/graphics/pokemon/alolan_raichu/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 96 32 +248 240 64 +16 16 16 +232 184 16 +144 88 32 +152 56 32 +96 40 16 +224 136 40 +176 88 32 +16 64 128 +248 248 248 +24 112 200 +128 104 88 +232 216 176 +0 0 0 diff --git a/graphics/pokemon/alolan_raichu/shiny.pal b/graphics/pokemon/alolan_raichu/shiny.pal new file mode 100644 index 0000000000..97f9a0451b --- /dev/null +++ b/graphics/pokemon/alolan_raichu/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +144 88 40 +248 176 72 +16 16 16 +216 136 32 +144 88 32 +112 40 40 +80 40 32 +168 104 64 +136 72 56 +16 64 128 +248 248 248 +24 112 200 +128 104 88 +232 216 176 +0 0 0 diff --git a/graphics/pokemon/alolan_raticate/back.png b/graphics/pokemon/alolan_raticate/back.png new file mode 100644 index 0000000000..7ea9895e56 Binary files /dev/null and b/graphics/pokemon/alolan_raticate/back.png differ diff --git a/graphics/pokemon/alolan_raticate/front.png b/graphics/pokemon/alolan_raticate/front.png new file mode 100644 index 0000000000..509c47662d Binary files /dev/null and b/graphics/pokemon/alolan_raticate/front.png differ diff --git a/graphics/pokemon/alolan_raticate/icon.png b/graphics/pokemon/alolan_raticate/icon.png new file mode 100644 index 0000000000..4acd9d0404 Binary files /dev/null and b/graphics/pokemon/alolan_raticate/icon.png differ diff --git a/graphics/pokemon/alolan_raticate/normal.pal b/graphics/pokemon/alolan_raticate/normal.pal new file mode 100644 index 0000000000..4f5d144e3b --- /dev/null +++ b/graphics/pokemon/alolan_raticate/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +40 40 32 +16 16 16 +80 88 80 +112 72 72 +152 96 88 +64 64 56 +104 96 96 +232 216 200 +184 160 152 +208 40 48 +248 248 248 +176 176 184 +88 40 40 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_raticate/shiny.pal b/graphics/pokemon/alolan_raticate/shiny.pal new file mode 100644 index 0000000000..02504c2696 --- /dev/null +++ b/graphics/pokemon/alolan_raticate/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 32 40 +16 16 16 +184 80 96 +112 96 80 +152 128 104 +136 56 72 +112 88 88 +232 216 200 +184 152 144 +208 40 48 +248 248 248 +176 176 184 +88 40 40 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_rattata/back.png b/graphics/pokemon/alolan_rattata/back.png new file mode 100644 index 0000000000..3ad8eb28f2 Binary files /dev/null and b/graphics/pokemon/alolan_rattata/back.png differ diff --git a/graphics/pokemon/alolan_rattata/front.png b/graphics/pokemon/alolan_rattata/front.png new file mode 100644 index 0000000000..865c09c220 Binary files /dev/null and b/graphics/pokemon/alolan_rattata/front.png differ diff --git a/graphics/pokemon/alolan_rattata/icon.png b/graphics/pokemon/alolan_rattata/icon.png new file mode 100644 index 0000000000..b13e1e9bb9 Binary files /dev/null and b/graphics/pokemon/alolan_rattata/icon.png differ diff --git a/graphics/pokemon/alolan_rattata/normal.pal b/graphics/pokemon/alolan_rattata/normal.pal new file mode 100644 index 0000000000..59134847f1 --- /dev/null +++ b/graphics/pokemon/alolan_rattata/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 56 48 +96 104 96 +16 16 16 +72 72 72 +112 128 144 +144 168 160 +240 240 240 +184 8 8 +184 152 120 +216 200 160 +224 56 56 +128 104 72 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_rattata/shiny.pal b/graphics/pokemon/alolan_rattata/shiny.pal new file mode 100644 index 0000000000..07115520ab --- /dev/null +++ b/graphics/pokemon/alolan_rattata/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 32 40 +192 80 88 +16 16 16 +136 56 72 +112 128 144 +144 168 160 +240 240 240 +184 8 8 +176 96 88 +208 160 152 +224 56 56 +136 56 48 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_sandshrew/back.png b/graphics/pokemon/alolan_sandshrew/back.png new file mode 100644 index 0000000000..1e09ba38b6 Binary files /dev/null and b/graphics/pokemon/alolan_sandshrew/back.png differ diff --git a/graphics/pokemon/alolan_sandshrew/front.png b/graphics/pokemon/alolan_sandshrew/front.png new file mode 100644 index 0000000000..f3d4dc140e Binary files /dev/null and b/graphics/pokemon/alolan_sandshrew/front.png differ diff --git a/graphics/pokemon/alolan_sandshrew/icon.png b/graphics/pokemon/alolan_sandshrew/icon.png new file mode 100644 index 0000000000..a1cc049bdb Binary files /dev/null and b/graphics/pokemon/alolan_sandshrew/icon.png differ diff --git a/graphics/pokemon/alolan_sandshrew/normal.pal b/graphics/pokemon/alolan_sandshrew/normal.pal new file mode 100644 index 0000000000..234fd3acec --- /dev/null +++ b/graphics/pokemon/alolan_sandshrew/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +80 136 152 +48 72 112 +248 248 248 +176 216 224 +128 176 200 +16 16 16 +16 56 120 +136 120 96 +40 120 200 +208 192 144 +248 248 168 +232 224 176 +200 208 216 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_sandshrew/shiny.pal b/graphics/pokemon/alolan_sandshrew/shiny.pal new file mode 100644 index 0000000000..6aaf4d2254 --- /dev/null +++ b/graphics/pokemon/alolan_sandshrew/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +80 136 152 +48 72 112 +248 248 248 +176 216 224 +128 176 200 +16 16 16 +16 56 120 +24 80 152 +40 120 200 +56 128 224 +136 184 232 +104 160 232 +200 208 216 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_sandslash/back.png b/graphics/pokemon/alolan_sandslash/back.png new file mode 100644 index 0000000000..c64d695360 Binary files /dev/null and b/graphics/pokemon/alolan_sandslash/back.png differ diff --git a/graphics/pokemon/alolan_sandslash/front.png b/graphics/pokemon/alolan_sandslash/front.png new file mode 100644 index 0000000000..fc7644cc1d Binary files /dev/null and b/graphics/pokemon/alolan_sandslash/front.png differ diff --git a/graphics/pokemon/alolan_sandslash/icon.png b/graphics/pokemon/alolan_sandslash/icon.png new file mode 100644 index 0000000000..88cea6049b Binary files /dev/null and b/graphics/pokemon/alolan_sandslash/icon.png differ diff --git a/graphics/pokemon/alolan_sandslash/normal.pal b/graphics/pokemon/alolan_sandslash/normal.pal new file mode 100644 index 0000000000..a5e9e74efb --- /dev/null +++ b/graphics/pokemon/alolan_sandslash/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +56 72 112 +16 16 16 +168 232 240 +240 240 240 +120 200 240 +88 152 192 +80 176 200 +56 136 176 +80 168 200 +168 168 192 +184 184 208 +168 232 240 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_sandslash/shiny.pal b/graphics/pokemon/alolan_sandslash/shiny.pal new file mode 100644 index 0000000000..cb4cba0589 --- /dev/null +++ b/graphics/pokemon/alolan_sandslash/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +56 72 112 +16 16 16 +168 232 240 +240 240 248 +120 200 240 +56 112 136 +80 176 200 +56 136 176 +56 112 136 +168 200 216 +192 208 224 +96 160 184 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_vulpix/back.png b/graphics/pokemon/alolan_vulpix/back.png new file mode 100644 index 0000000000..f3ea2e305d Binary files /dev/null and b/graphics/pokemon/alolan_vulpix/back.png differ diff --git a/graphics/pokemon/alolan_vulpix/front.png b/graphics/pokemon/alolan_vulpix/front.png new file mode 100644 index 0000000000..0f138a6841 Binary files /dev/null and b/graphics/pokemon/alolan_vulpix/front.png differ diff --git a/graphics/pokemon/alolan_vulpix/icon.png b/graphics/pokemon/alolan_vulpix/icon.png new file mode 100644 index 0000000000..f49562751b Binary files /dev/null and b/graphics/pokemon/alolan_vulpix/icon.png differ diff --git a/graphics/pokemon/alolan_vulpix/normal.pal b/graphics/pokemon/alolan_vulpix/normal.pal new file mode 100644 index 0000000000..728db562eb --- /dev/null +++ b/graphics/pokemon/alolan_vulpix/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 112 152 +168 176 208 +224 232 240 +104 104 128 +248 248 248 +16 16 16 +192 200 232 +88 136 168 +112 192 216 +64 80 112 +112 120 184 +80 120 160 +144 152 200 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/alolan_vulpix/shiny.pal b/graphics/pokemon/alolan_vulpix/shiny.pal new file mode 100644 index 0000000000..d22bf6e220 --- /dev/null +++ b/graphics/pokemon/alolan_vulpix/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +136 104 136 +176 152 184 +224 208 232 +152 104 128 +248 248 248 +16 16 16 +216 200 224 +120 112 184 +136 160 224 +72 48 104 +120 88 160 +112 104 184 +152 128 184 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/castform/anim_front.png b/graphics/pokemon/castform/anim_front.png new file mode 100644 index 0000000000..39bfaf4266 Binary files /dev/null and b/graphics/pokemon/castform/anim_front.png differ diff --git a/graphics/pokemon/castform/back.png b/graphics/pokemon/castform/back.png new file mode 100644 index 0000000000..6348a35e86 Binary files /dev/null and b/graphics/pokemon/castform/back.png differ diff --git a/graphics/pokemon/castform/front.png b/graphics/pokemon/castform/front.png new file mode 100644 index 0000000000..39bfaf4266 Binary files /dev/null and b/graphics/pokemon/castform/front.png differ diff --git a/graphics/pokemon/castform/normal.pal b/graphics/pokemon/castform/normal.pal new file mode 100644 index 0000000000..3fe2b76928 --- /dev/null +++ b/graphics/pokemon/castform/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +90 82 82 +205 189 189 +230 222 222 +246 246 238 +0 0 0 +255 255 255 +222 222 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +74 82 74 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/castform/shiny.pal b/graphics/pokemon/castform/shiny.pal new file mode 100644 index 0000000000..2fa401dd6f --- /dev/null +++ b/graphics/pokemon/castform/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +98 90 90 +205 164 189 +230 197 222 +255 222 255 +0 0 0 +255 246 65 +230 180 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +74 82 74 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/anim_front.png new file mode 100644 index 0000000000..8f6fb3d30f Binary files /dev/null and b/graphics/pokemon/cherrim/anim_front.png differ diff --git a/graphics/pokemon/cherrim/back.png b/graphics/pokemon/cherrim/back.png new file mode 100644 index 0000000000..5819f4dd94 Binary files /dev/null and b/graphics/pokemon/cherrim/back.png differ diff --git a/graphics/pokemon/cherrim/front.png b/graphics/pokemon/cherrim/front.png new file mode 100644 index 0000000000..5b10c48d1d Binary files /dev/null and b/graphics/pokemon/cherrim/front.png differ diff --git a/graphics/pokemon/cherrim/normal.pal b/graphics/pokemon/cherrim/normal.pal new file mode 100644 index 0000000000..b04e7c0e6d --- /dev/null +++ b/graphics/pokemon/cherrim/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 48 64 +200 88 112 +216 136 136 +16 16 16 +152 64 80 +16 80 16 +48 120 48 +56 168 56 +96 192 96 +96 56 112 +152 120 176 +120 88 152 +56 32 72 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/cherrim/shiny.pal b/graphics/pokemon/cherrim/shiny.pal new file mode 100644 index 0000000000..3b56a29a9b --- /dev/null +++ b/graphics/pokemon/cherrim/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 40 72 +208 88 128 +216 128 152 +16 16 16 +160 56 96 +8 80 40 +24 136 72 +32 192 88 +104 216 128 +80 104 128 +120 192 208 +72 152 184 +40 40 72 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/gmax_alcremie/back.png b/graphics/pokemon/gmax_alcremie/back.png new file mode 100644 index 0000000000..8c3a12e19e Binary files /dev/null and b/graphics/pokemon/gmax_alcremie/back.png differ diff --git a/graphics/pokemon/gmax_alcremie/front.png b/graphics/pokemon/gmax_alcremie/front.png new file mode 100644 index 0000000000..30d6ee4e8f Binary files /dev/null and b/graphics/pokemon/gmax_alcremie/front.png differ diff --git a/graphics/pokemon/gmax_alcremie/icon.png b/graphics/pokemon/gmax_alcremie/icon.png new file mode 100644 index 0000000000..10ba520d1c Binary files /dev/null and b/graphics/pokemon/gmax_alcremie/icon.png differ diff --git a/graphics/pokemon/gmax_alcremie/normal.pal b/graphics/pokemon/gmax_alcremie/normal.pal new file mode 100644 index 0000000000..dcc78ed923 --- /dev/null +++ b/graphics/pokemon/gmax_alcremie/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +147 116 87 +16 16 16 +214 191 164 +253 241 208 +217 194 40 +254 255 112 +185 119 190 +164 153 183 +240 189 195 +254 109 38 +232 254 23 +86 225 210 +247 86 144 +28 151 140 +226 122 129 diff --git a/graphics/pokemon/gmax_alcremie/shiny.pal b/graphics/pokemon/gmax_alcremie/shiny.pal new file mode 100644 index 0000000000..092c301bad --- /dev/null +++ b/graphics/pokemon/gmax_alcremie/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +108 127 125 +16 16 16 +184 203 202 +240 253 255 +35 36 35 +66 69 66 +185 119 190 +91 69 73 +139 113 119 +254 109 38 +232 254 23 +187 157 165 +247 86 144 +28 151 140 +75 79 75 diff --git a/graphics/pokemon/gmax_appletun/back.png b/graphics/pokemon/gmax_appletun/back.png new file mode 100644 index 0000000000..610d98112b Binary files /dev/null and b/graphics/pokemon/gmax_appletun/back.png differ diff --git a/graphics/pokemon/gmax_appletun/front.png b/graphics/pokemon/gmax_appletun/front.png new file mode 100644 index 0000000000..65c716e9e8 Binary files /dev/null and b/graphics/pokemon/gmax_appletun/front.png differ diff --git a/graphics/pokemon/gmax_appletun/icon.png b/graphics/pokemon/gmax_appletun/icon.png new file mode 100644 index 0000000000..b7ecabd469 Binary files /dev/null and b/graphics/pokemon/gmax_appletun/icon.png differ diff --git a/graphics/pokemon/gmax_appletun/normal.pal b/graphics/pokemon/gmax_appletun/normal.pal new file mode 100644 index 0000000000..2d5dabef1e --- /dev/null +++ b/graphics/pokemon/gmax_appletun/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +166 49 57 +119 38 40 +198 138 72 +141 66 41 +233 197 88 +66 118 56 +210 57 77 +179 172 98 +249 249 249 +44 72 40 +218 208 139 +57 164 61 +213 68 86 +15 15 15 diff --git a/graphics/pokemon/gmax_appletun/shiny.pal b/graphics/pokemon/gmax_appletun/shiny.pal new file mode 100644 index 0000000000..4514eb418d --- /dev/null +++ b/graphics/pokemon/gmax_appletun/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +55 143 41 +35 91 27 +198 138 72 +141 66 41 +233 197 88 +66 118 56 +75 183 48 +179 172 98 +249 249 249 +44 72 40 +218 208 139 +57 164 61 +213 68 86 +15 15 15 diff --git a/graphics/pokemon/gmax_blastoise/back.png b/graphics/pokemon/gmax_blastoise/back.png new file mode 100644 index 0000000000..cd9d607f55 Binary files /dev/null and b/graphics/pokemon/gmax_blastoise/back.png differ diff --git a/graphics/pokemon/gmax_blastoise/front.png b/graphics/pokemon/gmax_blastoise/front.png new file mode 100644 index 0000000000..c4608e67dd Binary files /dev/null and b/graphics/pokemon/gmax_blastoise/front.png differ diff --git a/graphics/pokemon/gmax_blastoise/icon.png b/graphics/pokemon/gmax_blastoise/icon.png new file mode 100644 index 0000000000..9761dfbe53 Binary files /dev/null and b/graphics/pokemon/gmax_blastoise/icon.png differ diff --git a/graphics/pokemon/gmax_blastoise/normal.pal b/graphics/pokemon/gmax_blastoise/normal.pal new file mode 100644 index 0000000000..2b7f1254f5 --- /dev/null +++ b/graphics/pokemon/gmax_blastoise/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +8 58 99 +16 16 16 +90 140 206 +33 99 173 +205 205 213 +74 74 74 +53 46 39 +199 84 53 +148 148 148 +253 253 253 +108 232 214 +73 65 54 +95 86 71 +148 173 230 +206 206 214 diff --git a/graphics/pokemon/gmax_blastoise/shiny.pal b/graphics/pokemon/gmax_blastoise/shiny.pal new file mode 100644 index 0000000000..f7906a9da8 --- /dev/null +++ b/graphics/pokemon/gmax_blastoise/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +115 82 148 +16 16 16 +213 180 246 +164 123 189 +205 205 213 +74 74 74 +66 53 42 +199 84 53 +148 148 148 +253 253 253 +108 232 214 +92 75 62 +140 126 83 +238 222 255 +206 206 214 diff --git a/graphics/pokemon/gmax_butterfree/back.png b/graphics/pokemon/gmax_butterfree/back.png new file mode 100644 index 0000000000..a9bce5aaf1 Binary files /dev/null and b/graphics/pokemon/gmax_butterfree/back.png differ diff --git a/graphics/pokemon/gmax_butterfree/front.png b/graphics/pokemon/gmax_butterfree/front.png new file mode 100644 index 0000000000..0fc4c4c70f Binary files /dev/null and b/graphics/pokemon/gmax_butterfree/front.png differ diff --git a/graphics/pokemon/gmax_butterfree/icon.png b/graphics/pokemon/gmax_butterfree/icon.png new file mode 100644 index 0000000000..9b18cd6e8d Binary files /dev/null and b/graphics/pokemon/gmax_butterfree/icon.png differ diff --git a/graphics/pokemon/gmax_butterfree/normal.pal b/graphics/pokemon/gmax_butterfree/normal.pal new file mode 100644 index 0000000000..17ad51006f --- /dev/null +++ b/graphics/pokemon/gmax_butterfree/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 194 14 +134 122 150 +100 87 122 +70 52 92 +106 189 205 +82 123 197 +179 242 219 +238 238 255 +189 189 230 +140 206 188 +146 233 150 +39 167 119 +255 156 180 +230 98 131 +222 49 49 +16 16 16 diff --git a/graphics/pokemon/gmax_butterfree/shiny.pal b/graphics/pokemon/gmax_butterfree/shiny.pal new file mode 100644 index 0000000000..3d3e6ed267 --- /dev/null +++ b/graphics/pokemon/gmax_butterfree/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 194 14 +131 131 189 +115 98 172 +90 74 115 +246 139 131 +222 82 98 +179 242 219 +238 238 255 +189 189 230 +140 206 188 +146 233 150 +39 167 119 +156 255 156 +115 238 115 +32 213 24 +16 16 16 diff --git a/graphics/pokemon/gmax_centiskorch/back.png b/graphics/pokemon/gmax_centiskorch/back.png new file mode 100644 index 0000000000..2279b3a065 Binary files /dev/null and b/graphics/pokemon/gmax_centiskorch/back.png differ diff --git a/graphics/pokemon/gmax_centiskorch/front.png b/graphics/pokemon/gmax_centiskorch/front.png new file mode 100644 index 0000000000..a35501c2bb Binary files /dev/null and b/graphics/pokemon/gmax_centiskorch/front.png differ diff --git a/graphics/pokemon/gmax_centiskorch/icon.png b/graphics/pokemon/gmax_centiskorch/icon.png new file mode 100644 index 0000000000..811a3c4991 Binary files /dev/null and b/graphics/pokemon/gmax_centiskorch/icon.png differ diff --git a/graphics/pokemon/gmax_centiskorch/normal.pal b/graphics/pokemon/gmax_centiskorch/normal.pal new file mode 100644 index 0000000000..5ce935aa18 --- /dev/null +++ b/graphics/pokemon/gmax_centiskorch/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +215 44 0 +255 155 27 +64 30 33 +255 247 0 +16 16 16 +85 19 7 +115 66 57 +82 40 41 +205 45 26 +255 90 66 +255 213 0 +156 27 15 +251 251 251 +148 21 40 +15 15 15 diff --git a/graphics/pokemon/gmax_centiskorch/shiny.pal b/graphics/pokemon/gmax_centiskorch/shiny.pal new file mode 100644 index 0000000000..26404703ab --- /dev/null +++ b/graphics/pokemon/gmax_centiskorch/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +215 44 0 +255 155 27 +6 31 51 +255 247 0 +16 16 16 +85 19 7 +43 94 109 +20 54 73 +205 45 26 +255 90 66 +255 213 0 +156 27 15 +251 251 251 +148 21 40 +15 15 15 diff --git a/graphics/pokemon/gmax_charizard/back.png b/graphics/pokemon/gmax_charizard/back.png new file mode 100644 index 0000000000..508e18c549 Binary files /dev/null and b/graphics/pokemon/gmax_charizard/back.png differ diff --git a/graphics/pokemon/gmax_charizard/front.png b/graphics/pokemon/gmax_charizard/front.png new file mode 100644 index 0000000000..c1f43003ac Binary files /dev/null and b/graphics/pokemon/gmax_charizard/front.png differ diff --git a/graphics/pokemon/gmax_charizard/icon.png b/graphics/pokemon/gmax_charizard/icon.png new file mode 100644 index 0000000000..68461c5032 Binary files /dev/null and b/graphics/pokemon/gmax_charizard/icon.png differ diff --git a/graphics/pokemon/gmax_charizard/normal.pal b/graphics/pokemon/gmax_charizard/normal.pal new file mode 100644 index 0000000000..533e9772e0 --- /dev/null +++ b/graphics/pokemon/gmax_charizard/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +255 66 0 +255 214 16 +247 165 16 +255 232 119 +16 16 16 +132 49 25 +239 132 41 +206 82 66 +252 252 252 +214 41 44 +239 181 90 +213 207 174 +162 54 43 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_charizard/shiny.pal b/graphics/pokemon/gmax_charizard/shiny.pal new file mode 100644 index 0000000000..bae527ee2e --- /dev/null +++ b/graphics/pokemon/gmax_charizard/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +255 66 0 +255 214 16 +247 165 16 +255 232 119 +16 16 16 +49 57 65 +131 123 148 +90 90 106 +252 252 252 +214 41 44 +169 163 183 +213 207 174 +66 66 82 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_cinderace/back.png b/graphics/pokemon/gmax_cinderace/back.png new file mode 100644 index 0000000000..b9e6b813de Binary files /dev/null and b/graphics/pokemon/gmax_cinderace/back.png differ diff --git a/graphics/pokemon/gmax_cinderace/front.png b/graphics/pokemon/gmax_cinderace/front.png new file mode 100644 index 0000000000..e3739d9062 Binary files /dev/null and b/graphics/pokemon/gmax_cinderace/front.png differ diff --git a/graphics/pokemon/gmax_cinderace/icon.png b/graphics/pokemon/gmax_cinderace/icon.png new file mode 100644 index 0000000000..3d1f1e4237 Binary files /dev/null and b/graphics/pokemon/gmax_cinderace/icon.png differ diff --git a/graphics/pokemon/gmax_cinderace/normal.pal b/graphics/pokemon/gmax_cinderace/normal.pal new file mode 100644 index 0000000000..a1782790ab --- /dev/null +++ b/graphics/pokemon/gmax_cinderace/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +125 118 121 +16 16 16 +190 182 183 +115 26 13 +175 39 20 +254 226 90 +235 93 36 +254 238 160 +237 151 35 +244 201 28 +104 85 25 +7 33 69 +0 65 148 +248 248 248 +252 252 252 diff --git a/graphics/pokemon/gmax_cinderace/shiny.pal b/graphics/pokemon/gmax_cinderace/shiny.pal new file mode 100644 index 0000000000..e4454df011 --- /dev/null +++ b/graphics/pokemon/gmax_cinderace/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +80 77 73 +16 16 16 +136 133 128 +118 50 8 +180 75 12 +254 226 90 +228 119 19 +254 238 160 +237 151 35 +244 201 28 +104 85 25 +132 120 120 +252 252 252 +179 186 175 +254 254 254 diff --git a/graphics/pokemon/gmax_coalossal/back.png b/graphics/pokemon/gmax_coalossal/back.png new file mode 100644 index 0000000000..907768dc81 Binary files /dev/null and b/graphics/pokemon/gmax_coalossal/back.png differ diff --git a/graphics/pokemon/gmax_coalossal/front.png b/graphics/pokemon/gmax_coalossal/front.png new file mode 100644 index 0000000000..efd49d97e4 Binary files /dev/null and b/graphics/pokemon/gmax_coalossal/front.png differ diff --git a/graphics/pokemon/gmax_coalossal/icon.png b/graphics/pokemon/gmax_coalossal/icon.png new file mode 100644 index 0000000000..82a769dd95 Binary files /dev/null and b/graphics/pokemon/gmax_coalossal/icon.png differ diff --git a/graphics/pokemon/gmax_coalossal/normal.pal b/graphics/pokemon/gmax_coalossal/normal.pal new file mode 100644 index 0000000000..7c8a54041a --- /dev/null +++ b/graphics/pokemon/gmax_coalossal/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +31 20 24 +47 36 39 +16 16 16 +55 51 55 +37 35 37 +88 71 74 +69 50 51 +66 64 60 +84 81 76 +103 99 92 +120 55 59 +89 40 43 +243 120 67 +236 225 13 +234 70 73 diff --git a/graphics/pokemon/gmax_coalossal/shiny.pal b/graphics/pokemon/gmax_coalossal/shiny.pal new file mode 100644 index 0000000000..ef46ff2c3f --- /dev/null +++ b/graphics/pokemon/gmax_coalossal/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +31 20 24 +47 36 39 +16 16 16 +50 58 63 +34 36 38 +88 71 74 +69 50 51 +71 82 88 +88 112 124 +103 132 140 +120 55 59 +89 40 43 +243 120 67 +236 225 13 +234 70 73 diff --git a/graphics/pokemon/gmax_copperajah/back.png b/graphics/pokemon/gmax_copperajah/back.png new file mode 100644 index 0000000000..b42d0d32d1 Binary files /dev/null and b/graphics/pokemon/gmax_copperajah/back.png differ diff --git a/graphics/pokemon/gmax_copperajah/front.png b/graphics/pokemon/gmax_copperajah/front.png new file mode 100644 index 0000000000..9ba3497ae0 Binary files /dev/null and b/graphics/pokemon/gmax_copperajah/front.png differ diff --git a/graphics/pokemon/gmax_copperajah/icon.png b/graphics/pokemon/gmax_copperajah/icon.png new file mode 100644 index 0000000000..1da37e2463 Binary files /dev/null and b/graphics/pokemon/gmax_copperajah/icon.png differ diff --git a/graphics/pokemon/gmax_copperajah/normal.pal b/graphics/pokemon/gmax_copperajah/normal.pal new file mode 100644 index 0000000000..0a7db22185 --- /dev/null +++ b/graphics/pokemon/gmax_copperajah/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +135 67 44 +16 16 16 +192 106 49 +34 66 54 +23 47 38 +95 101 89 +238 230 233 +159 147 149 +57 110 99 +34 83 72 +242 143 58 +24 88 79 +53 193 167 +242 91 0 +26 140 120 diff --git a/graphics/pokemon/gmax_copperajah/shiny.pal b/graphics/pokemon/gmax_copperajah/shiny.pal new file mode 100644 index 0000000000..f80600011c --- /dev/null +++ b/graphics/pokemon/gmax_copperajah/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +141 100 46 +16 16 16 +198 155 50 +37 63 44 +25 45 30 +95 101 89 +238 230 233 +159 147 149 +62 105 80 +39 78 55 +243 202 62 +52 90 85 +100 166 154 +242 91 0 +65 127 116 diff --git a/graphics/pokemon/gmax_corviknight/back.png b/graphics/pokemon/gmax_corviknight/back.png new file mode 100644 index 0000000000..99ba005f37 Binary files /dev/null and b/graphics/pokemon/gmax_corviknight/back.png differ diff --git a/graphics/pokemon/gmax_corviknight/front.png b/graphics/pokemon/gmax_corviknight/front.png new file mode 100644 index 0000000000..63c05fb7ab Binary files /dev/null and b/graphics/pokemon/gmax_corviknight/front.png differ diff --git a/graphics/pokemon/gmax_corviknight/icon.png b/graphics/pokemon/gmax_corviknight/icon.png new file mode 100644 index 0000000000..8104a49ba6 Binary files /dev/null and b/graphics/pokemon/gmax_corviknight/icon.png differ diff --git a/graphics/pokemon/gmax_corviknight/normal.pal b/graphics/pokemon/gmax_corviknight/normal.pal new file mode 100644 index 0000000000..1edbbecf93 --- /dev/null +++ b/graphics/pokemon/gmax_corviknight/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +37 29 78 +16 16 16 +67 68 117 +122 24 95 +215 0 67 +48 51 96 +24 23 61 +62 61 109 +77 84 136 +44 43 88 +100 108 168 +78 65 80 +46 38 47 +255 118 160 +152 27 117 diff --git a/graphics/pokemon/gmax_corviknight/shiny.pal b/graphics/pokemon/gmax_corviknight/shiny.pal new file mode 100644 index 0000000000..94086e3215 --- /dev/null +++ b/graphics/pokemon/gmax_corviknight/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +53 53 53 +16 16 16 +131 131 131 +139 121 31 +238 214 0 +77 77 77 +21 21 23 +65 64 68 +144 144 144 +41 41 44 +188 188 188 +35 34 34 +8 8 8 +255 247 153 +179 166 107 diff --git a/graphics/pokemon/gmax_drednaw/back.png b/graphics/pokemon/gmax_drednaw/back.png new file mode 100644 index 0000000000..f5e79c0a38 Binary files /dev/null and b/graphics/pokemon/gmax_drednaw/back.png differ diff --git a/graphics/pokemon/gmax_drednaw/front.png b/graphics/pokemon/gmax_drednaw/front.png new file mode 100644 index 0000000000..a86a9474cb Binary files /dev/null and b/graphics/pokemon/gmax_drednaw/front.png differ diff --git a/graphics/pokemon/gmax_drednaw/icon.png b/graphics/pokemon/gmax_drednaw/icon.png new file mode 100644 index 0000000000..2e8fdf7658 Binary files /dev/null and b/graphics/pokemon/gmax_drednaw/icon.png differ diff --git a/graphics/pokemon/gmax_drednaw/normal.pal b/graphics/pokemon/gmax_drednaw/normal.pal new file mode 100644 index 0000000000..8e0dc8ff0e --- /dev/null +++ b/graphics/pokemon/gmax_drednaw/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +62 115 115 +100 38 32 +168 83 26 +252 252 252 +101 208 188 +77 164 155 +152 67 52 +246 190 19 +183 236 230 +214 132 20 +186 90 58 +250 230 184 +230 196 125 +202 152 96 diff --git a/graphics/pokemon/gmax_drednaw/shiny.pal b/graphics/pokemon/gmax_drednaw/shiny.pal new file mode 100644 index 0000000000..2fa3812077 --- /dev/null +++ b/graphics/pokemon/gmax_drednaw/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +31 60 40 +43 34 34 +162 51 32 +252 252 252 +70 113 84 +49 87 61 +77 63 60 +236 132 29 +122 160 135 +206 85 28 +99 83 77 +255 178 119 +242 200 113 +185 132 73 diff --git a/graphics/pokemon/gmax_duraludon/back.png b/graphics/pokemon/gmax_duraludon/back.png new file mode 100644 index 0000000000..ed052cc0bb Binary files /dev/null and b/graphics/pokemon/gmax_duraludon/back.png differ diff --git a/graphics/pokemon/gmax_duraludon/front.png b/graphics/pokemon/gmax_duraludon/front.png new file mode 100644 index 0000000000..7fd2b21986 Binary files /dev/null and b/graphics/pokemon/gmax_duraludon/front.png differ diff --git a/graphics/pokemon/gmax_duraludon/icon.png b/graphics/pokemon/gmax_duraludon/icon.png new file mode 100644 index 0000000000..74118eb778 Binary files /dev/null and b/graphics/pokemon/gmax_duraludon/icon.png differ diff --git a/graphics/pokemon/gmax_duraludon/normal.pal b/graphics/pokemon/gmax_duraludon/normal.pal new file mode 100644 index 0000000000..eb23403c98 --- /dev/null +++ b/graphics/pokemon/gmax_duraludon/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +40 39 45 +168 147 168 +131 112 128 +112 112 134 +57 58 65 +228 229 241 +78 79 95 +56 173 186 +196 186 197 +254 254 254 +46 105 118 +56 139 156 +79 203 217 +255 222 89 diff --git a/graphics/pokemon/gmax_duraludon/shiny.pal b/graphics/pokemon/gmax_duraludon/shiny.pal new file mode 100644 index 0000000000..856918e1aa --- /dev/null +++ b/graphics/pokemon/gmax_duraludon/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +37 42 57 +143 165 151 +109 128 119 +94 116 158 +54 65 77 +232 237 220 +66 85 116 +219 89 40 +181 193 184 +254 254 254 +139 55 24 +183 73 31 +226 122 84 +255 164 48 diff --git a/graphics/pokemon/gmax_eevee/back.png b/graphics/pokemon/gmax_eevee/back.png new file mode 100644 index 0000000000..1e104f833b Binary files /dev/null and b/graphics/pokemon/gmax_eevee/back.png differ diff --git a/graphics/pokemon/gmax_eevee/front.png b/graphics/pokemon/gmax_eevee/front.png new file mode 100644 index 0000000000..315b69a2f3 Binary files /dev/null and b/graphics/pokemon/gmax_eevee/front.png differ diff --git a/graphics/pokemon/gmax_eevee/icon.png b/graphics/pokemon/gmax_eevee/icon.png new file mode 100644 index 0000000000..7b4698a0c2 Binary files /dev/null and b/graphics/pokemon/gmax_eevee/icon.png differ diff --git a/graphics/pokemon/gmax_eevee/normal.pal b/graphics/pokemon/gmax_eevee/normal.pal new file mode 100644 index 0000000000..5a1b6a1c9f --- /dev/null +++ b/graphics/pokemon/gmax_eevee/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +82 49 32 +16 16 16 +115 74 74 +189 156 123 +164 98 74 +230 197 148 +255 230 172 +213 156 74 +253 253 253 +230 189 123 +11 11 11 +12 12 12 +13 13 13 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_eevee/shiny.pal b/graphics/pokemon/gmax_eevee/shiny.pal new file mode 100644 index 0000000000..b554023321 --- /dev/null +++ b/graphics/pokemon/gmax_eevee/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +90 82 74 +16 16 16 +131 115 115 +189 197 255 +172 164 156 +213 222 255 +222 230 255 +213 213 197 +253 253 253 +246 246 238 +11 11 11 +12 12 12 +13 13 13 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_flapple/back.png b/graphics/pokemon/gmax_flapple/back.png new file mode 100644 index 0000000000..610d98112b Binary files /dev/null and b/graphics/pokemon/gmax_flapple/back.png differ diff --git a/graphics/pokemon/gmax_flapple/front.png b/graphics/pokemon/gmax_flapple/front.png new file mode 100644 index 0000000000..65c716e9e8 Binary files /dev/null and b/graphics/pokemon/gmax_flapple/front.png differ diff --git a/graphics/pokemon/gmax_flapple/icon.png b/graphics/pokemon/gmax_flapple/icon.png new file mode 100644 index 0000000000..b7ecabd469 Binary files /dev/null and b/graphics/pokemon/gmax_flapple/icon.png differ diff --git a/graphics/pokemon/gmax_flapple/normal.pal b/graphics/pokemon/gmax_flapple/normal.pal new file mode 100644 index 0000000000..2d5dabef1e --- /dev/null +++ b/graphics/pokemon/gmax_flapple/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +166 49 57 +119 38 40 +198 138 72 +141 66 41 +233 197 88 +66 118 56 +210 57 77 +179 172 98 +249 249 249 +44 72 40 +218 208 139 +57 164 61 +213 68 86 +15 15 15 diff --git a/graphics/pokemon/gmax_flapple/shiny.pal b/graphics/pokemon/gmax_flapple/shiny.pal new file mode 100644 index 0000000000..4514eb418d --- /dev/null +++ b/graphics/pokemon/gmax_flapple/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +55 143 41 +35 91 27 +198 138 72 +141 66 41 +233 197 88 +66 118 56 +75 183 48 +179 172 98 +249 249 249 +44 72 40 +218 208 139 +57 164 61 +213 68 86 +15 15 15 diff --git a/graphics/pokemon/gmax_garbodor/back.png b/graphics/pokemon/gmax_garbodor/back.png new file mode 100644 index 0000000000..645dae3c01 Binary files /dev/null and b/graphics/pokemon/gmax_garbodor/back.png differ diff --git a/graphics/pokemon/gmax_garbodor/front.png b/graphics/pokemon/gmax_garbodor/front.png new file mode 100644 index 0000000000..9856f28763 Binary files /dev/null and b/graphics/pokemon/gmax_garbodor/front.png differ diff --git a/graphics/pokemon/gmax_garbodor/icon.png b/graphics/pokemon/gmax_garbodor/icon.png new file mode 100644 index 0000000000..f929b577ce Binary files /dev/null and b/graphics/pokemon/gmax_garbodor/icon.png differ diff --git a/graphics/pokemon/gmax_garbodor/normal.pal b/graphics/pokemon/gmax_garbodor/normal.pal new file mode 100644 index 0000000000..5d365044cf --- /dev/null +++ b/graphics/pokemon/gmax_garbodor/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +123 106 90 +189 189 189 +90 74 65 +164 139 115 +24 57 41 +0 172 213 +107 220 39 +41 106 74 +253 253 253 +254 188 164 +235 73 78 +230 218 0 +184 41 45 +239 143 255 diff --git a/graphics/pokemon/gmax_garbodor/shiny.pal b/graphics/pokemon/gmax_garbodor/shiny.pal new file mode 100644 index 0000000000..a70820775d --- /dev/null +++ b/graphics/pokemon/gmax_garbodor/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +106 106 98 +189 189 189 +82 74 74 +148 139 131 +16 65 74 +82 238 106 +255 189 90 +41 164 164 +253 253 253 +255 134 134 +255 133 35 +178 86 230 +184 41 45 +75 86 255 diff --git a/graphics/pokemon/gmax_gengar/back.png b/graphics/pokemon/gmax_gengar/back.png new file mode 100644 index 0000000000..67f5bc6070 Binary files /dev/null and b/graphics/pokemon/gmax_gengar/back.png differ diff --git a/graphics/pokemon/gmax_gengar/front.png b/graphics/pokemon/gmax_gengar/front.png new file mode 100644 index 0000000000..bbcd1756a4 Binary files /dev/null and b/graphics/pokemon/gmax_gengar/front.png differ diff --git a/graphics/pokemon/gmax_gengar/icon.png b/graphics/pokemon/gmax_gengar/icon.png new file mode 100644 index 0000000000..31b59d5370 Binary files /dev/null and b/graphics/pokemon/gmax_gengar/icon.png differ diff --git a/graphics/pokemon/gmax_gengar/normal.pal b/graphics/pokemon/gmax_gengar/normal.pal new file mode 100644 index 0000000000..963348184c --- /dev/null +++ b/graphics/pokemon/gmax_gengar/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +74 41 74 +16 16 16 +90 74 156 +148 115 180 +123 98 164 +150 62 128 +116 58 91 +204 30 91 +146 6 52 +180 139 189 +186 50 90 +255 246 255 +255 131 55 +255 255 0 +189 172 189 diff --git a/graphics/pokemon/gmax_gengar/shiny.pal b/graphics/pokemon/gmax_gengar/shiny.pal new file mode 100644 index 0000000000..b69ff97992 --- /dev/null +++ b/graphics/pokemon/gmax_gengar/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +99 75 99 +16 16 16 +168 157 196 +252 244 252 +209 188 214 +221 144 195 +183 142 184 +204 30 91 +146 6 52 +254 254 254 +84 84 84 +255 246 255 +95 95 95 +140 140 140 +189 172 189 diff --git a/graphics/pokemon/gmax_grimmsnarl/back.png b/graphics/pokemon/gmax_grimmsnarl/back.png new file mode 100644 index 0000000000..834e97f853 Binary files /dev/null and b/graphics/pokemon/gmax_grimmsnarl/back.png differ diff --git a/graphics/pokemon/gmax_grimmsnarl/front.png b/graphics/pokemon/gmax_grimmsnarl/front.png new file mode 100644 index 0000000000..a497605717 Binary files /dev/null and b/graphics/pokemon/gmax_grimmsnarl/front.png differ diff --git a/graphics/pokemon/gmax_grimmsnarl/icon.png b/graphics/pokemon/gmax_grimmsnarl/icon.png new file mode 100644 index 0000000000..23bc5fd0dc Binary files /dev/null and b/graphics/pokemon/gmax_grimmsnarl/icon.png differ diff --git a/graphics/pokemon/gmax_grimmsnarl/normal.pal b/graphics/pokemon/gmax_grimmsnarl/normal.pal new file mode 100644 index 0000000000..806034cb62 --- /dev/null +++ b/graphics/pokemon/gmax_grimmsnarl/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +38 19 63 +67 53 104 +93 70 148 +53 41 84 +53 106 60 +71 190 98 +253 11 66 +64 149 85 +248 116 160 +201 201 201 +253 253 253 +233 55 97 +247 92 144 +15 15 15 diff --git a/graphics/pokemon/gmax_grimmsnarl/shiny.pal b/graphics/pokemon/gmax_grimmsnarl/shiny.pal new file mode 100644 index 0000000000..5d5b1b75a4 --- /dev/null +++ b/graphics/pokemon/gmax_grimmsnarl/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +94 89 96 +163 157 165 +221 215 223 +138 133 140 +107 46 103 +199 52 175 +253 11 66 +152 53 133 +248 116 160 +201 201 201 +253 253 253 +66 86 172 +85 134 201 +15 15 15 diff --git a/graphics/pokemon/gmax_hatterene/back.png b/graphics/pokemon/gmax_hatterene/back.png new file mode 100644 index 0000000000..68da7572c3 Binary files /dev/null and b/graphics/pokemon/gmax_hatterene/back.png differ diff --git a/graphics/pokemon/gmax_hatterene/front.png b/graphics/pokemon/gmax_hatterene/front.png new file mode 100644 index 0000000000..6c9e2c546d Binary files /dev/null and b/graphics/pokemon/gmax_hatterene/front.png differ diff --git a/graphics/pokemon/gmax_hatterene/icon.png b/graphics/pokemon/gmax_hatterene/icon.png new file mode 100644 index 0000000000..cc0ca7f2dc Binary files /dev/null and b/graphics/pokemon/gmax_hatterene/icon.png differ diff --git a/graphics/pokemon/gmax_hatterene/normal.pal b/graphics/pokemon/gmax_hatterene/normal.pal new file mode 100644 index 0000000000..26aac7facb --- /dev/null +++ b/graphics/pokemon/gmax_hatterene/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +114 122 177 +200 233 255 +172 191 223 +148 143 194 +245 186 194 +228 137 160 +229 228 239 +193 89 116 +254 254 254 +180 162 183 +133 109 139 +217 206 219 +249 213 218 +15 15 15 diff --git a/graphics/pokemon/gmax_hatterene/shiny.pal b/graphics/pokemon/gmax_hatterene/shiny.pal new file mode 100644 index 0000000000..9682f1ec43 --- /dev/null +++ b/graphics/pokemon/gmax_hatterene/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +101 75 95 +234 213 208 +192 166 187 +144 116 138 +252 153 172 +217 94 115 +225 193 207 +144 53 68 +254 254 254 +177 134 149 +137 90 110 +217 206 219 +245 186 194 +15 15 15 diff --git a/graphics/pokemon/gmax_inteleon/back.png b/graphics/pokemon/gmax_inteleon/back.png new file mode 100644 index 0000000000..81be3b2c25 Binary files /dev/null and b/graphics/pokemon/gmax_inteleon/back.png differ diff --git a/graphics/pokemon/gmax_inteleon/front.png b/graphics/pokemon/gmax_inteleon/front.png new file mode 100644 index 0000000000..6f55e4e29e Binary files /dev/null and b/graphics/pokemon/gmax_inteleon/front.png differ diff --git a/graphics/pokemon/gmax_inteleon/icon.png b/graphics/pokemon/gmax_inteleon/icon.png new file mode 100644 index 0000000000..a27bf3f1c8 Binary files /dev/null and b/graphics/pokemon/gmax_inteleon/icon.png differ diff --git a/graphics/pokemon/gmax_inteleon/normal.pal b/graphics/pokemon/gmax_inteleon/normal.pal new file mode 100644 index 0000000000..122b980735 --- /dev/null +++ b/graphics/pokemon/gmax_inteleon/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +0 62 106 +156 210 226 +16 16 16 +84 155 195 +176 250 255 +253 253 253 +92 218 218 +1 89 154 +28 123 193 +49 48 47 +233 205 95 +100 101 101 +74 74 77 +242 248 137 +238 62 92 diff --git a/graphics/pokemon/gmax_inteleon/shiny.pal b/graphics/pokemon/gmax_inteleon/shiny.pal new file mode 100644 index 0000000000..f112483770 --- /dev/null +++ b/graphics/pokemon/gmax_inteleon/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +0 68 114 +16 122 192 +16 16 16 +0 96 164 +176 250 255 +253 253 253 +92 218 218 +14 166 168 +6 204 207 +152 157 172 +233 95 146 +247 251 252 +196 204 212 +248 137 182 +238 62 92 diff --git a/graphics/pokemon/gmax_kingler/back.png b/graphics/pokemon/gmax_kingler/back.png new file mode 100644 index 0000000000..d1a624ac47 Binary files /dev/null and b/graphics/pokemon/gmax_kingler/back.png differ diff --git a/graphics/pokemon/gmax_kingler/front.png b/graphics/pokemon/gmax_kingler/front.png new file mode 100644 index 0000000000..075fc470c5 Binary files /dev/null and b/graphics/pokemon/gmax_kingler/front.png differ diff --git a/graphics/pokemon/gmax_kingler/icon.png b/graphics/pokemon/gmax_kingler/icon.png new file mode 100644 index 0000000000..0399c37ab4 Binary files /dev/null and b/graphics/pokemon/gmax_kingler/icon.png differ diff --git a/graphics/pokemon/gmax_kingler/normal.pal b/graphics/pokemon/gmax_kingler/normal.pal new file mode 100644 index 0000000000..e3bbad0227 --- /dev/null +++ b/graphics/pokemon/gmax_kingler/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +115 82 16 +16 16 16 +131 41 8 +255 246 222 +164 106 65 +180 90 74 +222 172 156 +246 197 139 +255 139 82 +253 253 253 +189 189 230 +125 129 147 +163 153 170 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_kingler/shiny.pal b/graphics/pokemon/gmax_kingler/shiny.pal new file mode 100644 index 0000000000..2dcc9678fa --- /dev/null +++ b/graphics/pokemon/gmax_kingler/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +106 98 8 +16 16 16 +74 90 0 +230 246 197 +148 139 57 +106 115 49 +205 213 115 +180 197 115 +139 156 74 +253 253 253 +189 189 230 +125 129 147 +163 153 170 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_lapras/back.png b/graphics/pokemon/gmax_lapras/back.png new file mode 100644 index 0000000000..ee056d3a54 Binary files /dev/null and b/graphics/pokemon/gmax_lapras/back.png differ diff --git a/graphics/pokemon/gmax_lapras/front.png b/graphics/pokemon/gmax_lapras/front.png new file mode 100644 index 0000000000..aff7e7d5f2 Binary files /dev/null and b/graphics/pokemon/gmax_lapras/front.png differ diff --git a/graphics/pokemon/gmax_lapras/icon.png b/graphics/pokemon/gmax_lapras/icon.png new file mode 100644 index 0000000000..367418a17c Binary files /dev/null and b/graphics/pokemon/gmax_lapras/icon.png differ diff --git a/graphics/pokemon/gmax_lapras/normal.pal b/graphics/pokemon/gmax_lapras/normal.pal new file mode 100644 index 0000000000..044e141f67 --- /dev/null +++ b/graphics/pokemon/gmax_lapras/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +115 197 246 +81 255 251 +128 117 115 +16 16 16 +57 123 164 +24 65 82 +65 164 230 +139 164 148 +222 197 131 +246 222 172 +82 82 106 +164 148 148 +213 205 197 +246 238 230 +90 74 65 diff --git a/graphics/pokemon/gmax_lapras/shiny.pal b/graphics/pokemon/gmax_lapras/shiny.pal new file mode 100644 index 0000000000..f0290fa5c1 --- /dev/null +++ b/graphics/pokemon/gmax_lapras/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +205 172 255 +81 255 251 +128 117 115 +16 16 16 +106 49 156 +41 0 98 +172 131 246 +139 90 197 +246 189 148 +255 213 189 +82 82 106 +164 148 148 +213 205 197 +246 238 230 +15 15 15 diff --git a/graphics/pokemon/gmax_machamp/back.png b/graphics/pokemon/gmax_machamp/back.png new file mode 100644 index 0000000000..aea4de046f Binary files /dev/null and b/graphics/pokemon/gmax_machamp/back.png differ diff --git a/graphics/pokemon/gmax_machamp/front.png b/graphics/pokemon/gmax_machamp/front.png new file mode 100644 index 0000000000..feff2a8346 Binary files /dev/null and b/graphics/pokemon/gmax_machamp/front.png differ diff --git a/graphics/pokemon/gmax_machamp/icon.png b/graphics/pokemon/gmax_machamp/icon.png new file mode 100644 index 0000000000..f0150630a6 Binary files /dev/null and b/graphics/pokemon/gmax_machamp/icon.png differ diff --git a/graphics/pokemon/gmax_machamp/normal.pal b/graphics/pokemon/gmax_machamp/normal.pal new file mode 100644 index 0000000000..8ad34672ca --- /dev/null +++ b/graphics/pokemon/gmax_machamp/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +126 84 5 +16 16 16 +227 141 3 +241 187 0 +252 234 0 +125 136 162 +74 74 98 +147 179 198 +43 43 57 +205 197 98 +131 115 41 +246 238 156 +13 13 13 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_machamp/shiny.pal b/graphics/pokemon/gmax_machamp/shiny.pal new file mode 100644 index 0000000000..67e67b00c9 --- /dev/null +++ b/graphics/pokemon/gmax_machamp/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +126 84 5 +16 16 16 +227 141 3 +241 187 0 +252 234 0 +106 139 41 +74 106 16 +148 189 74 +25 45 0 +205 197 98 +131 115 41 +246 238 156 +13 13 13 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_melmetal/back.png b/graphics/pokemon/gmax_melmetal/back.png new file mode 100644 index 0000000000..d1cbe4b98e Binary files /dev/null and b/graphics/pokemon/gmax_melmetal/back.png differ diff --git a/graphics/pokemon/gmax_melmetal/front.png b/graphics/pokemon/gmax_melmetal/front.png new file mode 100644 index 0000000000..a48b1912c8 Binary files /dev/null and b/graphics/pokemon/gmax_melmetal/front.png differ diff --git a/graphics/pokemon/gmax_melmetal/icon.png b/graphics/pokemon/gmax_melmetal/icon.png new file mode 100644 index 0000000000..a84cae6c8f Binary files /dev/null and b/graphics/pokemon/gmax_melmetal/icon.png differ diff --git a/graphics/pokemon/gmax_melmetal/normal.pal b/graphics/pokemon/gmax_melmetal/normal.pal new file mode 100644 index 0000000000..c6309ab24e --- /dev/null +++ b/graphics/pokemon/gmax_melmetal/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +138 141 126 +220 220 218 +177 181 166 +16 16 16 +249 249 249 +103 103 95 +61 53 52 +89 84 78 +232 232 232 +194 41 46 +134 66 36 +177 97 44 +224 135 37 +255 191 79 +228 109 139 diff --git a/graphics/pokemon/gmax_melmetal/shiny.pal b/graphics/pokemon/gmax_melmetal/shiny.pal new file mode 100644 index 0000000000..40cd79108f --- /dev/null +++ b/graphics/pokemon/gmax_melmetal/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +138 141 126 +220 220 218 +177 181 166 +16 16 16 +249 249 249 +103 103 95 +61 53 52 +89 84 78 +232 232 232 +0 93 220 +134 66 36 +177 79 45 +222 108 40 +254 166 80 +228 109 139 diff --git a/graphics/pokemon/gmax_meowth/back.png b/graphics/pokemon/gmax_meowth/back.png new file mode 100644 index 0000000000..16298c644a Binary files /dev/null and b/graphics/pokemon/gmax_meowth/back.png differ diff --git a/graphics/pokemon/gmax_meowth/front.png b/graphics/pokemon/gmax_meowth/front.png new file mode 100644 index 0000000000..3f7cf49d21 Binary files /dev/null and b/graphics/pokemon/gmax_meowth/front.png differ diff --git a/graphics/pokemon/gmax_meowth/icon.png b/graphics/pokemon/gmax_meowth/icon.png new file mode 100644 index 0000000000..039f90a4ad Binary files /dev/null and b/graphics/pokemon/gmax_meowth/icon.png differ diff --git a/graphics/pokemon/gmax_meowth/normal.pal b/graphics/pokemon/gmax_meowth/normal.pal new file mode 100644 index 0000000000..f8c1e79f7a --- /dev/null +++ b/graphics/pokemon/gmax_meowth/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +156 106 0 +255 230 131 +16 16 16 +222 189 57 +255 255 180 +255 115 82 +148 90 0 +213 90 57 +205 164 0 +252 252 252 +255 213 0 +244 255 43 +148 65 0 +197 123 8 +238 156 49 diff --git a/graphics/pokemon/gmax_meowth/shiny.pal b/graphics/pokemon/gmax_meowth/shiny.pal new file mode 100644 index 0000000000..00cf140549 --- /dev/null +++ b/graphics/pokemon/gmax_meowth/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +156 65 0 +255 205 131 +16 16 16 +222 156 57 +255 238 180 +213 82 106 +172 41 57 +148 65 0 +205 164 0 +252 252 252 +255 213 0 +244 255 43 +172 41 57 +213 82 106 +246 123 139 diff --git a/graphics/pokemon/gmax_orbeetle/back.png b/graphics/pokemon/gmax_orbeetle/back.png new file mode 100644 index 0000000000..e984f9cef9 Binary files /dev/null and b/graphics/pokemon/gmax_orbeetle/back.png differ diff --git a/graphics/pokemon/gmax_orbeetle/front.png b/graphics/pokemon/gmax_orbeetle/front.png new file mode 100644 index 0000000000..f59aff21ab Binary files /dev/null and b/graphics/pokemon/gmax_orbeetle/front.png differ diff --git a/graphics/pokemon/gmax_orbeetle/icon.png b/graphics/pokemon/gmax_orbeetle/icon.png new file mode 100644 index 0000000000..4e486f2637 Binary files /dev/null and b/graphics/pokemon/gmax_orbeetle/icon.png differ diff --git a/graphics/pokemon/gmax_orbeetle/normal.pal b/graphics/pokemon/gmax_orbeetle/normal.pal new file mode 100644 index 0000000000..af34ce0fac --- /dev/null +++ b/graphics/pokemon/gmax_orbeetle/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +120 23 40 +189 20 43 +253 38 54 +164 86 0 +191 167 49 +16 189 220 +62 32 45 +78 58 61 +207 255 255 +87 251 231 +246 230 115 +172 156 173 +249 255 255 +214 213 211 diff --git a/graphics/pokemon/gmax_orbeetle/shiny.pal b/graphics/pokemon/gmax_orbeetle/shiny.pal new file mode 100644 index 0000000000..349aac2b6a --- /dev/null +++ b/graphics/pokemon/gmax_orbeetle/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +50 41 102 +101 78 199 +146 115 230 +133 49 73 +199 83 105 +16 189 220 +62 32 45 +78 58 61 +207 255 255 +87 251 231 +234 134 149 +47 62 166 +249 255 255 +85 104 240 diff --git a/graphics/pokemon/gmax_pikachu/back.png b/graphics/pokemon/gmax_pikachu/back.png new file mode 100644 index 0000000000..fefeab9c22 Binary files /dev/null and b/graphics/pokemon/gmax_pikachu/back.png differ diff --git a/graphics/pokemon/gmax_pikachu/front.png b/graphics/pokemon/gmax_pikachu/front.png new file mode 100644 index 0000000000..75f0c2beda Binary files /dev/null and b/graphics/pokemon/gmax_pikachu/front.png differ diff --git a/graphics/pokemon/gmax_pikachu/icon.png b/graphics/pokemon/gmax_pikachu/icon.png new file mode 100644 index 0000000000..440004b8e9 Binary files /dev/null and b/graphics/pokemon/gmax_pikachu/icon.png differ diff --git a/graphics/pokemon/gmax_pikachu/normal.pal b/graphics/pokemon/gmax_pikachu/normal.pal new file mode 100644 index 0000000000..1bfa354f78 --- /dev/null +++ b/graphics/pokemon/gmax_pikachu/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +248 252 75 +255 246 164 +254 254 254 +16 16 16 +41 41 41 +65 65 74 +246 189 32 +98 49 8 +156 82 0 +246 230 82 +230 90 65 +197 32 24 +222 148 0 +115 115 131 +15 15 15 diff --git a/graphics/pokemon/gmax_pikachu/shiny.pal b/graphics/pokemon/gmax_pikachu/shiny.pal new file mode 100644 index 0000000000..377e03cd67 --- /dev/null +++ b/graphics/pokemon/gmax_pikachu/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +248 252 75 +255 230 131 +254 254 254 +16 16 16 +41 41 41 +65 65 74 +255 164 0 +115 16 0 +180 49 0 +255 197 49 +230 98 65 +197 41 24 +230 131 0 +115 115 131 +15 15 15 diff --git a/graphics/pokemon/gmax_rillaboom/back.png b/graphics/pokemon/gmax_rillaboom/back.png new file mode 100644 index 0000000000..d15e4e4c3a Binary files /dev/null and b/graphics/pokemon/gmax_rillaboom/back.png differ diff --git a/graphics/pokemon/gmax_rillaboom/front.png b/graphics/pokemon/gmax_rillaboom/front.png new file mode 100644 index 0000000000..922860400d Binary files /dev/null and b/graphics/pokemon/gmax_rillaboom/front.png differ diff --git a/graphics/pokemon/gmax_rillaboom/icon.png b/graphics/pokemon/gmax_rillaboom/icon.png new file mode 100644 index 0000000000..d149814fff Binary files /dev/null and b/graphics/pokemon/gmax_rillaboom/icon.png differ diff --git a/graphics/pokemon/gmax_rillaboom/normal.pal b/graphics/pokemon/gmax_rillaboom/normal.pal new file mode 100644 index 0000000000..6f782183ae --- /dev/null +++ b/graphics/pokemon/gmax_rillaboom/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +104 68 64 +1 47 25 +16 16 16 +182 127 76 +0 132 69 +0 89 47 +147 108 66 +50 29 35 +246 226 161 +181 154 125 +66 43 47 +133 117 80 +252 252 252 +250 113 61 +180 66 56 diff --git a/graphics/pokemon/gmax_rillaboom/shiny.pal b/graphics/pokemon/gmax_rillaboom/shiny.pal new file mode 100644 index 0000000000..bec70743b2 --- /dev/null +++ b/graphics/pokemon/gmax_rillaboom/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +95 43 53 +54 68 6 +16 16 16 +182 127 76 +140 180 0 +89 117 4 +147 108 66 +46 19 34 +246 226 161 +158 144 129 +60 30 43 +101 94 77 +252 252 252 +250 113 61 +180 66 56 diff --git a/graphics/pokemon/gmax_sandaconda/back.png b/graphics/pokemon/gmax_sandaconda/back.png new file mode 100644 index 0000000000..d1cf5184bc Binary files /dev/null and b/graphics/pokemon/gmax_sandaconda/back.png differ diff --git a/graphics/pokemon/gmax_sandaconda/front.png b/graphics/pokemon/gmax_sandaconda/front.png new file mode 100644 index 0000000000..33e3451fa5 Binary files /dev/null and b/graphics/pokemon/gmax_sandaconda/front.png differ diff --git a/graphics/pokemon/gmax_sandaconda/icon.png b/graphics/pokemon/gmax_sandaconda/icon.png new file mode 100644 index 0000000000..4b19d9570a Binary files /dev/null and b/graphics/pokemon/gmax_sandaconda/icon.png differ diff --git a/graphics/pokemon/gmax_sandaconda/normal.pal b/graphics/pokemon/gmax_sandaconda/normal.pal new file mode 100644 index 0000000000..f06c695866 --- /dev/null +++ b/graphics/pokemon/gmax_sandaconda/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +167 114 78 +105 97 69 +16 16 16 +245 243 211 +180 163 109 +189 154 106 +217 202 179 +79 59 35 +126 85 67 +175 120 86 +187 32 15 +233 63 109 +13 13 13 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_sandaconda/shiny.pal b/graphics/pokemon/gmax_sandaconda/shiny.pal new file mode 100644 index 0000000000..3c847bf83e --- /dev/null +++ b/graphics/pokemon/gmax_sandaconda/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +167 114 78 +94 98 76 +16 16 16 +231 238 218 +159 165 124 +189 154 106 +217 202 179 +59 59 55 +110 87 83 +150 119 111 +187 32 15 +233 63 109 +13 13 13 +14 14 14 +15 15 15 diff --git a/graphics/pokemon/gmax_snorlax/back.png b/graphics/pokemon/gmax_snorlax/back.png new file mode 100644 index 0000000000..c90fff95cc Binary files /dev/null and b/graphics/pokemon/gmax_snorlax/back.png differ diff --git a/graphics/pokemon/gmax_snorlax/front.png b/graphics/pokemon/gmax_snorlax/front.png new file mode 100644 index 0000000000..ef39f86990 Binary files /dev/null and b/graphics/pokemon/gmax_snorlax/front.png differ diff --git a/graphics/pokemon/gmax_snorlax/icon.png b/graphics/pokemon/gmax_snorlax/icon.png new file mode 100644 index 0000000000..e804e91963 Binary files /dev/null and b/graphics/pokemon/gmax_snorlax/icon.png differ diff --git a/graphics/pokemon/gmax_snorlax/normal.pal b/graphics/pokemon/gmax_snorlax/normal.pal new file mode 100644 index 0000000000..4441577deb --- /dev/null +++ b/graphics/pokemon/gmax_snorlax/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +246 230 189 +160 160 160 +230 197 172 +16 57 65 +84 121 43 +98 65 32 +164 115 82 +222 86 86 +252 139 159 +187 227 91 +137 180 50 +49 87 63 +49 90 123 +6 159 95 diff --git a/graphics/pokemon/gmax_snorlax/shiny.pal b/graphics/pokemon/gmax_snorlax/shiny.pal new file mode 100644 index 0000000000..d29a9cda8b --- /dev/null +++ b/graphics/pokemon/gmax_snorlax/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +16 16 16 +247 230 173 +160 160 160 +230 206 156 +8 49 123 +51 92 40 +99 74 25 +165 123 74 +215 69 47 +251 82 90 +187 227 91 +81 136 50 +141 93 10 +33 74 165 +221 146 16 diff --git a/graphics/pokemon/gmax_toxtricity/back.png b/graphics/pokemon/gmax_toxtricity/back.png new file mode 100644 index 0000000000..3e83fa04f3 Binary files /dev/null and b/graphics/pokemon/gmax_toxtricity/back.png differ diff --git a/graphics/pokemon/gmax_toxtricity/front.png b/graphics/pokemon/gmax_toxtricity/front.png new file mode 100644 index 0000000000..7fac75a683 Binary files /dev/null and b/graphics/pokemon/gmax_toxtricity/front.png differ diff --git a/graphics/pokemon/gmax_toxtricity/icon.png b/graphics/pokemon/gmax_toxtricity/icon.png new file mode 100644 index 0000000000..3e7e680f7c Binary files /dev/null and b/graphics/pokemon/gmax_toxtricity/icon.png differ diff --git a/graphics/pokemon/gmax_toxtricity/normal.pal b/graphics/pokemon/gmax_toxtricity/normal.pal new file mode 100644 index 0000000000..eceb597ad4 --- /dev/null +++ b/graphics/pokemon/gmax_toxtricity/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +75 45 94 +16 16 16 +141 79 174 +224 97 180 +215 143 0 +115 155 217 +240 200 16 +248 230 150 +106 66 119 +150 222 243 +202 74 170 +254 180 228 +240 142 197 +231 114 199 +124 70 31 diff --git a/graphics/pokemon/gmax_toxtricity/shiny.pal b/graphics/pokemon/gmax_toxtricity/shiny.pal new file mode 100644 index 0000000000..372ab9a7b2 --- /dev/null +++ b/graphics/pokemon/gmax_toxtricity/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +94 45 64 +16 16 16 +174 79 111 +224 97 180 +215 143 0 +115 155 217 +240 200 16 +248 230 150 +119 66 77 +150 222 243 +183 73 202 +238 180 254 +240 142 197 +218 114 231 +124 70 31 diff --git a/graphics/pokemon/gmax_urshifu/back.png b/graphics/pokemon/gmax_urshifu/back.png new file mode 100644 index 0000000000..74b71795bb Binary files /dev/null and b/graphics/pokemon/gmax_urshifu/back.png differ diff --git a/graphics/pokemon/gmax_urshifu/front.png b/graphics/pokemon/gmax_urshifu/front.png new file mode 100644 index 0000000000..9f144d32be Binary files /dev/null and b/graphics/pokemon/gmax_urshifu/front.png differ diff --git a/graphics/pokemon/gmax_urshifu/icon.png b/graphics/pokemon/gmax_urshifu/icon.png new file mode 100644 index 0000000000..bfeab0ee3b Binary files /dev/null and b/graphics/pokemon/gmax_urshifu/icon.png differ diff --git a/graphics/pokemon/gmax_urshifu/normal.pal b/graphics/pokemon/gmax_urshifu/normal.pal new file mode 100644 index 0000000000..4cba02f8cd --- /dev/null +++ b/graphics/pokemon/gmax_urshifu/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +40 45 38 +16 16 16 +66 71 58 +107 101 116 +181 181 181 +96 95 77 +87 15 15 +146 39 24 +231 20 10 +145 145 145 +158 98 37 +245 245 245 +255 250 96 +213 169 38 +254 125 112 diff --git a/graphics/pokemon/gmax_urshifu/shiny.pal b/graphics/pokemon/gmax_urshifu/shiny.pal new file mode 100644 index 0000000000..13f43d8b23 --- /dev/null +++ b/graphics/pokemon/gmax_urshifu/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +40 45 38 +16 16 16 +66 71 58 +107 101 116 +181 181 181 +96 95 77 +87 15 15 +146 39 24 +231 20 10 +145 145 145 +139 34 47 +245 245 245 +255 151 54 +185 88 38 +254 125 112 diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/back.png b/graphics/pokemon/gmax_urshifu_rapid_strike/back.png new file mode 100644 index 0000000000..3369e6c170 Binary files /dev/null and b/graphics/pokemon/gmax_urshifu_rapid_strike/back.png differ diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/front.png b/graphics/pokemon/gmax_urshifu_rapid_strike/front.png new file mode 100644 index 0000000000..a00a644f08 Binary files /dev/null and b/graphics/pokemon/gmax_urshifu_rapid_strike/front.png differ diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/icon.png b/graphics/pokemon/gmax_urshifu_rapid_strike/icon.png new file mode 100644 index 0000000000..04be58cc42 Binary files /dev/null and b/graphics/pokemon/gmax_urshifu_rapid_strike/icon.png differ diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/normal.pal b/graphics/pokemon/gmax_urshifu_rapid_strike/normal.pal new file mode 100644 index 0000000000..de95b4d5b4 --- /dev/null +++ b/graphics/pokemon/gmax_urshifu_rapid_strike/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +107 101 116 +16 16 16 +181 181 181 +43 51 125 +145 145 145 +245 245 245 +16 13 79 +48 63 241 +40 45 38 +158 98 37 +255 250 96 +213 169 38 +134 160 253 +96 95 77 +15 15 15 diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/shiny.pal b/graphics/pokemon/gmax_urshifu_rapid_strike/shiny.pal new file mode 100644 index 0000000000..739e8a8aeb --- /dev/null +++ b/graphics/pokemon/gmax_urshifu_rapid_strike/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +153 211 165 +107 101 116 +16 16 16 +181 181 181 +43 51 125 +145 145 145 +245 245 245 +16 13 79 +48 63 241 +40 45 38 +139 34 47 +255 151 54 +185 88 38 +134 160 253 +96 95 77 +15 15 15 diff --git a/graphics/pokemon/gmax_venusaur/back.png b/graphics/pokemon/gmax_venusaur/back.png new file mode 100644 index 0000000000..be482895b8 Binary files /dev/null and b/graphics/pokemon/gmax_venusaur/back.png differ diff --git a/graphics/pokemon/gmax_venusaur/front.png b/graphics/pokemon/gmax_venusaur/front.png new file mode 100644 index 0000000000..b7dde75ba8 Binary files /dev/null and b/graphics/pokemon/gmax_venusaur/front.png differ diff --git a/graphics/pokemon/gmax_venusaur/icon.png b/graphics/pokemon/gmax_venusaur/icon.png new file mode 100644 index 0000000000..523e647999 Binary files /dev/null and b/graphics/pokemon/gmax_venusaur/icon.png differ diff --git a/graphics/pokemon/gmax_venusaur/normal.pal b/graphics/pokemon/gmax_venusaur/normal.pal new file mode 100644 index 0000000000..74ffe32fbd --- /dev/null +++ b/graphics/pokemon/gmax_venusaur/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 128 +131 49 0 +16 16 16 +16 82 65 +223 91 95 +0 141 125 +0 107 93 +252 252 252 +32 180 156 +16 123 106 +246 148 153 +90 213 197 +255 201 201 +131 222 123 +255 238 82 +199 155 38 diff --git a/graphics/pokemon/gmax_venusaur/shiny.pal b/graphics/pokemon/gmax_venusaur/shiny.pal new file mode 100644 index 0000000000..cd6c71bec7 --- /dev/null +++ b/graphics/pokemon/gmax_venusaur/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +128 0 128 +131 49 0 +16 16 16 +57 90 32 +229 171 27 +0 141 125 +0 107 93 +252 252 252 +164 213 74 +123 156 41 +255 228 17 +205 238 82 +255 255 222 +131 222 123 +255 238 82 +199 155 38 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 5167f5f55f..919691b984 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -306,7 +306,7 @@ #define EVO_DARK_SCROLL 37 // interacts with Scroll of Darkness #define EVO_WATER_SCROLL 38 // interacts with Scroll of Waters -#define EVOS_PER_MON 10 +#define EVOS_PER_MON 11 // Evolution 'modes,' for GetEvolutionTargetSpecies #define EVO_MODE_NORMAL 0 @@ -324,6 +324,7 @@ #define FORM_WITHDRAW 4 #define FORM_BATTLE_BEGIN 5 #define FORM_BATTLE_END 6 +#define FORM_GIGANTAMAX 7 #define MON_PIC_WIDTH 64 #define MON_PIC_HEIGHT 64 diff --git a/include/constants/species.h b/include/constants/species.h index 18e3138ce6..f3709b7e73 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1370,8 +1370,43 @@ #define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327 #define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328 +// Gigantamax Forms +#define SPECIES_VENUSAUR_GMAX FORMS_START + 329 +#define SPECIES_BLASTOISE_GMAX FORMS_START + 330 +#define SPECIES_CHARIZARD_GMAX FORMS_START + 331 +#define SPECIES_BUTTERFREE_GMAX FORMS_START + 332 +#define SPECIES_PIKACHU_GMAX FORMS_START + 333 +#define SPECIES_MEOWTH_GMAX FORMS_START + 334 +#define SPECIES_MACHAMP_GMAX FORMS_START + 335 +#define SPECIES_GENGAR_GMAX FORMS_START + 336 +#define SPECIES_KINGLER_GMAX FORMS_START + 337 +#define SPECIES_LAPRAS_GMAX FORMS_START + 338 +#define SPECIES_EEVEE_GMAX FORMS_START + 339 +#define SPECIES_SNORLAX_GMAX FORMS_START + 340 +#define SPECIES_GARBODOR_GMAX FORMS_START + 341 +#define SPECIES_MELMETAL_GMAX FORMS_START + 342 +#define SPECIES_RILLABOOM_GMAX FORMS_START + 343 +#define SPECIES_CINDERACE_GMAX FORMS_START + 344 +#define SPECIES_INTELEON_GMAX FORMS_START + 345 +#define SPECIES_CORVIKNIGHT_GMAX FORMS_START + 346 +#define SPECIES_ORBEETLE_GMAX FORMS_START + 347 +#define SPECIES_DREDNAW_GMAX FORMS_START + 348 +#define SPECIES_COALOSSAL_GMAX FORMS_START + 349 +#define SPECIES_FLAPPLE_GMAX FORMS_START + 350 +#define SPECIES_APPLETUN_GMAX FORMS_START + 351 +#define SPECIES_SANDACONDA_GMAX FORMS_START + 352 +#define SPECIES_TOXTRICITY_GMAX FORMS_START + 353 +#define SPECIES_CENTISKORCH_GMAX FORMS_START + 354 +#define SPECIES_HATTERENE_GMAX FORMS_START + 355 +#define SPECIES_GRIMMSNARL_GMAX FORMS_START + 356 +#define SPECIES_ALCREMIE_GMAX FORMS_START + 357 +#define SPECIES_COPPERAJAH_GMAX FORMS_START + 358 +#define SPECIES_DURALUDON_GMAX FORMS_START + 359 +#define SPECIES_URSHIFU_GMAX FORMS_START + 360 +#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX FORMS_START + 361 + #define FORMS_START SPECIES_ENAMORUS -#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1 +#define SPECIES_EGG SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX + 1 #define NUM_SPECIES SPECIES_EGG diff --git a/include/graphics.h b/include/graphics.h index 512038b5f7..fbf03107da 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2493,6 +2493,39 @@ extern const u32 gMonBackPic_ZarudeDada[]; extern const u32 gMonBackPic_CalyrexIceRider[]; extern const u32 gMonBackPic_CalyrexShadowRider[]; //extern const u32 gMonBackPic_EnamorusTherian[]; +extern const u32 gMonBackPic_VenusaurGmax[]; +extern const u32 gMonBackPic_CharizardGmax[]; +extern const u32 gMonBackPic_BlastoiseGmax[]; +extern const u32 gMonBackPic_ButterfreeGmax[]; +extern const u32 gMonBackPic_PikachuGmax[]; +extern const u32 gMonBackPic_MeowthGmax[]; +extern const u32 gMonBackPic_MachampGmax[]; +extern const u32 gMonBackPic_GengarGmax[]; +extern const u32 gMonBackPic_KinglerGmax[]; +extern const u32 gMonBackPic_LaprasGmax[]; +extern const u32 gMonBackPic_EeveeGmax[]; +extern const u32 gMonBackPic_SnorlaxGmax[]; +extern const u32 gMonBackPic_GarbodorGmax[]; +extern const u32 gMonBackPic_MelmetalGmax[]; +extern const u32 gMonBackPic_RillaboomGmax[]; +extern const u32 gMonBackPic_CinderaceGmax[]; +extern const u32 gMonBackPic_InteleonGmax[]; +extern const u32 gMonBackPic_CorviknightGmax[]; +extern const u32 gMonBackPic_OrbeetleGmax[]; +extern const u32 gMonBackPic_DrednawGmax[]; +extern const u32 gMonBackPic_CoalossalGmax[]; +extern const u32 gMonBackPic_FlappleGmax[]; +extern const u32 gMonBackPic_AppletunGmax[]; +extern const u32 gMonBackPic_SandacondaGmax[]; +extern const u32 gMonBackPic_ToxtricityGmax[]; +extern const u32 gMonBackPic_CentiskorchGmax[]; +extern const u32 gMonBackPic_HattereneGmax[]; +extern const u32 gMonBackPic_GrimmsnarlGmax[]; +extern const u32 gMonBackPic_AlcremieGmax[]; +extern const u32 gMonBackPic_CopperajahGmax[]; +extern const u32 gMonBackPic_DuraludonGmax[]; +extern const u32 gMonBackPic_UrshifuGmax[]; +extern const u32 gMonBackPic_UrshifuRapidStrikeGmax[]; #endif extern const u32 gMonPalette_CircledQuestionMark[]; @@ -3725,6 +3758,39 @@ extern const u32 gMonPalette_ZarudeDada[]; extern const u32 gMonPalette_CalyrexIceRider[]; extern const u32 gMonPalette_CalyrexShadowRider[]; //extern const u32 gMonPalette_EnamorusTherian[]; +extern const u32 gMonPalette_VenusaurGmax[]; +extern const u32 gMonPalette_CharizardGmax[]; +extern const u32 gMonPalette_BlastoiseGmax[]; +extern const u32 gMonPalette_ButterfreeGmax[]; +extern const u32 gMonPalette_PikachuGmax[]; +extern const u32 gMonPalette_MeowthGmax[]; +extern const u32 gMonPalette_MachampGmax[]; +extern const u32 gMonPalette_GengarGmax[]; +extern const u32 gMonPalette_KinglerGmax[]; +extern const u32 gMonPalette_LaprasGmax[]; +extern const u32 gMonPalette_EeveeGmax[]; +extern const u32 gMonPalette_SnorlaxGmax[]; +extern const u32 gMonPalette_GarbodorGmax[]; +extern const u32 gMonPalette_MelmetalGmax[]; +extern const u32 gMonPalette_RillaboomGmax[]; +extern const u32 gMonPalette_CinderaceGmax[]; +extern const u32 gMonPalette_InteleonGmax[]; +extern const u32 gMonPalette_CorviknightGmax[]; +extern const u32 gMonPalette_OrbeetleGmax[]; +extern const u32 gMonPalette_DrednawGmax[]; +extern const u32 gMonPalette_CoalossalGmax[]; +extern const u32 gMonPalette_FlappleGmax[]; +extern const u32 gMonPalette_AppletunGmax[]; +extern const u32 gMonPalette_SandacondaGmax[]; +extern const u32 gMonPalette_ToxtricityGmax[]; +extern const u32 gMonPalette_CentiskorchGmax[]; +extern const u32 gMonPalette_HattereneGmax[]; +extern const u32 gMonPalette_GrimmsnarlGmax[]; +extern const u32 gMonPalette_AlcremieGmax[]; +extern const u32 gMonPalette_CopperajahGmax[]; +extern const u32 gMonPalette_DuraludonGmax[]; +extern const u32 gMonPalette_UrshifuGmax[]; +extern const u32 gMonPalette_UrshifuRapidStrikeGmax[]; #endif extern const u32 gMonPalette_Egg[]; @@ -4953,6 +5019,39 @@ extern const u32 gMonShinyPalette_ZarudeDada[]; extern const u32 gMonShinyPalette_CalyrexIceRider[]; extern const u32 gMonShinyPalette_CalyrexShadowRider[]; //extern const u32 gMonShinyPalette_EnamorusTherian[]; +extern const u32 gMonShinyPalette_VenusaurGmax[]; +extern const u32 gMonShinyPalette_CharizardGmax[]; +extern const u32 gMonShinyPalette_BlastoiseGmax[]; +extern const u32 gMonShinyPalette_ButterfreeGmax[]; +extern const u32 gMonShinyPalette_PikachuGmax[]; +extern const u32 gMonShinyPalette_MeowthGmax[]; +extern const u32 gMonShinyPalette_MachampGmax[]; +extern const u32 gMonShinyPalette_GengarGmax[]; +extern const u32 gMonShinyPalette_KinglerGmax[]; +extern const u32 gMonShinyPalette_LaprasGmax[]; +extern const u32 gMonShinyPalette_EeveeGmax[]; +extern const u32 gMonShinyPalette_SnorlaxGmax[]; +extern const u32 gMonShinyPalette_GarbodorGmax[]; +extern const u32 gMonShinyPalette_MelmetalGmax[]; +extern const u32 gMonShinyPalette_RillaboomGmax[]; +extern const u32 gMonShinyPalette_CinderaceGmax[]; +extern const u32 gMonShinyPalette_InteleonGmax[]; +extern const u32 gMonShinyPalette_CorviknightGmax[]; +extern const u32 gMonShinyPalette_OrbeetleGmax[]; +extern const u32 gMonShinyPalette_DrednawGmax[]; +extern const u32 gMonShinyPalette_CoalossalGmax[]; +extern const u32 gMonShinyPalette_FlappleGmax[]; +extern const u32 gMonShinyPalette_AppletunGmax[]; +extern const u32 gMonShinyPalette_SandacondaGmax[]; +extern const u32 gMonShinyPalette_ToxtricityGmax[]; +extern const u32 gMonShinyPalette_CentiskorchGmax[]; +extern const u32 gMonShinyPalette_HattereneGmax[]; +extern const u32 gMonShinyPalette_GrimmsnarlGmax[]; +extern const u32 gMonShinyPalette_AlcremieGmax[]; +extern const u32 gMonShinyPalette_CopperajahGmax[]; +extern const u32 gMonShinyPalette_DuraludonGmax[]; +extern const u32 gMonShinyPalette_UrshifuGmax[]; +extern const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[]; #endif extern const u8 gMonIcon_QuestionMark[]; @@ -6169,6 +6268,39 @@ extern const u8 gMonIcon_ZarudeDada[]; extern const u8 gMonIcon_CalyrexIceRider[]; extern const u8 gMonIcon_CalyrexShadowRider[]; extern const u8 gMonIcon_EnamorusTherian[]; +extern const u8 gMonIcon_VenusaurGmax[]; +extern const u8 gMonIcon_CharizardGmax[]; +extern const u8 gMonIcon_BlastoiseGmax[]; +extern const u8 gMonIcon_ButterfreeGmax[]; +extern const u8 gMonIcon_PikachuGmax[]; +extern const u8 gMonIcon_MeowthGmax[]; +extern const u8 gMonIcon_MachampGmax[]; +extern const u8 gMonIcon_GengarGmax[]; +extern const u8 gMonIcon_KinglerGmax[]; +extern const u8 gMonIcon_LaprasGmax[]; +extern const u8 gMonIcon_EeveeGmax[]; +extern const u8 gMonIcon_SnorlaxGmax[]; +extern const u8 gMonIcon_GarbodorGmax[]; +extern const u8 gMonIcon_MelmetalGmax[]; +extern const u8 gMonIcon_RillaboomGmax[]; +extern const u8 gMonIcon_CinderaceGmax[]; +extern const u8 gMonIcon_InteleonGmax[]; +extern const u8 gMonIcon_CorviknightGmax[]; +extern const u8 gMonIcon_OrbeetleGmax[]; +extern const u8 gMonIcon_DrednawGmax[]; +extern const u8 gMonIcon_CoalossalGmax[]; +extern const u8 gMonIcon_FlappleGmax[]; +extern const u8 gMonIcon_AppletunGmax[]; +extern const u8 gMonIcon_SandacondaGmax[]; +extern const u8 gMonIcon_ToxtricityGmax[]; +extern const u8 gMonIcon_CentiskorchGmax[]; +extern const u8 gMonIcon_HattereneGmax[]; +extern const u8 gMonIcon_GrimmsnarlGmax[]; +extern const u8 gMonIcon_AlcremieGmax[]; +extern const u8 gMonIcon_CopperajahGmax[]; +extern const u8 gMonIcon_DuraludonGmax[]; +extern const u8 gMonIcon_UrshifuGmax[]; +extern const u8 gMonIcon_UrshifuRapidStrikeGmax[]; #endif extern const u8 gMonIcon_Egg[]; @@ -7087,6 +7219,39 @@ extern const u8 gMonFootprint_Calyrex[]; //extern const u8 gMonFootprint_Sneasler[]; //extern const u8 gMonFootprint_Overqwil[]; //extern const u8 gMonFootprint_Enamorus[]; +extern const u32 gMonFrontPic_VenusaurGmax[]; +extern const u32 gMonFrontPic_CharizardGmax[]; +extern const u32 gMonFrontPic_BlastoiseGmax[]; +extern const u32 gMonFrontPic_ButterfreeGmax[]; +extern const u32 gMonFrontPic_PikachuGmax[]; +extern const u32 gMonFrontPic_MeowthGmax[]; +extern const u32 gMonFrontPic_MachampGmax[]; +extern const u32 gMonFrontPic_GengarGmax[]; +extern const u32 gMonFrontPic_KinglerGmax[]; +extern const u32 gMonFrontPic_LaprasGmax[]; +extern const u32 gMonFrontPic_EeveeGmax[]; +extern const u32 gMonFrontPic_SnorlaxGmax[]; +extern const u32 gMonFrontPic_GarbodorGmax[]; +extern const u32 gMonFrontPic_MelmetalGmax[]; +extern const u32 gMonFrontPic_RillaboomGmax[]; +extern const u32 gMonFrontPic_CinderaceGmax[]; +extern const u32 gMonFrontPic_InteleonGmax[]; +extern const u32 gMonFrontPic_CorviknightGmax[]; +extern const u32 gMonFrontPic_OrbeetleGmax[]; +extern const u32 gMonFrontPic_DrednawGmax[]; +extern const u32 gMonFrontPic_CoalossalGmax[]; +extern const u32 gMonFrontPic_FlappleGmax[]; +extern const u32 gMonFrontPic_AppletunGmax[]; +extern const u32 gMonFrontPic_SandacondaGmax[]; +extern const u32 gMonFrontPic_ToxtricityGmax[]; +extern const u32 gMonFrontPic_CentiskorchGmax[]; +extern const u32 gMonFrontPic_HattereneGmax[]; +extern const u32 gMonFrontPic_GrimmsnarlGmax[]; +extern const u32 gMonFrontPic_AlcremieGmax[]; +extern const u32 gMonFrontPic_CopperajahGmax[]; +extern const u32 gMonFrontPic_DuraludonGmax[]; +extern const u32 gMonFrontPic_UrshifuGmax[]; +extern const u32 gMonFrontPic_UrshifuRapidStrikeGmax[]; #endif // trainer sprites diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index ec7f079f75..91401d0910 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1210,6 +1210,39 @@ const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/f const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz"); //const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); +const u32 gMonFrontPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/front.4bpp.lz"); +const u32 gMonFrontPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/front.4bpp.lz"); +const u32 gMonFrontPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/front.4bpp.lz"); +const u32 gMonFrontPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/front.4bpp.lz"); +const u32 gMonFrontPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/front.4bpp.lz"); +const u32 gMonFrontPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/front.4bpp.lz"); +const u32 gMonFrontPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/front.4bpp.lz"); +const u32 gMonFrontPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/front.4bpp.lz"); +const u32 gMonFrontPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/front.4bpp.lz"); +const u32 gMonFrontPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/front.4bpp.lz"); +const u32 gMonFrontPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/front.4bpp.lz"); +const u32 gMonFrontPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/front.4bpp.lz"); +const u32 gMonFrontPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/front.4bpp.lz"); +const u32 gMonFrontPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/front.4bpp.lz"); +const u32 gMonFrontPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/front.4bpp.lz"); +const u32 gMonFrontPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/front.4bpp.lz"); +const u32 gMonFrontPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/front.4bpp.lz"); +const u32 gMonFrontPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/front.4bpp.lz"); +const u32 gMonFrontPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/front.4bpp.lz"); +const u32 gMonFrontPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/front.4bpp.lz"); +const u32 gMonFrontPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/front.4bpp.lz"); +const u32 gMonFrontPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/front.4bpp.lz"); +const u32 gMonFrontPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/front.4bpp.lz"); +const u32 gMonFrontPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/front.4bpp.lz"); +const u32 gMonFrontPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/front.4bpp.lz"); +const u32 gMonFrontPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/front.4bpp.lz"); +const u32 gMonFrontPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/front.4bpp.lz"); +const u32 gMonFrontPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/front.4bpp.lz"); +const u32 gMonFrontPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/front.4bpp.lz"); +const u32 gMonFrontPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/front.4bpp.lz"); +const u32 gMonFrontPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/front.4bpp.lz"); +const u32 gMonFrontPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/front.4bpp.lz"); +const u32 gMonFrontPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/front.4bpp.lz"); #endif const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); @@ -2424,6 +2457,39 @@ const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/ba const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz"); const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz"); //const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); +const u32 gMonBackPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/back.4bpp.lz"); +const u32 gMonBackPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/back.4bpp.lz"); +const u32 gMonBackPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/back.4bpp.lz"); +const u32 gMonBackPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/back.4bpp.lz"); +const u32 gMonBackPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/back.4bpp.lz"); +const u32 gMonBackPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/back.4bpp.lz"); +const u32 gMonBackPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/back.4bpp.lz"); +const u32 gMonBackPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/back.4bpp.lz"); +const u32 gMonBackPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/back.4bpp.lz"); +const u32 gMonBackPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/back.4bpp.lz"); +const u32 gMonBackPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/back.4bpp.lz"); +const u32 gMonBackPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/back.4bpp.lz"); +const u32 gMonBackPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/back.4bpp.lz"); +const u32 gMonBackPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/back.4bpp.lz"); +const u32 gMonBackPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/back.4bpp.lz"); +const u32 gMonBackPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/back.4bpp.lz"); +const u32 gMonBackPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/back.4bpp.lz"); +const u32 gMonBackPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/back.4bpp.lz"); +const u32 gMonBackPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/back.4bpp.lz"); +const u32 gMonBackPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/back.4bpp.lz"); +const u32 gMonBackPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/back.4bpp.lz"); +const u32 gMonBackPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/back.4bpp.lz"); +const u32 gMonBackPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/back.4bpp.lz"); +const u32 gMonBackPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/back.4bpp.lz"); +const u32 gMonBackPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/back.4bpp.lz"); +const u32 gMonBackPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/back.4bpp.lz"); +const u32 gMonBackPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/back.4bpp.lz"); +const u32 gMonBackPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/back.4bpp.lz"); +const u32 gMonBackPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/back.4bpp.lz"); +const u32 gMonBackPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/back.4bpp.lz"); +const u32 gMonBackPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/back.4bpp.lz"); +const u32 gMonBackPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/back.4bpp.lz"); +const u32 gMonBackPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/back.4bpp.lz"); #endif const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz"); @@ -3656,6 +3722,39 @@ const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/no const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz"); const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz"); //const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); +const u32 gMonPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/normal.gbapal.lz"); +const u32 gMonPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/normal.gbapal.lz"); +const u32 gMonPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/normal.gbapal.lz"); +const u32 gMonPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/normal.gbapal.lz"); +const u32 gMonPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/normal.gbapal.lz"); +const u32 gMonPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/normal.gbapal.lz"); +const u32 gMonPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/normal.gbapal.lz"); +const u32 gMonPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/normal.gbapal.lz"); +const u32 gMonPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/normal.gbapal.lz"); +const u32 gMonPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/normal.gbapal.lz"); +const u32 gMonPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/normal.gbapal.lz"); +const u32 gMonPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/normal.gbapal.lz"); +const u32 gMonPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/normal.gbapal.lz"); +const u32 gMonPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/normal.gbapal.lz"); +const u32 gMonPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/normal.gbapal.lz"); +const u32 gMonPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/normal.gbapal.lz"); +const u32 gMonPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/normal.gbapal.lz"); +const u32 gMonPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/normal.gbapal.lz"); +const u32 gMonPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/normal.gbapal.lz"); +const u32 gMonPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/normal.gbapal.lz"); +const u32 gMonPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/normal.gbapal.lz"); +const u32 gMonPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/normal.gbapal.lz"); +const u32 gMonPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/normal.gbapal.lz"); +const u32 gMonPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/normal.gbapal.lz"); +const u32 gMonPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/normal.gbapal.lz"); +const u32 gMonPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/normal.gbapal.lz"); +const u32 gMonPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/normal.gbapal.lz"); +const u32 gMonPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/normal.gbapal.lz"); +const u32 gMonPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/normal.gbapal.lz"); +const u32 gMonPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/normal.gbapal.lz"); +const u32 gMonPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/normal.gbapal.lz"); +const u32 gMonPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/normal.gbapal.lz"); +const u32 gMonPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/normal.gbapal.lz"); #endif const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); @@ -4883,6 +4982,39 @@ const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/da const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz"); const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz"); //const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); +const u32 gMonShinyPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/shiny.gbapal.lz"); +const u32 gMonShinyPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/shiny.gbapal.lz"); +const u32 gMonShinyPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/shiny.gbapal.lz"); +const u32 gMonShinyPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/shiny.gbapal.lz"); +const u32 gMonShinyPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/shiny.gbapal.lz"); +const u32 gMonShinyPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/shiny.gbapal.lz"); +const u32 gMonShinyPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/shiny.gbapal.lz"); +const u32 gMonShinyPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/shiny.gbapal.lz"); +const u32 gMonShinyPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/shiny.gbapal.lz"); +const u32 gMonShinyPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/shiny.gbapal.lz"); +const u32 gMonShinyPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/shiny.gbapal.lz"); +const u32 gMonShinyPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/shiny.gbapal.lz"); +const u32 gMonShinyPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/shiny.gbapal.lz"); +const u32 gMonShinyPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/shiny.gbapal.lz"); +const u32 gMonShinyPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/shiny.gbapal.lz"); #endif const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); @@ -6099,6 +6231,39 @@ const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4b const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp"); const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); +const u8 gMonIcon_VenusaurGmax[] = INCBIN_U8("graphics/pokemon/gmax_venusaur/icon.4bpp"); +const u8 gMonIcon_CharizardGmax[] = INCBIN_U8("graphics/pokemon/gmax_charizard/icon.4bpp"); +const u8 gMonIcon_BlastoiseGmax[] = INCBIN_U8("graphics/pokemon/gmax_blastoise/icon.4bpp"); +const u8 gMonIcon_ButterfreeGmax[] = INCBIN_U8("graphics/pokemon/gmax_butterfree/icon.4bpp"); +const u8 gMonIcon_PikachuGmax[] = INCBIN_U8("graphics/pokemon/gmax_pikachu/icon.4bpp"); +const u8 gMonIcon_MeowthGmax[] = INCBIN_U8("graphics/pokemon/gmax_meowth/icon.4bpp"); +const u8 gMonIcon_MachampGmax[] = INCBIN_U8("graphics/pokemon/gmax_machamp/icon.4bpp"); +const u8 gMonIcon_GengarGmax[] = INCBIN_U8("graphics/pokemon/gmax_gengar/icon.4bpp"); +const u8 gMonIcon_KinglerGmax[] = INCBIN_U8("graphics/pokemon/gmax_kingler/icon.4bpp"); +const u8 gMonIcon_LaprasGmax[] = INCBIN_U8("graphics/pokemon/gmax_lapras/icon.4bpp"); +const u8 gMonIcon_EeveeGmax[] = INCBIN_U8("graphics/pokemon/gmax_eevee/icon.4bpp"); +const u8 gMonIcon_SnorlaxGmax[] = INCBIN_U8("graphics/pokemon/gmax_snorlax/icon.4bpp"); +const u8 gMonIcon_GarbodorGmax[] = INCBIN_U8("graphics/pokemon/gmax_garbodor/icon.4bpp"); +const u8 gMonIcon_MelmetalGmax[] = INCBIN_U8("graphics/pokemon/gmax_melmetal/icon.4bpp"); +const u8 gMonIcon_RillaboomGmax[] = INCBIN_U8("graphics/pokemon/gmax_rillaboom/icon.4bpp"); +const u8 gMonIcon_CinderaceGmax[] = INCBIN_U8("graphics/pokemon/gmax_cinderace/icon.4bpp"); +const u8 gMonIcon_InteleonGmax[] = INCBIN_U8("graphics/pokemon/gmax_inteleon/icon.4bpp"); +const u8 gMonIcon_CorviknightGmax[] = INCBIN_U8("graphics/pokemon/gmax_corviknight/icon.4bpp"); +const u8 gMonIcon_OrbeetleGmax[] = INCBIN_U8("graphics/pokemon/gmax_orbeetle/icon.4bpp"); +const u8 gMonIcon_DrednawGmax[] = INCBIN_U8("graphics/pokemon/gmax_drednaw/icon.4bpp"); +const u8 gMonIcon_CoalossalGmax[] = INCBIN_U8("graphics/pokemon/gmax_coalossal/icon.4bpp"); +const u8 gMonIcon_FlappleGmax[] = INCBIN_U8("graphics/pokemon/gmax_flapple/icon.4bpp"); +const u8 gMonIcon_AppletunGmax[] = INCBIN_U8("graphics/pokemon/gmax_appletun/icon.4bpp"); +const u8 gMonIcon_SandacondaGmax[] = INCBIN_U8("graphics/pokemon/gmax_sandaconda/icon.4bpp"); +const u8 gMonIcon_ToxtricityGmax[] = INCBIN_U8("graphics/pokemon/gmax_toxtricity/icon.4bpp"); +const u8 gMonIcon_CentiskorchGmax[] = INCBIN_U8("graphics/pokemon/gmax_centiskorch/icon.4bpp"); +const u8 gMonIcon_HattereneGmax[] = INCBIN_U8("graphics/pokemon/gmax_hatterene/icon.4bpp"); +const u8 gMonIcon_GrimmsnarlGmax[] = INCBIN_U8("graphics/pokemon/gmax_grimmsnarl/icon.4bpp"); +const u8 gMonIcon_AlcremieGmax[] = INCBIN_U8("graphics/pokemon/gmax_alcremie/icon.4bpp"); +const u8 gMonIcon_CopperajahGmax[] = INCBIN_U8("graphics/pokemon/gmax_copperajah/icon.4bpp"); +const u8 gMonIcon_DuraludonGmax[] = INCBIN_U8("graphics/pokemon/gmax_duraludon/icon.4bpp"); +const u8 gMonIcon_UrshifuGmax[] = INCBIN_U8("graphics/pokemon/gmax_urshifu/icon.4bpp"); +const u8 gMonIcon_UrshifuRapidStrikeGmax[] = INCBIN_U8("graphics/pokemon/gmax_urshifu_rapid_strike/icon.4bpp"); #endif const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index a161fbf908..9cb07c45d6 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -6,6 +6,14 @@ #define FLIP 0 #define NO_FLIP 1 +#if P_UPDATED_STATS >= GEN_6 + #define BUTTERFREE_SP_ATK\ + .baseSpAttack = 90, +#else + #define BUTTERFREE_SP_ATK\ + .baseSpAttack = 80, +#endif + #if P_UPDATED_STATS >= GEN_6 #define PIKACHU_BASE_DEFENSES\ .baseDefense = 40, \ @@ -16,6 +24,113 @@ .baseSpDefense = 40 #endif +#if P_UPDATED_ABILITIES >= GEN_7 + #define GENGAR_ABILITIES\ + .abilities = {ABILITY_CURSED_BODY, ABILITY_NONE}, +#else + #define GENGAR_ABILITIES\ + .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, +#endif + +#define VENUSAUR_BASE_STATS \ + { \ + .baseHP = 80, \ + .baseAttack = 82, \ + .baseDefense = 83, \ + .baseSpeed = 80, \ + .baseSpAttack = 100, \ + .baseSpDefense = 100, \ + .type1 = TYPE_GRASS, \ + .type2 = TYPE_POISON, \ + .catchRate = 45, \ + .expYield = 236, \ + .evYield_SpAttack = 2, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_GRASS, \ + .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + +#define CHARIZARD_BASE_STATS \ + { \ + .baseHP = 78, \ + .baseAttack = 84, \ + .baseDefense = 78, \ + .baseSpeed = 100, \ + .baseSpAttack = 109, \ + .baseSpDefense = 85, \ + .type1 = TYPE_FIRE, \ + .type2 = TYPE_FLYING, \ + .catchRate = 45, \ + .expYield = 240, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_DRAGON, \ + .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER}, \ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE, \ + } + +#define BLASTOISE_BASE_STATS \ + { \ + .baseHP = 79, \ + .baseAttack = 83, \ + .baseDefense = 100, \ + .baseSpeed = 78, \ + .baseSpAttack = 85, \ + .baseSpDefense = 105, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_WATER, \ + .catchRate = 45, \ + .expYield = 239, \ + .evYield_SpDefense = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_WATER_1, \ + .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_RAIN_DISH}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + } + +#define BUTTERFREE_BASE_STATS \ + { \ + .baseHP = 60, \ + .baseAttack = 45, \ + .baseDefense = 50, \ + .baseSpeed = 70, \ + .baseSpDefense = 80, \ + BUTTERFREE_SP_ATK \ + .type1 = TYPE_BUG, \ + .type2 = TYPE_FLYING, \ + .catchRate = 45, \ + .expYield = 178, \ + .evYield_SpAttack = 2, \ + .evYield_SpDefense = 1, \ + .itemRare = ITEM_SILVER_POWDER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_BUG, \ + .eggGroup2 = EGG_GROUP_BUG, \ + .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS}, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + } + #define PIKACHU_BASE_STATS(gender, flip) \ { \ .baseHP = 35, \ @@ -40,6 +155,181 @@ .noFlip = flip, \ } +#define MEOWTH_BASE_STATS \ + { \ + .baseHP = 40, \ + .baseAttack = 45, \ + .baseDefense = 35, \ + .baseSpeed = 90, \ + .baseSpAttack = 40, \ + .baseSpDefense = 40, \ + .type1 = TYPE_NORMAL, \ + .type2 = TYPE_NORMAL, \ + .catchRate = 255, \ + .expYield = 58, \ + .evYield_Speed = 1, \ + .itemRare = ITEM_QUICK_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE},\ + .bodyColor = BODY_COLOR_YELLOW, \ + .noFlip = FALSE, \ + } + +#define MACHAMP_BASE_STATS \ + { \ + .baseHP = 90, \ + .baseAttack = 130, \ + .baseDefense = 80, \ + .baseSpeed = 55, \ + .baseSpAttack = 65, \ + .baseSpDefense = 85, \ + .type1 = TYPE_FIGHTING, \ + .type2 = TYPE_FIGHTING, \ + .catchRate = 45, \ + .expYield = 227, \ + .evYield_Attack = 3, \ + .itemRare = ITEM_FOCUS_BAND, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, \ + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, \ + .abilities = {ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + } + +#define GENGAR_BASE_STATS \ + { \ + .baseHP = 60, \ + .baseAttack = 65, \ + .baseDefense = 60, \ + .baseSpeed = 110, \ + .baseSpAttack = 130, \ + .baseSpDefense = 75, \ + .type1 = TYPE_GHOST, \ + .type2 = TYPE_POISON, \ + .catchRate = 45, \ + .expYield = 225, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_AMORPHOUS, \ + .eggGroup2 = EGG_GROUP_AMORPHOUS, \ + GENGAR_ABILITIES \ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + } + +#define KINGLER_BASE_STATS \ + { \ + .baseHP = 55, \ + .baseAttack = 130, \ + .baseDefense = 115, \ + .baseSpeed = 75, \ + .baseSpAttack = 50, \ + .baseSpDefense = 50, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_WATER, \ + .catchRate = 60, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_WATER_3, \ + .eggGroup2 = EGG_GROUP_WATER_3, \ + .abilities = {ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE}, \ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = TRUE, \ + } + +#define LAPRAS_BASE_STATS \ + { \ + .baseHP = 130, \ + .baseAttack = 85, \ + .baseDefense = 80, \ + .baseSpeed = 60, \ + .baseSpAttack = 85, \ + .baseSpDefense = 95, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_ICE, \ + .catchRate = 45, \ + .expYield = 187, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = 70, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_WATER_1, \ + .abilities = {ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + } + +#define EEVEE_BASE_STATS \ + { \ + .baseHP = 55, \ + .baseAttack = 55, \ + .baseDefense = 50, \ + .baseSpeed = 55, \ + .baseSpAttack = 45, \ + .baseSpDefense = 65, \ + .type1 = TYPE_NORMAL, \ + .type2 = TYPE_NORMAL, \ + .catchRate = 45, \ + .expYield = 65, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 35, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION}, \ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_GENDER_DIFFERENCE, \ + } + +#define SNORLAX_BASE_STATS \ + { \ + .baseHP = 160, \ + .baseAttack = 110, \ + .baseDefense = 65, \ + .baseSpeed = 30, \ + .baseSpAttack = 65, \ + .baseSpDefense = 110, \ + .type1 = TYPE_NORMAL, \ + .type2 = TYPE_NORMAL, \ + .catchRate = 25, \ + .expYield = 189, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_LEFTOVERS, \ + .itemRare = ITEM_LEFTOVERS, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 40, \ + .friendship = 70, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_MONSTER, \ + .abilities = {ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY}, \ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = FALSE, \ + } + #define COSPLAY_PIKACHU_BASE_STATS(flip) PIKACHU_BASE_STATS(MON_FEMALE, flip) #define CAP_PIKACHU_BASE_STATS(flip) PIKACHU_BASE_STATS(MON_MALE, flip) @@ -265,6 +555,32 @@ .flags = SPECIES_FLAG_MYTHICAL, \ } +#define GARBODOR_BASE_STATS \ + { \ + .baseHP = 80, \ + .baseAttack = 95, \ + .baseDefense = 82, \ + .baseSpeed = 75, \ + .baseSpAttack = 60, \ + .baseSpDefense = 82, \ + .type1 = TYPE_POISON, \ + .type2 = TYPE_POISON, \ + .catchRate = 60, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .itemCommon = ITEM_SILK_SCARF, \ + .itemRare = ITEM_BLACK_SLUDGE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_MINERAL, \ + .abilities = {ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = TRUE, \ + } + #define DEERLING_BASE_STATS(color) \ { \ .baseHP = 60, \ @@ -740,6 +1056,272 @@ .flags = SPECIES_FLAG_MYTHICAL, \ } +#define MELMETAL_BASE_STATS \ + { \ + .baseHP = 135, \ + .baseAttack = 143, \ + .baseDefense = 143, \ + .baseSpeed = 34, \ + .baseSpAttack = 80, \ + .baseSpDefense = 65, \ + .type1 = TYPE_STEEL, \ + .type2 = TYPE_STEEL, \ + .catchRate = 3, \ + .expYield = 270, \ + .evYield_Attack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_IRON_FIST, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_MYTHICAL, \ + } + +#define RILLABOOM_BASE_STATS \ + { \ + .baseHP = 100, \ + .baseAttack = 125, \ + .baseDefense = 90, \ + .baseSpeed = 85, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .type1 = TYPE_GRASS, \ + .type2 = TYPE_GRASS, \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_GRASS, \ + .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + +#define CINDERACE_BASE_STATS \ + { \ + .baseHP = 80, \ + .baseAttack = 116, \ + .baseDefense = 75, \ + .baseSpeed = 119, \ + .baseSpAttack = 65, \ + .baseSpDefense = 75, \ + .type1 = TYPE_FIRE, \ + .type2 = TYPE_FIRE, \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, \ + .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO}, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + } + +#define INTELEON_BASE_STATS \ + { \ + .baseHP = 70, \ + .baseAttack = 85, \ + .baseDefense = 65, \ + .baseSpeed = 120, \ + .baseSpAttack = 125, \ + .baseSpDefense = 65, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_WATER, \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_WATER_1, \ + .eggGroup2 = EGG_GROUP_FIELD, \ + .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE, \ + } + +#define CORVIKNIGHT_BASE_STATS \ + { \ + .baseHP = 98, \ + .baseAttack = 87, \ + .baseDefense = 105, \ + .baseSpeed = 67, \ + .baseSpAttack = 53, \ + .baseSpDefense = 85, \ + .type1 = TYPE_FLYING, \ + .type2 = TYPE_STEEL, \ + .catchRate = 45, \ + .expYield = 248, \ + .evYield_Defense = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_FLYING, \ + .eggGroup2 = EGG_GROUP_FLYING, \ + .abilities = {ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR}, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + } + +#define ORBEETLE_BASE_STATS \ + { \ + .baseHP = 60, \ + .baseAttack = 45, \ + .baseDefense = 110, \ + .baseSpeed = 90, \ + .baseSpAttack = 80, \ + .baseSpDefense = 120, \ + .type1 = TYPE_BUG, \ + .type2 = TYPE_PSYCHIC, \ + .catchRate = 45, \ + .expYield = 253, \ + .evYield_SpDefense = 3, \ + .itemRare = ITEM_PSYCHIC_SEED, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_BUG, \ + .eggGroup2 = EGG_GROUP_BUG, \ + .abilities = {ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY}, \ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE, \ + } + +#define DREDNAW_BASE_STATS \ + { \ + .baseHP = 90, \ + .baseAttack = 115, \ + .baseDefense = 90, \ + .baseSpeed = 74, \ + .baseSpAttack = 48, \ + .baseSpDefense = 68, \ + .type1 = TYPE_WATER, \ + .type2 = TYPE_ROCK, \ + .catchRate = 75, \ + .expYield = 170, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_MONSTER, \ + .eggGroup2 = EGG_GROUP_WATER_1, \ + .abilities = {ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + +#define COALOSSAL_BASE_STATS \ + { \ + .baseHP = 110, \ + .baseAttack = 80, \ + .baseDefense = 120, \ + .baseSpeed = 30, \ + .baseSpAttack = 80, \ + .baseSpDefense = 90, \ + .type1 = TYPE_ROCK, \ + .type2 = TYPE_FIRE, \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_Defense = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_MINERAL, \ + .abilities = {ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE}, \ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = FALSE, \ + } + +#define FLAPPLE_BASE_STATS \ + { \ + .baseHP = 70, \ + .baseAttack = 110, \ + .baseDefense = 80, \ + .baseSpeed = 70, \ + .baseSpAttack = 95, \ + .baseSpDefense = 60, \ + .type1 = TYPE_GRASS, \ + .type2 = TYPE_DRAGON, \ + .catchRate = 45, \ + .expYield = 170, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroup1 = EGG_GROUP_GRASS, \ + .eggGroup2 = EGG_GROUP_DRAGON, \ + .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + +#define APPLETUN_BASE_STATS \ + { \ + .baseHP = 110, \ + .baseAttack = 85, \ + .baseDefense = 80, \ + .baseSpeed = 30, \ + .baseSpAttack = 100, \ + .baseSpDefense = 80, \ + .type1 = TYPE_GRASS, \ + .type2 = TYPE_DRAGON, \ + .catchRate = 45, \ + .expYield = 170, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroup1 = EGG_GROUP_GRASS, \ + .eggGroup2 = EGG_GROUP_DRAGON, \ + .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + +#define SANDACONDA_BASE_STATS \ + { \ + .baseHP = 72, \ + .baseAttack = 107, \ + .baseDefense = 125, \ + .baseSpeed = 71, \ + .baseSpAttack = 65, \ + .baseSpDefense = 70, \ + .type1 = TYPE_GROUND, \ + .type2 = TYPE_GROUND, \ + .catchRate = 120, \ + .expYield = 179, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_DRAGON, \ + .abilities = {ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + #define CRAMORANT_BASE_STATS \ { \ .baseHP = 70, \ @@ -788,6 +1370,30 @@ .noFlip = FALSE, \ } +#define CENTISKORCH_BASE_STATS \ + { \ + .baseHP = 100, \ + .baseAttack = 115, \ + .baseDefense = 65, \ + .baseSpeed = 65, \ + .baseSpAttack = 90, \ + .baseSpDefense = 90, \ + .type1 = TYPE_FIRE, \ + .type2 = TYPE_BUG, \ + .catchRate = 75, \ + .expYield = 184, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_BUG, \ + .eggGroup2 = EGG_GROUP_BUG, \ + .abilities = {ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY}, \ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE, \ + } + #define SINISTEA_BASE_STATS \ { \ .baseHP = 40, \ @@ -836,6 +1442,54 @@ .noFlip = FALSE, \ } +#define HATTERENE_BASE_STATS \ + { \ + .baseHP = 57, \ + .baseAttack = 90, \ + .baseDefense = 95, \ + .baseSpeed = 29, \ + .baseSpAttack = 136, \ + .baseSpDefense = 103, \ + .type1 = TYPE_PSYCHIC, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_FAIRY, \ + .abilities = {ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE}, \ + .bodyColor = BODY_COLOR_PINK, \ + .noFlip = FALSE, \ + } + +#define GRIMMSNARL_BASE_STATS \ + { \ + .baseHP = 95, \ + .baseAttack = 120, \ + .baseDefense = 65, \ + .baseSpeed = 60, \ + .baseSpAttack = 95, \ + .baseSpDefense = 75, \ + .type1 = TYPE_DARK, \ + .type2 = TYPE_FAIRY, \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_Attack = 3, \ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FAIRY, \ + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, \ + .abilities = {ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET}, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE, \ + } + #define ALCREMIE_BASE_STATS(color) \ { \ .baseHP = 65, \ @@ -884,6 +1538,105 @@ .noFlip = FALSE, \ } +#define COPPERAJAH_BASE_STATS \ + { \ + .baseHP = 122, \ + .baseAttack = 130, \ + .baseDefense = 69, \ + .baseSpeed = 30, \ + .baseSpAttack = 80, \ + .baseSpDefense = 69, \ + .type1 = TYPE_STEEL, \ + .type2 = TYPE_STEEL, \ + .catchRate = 90, \ + .expYield = 175, \ + .evYield_Attack = 2, \ + .itemRare = ITEM_LAGGING_TAIL, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_FIELD, \ + .eggGroup2 = EGG_GROUP_MINERAL, \ + .abilities = {ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE, \ + } + +#define DURALUDON_BASE_STATS \ + { \ + .baseHP = 70, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 85, \ + .baseSpAttack = 120, \ + .baseSpDefense = 50, \ + .type1 = TYPE_STEEL, \ + .type2 = TYPE_DRAGON, \ + .catchRate = 45, \ + .expYield = 187, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 30, \ + .friendship = 70, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroup1 = EGG_GROUP_MINERAL, \ + .eggGroup2 = EGG_GROUP_DRAGON, \ + .abilities = {ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART}, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE, \ + } + +#define URSHIFU_BASE_STATS \ + { \ + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .type1 = TYPE_FIGHTING, \ + .type2 = TYPE_DARK, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = 70, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_LEGENDARY, \ + } + +#define URSHIFU_RAPID_STRIKE_STYLE_BASE_STATS \ + { \ + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .type1 = TYPE_FIGHTING, \ + .type2 = TYPE_WATER, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = 70, \ + .growthRate = GROWTH_SLOW, \ + .eggGroup1 = EGG_GROUP_UNDISCOVERED, \ + .eggGroup2 = EGG_GROUP_UNDISCOVERED, \ + .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_LEGENDARY, \ + } + #define ZARUDE_BASE_STATS \ { \ .baseHP = 105, \ @@ -962,30 +1715,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_VENUSAUR] = - { - .baseHP = 80, - .baseAttack = 82, - .baseDefense = 83, - .baseSpeed = 80, - .baseSpAttack = 100, - .baseSpDefense = 100, - .type1 = TYPE_GRASS, - .type2 = TYPE_POISON, - .catchRate = 45, - .expYield = 236, - .evYield_SpAttack = 2, - .evYield_SpDefense = 1, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_GRASS, - .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_VENUSAUR] = VENUSAUR_BASE_STATS, [SPECIES_CHARMANDER] = { @@ -1036,29 +1766,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_CHARIZARD] = - { - .baseHP = 78, - .baseAttack = 84, - .baseDefense = 78, - .baseSpeed = 100, - .baseSpAttack = 109, - .baseSpDefense = 85, - .type1 = TYPE_FIRE, - .type2 = TYPE_FLYING, - .catchRate = 45, - .expYield = 240, - .evYield_SpAttack = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_DRAGON, - .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, - }, + [SPECIES_CHARIZARD] = CHARIZARD_BASE_STATS, [SPECIES_SQUIRTLE] = { @@ -1109,29 +1817,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_BLASTOISE] = - { - .baseHP = 79, - .baseAttack = 83, - .baseDefense = 100, - .baseSpeed = 78, - .baseSpAttack = 85, - .baseSpDefense = 105, - .type1 = TYPE_WATER, - .type2 = TYPE_WATER, - .catchRate = 45, - .expYield = 239, - .evYield_SpDefense = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_WATER_1, - .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_RAIN_DISH}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - }, + [SPECIES_BLASTOISE] = BLASTOISE_BASE_STATS, [SPECIES_CATERPIE] = { @@ -1181,35 +1867,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_BUTTERFREE] = - { - .baseHP = 60, - .baseAttack = 45, - .baseDefense = 50, - .baseSpeed = 70, - .baseSpDefense = 80, - #if P_UPDATED_STATS >= GEN_6 - .baseSpAttack = 90, - #else - .baseSpAttack = 80, - #endif - .type1 = TYPE_BUG, - .type2 = TYPE_FLYING, - .catchRate = 45, - .expYield = 178, - .evYield_SpAttack = 2, - .evYield_SpDefense = 1, - .itemRare = ITEM_SILVER_POWDER, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_BUG, - .eggGroup2 = EGG_GROUP_BUG, - .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - }, + [SPECIES_BUTTERFREE] = BUTTERFREE_BASE_STATS, [SPECIES_WEEDLE] = { @@ -2210,30 +2868,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MEOWTH] = - { - .baseHP = 40, - .baseAttack = 45, - .baseDefense = 35, - .baseSpeed = 90, - .baseSpAttack = 40, - .baseSpDefense = 40, - .type1 = TYPE_NORMAL, - .type2 = TYPE_NORMAL, - .catchRate = 255, - .expYield = 58, - .evYield_Speed = 1, - .itemRare = ITEM_QUICK_CLAW, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE}, - .bodyColor = BODY_COLOR_YELLOW, - .noFlip = FALSE, - }, + [SPECIES_MEOWTH] = MEOWTH_BASE_STATS, [SPECIES_PERSIAN] = { @@ -2611,30 +3246,7 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, - [SPECIES_MACHAMP] = - { - .baseHP = 90, - .baseAttack = 130, - .baseDefense = 80, - .baseSpeed = 55, - .baseSpAttack = 65, - .baseSpDefense = 85, - .type1 = TYPE_FIGHTING, - .type2 = TYPE_FIGHTING, - .catchRate = 45, - .expYield = 227, - .evYield_Attack = 3, - .itemRare = ITEM_FOCUS_BAND, - .genderRatio = PERCENT_FEMALE(25), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_HUMAN_LIKE, - .eggGroup2 = EGG_GROUP_HUMAN_LIKE, - .abilities = {ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST}, - .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, - }, + [SPECIES_MACHAMP] = MACHAMP_BASE_STATS, [SPECIES_BELLSPROUT] = { @@ -3271,33 +3883,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_GENGAR] = - { - .baseHP = 60, - .baseAttack = 65, - .baseDefense = 60, - .baseSpeed = 110, - .baseSpAttack = 130, - .baseSpDefense = 75, - .type1 = TYPE_GHOST, - .type2 = TYPE_POISON, - .catchRate = 45, - .expYield = 225, - .evYield_SpAttack = 3, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_AMORPHOUS, - .eggGroup2 = EGG_GROUP_AMORPHOUS, - #if P_UPDATED_ABILITIES >= GEN_7 - .abilities = {ABILITY_CURSED_BODY, ABILITY_NONE}, - #else - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, - #endif - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - }, + [SPECIES_GENGAR] = GENGAR_BASE_STATS, [SPECIES_ONIX] = { @@ -3395,29 +3981,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_KINGLER] = - { - .baseHP = 55, - .baseAttack = 130, - .baseDefense = 115, - .baseSpeed = 75, - .baseSpAttack = 50, - .baseSpDefense = 50, - .type1 = TYPE_WATER, - .type2 = TYPE_WATER, - .catchRate = 60, - .expYield = 166, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_WATER_3, - .eggGroup2 = EGG_GROUP_WATER_3, - .abilities = {ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE}, - .bodyColor = BODY_COLOR_RED, - .noFlip = TRUE, - }, + [SPECIES_KINGLER] = KINGLER_BASE_STATS, [SPECIES_VOLTORB] = { @@ -4195,31 +4759,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_LAPRAS] = - { - .baseHP = 130, - .baseAttack = 85, - .baseDefense = 80, - .baseSpeed = 60, - .baseSpAttack = 85, - .baseSpDefense = 95, - .type1 = TYPE_WATER, - .type2 = TYPE_ICE, - .catchRate = 45, - .expYield = 187, - .evYield_HP = 2, - .itemCommon = ITEM_MYSTIC_WATER, - .itemRare = ITEM_MYSTIC_WATER, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 40, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_WATER_1, - .abilities = {ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - }, + [SPECIES_LAPRAS] = LAPRAS_BASE_STATS, [SPECIES_DITTO] = { @@ -4247,30 +4787,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_EEVEE] = - { - .baseHP = 55, - .baseAttack = 55, - .baseDefense = 50, - .baseSpeed = 55, - .baseSpAttack = 45, - .baseSpDefense = 65, - .type1 = TYPE_NORMAL, - .type2 = TYPE_NORMAL, - .catchRate = 45, - .expYield = 65, - .evYield_SpDefense = 1, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 35, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION}, - .bodyColor = BODY_COLOR_BROWN, - .noFlip = FALSE, - .flags = SPECIES_FLAG_GENDER_DIFFERENCE, - }, + [SPECIES_EEVEE] = EEVEE_BASE_STATS, [SPECIES_VAPOREON] = { @@ -4488,31 +5005,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_SNORLAX] = - { - .baseHP = 160, - .baseAttack = 110, - .baseDefense = 65, - .baseSpeed = 30, - .baseSpAttack = 65, - .baseSpDefense = 110, - .type1 = TYPE_NORMAL, - .type2 = TYPE_NORMAL, - .catchRate = 25, - .expYield = 189, - .evYield_HP = 2, - .itemCommon = ITEM_LEFTOVERS, - .itemRare = ITEM_LEFTOVERS, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 40, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_MONSTER, - .abilities = {ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, - }, + [SPECIES_SNORLAX] = SNORLAX_BASE_STATS, [SPECIES_ARTICUNO] = { @@ -15113,31 +15606,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_GARBODOR] = - { - .baseHP = 80, - .baseAttack = 95, - .baseDefense = 82, - .baseSpeed = 75, - .baseSpAttack = 60, - .baseSpDefense = 82, - .type1 = TYPE_POISON, - .type2 = TYPE_POISON, - .catchRate = 60, - .expYield = 166, - .evYield_Attack = 2, - .itemCommon = ITEM_SILK_SCARF, - .itemRare = ITEM_BLACK_SLUDGE, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = TRUE, - }, + [SPECIES_GARBODOR] = GARBODOR_BASE_STATS, [SPECIES_ZORUA] = { @@ -20663,30 +21132,7 @@ const struct BaseStats gBaseStats[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_MELMETAL] = - { - .baseHP = 135, - .baseAttack = 143, - .baseDefense = 143, - .baseSpeed = 34, - .baseSpAttack = 80, - .baseSpDefense = 65, - .type1 = TYPE_STEEL, - .type2 = TYPE_STEEL, - .catchRate = 3, - .expYield = 270, - .evYield_Attack = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_IRON_FIST, ABILITY_NONE}, - .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, - .flags = SPECIES_FLAG_MYTHICAL, - }, + [SPECIES_MELMETAL] = MELMETAL_BASE_STATS, #endif #if P_GEN_8_POKEMON == TRUE @@ -20738,29 +21184,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_RILLABOOM] = - { - .baseHP = 100, - .baseAttack = 125, - .baseDefense = 90, - .baseSpeed = 85, - .baseSpAttack = 60, - .baseSpDefense = 70, - .type1 = TYPE_GRASS, - .type2 = TYPE_GRASS, - .catchRate = 45, - .expYield = 265, - .evYield_Attack = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_GRASS, - .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_RILLABOOM] = RILLABOOM_BASE_STATS, [SPECIES_SCORBUNNY] = { @@ -20810,29 +21234,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_CINDERACE] = - { - .baseHP = 80, - .baseAttack = 116, - .baseDefense = 75, - .baseSpeed = 119, - .baseSpAttack = 65, - .baseSpDefense = 75, - .type1 = TYPE_FIRE, - .type2 = TYPE_FIRE, - .catchRate = 45, - .expYield = 265, - .evYield_Speed = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_HUMAN_LIKE, - .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - }, + [SPECIES_CINDERACE] = CINDERACE_BASE_STATS, [SPECIES_SOBBLE] = { @@ -20883,29 +21285,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_INTELEON] = - { - .baseHP = 70, - .baseAttack = 85, - .baseDefense = 65, - .baseSpeed = 120, - .baseSpAttack = 125, - .baseSpDefense = 65, - .type1 = TYPE_WATER, - .type2 = TYPE_WATER, - .catchRate = 45, - .expYield = 265, - .evYield_Speed = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_WATER_1, - .eggGroup2 = EGG_GROUP_FIELD, - .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER}, - .bodyColor = BODY_COLOR_BLUE, - .noFlip = FALSE, - }, + [SPECIES_INTELEON] = INTELEON_BASE_STATS, [SPECIES_SKWOVET] = { @@ -21005,29 +21385,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_CORVIKNIGHT] = - { - .baseHP = 98, - .baseAttack = 87, - .baseDefense = 105, - .baseSpeed = 67, - .baseSpAttack = 53, - .baseSpDefense = 85, - .type1 = TYPE_FLYING, - .type2 = TYPE_STEEL, - .catchRate = 45, - .expYield = 248, - .evYield_Defense = 3, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_FLYING, - .eggGroup2 = EGG_GROUP_FLYING, - .abilities = {ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - }, + [SPECIES_CORVIKNIGHT] = CORVIKNIGHT_BASE_STATS, [SPECIES_BLIPBUG] = { @@ -21078,30 +21436,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ORBEETLE] = - { - .baseHP = 60, - .baseAttack = 45, - .baseDefense = 110, - .baseSpeed = 90, - .baseSpAttack = 80, - .baseSpDefense = 120, - .type1 = TYPE_BUG, - .type2 = TYPE_PSYCHIC, - .catchRate = 45, - .expYield = 253, - .evYield_SpDefense = 3, - .itemRare = ITEM_PSYCHIC_SEED, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_BUG, - .eggGroup2 = EGG_GROUP_BUG, - .abilities = {ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, - }, + [SPECIES_ORBEETLE] = ORBEETLE_BASE_STATS, [SPECIES_NICKIT] = { @@ -21271,29 +21606,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_DREDNAW] = - { - .baseHP = 90, - .baseAttack = 115, - .baseDefense = 90, - .baseSpeed = 74, - .baseSpAttack = 48, - .baseSpDefense = 68, - .type1 = TYPE_WATER, - .type2 = TYPE_ROCK, - .catchRate = 75, - .expYield = 170, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_MONSTER, - .eggGroup2 = EGG_GROUP_WATER_1, - .abilities = {ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_DREDNAW] = DREDNAW_BASE_STATS, [SPECIES_YAMPER] = { @@ -21391,29 +21704,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_COALOSSAL] = - { - .baseHP = 110, - .baseAttack = 80, - .baseDefense = 120, - .baseSpeed = 30, - .baseSpAttack = 80, - .baseSpDefense = 90, - .type1 = TYPE_ROCK, - .type2 = TYPE_FIRE, - .catchRate = 45, - .expYield = 255, - .evYield_Defense = 3, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE}, - .bodyColor = BODY_COLOR_BLACK, - .noFlip = FALSE, - }, + [SPECIES_COALOSSAL] = COALOSSAL_BASE_STATS, [SPECIES_APPLIN] = { @@ -21439,53 +21730,9 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_FLAPPLE] = - { - .baseHP = 70, - .baseAttack = 110, - .baseDefense = 80, - .baseSpeed = 70, - .baseSpAttack = 95, - .baseSpDefense = 60, - .type1 = TYPE_GRASS, - .type2 = TYPE_DRAGON, - .catchRate = 45, - .expYield = 170, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_ERRATIC, - .eggGroup1 = EGG_GROUP_GRASS, - .eggGroup2 = EGG_GROUP_DRAGON, - .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_FLAPPLE] = FLAPPLE_BASE_STATS, - [SPECIES_APPLETUN] = - { - .baseHP = 110, - .baseAttack = 85, - .baseDefense = 80, - .baseSpeed = 30, - .baseSpAttack = 100, - .baseSpDefense = 80, - .type1 = TYPE_GRASS, - .type2 = TYPE_DRAGON, - .catchRate = 45, - .expYield = 170, - .evYield_HP = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_ERRATIC, - .eggGroup1 = EGG_GROUP_GRASS, - .eggGroup2 = EGG_GROUP_DRAGON, - .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_APPLETUN] = APPLETUN_BASE_STATS, [SPECIES_SILICOBRA] = { @@ -21511,29 +21758,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_SANDACONDA] = - { - .baseHP = 72, - .baseAttack = 107, - .baseDefense = 125, - .baseSpeed = 71, - .baseSpAttack = 65, - .baseSpDefense = 70, - .type1 = TYPE_GROUND, - .type2 = TYPE_GROUND, - .catchRate = 120, - .expYield = 179, - .evYield_Defense = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_DRAGON, - .abilities = {ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_SANDACONDA] = SANDACONDA_BASE_STATS, [SPECIES_CRAMORANT] = CRAMORANT_BASE_STATS, @@ -21635,29 +21860,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_CENTISKORCH] = - { - .baseHP = 100, - .baseAttack = 115, - .baseDefense = 65, - .baseSpeed = 65, - .baseSpAttack = 90, - .baseSpDefense = 90, - .type1 = TYPE_FIRE, - .type2 = TYPE_BUG, - .catchRate = 75, - .expYield = 184, - .evYield_Attack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_BUG, - .eggGroup2 = EGG_GROUP_BUG, - .abilities = {ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY}, - .bodyColor = BODY_COLOR_RED, - .noFlip = FALSE, - }, + [SPECIES_CENTISKORCH] = CENTISKORCH_BASE_STATS, [SPECIES_CLOBBOPUS] = { @@ -21759,29 +21962,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_HATTERENE] = - { - .baseHP = 57, - .baseAttack = 90, - .baseDefense = 95, - .baseSpeed = 29, - .baseSpAttack = 136, - .baseSpDefense = 103, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_FAIRY, - .catchRate = 45, - .expYield = 255, - .evYield_SpAttack = 3, - .genderRatio = MON_FEMALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_FAIRY, - .eggGroup2 = EGG_GROUP_FAIRY, - .abilities = {ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE}, - .bodyColor = BODY_COLOR_PINK, - .noFlip = FALSE, - }, + [SPECIES_HATTERENE] = HATTERENE_BASE_STATS, [SPECIES_IMPIDIMP] = { @@ -21831,29 +22012,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_GRIMMSNARL] = - { - .baseHP = 95, - .baseAttack = 120, - .baseDefense = 65, - .baseSpeed = 60, - .baseSpAttack = 95, - .baseSpDefense = 75, - .type1 = TYPE_DARK, - .type2 = TYPE_FAIRY, - .catchRate = 45, - .expYield = 255, - .evYield_Attack = 3, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FAIRY, - .eggGroup2 = EGG_GROUP_HUMAN_LIKE, - .abilities = {ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET}, - .bodyColor = BODY_COLOR_PURPLE, - .noFlip = FALSE, - }, + [SPECIES_GRIMMSNARL] = GRIMMSNARL_BASE_STATS, [SPECIES_OBSTAGOON] = { @@ -22223,30 +22382,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_COPPERAJAH] = - { - .baseHP = 122, - .baseAttack = 130, - .baseDefense = 69, - .baseSpeed = 30, - .baseSpAttack = 80, - .baseSpDefense = 69, - .type1 = TYPE_STEEL, - .type2 = TYPE_STEEL, - .catchRate = 90, - .expYield = 175, - .evYield_Attack = 2, - .itemRare = ITEM_LAGGING_TAIL, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 25, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_FIELD, - .eggGroup2 = EGG_GROUP_MINERAL, - .abilities = {ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL}, - .bodyColor = BODY_COLOR_GREEN, - .noFlip = FALSE, - }, + [SPECIES_COPPERAJAH] = COPPERAJAH_BASE_STATS, [SPECIES_DRACOZOLT] = { @@ -22344,29 +22480,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_DURALUDON] = - { - .baseHP = 70, - .baseAttack = 95, - .baseDefense = 115, - .baseSpeed = 85, - .baseSpAttack = 120, - .baseSpDefense = 50, - .type1 = TYPE_STEEL, - .type2 = TYPE_DRAGON, - .catchRate = 45, - .expYield = 187, - .evYield_SpAttack = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 30, - .friendship = 70, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroup1 = EGG_GROUP_MINERAL, - .eggGroup2 = EGG_GROUP_DRAGON, - .abilities = {ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART}, - .bodyColor = BODY_COLOR_WHITE, - .noFlip = FALSE, - }, + [SPECIES_DURALUDON] = DURALUDON_BASE_STATS, [SPECIES_DREEPY] = { @@ -22540,30 +22654,7 @@ const struct BaseStats gBaseStats[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_URSHIFU] = - { - .baseHP = 100, - .baseAttack = 130, - .baseDefense = 100, - .baseSpeed = 97, - .baseSpAttack = 63, - .baseSpDefense = 60, - .type1 = TYPE_FIGHTING, - .type2 = TYPE_DARK, - .catchRate = 3, - .expYield = 275, - .evYield_Attack = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 120, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, - .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, - .flags = SPECIES_FLAG_LEGENDARY, - }, + [SPECIES_URSHIFU] = URSHIFU_BASE_STATS, [SPECIES_ZARUDE] = ZARUDE_BASE_STATS, @@ -26737,30 +26828,7 @@ const struct BaseStats gBaseStats[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = - { - .baseHP = 100, - .baseAttack = 130, - .baseDefense = 100, - .baseSpeed = 97, - .baseSpAttack = 63, - .baseSpDefense = 60, - .type1 = TYPE_FIGHTING, - .type2 = TYPE_WATER, - .catchRate = 3, - .expYield = 275, - .evYield_Attack = 3, - .genderRatio = PERCENT_FEMALE(12.5), - .eggCycles = 120, - .friendship = 70, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, - .bodyColor = BODY_COLOR_GRAY, - .noFlip = FALSE, - .flags = SPECIES_FLAG_LEGENDARY, - }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = URSHIFU_RAPID_STRIKE_STYLE_BASE_STATS, [SPECIES_ZARUDE_DADA] = ZARUDE_BASE_STATS, @@ -26838,5 +26906,41 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, .flags = SPECIES_FLAG_LEGENDARY, }, + + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = VENUSAUR_BASE_STATS, + [SPECIES_CHARIZARD_GMAX] = CHARIZARD_BASE_STATS, + [SPECIES_BLASTOISE_GMAX] = BLASTOISE_BASE_STATS, + [SPECIES_BUTTERFREE_GMAX] = BUTTERFREE_BASE_STATS, + [SPECIES_PIKACHU_GMAX] = PIKACHU_BASE_STATS(PERCENT_FEMALE(50), FLIP), + [SPECIES_MEOWTH_GMAX] = MEOWTH_BASE_STATS, + [SPECIES_MACHAMP_GMAX] = MACHAMP_BASE_STATS, + [SPECIES_GENGAR_GMAX] = GENGAR_BASE_STATS, + [SPECIES_KINGLER_GMAX] = KINGLER_BASE_STATS, + [SPECIES_LAPRAS_GMAX] = LAPRAS_BASE_STATS, + [SPECIES_EEVEE_GMAX] = EEVEE_BASE_STATS, + [SPECIES_SNORLAX_GMAX] = SNORLAX_BASE_STATS, + [SPECIES_GARBODOR_GMAX] = GARBODOR_BASE_STATS, + [SPECIES_MELMETAL_GMAX] = MELMETAL_BASE_STATS, + [SPECIES_RILLABOOM_GMAX] = RILLABOOM_BASE_STATS, + [SPECIES_CINDERACE_GMAX] = CINDERACE_BASE_STATS, + [SPECIES_INTELEON_GMAX] = INTELEON_BASE_STATS, + [SPECIES_CORVIKNIGHT_GMAX] = CORVIKNIGHT_BASE_STATS, + [SPECIES_ORBEETLE_GMAX] = ORBEETLE_BASE_STATS, + [SPECIES_DREDNAW_GMAX] = DREDNAW_BASE_STATS, + [SPECIES_COALOSSAL_GMAX] = COALOSSAL_BASE_STATS, + [SPECIES_FLAPPLE_GMAX] = FLAPPLE_BASE_STATS, + [SPECIES_APPLETUN_GMAX] = APPLETUN_BASE_STATS, + [SPECIES_SANDACONDA_GMAX] = SANDACONDA_BASE_STATS, + [SPECIES_TOXTRICITY_GMAX] = TOXTRICITY_BASE_STATS(ABILITY_PLUS), + [SPECIES_CENTISKORCH_GMAX] = CENTISKORCH_BASE_STATS, + [SPECIES_HATTERENE_GMAX] = HATTERENE_BASE_STATS, + [SPECIES_GRIMMSNARL_GMAX] = GRIMMSNARL_BASE_STATS, + [SPECIES_ALCREMIE_GMAX] = ALCREMIE_BASE_STATS(BODY_COLOR_PINK), + [SPECIES_COPPERAJAH_GMAX] = COPPERAJAH_BASE_STATS, + [SPECIES_DURALUDON_GMAX] = DURALUDON_BASE_STATS, + [SPECIES_URSHIFU_GMAX] = URSHIFU_BASE_STATS, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = URSHIFU_RAPID_STRIKE_STYLE_BASE_STATS, + #endif }; diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index 90be7112b6..b6aaf07a57 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -76,5 +76,72 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = sZamazentaFormChangeTable, [SPECIES_ENAMORUS] = sEnamorusFormChangeTable, [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable, + // Gigantamax Forms + [SPECIES_VENUSAUR] = sVenusaurFormChangeTable, + [SPECIES_VENUSAUR_GMAX] = sVenusaurFormChangeTable, + [SPECIES_CHARIZARD] = sCharizardFormChangeTable, + [SPECIES_CHARIZARD_GMAX] = sCharizardFormChangeTable, + [SPECIES_BLASTOISE] = sBlastoiseFormChangeTable, + [SPECIES_BLASTOISE_GMAX] = sBlastoiseFormChangeTable, + [SPECIES_BUTTERFREE] = sButterfreeFormChangeTable, + [SPECIES_BUTTERFREE_GMAX] = sButterfreeFormChangeTable, + [SPECIES_PIKACHU] = sPikachuFormChangeTable, + [SPECIES_PIKACHU_GMAX] = sPikachuFormChangeTable, + [SPECIES_MEOWTH] = sMeowthFormChangeTable, + [SPECIES_MEOWTH_GMAX] = sMeowthFormChangeTable, + [SPECIES_MACHAMP] = sMachampFormChangeTable, + [SPECIES_MACHAMP_GMAX] = sMachampFormChangeTable, + [SPECIES_GENGAR] = sGengarFormChangeTable, + [SPECIES_GENGAR_GMAX] = sGengarFormChangeTable, + [SPECIES_KINGLER] = sKinglerFormChangeTable, + [SPECIES_KINGLER_GMAX] = sKinglerFormChangeTable, + [SPECIES_LAPRAS] = sLaprasFormChangeTable, + [SPECIES_LAPRAS_GMAX] = sLaprasFormChangeTable, + [SPECIES_EEVEE] = sEeveeFormChangeTable, + [SPECIES_EEVEE_GMAX] = sEeveeFormChangeTable, + [SPECIES_SNORLAX] = sSnorlaxFormChangeTable, + [SPECIES_SNORLAX_GMAX] = sSnorlaxFormChangeTable, + [SPECIES_GARBODOR] = sGarbodorFormChangeTable, + [SPECIES_GARBODOR_GMAX] = sGarbodorFormChangeTable, + [SPECIES_MELMETAL] = sMelmetalFormChangeTable, + [SPECIES_MELMETAL_GMAX] = sMelmetalFormChangeTable, + [SPECIES_RILLABOOM] = sRillaboomFormChangeTable, + [SPECIES_RILLABOOM_GMAX] = sRillaboomFormChangeTable, + [SPECIES_CINDERACE] = sCinderaceFormChangeTable, + [SPECIES_CINDERACE_GMAX] = sCinderaceFormChangeTable, + [SPECIES_INTELEON] = sInteleonFormChangeTable, + [SPECIES_INTELEON_GMAX] = sInteleonFormChangeTable, + [SPECIES_CORVIKNIGHT] = sCorviknightFormChangeTable, + [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightFormChangeTable, + [SPECIES_ORBEETLE] = sOrbeetleFormChangeTable, + [SPECIES_ORBEETLE_GMAX] = sOrbeetleFormChangeTable, + [SPECIES_DREDNAW] = sDrednawFormChangeTable, + [SPECIES_DREDNAW_GMAX] = sDrednawFormChangeTable, + [SPECIES_COALOSSAL] = sCoalossalFormChangeTable, + [SPECIES_COALOSSAL_GMAX] = sCoalossalFormChangeTable, + [SPECIES_FLAPPLE] = sFlappleFormChangeTable, + [SPECIES_FLAPPLE_GMAX] = sFlappleFormChangeTable, + [SPECIES_APPLETUN] = sAppletunFormChangeTable, + [SPECIES_APPLETUN_GMAX] = sAppletunFormChangeTable, + [SPECIES_SANDACONDA] = sSandacondaFormChangeTable, + [SPECIES_SANDACONDA_GMAX] = sSandacondaFormChangeTable, + [SPECIES_TOXTRICITY] = sToxtricityFormChangeTable, + [SPECIES_TOXTRICITY_GMAX] = sToxtricityFormChangeTable, + [SPECIES_CENTISKORCH] = sCentiskorchFormChangeTable, + [SPECIES_CENTISKORCH_GMAX] = sCentiskorchFormChangeTable, + [SPECIES_HATTERENE] = sHattereneFormChangeTable, + [SPECIES_HATTERENE_GMAX] = sHattereneFormChangeTable, + [SPECIES_GRIMMSNARL] = sGrimmsnarlFormChangeTable, + [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlFormChangeTable, + [SPECIES_ALCREMIE] = sAlcremieFormChangeTable, + [SPECIES_ALCREMIE_GMAX] = sAlcremieFormChangeTable, + [SPECIES_COPPERAJAH] = sCopperajahFormChangeTable, + [SPECIES_COPPERAJAH_GMAX] = sCopperajahFormChangeTable, + [SPECIES_DURALUDON] = sDuraludonFormChangeTable, + [SPECIES_DURALUDON_GMAX] = sDuraludonFormChangeTable, + [SPECIES_URSHIFU] = sUrshifuFormChangeTable, + [SPECIES_URSHIFU_GMAX] = sUrshifuFormChangeTable, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = sUrshifuRapidStrikeFormChangeTable, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuRapidStrikeFormChangeTable, #endif }; diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 94da0add36..aee50b3489 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -195,6 +195,48 @@ static const struct FormChange sEnamorusFormChangeTable[] = { {FORM_ITEM_USE, SPECIES_ENAMORUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; + +// Gigantamax Forms +#define GIGANTAMAX_FORM(species)\ + { \ + {FORM_GIGANTAMAX, SPECIES_##species}, \ + {FORM_GIGANTAMAX, SPECIES_##species##_GMAX}, \ + {FORM_CHANGE_END} \ + }; + +static const struct FormChange sVenusaurFormChangeTable[] = GIGANTAMAX_FORM(VENUSAUR) +static const struct FormChange sCharizardFormChangeTable[] = GIGANTAMAX_FORM(CHARIZARD) +static const struct FormChange sBlastoiseFormChangeTable[] = GIGANTAMAX_FORM(BLASTOISE) +static const struct FormChange sButterfreeFormChangeTable[] = GIGANTAMAX_FORM(BUTTERFREE) +static const struct FormChange sPikachuFormChangeTable[] = GIGANTAMAX_FORM(PIKACHU) +static const struct FormChange sMeowthFormChangeTable[] = GIGANTAMAX_FORM(MEOWTH) +static const struct FormChange sMachampFormChangeTable[] = GIGANTAMAX_FORM(MACHAMP) +static const struct FormChange sGengarFormChangeTable[] = GIGANTAMAX_FORM(GENGAR) +static const struct FormChange sKinglerFormChangeTable[] = GIGANTAMAX_FORM(KINGLER) +static const struct FormChange sLaprasFormChangeTable[] = GIGANTAMAX_FORM(LAPRAS) +static const struct FormChange sEeveeFormChangeTable[] = GIGANTAMAX_FORM(EEVEE) +static const struct FormChange sSnorlaxFormChangeTable[] = GIGANTAMAX_FORM(SNORLAX) +static const struct FormChange sGarbodorFormChangeTable[] = GIGANTAMAX_FORM(GARBODOR) +static const struct FormChange sMelmetalFormChangeTable[] = GIGANTAMAX_FORM(MELMETAL) +static const struct FormChange sRillaboomFormChangeTable[] = GIGANTAMAX_FORM(RILLABOOM) +static const struct FormChange sCinderaceFormChangeTable[] = GIGANTAMAX_FORM(CINDERACE) +static const struct FormChange sInteleonFormChangeTable[] = GIGANTAMAX_FORM(INTELEON) +static const struct FormChange sCorviknightFormChangeTable[] = GIGANTAMAX_FORM(CORVIKNIGHT) +static const struct FormChange sOrbeetleFormChangeTable[] = GIGANTAMAX_FORM(ORBEETLE) +static const struct FormChange sDrednawFormChangeTable[] = GIGANTAMAX_FORM(DREDNAW) +static const struct FormChange sCoalossalFormChangeTable[] = GIGANTAMAX_FORM(COALOSSAL) +static const struct FormChange sFlappleFormChangeTable[] = GIGANTAMAX_FORM(FLAPPLE) +static const struct FormChange sAppletunFormChangeTable[] = GIGANTAMAX_FORM(APPLETUN) +static const struct FormChange sSandacondaFormChangeTable[] = GIGANTAMAX_FORM(SANDACONDA) +static const struct FormChange sToxtricityFormChangeTable[] = GIGANTAMAX_FORM(TOXTRICITY) +static const struct FormChange sCentiskorchFormChangeTable[] = GIGANTAMAX_FORM(CENTISKORCH) +static const struct FormChange sHattereneFormChangeTable[] = GIGANTAMAX_FORM(HATTERENE) +static const struct FormChange sGrimmsnarlFormChangeTable[] = GIGANTAMAX_FORM(GRIMMSNARL) +static const struct FormChange sAlcremieFormChangeTable[] = GIGANTAMAX_FORM(ALCREMIE) +static const struct FormChange sCopperajahFormChangeTable[] = GIGANTAMAX_FORM(COPPERAJAH) +static const struct FormChange sDuraludonFormChangeTable[] = GIGANTAMAX_FORM(DURALUDON) +static const struct FormChange sUrshifuFormChangeTable[] = GIGANTAMAX_FORM(URSHIFU) +static const struct FormChange sUrshifuRapidStrikeFormChangeTable[] = GIGANTAMAX_FORM(URSHIFU_RAPID_STRIKE_STYLE) #endif #undef WHEN_LEARNED diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 73b1b07d7a..eae45e5491 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -590,5 +590,39 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable, // Enamorus [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = sVenusaurFormSpeciesIdTable, + [SPECIES_CHARIZARD_GMAX] = sCharizardFormSpeciesIdTable, + [SPECIES_BLASTOISE_GMAX] = sBlastoiseFormSpeciesIdTable, + [SPECIES_BUTTERFREE_GMAX] = sButterfreeFormSpeciesIdTable, + [SPECIES_PIKACHU_GMAX] = sPikachuFormSpeciesIdTable, + [SPECIES_MEOWTH_GMAX] = sMeowthFormSpeciesIdTable, + [SPECIES_MACHAMP_GMAX] = sMachampFormSpeciesIdTable, + [SPECIES_GENGAR_GMAX] = sGengarFormSpeciesIdTable, + [SPECIES_KINGLER_GMAX] = sKinglerFormSpeciesIdTable, + [SPECIES_LAPRAS_GMAX] = sLaprasFormSpeciesIdTable, + [SPECIES_EEVEE_GMAX] = sEeveeFormSpeciesIdTable, + [SPECIES_SNORLAX_GMAX] = sSnorlaxFormSpeciesIdTable, + [SPECIES_GARBODOR_GMAX] = sGarbodorFormSpeciesIdTable, + [SPECIES_MELMETAL_GMAX] = sMelmetalFormSpeciesIdTable, + [SPECIES_RILLABOOM_GMAX] = sRillaboomFormSpeciesIdTable, + [SPECIES_CINDERACE_GMAX] = sCinderaceFormSpeciesIdTable, + [SPECIES_INTELEON_GMAX] = sInteleonFormSpeciesIdTable, + [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightFormSpeciesIdTable, + [SPECIES_ORBEETLE_GMAX] = sOrbeetleFormSpeciesIdTable, + [SPECIES_DREDNAW_GMAX] = sDrednawFormSpeciesIdTable, + [SPECIES_COALOSSAL_GMAX] = sCoalossalFormSpeciesIdTable, + [SPECIES_FLAPPLE_GMAX] = sFlappleFormSpeciesIdTable, + [SPECIES_APPLETUN_GMAX] = sAppletunFormSpeciesIdTable, + [SPECIES_SANDACONDA_GMAX] = sSandacondaFormSpeciesIdTable, + [SPECIES_TOXTRICITY_GMAX] = sToxtricityFormSpeciesIdTable, + [SPECIES_CENTISKORCH_GMAX] = sCentiskorchFormSpeciesIdTable, + [SPECIES_HATTERENE_GMAX] = sHattereneFormSpeciesIdTable, + [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlFormSpeciesIdTable, + [SPECIES_ALCREMIE_GMAX] = sAlcremieFormSpeciesIdTable, + [SPECIES_COPPERAJAH_GMAX] = sCopperajahFormSpeciesIdTable, + [SPECIES_DURALUDON_GMAX] = sDuraludonFormSpeciesIdTable, + [SPECIES_URSHIFU_GMAX] = sUrshifuFormSpeciesIdTable, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuFormSpeciesIdTable, #endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 545201c5af..af862e7252 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1,6 +1,7 @@ static const u16 sVenusaurFormSpeciesIdTable[] = { SPECIES_VENUSAUR, SPECIES_VENUSAUR_MEGA, + SPECIES_VENUSAUR_GMAX, FORM_SPECIES_END, }; @@ -8,12 +9,20 @@ static const u16 sCharizardFormSpeciesIdTable[] = { SPECIES_CHARIZARD, SPECIES_CHARIZARD_MEGA_X, SPECIES_CHARIZARD_MEGA_Y, + SPECIES_CHARIZARD_GMAX, FORM_SPECIES_END, }; static const u16 sBlastoiseFormSpeciesIdTable[] = { SPECIES_BLASTOISE, SPECIES_BLASTOISE_MEGA, + SPECIES_BLASTOISE_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sButterfreeFormSpeciesIdTable[] = { + SPECIES_BUTTERFREE, + SPECIES_BUTTERFREE_GMAX, FORM_SPECIES_END, }; @@ -57,6 +66,7 @@ static const u16 sPikachuFormSpeciesIdTable[] = { SPECIES_PIKACHU_ALOLA_CAP, SPECIES_PIKACHU_PARTNER_CAP, SPECIES_PIKACHU_WORLD_CAP, + SPECIES_PIKACHU_GMAX, FORM_SPECIES_END, }; @@ -106,6 +116,7 @@ static const u16 sMeowthFormSpeciesIdTable[] = { SPECIES_MEOWTH, SPECIES_MEOWTH_ALOLAN, SPECIES_MEOWTH_GALARIAN, + SPECIES_MEOWTH_GMAX, FORM_SPECIES_END, }; @@ -133,6 +144,12 @@ static const u16 sArcanineFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sMachampFormSpeciesIdTable[] = { + SPECIES_MACHAMP, + SPECIES_MACHAMP_GMAX, + FORM_SPECIES_END, +}; + static const u16 sGeodudeFormSpeciesIdTable[] = { SPECIES_GEODUDE, SPECIES_GEODUDE_ALOLAN, @@ -194,9 +211,16 @@ static const u16 sMukFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sKinglerFormSpeciesIdTable[] = { + SPECIES_KINGLER, + SPECIES_KINGLER_GMAX, + FORM_SPECIES_END, +}; + static const u16 sGengarFormSpeciesIdTable[] = { SPECIES_GENGAR, SPECIES_GENGAR_MEGA, + SPECIES_GENGAR_GMAX, FORM_SPECIES_END, }; @@ -254,12 +278,30 @@ static const u16 sGyaradosFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sLaprasFormSpeciesIdTable[] = { + SPECIES_LAPRAS, + SPECIES_LAPRAS_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sEeveeFormSpeciesIdTable[] = { + SPECIES_EEVEE, + SPECIES_EEVEE_GMAX, + FORM_SPECIES_END, +}; + static const u16 sAerodactylFormSpeciesIdTable[] = { SPECIES_AERODACTYL, SPECIES_AERODACTYL_MEGA, FORM_SPECIES_END, }; +static const u16 sSnorlaxFormSpeciesIdTable[] = { + SPECIES_SNORLAX, + SPECIES_SNORLAX_GMAX, + FORM_SPECIES_END, +}; + static const u16 sArticunoFormSpeciesIdTable[] = { SPECIES_ARTICUNO, SPECIES_ARTICUNO_GALARIAN, @@ -727,6 +769,12 @@ static const u16 sZoroarkFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sGarbodorFormSpeciesIdTable[] = { + SPECIES_GARBODOR, + SPECIES_GARBODOR_GMAX, + FORM_SPECIES_END, +}; + static const u16 sDeerlingFormSpeciesIdTable[] = { SPECIES_DEERLING, SPECIES_DEERLING_SUMMER, @@ -1046,6 +1094,73 @@ static const u16 sMagearnaFormSpeciesIdTable[] = { #endif #if P_GEN_8_POKEMON == TRUE +static const u16 sMelmetalFormSpeciesIdTable[] = { + SPECIES_MELMETAL, + SPECIES_MELMETAL_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sRillaboomFormSpeciesIdTable[] = { + SPECIES_RILLABOOM, + SPECIES_RILLABOOM_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sCinderaceFormSpeciesIdTable[] = { + SPECIES_CINDERACE, + SPECIES_CINDERACE_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sInteleonFormSpeciesIdTable[] = { + SPECIES_INTELEON, + SPECIES_INTELEON_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sCorviknightFormSpeciesIdTable[] = { + SPECIES_CORVIKNIGHT, + SPECIES_CORVIKNIGHT_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sOrbeetleFormSpeciesIdTable[] = { + SPECIES_ORBEETLE, + SPECIES_ORBEETLE_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sDrednawFormSpeciesIdTable[] = { + SPECIES_DREDNAW, + SPECIES_DREDNAW_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sCoalossalFormSpeciesIdTable[] = { + SPECIES_COALOSSAL, + SPECIES_COALOSSAL_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sFlappleFormSpeciesIdTable[] = { + SPECIES_FLAPPLE, + SPECIES_FLAPPLE_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sAppletunFormSpeciesIdTable[] = { + SPECIES_APPLETUN, + SPECIES_APPLETUN_GMAX, + FORM_SPECIES_END, +}; + + +static const u16 sSandacondaFormSpeciesIdTable[] = { + SPECIES_SANDACONDA, + SPECIES_SANDACONDA_GMAX, + FORM_SPECIES_END, +}; + static const u16 sCramorantFormSpeciesIdTable[] = { SPECIES_CRAMORANT, SPECIES_CRAMORANT_GULPING, @@ -1056,6 +1171,19 @@ static const u16 sCramorantFormSpeciesIdTable[] = { static const u16 sToxtricityFormSpeciesIdTable[] = { SPECIES_TOXTRICITY, SPECIES_TOXTRICITY_LOW_KEY, + SPECIES_TOXTRICITY_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sCentiskorchFormSpeciesIdTable[] = { + SPECIES_CENTISKORCH, + SPECIES_CENTISKORCH_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sHattereneFormSpeciesIdTable[] = { + SPECIES_HATTERENE, + SPECIES_HATTERENE_GMAX, FORM_SPECIES_END, }; @@ -1071,6 +1199,12 @@ static const u16 sPolteageistFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sGrimmsnarlFormSpeciesIdTable[] = { + SPECIES_GRIMMSNARL, + SPECIES_GRIMMSNARL_GMAX, + FORM_SPECIES_END, +}; + static const u16 sAlcremieFormSpeciesIdTable[] = { SPECIES_ALCREMIE, SPECIES_ALCREMIE_RUBY_CREAM, @@ -1102,6 +1236,18 @@ static const u16 sMorpekoFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sCopperajahFormSpeciesIdTable[] = { + SPECIES_COPPERAJAH, + SPECIES_COPPERAJAH_GMAX, + FORM_SPECIES_END, +}; + +static const u16 sDuraludonFormSpeciesIdTable[] = { + SPECIES_DURALUDON, + SPECIES_DURALUDON_GMAX, + FORM_SPECIES_END, +}; + static const u16 sZacianFormSpeciesIdTable[] = { SPECIES_ZACIAN, SPECIES_ZACIAN_CROWNED_SWORD, @@ -1123,6 +1269,8 @@ static const u16 sEternatusFormSpeciesIdTable[] = { static const u16 sUrshifuFormSpeciesIdTable[] = { SPECIES_URSHIFU, SPECIES_URSHIFU_RAPID_STRIKE_STYLE, + SPECIES_URSHIFU_GMAX, + SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 0ecfa59ccf..8ba440804c 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1334,5 +1334,39 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset, // Enamorus [SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = sVenusaurLevelUpLearnset, + [SPECIES_CHARIZARD_GMAX] = sCharizardLevelUpLearnset, + [SPECIES_BLASTOISE_GMAX] = sBlastoiseLevelUpLearnset, + [SPECIES_BUTTERFREE_GMAX] = sButterfreeLevelUpLearnset, + [SPECIES_PIKACHU_GMAX] = sPikachuLevelUpLearnset, + [SPECIES_MEOWTH_GMAX] = sMeowthLevelUpLearnset, + [SPECIES_MACHAMP_GMAX] = sMachampLevelUpLearnset, + [SPECIES_GENGAR_GMAX] = sGengarLevelUpLearnset, + [SPECIES_KINGLER_GMAX] = sKinglerLevelUpLearnset, + [SPECIES_LAPRAS_GMAX] = sLaprasLevelUpLearnset, + [SPECIES_EEVEE_GMAX] = sEeveeLevelUpLearnset, + [SPECIES_SNORLAX_GMAX] = sSnorlaxLevelUpLearnset, + [SPECIES_GARBODOR_GMAX] = sGarbodorLevelUpLearnset, + [SPECIES_MELMETAL_GMAX] = sMelmetalLevelUpLearnset, + [SPECIES_RILLABOOM_GMAX] = sRillaboomLevelUpLearnset, + [SPECIES_CINDERACE_GMAX] = sCinderaceLevelUpLearnset, + [SPECIES_INTELEON_GMAX] = sInteleonLevelUpLearnset, + [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightLevelUpLearnset, + [SPECIES_ORBEETLE_GMAX] = sOrbeetleLevelUpLearnset, + [SPECIES_DREDNAW_GMAX] = sDrednawLevelUpLearnset, + [SPECIES_COALOSSAL_GMAX] = sCoalossalLevelUpLearnset, + [SPECIES_FLAPPLE_GMAX] = sFlappleLevelUpLearnset, + [SPECIES_APPLETUN_GMAX] = sAppletunLevelUpLearnset, + [SPECIES_SANDACONDA_GMAX] = sSandacondaLevelUpLearnset, + [SPECIES_TOXTRICITY_GMAX] = sToxtricityLevelUpLearnset, + [SPECIES_CENTISKORCH_GMAX] = sCentiskorchLevelUpLearnset, + [SPECIES_HATTERENE_GMAX] = sHattereneLevelUpLearnset, + [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlLevelUpLearnset, + [SPECIES_ALCREMIE_GMAX] = sAlcremieLevelUpLearnset, + [SPECIES_COPPERAJAH_GMAX] = sCopperajahLevelUpLearnset, + [SPECIES_DURALUDON_GMAX] = sDuraludonLevelUpLearnset, + [SPECIES_URSHIFU_GMAX] = sUrshifuLevelUpLearnset, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, #endif }; diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 28998aae1a..523179f43c 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -1334,5 +1334,39 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderTeachableLearnset, // Enamorus [SPECIES_ENAMORUS_THERIAN] = sEnamorusTeachableLearnset, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = sVenusaurTeachableLearnset, + [SPECIES_CHARIZARD_GMAX] = sCharizardTeachableLearnset, + [SPECIES_BLASTOISE_GMAX] = sBlastoiseTeachableLearnset, + [SPECIES_BUTTERFREE_GMAX] = sButterfreeTeachableLearnset, + [SPECIES_PIKACHU_GMAX] = sPikachuTeachableLearnset, + [SPECIES_MEOWTH_GMAX] = sMeowthTeachableLearnset, + [SPECIES_MACHAMP_GMAX] = sMachampTeachableLearnset, + [SPECIES_GENGAR_GMAX] = sGengarTeachableLearnset, + [SPECIES_KINGLER_GMAX] = sKinglerTeachableLearnset, + [SPECIES_LAPRAS_GMAX] = sLaprasTeachableLearnset, + [SPECIES_EEVEE_GMAX] = sEeveeTeachableLearnset, + [SPECIES_SNORLAX_GMAX] = sSnorlaxTeachableLearnset, + [SPECIES_GARBODOR_GMAX] = sGarbodorTeachableLearnset, + [SPECIES_MELMETAL_GMAX] = sMelmetalTeachableLearnset, + [SPECIES_RILLABOOM_GMAX] = sRillaboomTeachableLearnset, + [SPECIES_CINDERACE_GMAX] = sCinderaceTeachableLearnset, + [SPECIES_INTELEON_GMAX] = sInteleonTeachableLearnset, + [SPECIES_CORVIKNIGHT_GMAX] = sCorviknightTeachableLearnset, + [SPECIES_ORBEETLE_GMAX] = sOrbeetleTeachableLearnset, + [SPECIES_DREDNAW_GMAX] = sDrednawTeachableLearnset, + [SPECIES_COALOSSAL_GMAX] = sCoalossalTeachableLearnset, + [SPECIES_FLAPPLE_GMAX] = sFlappleTeachableLearnset, + [SPECIES_APPLETUN_GMAX] = sAppletunTeachableLearnset, + [SPECIES_SANDACONDA_GMAX] = sSandacondaTeachableLearnset, + [SPECIES_TOXTRICITY_GMAX] = sToxtricityTeachableLearnset, + [SPECIES_CENTISKORCH_GMAX] = sCentiskorchTeachableLearnset, + [SPECIES_HATTERENE_GMAX] = sHattereneTeachableLearnset, + [SPECIES_GRIMMSNARL_GMAX] = sGrimmsnarlTeachableLearnset, + [SPECIES_ALCREMIE_GMAX] = sAlcremieTeachableLearnset, + [SPECIES_COPPERAJAH_GMAX] = sCopperajahTeachableLearnset, + [SPECIES_DURALUDON_GMAX] = sDuraludonTeachableLearnset, + [SPECIES_URSHIFU_GMAX] = sUrshifuTeachableLearnset, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, #endif }; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 8dbc2d2a98..33ff17d9f6 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1356,6 +1356,40 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, // Enamorus [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_CHARIZARD_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_BLASTOISE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BUTTERFREE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_PIKACHU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MEOWTH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_MACHAMP_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GENGAR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_KINGLER_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_LAPRAS_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_EEVEE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_SNORLAX_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_GARBODOR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MELMETAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_RILLABOOM_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_CINDERACE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_INTELEON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_CORVIKNIGHT_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ORBEETLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_DREDNAW_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_COALOSSAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_FLAPPLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_APPLETUN_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SANDACONDA_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_TOXTRICITY_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CENTISKORCH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_HATTERENE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GRIMMSNARL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_ALCREMIE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_COPPERAJAH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_DURALUDON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, #endif [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, }; diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 398cf28754..945779f80b 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1332,6 +1332,41 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider), SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian), + + // Gigantamax Forms + SPECIES_SPRITE(VENUSAUR_GMAX, gMonBackPic_VenusaurGmax), + SPECIES_SPRITE(CHARIZARD_GMAX, gMonBackPic_CharizardGmax), + SPECIES_SPRITE(BLASTOISE_GMAX, gMonBackPic_BlastoiseGmax), + SPECIES_SPRITE(BUTTERFREE_GMAX, gMonBackPic_ButterfreeGmax), + SPECIES_SPRITE(PIKACHU_GMAX, gMonBackPic_PikachuGmax), + SPECIES_SPRITE(MEOWTH_GMAX, gMonBackPic_MeowthGmax), + SPECIES_SPRITE(MACHAMP_GMAX, gMonBackPic_MachampGmax), + SPECIES_SPRITE(GENGAR_GMAX, gMonBackPic_GengarGmax), + SPECIES_SPRITE(KINGLER_GMAX, gMonBackPic_KinglerGmax), + SPECIES_SPRITE(LAPRAS_GMAX, gMonBackPic_LaprasGmax), + SPECIES_SPRITE(EEVEE_GMAX, gMonBackPic_EeveeGmax), + SPECIES_SPRITE(SNORLAX_GMAX, gMonBackPic_SnorlaxGmax), + SPECIES_SPRITE(GARBODOR_GMAX, gMonBackPic_GarbodorGmax), + SPECIES_SPRITE(MELMETAL_GMAX, gMonBackPic_MelmetalGmax), + SPECIES_SPRITE(RILLABOOM_GMAX, gMonBackPic_RillaboomGmax), + SPECIES_SPRITE(CINDERACE_GMAX, gMonBackPic_CinderaceGmax), + SPECIES_SPRITE(INTELEON_GMAX, gMonBackPic_InteleonGmax), + SPECIES_SPRITE(CORVIKNIGHT_GMAX, gMonBackPic_CorviknightGmax), + SPECIES_SPRITE(ORBEETLE_GMAX, gMonBackPic_OrbeetleGmax), + SPECIES_SPRITE(DREDNAW_GMAX, gMonBackPic_DrednawGmax), + SPECIES_SPRITE(COALOSSAL_GMAX, gMonBackPic_CoalossalGmax), + SPECIES_SPRITE(FLAPPLE_GMAX, gMonBackPic_FlappleGmax), + SPECIES_SPRITE(APPLETUN_GMAX, gMonBackPic_AppletunGmax), + SPECIES_SPRITE(SANDACONDA_GMAX, gMonBackPic_SandacondaGmax), + SPECIES_SPRITE(TOXTRICITY_GMAX, gMonBackPic_ToxtricityGmax), + SPECIES_SPRITE(CENTISKORCH_GMAX, gMonBackPic_CentiskorchGmax), + SPECIES_SPRITE(HATTERENE_GMAX, gMonBackPic_HattereneGmax), + SPECIES_SPRITE(GRIMMSNARL_GMAX, gMonBackPic_GrimmsnarlGmax), + SPECIES_SPRITE(ALCREMIE_GMAX, gMonBackPic_AlcremieGmax), + SPECIES_SPRITE(COPPERAJAH_GMAX, gMonBackPic_CopperajahGmax), + SPECIES_SPRITE(DURALUDON_GMAX, gMonBackPic_DuraludonGmax), + SPECIES_SPRITE(URSHIFU_GMAX, gMonBackPic_UrshifuGmax), + SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonBackPic_UrshifuRapidStrikeGmax), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 64bd433fa4..115b199aac 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -268,4 +268,5 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_ETERNATUS_ETERNAMAX] = 13, + [SPECIES_BUTTERFREE_GMAX] = 10, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 6d2ab461e9..1cdd9b7596 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -9503,6 +9503,204 @@ static const union AnimCmd sAnim_ENAMORUS_THERIAN_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; + +static const union AnimCmd sAnim_VENUSAUR_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_CHARIZARD_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_BLASTOISE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_BUTTERFREE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PIKACHU_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MEOWTH_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MACHAMP_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_GENGAR_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_KINGLER_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_LAPRAS_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_EEVEE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_SNORLAX_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_GARBODOR_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MELMETAL_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_RILLABOOM_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_CINDERACE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_INTELEON_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_CORVIKNIGHT_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ORBEETLE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DREDNAW_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_COALOSSAL_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_FLAPPLE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_APPLETUN_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_SANDACONDA_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_TOXTRICITY_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_CENTISKORCH_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_HATTERENE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_GRIMMSNARL_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALCREMIE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_COPPERAJAH_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DURALUDON_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_URSHIFU_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_URSHIFU_RAPID_STRIKE_STYLE_GMAX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; #endif static const union AnimCmd *const sAnims_NONE[] = @@ -16102,6 +16300,172 @@ static const union AnimCmd *const sAnims_ENAMORUS_THERIAN[] = sAnim_GeneralFrame0, sAnim_ENAMORUS_THERIAN_1, }; + +static const union AnimCmd *const sAnims_VENUSAUR_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_VENUSAUR_GMAX_1, +}; + +static const union AnimCmd *const sAnims_CHARIZARD_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_CHARIZARD_GMAX_1, +}; + +static const union AnimCmd *const sAnims_BLASTOISE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_BLASTOISE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_BUTTERFREE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_BUTTERFREE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_PIKACHU_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_PIKACHU_GMAX_1, +}; + +static const union AnimCmd *const sAnims_MEOWTH_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_MEOWTH_GMAX_1, +}; + +static const union AnimCmd *const sAnims_MACHAMP_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_MACHAMP_GMAX_1, +}; + +static const union AnimCmd *const sAnims_GENGAR_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_GENGAR_GMAX_1, +}; + +static const union AnimCmd *const sAnims_KINGLER_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_KINGLER_GMAX_1, +}; + +static const union AnimCmd *const sAnims_LAPRAS_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_LAPRAS_GMAX_1, +}; + +static const union AnimCmd *const sAnims_EEVEE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_EEVEE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_SNORLAX_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_SNORLAX_GMAX_1, +}; + +static const union AnimCmd *const sAnims_GARBODOR_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_GARBODOR_GMAX_1, +}; + +static const union AnimCmd *const sAnims_MELMETAL_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_MELMETAL_GMAX_1, +}; + +static const union AnimCmd *const sAnims_RILLABOOM_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_RILLABOOM_GMAX_1, +}; + +static const union AnimCmd *const sAnims_CINDERACE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_CINDERACE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_INTELEON_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_INTELEON_GMAX_1, +}; + +static const union AnimCmd *const sAnims_CORVIKNIGHT_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_CORVIKNIGHT_GMAX_1, +}; + +static const union AnimCmd *const sAnims_ORBEETLE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_ORBEETLE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_DREDNAW_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_DREDNAW_GMAX_1, +}; + +static const union AnimCmd *const sAnims_COALOSSAL_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_COALOSSAL_GMAX_1, +}; + +static const union AnimCmd *const sAnims_FLAPPLE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_FLAPPLE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_APPLETUN_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_APPLETUN_GMAX_1, +}; + +static const union AnimCmd *const sAnims_SANDACONDA_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_SANDACONDA_GMAX_1, +}; + +static const union AnimCmd *const sAnims_TOXTRICITY_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_TOXTRICITY_GMAX_1, +}; + +static const union AnimCmd *const sAnims_CENTISKORCH_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_CENTISKORCH_GMAX_1, +}; + +static const union AnimCmd *const sAnims_HATTERENE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_HATTERENE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_GRIMMSNARL_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_GRIMMSNARL_GMAX_1, +}; + +static const union AnimCmd *const sAnims_ALCREMIE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_ALCREMIE_GMAX_1, +}; + +static const union AnimCmd *const sAnims_COPPERAJAH_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_COPPERAJAH_GMAX_1, +}; + +static const union AnimCmd *const sAnims_DURALUDON_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_DURALUDON_GMAX_1, +}; + +static const union AnimCmd *const sAnims_URSHIFU_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_URSHIFU_GMAX_1, +}; + +static const union AnimCmd *const sAnims_URSHIFU_RAPID_STRIKE_STYLE_GMAX[] ={ + sAnim_GeneralFrame0, + sAnim_URSHIFU_RAPID_STRIKE_STYLE_GMAX_1, +}; + #endif #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name @@ -17376,6 +17740,40 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(CALYREX_ICE_RIDER, sAnims_CALYREX), ANIM_CMD_FULL(CALYREX_SHADOW_RIDER, sAnims_CALYREX), ANIM_CMD(ENAMORUS_THERIAN), + // Gigantamax Forms + ANIM_CMD(VENUSAUR_GMAX), + ANIM_CMD(CHARIZARD_GMAX), + ANIM_CMD(BLASTOISE_GMAX), + ANIM_CMD(BUTTERFREE_GMAX), + ANIM_CMD(PIKACHU_GMAX), + ANIM_CMD(MEOWTH_GMAX), + ANIM_CMD(MACHAMP_GMAX), + ANIM_CMD(GENGAR_GMAX), + ANIM_CMD(KINGLER_GMAX), + ANIM_CMD(LAPRAS_GMAX), + ANIM_CMD(EEVEE_GMAX), + ANIM_CMD(SNORLAX_GMAX), + ANIM_CMD(GARBODOR_GMAX), + ANIM_CMD(MELMETAL_GMAX), + ANIM_CMD(RILLABOOM_GMAX), + ANIM_CMD(CINDERACE_GMAX), + ANIM_CMD(INTELEON_GMAX), + ANIM_CMD(CORVIKNIGHT_GMAX), + ANIM_CMD(ORBEETLE_GMAX), + ANIM_CMD(DREDNAW_GMAX), + ANIM_CMD(COALOSSAL_GMAX), + ANIM_CMD(FLAPPLE_GMAX), + ANIM_CMD(APPLETUN_GMAX), + ANIM_CMD(SANDACONDA_GMAX), + ANIM_CMD(TOXTRICITY_GMAX), + ANIM_CMD(CENTISKORCH_GMAX), + ANIM_CMD(HATTERENE_GMAX), + ANIM_CMD(GRIMMSNARL_GMAX), + ANIM_CMD(ALCREMIE_GMAX), + ANIM_CMD(COPPERAJAH_GMAX), + ANIM_CMD(DURALUDON_GMAX), + ANIM_CMD(URSHIFU_GMAX), + ANIM_CMD(URSHIFU_RAPID_STRIKE_STYLE_GMAX), #endif ANIM_CMD(EGG), }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index a484b85966..71328a3dc0 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1337,6 +1337,40 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_CHARIZARD_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BLASTOISE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_BUTTERFREE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_PIKACHU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_MEOWTH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_MACHAMP_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GENGAR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_KINGLER_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LAPRAS_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_EEVEE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_SNORLAX_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GARBODOR_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_MELMETAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_RILLABOOM_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CINDERACE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_INTELEON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CORVIKNIGHT_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_ORBEETLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DREDNAW_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_COALOSSAL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLAPPLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_APPLETUN_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SANDACONDA_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CENTISKORCH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_HATTERENE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GRIMMSNARL_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ALCREMIE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_COPPERAJAH_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_DURALUDON_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Egg [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 7629834adb..36d1945b1d 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1331,6 +1331,41 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider), SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian), + + // Gigantamax Forms + SPECIES_SPRITE(VENUSAUR_GMAX, gMonFrontPic_VenusaurGmax), + SPECIES_SPRITE(CHARIZARD_GMAX, gMonFrontPic_CharizardGmax), + SPECIES_SPRITE(BLASTOISE_GMAX, gMonFrontPic_BlastoiseGmax), + SPECIES_SPRITE(BUTTERFREE_GMAX, gMonFrontPic_ButterfreeGmax), + SPECIES_SPRITE(PIKACHU_GMAX, gMonFrontPic_PikachuGmax), + SPECIES_SPRITE(MEOWTH_GMAX, gMonFrontPic_MeowthGmax), + SPECIES_SPRITE(MACHAMP_GMAX, gMonFrontPic_MachampGmax), + SPECIES_SPRITE(GENGAR_GMAX, gMonFrontPic_GengarGmax), + SPECIES_SPRITE(KINGLER_GMAX, gMonFrontPic_KinglerGmax), + SPECIES_SPRITE(LAPRAS_GMAX, gMonFrontPic_LaprasGmax), + SPECIES_SPRITE(EEVEE_GMAX, gMonFrontPic_EeveeGmax), + SPECIES_SPRITE(SNORLAX_GMAX, gMonFrontPic_SnorlaxGmax), + SPECIES_SPRITE(GARBODOR_GMAX, gMonFrontPic_GarbodorGmax), + SPECIES_SPRITE(MELMETAL_GMAX, gMonFrontPic_MelmetalGmax), + SPECIES_SPRITE(RILLABOOM_GMAX, gMonFrontPic_RillaboomGmax), + SPECIES_SPRITE(CINDERACE_GMAX, gMonFrontPic_CinderaceGmax), + SPECIES_SPRITE(INTELEON_GMAX, gMonFrontPic_InteleonGmax), + SPECIES_SPRITE(CORVIKNIGHT_GMAX, gMonFrontPic_CorviknightGmax), + SPECIES_SPRITE(ORBEETLE_GMAX, gMonFrontPic_OrbeetleGmax), + SPECIES_SPRITE(DREDNAW_GMAX, gMonFrontPic_DrednawGmax), + SPECIES_SPRITE(COALOSSAL_GMAX, gMonFrontPic_CoalossalGmax), + SPECIES_SPRITE(FLAPPLE_GMAX, gMonFrontPic_FlappleGmax), + SPECIES_SPRITE(APPLETUN_GMAX, gMonFrontPic_AppletunGmax), + SPECIES_SPRITE(SANDACONDA_GMAX, gMonFrontPic_SandacondaGmax), + SPECIES_SPRITE(TOXTRICITY_GMAX, gMonFrontPic_ToxtricityGmax), + SPECIES_SPRITE(CENTISKORCH_GMAX, gMonFrontPic_CentiskorchGmax), + SPECIES_SPRITE(HATTERENE_GMAX, gMonFrontPic_HattereneGmax), + SPECIES_SPRITE(GRIMMSNARL_GMAX, gMonFrontPic_GrimmsnarlGmax), + SPECIES_SPRITE(ALCREMIE_GMAX, gMonFrontPic_AlcremieGmax), + SPECIES_SPRITE(COPPERAJAH_GMAX, gMonFrontPic_CopperajahGmax), + SPECIES_SPRITE(DURALUDON_GMAX, gMonFrontPic_DuraludonGmax), + SPECIES_SPRITE(URSHIFU_GMAX, gMonFrontPic_UrshifuGmax), + SPECIES_SPRITE(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonFrontPic_UrshifuRapidStrikeGmax), #endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 8ef3b32319..dcf263b877 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1331,6 +1331,41 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider), SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider), SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian), + + // Gigantamax Forms + SPECIES_PAL(VENUSAUR_GMAX, gMonPalette_VenusaurGmax), + SPECIES_PAL(CHARIZARD_GMAX, gMonPalette_CharizardGmax), + SPECIES_PAL(BLASTOISE_GMAX, gMonPalette_BlastoiseGmax), + SPECIES_PAL(BUTTERFREE_GMAX, gMonPalette_ButterfreeGmax), + SPECIES_PAL(PIKACHU_GMAX, gMonPalette_PikachuGmax), + SPECIES_PAL(MEOWTH_GMAX, gMonPalette_MeowthGmax), + SPECIES_PAL(MACHAMP_GMAX, gMonPalette_MachampGmax), + SPECIES_PAL(GENGAR_GMAX, gMonPalette_GengarGmax), + SPECIES_PAL(KINGLER_GMAX, gMonPalette_KinglerGmax), + SPECIES_PAL(LAPRAS_GMAX, gMonPalette_LaprasGmax), + SPECIES_PAL(EEVEE_GMAX, gMonPalette_EeveeGmax), + SPECIES_PAL(SNORLAX_GMAX, gMonPalette_SnorlaxGmax), + SPECIES_PAL(GARBODOR_GMAX, gMonPalette_GarbodorGmax), + SPECIES_PAL(MELMETAL_GMAX, gMonPalette_MelmetalGmax), + SPECIES_PAL(RILLABOOM_GMAX, gMonPalette_RillaboomGmax), + SPECIES_PAL(CINDERACE_GMAX, gMonPalette_CinderaceGmax), + SPECIES_PAL(INTELEON_GMAX, gMonPalette_InteleonGmax), + SPECIES_PAL(CORVIKNIGHT_GMAX, gMonPalette_CorviknightGmax), + SPECIES_PAL(ORBEETLE_GMAX, gMonPalette_OrbeetleGmax), + SPECIES_PAL(DREDNAW_GMAX, gMonPalette_DrednawGmax), + SPECIES_PAL(COALOSSAL_GMAX, gMonPalette_CoalossalGmax), + SPECIES_PAL(FLAPPLE_GMAX, gMonPalette_FlappleGmax), + SPECIES_PAL(APPLETUN_GMAX, gMonPalette_AppletunGmax), + SPECIES_PAL(SANDACONDA_GMAX, gMonPalette_SandacondaGmax), + SPECIES_PAL(TOXTRICITY_GMAX, gMonPalette_ToxtricityGmax), + SPECIES_PAL(CENTISKORCH_GMAX, gMonPalette_CentiskorchGmax), + SPECIES_PAL(HATTERENE_GMAX, gMonPalette_HattereneGmax), + SPECIES_PAL(GRIMMSNARL_GMAX, gMonPalette_GrimmsnarlGmax), + SPECIES_PAL(ALCREMIE_GMAX, gMonPalette_AlcremieGmax), + SPECIES_PAL(COPPERAJAH_GMAX, gMonPalette_CopperajahGmax), + SPECIES_PAL(DURALUDON_GMAX, gMonPalette_DuraludonGmax), + SPECIES_PAL(URSHIFU_GMAX, gMonPalette_UrshifuGmax), + SPECIES_PAL(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonPalette_UrshifuRapidStrikeGmax), #endif SPECIES_PAL(EGG, gMonPalette_Egg), }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 64a999c49e..334f29f927 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1330,6 +1330,41 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider), SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian), + + // Gigantamax Forms + SPECIES_SHINY_PAL(VENUSAUR_GMAX, gMonShinyPalette_VenusaurGmax), + SPECIES_SHINY_PAL(CHARIZARD_GMAX, gMonShinyPalette_CharizardGmax), + SPECIES_SHINY_PAL(BLASTOISE_GMAX, gMonShinyPalette_BlastoiseGmax), + SPECIES_SHINY_PAL(BUTTERFREE_GMAX, gMonShinyPalette_ButterfreeGmax), + SPECIES_SHINY_PAL(PIKACHU_GMAX, gMonShinyPalette_PikachuGmax), + SPECIES_SHINY_PAL(MEOWTH_GMAX, gMonShinyPalette_MeowthGmax), + SPECIES_SHINY_PAL(MACHAMP_GMAX, gMonShinyPalette_MachampGmax), + SPECIES_SHINY_PAL(GENGAR_GMAX, gMonShinyPalette_GengarGmax), + SPECIES_SHINY_PAL(KINGLER_GMAX, gMonShinyPalette_KinglerGmax), + SPECIES_SHINY_PAL(LAPRAS_GMAX, gMonShinyPalette_LaprasGmax), + SPECIES_SHINY_PAL(EEVEE_GMAX, gMonShinyPalette_EeveeGmax), + SPECIES_SHINY_PAL(SNORLAX_GMAX, gMonShinyPalette_SnorlaxGmax), + SPECIES_SHINY_PAL(GARBODOR_GMAX, gMonShinyPalette_GarbodorGmax), + SPECIES_SHINY_PAL(MELMETAL_GMAX, gMonShinyPalette_MelmetalGmax), + SPECIES_SHINY_PAL(RILLABOOM_GMAX, gMonShinyPalette_RillaboomGmax), + SPECIES_SHINY_PAL(CINDERACE_GMAX, gMonShinyPalette_CinderaceGmax), + SPECIES_SHINY_PAL(INTELEON_GMAX, gMonShinyPalette_InteleonGmax), + SPECIES_SHINY_PAL(CORVIKNIGHT_GMAX, gMonShinyPalette_CorviknightGmax), + SPECIES_SHINY_PAL(ORBEETLE_GMAX, gMonShinyPalette_OrbeetleGmax), + SPECIES_SHINY_PAL(DREDNAW_GMAX, gMonShinyPalette_DrednawGmax), + SPECIES_SHINY_PAL(COALOSSAL_GMAX, gMonShinyPalette_CoalossalGmax), + SPECIES_SHINY_PAL(FLAPPLE_GMAX, gMonShinyPalette_FlappleGmax), + SPECIES_SHINY_PAL(APPLETUN_GMAX, gMonShinyPalette_AppletunGmax), + SPECIES_SHINY_PAL(SANDACONDA_GMAX, gMonShinyPalette_SandacondaGmax), + SPECIES_SHINY_PAL(TOXTRICITY_GMAX, gMonShinyPalette_ToxtricityGmax), + SPECIES_SHINY_PAL(CENTISKORCH_GMAX, gMonShinyPalette_CentiskorchGmax), + SPECIES_SHINY_PAL(HATTERENE_GMAX, gMonShinyPalette_HattereneGmax), + SPECIES_SHINY_PAL(GRIMMSNARL_GMAX, gMonShinyPalette_GrimmsnarlGmax), + SPECIES_SHINY_PAL(ALCREMIE_GMAX, gMonShinyPalette_AlcremieGmax), + SPECIES_SHINY_PAL(COPPERAJAH_GMAX, gMonShinyPalette_CopperajahGmax), + SPECIES_SHINY_PAL(DURALUDON_GMAX, gMonShinyPalette_DuraludonGmax), + SPECIES_SHINY_PAL(URSHIFU_GMAX, gMonShinyPalette_UrshifuGmax), + SPECIES_SHINY_PAL(URSHIFU_RAPID_STRIKE_STYLE_GMAX, gMonShinyPalette_UrshifuRapidStrikeGmax), #endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index ec452b31ba..7e6077b6f6 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1336,5 +1336,39 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { // Calyrex [SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"), [SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"), + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = _("Venusaur"), + [SPECIES_CHARIZARD_GMAX] = _("Charizard"), + [SPECIES_BLASTOISE_GMAX] = _("Blastoise"), + [SPECIES_BUTTERFREE_GMAX] = _("Butterfree"), + [SPECIES_PIKACHU_GMAX] = _("Pikachu"), + [SPECIES_MEOWTH_GMAX] = _("Meowth"), + [SPECIES_MACHAMP_GMAX] = _("Machamp"), + [SPECIES_GENGAR_GMAX] = _("Gengar"), + [SPECIES_KINGLER_GMAX] = _("Kingler"), + [SPECIES_LAPRAS_GMAX] = _("Lapras"), + [SPECIES_EEVEE_GMAX] = _("Eevee"), + [SPECIES_SNORLAX_GMAX] = _("Snorlax"), + [SPECIES_GARBODOR_GMAX] = _("Garbodor"), + [SPECIES_MELMETAL_GMAX] = _("Melmetal"), + [SPECIES_RILLABOOM_GMAX] = _("Rillaboom"), + [SPECIES_CINDERACE_GMAX] = _("Cinderace"), + [SPECIES_INTELEON_GMAX] = _("Inteleon"), + [SPECIES_CORVIKNIGHT_GMAX] = _("Corviknigh"), + [SPECIES_ORBEETLE_GMAX] = _("Orbeetle"), + [SPECIES_DREDNAW_GMAX] = _("Drednaw"), + [SPECIES_COALOSSAL_GMAX] = _("Coalossal"), + [SPECIES_FLAPPLE_GMAX] = _("Flapple"), + [SPECIES_APPLETUN_GMAX] = _("Appletun"), + [SPECIES_SANDACONDA_GMAX] = _("Sandaconda"), + [SPECIES_TOXTRICITY_GMAX] = _("Toxtricity"), + [SPECIES_CENTISKORCH_GMAX] = _("Centiskorc"), + [SPECIES_HATTERENE_GMAX] = _("Hatterene"), + [SPECIES_GRIMMSNARL_GMAX] = _("Grimmsnarl"), + [SPECIES_ALCREMIE_GMAX] = _("Alcremie"), + [SPECIES_COPPERAJAH_GMAX] = _("Copperajah"), + [SPECIES_DURALUDON_GMAX] = _("Duraludon"), + [SPECIES_URSHIFU_GMAX] = _("Urshifu"), + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = _("Urshifu"), #endif }; diff --git a/src/pokemon.c b/src/pokemon.c index c8164d7462..1ab50666a6 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1671,6 +1671,40 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX - 1] = NATIONAL_DEX_VENUSAUR, + [SPECIES_CHARIZARD_GMAX - 1] = NATIONAL_DEX_CHARIZARD, + [SPECIES_BLASTOISE_GMAX - 1] = NATIONAL_DEX_BLASTOISE, + [SPECIES_BUTTERFREE_GMAX - 1] = NATIONAL_DEX_BUTTERFREE, + [SPECIES_PIKACHU_GMAX - 1] = NATIONAL_DEX_PIKACHU, + [SPECIES_MEOWTH_GMAX - 1] = NATIONAL_DEX_MEOWTH, + [SPECIES_MACHAMP_GMAX - 1] = NATIONAL_DEX_MACHAMP, + [SPECIES_GENGAR_GMAX - 1] = NATIONAL_DEX_GENGAR, + [SPECIES_KINGLER_GMAX - 1] = NATIONAL_DEX_KINGLER, + [SPECIES_LAPRAS_GMAX - 1] = NATIONAL_DEX_LAPRAS, + [SPECIES_EEVEE_GMAX - 1] = NATIONAL_DEX_EEVEE, + [SPECIES_SNORLAX_GMAX - 1] = NATIONAL_DEX_SNORLAX, + [SPECIES_GARBODOR_GMAX - 1] = NATIONAL_DEX_GARBODOR, + [SPECIES_MELMETAL_GMAX - 1] = NATIONAL_DEX_MELMETAL, + [SPECIES_RILLABOOM_GMAX - 1] = NATIONAL_DEX_RILLABOOM, + [SPECIES_CINDERACE_GMAX - 1] = NATIONAL_DEX_CINDERACE, + [SPECIES_INTELEON_GMAX - 1] = NATIONAL_DEX_INTELEON, + [SPECIES_CORVIKNIGHT_GMAX - 1] = NATIONAL_DEX_CORVIKNIGHT, + [SPECIES_ORBEETLE_GMAX - 1] = NATIONAL_DEX_ORBEETLE, + [SPECIES_DREDNAW_GMAX - 1] = NATIONAL_DEX_DREDNAW, + [SPECIES_COALOSSAL_GMAX - 1] = NATIONAL_DEX_COALOSSAL, + [SPECIES_FLAPPLE_GMAX - 1] = NATIONAL_DEX_FLAPPLE, + [SPECIES_APPLETUN_GMAX - 1] = NATIONAL_DEX_APPLETUN, + [SPECIES_SANDACONDA_GMAX - 1] = NATIONAL_DEX_SANDACONDA, + [SPECIES_TOXTRICITY_GMAX - 1] = NATIONAL_DEX_TOXTRICITY, + [SPECIES_CENTISKORCH_GMAX - 1] = NATIONAL_DEX_CENTISKORCH, + [SPECIES_HATTERENE_GMAX - 1] = NATIONAL_DEX_HATTERENE, + [SPECIES_GRIMMSNARL_GMAX - 1] = NATIONAL_DEX_GRIMMSNARL, + [SPECIES_ALCREMIE_GMAX - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_COPPERAJAH_GMAX - 1] = NATIONAL_DEX_COPPERAJAH, + [SPECIES_DURALUDON_GMAX - 1] = NATIONAL_DEX_DURALUDON, + [SPECIES_URSHIFU_GMAX - 1] = NATIONAL_DEX_URSHIFU, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX - 1] = NATIONAL_DEX_URSHIFU, #endif }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index c9dae53432..ef528fe317 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1293,6 +1293,40 @@ const u8 *const gMonIconTable[] = [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, + // Gigantamax Forms + [SPECIES_VENUSAUR_GMAX] = gMonIcon_VenusaurGmax, + [SPECIES_CHARIZARD_GMAX] = gMonIcon_CharizardGmax, + [SPECIES_BLASTOISE_GMAX] = gMonIcon_BlastoiseGmax, + [SPECIES_BUTTERFREE_GMAX] = gMonIcon_ButterfreeGmax, + [SPECIES_PIKACHU_GMAX] = gMonIcon_PikachuGmax, + [SPECIES_MEOWTH_GMAX] = gMonIcon_MeowthGmax, + [SPECIES_MACHAMP_GMAX] = gMonIcon_MachampGmax, + [SPECIES_GENGAR_GMAX] = gMonIcon_GengarGmax, + [SPECIES_KINGLER_GMAX] = gMonIcon_KinglerGmax, + [SPECIES_LAPRAS_GMAX] = gMonIcon_LaprasGmax, + [SPECIES_EEVEE_GMAX] = gMonIcon_EeveeGmax, + [SPECIES_SNORLAX_GMAX] = gMonIcon_SnorlaxGmax, + [SPECIES_GARBODOR_GMAX] = gMonIcon_GarbodorGmax, + [SPECIES_MELMETAL_GMAX] = gMonIcon_MelmetalGmax, + [SPECIES_RILLABOOM_GMAX] = gMonIcon_RillaboomGmax, + [SPECIES_CINDERACE_GMAX] = gMonIcon_CinderaceGmax, + [SPECIES_INTELEON_GMAX] = gMonIcon_InteleonGmax, + [SPECIES_CORVIKNIGHT_GMAX] = gMonIcon_CorviknightGmax, + [SPECIES_ORBEETLE_GMAX] = gMonIcon_OrbeetleGmax, + [SPECIES_DREDNAW_GMAX] = gMonIcon_DrednawGmax, + [SPECIES_COALOSSAL_GMAX] = gMonIcon_CoalossalGmax, + [SPECIES_FLAPPLE_GMAX] = gMonIcon_FlappleGmax, + [SPECIES_APPLETUN_GMAX] = gMonIcon_AppletunGmax, + [SPECIES_SANDACONDA_GMAX] = gMonIcon_SandacondaGmax, + [SPECIES_TOXTRICITY_GMAX] = gMonIcon_ToxtricityGmax, + [SPECIES_CENTISKORCH_GMAX] = gMonIcon_CentiskorchGmax, + [SPECIES_HATTERENE_GMAX] = gMonIcon_HattereneGmax, + [SPECIES_GRIMMSNARL_GMAX] = gMonIcon_GrimmsnarlGmax, + [SPECIES_ALCREMIE_GMAX] = gMonIcon_AlcremieGmax, + [SPECIES_COPPERAJAH_GMAX] = gMonIcon_CopperajahGmax, + [SPECIES_DURALUDON_GMAX] = gMonIcon_DuraludonGmax, + [SPECIES_URSHIFU_GMAX] = gMonIcon_UrshifuGmax, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = gMonIcon_UrshifuRapidStrikeGmax, #endif [SPECIES_EGG] = gMonIcon_Egg, }; @@ -2537,6 +2571,39 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_CALYREX_ICE_RIDER] = 0, [SPECIES_CALYREX_SHADOW_RIDER] = 0, [SPECIES_ENAMORUS_THERIAN] = 1, + [SPECIES_VENUSAUR_GMAX] = 0, + [SPECIES_CHARIZARD_GMAX] = 0, + [SPECIES_BLASTOISE_GMAX] = 0, + [SPECIES_BUTTERFREE_GMAX] = 0, + [SPECIES_PIKACHU_GMAX] = 2, + [SPECIES_MEOWTH_GMAX] = 1, + [SPECIES_MACHAMP_GMAX] = 0, + [SPECIES_GENGAR_GMAX] = 2, + [SPECIES_KINGLER_GMAX] = 0, + [SPECIES_LAPRAS_GMAX] = 2, + [SPECIES_EEVEE_GMAX] = 2, + [SPECIES_SNORLAX_GMAX] = 3, + [SPECIES_GARBODOR_GMAX] = 0, + [SPECIES_MELMETAL_GMAX] = 0, + [SPECIES_RILLABOOM_GMAX] = 1, + [SPECIES_CINDERACE_GMAX] = 0, + [SPECIES_INTELEON_GMAX] = 0, + [SPECIES_CORVIKNIGHT_GMAX] = 0, + [SPECIES_ORBEETLE_GMAX] = 0, + [SPECIES_DREDNAW_GMAX] = 0, + [SPECIES_COALOSSAL_GMAX] = 0, + [SPECIES_FLAPPLE_GMAX] = 1, + [SPECIES_APPLETUN_GMAX] = 1, + [SPECIES_SANDACONDA_GMAX] = 1, + [SPECIES_TOXTRICITY_GMAX] = 0, + [SPECIES_CENTISKORCH_GMAX] = 0, + [SPECIES_HATTERENE_GMAX] = 0, + [SPECIES_GRIMMSNARL_GMAX] = 0, + [SPECIES_ALCREMIE_GMAX] = 1, + [SPECIES_COPPERAJAH_GMAX] = 0, + [SPECIES_DURALUDON_GMAX] = 0, + [SPECIES_URSHIFU_GMAX] = 0, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = 0, #endif [SPECIES_EGG] = 1, };