diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png index 2798fa70c..e1b35043b 100644 Binary files a/graphics/pokemon/magnemite/back.png and b/graphics/pokemon/magnemite/back.png differ diff --git a/graphics/pokemon/magnemite/front.png b/graphics/pokemon/magnemite/front.png index f39c25b7a..2a262e550 100644 Binary files a/graphics/pokemon/magnemite/front.png and b/graphics/pokemon/magnemite/front.png differ diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/magnemite/normal.pal index e86b80511..b0e534a53 100644 --- a/graphics/pokemon/magnemite/normal.pal +++ b/graphics/pokemon/magnemite/normal.pal @@ -3,7 +3,7 @@ JASC-PAL 16 152 208 160 136 136 136 -232 248 248 +255 255 255 208 208 208 80 72 72 16 16 16 @@ -16,4 +16,4 @@ JASC-PAL 96 184 208 32 112 152 168 168 168 -232 248 248 +220 244 244 diff --git a/src/pokemon.c b/src/pokemon.c index a0fb94256..189fccdea 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2767,11 +2767,28 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_CALYREX - 1] = ANIM_V_SQUISH_AND_BOUNCE, // Forms - [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_FROST - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_FAN - 1] = ANIM_FIGURE_8, - [SPECIES_ROTOM_MOW - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ROTOM_WASH - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_FROST - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_FAN - 1] = ANIM_FIGURE_8, + [SPECIES_ROTOM_MOW - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ROTOM_WASH - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ARCEUS_FIGHTING - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FLYING - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_POISON - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GROUND - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ROCK - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_BUG - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GHOST - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_STEEL - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FIRE - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_WATER - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_GRASS - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ELECTRIC - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_PSYCHIC - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_ICE - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE, + [SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE, }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =