From 17127e0174b5b306f2e73c724c82a6d07dc3d1aa Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 11:29:35 -0300 Subject: [PATCH 01/16] Defined species for the Alolan Forms. --- include/constants/species.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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 From fcedeeeba728ec5bb8642b33bc86f961497ab217 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 11:33:59 -0300 Subject: [PATCH 02/16] Defined the sprites for the Alolan Forms. --- include/graphics.h | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/graphics.h b/include/graphics.h index aa31459281..54fced0361 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[]; From 8038389ad206ccfe5250b078372294fc82ad93c7 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 13:07:00 -0300 Subject: [PATCH 03/16] Added coordinates and entries for the Alolan Forms in the sprite data tables. --- .../pokemon_graphics/back_pic_coordinates.h | 91 +++++++++++++++++++ src/data/pokemon_graphics/back_pic_table.h | 19 ++++ .../pokemon_graphics/front_pic_coordinates.h | 90 ++++++++++++++++++ src/data/pokemon_graphics/front_pic_table.h | 19 ++++ src/data/pokemon_graphics/palette_table.h | 19 ++++ .../pokemon_graphics/shiny_palette_table.h | 19 ++++ 6 files changed, 257 insertions(+) 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_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), From 5f24eb1f5ec08134389f072aab19352ff513d33d Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 14:36:42 -0300 Subject: [PATCH 04/16] Set the InGame names for the Alolan Forms. --- src/data/text/species_names.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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"), }; From fecc6737e0b5bb018575794b8ef29236e3392636 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 16:58:44 -0300 Subject: [PATCH 05/16] Added the Alolan Forms' base stats. --- src/data/pokemon/base_stats.h | 461 ++++++++++++++++++++++++++++++++++ 1 file changed, 461 insertions(+) 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, + }, }; From 1791ec28c957115ef52c3ecc0ea726f33ae45ce8 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 17:26:54 -0300 Subject: [PATCH 06/16] Set the egg moves for the Alolan Forms. --- src/data/pokemon/egg_moves.h | 97 ++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index fb13490959..41c1e0963d 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_FEINT_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 }; From 05013586d7853b772c414fe5e0f757fcb3ce08f0 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 18:25:28 -0300 Subject: [PATCH 07/16] Set the evolution conditions for the Alolan Forms. --- src/data/pokemon/evolution.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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}}, }; From 788efccf79345bb854649ceae2be2be97ec71441 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 19:04:06 -0300 Subject: [PATCH 08/16] Set the level up learnsets for the Alolan Forms. --- src/data/pokemon/level_up_learnset_pointers.h | 19 ++ src/data/pokemon/level_up_learnsets.h | 261 ++++++++++++++++++ 2 files changed, 280 insertions(+) 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..6c17ec8319 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -7621,3 +7621,264 @@ 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_MOVE( 3, MOVE_TAIL_WHIP), + LEVEL_UP_MOVE( 6, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 9, MOVE_FOCUS_ENERGY), + LEVEL_UP_MOVE(12, MOVE_BITE), + LEVEL_UP_MOVE(15, MOVE_SUPER_FANG), + LEVEL_UP_MOVE(18, MOVE_CRUNCH), + LEVEL_UP_MOVE(21, MOVE_HYPER_FANG), + LEVEL_UP_MOVE(24, MOVE_SUCKER_PUNCH), + LEVEL_UP_MOVE(27, MOVE_DOUBLE_EDGE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanRaticateLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), + LEVEL_UP_MOVE( 1, MOVE_COUNTER), + LEVEL_UP_MOVE( 1, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), + LEVEL_UP_MOVE(12, MOVE_BITE), + LEVEL_UP_MOVE(15, MOVE_SUPER_FANG), + LEVEL_UP_MOVE(18, MOVE_CRUNCH), + LEVEL_UP_MOVE(26, MOVE_HYPER_FANG), + LEVEL_UP_MOVE(34, MOVE_SUCKER_PUNCH), + LEVEL_UP_MOVE(42, MOVE_DOUBLE_EDGE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanRaichuLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), + LEVEL_UP_MOVE( 1, MOVE_ENCORE), + LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), + LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), + LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanSandshrewLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), + LEVEL_UP_MOVE( 4, MOVE_BIDE), + LEVEL_UP_MOVE( 8, MOVE_ICE_SHARD), + LEVEL_UP_MOVE(12, MOVE_SWIFT), + LEVEL_UP_MOVE(16, MOVE_MIRROR_COAT), + LEVEL_UP_MOVE(20, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(24, MOVE_ICE_PUNCH), + LEVEL_UP_MOVE(28, MOVE_SWORDS_DANCE), + LEVEL_UP_MOVE(32, MOVE_SLASH), + LEVEL_UP_MOVE(36, MOVE_BLIZZARD), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanSandslashLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_COUNTER), + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), + LEVEL_UP_MOVE( 1, MOVE_BIDE), + LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanVulpixLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP), + LEVEL_UP_MOVE( 7, MOVE_MIST), + LEVEL_UP_MOVE(10, MOVE_ICE_SHARD), + LEVEL_UP_MOVE(14, MOVE_CONFUSE_RAY), + LEVEL_UP_MOVE(17, MOVE_AURORA_BEAM), + LEVEL_UP_MOVE(21, MOVE_DAZZLING_GLEAM), + LEVEL_UP_MOVE(24, MOVE_ICE_BEAM), + LEVEL_UP_MOVE(28, MOVE_ROAR), + LEVEL_UP_MOVE(31, MOVE_BLIZZARD), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanNinetalesLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), + LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), + LEVEL_UP_MOVE( 1, MOVE_MIST), + LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanDiglettLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 4, MOVE_SAND_ATTACK), + LEVEL_UP_MOVE( 8, MOVE_GROWL), + LEVEL_UP_MOVE(12, MOVE_AGILITY), + LEVEL_UP_MOVE(15, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(18, MOVE_DIG), + LEVEL_UP_MOVE(21, MOVE_SLASH), + LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH), + LEVEL_UP_MOVE(29, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(33, MOVE_FISSURE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanDugtrioLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TRI_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_SCREECH), + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_AGILITY), + LEVEL_UP_MOVE(15, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(18, MOVE_DIG), + LEVEL_UP_MOVE(21, MOVE_SLASH), + LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH), + LEVEL_UP_MOVE(35, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(45, MOVE_FISSURE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanMeowthLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), + LEVEL_UP_MOVE( 9, MOVE_TAUNT), + LEVEL_UP_MOVE(12, MOVE_PAY_DAY), + LEVEL_UP_MOVE(15, MOVE_FEINT), + LEVEL_UP_MOVE(19, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(23, MOVE_SCREECH), + LEVEL_UP_MOVE(27, MOVE_SLASH), + LEVEL_UP_MOVE(31, MOVE_NASTY_PLOT), + LEVEL_UP_MOVE(35, MOVE_PLAY_ROUGH), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanPersianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_AMNESIA), + LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), + LEVEL_UP_MOVE( 1, MOVE_SCRATCH), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), + LEVEL_UP_MOVE( 9, MOVE_TAUNT), + LEVEL_UP_MOVE(12, MOVE_PAY_DAY), + LEVEL_UP_MOVE(16, MOVE_FEINT), + LEVEL_UP_MOVE(19, MOVE_FURY_SWIPES), + LEVEL_UP_MOVE(23, MOVE_SCREECH), + LEVEL_UP_MOVE(27, MOVE_SLASH), + LEVEL_UP_MOVE(37, MOVE_NASTY_PLOT), + LEVEL_UP_MOVE(47, MOVE_PLAY_ROUGH), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGeodudeLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), + LEVEL_UP_MOVE( 3, MOVE_THUNDER_SHOCK), + LEVEL_UP_MOVE( 6, MOVE_BIDE), + LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW), + LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK), + LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN), + LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT), + LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE), + LEVEL_UP_MOVE(27, MOVE_THUNDER_PUNCH), + LEVEL_UP_MOVE(31, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(35, MOVE_EXPLOSION), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGravelerLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), + LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), + LEVEL_UP_MOVE( 1, MOVE_BIDE), + LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW), + LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK), + LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN), + LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT), + LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE), + LEVEL_UP_MOVE(31, MOVE_THUNDER_PUNCH), + LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(47, MOVE_EXPLOSION), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGolemLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_MEGA_PUNCH), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), + LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), + LEVEL_UP_MOVE( 1, MOVE_BIDE), + LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW), + LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK), + LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN), + LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT), + LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE), + LEVEL_UP_MOVE(31, MOVE_THUNDER_PUNCH), + LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(47, MOVE_EXPLOSION), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanGrimerLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_POUND), + LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), + LEVEL_UP_MOVE( 6, MOVE_HARDEN), + LEVEL_UP_MOVE(12, MOVE_MINIMIZE), + LEVEL_UP_MOVE(18, MOVE_DISABLE), + LEVEL_UP_MOVE(24, MOVE_BITE), + LEVEL_UP_MOVE(30, MOVE_SCREECH), + LEVEL_UP_MOVE(36, MOVE_CRUNCH), + LEVEL_UP_MOVE(42, MOVE_ACID_ARMOR), + LEVEL_UP_MOVE(48, MOVE_SLUDGE_BOMB), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanMukLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_HAZE), + LEVEL_UP_MOVE( 1, MOVE_MOONBLAST), + LEVEL_UP_MOVE( 1, MOVE_POUND), + LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), + LEVEL_UP_MOVE( 1, MOVE_HARDEN), + LEVEL_UP_MOVE( 1, MOVE_MINIMIZE), + LEVEL_UP_MOVE(18, MOVE_DISABLE), + LEVEL_UP_MOVE(24, MOVE_BITE), + LEVEL_UP_MOVE(30, MOVE_SCREECH), + LEVEL_UP_MOVE(36, MOVE_CRUNCH), + LEVEL_UP_MOVE(48, MOVE_ACID_ARMOR), + LEVEL_UP_MOVE(60, MOVE_SLUDGE_BOMB), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanExeggutorLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_DRAGON_PULSE), + LEVEL_UP_MOVE( 1, MOVE_POWER_WHIP), + LEVEL_UP_MOVE( 1, MOVE_EGG_BOMB), + LEVEL_UP_MOVE( 1, MOVE_BARRAGE), + LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), + LEVEL_UP_MOVE( 1, MOVE_CONFUSION), + LEVEL_UP_MOVE( 1, MOVE_STUN_SPORE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAlolanMarowakLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), + LEVEL_UP_MOVE( 1, MOVE_SCREECH), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), + LEVEL_UP_MOVE(14, MOVE_FIRE_SPIN), + LEVEL_UP_MOVE(18, MOVE_RAGE), + LEVEL_UP_MOVE(24, MOVE_WILL_O_WISP), + LEVEL_UP_MOVE(26, MOVE_BONEMERANG), + LEVEL_UP_MOVE(36, MOVE_THRASH), + LEVEL_UP_MOVE(48, MOVE_FLARE_BLITZ), + LEVEL_UP_END +}; From f47bc95990dbee07286f9ca674d87c42dc553f12 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 12 Nov 2019 22:38:13 -0300 Subject: [PATCH 09/16] Set the TM/HM learnsets for the Alolan Forms. --- src/data/pokemon/tmhm_learnsets.h | 249 ++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) 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)), + }; From cbc50eac50854756bec94f8b9ea5733f730f0f62 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 13 Nov 2019 11:45:38 -0300 Subject: [PATCH 10/16] Defined the paths of the sprites for the Alolan Forms. --- src/data/graphics/pokemon.h | 92 +++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) 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"); From 060488e06491ba810e47f348b2041d4478944e23 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 13 Nov 2019 11:53:58 -0300 Subject: [PATCH 11/16] Linked the icons to the species of the Alolan Forms. --- src/pokemon_icon.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 1a01e1f40c..d71b8497f1 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, From 224a556daa94df25552df070e273641538b08196 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 13 Nov 2019 12:52:52 -0300 Subject: [PATCH 12/16] Added the sprites of the Alolan Forms. --- graphics/pokemon/alolan_diglett/back.png | Bin 0 -> 398 bytes graphics/pokemon/alolan_diglett/front.png | Bin 0 -> 451 bytes graphics/pokemon/alolan_diglett/icon.png | Bin 0 -> 368 bytes graphics/pokemon/alolan_diglett/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_diglett/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_dugtrio/back.png | Bin 0 -> 519 bytes graphics/pokemon/alolan_dugtrio/front.png | Bin 0 -> 776 bytes graphics/pokemon/alolan_dugtrio/icon.png | Bin 0 -> 485 bytes graphics/pokemon/alolan_dugtrio/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_dugtrio/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_exeggutor/back.png | Bin 0 -> 848 bytes graphics/pokemon/alolan_exeggutor/front.png | Bin 0 -> 939 bytes graphics/pokemon/alolan_exeggutor/icon.png | Bin 0 -> 542 bytes graphics/pokemon/alolan_exeggutor/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_exeggutor/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_geodude/back.png | Bin 0 -> 621 bytes graphics/pokemon/alolan_geodude/front.png | Bin 0 -> 551 bytes graphics/pokemon/alolan_geodude/icon.png | Bin 0 -> 421 bytes graphics/pokemon/alolan_geodude/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_geodude/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_golem/back.png | Bin 0 -> 696 bytes graphics/pokemon/alolan_golem/front.png | Bin 0 -> 893 bytes graphics/pokemon/alolan_golem/icon.png | Bin 0 -> 476 bytes graphics/pokemon/alolan_golem/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_golem/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_graveler/back.png | Bin 0 -> 751 bytes graphics/pokemon/alolan_graveler/front.png | Bin 0 -> 889 bytes graphics/pokemon/alolan_graveler/icon.png | Bin 0 -> 529 bytes graphics/pokemon/alolan_graveler/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_graveler/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_grimer/back.png | Bin 0 -> 647 bytes graphics/pokemon/alolan_grimer/front.png | Bin 0 -> 686 bytes graphics/pokemon/alolan_grimer/icon.png | Bin 0 -> 493 bytes graphics/pokemon/alolan_grimer/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_grimer/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_marowak/back.png | Bin 0 -> 777 bytes graphics/pokemon/alolan_marowak/front.png | Bin 0 -> 846 bytes graphics/pokemon/alolan_marowak/icon.png | Bin 0 -> 507 bytes graphics/pokemon/alolan_marowak/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_marowak/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_meowth/back.png | Bin 0 -> 661 bytes graphics/pokemon/alolan_meowth/front.png | Bin 0 -> 660 bytes graphics/pokemon/alolan_meowth/icon.png | Bin 0 -> 438 bytes graphics/pokemon/alolan_meowth/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_meowth/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_muk/back.png | Bin 0 -> 883 bytes graphics/pokemon/alolan_muk/front.png | Bin 0 -> 917 bytes graphics/pokemon/alolan_muk/icon.png | Bin 0 -> 631 bytes graphics/pokemon/alolan_muk/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_muk/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_ninetales/back.png | Bin 0 -> 806 bytes graphics/pokemon/alolan_ninetales/front.png | Bin 0 -> 1012 bytes graphics/pokemon/alolan_ninetales/icon.png | Bin 0 -> 632 bytes graphics/pokemon/alolan_ninetales/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_ninetales/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_persian/back.png | Bin 0 -> 679 bytes graphics/pokemon/alolan_persian/front.png | Bin 0 -> 715 bytes graphics/pokemon/alolan_persian/icon.png | Bin 0 -> 466 bytes graphics/pokemon/alolan_persian/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_persian/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_raichu/back.png | Bin 0 -> 674 bytes graphics/pokemon/alolan_raichu/front.png | Bin 0 -> 890 bytes graphics/pokemon/alolan_raichu/icon.png | Bin 0 -> 584 bytes graphics/pokemon/alolan_raichu/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_raichu/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_raticate/back.png | Bin 0 -> 685 bytes graphics/pokemon/alolan_raticate/front.png | Bin 0 -> 821 bytes graphics/pokemon/alolan_raticate/icon.png | Bin 0 -> 512 bytes graphics/pokemon/alolan_raticate/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_raticate/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_rattata/back.png | Bin 0 -> 667 bytes graphics/pokemon/alolan_rattata/front.png | Bin 0 -> 575 bytes graphics/pokemon/alolan_rattata/icon.png | Bin 0 -> 459 bytes graphics/pokemon/alolan_rattata/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_rattata/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_sandshrew/back.png | Bin 0 -> 649 bytes graphics/pokemon/alolan_sandshrew/front.png | Bin 0 -> 599 bytes graphics/pokemon/alolan_sandshrew/icon.png | Bin 0 -> 437 bytes graphics/pokemon/alolan_sandshrew/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_sandshrew/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_sandslash/back.png | Bin 0 -> 940 bytes graphics/pokemon/alolan_sandslash/front.png | Bin 0 -> 974 bytes graphics/pokemon/alolan_sandslash/icon.png | Bin 0 -> 533 bytes graphics/pokemon/alolan_sandslash/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_sandslash/shiny.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_vulpix/back.png | Bin 0 -> 646 bytes graphics/pokemon/alolan_vulpix/front.png | Bin 0 -> 673 bytes graphics/pokemon/alolan_vulpix/icon.png | Bin 0 -> 492 bytes graphics/pokemon/alolan_vulpix/normal.pal | 19 +++++++++++++++++++ graphics/pokemon/alolan_vulpix/shiny.pal | 19 +++++++++++++++++++ 90 files changed, 684 insertions(+) create mode 100755 graphics/pokemon/alolan_diglett/back.png create mode 100755 graphics/pokemon/alolan_diglett/front.png create mode 100755 graphics/pokemon/alolan_diglett/icon.png create mode 100755 graphics/pokemon/alolan_diglett/normal.pal create mode 100755 graphics/pokemon/alolan_diglett/shiny.pal create mode 100755 graphics/pokemon/alolan_dugtrio/back.png create mode 100755 graphics/pokemon/alolan_dugtrio/front.png create mode 100755 graphics/pokemon/alolan_dugtrio/icon.png create mode 100755 graphics/pokemon/alolan_dugtrio/normal.pal create mode 100755 graphics/pokemon/alolan_dugtrio/shiny.pal create mode 100755 graphics/pokemon/alolan_exeggutor/back.png create mode 100755 graphics/pokemon/alolan_exeggutor/front.png create mode 100755 graphics/pokemon/alolan_exeggutor/icon.png create mode 100755 graphics/pokemon/alolan_exeggutor/normal.pal create mode 100755 graphics/pokemon/alolan_exeggutor/shiny.pal create mode 100755 graphics/pokemon/alolan_geodude/back.png create mode 100755 graphics/pokemon/alolan_geodude/front.png create mode 100755 graphics/pokemon/alolan_geodude/icon.png create mode 100755 graphics/pokemon/alolan_geodude/normal.pal create mode 100755 graphics/pokemon/alolan_geodude/shiny.pal create mode 100755 graphics/pokemon/alolan_golem/back.png create mode 100755 graphics/pokemon/alolan_golem/front.png create mode 100755 graphics/pokemon/alolan_golem/icon.png create mode 100755 graphics/pokemon/alolan_golem/normal.pal create mode 100755 graphics/pokemon/alolan_golem/shiny.pal create mode 100755 graphics/pokemon/alolan_graveler/back.png create mode 100755 graphics/pokemon/alolan_graveler/front.png create mode 100755 graphics/pokemon/alolan_graveler/icon.png create mode 100755 graphics/pokemon/alolan_graveler/normal.pal create mode 100755 graphics/pokemon/alolan_graveler/shiny.pal create mode 100755 graphics/pokemon/alolan_grimer/back.png create mode 100755 graphics/pokemon/alolan_grimer/front.png create mode 100755 graphics/pokemon/alolan_grimer/icon.png create mode 100755 graphics/pokemon/alolan_grimer/normal.pal create mode 100755 graphics/pokemon/alolan_grimer/shiny.pal create mode 100755 graphics/pokemon/alolan_marowak/back.png create mode 100755 graphics/pokemon/alolan_marowak/front.png create mode 100755 graphics/pokemon/alolan_marowak/icon.png create mode 100755 graphics/pokemon/alolan_marowak/normal.pal create mode 100755 graphics/pokemon/alolan_marowak/shiny.pal create mode 100755 graphics/pokemon/alolan_meowth/back.png create mode 100755 graphics/pokemon/alolan_meowth/front.png create mode 100755 graphics/pokemon/alolan_meowth/icon.png create mode 100755 graphics/pokemon/alolan_meowth/normal.pal create mode 100755 graphics/pokemon/alolan_meowth/shiny.pal create mode 100755 graphics/pokemon/alolan_muk/back.png create mode 100755 graphics/pokemon/alolan_muk/front.png create mode 100755 graphics/pokemon/alolan_muk/icon.png create mode 100755 graphics/pokemon/alolan_muk/normal.pal create mode 100755 graphics/pokemon/alolan_muk/shiny.pal create mode 100755 graphics/pokemon/alolan_ninetales/back.png create mode 100755 graphics/pokemon/alolan_ninetales/front.png create mode 100755 graphics/pokemon/alolan_ninetales/icon.png create mode 100755 graphics/pokemon/alolan_ninetales/normal.pal create mode 100755 graphics/pokemon/alolan_ninetales/shiny.pal create mode 100755 graphics/pokemon/alolan_persian/back.png create mode 100755 graphics/pokemon/alolan_persian/front.png create mode 100755 graphics/pokemon/alolan_persian/icon.png create mode 100755 graphics/pokemon/alolan_persian/normal.pal create mode 100755 graphics/pokemon/alolan_persian/shiny.pal create mode 100755 graphics/pokemon/alolan_raichu/back.png create mode 100755 graphics/pokemon/alolan_raichu/front.png create mode 100755 graphics/pokemon/alolan_raichu/icon.png create mode 100755 graphics/pokemon/alolan_raichu/normal.pal create mode 100755 graphics/pokemon/alolan_raichu/shiny.pal create mode 100755 graphics/pokemon/alolan_raticate/back.png create mode 100755 graphics/pokemon/alolan_raticate/front.png create mode 100755 graphics/pokemon/alolan_raticate/icon.png create mode 100755 graphics/pokemon/alolan_raticate/normal.pal create mode 100755 graphics/pokemon/alolan_raticate/shiny.pal create mode 100755 graphics/pokemon/alolan_rattata/back.png create mode 100755 graphics/pokemon/alolan_rattata/front.png create mode 100755 graphics/pokemon/alolan_rattata/icon.png create mode 100755 graphics/pokemon/alolan_rattata/normal.pal create mode 100755 graphics/pokemon/alolan_rattata/shiny.pal create mode 100755 graphics/pokemon/alolan_sandshrew/back.png create mode 100755 graphics/pokemon/alolan_sandshrew/front.png create mode 100755 graphics/pokemon/alolan_sandshrew/icon.png create mode 100755 graphics/pokemon/alolan_sandshrew/normal.pal create mode 100755 graphics/pokemon/alolan_sandshrew/shiny.pal create mode 100755 graphics/pokemon/alolan_sandslash/back.png create mode 100755 graphics/pokemon/alolan_sandslash/front.png create mode 100755 graphics/pokemon/alolan_sandslash/icon.png create mode 100755 graphics/pokemon/alolan_sandslash/normal.pal create mode 100755 graphics/pokemon/alolan_sandslash/shiny.pal create mode 100755 graphics/pokemon/alolan_vulpix/back.png create mode 100755 graphics/pokemon/alolan_vulpix/front.png create mode 100755 graphics/pokemon/alolan_vulpix/icon.png create mode 100755 graphics/pokemon/alolan_vulpix/normal.pal create mode 100755 graphics/pokemon/alolan_vulpix/shiny.pal diff --git a/graphics/pokemon/alolan_diglett/back.png b/graphics/pokemon/alolan_diglett/back.png new file mode 100755 index 0000000000000000000000000000000000000000..26e060dc346577c083b40b883dcd09b47f5f0661 GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wFGcGJ>Fi`k$g26*V00?emC~R<0`0?Y1LBIkIjf#c|A0jeN7$|5Y zL?le;nBZVwz`Bf;5vZ55z$3Dlfr0NZ2s0kfUy%Y7eD3Mu7~*mK?FC=1Lk0q@4<=SH zEZ2QE`3u8K{&mSVjomT|9hTkiY&PX)vU;aCb#WiuKDYnO>;v}ssq>lgK5GhCFPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_pjcS=$N*R{7!VK;*qB(ra6tI@_|P~= zZ~z$isF3(*STG$=qFzC!a(f|Me32;bRa{vGi!vFvd!vV){sAK>D0USw0 zK~zY`?U27t!!Qts9i?Li>>(2iDGz`UVy=+IM8%XcM?{Bs4~9Mgf>+=bvQUZ9X_k(~ zUNR<^g)x<|_%qcxPYg);EKk2r_d6XM`OgFg9zmRV224HkgDIyv!XqIPvg1@FXJp4D zIc78$GdkyjJ_An|8MR}OrVF?wg!m=}0AfU(!yP4rklROegm%71SUv+KoZr6`j{wgf0!GWv2N>M;mVYbHMA~Q zhbtQ^shjO)zX2<)biJ)gtagod2u*L5&VFonM%Vils>f?>u+xafDKLeyf5)yw?Aj04 tts-R|tfj_Yy|Mw6jnr^FGV<3j_6ZOzd{Bnd8#@31002ovPDHLkV1k0ju!8^q literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_diglett/icon.png b/graphics/pokemon/alolan_diglett/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..79d21ead889a4cd5db153c72fc92aed293d55d81 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq11uB-TB(1j&e( zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-oQQyC-yg1OYp&{Z!Lcst3|7&V$Kw2@t%YbXQ zfP#!k-tI2{m$H943gVOm`2{mLJiCzwDlFm#k2iMqHqf3%8)j{=NzW58)mKje`r8 f@Fz4$7QJL<2(wi5HoeJj3-W=dtDnm{r-UW|j|ppA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e114284819b74add47b737b084e0bb2aed9ce800 GIT binary patch literal 519 zcmV+i0{H!jP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_fG{BV$N<=AAh19nNEi_K`1lYI5C|xE zSZK&FP@vF|2rwWhU|3*~h>+NrSlF;rX8-^I32;bRa{vGi!vFvd!vV){sAK>D0bof) zK~zY`?U1o}tA`(D6)-i(}6RlB6EgCcyXb}Np*d0%3V#re8B0O3EZ-BVBAUmo3vMC%% zC&+0=K|eIqGLOB{-U63t&H_JvM)M7$GPxx7dikV@j)<1P+l43UuK#o%&;#&( zz1cq%53Mo}4KNo z&7oQ!B9QPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_pjcS=$N<=wSio>VSTGp)`1lYI5O4q( z_-I(rI7rZt2rwWhU|3*~h>+NrSOc4UOaK4?32;bRa{vGi!vFvd!vV){sAK>D0%1u+ zK~zY`?UONY+CUV??V-xTkaOxXkPe&_7LU#su=-h20+(O&d#B82SsDWznuj~Vt5 zIwiJk6M9$%72p8x_QfOa_mttlW--%S|Q zgD5;+@G`W(8OuI-{E7p9di}@{Xc501YqXW(xm8x)2gL2ch&w7oXF3!AjZ}DwF51}>tHZrU(C!Pz4a9#v%5UBAnH(`41LKlJI_BBJeQd?3$YxWh2 zfKEejaZAmx$~{#J7|*Rsw?eff=sq9-pMT&}#|i+(6>vw!9=KQd(PV6U)HOa*K=Y1V zzRq%inOlYS>ftgAeN7!N-S1Sz}r} zz+#z5LE>MedYnkPT%>cB11fT!g?&+7NSU$#zdSwzqF|Y<3B*a3BBo$h@DxxCx`7io^(zHL_hA8$bgN6410000?FJ=F96vQbB@(X5gcy=QV$ob>x;uumf=j}TPP;kv_B1UAk6rogbLa0nctH43z4#oyt#V~s_cYvd z4Y6KnrF8bnzBdQAZp|0XIA?q_OW5+;=J2bQLJS@+H@YmjCVTTVTZqhQr(g!2aMNSD z^LUrAnKw#K$#dJR_Ms*_G<~b5tPx#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nqz+gC-I1u=_Xb=z(;DAVoXaL}-Soqjz zplBfY`1r_Zi0Gimz@Py5@F<9=K=g7n@c;k-32;bRa{vGi!vFvd!vV){sAK>D0;x$v zK~zY`-IcM9+b|4x4Y6!#Ba*Jr9Jc?<6xZQh@ zh%N-M0`$BUbAmE*tQ4T5_Rr7o#8q@nLC=dml=CB!Kr}@+0xZGW*&H?quwtO0Mfb9= zlJuzv7{wxJ)f5K;@a-L;)3*gMd<+6``(`4#7~};U7s8FRtgLM$w=98#IHobPRe-V< zb&zfV)_cE>V`dPeb|Vqljc=uqoPwq|#Oh@RjDLy6`z=qv;K@AiyOf*{bp86A2%4^j zvS|wYuIWnl8BA~Om+^cXX{=%i6s*M!OOzd5^5RoZPWq^#15=BZJ0Dd~u9Ov0pXe@r z&^1gxavZ7W<(Xa!j8ZXF`8PrH;}b3W^NDu>xLd2-hnQeE+&I^1bQ*`TlT^KdfT!E- zj8zrLnAU|M5YpJcsoP@$}3%GzezQCR>S~9z;~hF6Y$}i zrynLcBLiHfywN4~7`U8y*jGt{RG0v%(ekhpAg_Zoy2$|7xIFVHzey6rn?nY;#+gTr zRq9a!_>UQAt{0go2C_!u{maWa0_DZW*JX$rMMC*m=L~TqX;@}JTO3AUeEap{ujQXy aMez$>8psSNRD(AF0000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nqIG{i%U@(Z_a1am>P{3eNNI1~AX!!8B zh=4Ho`1r_Zi0Gimka%Fgu$YLbKuORwY5)KL32;bRa{vGi!vFvd!vV){sAK>D0|ZG# zK~zY`g_N;x+CUV>56kk#a2Jv}c5wfIINfb}NmL|+NVuI;) z@E8+x-baeeSbG+^OZVAvs#OZBQLblY&y6yG)Jt59EQ*GQs z3T_CcEMtQAiBNJKU@0-4R;CEN- z1=vLBkiYjkl_6cB�!~tpqO0J}N!n-Vm)Lq?GnL099nL9#FZr9)J)p0IGCf0Qhh{ zfV`K0cA^YpTS>ocw8b(EM)b`Tp@s7tuq_0q*BrIyfJrGS(A0b)Z=M5|vs8Ut*wI;z zMVD%I!W$`@?ZsAU)yGM?w~0=8)u+dlp3LD@CzEuFd^FFYjjK<~BPhfFzP+&e2Q8gZ z^qhJpc-c zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6c zUq=Rpjs4tz5?O(Kg8-ip*Mu1j4h{|#GdyOT@JL9A*s&nu!i9_vA6ESM@#96o43KVA z5XqUP0u*6P@^*Lmzm)ycQ4psj$S;_|;n|HeAluZ_#WAE}&e2Q0ek}$f3=j56ZxK^_ zJn0g*fJMXSphL4-9^GQ8Vm=Z%>&zM6o~md@-dfc+CL4F}+qZB2ljNND4D82P)Eixj zJdEr6Mbb7|tkpC!-{sNkb*)Ep(Uwd5IF_(3GW*BR(JB?XZ(6T)$cjl@4Y!<=NIfCb z{;tp<*_Y{Q!Rj}g*S}mfJ^8EEFZ+uYF{?lNJlpZVLjQbz$?o&ZHZFOwr8@KFug^IL zf8Y6;DSYEJgPzCieQD*LpGx`96<+8(-w~@HF=uja&h5@NmZ#~d0 PP+)ty`njxgN@xNAFjUj~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b82b575e9944fb0eeb54702e2f20fd9ae7f0c71c GIT binary patch literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6-A0X`wFGcGKcU?K5i0>gy}4gmoH2?Yg@fB+2xgA+GS{P^($s0s}f^_55g zg*Xd5B8wRq_zr_G^yv zH(&9EX=}`W;||5ZMX$e=hP|qp`SbJnBQN~fyLP`6WxDd6fs>)?GsA?)9jAk5PH%CT z5aHOw!&17&q2ED{rNvFnfMt&;XP+RGR4adjX1}8LmnrM_#P6Q_S7LSw;|;mF`e}?A zu?-zZSg*-m{d=#Hg)uAd*84>j77A7_kK&4L)@HUnI?8nE^FrH+^*Q@j&Huo2^2pc5 zSIZ|TPn+Obq2_90@G#a{o%O?6uUEleOqpBRJtnM|eJOU}0DET38P>3!O{?rL$OX<% z`jO-+*HAe#{BNQCwu9dnsvX$&K+$7K$nE*(oV|M04s_j-+wJjbl9+C_>ra-c7Zdj8 z{XXBfrMy~cN6Vwq1+Q;q9!-<@#toLljqcjGSBKjsHjZ%BwTWo)|fqv8IdNAW)*9G0wD_Jl{{ z{ZsQNyqo$;BAxDRU|{=V!lvI6-A0X`wFGcGI$2q;*v;y^{k3;_WF2?Yg@fB+2xgA+GS{P^($s0t0N5nE;s z6yhxKh%9Dc;5!V$jK}j=qyQ~z@N{tu@i_i=l4D-8fq*Of$v1`Rc4|YF*I2)`TOoXTIO~aNX{Is~0^HSJ0i-G9`TD zp-(?HS|9IljhLVOxG~no>3n{phhl)TdI-bE7t`5!6xF;Py!mZDd}=V8Q>6GxWTl(* z_r7i+0j;J$~Tu? zi!FsAr0;~&tH!MleWvg1*~G2Tv87q!x?AaqS{;)kmSzlF*dDxFbM=ZOx04VngN-Ne zquehC3}pBG^$8X|7nQ8^taJ7E%l{mBmU!I~2(Y>FymHm)O#AC^jGRIb326vDe70;B zKi|%ux(iO2?}_~Wsjqd)#g`@e4Th|bz8zk1_S@;`so@MuUi3e{yr9ZthS9`Du?)Q8 z&!7Ei-|!)M9~+BheQ%%E*5taIj0ZjjYilmml$J}ec)oz=_kulz$6KNqKA7F){-bcb gY4^Kdn;G^oMk@t;eR1KCJ1EXPUHx3vIVCg!04e|EmjD0& literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_geodude/icon.png b/graphics/pokemon/alolan_geodude/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..d19527327bfcd7c21c3ae58aa2c737ef61fc0bbf GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq11uEqW$sbOD9L zOI#yLg7ec#$`gxH8QgtbfW|14r4}g|>zNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5}rL4Z$)Yx3My2M34b_!@pv&YlLF{EP7(@6(;4=eDvo@KkSgquN@VFtr>?k&IhFRRR8 zD_T*t`pPdR8VN^@ud=%?w3aNeF<$>uFbLHd1)@&Hggu= e-1)RZ0C>>*os~|9iUnxvXPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_I5D0uf0> zK~zY`?U6xl+b|GC-N1`#S2{UBD)$01djK0CV6p3_=mCQC02M$vyTSrA^qPRl6WGux zJ2Rvt+sd|!0-1$G%{>13Gn&1}zlys&f24POP9y&;8{l-)AFGTmUt|ZxVQU9z9Ai0&UlICm`S#w95hb($_zB9E}h^ zU%L+a4q_PN5P{R?;ailt0g^!1Roe)*vBLngJ#gBl_x>6fIu4k?X+G;ltdjfb-nXi%uYqTMPyPS&zWZvvFP2UAm9SswfO#ML% z1bAb#1E-X4tI}Z9ss*ST~hZ_-Xw{qz+XG z3ZqPQQ-M_|0von~wro%yZw!FOB6?De*MxwkI)JhXU_%hVlEA!0*IWk&R{(f$1mNI0 zCYtid^?CqE0s)^AP+E53e7XR@z^+LNP&mCY%E16&kGb`Dh@lnD7xV};XrhEZ0l}$& zD;X4&XMnaA6T$KHI^A%{BB0`b;DielIySKy)zCv2038$q_(Z}oy}ke%x=Z17pjIIQ e@A1FHZ1xu@IFG4ux8hC!0000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_I5T7a6nK< zC@3hHpqOY-P`Ie5kcfc5C@ARY=%Um?yZ`_I32;bRa{vGi!vFvd!vV){sAK>D0@g`H zK~zY`t<*tF+&~lu@a&R{^wPH*OQjUqiO`dWbiDLX*lh;ZQmt5MKY-vjSQzzM!GNcN z5FA|Gz3QtwXYp zI-Me_&`bwVIz==JKp&P3m|eHB6|kJL0UtICP%@$lk2cjB6$i>kRAF{K1sG9@<~Xnc z(h%t;rhqJji(SlNl>ilj5Cxn`P^FFvK`3?8T{vX`poXobv=7iM0q^Y`&(W0yto&Nv$DZ_W}ymR#V@_B-kAT6mLTj0xa$|$5UqDaR%lB zPa9#s2tMt7MBs5Z2m%T|Kh)Ro`8MaCx5s(F@n??nZEcMi&V8O1x}ET=&$qlo9gt^H z#EEh{VHlp^G!6Kn9SK2})PPWx@980rj$dM*DzGyZoKae9`$KTzd7~j`Lc1?)3X8Fy ztxyi2Chr412f9+WbFd%jpdrqjt1cAB@?^lw(yQp>vtC9`3sR5HcJ$NqhNHQ6-HpzkP7i-KP)Em@dmy#?HYZyT$w*_E+ z%YwIq%L}j|1z%Y2Hc3Xd;dk0>pg;>O6=K25}cn_Ql40p%HZzf0yIXUEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4& zeH|GXHuiJ>Nn{1`4FY^ZT$AUvIygAg)YN=W4&1kIUvhHP`(wS^TBH8||9|%ES&(j2 zu>bu<9iRwflDE6d|E27oj)FKPL4Lsu4$p3+0Xd&NT^vIy<~*Hbn8⩔QElQW>dvw zqaeNshbG;Q&E+$gcx>JFME?nEZkJ@%CQmL+=iBjb_MLI9AA;xCUHQeed$L>9@@*TvKtbi{>gTe~DWM4f`}nlN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..038e7d37bc0b70ce598634bba0e583782e949cc1 GIT binary patch literal 751 zcmVPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_cpw0nH~_d<09XJ35D*a9kO(L+C{R#9 z(0~y5uqb$dXc!n6`1tt9FlYb(0DZB}tpET332;bRa{vGi!vFvd!vV){sAK>D0!T?j zK~zY`?US)?+b|G@Wgvo=4n0{M40I7~KY(;LyoL_7SBVG@=|co43JuZjp_7LW_TIsI zffz^^!$Ujxp>iaxIF@Mx1v2IaN#uR}`QM53KH~qQ1)neHI~cr!45{9oW~CTv5`)|3gWR37qD=`*rEH*m_IrqsRsLKWDpu|I+|M z=m0!5Ew(r#wt=ut4? zO6_OKz0;ya9|!-=2jxr7jzQpw)|C;sA6PM`ilJvTpU; hStj#7;$6b?UH}Y&pf{7&YgzyR002ovPDHLkV1igeNJanv literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_graveler/front.png b/graphics/pokemon/alolan_graveler/front.png new file mode 100755 index 0000000000000000000000000000000000000000..d2454334b548f456583d4e6f3b810d35a6709585 GIT binary patch literal 889 zcmV-<1BU#GP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_P*_-afOwdopfET%5D*Zkz_=(dC{R#9 z(0~y5uqb$dXc!n6`1tt9FlYb(01rW2ZU6uP32;bRa{vGi!vFvd!vV){sAK>D0@6uD zK~zY`?UTJ~+&~b=*Pz91MjtkTG#W_(m$xGu3@NOSbA6I-W9Op@XRb~N<_t-1*M=0A zH*j9SMVf#K7sxd(+@(zIXUME{hixP-50DJUv0{Gu&woa<;-3%rOWvl{#2N+kXcgcP zQSWbnvr59siNbi5M3O0Y1pp#({fzdOPpzmR0WQ)2Kz<7-$p?qjUXx#vLgdSXEP;XE zz}V&d60k;L&NDLINdTLo13stl&{qd)nXJ9v9gR) z-$l)*DhXmp3}B@_hph)SkP#uG@leHf0(K;FD<#JrtHPn}a0wjL4dnpdz#2n9Djcil zM`UAPl>9V}*u#241TYZQ&WQWUMrvd9;yj^&3~2YllLPUgA1D@Jq4?<=l@a&!@`6Yg zHUo#>gwR=uZt4jc#5*HyNYVDz1@-tuTc4ycxgREok+9r8jhi;}j3RTWd*CkEEJjw6 z9#wUoGK#qr?^6S;ms2MC8D--hEuwy3`Cct>QhYf_^fIbwRA)EeN2QrTq?-y_8X(|l zq!Y7;n`g5*^6QJViN~xEY!AoulZnmCvmeJ?KflWh%Vrbg(&W|U>E!EVe){@~N9x@H z5)BashsU#%v&r{sJz*fZ2MDcg-wyJAaWk9DZ?2!s*$a9PHn1@JHG6mS>m%EYd74v% z!F@m$P|}mDW(qOkE_e0-5K@s*s!T`J=agyKOW^sNu=lg)8 zQY3J5G9OB{Du}FyZkX2|`QD@51{8)Vrp8F6eAJ><0;fLT6#hlH*!PDa{m+U(56pQRm91wn#={%2H%8zla<5hmuSNe~)#&KP$$b8N9 z$ZWaP)SjByX9vz**DyHCHAO`wdhsRJd7G~5DX-mq_{2<$sH)ywZbuA)maJ*>juTGZ z|KP*n*)|VvO<-$(SX6v-z3pppZx)FeA+P`XN^fX9@%``-&bQ_~2fsa*+j<6tAg;^E=h+0M9p_y7LK z{sv5b2`a7b1{1huOnRAcB;bHUPx#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nqu!ykOsMugQcn}Z}=-B9ZNPzhG_?T#z za7Y;N;3&YL5I|6nP>9F?00000037!_k^lez32;bRa{vGi!vFvd!vV){sAK>D0pLkQ zK~zY`?UFrD<3JFGjqHN*98siYb4XW0;=<)BHV|EjWF0>MtxU}!OLW0jG?tsx(9*D1 z-br^de~y{i^+yut>eGo=`H=iRp4oYKoDco0I`Dn}(_eglB!oDI{eF@N(s;jbfIY;) zNs?R{K%5Q%k0-5PL<9bzX!RwI2TFw2^#P8~vjO1Do(}+mZ`u8h@4=EXARmFdT_6C! z6an@E3+Qw+(87a0aJdW2`api3U2l)^^-rG&64(N~`Ug9;)|SjSd^fB#5|t)dLiT~_ zxHXyF23%YcBG{^QNPopfhY=Bt>R*^iAsu(t9@Jf_v;!&~&jR$PV$#K^dPJ$^WhT+@ z1E3U}REmJ_a*lr6gK{QfrBG?9*RgcwVshqBPCI~2)~#OSv$>cGfArY^7r-T`2!2Zo z&~}(%J=5PF1Il_$*$RP=I4*agQl4{Z7p8tOUGw0A05{_5L|EYIrP+^Sfk4z8Foorq zD?PvBeylhc4AkR2<{?u1TRlih#$K7%T!ZT7%+_uQCfmaCMy7-zs7PA=e#ITPJ#d~L zVK3xOFQ_R5kju?|w|f3buPZ3x7-NWdKQ>fEbVQZL<{oBzhdt#Xx%lC&iPx#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nqICxM%plA?CC=d`3Siq1VKrs0D_$XLN za7Y;N;3&YL5I|6nP>9F?0000006KfY=Kufz32;bRa{vGi!vFvd!vV){sAK>D0tZP% zK~zY`?UTQ5oInu9k>CZ!Aap62vr)<%>-D0+q@+xa`l1M38zoJg z){VLLD)I{FCvbR|%yLd-xW!$HNdACb;QKARGqYIt`d{7sfP}=rnGoXXth#6bzcmFPQsLQ*Ci$%T0x+3_ z>SW4tGW6dOsrMR?3bHO>y$aw59j@05c;LhF7T^E_SM|D*;2rx56YyY3b^S{N8K}WF z;Cjo$x~>_JK7gU#FaHAIXN%Kqz}eTpb*ZzYlxfFMxw^X6iR_l*kL3CCXH~B50A816 zxs;9X83B)d+I(PS0Bi;4mp8s~3cFAT7cfu?3Y8UxFe6yJS*b>hd^P~cTTx~GbJ)C} z8q4hgMj}FVN5CgD!T7ZnDF6Tf literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_grimer/icon.png b/graphics/pokemon/alolan_grimer/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..61c3b258b71d057c2e2e670ca2b9bdbdb0fc9c98 GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq10@taR_+PXr2y zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6c zUq=Rpjs4tz5?O(Kg8-ip*W|ga4h{};&wEb&?pab&^8f$;nz^3I$x-{3M}2>;vTxr$ zkO4^Gg7v$bFrQ0+&xD;OLQ6bI;rfJQj|K%HpRku*Y+6ZRSvb*S@$fIcpg1I?00@=XGzD= zgo`0}Ot_33`IT37@JsdSsZGZ4DBq#vk~wsnIGSBed2% z|9hf64W*aPPaN9L=hQg-Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_DA=%o;Mkz}@EE9wSXfXH5D@tI_`txp zh>&<#7-(2fP>5i_Krk?1K!_+HAdR*-@Bjb+32;bRa{vGi!vFvd!vV){sAK>D0%A!- zK~zY`-O@2{+CUTsa6H6PH=a?VbZ9Hvd;xs@1d%^LI=F#OVaOFEY9@Mk=+MD%-nvkn zv1Ve_XDe6MhJG*fVwo|E{+FP*ve!TbR9hHCc9Q+P6PyZ4e(7~Sq zHEG?VUK#LW(WIm#gi2!Z5Rl?gNXdti8LtT$I4w%YWhpzvn-Wg|&ncNPo)QTtA(LVd z5JE(qj!8+*E+NB!#w`XVA%-*t^sKOj8pb6F{K6J$Tp?lHq6GM7ZIUeQk=1w{LJ9(m0#3A2q$TAIT+_=bmA}jNsFR8?M@Of9ws8UOcl%S z&5)!maznZjBvnUzdbuIuGTy_Xj2XyF3-as6QXD&B5IS<+$4XwbD1ca(Pw7QSM|mKU zw&7PuCp=GID;aSGkMR#mCm7@Vw@NjAd~*v&%T@O!-f65r`q=02bi2Gc-y59*^_H(; zyZpYN4XPQSU$0iBpugd3?b&u8D0&)Uw)j-jpR53?S)euUCd_(YW|{?H8hS=3wKT$p z%{d@lv+R>b2AC;`n9J8DLUjS|TL4NkeqIQmAM8-6sAp#=rpPS?{yG!j+lw5~kT`l3FMEu+;@<{F-QG=UBFjMf^$lZePDdC_YbS%a z&05_yEFK9Eja&|Z3?uU^?~UX`FSeuBgki-mAM@tJ^xyoT&02ol4~=UKc-tPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_DA=%o;Mkz}@EE9wSXfXH5D@tI_`txp zh>&<77%)gccu+`)sDO|#Fi>znP?@qm7XSbN32;bRa{vGi!vFvd!vV){sAK>D0;fqt zK~zY`y_2zy+CUJ7*99)9uu-J6U|s;67l^Yj5Glw+X`CXfQ*@Vfx1f{K#W+fRxl0q# zq(KfTa}qs;wW7>b<~oWK+BYDVe{C=je5Od05t6N)kN+R<%#i;an(_C9Svdey4*;`}lNAQ1TqsHDJfkN|z&>jbJu z2!s)yCc3K17>a110M0J}y!XnXn6P8lPqwI%8b+lq9D3JXDEKh&i2kZ;V6u`GU<)C> zo{fL-PuD#K2*H%`Q^&Sz>6eZ`yx<>urx%wAFi9#iD2QYO%I~0oE}j2uBOe@#v{hz< zI+m?AKxc4qaR+S(Ft!rVs%kvz>+xg?Q2KJQ62PJZpw{}jU3E!8a3U9}fC3tnHuiv- zT+JJ9;SqJV6qEyF@$7azkcQo&PQ97+0suRSZF?1AxxRKMO*B Y1FV2oZ&xgk@c;k-07*qoM6N<$g2rZYCjbBd literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_marowak/icon.png b/graphics/pokemon/alolan_marowak/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..8d76e5925695de812aa8daf5d882b397e93cf83a GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq10@&1{PnaRY_K zOI#yLg7ec#$`gxH8QgtbfW|14r4}g|>zNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5}rL4Z$)Yx3OIiWwd=PIyfC;NjrlkdP4ZH1o;IsI6S+N24o9)x;TbZ%(;3gFt0^HfbGG?B8Hpu7Tnq= zy|cl$;44FuOv33Z23_$Br#7DE+TF0;cUIY>(|;t{J?t9dwR86AyqNzOwGEsX1imYsA|;K3-3ZaxPz1oIcnpXG#M9cx%l_-yQlve9&FvF@#pxV z_InMTtbYRyZZh@+$~7M>U`S@-PAk;jz_RF5( buc={9zmoDSxAO06P+)qx`njxgN@xNAQp&+> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..84eafdae027197ea54f679aafe7d77d5d8f417c5 GIT binary patch literal 661 zcmV;G0&4wPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C^%>k5D;*X&>$!{m{2f4XrS=$@ZiWO zFeq5afH+V%kbp?Y00000000000N&hBdH?_b32;bRa{vGi!vFvd!vV){sAK>D0q#je zK~zY`<&-;a+%OP^sR2^B(*sZ~aRCB(G!y|HAjk;`4YaCZt0lAwkA^@h5 z-}XenZChx>xlv zprw_vI0Vr2ZDou(21Xt7M}VN_ro7R3&?ZSt0L}nAobWTar*t3kI0S%gE$kVPhfaZv zw$wfcGRi7PEOl0=KvDI)6BtWOL!%5AvNqYtw1$>BJI*YJFa9whC|MP( z&0pU8M-Es~a1$SW2re-chIetZ1q|{osKS#=YFJEepMa~sa-dA|;5R_JZvvi(dEiY@ z6w5N;>i>A}R4R}eJ?nsT56)dypbT&6z-$7n70O9qT!EXjyPPkw=6R|>=QY>(?3|P$ z5`&E1YGVctoal(kmbF-!zFvTz6~Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_Ku}l^5D<`{xF9Gvm{2fac!2Qm@ZiWO zcz|%ofH<(QxbX1s000000000006PchumAu632;bRa{vGi!vFvd!vV){sAK>D0qsdd zK~zY`?Ub>K+dvS8SKD2uz2#g>BO_y6t%ht0cS27P2p7^>g1z1@_KaS@Wk@5$buLr- zASU?bGLn37u||E08-$zrJpar;BZ-grKO+d~M@^<>qzMSJNnoB|0f;7mLWf_4E}_VI zg#z@$bEKh|0`fL_d_LNF4pYD-`TpxmmM?!65fA*HJsyr5bvf~Xm{*o6ICLyP_QYtv z9gY=Z$pK`6Mx+XeXt*W=BecU$hvW*3440@7D+F|;5psqn7IAn82=r|ifs(OxeU|Dd zoiPe(y>(Q6z`d5NgI3@tkI}#wkQlH}!RT}{{>tc3UGZ;d2Mb8>A;bFFr)lEb%fg7&LC1+hACsGI?`z~ zaza)LO{Y*9p<*}VtjaX`NJ~?eDlsPkQ9q_h&_)sj7Xu)X&%OclW=-V>v-?fAEeoU_ z&>4N_>mMvY2jMzk;r)pNWaq<-T3FQ0mIXE)P${uE?|A_4<0?y0wG)6yB8izy@%*Pb z@nb|HEro=YuetX(P&7i?Wh5|W-L*}3Z7FlmL#%4Qqb*gR_q>Z@x%aO?XW@Ore?R2% u(h0-4d71bOUTzNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5}rL4Z$)Yx3My2M33J`?l58)FdZI9b2#R{kzKl|NlYyuz}J(&No1D z#w2fdm;X!IKOF^eN`m}?862M7NCR@tdb&7>zHgg6GtsO^z+LJFv)4NXT~V)f9xHs}%UfpB6U&J;vba>gTe~DWM4f D)jFMu literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..243561d491ab8c195c3b5c285102a0224cb1bdc3 GIT binary patch literal 883 zcmV-(1C0EMP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nqcu0VVI7s;T_z(~f@Q~1mpqSuTn82XO zATYq-xacr|;PBumz@QKS0000001~Ffm;e9(32;bRa{vGi!vFvd!vV){sAK>D0?bK7 zK~zY`)s(+$+dve@Wg|NG@Zm;j3~or`*~r{%*@s*~vlL8cM?!my!r?K{LG30GO>gK> z=n%AZ=+Jo07Ig@OLZJ7*^xY4|PAhxQcS!8}e(t?{_s-9H+CuGZ?*9IM=;Dobvp1bi z=SO6?$v>M)y*nCi^?~Tt1BcpX?CfnV(X4z>QU@>{elu{m3Q!BIXP6JSXE+#b&+zJb zeGSXy4;`S@uOpgEDX@FCA9?Z_bKbOVs0kA>1@?R&$oE5Dw=J1f7qO!5Ez`SQVs zQqq5Jy5Xd7jn#G#LXQE5=kk`X^ls3{;!%jkJ@Rf;Bd+vzlosFCfxT<@O{oaz#OL(A z@6z3Mpi$yzuPjU1N~xTNgsxw=xF)!iy5X6l02=zkM;VBxfM253mmw%dhE6)`5BS!>Pw@Bt9F)iL}*M}Gg^5v`EM27o-`&Kv

snDs>QL}7j3g2wr3=$Ufwtiz9@hk-$~$JZq9NtFb^yC!+-;E7l$1| z!R8tDIHs}r<=A8p2kJyI9O7PH6Siyz!_f`khB#0i@Z*8{&!N!)K;{J0jicT|u4ion zfD=5td^?FxCX4~`DU2fJXP9vALc| z5>P%%D4irp*HeHEvq%H1O(L#`SB7$$oVuz`YFx%(VP>Y=ch|}1o_iu6RiM}67Yw!F zj~;KW&>6uH>&ZbF$fPWB`=^A)6BBF{JNn~+Wd|y4;?5A6$aGLHgrKyifT3k`xxio| zwbg!IMx}XI0kCF(MddGaIdGe{zFTO6uR2!w>ce8wBzju1tiJ}N+Px#1ZP1_K>z@;j|==^1poj5Fi=cXMF6nq5J)J9I7s;T_z(~f@Q~1mpqSuTm_VRt zATYpKz>qM2;PBumz@QKS000000Dk@Tq5uE@32;bRa{vGi!vFvd!vV){sAK>D0`5sf zK~zY`)s!)7+fWe4Wuq_fqST2=hhkzpq#2Bb=LDaXh{i)gM21YkMtg(9Bcq_hb2ft@ zK1}xF&5$Li9lAS9FqA;`U3&NA*m4@VQ-}UH-~V^-&gVND|F3eQ^kF4n)tV=(h`d#A zdMA6?K)KNIJnuBqH@)L`1bExoK%%qEBB1?Jxtj$v06<=OC)vP-QXqv_$*N)Q4-|@a zGZQe(9`|lXL*@2u+x?~!f0n#+B(n7a>?Fw%elTI-Y>YM|;n zd!~_Ah0F8w!!8m~hs#&nR!RIQy6^Ud{Oljd?Ij|&LH;m`7#Q19^2&G9M578AY2C~H z4!Kt}s}zxMRNd$W;B@`}AQ#tPcIsQ>EwTjzoSqP{HwW5lmK{aonyAce?|4IWW-XRa z+Z&d>LqNO9nYzZAbx}y3$ZZB!APe?oH1=!FGkHzlmwyba?YJQmt_p5FuX`X%C5HyU zisp$$s;lmh+zNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5}rL4Z$)Yx3My2M3221v7s9_>tgoB4fpjhK7P2J9d2dpplRe(NXaO zWB?NAHWC4u$(ZEr?(%;r`=_HIPDzkoFoVOh8)-mxpQnpsNX49^lh0-yau8^^YhIA6 zRaGLQcwK9X%;p|5ORjYn7B5(6J3XjMgz2t~wDU841-xFuvys3Nn z^`8mH+wIp%7$&PJa?jZ0DXgG#W6jT#4AW!{B+rC}J7~US*RErnviiHC{gHi2^-pKp zIoenjoVL7wG^FFsvkA)fc43_>SgkhPdnczgG5my%#8U}(&py>1YuTJ!Q zTo;tg%Qv(y|v`(t!RyGpbrqtq?dao7L1s&$NxK22vAGx071MWLswpUXO@geCwe CjQUOh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..149d868a537ce4a02f2030a87a4672027d3fcaa0 GIT binary patch literal 806 zcmV+>1KIqEP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_a8PjQ*!Zxh$fzi&xKPLt5DD0)I(F zK~zY`)s(xg;xG_~lLp!tODWRXk)U=g1!Mg1*xFOA6+7DNl<4*{=XB zxG(|G%^Md?p93JHi+-xEd#2S)hfT_{W>EMn0<0eI`sr?(#S~JO0ERTy&e}mA;?ztG z4s4d+W&kQ8MLPh{D**c$QS)}J#i4ReD?anl>UK!-;9yrimyQ0NfEDR(e%_!en*VLO0`Q6R*7v58 z0K^c1W!2qZ=VrUmn;QaT5rH0V?!M-h1`F0piD;p5EBBz5q6kM&IS;xAL@4wr`)~ok z2loj`*`rd;HUiLngvTiaxcu2Ms&**V$`!{5+=GMt-*0?b6x~K(b@UN(40p*1Kq*y+ zqIVIW(-HeTA<76%XtQ{g3gM#7DNKJ*=VGR zG}Dyi6X1jMG>@sd#j*pLmVlPS)Z{ep38)og!AEnNMTjX%g&)0t-@{O3KKf?V<*tN& z*1Lri>X7QrP}2`dj6kj8`r*{Hsi(1-(@C8&*>VD6mVWhc9IbV7Ah+nLREb>qA@HWs z3dAbmMqgh56IWoZ&3>3|&ZmGU>aae{3ozMHR&y1H-vd1Dgkb&ISkvn69kA#0M`^QX kAVt9P!Ot%HDVAmb0JZ28YoW4hK>z>%07*qoM6N<$g4@?^B>(^b literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_ninetales/front.png b/graphics/pokemon/alolan_ninetales/front.png new file mode 100755 index 0000000000000000000000000000000000000000..22ae9d2c931abc281d59df4d1dd1676692411171 GIT binary patch literal 1012 zcmVPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_SYU9_@bH+xxF~q2NTA3N5D<`%kofrc z5I}Iq$jI>U@Bjb+00000000000Pnf@OaK4?32;bRa{vGi!vFvd!vV){sAK>D15HUp zK~zY`m6OeG+d2@1>5a6t=sLGs4gn=wiHIH`b%17hn=(Lmikvb+R&I)030b;;Ok{h} zMb`yVz)#sT`l%f^PLVMTNSbfX91cnGvWUii$&-4P84(#~_SR2Q;u!C*rxyUxpI$~$ z52)^0?GPg=Wluzr?7{7j^h(j=81Den6DiYYfp=0G(bN#&#`vK$pVE_o5f zfolmukri}UFUOC|pQUl$Z?N$eF(`Ooufs$*v!DWON`NA!f~M}c7BB?zXceIc|=p^K3?#)mj0IFu0thm zi7muwnwrE~dvWxct8b}Xu|nvpCAU=vT4Pk!zPIInDXLk8CE#a?HLB?a9|k>bfpb(7 zHQp^4a2^6v`)|8~sr_cl6#)MaGU6IQBivW1tnG%G%)Z$RU%`X(oyV{dqe-HUPrH*E zoz1LuaOmiD3xrUZkW#wqpp&!NDF`^w-A*{4^JdE)AaihqCiWU){h%G@6e&6$02!a1 zwm>rM1U6eq-FqaH(ACVI7nF|0uoV(FX|e^xGd?zQEQ0GEKrXVA4eOA-XU8M2L z%$)BJRHz3;<@4|pTo`B21Po~gd^rHvtvkQehJkr2!&Z^xt0e}T9(P8}GpPZ`OM{FjwwPT!2hVdnPoEoUo&PIa8L?N22KAUf-)a~Jj74}2G$wKEUXw1;Q*|v zdc6=qDk;Cg_nVA;J&3ReM9G$LILZOwVs23nF5Mb$0P5uixX*b4L+~dC{BPiHor|pq z+P9zs0_aui2k~bFb>mP7AaE{!8u$s|_5D*xj?g!E=-}&T04N9bmpyq5r!95+1fJ3E if&JQjxLmw6g!l!;88(%b3|TS&0000zqbAW literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_ninetales/icon.png b/graphics/pokemon/alolan_ninetales/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..33fec51e02e64518a2b0aa9b98c049847c17aa69 GIT binary patch literal 632 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq10Dt<~2{ZvqO5 zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6c zUq=Rpjs4tz5?O(Kg8-ip*W|gahK7b`pZzbMa`fA`|3N`PORm0iOgj4i|No@!qafX= zpy*QYYM=;XlDE6d|E27oKuQ=(g8YIR9G=}s1G4))T^vIy=A51Eo!4w2;9zUM;b+Qu zl?kN|75y&!0y2BpUj_PKSo~#=?CqLKUa{MA1pMc%mv{Q}mig1u;I1c<8X5~Y-g__x zvw1npXJz1AbcXlTlS{44CkysD#y&P#Au(~$G)<*zt~#s{mZ_^HKdv#7XEx?NCM5W% zfYWgKGbx6|l}VRgMQ!8GT(#^**r$)3k2eYE3a^;(<(KL7w#Ipz=S^0LX+3w&BB-)>L_AS$Z>4=pqWz8olMUXm-~OP|^ZjwCgy6s10v~y0c#|D{qm)1?iow&>&t;uc GLK6T;hyIQL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cdf20d0f7fd4b15381ce2de6e375e575703aec6d GIT binary patch literal 679 zcmV;Y0$BZtP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5D*YBICvl^I9Mofm{_<_XsC#w*bsow z`1tq`xbP52sIaiGKuDmd$mjq706Cx7Gynhq32;bRa{vGi!vFvd!vV){sAK>D0su)w zK~zY`?US*N+b|4IZ?vlR%OA34mM92bh&I9$@Mha?nlm|5P20Fm`DQ+Tb4^YmJ^8ip{>vJwg_r6J} znA=jMe3j?}i^^c*l@H7!Vt-xX!3X9V;loZnk*?98LX~=L{x>0n_ya_gTfRg14GaJP N002ovPDHLkV1lBd9F+h7 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_persian/front.png b/graphics/pokemon/alolan_persian/front.png new file mode 100755 index 0000000000000000000000000000000000000000..83bfb2dc44e77158c5375e04a075775012303ef4 GIT binary patch literal 715 zcmV;+0yO=JP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_5D*YRKu{nkI6zQXV0eINaFCd&un>UI z`1tq`xbP52sIaiGSXgklz|a5y06MelqW}N^32;bRa{vGi!vFvd!vV){sAK>D0whU9 zK~zY`)s;bx(=Zf<Jkk2&+=0zAx|p-}AFm{YQ(frYGlRV7=SK_hL9^YtP^iaLhuLA%g7Jv_Ui|`wZ3Z$X%_yu8YE18F7 zRRdptMqsFi9B8EizI~6ts0t<+@Nob6*MkP68gh+#%ax{}*7qdQ$V`Kc62Bwx2U1Gp z8m+~%0L=4`;KCF<2z-iw1FTtXGN6{qJMO%tBB-ETf>FeI_#j{{pI(|L;tFa+AKEaD zRISj@a|mjXBnR-5Md}>pDVTc#s0MG32I>HhS1H`lz?6XYMqUF<*sx4<0z8s(BGGp< zU`Xm^ToQ5uNHGJV#>qJipeX@vb5U#)Ab4;W=ZvR4Z$o@uS_Z_4o3$@3(`CT*WCg%q z^*06V5rA9*XtPJmh#Ez}pNTr{Q||&Wo{gqJCDa*+MwL&2?g)&si|?xR{0L(S7{)Mc zLr^d|Kt2bB2}l*F5yC1Og18#myBsj$0x+AMK>CaBnQ6;Ro*-8g2k?-ONOuD3@_g2 xq7%ybW@Wo#1@UtxC`OO+_u$AZ$Nu4}s=p4l=}J9i*t`G$002ovPDHLkV1kXNG^PLm literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_persian/icon.png b/graphics/pokemon/alolan_persian/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..6dab9fb3fcb968ea18a18fbe80eb6590a7c04562 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq11uRo_o@2?h#@ zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6c zUq=Rpjs4tz5?O(Kg8-ip*W|ga4h|0c_H9c}j;g7t`Tzg_vi0Am)|@XXISyrfU;hHHrA=$d zoU%w_6>CUbW?v{XM@ogP_TH3|2hHJ6f;6VO=X~Q;e0$+xNnG3mhMn$PkCwLYVijMR z)cBU~^MN@|nr_=R=rMb+reN5);-t7D5qNC9-zhBvx4frqp zWSQBZee6N%q5oU&aTw(pa2d^JFqy2ob>hn9;*0ef+YSDzRo+?8^*H!wdg76Oou1ho k#y>s^JiE!i``0>obLPp08zx08ngR+VPgg&ebxsLQ0QL5+KL7v# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..abb01054a45db50f0cf29d2857656efae5e7e33e GIT binary patch literal 674 zcmV;T0$u%yP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_kXR`Aut*RP5ZH(ykXRsaC@4@UAgE|S zh)6gPK!Eu8_!w}=fM{6g*suTq0C!r~V*mgE32;bRa{vGi!vFvd!vV){sAK>D0sBcr zK~zY`)swMG13?gmHv~*2cyYx#t6&k3r~$E1++#6yiX*KcMC?@5B!!KFUa!R4!aPLU zV4lHNLeiwpJ%h7%7j@>iwbg;ZhX1?&pP9X5f36(o(5mNzkV`gTTL@9I5!=eO6IB%v z*?l-lsn(T{nLu8tn%5|b%#a)hz*`k1OA~U%^Da{sa=swQxc0n;P^33#UGl^NGU`Q~ z0sDhmcfKu1MimT9@wr9aA%NMA@mPv2F1RY9Cb&`&5Kp(|z<-IFF#C%MuxP@%CC31` zLdZJ&O6)WMfJ+RRJ5mA=Ay$KXICF?NrWO(sT+#7kfXfGJAzfFv8#;23j*>pMFweju zI$8%X1613`7RwScN(um7O#p0RLL6QLT|XJUrUL?)KGl%{^bH(L)*}LPCc2|zq8S}( zEVYXSNXk8DWDs?R0D%Fv!;druDi~nPyBK(;04rcX{|3BJoh@MCDFvMU2H-X5W41W9 z0+q#4|J?#~3!{E{n%P75wAC(`hf~XxzV8k~8xZ(+!?0ojwEw(0Lrr#G!!R8GL^g4c z`(accKLC6i2O%ZakX}giaQ3|_1mx$ymj$_uG(g^mTN2Sd!8+TUV7*CSs69P4^4APg zq8G?zr+_@s^;-&8>Bvq|67cG0wFW16=H>RlK=n!07*qo IM6N<$g077di~s-t literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_raichu/front.png b/graphics/pokemon/alolan_raichu/front.png new file mode 100755 index 0000000000000000000000000000000000000000..20c88523f6fc66cf3d1ab747d45008355cc8df0d GIT binary patch literal 890 zcmV-=1BLvFP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_U|=Bl@IVj{5a_rNkXRs?I3Qps5a5U? zuvj1vK!Eu8_!w}=fM{6g*suTq0B6}Dga7~l32;bRa{vGi!vFvd!vV){sAK>D0@F!E zK~zY`eU&j!+dve@FS@}~CF0}@j+uCSC{sn}>f z4=gt3vbq64joG`s~Lcx6;J>iorI0V zYY_mpOrqcKOTZ!RBCtqM&u5JFZDRxxgE&%Wtd59dZ~%b&e58QSl-5i-fcxh{K0P1S zFfiM@p91)H!467v>(eg*T!=@z1Q@>fxWi5#mjbUC+hJcALu{`ESYRLg5qpmo4oU%O z{{dKRhy~#0%9P|NA$TwyuNUN-D~l^)$oWYaw(>3>H78g5Jh3-T6A*si<)bK)4tR6C zk*@_LaajvozoLau~))9qGUQ(qfSUoZ zbQY;XiMtA5+XQfZSG?`Y2BDg7Hw7T?C!YhyR04J*5Ac^5Ka~+&2~3qU$XgQ6 zfJ(qt0G!o9N$g#Bg;MG`8h{>YRE62o+wl61UN5=}c|6ix3tu}74dgRmp_)UaH}T2CD)Cmn)v zmLIJ+4%DkBdJhx~itoQO)8~N6s)_E@jDOEcRc|jD2(Fe(y17b1*h~iC9~uR9b261- Q6951J07*qoM6N<$f_3b7BLDyZ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_raichu/icon.png b/graphics/pokemon/alolan_raichu/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..f1bf7b8cf588b9d744d0a59046cff798911b401a GIT binary patch literal 584 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq123#r}NG@&pQr zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6c zUq=Rpjs4tz5?O(Kg8-ip*Mu1j4h{|H)L>yS5@#Dvjf`Stp8X{gC=%}cu0O>{r zRb3tqKoQ0yZ+DmfOW8ji1#wD({DK)Ap4~_Tvg18n978JR9G!eHui1d7?Xh`B@Tz&z z6^sTQ?`|BE-fjGi={9%B+9`3X{iO6ae2<+WR#1E^cVC13C+lzei?7^gDq-@O*_69z z!*3Rm%bZu3TFSRLr3)PN+K^;csj713T-Z;hO`IM_SysKB+ceW<^MfBB=SF&;3=Z{R zn8(j5pWIco_xFQY>pyO8`kJTm?$3HPn}ky78}VWb9(=p{JJ8)zqj=%9`HxIHPMFmF zdi;iC-d%@(A$olYZl+t+v!CBnD0YtTtn5uyDs*Vvs8}HRto?+Iz@GE})i22@_?PkI zF!@YuI-IgsBjwwQ!+Q?(&HC>4OZeO3OT;8LfX$^v$21+fcXX>fHV393HN#e5rRma#6x(gDv~!bSFLQ*mJ!w?nc4o z?ehxeiC>tgtpA;Pr{oip1a9|F4nG*3bCzzL@#ONRW&7)U@_kk~KYFaO(gGAMp00i_ I>zopr03hJ>ga7~l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7ea9895e56ac95bf1c5bf77f312f84c880a8de3c GIT binary patch literal 685 zcmV;e0#f~nP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_U?3UfU~phin1E=AI7o0D0tQJ$ zK~zY`?UX;Sn=ll`4MS14m`JYPMuud9;IO*2y zT_wTc{(R2CwqPIi-zq*a{%@eXUr%lr@l)96X`_nrPW`jY_8m@lucelvQ8@Z^mf!bN zuTr64BqS9MakL7w1jzD^vs{%dl2R`~GT3msk;>1v5@)GZ>Iraw*5%rlrNsY>MEBGF z78*606{t4g^XviDR1U!3v+b+X7J=nLiwZR=`bZL}y~E%gup}{BQi3BO@Rps3&4vVg zgk+=$vC_UO|2+aiA8T=NfDiFEkhE(AmIi&DCEYJ{n9NIuZo(AFY!#xQuk^QkdQe6S z2o(sV<6yEiV;(xZjYDr0I

b0|_;bIiN&O3Zf1}%u|+Ut3|PeTk40M&*GVY*!8em zZy_jSY$yW>)YM(I-X63-l))`St<%dMcqafx@DA83R4!KFOXdMwD1Y;U*IiuZ0Ne{N zunR~)OMvO7-{DTX5G{qo=ZxKX3jmux2Efa609w0-J%+&ZXn_NyfKI~A;3cO;JOU=S z9=9GnVvaz4a8NmI7KWGyOsR|Gsq}{$0hn9uR_Pg#^Z;gTH9tBm0K0)f<~@AMbb0@P z)o8=jTwXwUA^#QF*bLL%LOxJ8o(e-+`Q7-N3`bzF$s TTA5~u00000NkvXXu0mjflZ+?e literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_raticate/front.png b/graphics/pokemon/alolan_raticate/front.png new file mode 100755 index 0000000000000000000000000000000000000000..509c47662da78d5c350a99e5c6a89f7e56d6aa32 GIT binary patch literal 821 zcmV-51Iqk~P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_C@3Hh5D-vUP;f{{m|$2yKsab%VCdM$ zxS*KOC@}c=_^`0JSSTm}000000Mkd&W&i*H32;bRa{vGi!vFvd!vV){sAK>D0**;U zK~zY`?UXTdn=ll|F$-%jNv`cgMH-vyMATz%4|nU(oYlR!r5STxBvyv#X=MSeUGo8Q zxp?kJ=+^JjCmC>TaveM6Z{OMG|KtCjo{*hq{a^Xr=Onbh{1Fh@OVde!z{IB)BfzCc z=v)NUKbi!ThGQT|oJo+-DGd=C2RQEg#N3H`P5tZ%AX+9{p9V>mQ8ETt=hM~kf<4iM z`#D|Fl_fI9=yc!Zm=Ijuq}2CmT6{;q1aLk8bMCk)sPxtCCcRQ`IzYfcxa!&f#qHZ) zS5Pzd#SY37>UxN1#1ANMesTd#WB}Wv*UHZKxI#ck4vKTm*s7a@fG)xXAzASMNE4YxLL9QcQ>1pol*Kh@t5BDad1ssN7baN6z6RK642LwDU)w!T{cs<^h)(C*ha%0ly$^s}qA-FK)Hgs9+TQy?;rAwviC&Xp zl|W<@keI7#0OC5oEaG~(N?xe70dU%+g?a~^e`6nWvZQk%Rb&zfX{8=o@JR5EEzNr_ zxWri%xo)&B2Y{>NcZ@AqwjjJI4dA~-U_As#d6F4m!5A*M#uhN5d{m*Dofs3fyo_~( zei7?(*P<7CHS6_(7=MZd9v?54^nUiKu$q#C<9B9DEVJy-Z{z3Aq1pD{wl1DO z3Dwv~Z8t{DU zCMz&i&y+8nreovw6y|Q~6}G>xStu>r`j61eJ<$ zB^`LzvGk5n&}u{LO=@C?ehHN8J)O+@{#thE+&fQtX*Wj2N%CHh}e4m$NtxW2_O6-8U$^u40;!^^+Z@17#-#7IXh_+ zqq0Y7!jdfZWtL_M+oX6Ul;@i>2X{*GaU1wBGb=MOKVF~nacl44ij*ZK^4y;rTXw(y b$187tJPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_U?3>KP*@NU5QsQPaDb4IsG#uh@VE#F zuwYowpqSt|IEXkf00000000000E$GD0rW{k zK~zY`?UcQ4+%OEsZRo}hqR&f!EXVi(?321zHkWLDn?B10d4U*thyyYNE%Hz$^pLQRaFnvTfra~O!Il{nb)+mv}AJS_i)C_i@_;0&H(ph0$#qb-2C zf(Hhi_wNC~Q;iyI38CXH|iac_FH4t1TkF6^V6XjxktGkgN16|hB-qp|Fi)NE*Wc`Ric35}I1 zH8@MBJe856hQ15kqV}1EWk&8#I1B&#zG<^iryba(ekW0tc91 z%~~Gqb8&L`X%Z6d=9iBpO+On6=x7ive3~!UDi0x803?KT@aHuTp&4uZ1w+K+c4Ymx z1&|OJ%=P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_FgP$^XkZW!5J*T!aDb4IsG#uh@VE#F zxR`j@$e`djIDlwK00000000000PeFy0RR9132;bRa{vGi!vFvd!vV){sAK>D0hmcd zK~zY`?US)i!!QtrV?}Hk8aD&#=8G3Lx5v_MxCYd{s51k+KnHjSCMZj?p-i@T3Dk+G z55+l!0mbf$g!&JOlK<1)`OhUe>YpnAbqk0qe`V!ifaOsj2XAo@u^wDQp68$;Rw7*% z075Qd5Cd)jKwsYIL3Bt0;Ob7Rh|iz{?hgXONCJk64ZTke|$f!vXl2V_4jHbf4iA3*aSz{}MdgmcY)+&+M6wMKMy z{0#(-ak9>KAB7qE$VvzWfrT+fdke=QAP4zMezy*+5A1dTXO;qp0I74ZAfN&+$z#2s zwoSX4)|QYx&|AB$YE@R-+KS5fsCvLI*(RB@&W_xM9(i!>G79>wZG8tB+^Qh~&1^>A zWFGQa=_??0M-wc-{KtF-foOsS=o3wyozUKzxrzYus+xdAjO;y^29bc+Z;=!RDRM9| zpt9X)=ZgrCy|+HXWZESeP&#W=$GOi)iL`s4H8YG(xyRDvsJ~E>d;#ZUYADJ#puPYA N002ovPDHLkV1hB?>TCc2 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_rattata/icon.png b/graphics/pokemon/alolan_rattata/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..21d0d6e9776eba77d0c41bb2ce299c3298e05ba2 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq123q~64dD+7hZ zOI#yLg7ec#$`gxH8QgtbfW|14r4}g|>zNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5}rL4Z$)Yx3My2M33mnwsR~sD1mkZEKBsf2{Za|Nq~U13_9bKy9Y* zRiGealDE6d|E27oj)FKPL4Lsu4$p3+0XdI6T^vIy=G>iR*vG8ME<1=W`}4FUShnLBlypZmYwSt8yxNb cVQ2r3v6@Fgdu8C`d!WGaboFyt=akR{09|9L{{R30 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1e09ba38b6cdb50aeb0f5fd378ed8b8b9d2007cd GIT binary patch literal 649 zcmV;40(Sk0P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_P>7f?NO1W0_^{aEfUw9A5D*YJcoD0pdwS zK~zY`?UOx@+b|G?WfiJJLUfTTB19uVO8Wxwjt(${o@?8I1mqU!bC0Ch8|+>#L((Rd z#OecN2arH;KEC-Qt2g_v&AzK@YwfDPfmSWi&}q8{C>jXr*wXniz(l0Rp{HR5XrB%w zG5Wzj25Qn&?qca6rW`zsFS5t7lpZ;Tb^>hk?j{4a zmjFlWgn*kf(BA{1GGO4ka{_#TtPZ5^vV>eObE-2C{}RPzU}D3VOA!Kii^YYQMAGn_i-2O8HX{R9 z+4fSG3&K&SiyPZghFAyQI-LL;B2DFCG%iM$#BU+G@SAg)v5BE{u!}LgTuSKE;$2+D zC8>p@LHqPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_P>7f?NO1W0_^{aEfUw9A5D*YJc!+pl zD0s-wz>xU(sOaFZ$k5mT0000001^V|xBvhE32;bRa{vGi!vFvd!vV){sAK>D0kBC# zK~zY`?b5MM!!QsAU@Jp*OL6x^X@w9Q1-cf_Wj6Q%BQ1$R6(buX0#z_0W)=pkI|ED% z49E|_!n<%uCmOpu61QadKb>=#j|X6z6r2GMClfyhH#Uzd)No5wLA%ciQ=3~ z2?s&I>jII5Kq@3io(zi+=J7=g8Kwfcd zf&7?&qd|0EVE literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_sandshrew/icon.png b/graphics/pokemon/alolan_sandshrew/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..525d669ed7ea9d3a7fc1260ba50126f8891e2111 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq123wU^9RivS9V zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6c zUq=Rpjs4tz5?O(Kg8-ip*W|ga4h{~>j{OIM-kSf($x()m&HMK4tFErzyLSsnH!7H) zW}*WWVNCLNclp1R{nJqprzFTPn8D%MjWi(VjHioZNX49|llJm98wj|)<+V_7^*U$3 zVCT`F%*K#n=-}27z;=Qo(n7>8d4;lT;J$PI*Z$t{@3`;Bw88qcldy`RL4=vLgV*&~ zm!Ry>>*CTU-p=9@R{Xnmj+DU)_KB4ff(i|l!xq>~h`3+1gzNQ%)>}Vst(y4y)N>>K zRYwg=*uF;;7#%j7Irl`MWN%p!Z=lIci|Bw|-P;>W?^NtHz4@Bq$-mxzR`W&Lv^N?| zs-NHLDY?Pm4LA4VCcZcc9;=E(CHn(+qv!C|?Rfv|BU{XL?RLqJ?>B+Mz|+;wWt~$( F696<5n$iFO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c64d6953600ea700edd42ee0c6c29d251c21f8aa GIT binary patch literal 940 zcmV;d15^BoP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_I7o015D=*7@bK{Xc*yWLaEMT_$T*0w zIBD0|iM$ zK~zY`-IKp>+CUV?9S@y3i#RA^2p5^4C`)k=S&2}lF2y-HV@aD+6|p21I*+xh#-}R( zL=fuW|H4aDMfXSby*r!YijqAifr0no{rG<0S#Rp>kXHcPe}%AvfPC6Yc!SGnV=EA_ z%h5K%4hKNETL2af7`xcgsuxCc#)AJ7Bow~bM%YYG#6tiHsPSB@VF##y?}Z3JkuKD5>itD$Ai;!5bJ7Q;+MQa8Fq7FGxhVljPt=Up zME5{})StFWpba(XUu$;=aj&FE12!UGF`g&{zRapd?SX#*jPM3HZUs1WR?YhEGwceC zNdkNlEyPRyL{EyUfaeQX7S<0Vc=|xJpL00BjNmp4`r%n7AO>zo!Ge}_ZxP6sjnX9H zfjWSYI64F3z5G}L2c-xSrvwe}!z_|=KKa3ZY9Kd&MX%COY9BoGJ7XT*?_-6@CGyCm$VkQZ2VW^4_F9^ z0{n7Ziz5-IbT9IU(1w`wB!wOqYjIrJ-JmbCXow5fr+j}w$a)xDfNR&o|APp3oL|q> zGx=5lhyGCL&R|(G_%!cM@m{E8wG86>P;ZfAmMQDHN}r-4C=gobjsb`&&+2MWp{vWJ zr#HH7!qZ1}P&&b=PLL1>38zYss8q*yLlFa!fF(h{C(~=L!{kvpsaXabp$lOUlJ#kq zyR$Mu@uJ(*Lc1UY)Dg_(yvIv|jvJ*FX-7ASMgwsDz&Y@F(+ O0000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_I7o015D=*7@bK{Pc*yWrn7~l5$T*0w zP^ieLsKB_m(5UF}00000000000K2)t`2YX_32;bRa{vGi!vFvd!vV){sAK>D11CvD zK~zY`mDIm;+AtIcaEqb6Zj}Z3;mKBrL&$^`$T1S!4s4in$qKo8&v6`HX^yip#+fvR z^U%}SHUC_nYy(c}hE{{&PM`bg=}ETspF`g>kDNV#>;dS@9#9>5?+3JVfXs3b`0a64 zN;&xO-EaG!RRAjo$e+!9GcBbY)W#V=?Y3DSu((<%P#gKBU@^`B8n??qExcbSP>Zh8 zQvY0mFE{{nGh2Ks3n1et0xGaKSb_8TDg0yr7b_)Z?S_W{ z?sS!-0Djd@ayI8M!JJ=5+d|Ci#vIRE29C<#(FssB9kU|fjVs_i$UU7vjaF@&mL0Z?V%_az}pw1Pi^Df*B zd%`Bh^>z~{89=Rc{;Mi5z*WOF3*b@Ri43F_+LOdcHURZ9KnlPyWG~rVCp5t6Ye-l% zUjYV{J=w!qr_i9e&Ng!apqBx=nHbkWFwH@_8WQo#%ge8HzLNv92r5Ec08lk_0(+Vm zc95S%GXvVWh(SQ3JHa%VCi;ZtRT}HG2CZ@|bV}_2#x!WI>GsX3(3B!7RKF?;P>WLS z%|KXW{ZJ8Q-$~>7I6E^d-`(4QXX9DKW|}Z54KSqC)r6{{EP+Z&vv&LiR5n#t4%nm& w?4%5&`7TJR?*pw~Uu%27`vJRh|7mF2Z~ELS_<|1r*8l(j07*qoM6N<$g3yh*0RR91 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_sandslash/icon.png b/graphics/pokemon/alolan_sandslash/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..9145ca72fd6cb2832f434cee89b026636690f509 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq10D7=P^e>R|DNig)WpMX#0UD!FmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6? zzCi68`?>!lvI6-A0X`wF$#YvB92|OU{x3WBKYRV$WY6=-$x;9R|KGQ7Uu$a#NH;22 z;W3F5D8iWJ?e6k_Df_3RAWlh;UoeBivm0qZwvMNZV@SoEyOV7F4;u)y)p85XUhm== z=5<@vGKIf)k9op--&}ULX)4MS1vu*&zCNGCHe1Ex3`gGX@b5ogDLx5jereObdM877 zv{!-8$)ve~d;SU8#B}k5Phb2Xd*ajAodp*zJxS^><0@Fjd)cY`2jT78%T-~sD zXR_O~kLPkzdp`Q^yHp)rcu=Xw%scVjN^OllTGNBx$GEq+uAEwC>=_Wc^pTtQ_cJpO zZg||IoodU`FS6@;?wnO6J9zF%F&%&8`q4yEYe8nm_lPZBxA_)u$gV$KVqbb?z4v4v zTb?NWxjVZgMDEwRe=>h`pSk(lVPOM)^@KhCG9CE>yPrERnQ}Do!Q&W1W2P&gKgJd3 zZEs8T7cnn=`NQGG-h+$ges-){lBVYL*W@{~K>ee~%t^fo^E}p1`v3}KPgg&ebxsLQ E07viBI{*Lx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f3ea2e305d7d2c6cf809ae1f2c58041c494d4a38 GIT binary patch literal 646 zcmV;10(t$3P)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_h-iqgn7H83=$L4L`1tq`5D?hN;COJj zh@jv|FlcyKpm1oon1Hwd000000D&0_XaE2J32;bRa{vGi!vFvd!vV){sAK>D0pCeP zK~zY`?UXTZt3V9LL8_R0hmx+bk=TQ!&K+p-1$vJ)Ii)Z^iR8ZivyUV|<22*zPz$2K z|97^Jvz`3f|FslX-|LpDZ;70U*0{UxfOYcpdQZotILN8mJ=Jg8`r@^qN}$6w?9>F- z7SR?23wH-Vk7BHAK*o|49hwmOHyw!f5<)m74}i^$T-O^r=)k&?Lgzk)46$RqSAgIK z06IN|jNgLnqYP>a0)&JuPm33wv-f-Dan3yWrcPL?c|TK^CwMpy2g7kE2V+yBPmSTI1z-2J>+pp6j^_S5U2ZO};Qn5<_go^{N gwxEuWpJ_?*4^rRWe^G`j9smFU07*qoM6N<$f{xu9dH?_b literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_vulpix/front.png b/graphics/pokemon/alolan_vulpix/front.png new file mode 100755 index 0000000000000000000000000000000000000000..0f138a6841bf25423863f9b7900453699a0a3f0b GIT binary patch literal 673 zcmV;S0$%-zP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_U~rhIu+ZS>@Mvg&`1tq`5D>t~=vauT zaKP9=P;hW~xKMbYkeJ8-0000009`>+%>V!Z32;bRa{vGi!vFvd!vV){sAK>D0s2Wq zK~zY`?UX%k+dvS7*MP7{DUwKf?n+KAPVBTQNJ*_>4{0YbK$8|}mH|RBCvd0>7$%T1 zo!c}ia)Y!fa+}Q3KR~#<0s^G;Q@I~z-n`+6J?o$4IJ@8XWU!m?f}O;iIUr$XB}TCW z0w4%d8*l`qK*GKS;2%8bb!Y?J**##Zum@z3Gzr7`4nR&K{B&(@;RzxpQPQ>+z=Z$; zJXv+OW`JEdFU1s>ad%soffDg+lwjPo=BNt9ckjPpa%Hpd6Y=i+JH{(2;28GKYs4Sj zZ^YArIT8X586o0%_X}~M5&`griyu*iUa2Yo6nilKn}|gJ9y2aI1sojv0~6D!0yZoM zPe=&}vw@3C0+J@>x$uQhd-I2LTsBQZ1!f8mYLKx;EEOPJdUxsTgRzzcl?a7;rW%GG zJ&=Tpq6g%G=8}z?K8&PLT~ruDVEK?$lHCKo4Zv6k-vgnI@dPB9?@B#v7Cr6*FZwA! z2Of#c46Ks~v8Er*p|aLmlt?ZjjA$ddDxi(Y@go88vT4$chBPFJCp9kekOJp)B%Z#D znoP{gH?Nz0P99z{O>0~eu*qqu85|nUqr?&y<%ZWA#tYN=RCR@`&)57cW=8RC(Y>Y1 zdePljfVS$sT(zkcU`4gP;RUO#z=O4FYx^sF!q~I^zZm-iQ=g!PsuUBR00000NkvXX Hu0mjf*e4w; literal 0 HcmV?d00001 diff --git a/graphics/pokemon/alolan_vulpix/icon.png b/graphics/pokemon/alolan_vulpix/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..5e095b3c6fc31fe7f4c41092e4f00ca7b278972b GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QtTz3zOL+#xq10D71o}*6bBR% zFL8}13C>R|DNig)WpMX#0UD!FmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6? zzK#qG8~eHcB(ehe1_3@HuG#D7IygA||NlQZIcnd&eZ4jRmmT{L(u4!7Omuk(lwwTs zc6a%|l>O6D5T_)_FPOpM*^M+Ho7vOFF{EP7-ARsA>jE`3; z8CWmiQ<>`Vc%G@Bu^N*E@3QXAJ6r=^O8vU0XWaThO7zT0b-{+9@cPYjL{eYK^NTEx z)_QP+i3Muur;%GZeRK$199`4B9mGo?{G~raO!tG z)p5vRW?p3L!c5l0DwCP=i@vP4+VkV$`@b3=*Vp}FT7SzV!RNra37|0aboFyt=akR{ E0JBB16aWAK literal 0 HcmV?d00001 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 From 8bde7eec1b44f690486d7e5a0142539f93804f9a Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 13 Nov 2019 13:00:31 -0300 Subject: [PATCH 13/16] Defined the animations for the front sprites of the Alolan Forms. --- src/data/pokemon_graphics/front_pic_anims.h | 216 ++++++++++++++++++++ 1 file changed, 216 insertions(+) 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), }; From 884f5427985d7e53dce080819b4eeef579cfbcdb Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 13 Nov 2019 14:29:26 -0300 Subject: [PATCH 14/16] Fixed a typo and added entries for the Alolan Forms in src/pokemon.c --- src/data/pokemon/egg_moves.h | 2 +- src/pokemon.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 41c1e0963d..5e7d5e5b3d 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -4088,7 +4088,7 @@ const u16 gEggMoves[] = { MOVE_ANCIENT_POWER, MOVE_BEAT_UP, MOVE_ENDURE, - MOVE_FEINT_ATTACK, + MOVE_FAINT_ATTACK, MOVE_FINAL_GAMBIT, MOVE_HEADBUTT, MOVE_MEMENTO, diff --git a/src/pokemon.c b/src/pokemon.c index 33c1ae59af..93023ecb7a 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), From 762d33f52e34165bb1e4f2dea359b228dd0338b1 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 15 Nov 2019 19:14:58 -0300 Subject: [PATCH 15/16] Added the icons of the Alolan Forms. --- graphics/pokemon/alolan_diglett/icon.png | Bin 368 -> 358 bytes graphics/pokemon/alolan_dugtrio/icon.png | Bin 485 -> 476 bytes graphics/pokemon/alolan_exeggutor/icon.png | Bin 542 -> 536 bytes graphics/pokemon/alolan_geodude/icon.png | Bin 421 -> 410 bytes graphics/pokemon/alolan_golem/icon.png | Bin 476 -> 465 bytes graphics/pokemon/alolan_graveler/icon.png | Bin 529 -> 519 bytes graphics/pokemon/alolan_grimer/icon.png | Bin 493 -> 486 bytes graphics/pokemon/alolan_marowak/icon.png | Bin 507 -> 495 bytes graphics/pokemon/alolan_meowth/icon.png | Bin 438 -> 426 bytes graphics/pokemon/alolan_muk/icon.png | Bin 631 -> 626 bytes graphics/pokemon/alolan_ninetales/icon.png | Bin 632 -> 601 bytes graphics/pokemon/alolan_persian/icon.png | Bin 466 -> 456 bytes graphics/pokemon/alolan_raichu/icon.png | Bin 584 -> 577 bytes graphics/pokemon/alolan_raticate/icon.png | Bin 512 -> 506 bytes graphics/pokemon/alolan_rattata/icon.png | Bin 459 -> 448 bytes graphics/pokemon/alolan_sandshrew/icon.png | Bin 437 -> 425 bytes graphics/pokemon/alolan_sandslash/icon.png | Bin 533 -> 524 bytes graphics/pokemon/alolan_vulpix/icon.png | Bin 492 -> 487 bytes src/pokemon_icon.c | 18 ++++++++++++++++++ 19 files changed, 18 insertions(+) diff --git a/graphics/pokemon/alolan_diglett/icon.png b/graphics/pokemon/alolan_diglett/icon.png index 79d21ead889a4cd5db153c72fc92aed293d55d81..1b575078a3487ad1a735ad181c4242add98a764e 100755 GIT binary patch delta 247 zcmV%3HYY_)r%sVHPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL004?fL_t(|oaK@+ z4udcZMRNno7f5gCk!)n_IatDg#J#d~G|fUqhomrtpA!_}%}?K!Y&~PHR`hQAJY*uF z5Jrq_LqSlQ0Qnwwe7tu6)@KiZCMO8KGlJ|^ai^_hMWlOFkW_aNYa}bbx~LUU;%NCa xVu+Q~0;gzcKGNKJ`}$L1${`H+u?urKKYju}L$7{Hht{Et zl$4HDE;k|sLLCHr85ehJuaZ>K(`(dVT9ntfPJ^lEW#hsXOi3$OFgZ0YTG;5Z%*d>@ zt&Po8iA80~lm;d#4pk>F*;S5GUL1^WoqWB^_*8UxdStz1g}OB20)cp-HmnB{M^qrJ}d#O@3RDFFalST-G@yGywqi@Kh84 diff --git a/graphics/pokemon/alolan_dugtrio/icon.png b/graphics/pokemon/alolan_dugtrio/icon.png index 7a74f5aad9ff37c04ddd0a964f1c4d8c37f5e298..2a409cb8d023857a2f3180dd08123c24f8211c52 100755 GIT binary patch delta 366 zcmV-!0g?XY1Kb0UEC>%3HW`F1y5*5HPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL0096=L_t(|oXwIk zZp0uEMY#du0`XCD8&;_(U8Z#^+NE+4X$v)$+`47YS1v>WH-M^tuP9$vjtJz75(`o5*e%e5lTm%&dd!N<=z0YIEK| zh+`R^3*i0~y12!g<(^b delta 375 zcmcb^{FHfu4hJv4mR@4~npqP~{OgnFwmLXCeE+U;Y`x0+W4+s2qyGQ@|2;V{IXSAP zriK9nhzG1Y0u*FS@^*Lmzm)ycQ4psj$S;_|;n|HeAm@*#i(^Q|oU@Z0^NuL+xISb{ zp5${Ub%yYTISYdH98B#T`Y#+c$zGyVIql}u+tcc`96WaAx6hrw@8AL9NA==!__oTG zZQavw&o#t)rIpgzEBoFY+`2ViG~=A{%`9QdZ=1ufS_(0Eyxi!rCWR_!e-tmIVI0+v)YH6?9lYBp0-9`J}>`WQ7;=~m0akMw@*~TpyJaD-FaLO zemkXDs;d+iqzLN7uq8g}o9FbhQ^nwsc+U6Z3~%m)9skW$(q2Bj{a503c@E|R0k_w6 z>StCp|61zIHk{sr&QC&VG{o{R4Btg*5godkhLV MPgg&ebxsLQ0FED?uK)l5 diff --git a/graphics/pokemon/alolan_exeggutor/icon.png b/graphics/pokemon/alolan_exeggutor/icon.png index b52074485eb1778e3b7e20827995cec57ea11005..723d0a4ead441c58f1148dc6385a797ab5b54dfe 100755 GIT binary patch delta 427 zcmV;c0aX5;1egSnEC>%3Iteu|<&BXvPk&;ZgL89py}iBv|NncON}SC~l=e#QbDZ{+ z_PwN9_U0+}_N>*_YUWBQVq#iBK|yIbeOmwk00Cl4M??UK1szBL00BHnL_t(|oW;^j zYJ@Np0N~u*Ts{ZxT-`D=nSXYO>K9M;-AD+9@6W#8y zC?qL5?cPbc{ybaoK6ifK1okq(IDgWnDcLpVzV1ya10wbrgK8Wb60(iVTUU@ku39Z^ zx(0?$cJd6q%cW>lLq`WU$~@c!4tHUIImdo^U~@IrYy@HELP6sMCKNP*2?QZxAjqZ@ zAoAxMj2H9+#`(to2WHPlz+uh^ILtl*4zmx+VetXQ#>YT7EIvxYVe#=nni&4Ek1w<{ V1wY$ARdoOW002ovPDHLkV1f^N!-W6< delta 433 zcmbQiGLL0~4hJv4u5!S7w+9nV{Oc2DG&ndoRLt<0al#`ZA!5gZhzl1oK73g5H*X`A?E_-ZQWt zV^ME(De^F`?-xniWU*G$$b6Sauh+F6%|%--?c-R&y2$JwKS!%n=)P&a)*&kIu1jinn+i1b4l^l3OT zKi?qk0>8vV>HqRGY~>l-EtMY_{N}JYW2e!6l-)#H-tgguA1gTJ+K(P*&ir-UZXd%n WsUW%Zl;h_>LGJ15=d#Wzp$PyrlDx(M diff --git a/graphics/pokemon/alolan_geodude/icon.png b/graphics/pokemon/alolan_geodude/icon.png index d19527327bfcd7c21c3ae58aa2c737ef61fc0bbf..1a5f9699716f979d3485d22db4898ce59047d23a 100755 GIT binary patch delta 267 zcmV+m0rdW*1DXSnEC>%3J2sk9`SFo7Pk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL006#8L_t(|oaK_i z4Z|P|MZE!X2fz{ozy|I9V?ghS(7W9vm0z4#)^&h}*m7LBdmB#x;^-lrJ zTHd#dbrXP@Wm^@L9b^T-kqld3YSzaLlGx;eaZW)*u1;2PQDE)0hFm3)_GNpkoNY{@ z1B#R%9&PDgEepyW1v}UpA<{IHL@F?qoReGuB_wG&4Cyx=hMAfU)4<=>;R$55gazOp RLC^pI002ovPDHLkV1i4ucf9}r delta 278 zcmbQmyp(x@4hJv4wnfhbjjo9%{`JXoTOAx6l9QwM?b}vUQ}h4-e+IlDCfB+KpqsTTgSIiL%_@T{^j;qaa%JhHM3^!$zq` zIdiWc?+JMlFiF$ZQKX19yde0%pMsOtJfXjZ?#ov8DV7E#f1R$A^E>>lQibRgzHM$w zrL#Dbw;G7fn;gifs*+>H^U_?lZRRY#%LndXd&v3ptCIS&*3TC}e)M$pb6Mw<&;$Tx CVrY8+ diff --git a/graphics/pokemon/alolan_golem/icon.png b/graphics/pokemon/alolan_golem/icon.png index eb74bc8dec019a2c10423326acab9a816e5ee3cf..e796f88842dfecc2c057f922ab7cb95c39f91894 100755 GIT binary patch delta 355 zcmV-p0i6Ea1JMJJEC>%3I|(c_)Xb4IPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL008w#L_t(|oaK@+ zPQ)+}Mdt?ATmUOM04X>Chgm6flyRBE(8HN%cDornNLh)(A8!_W!kz$xE6>ySczIpn41^K4*Nbbbo8hdvd=K1`1lg#0n4cN`4hWzBp- z9Tig+<-0K3q=M&kJWVy>L`T7K98m3bSwO4QF-pYgWnlXuqDweN`g7}F2s7Ubb7qHL delta 366 zcmcb}e20004hJv4j_QKzm!?cK@vl#w+v?!pP*YR$JvngSzJ1BbQSXoSZflMD|NsBl zvu7DF!2b6ab%275N#5=*|Ch3VItt>H1o;IsI6S+N2IPG9ba4!+nDca!VIH%hfa^oH znoSj#je__l9GY}HHkZ#};<0tx6a6Qwxm}W3n>@L`G@-+Pf<}n3zr4f+<7eW!uX`N1 zZF-ir-QZwXTF!7@q9aLlTI0cBnJgB5hH4+vraRn=S1TmwHwrFly7Sa!=Lxi;g_I6{mOBzP@#?aedxj?!;%+iRVP` xw7j$z%{la8ufeP1+kx13#%3J0xlAh`Et8Pk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL00ApWL_t(|oXyfP zZp0uE1yF8)hHB*ki%Ao00gBQmXWOHs%eBk_226TpF$UY~A}KdCSmO^G;0f`xA%D+> z%%?!k9P39E^;dE^F9n&L40Q!Un{|y!Ah;~E1@CH<0f)#@B4Mae=`D=PWv>X=-FX6q zU;@6HTq9zh(4dO*RjrA#pY`U+G(PRe|_@YRtE=%yg=Vsi{3RvCj^iyRKnymTQWNO7!AOtn)Tq*Hd1*`|ydG7Ex8byWEZ#1T9(9 z<{c-Ty8pq4!?SH3-kQMH{;;U{=6c)L;@&J0GeTbf^_AYxc;frvBb;x|c@BPiEXf}~ z-=e2}mHLDZr9Gd+JUUvg-`;Y!gR>{^Uf2}B;6*3eoh&t;Px+?$l+DM%Muf$~!?UxU zary55{g3?(nEVn{THOsMaLt(XGT}(T0f)+?vOS&L?E4!v&u=L3u$Ew)+T1Ja^E}}h z+p%3IxFB$q-l{fPk&;ZgL89py}iBv|NncON}SC~l=e#QbDZ{+ z_PwN9_U0+}_N>*_YUWBQVq#iBK|yIbeOmwk00Cl4M??UK1szBL009a~L_t(|ob8ga zPQx$|hVup|i%cwi1D1BLDlU~+Tp{_^bRj$u3k*e-Sel{l)Zz?ua4XeeU@=x8XMZ~b z5+f4-=HLIFb-pjl{=DEcIJe8xX)9Vr*AB=lMB3XkkyLCzMN`7D<{D5XiHmdd%n>Jv zt|yOT!A-0oD%W{1;LW@qUgV5x?2R!ss$Cy}*>-=mZAb^BHV1vL^oUC?>rFG47<%B- zgDiCP3Vw*(ETVZGAi8vZ=dyoA`ehjy|9J^8K%*3xccK)Swip6qhrmD&OjzX?FuZKQ z4jA0!-w~U4z!bcGD?Bh8LuJoY2h3_-NhSzAFe`PZBVgQG=rRBR&U^Bh&OhMgH~Iw3 WyNl`JFQwlA0000IEGZrc{^#N-(drR zw&MJT=B$;;{wHoWABj8ZlJth5`f^d4YF6&4V@|jCX4TJDe_*Vy; zzvgpo!%40RVCb3`mhQPk&;ZgL89py}iBv|NncON}SC~l=e#QbDZ{+ z_PwN9_U0+}_N>*_YUWBQVq#iBK|yIbeOmwk00Cl4M??UK1szBL009$8L_t(|oYm65 zZ-gKe2kCMwfhc7uj-FDMFRpgQP~8WEn97_7f8jbtc7v?<*Qa){3sO zaAzd%{1cG{=UBUuSKfmjNr}hF25!7>JCtLI-KmhaqC;|!_`U>E0igAUr^ml{`vrpA z+S2eJt2y)rOf2Y+f~gN+jPe*v0|ziBuwV+eqOo9>hYt&83w-QgLLWPr(8mo-?BfO| f_R;O{pZoX*1Co`UG`fI}00000NkvXXu0mjfhFiFl delta 397 zcmaFQ{F`}#4hJv4u9#E&08cI?75O}1z#DOWD-tSG3bh4IJNOK*Y1Y;^}e&p9-aOp$?jp-5U-uHPv^z_Pdc2{ zD^}S^F$9UczsTiuPcLwS9lvnYi=pbJmtTj^53LSubR{TB?S4^IT#!} zzR>;3H_l71pBLO)mbdn<^Q_Rm7~hyTj*}Mpp75Q?_`91^WdEwAm%ocjtSp-owQ+~> zr0IV|SNc`0pS5dZa2#W5*0nX;9pgk*qqbgn7vjMkq-4lZ8_%T4xM0i0zmMNN{nzkd z>o$!)#}BpNYv^SC8)$Hou_sWj`CtJe_w+_)YH|^Wt~$(695trs>T2S diff --git a/graphics/pokemon/alolan_meowth/icon.png b/graphics/pokemon/alolan_meowth/icon.png index 597221879410cb5e0a4482177fba11ddb8cb7f79..d4b80eb6b46178d6e1f78cdc4b465e380b862dc3 100755 GIT binary patch delta 316 zcmV-C0mJ^b1F8d%EC>%3H79Oi^o@};Pk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL007QOL_t(|oZV6} z4#OY}>gpnn*U zLanfbX)Zg#<1SqVL>ecfD*)s$7*lzG8z*T3F_8MpO-t$uqt_;R9e`D+Pft4wWDYdv ztCFN$rbI98Ouzs%%B$s#lqE~@`1aInN+LQ%v8|$c1GKTz8^1*wwRPco52VG O0000*?YcQZeUlkR#tA1%Z_M15BOIg?gTg z37u!HY20T2f_c`D{}F3-Zr}5j`o3*){mewO9szf$8_Zts6m&(s)_JV(i7#)teb}8X zLq3GAg)Qd$Y_N7LKF24M&E-%31cI<(^5AMYu4skrH;SRRX z)-~-3S-0ZaAr2<5#0gSgGt56gLU`&#SgWqMTvY`+yL|%gQu&X J%Q~loCIAOJh7|w+ diff --git a/graphics/pokemon/alolan_muk/icon.png b/graphics/pokemon/alolan_muk/icon.png index 08093963c77531551d267cbab195733e227beeac..d598fd728306abb779233eeb28b03032bd5dc651 100755 GIT binary patch delta 517 zcmV+g0{Z>;1o8xsEC>%3Iv8J{#eb1BPk&;ZgM))}y}iBv|Np(DLH713)nY;RlqrjQ z|6)qb?sJ^~w4|iP|7xt9Vq#iBK|xumkYoS=00Cl4M??UK1szBL00EXsL_t(|oW+y9 zZo)7SfO!KeLk9+m)XwctCOYIHDtX8fUZ+zfDrGoJ5Fw`A5T1pR!9^9ykPI%UVt)uy zas3NP9-zG}@u%FK&;HWu{b>-nZ>{ACS4~1jxMZs)035Nb`N;{#9k4oOvn!C2?CTl7 z0Lj(+f%j8ikw5V5o&Zc7_~D$dQ%PxLbI5=XKFWj^6dagt*6$^aN?;ZoBS^y}f(qSM zYpNnD=L~a~lF*kD#5`m9(2}#*iGR7M5T-Y#F_f9r|qCf5L3R^-A8$b{Q5X;Ls*Fk!K#LsH4fY3?%8hV{; z`L~d=wImX;MZTYLjLp5)Y&piXnSx8`0Ew_|H6g$oK=mYpHME7PA@RTpb8@8ASGB^N zY2<(tCI)aiIALP+emG&YA9frsjPfHe#0kTc9|6^!i5CVJMXbTW3!?-vDP9;Yh$*qL z!WcnJ2@XaWEr=2TIt`U00000NkvXX Hu0mjfZQt)o delta 522 zcmeyw@||UZ4hJv4uHcLc@q~#c{`JXoTOAx6UKGsu@#9B=$BB#;Ga4EScI?>k;e$p( zLPST!4+d1wZ6sn06k$yAc6a%|l>O6D5T_)_FPOpM*^M+HyU)|bF{EP7(aC4C4mk)k z+%+%A)v78HQM|4-MP_r4nI+e{3yT*lw4EMQCBk%9re50lq@C06DR<+2KQX+0GU@M$ zGjHD1z5M#mgyZe@Yb6Ym)fBmBZ1NOV(7CbZ=ShZXvIdf8!onRiU$Sf0F-}?iUD5u? zKBfAnv+W#hEDKIs-ai`Bap&0tWqZ4@&K0ay8}7Z6)0!B5LPz4Mgu7>->W;N+POfoF zd7P$C>geZ6wMu?ie{a%8o6{lF8eXeko^fXBAHMUd2d4ipNpAV%-c*%RVx;LPaq_p& zC5@_b*GS2|Q#L=}zG_>wdNfOAg#5X!x(nOR8k{!LdGT~kvyNQSqx7xe4o6nj^6ovi z^-pxbttcU`3rgnY8(N;lF`LCY-SKJEEMs83vt^dR6W#??lOFTkKEzT!qavYIlJnu} zsKjGR%3Hy3)2rlXNGPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL00DhTL_t(|oXwNF zj)fo)hIxZ|n9)`WrF9FO79JjGJtTNq*#W$rO}5@OF~mP}{rME)Zy$&spHZZzkbgmf ztY=dJHx@FVEesN3+&#vGvIZpAeZe@Qb-871sN#l*qin4Jdy_-25xbm94rp>d5D}uo zn)9BzDi992745rWUPw`I+gM2}T$hDtv5;%gPU*q3pmZul5_h4__(^4rncM6%b4g`_ ziAk0m$eGiLRiS1ZcEOhGNAkDDsM_@ERc&{@W)z!YI2 zSq3?P3DacX6@VL<43(e*80FCNmUZ|FO!xtecLP0vF*6SI0gOYhZ(x`YZtwtx`Ctbh iz!W|{ff4n;tr_1BYwtjuq5As(0000w`DLW^x8?uo!Pk&>bg)uQP&F24el*RV;|58#?q}A?0V#WXe z|6+^9000000000000000000000045*Q>y>~00Cl4M@0Xn2lB-L0004WQchCQPV7qx8HT+kBErU4OT1 z5Ko@3A42@?1M=llisTt6D4+=MNC8s@N%3G$(g@#mtd3Pk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL008VsL_t(|oYj&+ z4#FT1MY#b^-9!8?O=^sBWulkxq;9>8^Z>N<03E3^)K*=ZD695m_%Op$>erU$34drY zCK`Uxi~%YE`u@?DVVyvzmEstx1$0(vid6$J9B39Rtz;CStySz&D7QPzH#H;e&}M&H zo#6nvM|Z^KfU*KLsbY!a0SiNvLODiO@Gb+@768aOGEHs+rMFCSuIl1{ObnE}^L6~u zMl$+N`fKwr57zkvnSg7?;AO)9wMX6vGHx&mvYr6clPzVCsizm?B7ui6{U&+buL@&R s#b;r}k1ULv2s8Nc5a!trfBmi>H|KARX=5-UK>z>%07*qoM6N<$g2m6D!vFvP delta 356 zcmX@Xe2IC24hJv4w(9$7F2NH`{OgnFwmLXC?Ay03IXSAPrsn_u|I5~YpIURiq~tsU zHn1&VmOfCNG0EHA<^NLlPe(zVk|4ie28U-i(tw1QCz%m(da4^j{P-+GV3D9?b)Xf}h%WZkV3S1uP{tk>9X@K>$!&U&uL!AH{* rkM!&G%;qru@loK}P5#}#*2$YQPd3~zDPqwSP(XRQ`njxgN@xNAscM%X diff --git a/graphics/pokemon/alolan_raichu/icon.png b/graphics/pokemon/alolan_raichu/icon.png index f1bf7b8cf588b9d744d0a59046cff798911b401a..d005cf7e1de3978f2cf02d9ec165b6031cc2ce1c 100755 GIT binary patch delta 468 zcmV;_0W1E<1i=K5EC>%3I6KeI){l`iPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL00Cu5L_t(|oW+x| zZi7G!hVKnL^ik;0iMdlBmCPKp$9OWdRCfpb&0dVc|b z-0!o08KwRf;1b}66r2);Jtm-*Kq@BCpY9Zh zB$@?-@6U)%NGU-dbI!ryN6sCE=od~ z6}5U3uVH4S;#F^FM|f>A(wkv%gnvissNGmQ_XeZM@?OmAEfR?X3cL-$%P>Dg=7I2i z{y&lS0ClosU=!f06dWe&MInD=7v>dqba?dApRgajrNzK$Kl<7ZcYqQF8WNX`9X=w8 z?GBO`yMWNpb&VFwSi>pK3pDt-Yy;%Qt}FF^28z$kQ@PsD5(U?z=jNIxgU&8CZ_>g8IlLW4;bPkjpZbtmNotTV|)V(qwxm6?ZCGH0000< KMNUMnLSTa7&)XFM delta 475 zcmV<10VMvx1jq!CEC>w`Cl>tkYDtkaPk&&TfIvV%@bD;LU|7JYDERpJaB#@5fLQ3j zhv42I)3h*PSb8+ZXQi0;_N8@n_10^18zt(0D?P8u(;_kUfO z7I1UgZN7j%@;mk~qtxF5bOKD7f^DL(`verz3Dg3FceFxh5Wz~YVm5gtB+SlM`2w;D zNW}!I?VW;|M6=-d@ts*q$x~HG0G5Y{I4cFV09bVUlyR? z_SO4QM@cAiq1K<`HHgSGe){9=2!Ed4K>k!Nj$lSLwI^%m-XL>BUx|5*Wg>Avfw3WQ z8Rmz`JP^Fk|0mKOAWwD-YywP?g2QCJC}j4i!@R%3IUDV}#|Du!Pk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL00ACJL_t(|oYj)C zZp0uAhVuppbw8fr#Bkg3ELA1OM%4}3%ER2FRqAM5A;E_0Bo16MRqE2RApiU}*nfP( z@TV6ZVik|VD5;e6|Sb?Ciz5tWm1Yf+h0Q9md+5BWN{dhpWJXUmsGQtbJ!8mi1Z{rZPnb zko~v{6au8FLY%hlkgrG;Dz*Oer+FVM^q8}}e~jl2iN^iZN;wQx?KA%G`YABfq@Z$fr%Hk q#L&i(BQa97kA?Xlpxt->hL3OB2h=RUttjaL0000aoa)^G+h%@<6^PDD== zV4EAnBJ(CIFmh>$mtAAThr4l)PHP@@yy{x8{Zs1xi+dWiHY~Gw%CA%TWV7pr=`rh6 zXR`#Aig6_!c-OJ?j#1ERL+edyVuyYSlE@aUZ3-EYwzKTlqDtd i+@Bj;cEA6}D{p^2(5`CNkyJiV$a=c^xvXVa1Hc22EC>%3IWn&aUuuywPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL0087kL_t(|oZXT! zjsqbKMY)0X)1(_8A-BpE=rV`dlToD$Sdl^pVP*#mR9kEjg^s6hTbO6eN1rg=iGOFX zge{d7xM0W=l!y=Ff-J390^>q(p_O1c4FJF?lw1WbfPFtb0?*t567WylCfA`3+1k>h z^-PR-V+DpD!X;HJ%9Q8j<)HzSDciFQPfpgxbpZF(4_l&~9@E;=bpn*lm!3ZgLz?>) zMp(%%Ooo2UE{rU!C7Uok*o7h2z&|03w5EqJ4OC&;Zy&-mfvPYH4q-Y!iZGEo(~B_0 kk4c#OIto+#@c-w>8%#u$jck6;;Q#;t07*qoM6N<$f|H_`LjV8( delta 349 zcmX@We42TJ4hJv4n$(*(apj37{`JXoTOAx6YHDhdlcVix0a|NsAgPYz_j z25K{fuL8vxlf2zs{x4EaktG3V|i!#-w39@me&2Q-#^ zo3CN(;x*s-4WpZO;ncm~j3zTOhjxhszNo1GwXL=CSk0G>m*=Lib>9v0bKKOX#f(T@yWu{Szamyg6j? z;`p0GAH0;JHgR5Vj+OA@l{r+9UBz+PL3G*QZ;C#`E4UUv5LotkF^BLH%3I1poUFVB%QPk&;ZgM))}y}iBv|Np(DLH713)nY;RlqrjQ z|6)qb?sJ^~w4|iP|7xt9Vq#iBK|xumkYoS=00Cl4M??UK1szBL007NNL_t(|oaK_g z4uc>Nhj{~rzCqnxZgC*+a9tRTJ`{_?Mc+YJgQhMHrdJ0J(YZ;}^tbVa+#mRa_EVKxRV4Ew^uxG1PY5C)?TL72o3@|nir;)nmPA8#Irm8rAlj@bYJ N002ovPDHLkV1lKnmAL=_ delta 327 zcmZ3aX3nu!ijkTJ>I-R1vM_D@GaoRT2FUL$8ZVpLjcqOIY#m+Bs4NE7&JiP6#SAR1RBUGa=%B)e^4P7g}%qytQiL z>r>B-^j944v|;v{&iDiW3K58REO!&kTC{jZN~G1Il%B|pC31PTaG LS3j3^P61dIfbEC>%3I0BH%UWbu1Pk&;ZgM))}y}iBv|Np(DLH713)nY;RlqrjQ z|6)qb?sJ^~w4|iP|7xt9Vq#iBK|xumkYoS=00Cl4M??UK1szBL00A&bL_t(|oZXVo zPJ}QJ#_J0>$v%KlI4cR<@%45ScfHa?yU$}%@akbHQ7$yub_rbeAdD=wLQOmyoqyYW znZI9tg#2n??dEXj3UGX>2~H_Fu96y`zl08#G{N=#B=nLd)oLc}CDRo>pqT=KOU)&f zw6H?Pct)9~W;N`d9=K*zwzXS1=VDW><-t_E^Ayv~lIq9W7LaO%n}1!Ft9-l+t^xv!@>+?!7%LzMNcUR$N|+9)5j+vb z`C;y8AI7?vd)WG2?zoEBmfw9x@;Bn&1B2$n6EJTlV7gBnNUssS%YCYp!C~a%OmRH{ zH1Kf|3SqW3%|MjUVQl$87`(yKcljU#QjUob-nx7M;!k{h0PZ6k`@{wmUkm^M002ov JPDHLkV1klu!wLWZ delta 424 zcmeBSnaVOjhl7`2gYn0X&yEvK{OgnFwmLXC^w#`ecI!Cs2?v$=luK|5El(M?svDAirP+hi5m^fNUL47srr_Id>=7`X4qBXshKG zn!Vn|GtBF@tYr#+?;i7n_rAI8ZqrnhCkk-ZGt_^5K8bC%ipLp_yxrm7f4)+D63+b6 zrhWBJhVE#u0-uvfa|8GM6S9fv;t8L=_(Ar>r>{E;E?jz&)L+I`u#ESzQ}+?hjVT)^ zxZSwAVeiglw`U*E<)-$0^xb!2Wd7(rbMv>u!Up{6348oyI`Rc}KX+a-{zuVP0i`A$#Z6b`bUpNnUi`G=6S52_5l>q Mp00i_>zopr0L=Qk=l}o! diff --git a/graphics/pokemon/alolan_vulpix/icon.png b/graphics/pokemon/alolan_vulpix/icon.png index 5e095b3c6fc31fe7f4c41092e4f00ca7b278972b..f49562751b543e16fe7f4ab6e16e9c39cd406b7a 100755 GIT binary patch delta 377 zcmV-<0fzqU1Lp&fEC>%3Hzl%J_al)sPk&;ZgL`{>y}h*m|NnDy&7`dMw1Zmi#f!zP zDfad$_F__$d(Fk9&Alm{Vq#iBK|$$6v|j)K00Cl4M??UK1szBL009e0L_t(|oZXT^ zio+ljhP{DzNcIi%XI4Tzgt!W{cWlTiFmsnkR)sWFx(dW9`Vt#vJ22FpAJ1QX?|)VH0ZUYN2IUL^5iU_6xsS`CbWq!MfNdBmwjM*xjMchd?#5zJzQ z_#Wz(LimUo=H!zIK+1!^*>;jL#MJ}I>6RHd_CUqxsa&Bb&{x@Km%hZK$iB=&g3iIg zgLB@Lr`aMS7%sb>J$HcdT~|M7{bni*&u9>aTU4tbK^O}(s~;o`O>Ps0W*dd6l}LU> zVFq6(;+ZJSO?N7VBw=d3f+UO+&6F~tFwCY~R$*vbL6{PK=7(GSs~&HDlzTrG{HY%= XvzC`F?Loaq00000NkvXXu0mjftiq^V delta 382 zcmaFP{Dygg4hJv4ro!4&m*OUx_}6EzpX=b@@c;k+FScPBYcYE}?%eaO~iSY3DM4SR2O zuXu;#-S#PW{&O(1u01mAZOGC?ef8mI*>}k&=kIm-xa)a;Y2gL%hXvPn`85bP? zr7}KVsbpZifKO$r$K!dXe#UA{61>a0H}7x_cq#Sko}O{*2Px4rC)EWTg2L-J&k;#| zA(?&w|=FRb_V=kCkV~ z{$22Oxq;1MM+v=)YwK7NRSeeEO)xOo=_@fSS0rtt)lb3J%-Xqq>5B}+&2NfKYKgqV zHOauK-}O|-A%mHDk*y0eSre;FX38)6vfgUXkBjgBYJ6N@_lIfyEt3SF1Lr1y0@Bmf K&t;ucLK6Tx>6=IZ diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index d71b8497f1..8b41d28e6f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1812,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, }; From ad7cda916911aab9d1aa5948bd006fdccd9117c6 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 30 Nov 2019 09:29:30 -0300 Subject: [PATCH 16/16] =?UTF-8?q?Replaced=20the=20level=20up=20learnsets?= =?UTF-8?q?=20of=20the=20Alolan=20Forms=20with=20the=20same=20placeholder?= =?UTF-8?q?=20that=20many=20other=20new=20Pok=C3=A9mon=20use.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/pokemon/level_up_learnsets.h | 193 ++------------------------ 1 file changed, 11 insertions(+), 182 deletions(-) diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 6c17ec8319..c21185402a 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -7624,261 +7624,90 @@ static const struct LevelUpMove sZeraoraLevelUpLearnset[] = { static const struct LevelUpMove sAlolanRattataLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 6, MOVE_QUICK_ATTACK), - LEVEL_UP_MOVE( 9, MOVE_FOCUS_ENERGY), - LEVEL_UP_MOVE(12, MOVE_BITE), - LEVEL_UP_MOVE(15, MOVE_SUPER_FANG), - LEVEL_UP_MOVE(18, MOVE_CRUNCH), - LEVEL_UP_MOVE(21, MOVE_HYPER_FANG), - LEVEL_UP_MOVE(24, MOVE_SUCKER_PUNCH), - LEVEL_UP_MOVE(27, MOVE_DOUBLE_EDGE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanRaticateLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), - LEVEL_UP_MOVE( 1, MOVE_COUNTER), - LEVEL_UP_MOVE( 1, MOVE_FURY_SWIPES), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), - LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), - LEVEL_UP_MOVE(12, MOVE_BITE), - LEVEL_UP_MOVE(15, MOVE_SUPER_FANG), - LEVEL_UP_MOVE(18, MOVE_CRUNCH), - LEVEL_UP_MOVE(26, MOVE_HYPER_FANG), - LEVEL_UP_MOVE(34, MOVE_SUCKER_PUNCH), - LEVEL_UP_MOVE(42, MOVE_DOUBLE_EDGE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanRaichuLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), - LEVEL_UP_MOVE( 1, MOVE_ENCORE), - LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), - LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanSandshrewLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), - LEVEL_UP_MOVE( 4, MOVE_BIDE), - LEVEL_UP_MOVE( 8, MOVE_ICE_SHARD), - LEVEL_UP_MOVE(12, MOVE_SWIFT), - LEVEL_UP_MOVE(16, MOVE_MIRROR_COAT), - LEVEL_UP_MOVE(20, MOVE_FURY_SWIPES), - LEVEL_UP_MOVE(24, MOVE_ICE_PUNCH), - LEVEL_UP_MOVE(28, MOVE_SWORDS_DANCE), - LEVEL_UP_MOVE(32, MOVE_SLASH), - LEVEL_UP_MOVE(36, MOVE_BLIZZARD), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanSandslashLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_COUNTER), - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), - LEVEL_UP_MOVE( 1, MOVE_BIDE), - LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanVulpixLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 7, MOVE_MIST), - LEVEL_UP_MOVE(10, MOVE_ICE_SHARD), - LEVEL_UP_MOVE(14, MOVE_CONFUSE_RAY), - LEVEL_UP_MOVE(17, MOVE_AURORA_BEAM), - LEVEL_UP_MOVE(21, MOVE_DAZZLING_GLEAM), - LEVEL_UP_MOVE(24, MOVE_ICE_BEAM), - LEVEL_UP_MOVE(28, MOVE_ROAR), - LEVEL_UP_MOVE(31, MOVE_BLIZZARD), LEVEL_UP_END }; static const struct LevelUpMove sAlolanNinetalesLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), - LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 1, MOVE_MIST), - LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD), LEVEL_UP_END }; static const struct LevelUpMove sAlolanDiglettLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 4, MOVE_SAND_ATTACK), - LEVEL_UP_MOVE( 8, MOVE_GROWL), - LEVEL_UP_MOVE(12, MOVE_AGILITY), - LEVEL_UP_MOVE(15, MOVE_FURY_SWIPES), - LEVEL_UP_MOVE(18, MOVE_DIG), - LEVEL_UP_MOVE(21, MOVE_SLASH), - LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH), - LEVEL_UP_MOVE(29, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(33, MOVE_FISSURE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanDugtrioLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_TRI_ATTACK), - LEVEL_UP_MOVE( 1, MOVE_SCREECH), - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_AGILITY), - LEVEL_UP_MOVE(15, MOVE_FURY_SWIPES), - LEVEL_UP_MOVE(18, MOVE_DIG), - LEVEL_UP_MOVE(21, MOVE_SLASH), - LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH), - LEVEL_UP_MOVE(35, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(45, MOVE_FISSURE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanMeowthLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_BITE), - LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), - LEVEL_UP_MOVE( 9, MOVE_TAUNT), - LEVEL_UP_MOVE(12, MOVE_PAY_DAY), - LEVEL_UP_MOVE(15, MOVE_FEINT), - LEVEL_UP_MOVE(19, MOVE_FURY_SWIPES), - LEVEL_UP_MOVE(23, MOVE_SCREECH), - LEVEL_UP_MOVE(27, MOVE_SLASH), - LEVEL_UP_MOVE(31, MOVE_NASTY_PLOT), - LEVEL_UP_MOVE(35, MOVE_PLAY_ROUGH), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanPersianLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SWIFT), - LEVEL_UP_MOVE( 1, MOVE_AMNESIA), - LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), - LEVEL_UP_MOVE( 1, MOVE_SCRATCH), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_BITE), - LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), - LEVEL_UP_MOVE( 9, MOVE_TAUNT), - LEVEL_UP_MOVE(12, MOVE_PAY_DAY), - LEVEL_UP_MOVE(16, MOVE_FEINT), - LEVEL_UP_MOVE(19, MOVE_FURY_SWIPES), - LEVEL_UP_MOVE(23, MOVE_SCREECH), - LEVEL_UP_MOVE(27, MOVE_SLASH), - LEVEL_UP_MOVE(37, MOVE_NASTY_PLOT), - LEVEL_UP_MOVE(47, MOVE_PLAY_ROUGH), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanGeodudeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), - LEVEL_UP_MOVE( 3, MOVE_THUNDER_SHOCK), - LEVEL_UP_MOVE( 6, MOVE_BIDE), - LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW), - LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK), - LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN), - LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT), - LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE), - LEVEL_UP_MOVE(27, MOVE_THUNDER_PUNCH), - LEVEL_UP_MOVE(31, MOVE_DOUBLE_EDGE), - LEVEL_UP_MOVE(35, MOVE_EXPLOSION), LEVEL_UP_END }; static const struct LevelUpMove sAlolanGravelerLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), - LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), - LEVEL_UP_MOVE( 1, MOVE_BIDE), - LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW), - LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK), - LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN), - LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT), - LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE), - LEVEL_UP_MOVE(31, MOVE_THUNDER_PUNCH), - LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE), - LEVEL_UP_MOVE(47, MOVE_EXPLOSION), LEVEL_UP_END }; static const struct LevelUpMove sAlolanGolemLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_MEGA_PUNCH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), - LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), - LEVEL_UP_MOVE( 1, MOVE_BIDE), - LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW), - LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK), - LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN), - LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT), - LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE), - LEVEL_UP_MOVE(31, MOVE_THUNDER_PUNCH), - LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE), - LEVEL_UP_MOVE(47, MOVE_EXPLOSION), LEVEL_UP_END }; static const struct LevelUpMove sAlolanGrimerLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_POUND), - LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), - LEVEL_UP_MOVE( 6, MOVE_HARDEN), - LEVEL_UP_MOVE(12, MOVE_MINIMIZE), - LEVEL_UP_MOVE(18, MOVE_DISABLE), - LEVEL_UP_MOVE(24, MOVE_BITE), - LEVEL_UP_MOVE(30, MOVE_SCREECH), - LEVEL_UP_MOVE(36, MOVE_CRUNCH), - LEVEL_UP_MOVE(42, MOVE_ACID_ARMOR), - LEVEL_UP_MOVE(48, MOVE_SLUDGE_BOMB), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanMukLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_HAZE), - LEVEL_UP_MOVE( 1, MOVE_MOONBLAST), - LEVEL_UP_MOVE( 1, MOVE_POUND), - LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), - LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 1, MOVE_MINIMIZE), - LEVEL_UP_MOVE(18, MOVE_DISABLE), - LEVEL_UP_MOVE(24, MOVE_BITE), - LEVEL_UP_MOVE(30, MOVE_SCREECH), - LEVEL_UP_MOVE(36, MOVE_CRUNCH), - LEVEL_UP_MOVE(48, MOVE_ACID_ARMOR), - LEVEL_UP_MOVE(60, MOVE_SLUDGE_BOMB), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanExeggutorLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_DRAGON_PULSE), - LEVEL_UP_MOVE( 1, MOVE_POWER_WHIP), - LEVEL_UP_MOVE( 1, MOVE_EGG_BOMB), - LEVEL_UP_MOVE( 1, MOVE_BARRAGE), - LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS), - LEVEL_UP_MOVE( 1, MOVE_CONFUSION), - LEVEL_UP_MOVE( 1, MOVE_STUN_SPORE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; static const struct LevelUpMove sAlolanMarowakLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), - LEVEL_UP_MOVE( 1, MOVE_SCREECH), - LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), - LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), - LEVEL_UP_MOVE(14, MOVE_FIRE_SPIN), - LEVEL_UP_MOVE(18, MOVE_RAGE), - LEVEL_UP_MOVE(24, MOVE_WILL_O_WISP), - LEVEL_UP_MOVE(26, MOVE_BONEMERANG), - LEVEL_UP_MOVE(36, MOVE_THRASH), - LEVEL_UP_MOVE(48, MOVE_FLARE_BLITZ), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END };