diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 80471f960e..4e345357eb 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -3659,7 +3659,83 @@ const u16 gEggMoves[] = { MOVE_SNATCH, MOVE_QUICK_GUARD), - egg_moves(SCATTERBUG, + egg_moves(SCATTERBUG_ICY_SNOW, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_POLAR, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_TUNDRA, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_CONTINENTAL, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_GARDEN, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_ELEGANT, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_MEADOW, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_MODERN, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_MARINE, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_ARCHIPELAGO, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_HIGH_PLAINS, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_SANDSTORM, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_RIVER, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_MONSOON, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_SAVANNA, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_SUN, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_OCEAN, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_JUNGLE, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_FANCY, + MOVE_STUN_SPORE, + MOVE_POISON_POWDER, + MOVE_RAGE_POWDER), + egg_moves(SCATTERBUG_POKE_BALL, MOVE_STUN_SPORE, MOVE_POISON_POWDER, MOVE_RAGE_POWDER), diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index beea6646e5..36270d13c0 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -627,8 +627,46 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_FROAKIE, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_FROGADIER, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_BUNNELBY, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SCATTERBUG, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SPEWPA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SCATTERBUG_ICY_SNOW, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_POLAR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_TUNDRA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_CONTINENTAL, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_GARDEN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_ELEGANT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_MEADOW, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_MODERN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_MARINE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_ARCHIPELAGO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_HIGH_PLAINS, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_SANDSTORM, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_RIVER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_MONSOON, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_SAVANNA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_SUN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_OCEAN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_JUNGLE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_FANCY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG_POKE_BALL, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SPEWPA_ICY_SNOW, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_POLAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_TUNDRA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_CONTINENTAL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_GARDEN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_ELEGANT, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_MEADOW, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_MODERN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_MARINE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_ARCHIPELAGO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_HIGH_PLAINS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_SANDSTORM, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_RIVER, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_MONSOON, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_SAVANNA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_SUN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_OCEAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_JUNGLE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_FANCY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SPEWPA_POKE_BALL, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_LITLEO, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_PANCHAM, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_ESPURR, .jumpType = JUMP_TYPE_NORMAL, },