diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index d12188dbe8..cc722da8d4 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -129,6 +129,8 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 arg0, u8 *floorLayoutOf static bool8 TrySetPyramidEventObjectPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); // Const rom data. +#define ABILITY_RANDOM 2 // For wild mons data. + #include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" #include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h" @@ -1407,7 +1409,7 @@ void GenerateBattlePyramidWildMon(void) case 1: SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &wildMons[id].abilityNum); break; - case 2: + case ABILITY_RANDOM: default: if (gBaseStats[wildMons[id].species].abilities[1]) { diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h index 8b6810f888..d706aafeee 100644 --- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h @@ -3,49 +3,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round1[] = { .species = SPECIES_PLUSLE, .lvl = 35, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE} }, { .species = SPECIES_MINUN, .lvl = 35, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_PIKACHU, .lvl = 37, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_ELECTABUZZ, .lvl = 37, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE} }, { .species = SPECIES_VILEPLUME, .lvl = 39, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MANECTRIC, .lvl = 39, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 40, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH} }, { .species = SPECIES_JOLTEON, .lvl = 40, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK} } }; @@ -55,31 +55,31 @@ static const struct PyramidWildMon sLevel50WildMons_Round2[] = { .species = SPECIES_GULPIN, .lvl = 36, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ROSELIA, .lvl = 36, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE} }, { .species = SPECIES_BUTTERFREE, .lvl = 38, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE} }, { .species = SPECIES_SEVIPER, .lvl = 38, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL} }, { .species = SPECIES_SKARMORY, .lvl = 40, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE} }, { @@ -91,13 +91,13 @@ static const struct PyramidWildMon sLevel50WildMons_Round2[] = { .species = SPECIES_CROBAT, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE} }, { .species = SPECIES_GENGAR, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -107,13 +107,13 @@ static const struct PyramidWildMon sLevel50WildMons_Round3[] = { .species = SPECIES_GROWLITHE, .lvl = 37, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_VULPIX, .lvl = 37, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE} }, { @@ -125,31 +125,31 @@ static const struct PyramidWildMon sLevel50WildMons_Round3[] = { .species = SPECIES_NINETALES, .lvl = 39, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_WEEZING, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_DUSCLOPS, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH} }, { .species = SPECIES_HOUNDOOM, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT} } }; @@ -159,49 +159,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round4[] = { .species = SPECIES_DUNSPARCE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_BANETTE, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_DUSCLOPS, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL} }, { .species = SPECIES_SHEDINJA, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -211,49 +211,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round5[] = { .species = SPECIES_HAUNTER, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE} }, { .species = SPECIES_CHIMECHO, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT} }, { .species = SPECIES_SOLROCK, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC} }, { .species = SPECIES_MISDREAVUS, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT} }, { .species = SPECIES_CLAYDOL, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC} }, { .species = SPECIES_WEEZING, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_FLYGON, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH} }, { .species = SPECIES_GENGAR, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE} } }; @@ -263,13 +263,13 @@ static const struct PyramidWildMon sLevel50WildMons_Round6[] = { .species = SPECIES_DIGLETT, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE} }, { .species = SPECIES_TRAPINCH, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { @@ -281,13 +281,13 @@ static const struct PyramidWildMon sLevel50WildMons_Round6[] = { .species = SPECIES_DIGLETT, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC} }, { .species = SPECIES_TRAPINCH, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT} }, { @@ -315,49 +315,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round7[] = { .species = SPECIES_GLALIE, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_PILOSWINE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_JYNX, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE} }, { .species = SPECIES_CLOYSTER, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC} } }; @@ -367,49 +367,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round8[] = { .species = SPECIES_WEEZING, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_ELECTRODE, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_GOLEM, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_PINECO, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { .species = SPECIES_SOLROCK, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT} } }; @@ -419,49 +419,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round9[] = { .species = SPECIES_WOBBUFFET, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} }, { .species = SPECIES_METANG, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC} }, { .species = SPECIES_EXEGGUTOR, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE} }, { .species = SPECIES_SLOWKING, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER} }, { .species = SPECIES_XATU, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING} }, { .species = SPECIES_ALAKAZAM, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC} }, { .species = SPECIES_STARMIE, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_ESPEON, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE} } }; @@ -471,49 +471,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round10[] = { .species = SPECIES_GOLEM, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_OMASTAR, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE} }, { .species = SPECIES_LUNATONE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_CRADILY, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE} } }; @@ -523,49 +523,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round11[] = { .species = SPECIES_POLIWRATH, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_HARIYAMA, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONCHAN, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONLEE, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_HERACROSS, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE} }, { .species = SPECIES_MACHAMP, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS} } }; @@ -575,49 +575,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round12[] = { .species = SPECIES_QUAGSIRE, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_TROPIUS, .lvl = 41, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_PUPITAR, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_CACTURNE, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 44, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 45, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE} } }; @@ -627,49 +627,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round13[] = { .species = SPECIES_PINECO, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_VENOMOTH, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC} }, { .species = SPECIES_SCIZOR, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT} }, { .species = SPECIES_HERACROSS, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE} }, { .species = SPECIES_FORRETRESS, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE} } }; @@ -679,49 +679,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round14[] = { .species = SPECIES_SABLEYE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK} }, { .species = SPECIES_CRAWDAUNT, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN} }, { .species = SPECIES_CACTURNE, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE} }, { .species = SPECIES_HOUNDOOM, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_UMBREON, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK} } }; @@ -731,49 +731,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round15[] = { .species = SPECIES_OCTILLERY, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE} }, { .species = SPECIES_PELIPPER, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_QUAGSIRE, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LUDICOLO, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM} }, { .species = SPECIES_SLOWKING, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD} }, { .species = SPECIES_BLASTOISE, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE} } }; @@ -783,49 +783,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round16[] = { .species = SPECIES_DUSKULL, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_HAUNTER, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL} }, { .species = SPECIES_BANETTE, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE} }, { .species = SPECIES_SABLEYE, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE} }, { .species = SPECIES_DUSCLOPS, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT} }, { .species = SPECIES_GENGAR, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE} } }; @@ -835,49 +835,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round17[] = { .species = SPECIES_MAWILE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_MAGNETON, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_SCIZOR, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SKARMORY, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT} }, { .species = SPECIES_AGGRON, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_METAGROSS, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK} } }; @@ -887,49 +887,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round18[] = { .species = SPECIES_DRAGONAIR, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_VIBRAVA, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING} }, { .species = SPECIES_ALTARIA, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT} }, { .species = SPECIES_FLYGON, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE} }, { .species = SPECIES_KINGDRA, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_CHARIZARD, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL} } }; @@ -939,49 +939,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round19[] = { .species = SPECIES_ARCANINE, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_POLIWRATH, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_RAICHU, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_VAPOREON, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_JOLTEON, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC} } }; @@ -991,49 +991,49 @@ static const struct PyramidWildMon sLevel50WildMons_Round20[] = { .species = SPECIES_KANGASKHAN, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH} }, { .species = SPECIES_SWELLOW, .lvl = 42, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_URSARING, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT} }, { .species = SPECIES_PORYGON2, .lvl = 46, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} }, { .species = SPECIES_TAUROS, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT} }, { .species = SPECIES_FEAROW, .lvl = 48, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT} }, { .species = SPECIES_SNORLAX, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE} }, { .species = SPECIES_SLAKING, .lvl = 50, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} } }; diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h index 24f559492e..8738b0de64 100644 --- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h @@ -3,49 +3,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round1[] = { .species = SPECIES_PLUSLE, .lvl = 15, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE} }, { .species = SPECIES_MINUN, .lvl = 15, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_PIKACHU, .lvl = 13, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_ELECTABUZZ, .lvl = 13, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE} }, { .species = SPECIES_VILEPLUME, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MANECTRIC, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH} }, { .species = SPECIES_JOLTEON, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK} } }; @@ -55,31 +55,31 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round2[] = { .species = SPECIES_GULPIN, .lvl = 14, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ROSELIA, .lvl = 14, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE} }, { .species = SPECIES_BUTTERFREE, .lvl = 12, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE} }, { .species = SPECIES_SEVIPER, .lvl = 12, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL} }, { .species = SPECIES_SKARMORY, .lvl = 7, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE} }, { @@ -91,13 +91,13 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round2[] = { .species = SPECIES_CROBAT, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -107,13 +107,13 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round3[] = { .species = SPECIES_GROWLITHE, .lvl = 13, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_VULPIX, .lvl = 13, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE} }, { @@ -125,31 +125,31 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round3[] = { .species = SPECIES_NINETALES, .lvl = 11, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_WEEZING, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_DUSCLOPS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH} }, { .species = SPECIES_HOUNDOOM, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT} } }; @@ -159,49 +159,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round4[] = { .species = SPECIES_DUNSPARCE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_BANETTE, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_DUSCLOPS, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL} }, { .species = SPECIES_SHEDINJA, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE} } }; @@ -211,49 +211,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round5[] = { .species = SPECIES_HAUNTER, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE} }, { .species = SPECIES_CHIMECHO, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT} }, { .species = SPECIES_SOLROCK, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC} }, { .species = SPECIES_MISDREAVUS, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT} }, { .species = SPECIES_CLAYDOL, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC} }, { .species = SPECIES_WEEZING, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_FLYGON, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE} } }; @@ -263,13 +263,13 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round6[] = { .species = SPECIES_DIGLETT, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE} }, { .species = SPECIES_TRAPINCH, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { @@ -315,49 +315,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round7[] = { .species = SPECIES_GLALIE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_PILOSWINE, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_JYNX, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE} }, { .species = SPECIES_CLOYSTER, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC} } }; @@ -367,49 +367,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round8[] = { .species = SPECIES_WEEZING, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_ELECTRODE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE} }, { .species = SPECIES_GENGAR, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_GOLEM, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_PINECO, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE} }, { .species = SPECIES_SOLROCK, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT} } }; @@ -419,49 +419,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round9[] = { .species = SPECIES_WOBBUFFET, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} }, { .species = SPECIES_METANG, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC} }, { .species = SPECIES_EXEGGUTOR, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE} }, { .species = SPECIES_SLOWKING, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER} }, { .species = SPECIES_XATU, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING} }, { .species = SPECIES_ALAKAZAM, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC} }, { .species = SPECIES_STARMIE, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_ESPEON, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE} } }; @@ -471,49 +471,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round10[] = { .species = SPECIES_GOLEM, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_OMASTAR, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE} }, { .species = SPECIES_LUNATONE, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_CRADILY, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE} } }; @@ -523,49 +523,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round11[] = { .species = SPECIES_POLIWRATH, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_HARIYAMA, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE} }, { .species = SPECIES_BRELOOM, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_MEDICHAM, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONCHAN, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} }, { .species = SPECIES_HITMONLEE, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_HERACROSS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE} }, { .species = SPECIES_MACHAMP, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS} } }; @@ -575,49 +575,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round12[] = { .species = SPECIES_QUAGSIRE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_TROPIUS, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_PUPITAR, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_LAPRAS, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_CACTURNE, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_WALREIN, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE} } }; @@ -627,49 +627,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round13[] = { .species = SPECIES_PINECO, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SHUCKLE, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_VENOMOTH, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC} }, { .species = SPECIES_SCIZOR, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT} }, { .species = SPECIES_HERACROSS, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE} }, { .species = SPECIES_FORRETRESS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_ARMALDO, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE} } }; @@ -679,49 +679,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round14[] = { .species = SPECIES_SABLEYE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE} }, { .species = SPECIES_SNEASEL, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK} }, { .species = SPECIES_CRAWDAUNT, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_SHIFTRY, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN} }, { .species = SPECIES_CACTURNE, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE} }, { .species = SPECIES_ABSOL, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE} }, { .species = SPECIES_HOUNDOOM, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_UMBREON, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK} } }; @@ -731,49 +731,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round15[] = { .species = SPECIES_OCTILLERY, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_DEWGONG, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE} }, { .species = SPECIES_PELIPPER, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_QUAGSIRE, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE} }, { .species = SPECIES_LUDICOLO, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM} }, { .species = SPECIES_SLOWKING, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD} }, { .species = SPECIES_BLASTOISE, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE} } }; @@ -783,49 +783,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round16[] = { .species = SPECIES_DUSKULL, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT} }, { .species = SPECIES_HAUNTER, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL} }, { .species = SPECIES_BANETTE, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE} }, { .species = SPECIES_MISDREAVUS, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE} }, { .species = SPECIES_SABLEYE, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE} }, { .species = SPECIES_DUSCLOPS, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE} }, { .species = SPECIES_SHEDINJA, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT} }, { .species = SPECIES_GENGAR, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE} } }; @@ -835,49 +835,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round17[] = { .species = SPECIES_MAWILE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_MAGNETON, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_STEELIX, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE} }, { .species = SPECIES_SCIZOR, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FORRETRESS, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_SKARMORY, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT} }, { .species = SPECIES_AGGRON, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM} }, { .species = SPECIES_METAGROSS, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK} } }; @@ -887,49 +887,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round18[] = { .species = SPECIES_DRAGONAIR, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} }, { .species = SPECIES_VIBRAVA, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING} }, { .species = SPECIES_ALTARIA, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT} }, { .species = SPECIES_FLYGON, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE} }, { .species = SPECIES_AERODACTYL, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE} }, { .species = SPECIES_GYARADOS, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE} }, { .species = SPECIES_KINGDRA, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_CHARIZARD, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL} } }; @@ -939,49 +939,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round19[] = { .species = SPECIES_ARCANINE, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_POLIWRATH, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_RAICHU, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE} }, { .species = SPECIES_VAPOREON, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_JOLTEON, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_FLAREON, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE} }, { .species = SPECIES_NINETALES, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE} }, { .species = SPECIES_STARMIE, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC} } }; @@ -991,49 +991,49 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round20[] = { .species = SPECIES_KANGASKHAN, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH} }, { .species = SPECIES_SWELLOW, .lvl = 10, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE} }, { .species = SPECIES_URSARING, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT} }, { .species = SPECIES_PORYGON2, .lvl = 8, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} }, { .species = SPECIES_TAUROS, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT} }, { .species = SPECIES_FEAROW, .lvl = 6, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT} }, { .species = SPECIES_SNORLAX, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE} }, { .species = SPECIES_SLAKING, .lvl = 5, - .abilityNum = 2, + .abilityNum = ABILITY_RANDOM, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} } };