Add Burmy Wormadam form gfx and data

This commit is contained in:
DizzyEggg 2019-04-07 14:39:11 +02:00
parent c090f6cda9
commit 51bb713aef
48 changed files with 358 additions and 32 deletions

View File

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 798 B

View File

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 589 B

View File

Before

Width:  |  Height:  |  Size: 514 B

After

Width:  |  Height:  |  Size: 514 B

View File

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 517 B

View File

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 310 B

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 845 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 533 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

View File

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

View File

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

View File

Before

Width:  |  Height:  |  Size: 936 B

After

Width:  |  Height:  |  Size: 936 B

View File

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 647 B

View File

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
88 88 96
56 56 56
136 136 120
56 48 24
168 136 88
120 88 48
176 160 112
248 248 248
160 64 56
232 208 136
96 96 80
232 112 88
120 120 88
0 0 0

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 938 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 575 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

View File

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

View File

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

View File

@ -860,9 +860,14 @@
#define SPECIES_MEGA_SALAMENCE 854
#define SPECIES_MEGA_BEEDRILL 855
// TODO: forms
#define SPECIES_EGG 856
#define SPECIES_BURMY_SANDY 856
#define SPECIES_BURMY_TRASH 857
#define SPECIES_WORMADAM_SANDY 858
#define SPECIES_WORMADAM_TRASH 859
// TODO: forms
#define SPECIES_EGG 860
#define NUM_SPECIES SPECIES_EGG
// Unown forms, not actual species

View File

@ -476,8 +476,12 @@ extern const u32 gMonFrontPic_Cranidos[];
extern const u32 gMonFrontPic_Rampardos[];
extern const u32 gMonFrontPic_Shieldon[];
extern const u32 gMonFrontPic_Bastiodon[];
extern const u32 gMonFrontPic_Burmy[];
extern const u32 gMonFrontPic_Wormadam[];
extern const u32 gMonFrontPic_BurmyPlant[];
extern const u32 gMonFrontPic_BurmySandy[];
extern const u32 gMonFrontPic_BurmyTrash[];
extern const u32 gMonFrontPic_WormadamPlant[];
extern const u32 gMonFrontPic_WormadamSandy[];
extern const u32 gMonFrontPic_WormadamTrash[];
extern const u32 gMonFrontPic_Mothim[];
extern const u32 gMonFrontPic_Combee[];
extern const u32 gMonFrontPic_Vespiquen[];
@ -1313,8 +1317,12 @@ extern const u32 gMonBackPic_Cranidos[];
extern const u32 gMonBackPic_Rampardos[];
extern const u32 gMonBackPic_Shieldon[];
extern const u32 gMonBackPic_Bastiodon[];
extern const u32 gMonBackPic_Burmy[];
extern const u32 gMonBackPic_Wormadam[];
extern const u32 gMonBackPic_BurmyPlant[];
extern const u32 gMonBackPic_BurmySandy[];
extern const u32 gMonBackPic_BurmyTrash[];
extern const u32 gMonBackPic_WormadamPlant[];
extern const u32 gMonBackPic_WormadamSandy[];
extern const u32 gMonBackPic_WormadamTrash[];
extern const u32 gMonBackPic_Mothim[];
extern const u32 gMonBackPic_Combee[];
extern const u32 gMonBackPic_Vespiquen[];
@ -2124,8 +2132,12 @@ extern const u32 gMonPalette_Cranidos[];
extern const u32 gMonPalette_Rampardos[];
extern const u32 gMonPalette_Shieldon[];
extern const u32 gMonPalette_Bastiodon[];
extern const u32 gMonPalette_Burmy[];
extern const u32 gMonPalette_Wormadam[];
extern const u32 gMonPalette_BurmyPlant[];
extern const u32 gMonPalette_BurmySandy[];
extern const u32 gMonPalette_BurmyTrash[];
extern const u32 gMonPalette_WormadamPlant[];
extern const u32 gMonPalette_WormadamSandy[];
extern const u32 gMonPalette_WormadamTrash[];
extern const u32 gMonPalette_Mothim[];
extern const u32 gMonPalette_Combee[];
extern const u32 gMonPalette_Vespiquen[];
@ -2934,8 +2946,12 @@ extern const u32 gMonShinyPalette_Cranidos[];
extern const u32 gMonShinyPalette_Rampardos[];
extern const u32 gMonShinyPalette_Shieldon[];
extern const u32 gMonShinyPalette_Bastiodon[];
extern const u32 gMonShinyPalette_Burmy[];
extern const u32 gMonShinyPalette_Wormadam[];
extern const u32 gMonShinyPalette_BurmyPlant[];
extern const u32 gMonShinyPalette_BurmySandy[];
extern const u32 gMonShinyPalette_BurmyTrash[];
extern const u32 gMonShinyPalette_WormadamPlant[];
extern const u32 gMonShinyPalette_WormadamSandy[];
extern const u32 gMonShinyPalette_WormadamTrash[];
extern const u32 gMonShinyPalette_Mothim[];
extern const u32 gMonShinyPalette_Combee[];
extern const u32 gMonShinyPalette_Vespiquen[];
@ -3771,8 +3787,12 @@ extern const u8 gMonIcon_Cranidos[];
extern const u8 gMonIcon_Rampardos[];
extern const u8 gMonIcon_Shieldon[];
extern const u8 gMonIcon_Bastiodon[];
extern const u8 gMonIcon_Burmy[];
extern const u8 gMonIcon_Wormadam[];
extern const u8 gMonIcon_BurmyPlant[];
extern const u8 gMonIcon_BurmySandy[];
extern const u8 gMonIcon_BurmyTrash[];
extern const u8 gMonIcon_WormadamPlant[];
extern const u8 gMonIcon_WormadamSandy[];
extern const u8 gMonIcon_WormadamTrash[];
extern const u8 gMonIcon_Mothim[];
extern const u8 gMonIcon_Combee[];
extern const u8 gMonIcon_Vespiquen[];

View File

@ -439,8 +439,12 @@ const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/anim_f
const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz");
const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/anim_front.4bpp.lz");
const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/anim_front.4bpp.lz");
const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz");
const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz");
const u32 gMonFrontPic_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/anim_front.4bpp.lz");
const u32 gMonFrontPic_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/anim_front.4bpp.lz");
const u32 gMonFrontPic_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/anim_front.4bpp.lz");
const u32 gMonFrontPic_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/anim_front.4bpp.lz");
const u32 gMonFrontPic_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/anim_front.4bpp.lz");
const u32 gMonFrontPic_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/anim_front.4bpp.lz");
const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz");
const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz");
const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz");
@ -1276,8 +1280,12 @@ const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4b
const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz");
const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz");
const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/back.4bpp.lz");
const u32 gMonBackPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz");
const u32 gMonBackPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz");
const u32 gMonBackPic_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/back.4bpp.lz");
const u32 gMonBackPic_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/back.4bpp.lz");
const u32 gMonBackPic_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/back.4bpp.lz");
const u32 gMonBackPic_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/back.4bpp.lz");
const u32 gMonBackPic_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/back.4bpp.lz");
const u32 gMonBackPic_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/back.4bpp.lz");
const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/back.4bpp.lz");
const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.lz");
const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz");
@ -2087,8 +2095,12 @@ const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/normal.
const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/normal.gbapal.lz");
const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/normal.gbapal.lz");
const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/normal.gbapal.lz");
const u32 gMonPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz");
const u32 gMonPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz");
const u32 gMonPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/normal.gbapal.lz");
const u32 gMonPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/normal.gbapal.lz");
const u32 gMonPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/normal.gbapal.lz");
const u32 gMonPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/normal.gbapal.lz");
const u32 gMonPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/normal.gbapal.lz");
const u32 gMonPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/normal.gbapal.lz");
const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz");
const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz");
const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz");
@ -2897,8 +2909,12 @@ const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/sh
const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/shiny.gbapal.lz");
const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/shiny.gbapal.lz");
const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/shiny.gbapal.lz");
const u32 gMonShinyPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz");
const u32 gMonShinyPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz");
const u32 gMonShinyPalette_BurmyPlant[] = INCBIN_U32("graphics/pokemon/burmy/plant/shiny.gbapal.lz");
const u32 gMonShinyPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/shiny.gbapal.lz");
const u32 gMonShinyPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/shiny.gbapal.lz");
const u32 gMonShinyPalette_WormadamPlant[] = INCBIN_U32("graphics/pokemon/wormadam/plant/shiny.gbapal.lz");
const u32 gMonShinyPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/shiny.gbapal.lz");
const u32 gMonShinyPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/shiny.gbapal.lz");
const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz");
const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz");
const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz");
@ -3734,8 +3750,12 @@ const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp");
const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp");
const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp");
const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp");
const u8 gMonIcon_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp");
const u8 gMonIcon_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp");
const u8 gMonIcon_BurmyPlant[] = INCBIN_U8("graphics/pokemon/burmy/plant/icon.4bpp");
const u8 gMonIcon_BurmySandy[] = INCBIN_U8("graphics/pokemon/burmy/sandy/icon.4bpp");
const u8 gMonIcon_BurmyTrash[] = INCBIN_U8("graphics/pokemon/burmy/trash/icon.4bpp");
const u8 gMonIcon_WormadamPlant[] = INCBIN_U8("graphics/pokemon/wormadam/plant/icon.4bpp");
const u8 gMonIcon_WormadamSandy[] = INCBIN_U8("graphics/pokemon/wormadam/sandy/icon.4bpp");
const u8 gMonIcon_WormadamTrash[] = INCBIN_U8("graphics/pokemon/wormadam/trash/icon.4bpp");
const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp");
const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp");
const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp");

View File

@ -10282,6 +10282,54 @@ const struct BaseStats gBaseStats[] =
.bodyColor = BODY_COLOR_GREEN,
},
[SPECIES_BURMY_SANDY] =
{
.baseHP = 40,
.baseAttack = 29,
.baseDefense = 45,
.baseSpeed = 36,
.baseSpAttack = 29,
.baseSpDefense = 45,
.type1 = TYPE_BUG,
.type2 = TYPE_BUG,
.catchRate = 120,
.expYield = 45,
.evYield_SpAttack = 0,
.evYield_SpDefense = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.ability1 = ABILITY_SHED_SKIN,
.bodyColor = BODY_COLOR_GREEN,
},
[SPECIES_BURMY_TRASH] =
{
.baseHP = 40,
.baseAttack = 29,
.baseDefense = 45,
.baseSpeed = 36,
.baseSpAttack = 29,
.baseSpDefense = 45,
.type1 = TYPE_BUG,
.type2 = TYPE_BUG,
.catchRate = 120,
.expYield = 45,
.evYield_SpAttack = 0,
.evYield_SpDefense = 1,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 15,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.ability1 = ABILITY_SHED_SKIN,
.bodyColor = BODY_COLOR_GREEN,
},
[SPECIES_WORMADAM] =
{
.baseHP = 60,
@ -10307,6 +10355,55 @@ const struct BaseStats gBaseStats[] =
.bodyColor = BODY_COLOR_GREEN,
},
[SPECIES_WORMADAM_SANDY] =
{
.baseHP = 60,
.baseAttack = 79,
.baseDefense = 105,
.baseSpeed = 36,
.baseSpAttack = 59,
.baseSpDefense = 85,
.type1 = TYPE_BUG,
.type2 = TYPE_GROUND,
.catchRate = 45,
.expYield = 148,
.evYield_Defense = 2,
.item2 = ITEM_SILVER_POWDER,
.genderRatio = MON_FEMALE,
.eggCycles = 15,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.ability1 = ABILITY_ANTICIPATION,
.bodyColor = BODY_COLOR_BROWN,
},
[SPECIES_WORMADAM_TRASH] =
{
.baseHP = 60,
.baseAttack = 69,
.baseDefense = 95,
.baseSpeed = 36,
.baseSpAttack = 69,
.baseSpDefense = 95,
.type1 = TYPE_BUG,
.type2 = TYPE_STEEL,
.catchRate = 45,
.expYield = 148,
.evYield_Defense = 1,
.evYield_SpDefense = 1,
.item2 = ITEM_SILVER_POWDER,
.genderRatio = MON_FEMALE,
.eggCycles = 15,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.ability1 = ABILITY_ANTICIPATION,
.bodyColor = BODY_COLOR_RED,
},
[SPECIES_MOTHIM] =
{
.baseHP = 70,

View File

@ -268,6 +268,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_SHIELDON] = {{EVO_LEVEL, 30, SPECIES_BASTIODON}},
[SPECIES_BURMY] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
[SPECIES_BURMY_SANDY]= {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
[SPECIES_BURMY_TRASH]= {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH},
{EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}},
[SPECIES_COMBEE] = {{EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}},
[SPECIES_BUIZEL] = {{EVO_LEVEL, 26, SPECIES_FLOATZEL}},
[SPECIES_CHERUBI] = {{EVO_LEVEL, 25, SPECIES_CHERRIM}},

View File

@ -412,8 +412,12 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(RAMPARDOS, gMonBackPic_Rampardos),
SPECIES_SPRITE(SHIELDON, gMonBackPic_Shieldon),
SPECIES_SPRITE(BASTIODON, gMonBackPic_Bastiodon),
SPECIES_SPRITE(BURMY, gMonBackPic_Burmy),
SPECIES_SPRITE(WORMADAM, gMonBackPic_Wormadam),
SPECIES_SPRITE(BURMY, gMonBackPic_BurmyPlant),
SPECIES_SPRITE(BURMY_SANDY, gMonBackPic_BurmySandy),
SPECIES_SPRITE(BURMY_TRASH, gMonBackPic_BurmyTrash),
SPECIES_SPRITE(WORMADAM, gMonBackPic_WormadamPlant),
SPECIES_SPRITE(WORMADAM_SANDY, gMonBackPic_WormadamSandy),
SPECIES_SPRITE(WORMADAM_TRASH, gMonBackPic_WormadamTrash),
SPECIES_SPRITE(MOTHIM, gMonBackPic_Mothim),
SPECIES_SPRITE(COMBEE, gMonBackPic_Combee),
SPECIES_SPRITE(VESPIQUEN, gMonBackPic_Vespiquen),

View File

@ -12426,7 +12426,11 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(SHIELDON),
ANIM_CMD(BASTIODON),
ANIM_CMD(BURMY),
ANIM_CMD_FULL(BURMY_SANDY, sAnims_BURMY),
ANIM_CMD_FULL(BURMY_TRASH, sAnims_BURMY),
ANIM_CMD(WORMADAM),
ANIM_CMD_FULL(WORMADAM_SANDY, sAnims_WORMADAM),
ANIM_CMD_FULL(WORMADAM_TRASH, sAnims_WORMADAM),
ANIM_CMD(MOTHIM),
ANIM_CMD(COMBEE),
ANIM_CMD(VESPIQUEN),

View File

@ -412,8 +412,12 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(RAMPARDOS, gMonFrontPic_Rampardos),
SPECIES_SPRITE(SHIELDON, gMonFrontPic_Shieldon),
SPECIES_SPRITE(BASTIODON, gMonFrontPic_Bastiodon),
SPECIES_SPRITE(BURMY, gMonFrontPic_Burmy),
SPECIES_SPRITE(WORMADAM, gMonFrontPic_Wormadam),
SPECIES_SPRITE(BURMY, gMonFrontPic_BurmyPlant),
SPECIES_SPRITE(BURMY_SANDY, gMonFrontPic_BurmySandy),
SPECIES_SPRITE(BURMY_TRASH, gMonFrontPic_BurmyTrash),
SPECIES_SPRITE(WORMADAM, gMonFrontPic_WormadamPlant),
SPECIES_SPRITE(WORMADAM_SANDY, gMonFrontPic_WormadamSandy),
SPECIES_SPRITE(WORMADAM_TRASH, gMonFrontPic_WormadamTrash),
SPECIES_SPRITE(MOTHIM, gMonFrontPic_Mothim),
SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee),
SPECIES_SPRITE(VESPIQUEN, gMonFrontPic_Vespiquen),

View File

@ -412,8 +412,12 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(RAMPARDOS, gMonPalette_Rampardos),
SPECIES_PAL(SHIELDON, gMonPalette_Shieldon),
SPECIES_PAL(BASTIODON, gMonPalette_Bastiodon),
SPECIES_PAL(BURMY, gMonPalette_Burmy),
SPECIES_PAL(WORMADAM, gMonPalette_Wormadam),
SPECIES_PAL(BURMY, gMonPalette_BurmyPlant),
SPECIES_PAL(BURMY_SANDY, gMonPalette_BurmySandy),
SPECIES_PAL(BURMY_TRASH, gMonPalette_BurmyTrash),
SPECIES_PAL(WORMADAM, gMonPalette_WormadamPlant),
SPECIES_PAL(WORMADAM_SANDY, gMonPalette_WormadamSandy),
SPECIES_PAL(WORMADAM_TRASH, gMonPalette_WormadamTrash),
SPECIES_PAL(MOTHIM, gMonPalette_Mothim),
SPECIES_PAL(COMBEE, gMonPalette_Combee),
SPECIES_PAL(VESPIQUEN, gMonPalette_Vespiquen),

View File

@ -412,8 +412,12 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(RAMPARDOS, gMonShinyPalette_Rampardos),
SPECIES_SHINY_PAL(SHIELDON, gMonShinyPalette_Shieldon),
SPECIES_SHINY_PAL(BASTIODON, gMonShinyPalette_Bastiodon),
SPECIES_SHINY_PAL(BURMY, gMonShinyPalette_Burmy),
SPECIES_SHINY_PAL(WORMADAM, gMonShinyPalette_Wormadam),
SPECIES_SHINY_PAL(BURMY, gMonShinyPalette_BurmyPlant),
SPECIES_SHINY_PAL(BURMY_SANDY, gMonShinyPalette_BurmySandy),
SPECIES_SHINY_PAL(BURMY_TRASH, gMonShinyPalette_BurmyTrash),
SPECIES_SHINY_PAL(WORMADAM, gMonShinyPalette_WormadamPlant),
SPECIES_SHINY_PAL(WORMADAM_SANDY, gMonShinyPalette_WormadamSandy),
SPECIES_SHINY_PAL(WORMADAM_TRASH, gMonShinyPalette_WormadamTrash),
SPECIES_SHINY_PAL(MOTHIM, gMonShinyPalette_Mothim),
SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
SPECIES_SHINY_PAL(VESPIQUEN, gMonShinyPalette_Vespiquen),

View File

@ -709,7 +709,11 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
SPECIES_TO_NATIONAL(SHIELDON),
SPECIES_TO_NATIONAL(BASTIODON),
SPECIES_TO_NATIONAL(BURMY),
[SPECIES_BURMY_SANDY] = NATIONAL_DEX_BURMY,
[SPECIES_BURMY_TRASH] = NATIONAL_DEX_BURMY,
SPECIES_TO_NATIONAL(WORMADAM),
[SPECIES_WORMADAM_SANDY] = NATIONAL_DEX_WORMADAM,
[SPECIES_WORMADAM_TRASH] = NATIONAL_DEX_WORMADAM,
SPECIES_TO_NATIONAL(MOTHIM),
SPECIES_TO_NATIONAL(COMBEE),
SPECIES_TO_NATIONAL(VESPIQUEN),

View File

@ -437,8 +437,12 @@ const u8 *const gMonIconTable[] =
[SPECIES_RAMPARDOS] = gMonIcon_Rampardos,
[SPECIES_SHIELDON] = gMonIcon_Shieldon,
[SPECIES_BASTIODON] = gMonIcon_Bastiodon,
[SPECIES_BURMY] = gMonIcon_Burmy,
[SPECIES_WORMADAM] = gMonIcon_Wormadam,
[SPECIES_BURMY] = gMonIcon_BurmyPlant,
[SPECIES_BURMY_SANDY] = gMonIcon_BurmySandy,
[SPECIES_BURMY_TRASH] = gMonIcon_BurmyTrash,
[SPECIES_WORMADAM] = gMonIcon_WormadamPlant,
[SPECIES_WORMADAM_SANDY] = gMonIcon_WormadamSandy,
[SPECIES_WORMADAM_TRASH] = gMonIcon_WormadamTrash,
[SPECIES_MOTHIM] = gMonIcon_Mothim,
[SPECIES_COMBEE] = gMonIcon_Combee,
[SPECIES_VESPIQUEN] = gMonIcon_Vespiquen,