diff --git a/graphics/pokemon/alolan_diglett/back.png b/graphics/pokemon/alolan_diglett/back.png new file mode 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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/include/constants/species.h b/include/constants/species.h index cde0daa398..505d744087 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -876,9 +876,28 @@ #define SPECIES_KYUREM_WHITE 868 #define SPECIES_MEOWSTIC_F 869 +#define SPECIES_ALOLAN_RATTATA 870 +#define SPECIES_ALOLAN_RATICATE 871 +#define SPECIES_ALOLAN_RAICHU 872 +#define SPECIES_ALOLAN_SANDSHREW 873 +#define SPECIES_ALOLAN_SANDSLASH 874 +#define SPECIES_ALOLAN_VULPIX 875 +#define SPECIES_ALOLAN_NINETALES 876 +#define SPECIES_ALOLAN_DIGLETT 877 +#define SPECIES_ALOLAN_DUGTRIO 878 +#define SPECIES_ALOLAN_MEOWTH 879 +#define SPECIES_ALOLAN_PERSIAN 880 +#define SPECIES_ALOLAN_GEODUDE 881 +#define SPECIES_ALOLAN_GRAVELER 882 +#define SPECIES_ALOLAN_GOLEM 883 +#define SPECIES_ALOLAN_GRIMER 884 +#define SPECIES_ALOLAN_MUK 885 +#define SPECIES_ALOLAN_EXEGGUTOR 886 +#define SPECIES_ALOLAN_MAROWAK 887 + // TODO: forms -#define SPECIES_EGG 870 +#define SPECIES_EGG 888 #define NUM_SPECIES SPECIES_EGG // Unown forms, not actual species diff --git a/include/graphics.h b/include/graphics.h index 1aee00908b..8b736f70b4 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3572,6 +3572,79 @@ extern const u32 gMonBackPic_MegaDiancie[]; extern const u32 gMonPalette_MegaDiancie[]; extern const u32 gMonShinyPalette_MegaDiancie[]; +extern const u32 gMonFrontPic_AlolanRattata[]; +extern const u32 gMonBackPic_AlolanRattata[]; +extern const u32 gMonPalette_AlolanRattata[]; +extern const u32 gMonShinyPalette_AlolanRattata[]; +extern const u32 gMonFrontPic_AlolanRaticate[]; +extern const u32 gMonBackPic_AlolanRaticate[]; +extern const u32 gMonPalette_AlolanRaticate[]; +extern const u32 gMonShinyPalette_AlolanRaticate[]; +extern const u32 gMonFrontPic_AlolanRaichu[]; +extern const u32 gMonBackPic_AlolanRaichu[]; +extern const u32 gMonPalette_AlolanRaichu[]; +extern const u32 gMonShinyPalette_AlolanRaichu[]; +extern const u32 gMonFrontPic_AlolanSandshrew[]; +extern const u32 gMonBackPic_AlolanSandshrew[]; +extern const u32 gMonPalette_AlolanSandshrew[]; +extern const u32 gMonShinyPalette_AlolanSandshrew[]; +extern const u32 gMonFrontPic_AlolanSandslash[]; +extern const u32 gMonBackPic_AlolanSandslash[]; +extern const u32 gMonPalette_AlolanSandslash[]; +extern const u32 gMonShinyPalette_AlolanSandslash[]; +extern const u32 gMonFrontPic_AlolanVulpix[]; +extern const u32 gMonBackPic_AlolanVulpix[]; +extern const u32 gMonPalette_AlolanVulpix[]; +extern const u32 gMonShinyPalette_AlolanVulpix[]; +extern const u32 gMonFrontPic_AlolanNinetales[]; +extern const u32 gMonBackPic_AlolanNinetales[]; +extern const u32 gMonPalette_AlolanNinetales[]; +extern const u32 gMonShinyPalette_AlolanNinetales[]; +extern const u32 gMonFrontPic_AlolanDiglett[]; +extern const u32 gMonBackPic_AlolanDiglett[]; +extern const u32 gMonPalette_AlolanDiglett[]; +extern const u32 gMonShinyPalette_AlolanDiglett[]; +extern const u32 gMonFrontPic_AlolanDugtrio[]; +extern const u32 gMonBackPic_AlolanDugtrio[]; +extern const u32 gMonPalette_AlolanDugtrio[]; +extern const u32 gMonShinyPalette_AlolanDugtrio[]; +extern const u32 gMonFrontPic_AlolanMeowth[]; +extern const u32 gMonBackPic_AlolanMeowth[]; +extern const u32 gMonPalette_AlolanMeowth[]; +extern const u32 gMonShinyPalette_AlolanMeowth[]; +extern const u32 gMonFrontPic_AlolanPersian[]; +extern const u32 gMonBackPic_AlolanPersian[]; +extern const u32 gMonPalette_AlolanPersian[]; +extern const u32 gMonShinyPalette_AlolanPersian[]; +extern const u32 gMonFrontPic_AlolanGeodude[]; +extern const u32 gMonBackPic_AlolanGeodude[]; +extern const u32 gMonPalette_AlolanGeodude[]; +extern const u32 gMonShinyPalette_AlolanGeodude[]; +extern const u32 gMonFrontPic_AlolanGraveler[]; +extern const u32 gMonBackPic_AlolanGraveler[]; +extern const u32 gMonPalette_AlolanGraveler[]; +extern const u32 gMonShinyPalette_AlolanGraveler[]; +extern const u32 gMonFrontPic_AlolanGolem[]; +extern const u32 gMonBackPic_AlolanGolem[]; +extern const u32 gMonPalette_AlolanGolem[]; +extern const u32 gMonShinyPalette_AlolanGolem[]; +extern const u32 gMonFrontPic_AlolanGrimer[]; +extern const u32 gMonBackPic_AlolanGrimer[]; +extern const u32 gMonPalette_AlolanGrimer[]; +extern const u32 gMonShinyPalette_AlolanGrimer[]; +extern const u32 gMonFrontPic_AlolanMuk[]; +extern const u32 gMonBackPic_AlolanMuk[]; +extern const u32 gMonPalette_AlolanMuk[]; +extern const u32 gMonShinyPalette_AlolanMuk[]; +extern const u32 gMonFrontPic_AlolanExeggutor[]; +extern const u32 gMonBackPic_AlolanExeggutor[]; +extern const u32 gMonPalette_AlolanExeggutor[]; +extern const u32 gMonShinyPalette_AlolanExeggutor[]; +extern const u32 gMonFrontPic_AlolanMarowak[]; +extern const u32 gMonBackPic_AlolanMarowak[]; +extern const u32 gMonPalette_AlolanMarowak[]; +extern const u32 gMonShinyPalette_AlolanMarowak[]; + extern const u8 gMonIcon_QuestionMark[]; extern const u8 gMonIcon_Bulbasaur[]; extern const u8 gMonIcon_Ivysaur[]; @@ -4469,6 +4542,25 @@ extern const u8 gMonIcon_MegaGallade[]; extern const u8 gMonIcon_MegaAudino[]; extern const u8 gMonIcon_MegaDiancie[]; +extern const u8 gMonIcon_AlolanRattata[]; +extern const u8 gMonIcon_AlolanRaticate[]; +extern const u8 gMonIcon_AlolanRaichu[]; +extern const u8 gMonIcon_AlolanSandshrew[]; +extern const u8 gMonIcon_AlolanSandslash[]; +extern const u8 gMonIcon_AlolanVulpix[]; +extern const u8 gMonIcon_AlolanNinetales[]; +extern const u8 gMonIcon_AlolanDiglett[]; +extern const u8 gMonIcon_AlolanDugtrio[]; +extern const u8 gMonIcon_AlolanMeowth[]; +extern const u8 gMonIcon_AlolanPersian[]; +extern const u8 gMonIcon_AlolanGeodude[]; +extern const u8 gMonIcon_AlolanGraveler[]; +extern const u8 gMonIcon_AlolanGolem[]; +extern const u8 gMonIcon_AlolanGrimer[]; +extern const u8 gMonIcon_AlolanMuk[]; +extern const u8 gMonIcon_AlolanExeggutor[]; +extern const u8 gMonIcon_AlolanMarowak[]; + extern const u8 gMonFootprint_QuestionMark[]; extern const u8 gMonFootprint_Bulbasaur[]; extern const u8 gMonFootprint_Ivysaur[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index d3fe523e4f..4e28ff9156 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -3535,6 +3535,79 @@ const u32 gMonBackPic_MegaDiancie[] = INCBIN_U32("graphics/pokemon/mega_diancie/ const u32 gMonPalette_MegaDiancie[] = INCBIN_U32("graphics/pokemon/mega_diancie/normal.gbapal.lz"); const u32 gMonShinyPalette_MegaDiancie[] = INCBIN_U32("graphics/pokemon/mega_diancie/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanRattata[] = INCBIN_U32("graphics/pokemon/alolan_rattata/front.4bpp.lz"); +const u32 gMonBackPic_AlolanRattata[] = INCBIN_U32("graphics/pokemon/alolan_rattata/back.4bpp.lz"); +const u32 gMonPalette_AlolanRattata[] = INCBIN_U32("graphics/pokemon/alolan_rattata/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanRattata[] = INCBIN_U32("graphics/pokemon/alolan_rattata/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanRaticate[] = INCBIN_U32("graphics/pokemon/alolan_raticate/front.4bpp.lz"); +const u32 gMonBackPic_AlolanRaticate[] = INCBIN_U32("graphics/pokemon/alolan_raticate/back.4bpp.lz"); +const u32 gMonPalette_AlolanRaticate[] = INCBIN_U32("graphics/pokemon/alolan_raticate/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanRaticate[] = INCBIN_U32("graphics/pokemon/alolan_raticate/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanRaichu[] = INCBIN_U32("graphics/pokemon/alolan_raichu/front.4bpp.lz"); +const u32 gMonBackPic_AlolanRaichu[] = INCBIN_U32("graphics/pokemon/alolan_raichu/back.4bpp.lz"); +const u32 gMonPalette_AlolanRaichu[] = INCBIN_U32("graphics/pokemon/alolan_raichu/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanRaichu[] = INCBIN_U32("graphics/pokemon/alolan_raichu/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanSandshrew[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/front.4bpp.lz"); +const u32 gMonBackPic_AlolanSandshrew[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/back.4bpp.lz"); +const u32 gMonPalette_AlolanSandshrew[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanSandshrew[] = INCBIN_U32("graphics/pokemon/alolan_sandshrew/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanSandslash[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/front.4bpp.lz"); +const u32 gMonBackPic_AlolanSandslash[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/back.4bpp.lz"); +const u32 gMonPalette_AlolanSandslash[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanSandslash[] = INCBIN_U32("graphics/pokemon/alolan_sandslash/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanVulpix[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/front.4bpp.lz"); +const u32 gMonBackPic_AlolanVulpix[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/back.4bpp.lz"); +const u32 gMonPalette_AlolanVulpix[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanVulpix[] = INCBIN_U32("graphics/pokemon/alolan_vulpix/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanNinetales[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/front.4bpp.lz"); +const u32 gMonBackPic_AlolanNinetales[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/back.4bpp.lz"); +const u32 gMonPalette_AlolanNinetales[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanNinetales[] = INCBIN_U32("graphics/pokemon/alolan_ninetales/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanDiglett[] = INCBIN_U32("graphics/pokemon/alolan_diglett/front.4bpp.lz"); +const u32 gMonBackPic_AlolanDiglett[] = INCBIN_U32("graphics/pokemon/alolan_diglett/back.4bpp.lz"); +const u32 gMonPalette_AlolanDiglett[] = INCBIN_U32("graphics/pokemon/alolan_diglett/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanDiglett[] = INCBIN_U32("graphics/pokemon/alolan_diglett/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanDugtrio[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/front.4bpp.lz"); +const u32 gMonBackPic_AlolanDugtrio[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/back.4bpp.lz"); +const u32 gMonPalette_AlolanDugtrio[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanDugtrio[] = INCBIN_U32("graphics/pokemon/alolan_dugtrio/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanMeowth[] = INCBIN_U32("graphics/pokemon/alolan_meowth/front.4bpp.lz"); +const u32 gMonBackPic_AlolanMeowth[] = INCBIN_U32("graphics/pokemon/alolan_meowth/back.4bpp.lz"); +const u32 gMonPalette_AlolanMeowth[] = INCBIN_U32("graphics/pokemon/alolan_meowth/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanMeowth[] = INCBIN_U32("graphics/pokemon/alolan_meowth/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanPersian[] = INCBIN_U32("graphics/pokemon/alolan_persian/front.4bpp.lz"); +const u32 gMonBackPic_AlolanPersian[] = INCBIN_U32("graphics/pokemon/alolan_persian/back.4bpp.lz"); +const u32 gMonPalette_AlolanPersian[] = INCBIN_U32("graphics/pokemon/alolan_persian/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanPersian[] = INCBIN_U32("graphics/pokemon/alolan_persian/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanGeodude[] = INCBIN_U32("graphics/pokemon/alolan_geodude/front.4bpp.lz"); +const u32 gMonBackPic_AlolanGeodude[] = INCBIN_U32("graphics/pokemon/alolan_geodude/back.4bpp.lz"); +const u32 gMonPalette_AlolanGeodude[] = INCBIN_U32("graphics/pokemon/alolan_geodude/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanGeodude[] = INCBIN_U32("graphics/pokemon/alolan_geodude/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanGraveler[] = INCBIN_U32("graphics/pokemon/alolan_graveler/front.4bpp.lz"); +const u32 gMonBackPic_AlolanGraveler[] = INCBIN_U32("graphics/pokemon/alolan_graveler/back.4bpp.lz"); +const u32 gMonPalette_AlolanGraveler[] = INCBIN_U32("graphics/pokemon/alolan_graveler/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanGraveler[] = INCBIN_U32("graphics/pokemon/alolan_graveler/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanGolem[] = INCBIN_U32("graphics/pokemon/alolan_golem/front.4bpp.lz"); +const u32 gMonBackPic_AlolanGolem[] = INCBIN_U32("graphics/pokemon/alolan_golem/back.4bpp.lz"); +const u32 gMonPalette_AlolanGolem[] = INCBIN_U32("graphics/pokemon/alolan_golem/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanGolem[] = INCBIN_U32("graphics/pokemon/alolan_golem/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanGrimer[] = INCBIN_U32("graphics/pokemon/alolan_grimer/front.4bpp.lz"); +const u32 gMonBackPic_AlolanGrimer[] = INCBIN_U32("graphics/pokemon/alolan_grimer/back.4bpp.lz"); +const u32 gMonPalette_AlolanGrimer[] = INCBIN_U32("graphics/pokemon/alolan_grimer/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanGrimer[] = INCBIN_U32("graphics/pokemon/alolan_grimer/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanMuk[] = INCBIN_U32("graphics/pokemon/alolan_muk/front.4bpp.lz"); +const u32 gMonBackPic_AlolanMuk[] = INCBIN_U32("graphics/pokemon/alolan_muk/back.4bpp.lz"); +const u32 gMonPalette_AlolanMuk[] = INCBIN_U32("graphics/pokemon/alolan_muk/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanMuk[] = INCBIN_U32("graphics/pokemon/alolan_muk/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanExeggutor[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/front.4bpp.lz"); +const u32 gMonBackPic_AlolanExeggutor[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/back.4bpp.lz"); +const u32 gMonPalette_AlolanExeggutor[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanExeggutor[] = INCBIN_U32("graphics/pokemon/alolan_exeggutor/shiny.gbapal.lz"); +const u32 gMonFrontPic_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_marowak/front.4bpp.lz"); +const u32 gMonBackPic_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_marowak/back.4bpp.lz"); +const u32 gMonPalette_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_marowak/normal.gbapal.lz"); +const u32 gMonShinyPalette_AlolanMarowak[] = INCBIN_U32("graphics/pokemon/alolan_marowak/shiny.gbapal.lz"); + const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp"); const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp"); @@ -4432,6 +4505,25 @@ const u8 gMonIcon_MegaGallade[] = INCBIN_U8("graphics/pokemon/mega_gallade/icon. const u8 gMonIcon_MegaAudino[] = INCBIN_U8("graphics/pokemon/mega_audino/icon.4bpp"); const u8 gMonIcon_MegaDiancie[] = INCBIN_U8("graphics/pokemon/mega_diancie/icon.4bpp"); +const u8 gMonIcon_AlolanRattata[] = INCBIN_U8("graphics/pokemon/alolan_rattata/icon.4bpp"); +const u8 gMonIcon_AlolanRaticate[] = INCBIN_U8("graphics/pokemon/alolan_raticate/icon.4bpp"); +const u8 gMonIcon_AlolanRaichu[] = INCBIN_U8("graphics/pokemon/alolan_raichu/icon.4bpp"); +const u8 gMonIcon_AlolanSandshrew[] = INCBIN_U8("graphics/pokemon/alolan_sandshrew/icon.4bpp"); +const u8 gMonIcon_AlolanSandslash[] = INCBIN_U8("graphics/pokemon/alolan_sandslash/icon.4bpp"); +const u8 gMonIcon_AlolanVulpix[] = INCBIN_U8("graphics/pokemon/alolan_vulpix/icon.4bpp"); +const u8 gMonIcon_AlolanNinetales[] = INCBIN_U8("graphics/pokemon/alolan_ninetales/icon.4bpp"); +const u8 gMonIcon_AlolanDiglett[] = INCBIN_U8("graphics/pokemon/alolan_diglett/icon.4bpp"); +const u8 gMonIcon_AlolanDugtrio[] = INCBIN_U8("graphics/pokemon/alolan_dugtrio/icon.4bpp"); +const u8 gMonIcon_AlolanMeowth[] = INCBIN_U8("graphics/pokemon/alolan_meowth/icon.4bpp"); +const u8 gMonIcon_AlolanPersian[] = INCBIN_U8("graphics/pokemon/alolan_persian/icon.4bpp"); +const u8 gMonIcon_AlolanGeodude[] = INCBIN_U8("graphics/pokemon/alolan_geodude/icon.4bpp"); +const u8 gMonIcon_AlolanGraveler[] = INCBIN_U8("graphics/pokemon/alolan_graveler/icon.4bpp"); +const u8 gMonIcon_AlolanGolem[] = INCBIN_U8("graphics/pokemon/alolan_golem/icon.4bpp"); +const u8 gMonIcon_AlolanGrimer[] = INCBIN_U8("graphics/pokemon/alolan_grimer/icon.4bpp"); +const u8 gMonIcon_AlolanMuk[] = INCBIN_U8("graphics/pokemon/alolan_muk/icon.4bpp"); +const u8 gMonIcon_AlolanExeggutor[] = INCBIN_U8("graphics/pokemon/alolan_exeggutor/icon.4bpp"); +const u8 gMonIcon_AlolanMarowak[] = INCBIN_U8("graphics/pokemon/alolan_marowak/icon.4bpp"); + const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp"); const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp"); diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index ff699953d9..a544e7f75e 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -21699,4 +21699,465 @@ const struct BaseStats gBaseStats[] = .abilities = {ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY}, .bodyColor = BODY_COLOR_YELLOW, }, + + [SPECIES_ALOLAN_RATTATA] = + { + .baseHP = 30, + .baseAttack = 56, + .baseDefense = 35, + .baseSpeed = 72, + .baseSpAttack = 25, + .baseSpDefense = 35, + .type1 = TYPE_DARK, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 51, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GLUTTONY, ABILITY_HUSTLE}, + .abilityHidden = ABILITY_THICK_FAT, + .bodyColor = BODY_COLOR_BLACK, + }, + + [SPECIES_ALOLAN_RATICATE] = + { + .baseHP = 75, + .baseAttack = 71, + .baseDefense = 70, + .baseSpeed = 77, + .baseSpAttack = 40, + .baseSpDefense = 80, + .type1 = TYPE_DARK, + .type2 = TYPE_NORMAL, + .catchRate = 127, + .expYield = 145, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GLUTTONY, ABILITY_HUSTLE}, + .abilityHidden = ABILITY_THICK_FAT, + .bodyColor = BODY_COLOR_BLACK, + }, + + [SPECIES_ALOLAN_RAICHU] = + { + .baseHP = 60, + .baseAttack = 85, + .baseDefense = 50, + .baseSpeed = 110, + .baseSpAttack = 95, + .baseSpDefense = 85, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 75, + .expYield = 218, + .evYield_Speed = 3, + .evYield_SpAttack = 0, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .abilities = {ABILITY_SURGE_SURFER, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BROWN, + }, + + [SPECIES_ALOLAN_SANDSHREW] = + { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 90, + .baseSpeed = 40, + .baseSpAttack = 10, + .baseSpDefense = 35, + .type1 = TYPE_ICE, + .type2 = TYPE_STEEL, + .catchRate = 255, + .expYield = 60, + .evYield_Defense = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_GRIP_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_SNOW_CLOAK, ABILITY_NONE}, + .abilityHidden = ABILITY_SLUSH_RUSH, + .bodyColor = BODY_COLOR_BLUE, + }, + + [SPECIES_ALOLAN_SANDSLASH] = + { + .baseHP = 75, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 65, + .baseSpAttack = 25, + .baseSpDefense = 65, + .type1 = TYPE_ICE, + .type2 = TYPE_STEEL, + .catchRate = 90, + .expYield = 158, + .evYield_Defense = 2, + .evYield_SpAttack = 0, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_SNOW_CLOAK, ABILITY_NONE}, + .abilityHidden = ABILITY_SLUSH_RUSH, + .bodyColor = BODY_COLOR_BLUE, + }, + + [SPECIES_ALOLAN_VULPIX] = + { + .baseHP = 38, + .baseAttack = 41, + .baseDefense = 40, + .baseSpeed = 65, + .baseSpAttack = 50, + .baseSpDefense = 65, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 190, + .expYield = 60, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_SNOWBALL, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_SNOW_CLOAK, ABILITY_NONE}, + .abilityHidden = ABILITY_SNOW_WARNING, + .bodyColor = BODY_COLOR_BLUE, + }, + + [SPECIES_ALOLAN_NINETALES] = + { + .baseHP = 73, + .baseAttack = 67, + .baseDefense = 75, + .baseSpeed = 109, + .baseSpAttack = 81, + .baseSpDefense = 100, + .type1 = TYPE_ICE, + .type2 = TYPE_FAIRY, + .catchRate = 75, + .expYield = 177, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_SNOW_CLOAK, ABILITY_NONE}, + .abilityHidden = ABILITY_SNOW_WARNING, + .bodyColor = BODY_COLOR_BLUE, + }, + + [SPECIES_ALOLAN_DIGLETT] = + { + .baseHP = 10, + .baseAttack = 55, + .baseDefense = 30, + .baseSpeed = 90, + .baseSpAttack = 35, + .baseSpDefense = 45, + .type1 = TYPE_GROUND, + .type2 = TYPE_STEEL, + .catchRate = 255, + .expYield = 53, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_SAND_VEIL, ABILITY_TANGLING_HAIR}, + .abilityHidden = ABILITY_SAND_FORCE, + .bodyColor = BODY_COLOR_BROWN, + }, + + [SPECIES_ALOLAN_DUGTRIO] = + { + .baseHP = 35, + .baseAttack = 100, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 50, + .baseSpDefense = 70, + .type1 = TYPE_GROUND, + .type2 = TYPE_STEEL, + .catchRate = 50, + .expYield = 149, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_SAND_VEIL, ABILITY_TANGLING_HAIR}, + .abilityHidden = ABILITY_SAND_FORCE, + .bodyColor = BODY_COLOR_BROWN, + }, + + [SPECIES_ALOLAN_MEOWTH] = + { + .baseHP = 40, + .baseAttack = 35, + .baseDefense = 35, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = 40, + .type1 = TYPE_DARK, + .type2 = TYPE_DARK, + .catchRate = 255, + .expYield = 58, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // 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}, + .abilityHidden = ABILITY_RATTLED, + .bodyColor = BODY_COLOR_GRAY, + }, + + [SPECIES_ALOLAN_PERSIAN] = + { + .baseHP = 65, + .baseAttack = 60, + .baseDefense = 60, + .baseSpeed = 115, + .baseSpAttack = 75, + .baseSpDefense = 65, + .type1 = TYPE_DARK, + .type2 = TYPE_DARK, + .catchRate = 90, + .expYield = 154, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // 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_FUR_COAT, ABILITY_TECHNICIAN}, + .abilityHidden = ABILITY_RATTLED, + .bodyColor = BODY_COLOR_GRAY, + }, + + [SPECIES_ALOLAN_GEODUDE] = + { + .baseHP = 40, + .baseAttack = 80, + .baseDefense = 100, + .baseSpeed = 20, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_ROCK, + .type2 = TYPE_ELECTRIC, + .catchRate = 255, + .expYield = 60, + .evYield_Defense = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .abilities = {ABILITY_MAGNET_PULL, ABILITY_STURDY}, + .abilityHidden = ABILITY_GALVANIZE, + .bodyColor = BODY_COLOR_BROWN, + }, + + [SPECIES_ALOLAN_GRAVELER] = + { + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 35, + .baseSpAttack = 45, + .baseSpDefense = 45, + .type1 = TYPE_ROCK, + .type2 = TYPE_ELECTRIC, + .catchRate = 120, + .expYield = 137, + .evYield_Defense = 2, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .abilities = {ABILITY_MAGNET_PULL, ABILITY_STURDY}, + .abilityHidden = ABILITY_GALVANIZE, + .bodyColor = BODY_COLOR_BROWN, + }, + + [SPECIES_ALOLAN_GOLEM] = + { + .baseHP = 80, + .baseAttack = 120, + .baseDefense = 130, + .baseSpeed = 45, + .baseSpAttack = 55, + .baseSpDefense = 65, + .type1 = TYPE_ROCK, + .type2 = TYPE_ELECTRIC, + .catchRate = 45, + .expYield = 223, + .evYield_Defense = 3, + .evYield_SpAttack = 0, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .abilities = {ABILITY_MAGNET_PULL, ABILITY_STURDY}, + .abilityHidden = ABILITY_GALVANIZE, + .bodyColor = BODY_COLOR_BROWN, + }, + + [SPECIES_ALOLAN_GRIMER] = + { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 25, + .baseSpAttack = 40, + .baseSpDefense = 50, + .type1 = TYPE_POISON, + .type2 = TYPE_DARK, + .catchRate = 190, + .expYield = 65, + .evYield_HP = 1, + .evYield_SpAttack = 0, + .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .abilities = {ABILITY_POISON_TOUCH, ABILITY_GLUTTONY}, + .abilityHidden = ABILITY_POWER_OF_ALCHEMY, + .bodyColor = BODY_COLOR_GREEN, + }, + + [SPECIES_ALOLAN_MUK] = + { + .baseHP = 105, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 100, + .type1 = TYPE_POISON, + .type2 = TYPE_DARK, + .catchRate = 75, + .expYield = 175, + .evYield_HP = 1, + .evYield_Attack = 1, + .evYield_SpAttack = 0, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .abilities = {ABILITY_POISON_TOUCH, ABILITY_GLUTTONY}, + .abilityHidden = ABILITY_POWER_OF_ALCHEMY, + .bodyColor = BODY_COLOR_GREEN, + }, + + [SPECIES_ALOLAN_EXEGGUTOR] = + { + .baseHP = 95, + .baseAttack = 105, + .baseDefense = 85, + .baseSpeed = 45, + .baseSpAttack = 125, + .baseSpDefense = 75, + .type1 = TYPE_GRASS, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 186, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .abilities = {ABILITY_FRISK, ABILITY_NONE}, + .abilityHidden = ABILITY_HARVEST, + .bodyColor = BODY_COLOR_YELLOW, + }, + + [SPECIES_ALOLAN_MAROWAK] = + { + .baseHP = 60, + .baseAttack = 80, + .baseDefense = 110, + .baseSpeed = 45, + .baseSpAttack = 50, + .baseSpDefense = 80, + .type1 = TYPE_FIRE, + .type2 = TYPE_GHOST, + .catchRate = 75, + .expYield = 149, + .evYield_Defense = 2, + .evYield_SpAttack = 0, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .abilities = {ABILITY_CURSED_BODY, ABILITY_LIGHTNING_ROD}, + .abilityHidden = ABILITY_ROCK_HEAD, + .bodyColor = BODY_COLOR_PURPLE, + }, }; diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index fb13490959..5e7d5e5b3d 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -4041,5 +4041,102 @@ const u16 gEggMoves[] = { MOVE_SUCKER_PUNCH, MOVE_THRASH), + egg_moves(ALOLAN_RATTATA, + MOVE_COUNTER, + MOVE_FINAL_GAMBIT, + MOVE_FURY_SWIPES, + MOVE_ME_FIRST, + MOVE_REVENGE, + MOVE_REVERSAL, + MOVE_SNATCH, + MOVE_STOCKPILE, + MOVE_SWALLOW, + MOVE_SWITCHEROO, + MOVE_UPROAR), + + egg_moves(ALOLAN_SANDSHREW, + MOVE_AMNESIA, + MOVE_CHIP_AWAY, + MOVE_COUNTER, + MOVE_CRUSH_CLAW, + MOVE_CURSE, + MOVE_ENDURE, + MOVE_FLAIL, + MOVE_HONE_CLAWS, + MOVE_ICICLE_CRASH, + MOVE_ICICLE_SPEAR, + MOVE_METAL_CLAW, + MOVE_NIGHT_SLASH), + + egg_moves(ALOLAN_VULPIX, + MOVE_AGILITY, + MOVE_CHARM, + MOVE_DISABLE, + MOVE_ENCORE, + MOVE_EXTRASENSORY, + MOVE_FLAIL, + MOVE_FREEZE_DRY, + MOVE_HOWL, + MOVE_HYPNOSIS, + MOVE_MOONBLAST, + MOVE_POWER_SWAP, + MOVE_SPITE, + MOVE_SECRET_POWER, + MOVE_TAIL_SLAP), + + egg_moves(ALOLAN_DIGLETT, + MOVE_ANCIENT_POWER, + MOVE_BEAT_UP, + MOVE_ENDURE, + MOVE_FAINT_ATTACK, + MOVE_FINAL_GAMBIT, + MOVE_HEADBUTT, + MOVE_MEMENTO, + MOVE_METAL_SOUND, + MOVE_PURSUIT, + MOVE_REVERSAL, + MOVE_THRASH), + + egg_moves(ALOLAN_MEOWTH, + MOVE_AMNESIA, + MOVE_ASSIST, + MOVE_CHARM, + MOVE_COVET, + MOVE_FLAIL, + MOVE_FLATTER, + MOVE_FOUL_PLAY, + MOVE_HYPNOSIS, + MOVE_PARTING_SHOT, + MOVE_PUNISHMENT, + MOVE_SNATCH, + MOVE_SPITE), + + egg_moves(ALOLAN_GEODUDE, + MOVE_AUTOTOMIZE, + MOVE_BLOCK, + MOVE_COUNTER, + MOVE_CURSE, + MOVE_ENDURE, + MOVE_FLAIL, + MOVE_MAGNET_RISE, + MOVE_ROCK_CLIMB, + MOVE_SCREECH, + MOVE_WIDE_GUARD), + + egg_moves(ALOLAN_GRIMER, + MOVE_ASSURANCE, + MOVE_CLEAR_SMOG, + MOVE_CURSE, + MOVE_IMPRISON, + MOVE_MEAN_LOOK, + MOVE_POWER_UP_PUNCH, + MOVE_PURSUIT, + MOVE_SCARY_FACE, + MOVE_SHADOW_SNEAK, + MOVE_SPITE, + MOVE_SPIT_UP, + MOVE_STOCKPILE, + MOVE_SWALLOW), + EGG_MOVES_TERMINATOR }; diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index c170c63a4e..eeb0264906 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -21,7 +21,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, - [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_RAICHU}}, + [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_RAICHU}, + {EVO_ITEM, ITEM_NONE,/*ITEM_THUNDER_STONE*/ SPECIES_ALOLAN_RAICHU}}, [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_NONE,/*ITEM_MOON_STONE*/ SPECIES_NIDOQUEEN}}, @@ -72,8 +73,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}}, [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}}, [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}}, - [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_EXEGGUTOR}}, - [SPECIES_CUBONE] = {{EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK}}, + [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_EXEGGUTOR}, + {EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_ALOLAN_EXEGGUTOR}}, + [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}, + {EVO_LEVEL_NIGHT, 28, SPECIES_ALOLAN_MAROWAK}}, [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}}, [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, @@ -448,4 +451,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_COSMOEM] = {{EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}}, [SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_NONE,/*MOVE_DRAGON_PULSE*/ SPECIES_NAGANADEL}}, + + [SPECIES_ALOLAN_RATTATA] = {{EVO_LEVEL_NIGHT, 20, SPECIES_ALOLAN_RATICATE}}, + [SPECIES_ALOLAN_SANDSHREW] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_SANDSLASH}}, + [SPECIES_ALOLAN_VULPIX] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_NINETALES}}, + [SPECIES_ALOLAN_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_ALOLAN_DUGTRIO}}, + [SPECIES_ALOLAN_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_ALOLAN_PERSIAN}}, + [SPECIES_ALOLAN_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_ALOLAN_GRAVELER}}, + [SPECIES_ALOLAN_GRAVELER] = {{EVO_LEVEL, 40, SPECIES_ALOLAN_GOLEM}}, + [SPECIES_ALOLAN_GRIMER] = {{EVO_LEVEL, 38, SPECIES_ALOLAN_MUK}}, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 76e56864c1..8d5130491a 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -871,4 +871,23 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MEGA_GALLADE] = sGalladeLevelUpLearnset, [SPECIES_MEGA_AUDINO] = sAudinoLevelUpLearnset, [SPECIES_MEGA_DIANCIE] = sDiancieLevelUpLearnset, + // Alolan Forms + [SPECIES_ALOLAN_RATTATA] = sAlolanRattataLevelUpLearnset, + [SPECIES_ALOLAN_RATICATE] = sAlolanRaticateLevelUpLearnset, + [SPECIES_ALOLAN_RAICHU] = sAlolanRaichuLevelUpLearnset, + [SPECIES_ALOLAN_SANDSHREW] = sAlolanSandshrewLevelUpLearnset, + [SPECIES_ALOLAN_SANDSLASH] = sAlolanSandslashLevelUpLearnset, + [SPECIES_ALOLAN_VULPIX] = sAlolanVulpixLevelUpLearnset, + [SPECIES_ALOLAN_NINETALES] = sAlolanNinetalesLevelUpLearnset, + [SPECIES_ALOLAN_DIGLETT] = sAlolanDiglettLevelUpLearnset, + [SPECIES_ALOLAN_DUGTRIO] = sAlolanDugtrioLevelUpLearnset, + [SPECIES_ALOLAN_MEOWTH] = sAlolanMeowthLevelUpLearnset, + [SPECIES_ALOLAN_PERSIAN] = sAlolanPersianLevelUpLearnset, + [SPECIES_ALOLAN_GEODUDE] = sAlolanGeodudeLevelUpLearnset, + [SPECIES_ALOLAN_GRAVELER] = sAlolanGravelerLevelUpLearnset, + [SPECIES_ALOLAN_GOLEM] = sAlolanGolemLevelUpLearnset, + [SPECIES_ALOLAN_GRIMER] = sAlolanGrimerLevelUpLearnset, + [SPECIES_ALOLAN_MUK] = sAlolanMukLevelUpLearnset, + [SPECIES_ALOLAN_EXEGGUTOR] = sAlolanExeggutorLevelUpLearnset, + [SPECIES_ALOLAN_MAROWAK] = sAlolanMarowakLevelUpLearnset, }; diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index e5620acce9..c21185402a 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -7621,3 +7621,93 @@ static const struct LevelUpMove sZeraoraLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; + +static const struct LevelUpMove sAlolanRattataLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanRaticateLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanRaichuLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanSandshrewLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanSandslashLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanVulpixLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanNinetalesLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanDiglettLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanDugtrioLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanMeowthLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanPersianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGeodudeLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGravelerLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGolemLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGrimerLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanMukLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanExeggutorLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanMarowakLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index d41359d06d..d1dee7209e 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -19328,4 +19328,253 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), + [SPECIES_ALOLAN_RATTATA] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(HM01_CUT) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM12_TAUNT) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_RATICATE]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(TM08_BULK_UP) + | TMHM(HM01_CUT) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM12_TAUNT) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_RAICHU] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + | TMHM(TM04_CALM_MIND) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(HM05_FLASH) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM29_PSYCHIC) + | TMHM(TM33_REFLECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM04_STRENGTH) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_SANDSHREW] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(TM31_BRICK_BREAK) + | TMHM(HM01_CUT) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM04_STRENGTH) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_SANDSLASH] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(TM31_BRICK_BREAK) + | TMHM(HM01_CUT) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM04_STRENGTH) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_VULPIX] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM33_REFLECT) + | TMHM(TM44_REST) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_NINETALES] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(TM04_CALM_MIND) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM33_REFLECT) + | TMHM(TM44_REST) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_DIGLETT] = TMHM_LEARNSET(TMHM(HM01_CUT) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_DUGTRIO] = TMHM_LEARNSET(TMHM(HM01_CUT) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_MEOWTH] = TMHM_LEARNSET(TMHM(HM01_CUT) + | TMHM(TM42_FACADE) + | TMHM(HM05_FLASH) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM12_TAUNT) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_PERSIAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + | TMHM(TM42_FACADE) + | TMHM(HM05_FLASH) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM12_TAUNT) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_GEODUDE] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM04_STRENGTH) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_GRAVELER] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM04_STRENGTH) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_GOLEM] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM04_STRENGTH) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_GRIMER] = TMHM_LEARNSET(TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(HM04_STRENGTH) + | TMHM(TM12_TAUNT) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_MUK] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + | TMHM(TM28_DIG) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(HM04_STRENGTH) + | TMHM(TM12_TAUNT) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_EXEGGUTOR] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(HM05_FLASH) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM29_PSYCHIC) + | TMHM(TM33_REFLECT) + | TMHM(TM44_REST) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(HM04_STRENGTH) + | TMHM(TM06_TOXIC)), + + [SPECIES_ALOLAN_MAROWAK] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM28_DIG) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM17_PROTECT) + | TMHM(TM44_REST) + | TMHM(HM06_ROCK_SMASH) + | TMHM(TM30_SHADOW_BALL) + | TMHM(HM04_STRENGTH) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM06_TOXIC)), + }; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 65bfee7805..bb96b73630 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4423,4 +4423,95 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0, .y_offset = 10, }, + // Alolan Forms + [SPECIES_ALOLAN_RATTATA] = + { + .size = 0x65, + .y_offset = 0x7, + }, + [SPECIES_ALOLAN_RATICATE] = + { + .size = 0x75, + .y_offset = 0xa, + }, + [SPECIES_ALOLAN_RAICHU] = + { + .size = 0x66, + .y_offset = 0x6, + }, + [SPECIES_ALOLAN_SANDSHREW] = + { + .size = 0x65, + .y_offset = 0xd, + }, + [SPECIES_ALOLAN_SANDSLASH] = + { + .size = 0x86, + .y_offset = 0xb, + }, + [SPECIES_ALOLAN_VULPIX] = + { + .size = 0x76, + .y_offset = 0x9, + }, + [SPECIES_ALOLAN_NINETALES] = + { + .size = 0x77, + .y_offset = 0x5, + }, + [SPECIES_ALOLAN_DIGLETT] = + { + .size = 0x54, + .y_offset = 0xe, + }, + [SPECIES_ALOLAN_DUGTRIO] = + { + .size = 0x66, + .y_offset = 0x11, + }, + [SPECIES_ALOLAN_MEOWTH] = + { + .size = 0x65, + .y_offset = 0x6, + }, + [SPECIES_ALOLAN_PERSIAN] = + { + .size = 0x87, + .y_offset = 0x7, + }, + [SPECIES_ALOLAN_GEODUDE] = + { + .size = 0x66, + .y_offset = 0xb, + }, + [SPECIES_ALOLAN_GRAVELER] = + { + .size = 0x75, + .y_offset = 0xa, + }, + [SPECIES_ALOLAN_GOLEM] = + { + .size = 0x84, + .y_offset = 0xb, + }, + [SPECIES_ALOLAN_GRIMER] = + { + .size = 0x75, + .y_offset = 0xd, + }, + [SPECIES_ALOLAN_MUK] = + { + .size = 0x87, + .y_offset = 0x9, + }, + [SPECIES_ALOLAN_EXEGGUTOR] = + { + .size = 0x87, + .y_offset = 0x8, + }, + [SPECIES_ALOLAN_MAROWAK] = + { + .size = 0x66, + .y_offset = 0x8, + }, }; diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 03c48d9aa4..a788e7e399 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -871,6 +871,25 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MEGA_AUDINO, gMonBackPic_MegaAudino), SPECIES_SPRITE(MEGA_DIANCIE, gMonBackPic_MegaDiancie), + SPECIES_SPRITE(ALOLAN_RATTATA, gMonBackPic_AlolanRattata), + SPECIES_SPRITE(ALOLAN_RATICATE, gMonBackPic_AlolanRaticate), + SPECIES_SPRITE(ALOLAN_RAICHU, gMonBackPic_AlolanRaichu), + SPECIES_SPRITE(ALOLAN_SANDSHREW, gMonBackPic_AlolanSandshrew), + SPECIES_SPRITE(ALOLAN_SANDSLASH, gMonBackPic_AlolanSandslash), + SPECIES_SPRITE(ALOLAN_VULPIX, gMonBackPic_AlolanVulpix), + SPECIES_SPRITE(ALOLAN_NINETALES, gMonBackPic_AlolanNinetales), + SPECIES_SPRITE(ALOLAN_DIGLETT, gMonBackPic_AlolanDiglett), + SPECIES_SPRITE(ALOLAN_DUGTRIO, gMonBackPic_AlolanDugtrio), + SPECIES_SPRITE(ALOLAN_MEOWTH, gMonBackPic_AlolanMeowth), + SPECIES_SPRITE(ALOLAN_PERSIAN, gMonBackPic_AlolanPersian), + SPECIES_SPRITE(ALOLAN_GEODUDE, gMonBackPic_AlolanGeodude), + SPECIES_SPRITE(ALOLAN_GRAVELER, gMonBackPic_AlolanGraveler), + SPECIES_SPRITE(ALOLAN_GOLEM, gMonBackPic_AlolanGolem), + SPECIES_SPRITE(ALOLAN_GRIMER, gMonBackPic_AlolanGrimer), + SPECIES_SPRITE(ALOLAN_MUK, gMonBackPic_AlolanMuk), + SPECIES_SPRITE(ALOLAN_EXEGGUTOR, gMonBackPic_AlolanExeggutor), + SPECIES_SPRITE(ALOLAN_MAROWAK, gMonBackPic_AlolanMarowak), + SPECIES_SPRITE(UNOWN_A, gMonBackPic_UnownA), SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB), SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC), diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index eeb204df44..88d86a0472 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8188,6 +8188,114 @@ static const union AnimCmd sAnim_MEGA_DIANCIE_1[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_ALOLAN_RATTATA_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_RATICATE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_RAICHU_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_SANDSHREW_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_SANDSLASH_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_VULPIX_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_NINETALES_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_DIGLETT_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_DUGTRIO_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_MEOWTH_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_PERSIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_GEODUDE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_GRAVELER_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_GOLEM_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_GRIMER_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_MUK_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_EXEGGUTOR_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ALOLAN_MAROWAK_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd *const sAnims_NONE[] ={ sAnim_GeneralFrame0, sAnim_NONE_1, @@ -12708,6 +12816,96 @@ static const union AnimCmd *const sAnims_MEGA_DIANCIE[] ={ sAnim_MEGA_DIANCIE_1, }; +static const union AnimCmd *const sAnims_ALOLAN_RATTATA[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_RATTATA_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_RATICATE[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_RATICATE_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_RAICHU[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_RAICHU_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_SANDSHREW[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_SANDSHREW_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_SANDSLASH[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_SANDSLASH_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_VULPIX[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_VULPIX_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_NINETALES[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_NINETALES_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_DIGLETT[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_DIGLETT_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_DUGTRIO[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_DUGTRIO_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_MEOWTH[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_MEOWTH_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_PERSIAN[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_PERSIAN_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_GEODUDE[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_GEODUDE_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_GRAVELER[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_GRAVELER_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_GOLEM[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_GOLEM_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_GRIMER[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_GRIMER_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_MUK[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_MUK_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_EXEGGUTOR[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_EXEGGUTOR_1, +}; + +static const union AnimCmd *const sAnims_ALOLAN_MAROWAK[] ={ + sAnim_GeneralFrame0, + sAnim_ALOLAN_MAROWAK_1, +}; + #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims @@ -13582,5 +13780,23 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(MEGA_GALLADE), ANIM_CMD(MEGA_AUDINO), ANIM_CMD(MEGA_DIANCIE), + ANIM_CMD(ALOLAN_RATTATA), + ANIM_CMD(ALOLAN_RATICATE), + ANIM_CMD(ALOLAN_RAICHU), + ANIM_CMD(ALOLAN_SANDSHREW), + ANIM_CMD(ALOLAN_SANDSLASH), + ANIM_CMD(ALOLAN_VULPIX), + ANIM_CMD(ALOLAN_NINETALES), + ANIM_CMD(ALOLAN_DIGLETT), + ANIM_CMD(ALOLAN_DUGTRIO), + ANIM_CMD(ALOLAN_MEOWTH), + ANIM_CMD(ALOLAN_PERSIAN), + ANIM_CMD(ALOLAN_GEODUDE), + ANIM_CMD(ALOLAN_GRAVELER), + ANIM_CMD(ALOLAN_GOLEM), + ANIM_CMD(ALOLAN_GRIMER), + ANIM_CMD(ALOLAN_MUK), + ANIM_CMD(ALOLAN_EXEGGUTOR), + ANIM_CMD(ALOLAN_MAROWAK), }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index c413a93c9f..0eb6ae2675 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4422,4 +4422,94 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0, .y_offset = 6, }, + [SPECIES_ALOLAN_RATTATA] = + { + .size = 0x44, + .y_offset = 0xd, + }, + [SPECIES_ALOLAN_RATICATE] = + { + .size = 0x66, + .y_offset = 0x6, + }, + [SPECIES_ALOLAN_RAICHU] = + { + .size = 0x67, + .y_offset = 0x3, + }, + [SPECIES_ALOLAN_SANDSHREW] = + { + .size = 0x55, + .y_offset = 0xb, + }, + [SPECIES_ALOLAN_SANDSLASH] = + { + .size = 0x76, + .y_offset = 0x6, + }, + [SPECIES_ALOLAN_VULPIX] = + { + .size = 0x65, + .y_offset = 0xb, + }, + [SPECIES_ALOLAN_NINETALES] = + { + .size = 0x88, + .y_offset = 0x3, + }, + [SPECIES_ALOLAN_DIGLETT] = + { + .size = 0x54, + .y_offset = 0x11, + }, + [SPECIES_ALOLAN_DUGTRIO] = + { + .size = 0x75, + .y_offset = 0xb, + }, + [SPECIES_ALOLAN_MEOWTH] = + { + .size = 0x55, + .y_offset = 0xa, + }, + [SPECIES_ALOLAN_PERSIAN] = + { + .size = 0x77, + .y_offset = 0x4, + }, + [SPECIES_ALOLAN_GEODUDE] = + { + .size = 0x54, + .y_offset = 0x13, + }, + [SPECIES_ALOLAN_GRAVELER] = + { + .size = 0x87, + .y_offset = 0x9, + }, + [SPECIES_ALOLAN_GOLEM] = + { + .size = 0x77, + .y_offset = 0x6, + }, + [SPECIES_ALOLAN_GRIMER] = + { + .size = 0x65, + .y_offset = 0x9, + }, + [SPECIES_ALOLAN_MUK] = + { + .size = 0x87, + .y_offset = 0x7, + }, + [SPECIES_ALOLAN_EXEGGUTOR] = + { + .size = 0x88, + .y_offset = 0x0, + }, + [SPECIES_ALOLAN_MAROWAK] = + { + .size = 0x76, + .y_offset = 0x8, + }, }; diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 86efa56dc3..2427835c99 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -871,6 +871,25 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MEGA_AUDINO, gMonFrontPic_MegaAudino), SPECIES_SPRITE(MEGA_DIANCIE, gMonFrontPic_MegaDiancie), + SPECIES_SPRITE(ALOLAN_RATTATA, gMonFrontPic_AlolanRattata), + SPECIES_SPRITE(ALOLAN_RATICATE, gMonFrontPic_AlolanRaticate), + SPECIES_SPRITE(ALOLAN_RAICHU, gMonFrontPic_AlolanRaichu), + SPECIES_SPRITE(ALOLAN_SANDSHREW, gMonFrontPic_AlolanSandshrew), + SPECIES_SPRITE(ALOLAN_SANDSLASH, gMonFrontPic_AlolanSandslash), + SPECIES_SPRITE(ALOLAN_VULPIX, gMonFrontPic_AlolanVulpix), + SPECIES_SPRITE(ALOLAN_NINETALES, gMonFrontPic_AlolanNinetales), + SPECIES_SPRITE(ALOLAN_DIGLETT, gMonFrontPic_AlolanDiglett), + SPECIES_SPRITE(ALOLAN_DUGTRIO, gMonFrontPic_AlolanDugtrio), + SPECIES_SPRITE(ALOLAN_MEOWTH, gMonFrontPic_AlolanMeowth), + SPECIES_SPRITE(ALOLAN_PERSIAN, gMonFrontPic_AlolanPersian), + SPECIES_SPRITE(ALOLAN_GEODUDE, gMonFrontPic_AlolanGeodude), + SPECIES_SPRITE(ALOLAN_GRAVELER, gMonFrontPic_AlolanGraveler), + SPECIES_SPRITE(ALOLAN_GOLEM, gMonFrontPic_AlolanGolem), + SPECIES_SPRITE(ALOLAN_GRIMER, gMonFrontPic_AlolanGrimer), + SPECIES_SPRITE(ALOLAN_MUK, gMonFrontPic_AlolanMuk), + SPECIES_SPRITE(ALOLAN_EXEGGUTOR, gMonFrontPic_AlolanExeggutor), + SPECIES_SPRITE(ALOLAN_MAROWAK, gMonFrontPic_AlolanMarowak), + SPECIES_SPRITE(UNOWN_A, gMonFrontPic_UnownA), SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB), SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 5f6d202f8e..00368f8b50 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -871,6 +871,25 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MEGA_AUDINO, gMonPalette_MegaAudino), SPECIES_PAL(MEGA_DIANCIE, gMonPalette_MegaDiancie), + SPECIES_PAL(ALOLAN_RATTATA, gMonPalette_AlolanRattata), + SPECIES_PAL(ALOLAN_RATICATE, gMonPalette_AlolanRaticate), + SPECIES_PAL(ALOLAN_RAICHU, gMonPalette_AlolanRaichu), + SPECIES_PAL(ALOLAN_SANDSHREW, gMonPalette_AlolanSandshrew), + SPECIES_PAL(ALOLAN_SANDSLASH, gMonPalette_AlolanSandslash), + SPECIES_PAL(ALOLAN_VULPIX, gMonPalette_AlolanVulpix), + SPECIES_PAL(ALOLAN_NINETALES, gMonPalette_AlolanNinetales), + SPECIES_PAL(ALOLAN_DIGLETT, gMonPalette_AlolanDiglett), + SPECIES_PAL(ALOLAN_DUGTRIO, gMonPalette_AlolanDugtrio), + SPECIES_PAL(ALOLAN_MEOWTH, gMonPalette_AlolanMeowth), + SPECIES_PAL(ALOLAN_PERSIAN, gMonPalette_AlolanPersian), + SPECIES_PAL(ALOLAN_GEODUDE, gMonPalette_AlolanGeodude), + SPECIES_PAL(ALOLAN_GRAVELER, gMonPalette_AlolanGraveler), + SPECIES_PAL(ALOLAN_GOLEM, gMonPalette_AlolanGolem), + SPECIES_PAL(ALOLAN_GRIMER, gMonPalette_AlolanGrimer), + SPECIES_PAL(ALOLAN_MUK, gMonPalette_AlolanMuk), + SPECIES_PAL(ALOLAN_EXEGGUTOR, gMonPalette_AlolanExeggutor), + SPECIES_PAL(ALOLAN_MAROWAK, gMonPalette_AlolanMarowak), + SPECIES_PAL(UNOWN_A, gMonPalette_Unown), SPECIES_PAL(UNOWN_B, gMonPalette_Unown), SPECIES_PAL(UNOWN_C, gMonPalette_Unown), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 2a9578e620..da85d5c3ae 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -871,6 +871,25 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MEGA_AUDINO, gMonShinyPalette_MegaAudino), SPECIES_SHINY_PAL(MEGA_DIANCIE, gMonShinyPalette_MegaDiancie), + SPECIES_SHINY_PAL(ALOLAN_RATTATA, gMonShinyPalette_AlolanRattata), + SPECIES_SHINY_PAL(ALOLAN_RATICATE, gMonShinyPalette_AlolanRaticate), + SPECIES_SHINY_PAL(ALOLAN_RAICHU, gMonShinyPalette_AlolanRaichu), + SPECIES_SHINY_PAL(ALOLAN_SANDSHREW, gMonShinyPalette_AlolanSandshrew), + SPECIES_SHINY_PAL(ALOLAN_SANDSLASH, gMonShinyPalette_AlolanSandslash), + SPECIES_SHINY_PAL(ALOLAN_VULPIX, gMonShinyPalette_AlolanVulpix), + SPECIES_SHINY_PAL(ALOLAN_NINETALES, gMonShinyPalette_AlolanNinetales), + SPECIES_SHINY_PAL(ALOLAN_DIGLETT, gMonShinyPalette_AlolanDiglett), + SPECIES_SHINY_PAL(ALOLAN_DUGTRIO, gMonShinyPalette_AlolanDugtrio), + SPECIES_SHINY_PAL(ALOLAN_MEOWTH, gMonShinyPalette_AlolanMeowth), + SPECIES_SHINY_PAL(ALOLAN_PERSIAN, gMonShinyPalette_AlolanPersian), + SPECIES_SHINY_PAL(ALOLAN_GEODUDE, gMonShinyPalette_AlolanGeodude), + SPECIES_SHINY_PAL(ALOLAN_GRAVELER, gMonShinyPalette_AlolanGraveler), + SPECIES_SHINY_PAL(ALOLAN_GOLEM, gMonShinyPalette_AlolanGolem), + SPECIES_SHINY_PAL(ALOLAN_GRIMER, gMonShinyPalette_AlolanGrimer), + SPECIES_SHINY_PAL(ALOLAN_MUK, gMonShinyPalette_AlolanMuk), + SPECIES_SHINY_PAL(ALOLAN_EXEGGUTOR, gMonShinyPalette_AlolanExeggutor), + SPECIES_SHINY_PAL(ALOLAN_MAROWAK, gMonShinyPalette_AlolanMarowak), + SPECIES_SHINY_PAL(UNOWN_A, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 9ebf9fcdfd..8829935869 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -870,4 +870,23 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MEGA_GALLADE] = _("Gallade"), [SPECIES_MEGA_AUDINO] = _("Audino"), [SPECIES_MEGA_DIANCIE] = _("Diancie"), + + [SPECIES_ALOLAN_RATTATA] = _("Rattata"), + [SPECIES_ALOLAN_RATICATE] = _("Raticate"), + [SPECIES_ALOLAN_RAICHU] = _("Raichu"), + [SPECIES_ALOLAN_SANDSHREW] = _("Sandshrew"), + [SPECIES_ALOLAN_SANDSLASH] = _("Sandslash"), + [SPECIES_ALOLAN_VULPIX] = _("Vulpix"), + [SPECIES_ALOLAN_NINETALES] = _("Ninetales"), + [SPECIES_ALOLAN_DIGLETT] = _("Diglett"), + [SPECIES_ALOLAN_DUGTRIO] = _("Dugtrio"), + [SPECIES_ALOLAN_MEOWTH] = _("Meowth"), + [SPECIES_ALOLAN_PERSIAN] = _("Persian"), + [SPECIES_ALOLAN_GEODUDE] = _("Geodude"), + [SPECIES_ALOLAN_GRAVELER] = _("Graveler"), + [SPECIES_ALOLAN_GOLEM] = _("Golem"), + [SPECIES_ALOLAN_GRIMER] = _("Grimer"), + [SPECIES_ALOLAN_MUK] = _("Muk"), + [SPECIES_ALOLAN_EXEGGUTOR] = _("Exeggutor"), + [SPECIES_ALOLAN_MAROWAK] = _("Marowak"), }; diff --git a/src/pokemon.c b/src/pokemon.c index 76c88ce268..58b556a98b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -318,13 +318,16 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(PIDGEOTTO), SPECIES_TO_NATIONAL(PIDGEOT), SPECIES_TO_NATIONAL(RATTATA), + [SPECIES_ALOLAN_RATTATA - 1] = NATIONAL_DEX_RATTATA, SPECIES_TO_NATIONAL(RATICATE), + [SPECIES_ALOLAN_RATICATE - 1] = NATIONAL_DEX_RATICATE, SPECIES_TO_NATIONAL(SPEAROW), SPECIES_TO_NATIONAL(FEAROW), SPECIES_TO_NATIONAL(EKANS), SPECIES_TO_NATIONAL(ARBOK), SPECIES_TO_NATIONAL(PIKACHU), SPECIES_TO_NATIONAL(RAICHU), + [SPECIES_ALOLAN_RAICHU - 1] = NATIONAL_DEX_RAICHU, SPECIES_TO_NATIONAL(SANDSHREW), SPECIES_TO_NATIONAL(SANDSLASH), SPECIES_TO_NATIONAL(NIDORAN_F), @@ -336,7 +339,9 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(CLEFAIRY), SPECIES_TO_NATIONAL(CLEFABLE), SPECIES_TO_NATIONAL(VULPIX), + [SPECIES_ALOLAN_VULPIX - 1] = NATIONAL_DEX_VULPIX, SPECIES_TO_NATIONAL(NINETALES), + [SPECIES_ALOLAN_NINETALES - 1] = NATIONAL_DEX_NINETALES, SPECIES_TO_NATIONAL(JIGGLYPUFF), SPECIES_TO_NATIONAL(WIGGLYTUFF), SPECIES_TO_NATIONAL(ZUBAT), @@ -349,9 +354,13 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(VENONAT), SPECIES_TO_NATIONAL(VENOMOTH), SPECIES_TO_NATIONAL(DIGLETT), + [SPECIES_ALOLAN_DIGLETT - 1] = NATIONAL_DEX_DIGLETT, SPECIES_TO_NATIONAL(DUGTRIO), + [SPECIES_ALOLAN_DUGTRIO - 1] = NATIONAL_DEX_DUGTRIO, SPECIES_TO_NATIONAL(MEOWTH), + [SPECIES_ALOLAN_MEOWTH - 1] = NATIONAL_DEX_MEOWTH, SPECIES_TO_NATIONAL(PERSIAN), + [SPECIES_ALOLAN_PERSIAN - 1] = NATIONAL_DEX_PERSIAN, SPECIES_TO_NATIONAL(PSYDUCK), SPECIES_TO_NATIONAL(GOLDUCK), SPECIES_TO_NATIONAL(MANKEY), @@ -373,8 +382,11 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(TENTACOOL), SPECIES_TO_NATIONAL(TENTACRUEL), SPECIES_TO_NATIONAL(GEODUDE), + [SPECIES_ALOLAN_GEODUDE - 1] = NATIONAL_DEX_GEODUDE, SPECIES_TO_NATIONAL(GRAVELER), + [SPECIES_ALOLAN_GRAVELER - 1] = NATIONAL_DEX_GRAVELER, SPECIES_TO_NATIONAL(GOLEM), + [SPECIES_ALOLAN_GOLEM - 1] = NATIONAL_DEX_GOLEM, SPECIES_TO_NATIONAL(PONYTA), SPECIES_TO_NATIONAL(RAPIDASH), SPECIES_TO_NATIONAL(SLOWPOKE), @@ -387,7 +399,9 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(SEEL), SPECIES_TO_NATIONAL(DEWGONG), SPECIES_TO_NATIONAL(GRIMER), + [SPECIES_ALOLAN_GRIMER - 1] = NATIONAL_DEX_GRIMER, SPECIES_TO_NATIONAL(MUK), + [SPECIES_ALOLAN_MUK - 1] = NATIONAL_DEX_MUK, SPECIES_TO_NATIONAL(SHELLDER), SPECIES_TO_NATIONAL(CLOYSTER), SPECIES_TO_NATIONAL(GASTLY), @@ -402,8 +416,10 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(ELECTRODE), SPECIES_TO_NATIONAL(EXEGGCUTE), SPECIES_TO_NATIONAL(EXEGGUTOR), + [SPECIES_ALOLAN_EXEGGUTOR - 1] = NATIONAL_DEX_EXEGGUTOR, SPECIES_TO_NATIONAL(CUBONE), SPECIES_TO_NATIONAL(MAROWAK), + [SPECIES_ALOLAN_MAROWAK - 1] = NATIONAL_DEX_MAROWAK, SPECIES_TO_NATIONAL(HITMONLEE), SPECIES_TO_NATIONAL(HITMONCHAN), SPECIES_TO_NATIONAL(LICKITUNG), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 1a01e1f40c..8b41d28e6f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -894,6 +894,24 @@ const u8 *const gMonIconTable[] = [SPECIES_MEGA_GALLADE] = gMonIcon_MegaGallade, [SPECIES_MEGA_AUDINO] = gMonIcon_MegaAudino, [SPECIES_MEGA_DIANCIE] = gMonIcon_MegaDiancie, + [SPECIES_ALOLAN_RATTATA] = gMonIcon_AlolanRattata, + [SPECIES_ALOLAN_RATICATE] = gMonIcon_AlolanRaticate, + [SPECIES_ALOLAN_RAICHU] = gMonIcon_AlolanRaichu, + [SPECIES_ALOLAN_SANDSHREW] = gMonIcon_AlolanSandshrew, + [SPECIES_ALOLAN_SANDSLASH] = gMonIcon_AlolanSandslash, + [SPECIES_ALOLAN_VULPIX] = gMonIcon_AlolanVulpix, + [SPECIES_ALOLAN_NINETALES] = gMonIcon_AlolanNinetales, + [SPECIES_ALOLAN_DIGLETT] = gMonIcon_AlolanDiglett, + [SPECIES_ALOLAN_DUGTRIO] = gMonIcon_AlolanDugtrio, + [SPECIES_ALOLAN_MEOWTH] = gMonIcon_AlolanMeowth, + [SPECIES_ALOLAN_PERSIAN] = gMonIcon_AlolanPersian, + [SPECIES_ALOLAN_GEODUDE] = gMonIcon_AlolanGeodude, + [SPECIES_ALOLAN_GRAVELER] = gMonIcon_AlolanGraveler, + [SPECIES_ALOLAN_GOLEM] = gMonIcon_AlolanGolem, + [SPECIES_ALOLAN_GRIMER] = gMonIcon_AlolanGrimer, + [SPECIES_ALOLAN_MUK] = gMonIcon_AlolanMuk, + [SPECIES_ALOLAN_EXEGGUTOR] = gMonIcon_AlolanExeggutor, + [SPECIES_ALOLAN_MAROWAK] = gMonIcon_AlolanMarowak, [SPECIES_UNOWN_A] = gMonIcon_UnownA, [SPECIES_UNOWN_B] = gMonIcon_UnownB, [SPECIES_UNOWN_C] = gMonIcon_UnownC, @@ -1794,6 +1812,24 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MEGA_GALLADE] = 1, [SPECIES_MEGA_AUDINO] = 1, [SPECIES_MEGA_DIANCIE] = 0, + [SPECIES_ALOLAN_RATTATA] = 2, + [SPECIES_ALOLAN_RATICATE] = 2, + [SPECIES_ALOLAN_RAICHU] = 2, + [SPECIES_ALOLAN_SANDSHREW] = 0, + [SPECIES_ALOLAN_SANDSLASH] = 0, + [SPECIES_ALOLAN_VULPIX] = 2, + [SPECIES_ALOLAN_NINETALES] = 2, + [SPECIES_ALOLAN_DIGLETT] = 2, + [SPECIES_ALOLAN_DUGTRIO] = 2, + [SPECIES_ALOLAN_MEOWTH] = 2, + [SPECIES_ALOLAN_PERSIAN] = 2, + [SPECIES_ALOLAN_GEODUDE] = 2, + [SPECIES_ALOLAN_GRAVELER] = 2, + [SPECIES_ALOLAN_GOLEM] = 2, + [SPECIES_ALOLAN_GRIMER] = 1, + [SPECIES_ALOLAN_MUK] = 0, + [SPECIES_ALOLAN_EXEGGUTOR] = 1, + [SPECIES_ALOLAN_MAROWAK] = 1, [SPECIES_UNOWN_A ... SPECIES_UNOWN_QMARK] = 0, [SPECIES_EGG] = 1, };