ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from thechurchofcage/zeta

Browse Source 
Gen 7 animations
This commit is contained in:
DizzyEggg 2019-04-13 09:36:34 +02:00 committed by GitHub
commit ece5b2c256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 601 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/marshadow/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 523 B

BIN
graphics/pokemon/marshadow/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 1.0 KiB

30
graphics/pokemon/marshadow/normal.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
152 208 160
40 64 40
96 128 104
80 96 80
156 214 165
41 66 41
99 132 107
82 99 82
16 16 16
40 48 48
112 112 120
72 80 80
248 240 144
248 64 0
240 160 80
128 152 120
136 136 136
0 0 0
0 0 0
0 0 0
41 49 49
115 115 123
74 82 82
255 247 148
239 99 25
189 197 107
156 140 74
123 90 66
16 74 74
8 173 132
16 123 99

30
graphics/pokemon/marshadow/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
152 208 160
48 32 64
128 96 136
88 64 104
156 214 165
49 33 66
132 99 140
90 66 107
16 16 16
40 48 48
112 112 120
72 80 80
248 240 144
248 64 0
240 160 80
136 120 152
136 136 136
0 0 0
0 0 0
0 0 0
41 49 49
115 115 123
74 82 82
255 247 148
255 66 0
189 197 107
156 140 74
123 90 66
82 49 99
165 82 181
115 66 132

BIN
graphics/pokemon/tapu_bulu/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 875 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/tapu_fini/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 885 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/tapu_koko/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/tapu_lele/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 1.2 KiB

1
include/constants/rgb.h
View File

@ -10,6 +10,7 @@
#define RGB_RED RGB(31, 0, 0)
#define RGB_GREEN RGB(0, 31, 0)
#define RGB_BLUE RGB(0, 0, 31)
#define RGB_PURPLE RGB(24, 0, 24)
#define RGB_YELLOW RGB(31, 31, 0)
#define RGB_MAGENTA RGB(31, 0, 31)
#define RGB_CYAN RGB(0, 31, 31)

16
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -7641,24 +7641,38 @@ static const union AnimCmd sAnim_KOMMO_O_1[] =
static const union AnimCmd sAnim_TAPU_KOKO_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_TAPU_LELE_1[] =
{
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_TAPU_BULU_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd sAnim_TAPU_FINI_1[] =
{
ANIMCMD_FRAME(1, 60),
ANIMCMD_FRAME(1, 60),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
@ -7744,6 +7758,8 @@ static const union AnimCmd sAnim_MAGEARNA_1[] =
static const union AnimCmd sAnim_MARSHADOW_1[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 54),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
};

772
src/data/text/species_names.h
View File

@ -1,391 +1,391 @@
const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_NONE] = _("??????????"),
[SPECIES_BULBASAUR] = _("BULBASAUR"),
[SPECIES_IVYSAUR] = _("IVYSAUR"),
[SPECIES_VENUSAUR] = _("VENUSAUR"),
[SPECIES_CHARMANDER] = _("CHARMANDER"),
[SPECIES_CHARMELEON] = _("CHARMELEON"),
[SPECIES_CHARIZARD] = _("CHARIZARD"),
[SPECIES_SQUIRTLE] = _("SQUIRTLE"),
[SPECIES_WARTORTLE] = _("WARTORTLE"),
[SPECIES_BLASTOISE] = _("BLASTOISE"),
[SPECIES_CATERPIE] = _("CATERPIE"),
[SPECIES_METAPOD] = _("METAPOD"),
[SPECIES_BUTTERFREE] = _("BUTTERFREE"),
[SPECIES_WEEDLE] = _("WEEDLE"),
[SPECIES_KAKUNA] = _("KAKUNA"),
[SPECIES_BEEDRILL] = _("BEEDRILL"),
[SPECIES_PIDGEY] = _("PIDGEY"),
[SPECIES_PIDGEOTTO] = _("PIDGEOTTO"),
[SPECIES_PIDGEOT] = _("PIDGEOT"),
[SPECIES_RATTATA] = _("RATTATA"),
[SPECIES_RATICATE] = _("RATICATE"),
[SPECIES_SPEAROW] = _("SPEAROW"),
[SPECIES_FEAROW] = _("FEAROW"),
[SPECIES_EKANS] = _("EKANS"),
[SPECIES_ARBOK] = _("ARBOK"),
[SPECIES_PIKACHU] = _("PIKACHU"),
[SPECIES_RAICHU] = _("RAICHU"),
[SPECIES_SANDSHREW] = _("SANDSHREW"),
[SPECIES_SANDSLASH] = _("SANDSLASH"),
[SPECIES_NIDORAN_F] = _("NIDORAN♀"),
[SPECIES_NIDORINA] = _("NIDORINA"),
[SPECIES_NIDOQUEEN] = _("NIDOQUEEN"),
[SPECIES_NIDORAN_M] = _("NIDORAN♂"),
[SPECIES_NIDORINO] = _("NIDORINO"),
[SPECIES_NIDOKING] = _("NIDOKING"),
[SPECIES_CLEFAIRY] = _("CLEFAIRY"),
[SPECIES_CLEFABLE] = _("CLEFABLE"),
[SPECIES_VULPIX] = _("VULPIX"),
[SPECIES_NINETALES] = _("NINETALES"),
[SPECIES_JIGGLYPUFF] = _("JIGGLYPUFF"),
[SPECIES_WIGGLYTUFF] = _("WIGGLYTUFF"),
[SPECIES_ZUBAT] = _("ZUBAT"),
[SPECIES_GOLBAT] = _("GOLBAT"),
[SPECIES_ODDISH] = _("ODDISH"),
[SPECIES_GLOOM] = _("GLOOM"),
[SPECIES_VILEPLUME] = _("VILEPLUME"),
[SPECIES_PARAS] = _("PARAS"),
[SPECIES_PARASECT] = _("PARASECT"),
[SPECIES_VENONAT] = _("VENONAT"),
[SPECIES_VENOMOTH] = _("VENOMOTH"),
[SPECIES_DIGLETT] = _("DIGLETT"),
[SPECIES_DUGTRIO] = _("DUGTRIO"),
[SPECIES_MEOWTH] = _("MEOWTH"),
[SPECIES_PERSIAN] = _("PERSIAN"),
[SPECIES_PSYDUCK] = _("PSYDUCK"),
[SPECIES_GOLDUCK] = _("GOLDUCK"),
[SPECIES_MANKEY] = _("MANKEY"),
[SPECIES_PRIMEAPE] = _("PRIMEAPE"),
[SPECIES_GROWLITHE] = _("GROWLITHE"),
[SPECIES_ARCANINE] = _("ARCANINE"),
[SPECIES_POLIWAG] = _("POLIWAG"),
[SPECIES_POLIWHIRL] = _("POLIWHIRL"),
[SPECIES_POLIWRATH] = _("POLIWRATH"),
[SPECIES_ABRA] = _("ABRA"),
[SPECIES_KADABRA] = _("KADABRA"),
[SPECIES_ALAKAZAM] = _("ALAKAZAM"),
[SPECIES_MACHOP] = _("MACHOP"),
[SPECIES_MACHOKE] = _("MACHOKE"),
[SPECIES_MACHAMP] = _("MACHAMP"),
[SPECIES_BELLSPROUT] = _("BELLSPROUT"),
[SPECIES_WEEPINBELL] = _("WEEPINBELL"),
[SPECIES_VICTREEBEL] = _("VICTREEBEL"),
[SPECIES_TENTACOOL] = _("TENTACOOL"),
[SPECIES_TENTACRUEL] = _("TENTACRUEL"),
[SPECIES_GEODUDE] = _("GEODUDE"),
[SPECIES_GRAVELER] = _("GRAVELER"),
[SPECIES_GOLEM] = _("GOLEM"),
[SPECIES_PONYTA] = _("PONYTA"),
[SPECIES_RAPIDASH] = _("RAPIDASH"),
[SPECIES_SLOWPOKE] = _("SLOWPOKE"),
[SPECIES_SLOWBRO] = _("SLOWBRO"),
[SPECIES_MAGNEMITE] = _("MAGNEMITE"),
[SPECIES_MAGNETON] = _("MAGNETON"),
[SPECIES_FARFETCHD] = _("FARFETCH'D"),
[SPECIES_DODUO] = _("DODUO"),
[SPECIES_DODRIO] = _("DODRIO"),
[SPECIES_SEEL] = _("SEEL"),
[SPECIES_DEWGONG] = _("DEWGONG"),
[SPECIES_GRIMER] = _("GRIMER"),
[SPECIES_MUK] = _("MUK"),
[SPECIES_SHELLDER] = _("SHELLDER"),
[SPECIES_CLOYSTER] = _("CLOYSTER"),
[SPECIES_GASTLY] = _("GASTLY"),
[SPECIES_HAUNTER] = _("HAUNTER"),
[SPECIES_GENGAR] = _("GENGAR"),
[SPECIES_ONIX] = _("ONIX"),
[SPECIES_DROWZEE] = _("DROWZEE"),
[SPECIES_HYPNO] = _("HYPNO"),
[SPECIES_KRABBY] = _("KRABBY"),
[SPECIES_KINGLER] = _("KINGLER"),
[SPECIES_VOLTORB] = _("VOLTORB"),
[SPECIES_ELECTRODE] = _("ELECTRODE"),
[SPECIES_EXEGGCUTE] = _("EXEGGCUTE"),
[SPECIES_EXEGGUTOR] = _("EXEGGUTOR"),
[SPECIES_CUBONE] = _("CUBONE"),
[SPECIES_MAROWAK] = _("MAROWAK"),
[SPECIES_HITMONLEE] = _("HITMONLEE"),
[SPECIES_HITMONCHAN] = _("HITMONCHAN"),
[SPECIES_LICKITUNG] = _("LICKITUNG"),
[SPECIES_KOFFING] = _("KOFFING"),
[SPECIES_WEEZING] = _("WEEZING"),
[SPECIES_RHYHORN] = _("RHYHORN"),
[SPECIES_RHYDON] = _("RHYDON"),
[SPECIES_CHANSEY] = _("CHANSEY"),
[SPECIES_TANGELA] = _("TANGELA"),
[SPECIES_KANGASKHAN] = _("KANGASKHAN"),
[SPECIES_HORSEA] = _("HORSEA"),
[SPECIES_SEADRA] = _("SEADRA"),
[SPECIES_GOLDEEN] = _("GOLDEEN"),
[SPECIES_SEAKING] = _("SEAKING"),
[SPECIES_STARYU] = _("STARYU"),
[SPECIES_STARMIE] = _("STARMIE"),
[SPECIES_MR_MIME] = _("MR. MIME"),
[SPECIES_SCYTHER] = _("SCYTHER"),
[SPECIES_JYNX] = _("JYNX"),
[SPECIES_ELECTABUZZ] = _("ELECTABUZZ"),
[SPECIES_MAGMAR] = _("MAGMAR"),
[SPECIES_PINSIR] = _("PINSIR"),
[SPECIES_TAUROS] = _("TAUROS"),
[SPECIES_MAGIKARP] = _("MAGIKARP"),
[SPECIES_GYARADOS] = _("GYARADOS"),
[SPECIES_LAPRAS] = _("LAPRAS"),
[SPECIES_DITTO] = _("DITTO"),
[SPECIES_EEVEE] = _("EEVEE"),
[SPECIES_VAPOREON] = _("VAPOREON"),
[SPECIES_JOLTEON] = _("JOLTEON"),
[SPECIES_FLAREON] = _("FLAREON"),
[SPECIES_PORYGON] = _("PORYGON"),
[SPECIES_OMANYTE] = _("OMANYTE"),
[SPECIES_OMASTAR] = _("OMASTAR"),
[SPECIES_KABUTO] = _("KABUTO"),
[SPECIES_KABUTOPS] = _("KABUTOPS"),
[SPECIES_AERODACTYL] = _("AERODACTYL"),
[SPECIES_SNORLAX] = _("SNORLAX"),
[SPECIES_ARTICUNO] = _("ARTICUNO"),
[SPECIES_ZAPDOS] = _("ZAPDOS"),
[SPECIES_MOLTRES] = _("MOLTRES"),
[SPECIES_DRATINI] = _("DRATINI"),
[SPECIES_DRAGONAIR] = _("DRAGONAIR"),
[SPECIES_DRAGONITE] = _("DRAGONITE"),
[SPECIES_MEWTWO] = _("MEWTWO"),
[SPECIES_MEW] = _("MEW"),
[SPECIES_CHIKORITA] = _("CHIKORITA"),
[SPECIES_BAYLEEF] = _("BAYLEEF"),
[SPECIES_MEGANIUM] = _("MEGANIUM"),
[SPECIES_CYNDAQUIL] = _("CYNDAQUIL"),
[SPECIES_QUILAVA] = _("QUILAVA"),
[SPECIES_TYPHLOSION] = _("TYPHLOSION"),
[SPECIES_TOTODILE] = _("TOTODILE"),
[SPECIES_CROCONAW] = _("CROCONAW"),
[SPECIES_FERALIGATR] = _("FERALIGATR"),
[SPECIES_SENTRET] = _("SENTRET"),
[SPECIES_FURRET] = _("FURRET"),
[SPECIES_HOOTHOOT] = _("HOOTHOOT"),
[SPECIES_NOCTOWL] = _("NOCTOWL"),
[SPECIES_LEDYBA] = _("LEDYBA"),
[SPECIES_LEDIAN] = _("LEDIAN"),
[SPECIES_SPINARAK] = _("SPINARAK"),
[SPECIES_ARIADOS] = _("ARIADOS"),
[SPECIES_CROBAT] = _("CROBAT"),
[SPECIES_CHINCHOU] = _("CHINCHOU"),
[SPECIES_LANTURN] = _("LANTURN"),
[SPECIES_PICHU] = _("PICHU"),
[SPECIES_CLEFFA] = _("CLEFFA"),
[SPECIES_IGGLYBUFF] = _("IGGLYBUFF"),
[SPECIES_TOGEPI] = _("TOGEPI"),
[SPECIES_TOGETIC] = _("TOGETIC"),
[SPECIES_NATU] = _("NATU"),
[SPECIES_XATU] = _("XATU"),
[SPECIES_MAREEP] = _("MAREEP"),
[SPECIES_FLAAFFY] = _("FLAAFFY"),
[SPECIES_AMPHAROS] = _("AMPHAROS"),
[SPECIES_BELLOSSOM] = _("BELLOSSOM"),
[SPECIES_MARILL] = _("MARILL"),
[SPECIES_AZUMARILL] = _("AZUMARILL"),
[SPECIES_SUDOWOODO] = _("SUDOWOODO"),
[SPECIES_POLITOED] = _("POLITOED"),
[SPECIES_HOPPIP] = _("HOPPIP"),
[SPECIES_SKIPLOOM] = _("SKIPLOOM"),
[SPECIES_JUMPLUFF] = _("JUMPLUFF"),
[SPECIES_AIPOM] = _("AIPOM"),
[SPECIES_SUNKERN] = _("SUNKERN"),
[SPECIES_SUNFLORA] = _("SUNFLORA"),
[SPECIES_YANMA] = _("YANMA"),
[SPECIES_WOOPER] = _("WOOPER"),
[SPECIES_QUAGSIRE] = _("QUAGSIRE"),
[SPECIES_ESPEON] = _("ESPEON"),
[SPECIES_UMBREON] = _("UMBREON"),
[SPECIES_MURKROW] = _("MURKROW"),
[SPECIES_SLOWKING] = _("SLOWKING"),
[SPECIES_MISDREAVUS] = _("MISDREAVUS"),
[SPECIES_UNOWN] = _("UNOWN"),
[SPECIES_WOBBUFFET] = _("WOBBUFFET"),
[SPECIES_GIRAFARIG] = _("GIRAFARIG"),
[SPECIES_PINECO] = _("PINECO"),
[SPECIES_FORRETRESS] = _("FORRETRESS"),
[SPECIES_DUNSPARCE] = _("DUNSPARCE"),
[SPECIES_GLIGAR] = _("GLIGAR"),
[SPECIES_STEELIX] = _("STEELIX"),
[SPECIES_SNUBBULL] = _("SNUBBULL"),
[SPECIES_GRANBULL] = _("GRANBULL"),
[SPECIES_QWILFISH] = _("QWILFISH"),
[SPECIES_SCIZOR] = _("SCIZOR"),
[SPECIES_SHUCKLE] = _("SHUCKLE"),
[SPECIES_HERACROSS] = _("HERACROSS"),
[SPECIES_SNEASEL] = _("SNEASEL"),
[SPECIES_TEDDIURSA] = _("TEDDIURSA"),
[SPECIES_URSARING] = _("URSARING"),
[SPECIES_SLUGMA] = _("SLUGMA"),
[SPECIES_MAGCARGO] = _("MAGCARGO"),
[SPECIES_SWINUB] = _("SWINUB"),
[SPECIES_PILOSWINE] = _("PILOSWINE"),
[SPECIES_CORSOLA] = _("CORSOLA"),
[SPECIES_REMORAID] = _("REMORAID"),
[SPECIES_OCTILLERY] = _("OCTILLERY"),
[SPECIES_DELIBIRD] = _("DELIBIRD"),
[SPECIES_MANTINE] = _("MANTINE"),
[SPECIES_SKARMORY] = _("SKARMORY"),
[SPECIES_HOUNDOUR] = _("HOUNDOUR"),
[SPECIES_HOUNDOOM] = _("HOUNDOOM"),
[SPECIES_KINGDRA] = _("KINGDRA"),
[SPECIES_PHANPY] = _("PHANPY"),
[SPECIES_DONPHAN] = _("DONPHAN"),
[SPECIES_PORYGON2] = _("PORYGON2"),
[SPECIES_STANTLER] = _("STANTLER"),
[SPECIES_SMEARGLE] = _("SMEARGLE"),
[SPECIES_TYROGUE] = _("TYROGUE"),
[SPECIES_HITMONTOP] = _("HITMONTOP"),
[SPECIES_SMOOCHUM] = _("SMOOCHUM"),
[SPECIES_ELEKID] = _("ELEKID"),
[SPECIES_MAGBY] = _("MAGBY"),
[SPECIES_MILTANK] = _("MILTANK"),
[SPECIES_BLISSEY] = _("BLISSEY"),
[SPECIES_RAIKOU] = _("RAIKOU"),
[SPECIES_ENTEI] = _("ENTEI"),
[SPECIES_SUICUNE] = _("SUICUNE"),
[SPECIES_LARVITAR] = _("LARVITAR"),
[SPECIES_PUPITAR] = _("PUPITAR"),
[SPECIES_TYRANITAR] = _("TYRANITAR"),
[SPECIES_LUGIA] = _("LUGIA"),
[SPECIES_HO_OH] = _("HO-OH"),
[SPECIES_CELEBI] = _("CELEBI"),
[SPECIES_TREECKO] = _("TREECKO"),
[SPECIES_GROVYLE] = _("GROVYLE"),
[SPECIES_SCEPTILE] = _("SCEPTILE"),
[SPECIES_TORCHIC] = _("TORCHIC"),
[SPECIES_COMBUSKEN] = _("COMBUSKEN"),
[SPECIES_BLAZIKEN] = _("BLAZIKEN"),
[SPECIES_MUDKIP] = _("MUDKIP"),
[SPECIES_MARSHTOMP] = _("MARSHTOMP"),
[SPECIES_SWAMPERT] = _("SWAMPERT"),
[SPECIES_POOCHYENA] = _("POOCHYENA"),
[SPECIES_MIGHTYENA] = _("MIGHTYENA"),
[SPECIES_ZIGZAGOON] = _("ZIGZAGOON"),
[SPECIES_LINOONE] = _("LINOONE"),
[SPECIES_WURMPLE] = _("WURMPLE"),
[SPECIES_SILCOON] = _("SILCOON"),
[SPECIES_BEAUTIFLY] = _("BEAUTIFLY"),
[SPECIES_CASCOON] = _("CASCOON"),
[SPECIES_DUSTOX] = _("DUSTOX"),
[SPECIES_LOTAD] = _("LOTAD"),
[SPECIES_LOMBRE] = _("LOMBRE"),
[SPECIES_LUDICOLO] = _("LUDICOLO"),
[SPECIES_SEEDOT] = _("SEEDOT"),
[SPECIES_NUZLEAF] = _("NUZLEAF"),
[SPECIES_SHIFTRY] = _("SHIFTRY"),
[SPECIES_NINCADA] = _("NINCADA"),
[SPECIES_NINJASK] = _("NINJASK"),
[SPECIES_SHEDINJA] = _("SHEDINJA"),
[SPECIES_TAILLOW] = _("TAILLOW"),
[SPECIES_SWELLOW] = _("SWELLOW"),
[SPECIES_SHROOMISH] = _("SHROOMISH"),
[SPECIES_BRELOOM] = _("BRELOOM"),
[SPECIES_SPINDA] = _("SPINDA"),
[SPECIES_WINGULL] = _("WINGULL"),
[SPECIES_PELIPPER] = _("PELIPPER"),
[SPECIES_SURSKIT] = _("SURSKIT"),
[SPECIES_MASQUERAIN] = _("MASQUERAIN"),
[SPECIES_WAILMER] = _("WAILMER"),
[SPECIES_WAILORD] = _("WAILORD"),
[SPECIES_SKITTY] = _("SKITTY"),
[SPECIES_DELCATTY] = _("DELCATTY"),
[SPECIES_KECLEON] = _("KECLEON"),
[SPECIES_BALTOY] = _("BALTOY"),
[SPECIES_CLAYDOL] = _("CLAYDOL"),
[SPECIES_NOSEPASS] = _("NOSEPASS"),
[SPECIES_TORKOAL] = _("TORKOAL"),
[SPECIES_SABLEYE] = _("SABLEYE"),
[SPECIES_BARBOACH] = _("BARBOACH"),
[SPECIES_WHISCASH] = _("WHISCASH"),
[SPECIES_LUVDISC] = _("LUVDISC"),
[SPECIES_CORPHISH] = _("CORPHISH"),
[SPECIES_CRAWDAUNT] = _("CRAWDAUNT"),
[SPECIES_FEEBAS] = _("FEEBAS"),
[SPECIES_MILOTIC] = _("MILOTIC"),
[SPECIES_CARVANHA] = _("CARVANHA"),
[SPECIES_SHARPEDO] = _("SHARPEDO"),
[SPECIES_TRAPINCH] = _("TRAPINCH"),
[SPECIES_VIBRAVA] = _("VIBRAVA"),
[SPECIES_FLYGON] = _("FLYGON"),
[SPECIES_MAKUHITA] = _("MAKUHITA"),
[SPECIES_HARIYAMA] = _("HARIYAMA"),
[SPECIES_ELECTRIKE] = _("ELECTRIKE"),
[SPECIES_MANECTRIC] = _("MANECTRIC"),
[SPECIES_NUMEL] = _("NUMEL"),
[SPECIES_CAMERUPT] = _("CAMERUPT"),
[SPECIES_SPHEAL] = _("SPHEAL"),
[SPECIES_SEALEO] = _("SEALEO"),
[SPECIES_WALREIN] = _("WALREIN"),
[SPECIES_CACNEA] = _("CACNEA"),
[SPECIES_CACTURNE] = _("CACTURNE"),
[SPECIES_SNORUNT] = _("SNORUNT"),
[SPECIES_GLALIE] = _("GLALIE"),
[SPECIES_LUNATONE] = _("LUNATONE"),
[SPECIES_SOLROCK] = _("SOLROCK"),
[SPECIES_AZURILL] = _("AZURILL"),
[SPECIES_SPOINK] = _("SPOINK"),
[SPECIES_GRUMPIG] = _("GRUMPIG"),
[SPECIES_PLUSLE] = _("PLUSLE"),
[SPECIES_MINUN] = _("MINUN"),
[SPECIES_MAWILE] = _("MAWILE"),
[SPECIES_MEDITITE] = _("MEDITITE"),
[SPECIES_MEDICHAM] = _("MEDICHAM"),
[SPECIES_SWABLU] = _("SWABLU"),
[SPECIES_ALTARIA] = _("ALTARIA"),
[SPECIES_WYNAUT] = _("WYNAUT"),
[SPECIES_DUSKULL] = _("DUSKULL"),
[SPECIES_DUSCLOPS] = _("DUSCLOPS"),
[SPECIES_ROSELIA] = _("ROSELIA"),
[SPECIES_SLAKOTH] = _("SLAKOTH"),
[SPECIES_VIGOROTH] = _("VIGOROTH"),
[SPECIES_SLAKING] = _("SLAKING"),
[SPECIES_GULPIN] = _("GULPIN"),
[SPECIES_SWALOT] = _("SWALOT"),
[SPECIES_TROPIUS] = _("TROPIUS"),
[SPECIES_WHISMUR] = _("WHISMUR"),
[SPECIES_LOUDRED] = _("LOUDRED"),
[SPECIES_EXPLOUD] = _("EXPLOUD"),
[SPECIES_CLAMPERL] = _("CLAMPERL"),
[SPECIES_HUNTAIL] = _("HUNTAIL"),
[SPECIES_GOREBYSS] = _("GOREBYSS"),
[SPECIES_ABSOL] = _("ABSOL"),
[SPECIES_SHUPPET] = _("SHUPPET"),
[SPECIES_BANETTE] = _("BANETTE"),
[SPECIES_SEVIPER] = _("SEVIPER"),
[SPECIES_ZANGOOSE] = _("ZANGOOSE"),
[SPECIES_RELICANTH] = _("RELICANTH"),
[SPECIES_ARON] = _("ARON"),
[SPECIES_LAIRON] = _("LAIRON"),
[SPECIES_AGGRON] = _("AGGRON"),
[SPECIES_CASTFORM] = _("CASTFORM"),
[SPECIES_VOLBEAT] = _("VOLBEAT"),
[SPECIES_ILLUMISE] = _("ILLUMISE"),
[SPECIES_LILEEP] = _("LILEEP"),
[SPECIES_CRADILY] = _("CRADILY"),
[SPECIES_ANORITH] = _("ANORITH"),
[SPECIES_ARMALDO] = _("ARMALDO"),
[SPECIES_RALTS] = _("RALTS"),
[SPECIES_KIRLIA] = _("KIRLIA"),
[SPECIES_GARDEVOIR] = _("GARDEVOIR"),
[SPECIES_BAGON] = _("BAGON"),
[SPECIES_SHELGON] = _("SHELGON"),
[SPECIES_SALAMENCE] = _("SALAMENCE"),
[SPECIES_BELDUM] = _("BELDUM"),
[SPECIES_METANG] = _("METANG"),
[SPECIES_METAGROSS] = _("METAGROSS"),
[SPECIES_REGIROCK] = _("REGIROCK"),
[SPECIES_REGICE] = _("REGICE"),
[SPECIES_REGISTEEL] = _("REGISTEEL"),
[SPECIES_KYOGRE] = _("KYOGRE"),
[SPECIES_GROUDON] = _("GROUDON"),
[SPECIES_RAYQUAZA] = _("RAYQUAZA"),
[SPECIES_LATIAS] = _("LATIAS"),
[SPECIES_LATIOS] = _("LATIOS"),
[SPECIES_JIRACHI] = _("JIRACHI"),
[SPECIES_DEOXYS] = _("DEOXYS"),
[SPECIES_CHIMECHO] = _("CHIMECHO"),
[SPECIES_BULBASAUR] = _("Bulbasaur"),
[SPECIES_IVYSAUR] = _("Ivysaur"),
[SPECIES_VENUSAUR] = _("Venusaur"),
[SPECIES_CHARMANDER] = _("Charmander"),
[SPECIES_CHARMELEON] = _("Charmeleon"),
[SPECIES_CHARIZARD] = _("Charizard"),
[SPECIES_SQUIRTLE] = _("Squirtle"),
[SPECIES_WARTORTLE] = _("Wartortle"),
[SPECIES_BLASTOISE] = _("Blastoise"),
[SPECIES_CATERPIE] = _("Caterpie"),
[SPECIES_METAPOD] = _("Metapod"),
[SPECIES_BUTTERFREE] = _("Butterfree"),
[SPECIES_WEEDLE] = _("Weedle"),
[SPECIES_KAKUNA] = _("Kakuna"),
[SPECIES_BEEDRILL] = _("Beedrill"),
[SPECIES_PIDGEY] = _("Pidgey"),
[SPECIES_PIDGEOTTO] = _("Pidgeotto"),
[SPECIES_PIDGEOT] = _("Pidgeot"),
[SPECIES_RATTATA] = _("Rattata"),
[SPECIES_RATICATE] = _("Raticate"),
[SPECIES_SPEAROW] = _("Spearow"),
[SPECIES_FEAROW] = _("Fearow"),
[SPECIES_EKANS] = _("Ekans"),
[SPECIES_ARBOK] = _("Arbok"),
[SPECIES_PIKACHU] = _("Pikachu"),
[SPECIES_RAICHU] = _("Raichu"),
[SPECIES_SANDSHREW] = _("Sandshrew"),
[SPECIES_SANDSLASH] = _("Sandslash"),
[SPECIES_NIDORAN_F] = _("Nidoran♀"),
[SPECIES_NIDORINA] = _("Nidorina"),
[SPECIES_NIDOQUEEN] = _("Nidoqueen"),
[SPECIES_NIDORAN_M] = _("Nidoran♂"),
[SPECIES_NIDORINO] = _("Nidorino"),
[SPECIES_NIDOKING] = _("Nidoking"),
[SPECIES_CLEFAIRY] = _("Clefairy"),
[SPECIES_CLEFABLE] = _("Clefable"),
[SPECIES_VULPIX] = _("Vulpix"),
[SPECIES_NINETALES] = _("Ninetales"),
[SPECIES_JIGGLYPUFF] = _("Jigglypuff"),
[SPECIES_WIGGLYTUFF] = _("Wigglytuff"),
[SPECIES_ZUBAT] = _("Zubat"),
[SPECIES_GOLBAT] = _("Golbat"),
[SPECIES_ODDISH] = _("Oddish"),
[SPECIES_GLOOM] = _("Gloom"),
[SPECIES_VILEPLUME] = _("Vileplume"),
[SPECIES_PARAS] = _("Paras"),
[SPECIES_PARASECT] = _("Parasect"),
[SPECIES_VENONAT] = _("Venonat"),
[SPECIES_VENOMOTH] = _("Venomoth"),
[SPECIES_DIGLETT] = _("Diglett"),
[SPECIES_DUGTRIO] = _("Dugtrio"),
[SPECIES_MEOWTH] = _("Meowth"),
[SPECIES_PERSIAN] = _("Persian"),
[SPECIES_PSYDUCK] = _("Psyduck"),
[SPECIES_GOLDUCK] = _("Golduck"),
[SPECIES_MANKEY] = _("Mankey"),
[SPECIES_PRIMEAPE] = _("Primeape"),
[SPECIES_GROWLITHE] = _("Growlithe"),
[SPECIES_ARCANINE] = _("Arcanine"),
[SPECIES_POLIWAG] = _("Poliwag"),
[SPECIES_POLIWHIRL] = _("Poliwhirl"),
[SPECIES_POLIWRATH] = _("Poliwrath"),
[SPECIES_ABRA] = _("Abra"),
[SPECIES_KADABRA] = _("Kadabra"),
[SPECIES_ALAKAZAM] = _("Alakazam"),
[SPECIES_MACHOP] = _("Machop"),
[SPECIES_MACHOKE] = _("Machoke"),
[SPECIES_MACHAMP] = _("Machamp"),
[SPECIES_BELLSPROUT] = _("Bellsprout"),
[SPECIES_WEEPINBELL] = _("Weepinbell"),
[SPECIES_VICTREEBEL] = _("Victreebel"),
[SPECIES_TENTACOOL] = _("Tentacool"),
[SPECIES_TENTACRUEL] = _("Tentacruel"),
[SPECIES_GEODUDE] = _("Geodude"),
[SPECIES_GRAVELER] = _("Graveler"),
[SPECIES_GOLEM] = _("Golem"),
[SPECIES_PONYTA] = _("Ponyta"),
[SPECIES_RAPIDASH] = _("Rapidash"),
[SPECIES_SLOWPOKE] = _("Slowpoke"),
[SPECIES_SLOWBRO] = _("Slowbro"),
[SPECIES_MAGNEMITE] = _("Magnemite"),
[SPECIES_MAGNETON] = _("Magneton"),
[SPECIES_FARFETCHD] = _("Farfetch'd"),
[SPECIES_DODUO] = _("Doduo"),
[SPECIES_DODRIO] = _("Dodrio"),
[SPECIES_SEEL] = _("Seel"),
[SPECIES_DEWGONG] = _("Dewgong"),
[SPECIES_GRIMER] = _("Grimer"),
[SPECIES_MUK] = _("Muk"),
[SPECIES_SHELLDER] = _("Shellder"),
[SPECIES_CLOYSTER] = _("Cloyster"),
[SPECIES_GASTLY] = _("Gastly"),
[SPECIES_HAUNTER] = _("Haunter"),
[SPECIES_GENGAR] = _("Gengar"),
[SPECIES_ONIX] = _("Onix"),
[SPECIES_DROWZEE] = _("Drowzee"),
[SPECIES_HYPNO] = _("Hypno"),
[SPECIES_KRABBY] = _("Krabby"),
[SPECIES_KINGLER] = _("Kingler"),
[SPECIES_VOLTORB] = _("Voltorb"),
[SPECIES_ELECTRODE] = _("Electrode"),
[SPECIES_EXEGGCUTE] = _("Exeggcute"),
[SPECIES_EXEGGUTOR] = _("Exeggutor"),
[SPECIES_CUBONE] = _("Cubone"),
[SPECIES_MAROWAK] = _("Marowak"),
[SPECIES_HITMONLEE] = _("Hitmonlee"),
[SPECIES_HITMONCHAN] = _("Hitmonchan"),
[SPECIES_LICKITUNG] = _("Lickitung"),
[SPECIES_KOFFING] = _("Koffing"),
[SPECIES_WEEZING] = _("Weezing"),
[SPECIES_RHYHORN] = _("Rhyhorn"),
[SPECIES_RHYDON] = _("Rhydon"),
[SPECIES_CHANSEY] = _("Chansey"),
[SPECIES_TANGELA] = _("Tangela"),
[SPECIES_KANGASKHAN] = _("Kangaskhan"),
[SPECIES_HORSEA] = _("Horsea"),
[SPECIES_SEADRA] = _("Seadra"),
[SPECIES_GOLDEEN] = _("Goldeen"),
[SPECIES_SEAKING] = _("Seaking"),
[SPECIES_STARYU] = _("Staryu"),
[SPECIES_STARMIE] = _("Starmie"),
[SPECIES_MR_MIME] = _("Mr. Mime"),
[SPECIES_SCYTHER] = _("Scyther"),
[SPECIES_JYNX] = _("Jynx"),
[SPECIES_ELECTABUZZ] = _("Electabuzz"),
[SPECIES_MAGMAR] = _("Magmar"),
[SPECIES_PINSIR] = _("Pinsir"),
[SPECIES_TAUROS] = _("Tauros"),
[SPECIES_MAGIKARP] = _("Magikarp"),
[SPECIES_GYARADOS] = _("Gyarados"),
[SPECIES_LAPRAS] = _("Lapras"),
[SPECIES_DITTO] = _("Ditto"),
[SPECIES_EEVEE] = _("Eevee"),
[SPECIES_VAPOREON] = _("Vaporeon"),
[SPECIES_JOLTEON] = _("Jolteon"),
[SPECIES_FLAREON] = _("Flareon"),
[SPECIES_PORYGON] = _("Porygon"),
[SPECIES_OMANYTE] = _("Omanyte"),
[SPECIES_OMASTAR] = _("Omastar"),
[SPECIES_KABUTO] = _("Kabuto"),
[SPECIES_KABUTOPS] = _("Kabutops"),
[SPECIES_AERODACTYL] = _("Aerodactyl"),
[SPECIES_SNORLAX] = _("Snorlax"),
[SPECIES_ARTICUNO] = _("Articuno"),
[SPECIES_ZAPDOS] = _("Zapdos"),
[SPECIES_MOLTRES] = _("Moltres"),
[SPECIES_DRATINI] = _("Dratini"),
[SPECIES_DRAGONAIR] = _("Dragonair"),
[SPECIES_DRAGONITE] = _("Dragonite"),
[SPECIES_MEWTWO] = _("Mewtwo"),
[SPECIES_MEW] = _("Mew"),
[SPECIES_CHIKORITA] = _("Chikorita"),
[SPECIES_BAYLEEF] = _("Bayleef"),
[SPECIES_MEGANIUM] = _("Meganium"),
[SPECIES_CYNDAQUIL] = _("Cyndaquil"),
[SPECIES_QUILAVA] = _("Quilava"),
[SPECIES_TYPHLOSION] = _("Typhlosion"),
[SPECIES_TOTODILE] = _("Totodile"),
[SPECIES_CROCONAW] = _("Croconaw"),
[SPECIES_FERALIGATR] = _("Feraligatr"),
[SPECIES_SENTRET] = _("Sentret"),
[SPECIES_FURRET] = _("Furret"),
[SPECIES_HOOTHOOT] = _("Hoothoot"),
[SPECIES_NOCTOWL] = _("Noctowl"),
[SPECIES_LEDYBA] = _("Ledyba"),
[SPECIES_LEDIAN] = _("Ledian"),
[SPECIES_SPINARAK] = _("Spinarak"),
[SPECIES_ARIADOS] = _("Ariados"),
[SPECIES_CROBAT] = _("Crobat"),
[SPECIES_CHINCHOU] = _("Chinchou"),
[SPECIES_LANTURN] = _("Lanturn"),
[SPECIES_PICHU] = _("Pichu"),
[SPECIES_CLEFFA] = _("Cleffa"),
[SPECIES_IGGLYBUFF] = _("Igglybuff"),
[SPECIES_TOGEPI] = _("Togepi"),
[SPECIES_TOGETIC] = _("Togetic"),
[SPECIES_NATU] = _("Natu"),
[SPECIES_XATU] = _("Xatu"),
[SPECIES_MAREEP] = _("Mareep"),
[SPECIES_FLAAFFY] = _("Flaaffy"),
[SPECIES_AMPHAROS] = _("Ampharos"),
[SPECIES_BELLOSSOM] = _("Bellossom"),
[SPECIES_MARILL] = _("Marill"),
[SPECIES_AZUMARILL] = _("Azumarill"),
[SPECIES_SUDOWOODO] = _("Sudowoodo"),
[SPECIES_POLITOED] = _("Politoed"),
[SPECIES_HOPPIP] = _("Hoppip"),
[SPECIES_SKIPLOOM] = _("Skiploom"),
[SPECIES_JUMPLUFF] = _("Jumpluff"),
[SPECIES_AIPOM] = _("Aipom"),
[SPECIES_SUNKERN] = _("Sunkern"),
[SPECIES_SUNFLORA] = _("Sunflora"),
[SPECIES_YANMA] = _("Yanma"),
[SPECIES_WOOPER] = _("Wooper"),
[SPECIES_QUAGSIRE] = _("Quagsire"),
[SPECIES_ESPEON] = _("Espeon"),
[SPECIES_UMBREON] = _("Umbreon"),
[SPECIES_MURKROW] = _("Murkrow"),
[SPECIES_SLOWKING] = _("Slowking"),
[SPECIES_MISDREAVUS] = _("Misdreavus"),
[SPECIES_UNOWN] = _("Unown"),
[SPECIES_WOBBUFFET] = _("Wobbuffet"),
[SPECIES_GIRAFARIG] = _("Girafarig"),
[SPECIES_PINECO] = _("Pineco"),
[SPECIES_FORRETRESS] = _("Forretress"),
[SPECIES_DUNSPARCE] = _("Dunsparce"),
[SPECIES_GLIGAR] = _("Gligar"),
[SPECIES_STEELIX] = _("Steelix"),
[SPECIES_SNUBBULL] = _("Snubbull"),
[SPECIES_GRANBULL] = _("Granbull"),
[SPECIES_QWILFISH] = _("Qwilfish"),
[SPECIES_SCIZOR] = _("Scizor"),
[SPECIES_SHUCKLE] = _("Shuckle"),
[SPECIES_HERACROSS] = _("Heracross"),
[SPECIES_SNEASEL] = _("Sneasel"),
[SPECIES_TEDDIURSA] = _("Teddiursa"),
[SPECIES_URSARING] = _("Ursaring"),
[SPECIES_SLUGMA] = _("Slugma"),
[SPECIES_MAGCARGO] = _("Magcargo"),
[SPECIES_SWINUB] = _("Swinub"),
[SPECIES_PILOSWINE] = _("Piloswine"),
[SPECIES_CORSOLA] = _("Corsola"),
[SPECIES_REMORAID] = _("Remoraid"),
[SPECIES_OCTILLERY] = _("Octillery"),
[SPECIES_DELIBIRD] = _("Delibird"),
[SPECIES_MANTINE] = _("Mantine"),
[SPECIES_SKARMORY] = _("Skarmory"),
[SPECIES_HOUNDOUR] = _("Houndour"),
[SPECIES_HOUNDOOM] = _("Houndoom"),
[SPECIES_KINGDRA] = _("Kingdra"),
[SPECIES_PHANPY] = _("Phanpy"),
[SPECIES_DONPHAN] = _("Donphan"),
[SPECIES_PORYGON2] = _("Porygon2"),
[SPECIES_STANTLER] = _("Stantler"),
[SPECIES_SMEARGLE] = _("Smeargle"),
[SPECIES_TYROGUE] = _("Tyrogue"),
[SPECIES_HITMONTOP] = _("Hitmontop"),
[SPECIES_SMOOCHUM] = _("Smoochum"),
[SPECIES_ELEKID] = _("Elekid"),
[SPECIES_MAGBY] = _("Magby"),
[SPECIES_MILTANK] = _("Miltank"),
[SPECIES_BLISSEY] = _("Blissey"),
[SPECIES_RAIKOU] = _("Raikou"),
[SPECIES_ENTEI] = _("Entei"),
[SPECIES_SUICUNE] = _("Suicune"),
[SPECIES_LARVITAR] = _("Larvitar"),
[SPECIES_PUPITAR] = _("Pupitar"),
[SPECIES_TYRANITAR] = _("Tyranitar"),
[SPECIES_LUGIA] = _("Lugia"),
[SPECIES_HO_OH] = _("Ho-Oh"),
[SPECIES_CELEBI] = _("Celebi"),
[SPECIES_TREECKO] = _("Treecko"),
[SPECIES_GROVYLE] = _("Grovyle"),
[SPECIES_SCEPTILE] = _("Sceptile"),
[SPECIES_TORCHIC] = _("Torchic"),
[SPECIES_COMBUSKEN] = _("Combusken"),
[SPECIES_BLAZIKEN] = _("Blaziken"),
[SPECIES_MUDKIP] = _("Mudkip"),
[SPECIES_MARSHTOMP] = _("Marshtomp"),
[SPECIES_SWAMPERT] = _("Swampert"),
[SPECIES_POOCHYENA] = _("Poochyena"),
[SPECIES_MIGHTYENA] = _("Mightyena"),
[SPECIES_ZIGZAGOON] = _("Zigzagoon"),
[SPECIES_LINOONE] = _("Linoone"),
[SPECIES_WURMPLE] = _("Wurmple"),
[SPECIES_SILCOON] = _("Silcoon"),
[SPECIES_BEAUTIFLY] = _("Beautifly"),
[SPECIES_CASCOON] = _("Cascoon"),
[SPECIES_DUSTOX] = _("Dustox"),
[SPECIES_LOTAD] = _("Lotad"),
[SPECIES_LOMBRE] = _("Lombre"),
[SPECIES_LUDICOLO] = _("Ludicolo"),
[SPECIES_SEEDOT] = _("Seedot"),
[SPECIES_NUZLEAF] = _("Nuzleaf"),
[SPECIES_SHIFTRY] = _("Shiftry"),
[SPECIES_TAILLOW] = _("Taillow"),
[SPECIES_SWELLOW] = _("Swellow"),
[SPECIES_WINGULL] = _("Wingull"),
[SPECIES_PELIPPER] = _("Pelipper"),
[SPECIES_RALTS] = _("Ralts"),
[SPECIES_KIRLIA] = _("Kirlia"),
[SPECIES_GARDEVOIR] = _("Gardevoir"),
[SPECIES_SURSKIT] = _("Surskit"),
[SPECIES_MASQUERAIN] = _("Masquerain"),
[SPECIES_SHROOMISH] = _("Shroomish"),
[SPECIES_BRELOOM] = _("Breloom"),
[SPECIES_SLAKOTH] = _("Slakoth"),
[SPECIES_VIGOROTH] = _("Vigoroth"),
[SPECIES_SLAKING] = _("Slaking"),
[SPECIES_NINCADA] = _("Nincada"),
[SPECIES_NINJASK] = _("Ninjask"),
[SPECIES_SHEDINJA] = _("Shedinja"),
[SPECIES_WHISMUR] = _("Whismur"),
[SPECIES_LOUDRED] = _("Loudred"),
[SPECIES_EXPLOUD] = _("Exploud"),
[SPECIES_MAKUHITA] = _("Makuhita"),
[SPECIES_HARIYAMA] = _("Hariyama"),
[SPECIES_AZURILL] = _("Azurill"),
[SPECIES_NOSEPASS] = _("Nosepass"),
[SPECIES_SKITTY] = _("Skitty"),
[SPECIES_DELCATTY] = _("Delcatty"),
[SPECIES_SABLEYE] = _("Sableye"),
[SPECIES_MAWILE] = _("Mawile"),
[SPECIES_ARON] = _("Aron"),
[SPECIES_LAIRON] = _("Lairon"),
[SPECIES_AGGRON] = _("Aggron"),
[SPECIES_MEDITITE] = _("Meditite"),
[SPECIES_MEDICHAM] = _("Medicham"),
[SPECIES_ELECTRIKE] = _("Electrike"),
[SPECIES_MANECTRIC] = _("Manectric"),
[SPECIES_PLUSLE] = _("Plusle"),
[SPECIES_MINUN] = _("Minun"),
[SPECIES_VOLBEAT] = _("Volbeat"),
[SPECIES_ILLUMISE] = _("Illumise"),
[SPECIES_ROSELIA] = _("Roselia"),
[SPECIES_GULPIN] = _("Gulpin"),
[SPECIES_SWALOT] = _("Swalot"),
[SPECIES_CARVANHA] = _("Carvanha"),
[SPECIES_SHARPEDO] = _("Sharpedo"),
[SPECIES_WAILMER] = _("Wailmer"),
[SPECIES_WAILORD] = _("Wailord"),
[SPECIES_NUMEL] = _("Numel"),
[SPECIES_CAMERUPT] = _("Camerupt"),
[SPECIES_TORKOAL] = _("Torkoal"),
[SPECIES_SPOINK] = _("Spoink"),
[SPECIES_GRUMPIG] = _("Grumpig"),
[SPECIES_SPINDA] = _("Spinda"),
[SPECIES_TRAPINCH] = _("Trapinch"),
[SPECIES_VIBRAVA] = _("Vibrava"),
[SPECIES_FLYGON] = _("Flygon"),
[SPECIES_CACNEA] = _("Cacnea"),
[SPECIES_CACTURNE] = _("Cacturne"),
[SPECIES_SWABLU] = _("Swablu"),
[SPECIES_ALTARIA] = _("Altaria"),
[SPECIES_ZANGOOSE] = _("Zangoose"),
[SPECIES_SEVIPER] = _("Seviper"),
[SPECIES_LUNATONE] = _("Lunatone"),
[SPECIES_SOLROCK] = _("Solrock"),
[SPECIES_BARBOACH] = _("Barboach"),
[SPECIES_WHISCASH] = _("Whiscash"),
[SPECIES_CORPHISH] = _("Corphish"),
[SPECIES_CRAWDAUNT] = _("Crawdaunt"),
[SPECIES_BALTOY] = _("Baltoy"),
[SPECIES_CLAYDOL] = _("Claydol"),
[SPECIES_LILEEP] = _("Lileep"),
[SPECIES_CRADILY] = _("Cradily"),
[SPECIES_ANORITH] = _("Anorith"),
[SPECIES_ARMALDO] = _("Armaldo"),
[SPECIES_FEEBAS] = _("Feebas"),
[SPECIES_MILOTIC] = _("Milotic"),
[SPECIES_CASTFORM] = _("Castform"),
[SPECIES_KECLEON] = _("Kecleon"),
[SPECIES_SHUPPET] = _("Shuppet"),
[SPECIES_BANETTE] = _("Banette"),
[SPECIES_DUSKULL] = _("Duskull"),
[SPECIES_DUSCLOPS] = _("Dusclops"),
[SPECIES_TROPIUS] = _("Tropius"),
[SPECIES_CHIMECHO] = _("Chimecho"),
[SPECIES_ABSOL] = _("Absol"),
[SPECIES_WYNAUT] = _("Wynaut"),
[SPECIES_SNORUNT] = _("Snorunt"),
[SPECIES_GLALIE] = _("Glalie"),
[SPECIES_SPHEAL] = _("Spheal"),
[SPECIES_SEALEO] = _("Sealeo"),
[SPECIES_WALREIN] = _("Walrein"),
[SPECIES_CLAMPERL] = _("Clamperl"),
[SPECIES_HUNTAIL] = _("Huntail"),
[SPECIES_GOREBYSS] = _("Gorebyss"),
[SPECIES_RELICANTH] = _("Relicanth"),
[SPECIES_LUVDISC] = _("Luvdisc"),
[SPECIES_BAGON] = _("Bagon"),
[SPECIES_SHELGON] = _("Shelgon"),
[SPECIES_SALAMENCE] = _("Salamence"),
[SPECIES_BELDUM] = _("Beldum"),
[SPECIES_METANG] = _("Metang"),
[SPECIES_METAGROSS] = _("Metagross"),
[SPECIES_REGIROCK] = _("Regirock"),
[SPECIES_REGICE] = _("Regice"),
[SPECIES_REGISTEEL] = _("Registeel"),
[SPECIES_LATIAS] = _("Latias"),
[SPECIES_LATIOS] = _("Latios"),
[SPECIES_KYOGRE] = _("Kyogre"),
[SPECIES_GROUDON] = _("Groudon"),
[SPECIES_RAYQUAZA] = _("Rayquaza"),
[SPECIES_JIRACHI] = _("Jirachi"),
[SPECIES_DEOXYS] = _("Deoxys"),
[SPECIES_TURTWIG] = _("Turtwig"),
[SPECIES_GROTLE] = _("Grotle"),
[SPECIES_TORTERRA] = _("Torterra"),

101
src/pokemon.c
View File

@ -1770,7 +1770,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_QUILLADIN - 1] = 0x00,
[SPECIES_CHESNAUGHT - 1] = 0x19,
[SPECIES_FENNEKIN - 1] = 0x00,
[SPECIES_BRAIXEN - 1] = 0x21,
[SPECIES_BRAIXEN - 1] = 0x90,
[SPECIES_DELPHOX - 1] = 0x17,
[SPECIES_FROAKIE - 1] = 0x32,
[SPECIES_FROGADIER - 1] = 0x00,
@ -1821,7 +1821,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_DEDENNE - 1] = 0x52,
[SPECIES_CARBINK - 1] = 0x0d,
[SPECIES_GOOMY - 1] = 0x01,
[SPECIES_SLIGGOO - 1] = 0x3e,
[SPECIES_SLIGGOO - 1] = 0x6e,
[SPECIES_GOODRA - 1] = 0x10,
[SPECIES_KLEFKI - 1] = 0x0d,
[SPECIES_PHANTUMP - 1] = 0x1c,
@ -1831,13 +1831,101 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_BERGMITE - 1] = 0x10,
[SPECIES_AVALUGG - 1] = 0x2f,
[SPECIES_NOIBAT - 1] = 0x51,
[SPECIES_NOIVERN - 1] = 0x32,
[SPECIES_NOIVERN - 1] = 0x09,
[SPECIES_XERNEAS - 1] = 0x23,
[SPECIES_YVELTAL - 1] = 0x15,
[SPECIES_ZYGARDE - 1] = 0x0f,
[SPECIES_YVELTAL - 1] = 0x97,
[SPECIES_ZYGARDE - 1] = 0x09,
[SPECIES_DIANCIE - 1] = 0x0d,
[SPECIES_HOOPA - 1] = 0x51,
[SPECIES_HOOPA - 1] = 0x4b,
[SPECIES_VOLCANION - 1] = 0x10,
// Gen 7 animations
[SPECIES_ROWLET - 1] = 0x00,
[SPECIES_DARTRIX - 1] = 0x16,
[SPECIES_DECIDUEYE - 1] = 0x2,
[SPECIES_LITTEN - 1] = 0x16,
[SPECIES_TORRACAT - 1] = 0x17,
[SPECIES_INCINEROAR - 1] = 0x10,
[SPECIES_POPPLIO - 1] = 0x45,
[SPECIES_BRIONNE - 1] = 0x13,
[SPECIES_PRIMARINA - 1] = 0x96,
[SPECIES_PIKIPEK - 1] = 0x52,
[SPECIES_TRUMBEAK - 1] = 0x16,
[SPECIES_TOUCANNON - 1] = 0x85,
[SPECIES_YUNGOOS - 1] = 0x17,
[SPECIES_GUMSHOOS - 1] = 0x0f,
[SPECIES_GRUBBIN - 1] = 0x03,
[SPECIES_CHARJABUG - 1] = 0x8d,
[SPECIES_VIKAVOLT - 1] = 0x02,
[SPECIES_CRABRAWLER - 1] = 0x10,
[SPECIES_CRABOMINABLE - 1] = 0x85,
[SPECIES_ORICORIO - 1] = 0x80,
[SPECIES_CUTIEFLY - 1] = 0x1c,
[SPECIES_RIBOMBEE - 1] = 0x7e,
[SPECIES_ROCKRUFF - 1] = 0x17,
[SPECIES_LYCANROC - 1] = 0x10,
[SPECIES_WISHIWASHI - 1] = 0x51,
[SPECIES_MAREANIE - 1] = 0x24,
[SPECIES_TOXAPEX - 1] = 0x99,
[SPECIES_MUDBRAY - 1] = 0x10,
[SPECIES_MUDSDALE - 1] = 0x19,
[SPECIES_DEWPIDER - 1] = 0x13,
[SPECIES_ARAQUANID - 1] = 0x0f,
[SPECIES_FOMANTIS - 1] = 0x45,
[SPECIES_LURANTIS - 1] = 0x09,
[SPECIES_MORELULL - 1] = 0x8c,
[SPECIES_SHIINOTIC - 1] = 0x98,
[SPECIES_SALANDIT - 1] = 0x90,
[SPECIES_SALAZZLE - 1] = 0x09,
[SPECIES_STUFFUL - 1] = 0x16,
[SPECIES_BEWEAR - 1] = 0x16,
[SPECIES_BOUNSWEET - 1] = 0x0,
[SPECIES_STEENEE - 1] = 0x0,
[SPECIES_TSAREENA - 1] = 0x13,
[SPECIES_COMFEY - 1] = 0x1d,
[SPECIES_ORANGURU - 1] = 0x13,
[SPECIES_PASSIMIAN - 1] = 0x10,
[SPECIES_WIMPOD - 1] = 0x67,
[SPECIES_GOLISOPOD - 1] = 0x85,
[SPECIES_SANDYGAST - 1] = 0x01,
[SPECIES_PALOSSAND - 1] = 0x02,
[SPECIES_PYUKUMUKU - 1] = 0x00,
[SPECIES_TYPE_NULL - 1] = 0x0f,
[SPECIES_SILVALLY - 1] = 0x10,
[SPECIES_MINIOR - 1] = 0x54,
[SPECIES_KOMALA - 1] = 0x82,
[SPECIES_TURTONATOR - 1] = 0x8f,
[SPECIES_TOGEDEMARU - 1] = 0x8c,
[SPECIES_MIMIKYU - 1] = 0x30,
[SPECIES_BRUXISH - 1] = 0x18,
[SPECIES_DRAMPA - 1] = 0x10,
[SPECIES_DHELMISE - 1] = 0xd,
[SPECIES_JANGMO_O - 1] = 0x16,
[SPECIES_HAKAMO_O - 1] = 0x16,
[SPECIES_KOMMO_O - 1] = 0x19,
[SPECIES_TAPU_KOKO - 1] = 0x6a,
[SPECIES_TAPU_LELE - 1] = 0x51,
[SPECIES_TAPU_BULU - 1] = 0x19,
[SPECIES_TAPU_FINI - 1] = 0x96,
[SPECIES_COSMOG - 1] = 0x32,
[SPECIES_COSMOEM - 1] = 0x18,
[SPECIES_SOLGALEO - 1] = 0x09,
[SPECIES_LUNALA - 1] = 0x11,
[SPECIES_NIHILEGO - 1] = 0x01,
[SPECIES_BUZZWOLE - 1] = 0x85,
[SPECIES_PHEROMOSA - 1] = 0x13,
[SPECIES_XURKITREE - 1] = 0x8b,
[SPECIES_CELESTEELA - 1] = 0x65,
[SPECIES_KARTANA - 1] = 0x02,
[SPECIES_GUZZLORD - 1] = 0x85,
[SPECIES_NECROZMA - 1] = 0x09,
[SPECIES_MAGEARNA - 1] = 0x46,
[SPECIES_MARSHADOW - 1] = 0x10,
[SPECIES_POIPOLE - 1] = 0x99,
[SPECIES_NAGANADEL - 1] = 0x6a,
[SPECIES_STAKATAKA - 1] = 0x09,
[SPECIES_BLACEPHALON - 1] = 0x8f,
[SPECIES_ZERAORA - 1] = 0x17,
};
static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
@ -1897,6 +1985,7 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
[SPECIES_SALAMENCE - 1] = 0x46,
[SPECIES_KYOGRE - 1] = 0x3c,
[SPECIES_RAYQUAZA - 1] = 0x3c,
[SPECIES_TAPU_FINI - 1] = 0x5,
};
const u8 gPPUpGetMask[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values

77
src/pokemon_animation.c
View File

@ -171,6 +171,9 @@ static void pokemonanimfunc_93(struct Sprite *sprite);
static void pokemonanimfunc_94(struct Sprite *sprite);
static void pokemonanimfunc_95(struct Sprite *sprite);
static void pokemonanimfunc_96(struct Sprite *sprite);
static void pokemonanimfunc_97(struct Sprite *sprite);
static void pokemonanimfunc_98(struct Sprite *sprite);
static void pokemonanimfunc_99(struct Sprite *sprite);
static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite);
@ -750,7 +753,10 @@ static void (* const sMonAnimFunctions[])(struct Sprite *sprite) =
pokemonanimfunc_93,
pokemonanimfunc_94,
pokemonanimfunc_95,
pokemonanimfunc_96
pokemonanimfunc_96,
pokemonanimfunc_97,
pokemonanimfunc_98,
pokemonanimfunc_99
};
// counting from Id 1, because 0 in sSpeciesToBackAnimSet is used for mons with no back animation
@ -2102,13 +2108,13 @@ static void pokemonanimfunc_24(struct Sprite *sprite)
if (sprite->data[2] > 128)
{
BlendPalette(sprite->data[7], 0x10, 0, RGB(24, 0, 24));
BlendPalette(sprite->data[7], 0x10, 0, RGB_PURPLE);
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
else
{
sprite->data[6] = Sin(sprite->data[2], 12);
BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB(24, 0, 24));
BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB_PURPLE);
}
sprite->data[2] += 2;
@ -5399,7 +5405,7 @@ static void BackAnimBlend(struct Sprite *sprite)
{
static const u16 sColors[] =
{
RGB_RED, RGB_GREEN, RGB_BLUE, RGB_BLACK
RGB_RED, RGB_GREEN, RGB_BLUE, RGB_BLACK, RGB_WHITE, RGB_PURPLE
};
if (sprite->data[2] > 127)
@ -5626,6 +5632,69 @@ static void pokemonanimfunc_96(struct Sprite *sprite)
sprite->data[2]++;
}
static void pokemonanimfunc_97(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[0] = 80;
sprite->data[5] = 0;
sprite->data[4] = 1;
sprite->data[3] = 0;
sprite->data[1] = 3;
}
if (sprite->data[2] % 2 == 0)
BackAnimBlend(sprite);
if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
sub_8184934(sprite);
sprite->data[2]++;
}
static void pokemonanimfunc_98(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[0] = 80;
sprite->data[5] = 0;
sprite->data[4] = 1;
sprite->data[3] = 0;
sprite->data[1] = 4;
}
if (sprite->data[2] % 2 == 0)
BackAnimBlend(sprite);
if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
sub_8184934(sprite);
sprite->data[2]++;
}
static void pokemonanimfunc_99(struct Sprite *sprite)
{
if (sprite->data[2] == 0)
{
sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
sprite->data[0] = 80;
sprite->data[5] = 0;
sprite->data[4] = 1;
sprite->data[3] = 0;
sprite->data[1] = 5;
}
if (sprite->data[2] % 2 == 0)
BackAnimBlend(sprite);
if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
sub_8184934(sprite);
sprite->data[2]++;
}
static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite)
{
if (sprite->animEnded)