diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 17f99d75e..6e93f365d 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index b1f3b4c57..f5439b6a0 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index c83f78e50..f6300a7aa 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index bbec51be9..dc32017e2 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -20,7 +20,7 @@ module Settings FUSION_ICON_SPRITE_OFFSET = 10 #Infinite fusion settings - NB_POKEMON = 420 + NB_POKEMON = 809 CUSTOM_BASE_SPRITES_FOLDER = "Graphics/CustomBattlers/customBaseSprites/" CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/" CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed/" diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb index b0ed8b0b1..a43fafb67 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb @@ -180,7 +180,6 @@ class PokemonIconSprite < SpriteWrapper bodyPoke_number = getBodyID(pokemon.species) headPoke_number = getHeadID(pokemon.species, bodyPoke_number) - bodyPoke = GameData::Species.get(bodyPoke_number).species headPoke = GameData::Species.get(headPoke_number).species diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index 04302dcce..716f3478c 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -45,7 +45,6 @@ class Pokemon attr_accessor :body_original_ability_index attr_accessor :head_original_ability_index - # @return [Array] the moves known by this Pokémon attr_accessor :moves # @return [Array] the IDs of moves known by this Pokémon when it was obtained @@ -126,7 +125,9 @@ class Pokemon end def species_data - @species_data = GameData::Species.get(@species) if ! @species_data + if !@species_data || @species != @species_data.species + @species_data = GameData::Species.get(@species) + end return @species_data #GameData::Species.get(@species) end @@ -163,7 +164,7 @@ class Pokemon return isSpecies?(check_species) end bodySpecies = getBodyID(species) - checkSpeciesId = getID(nil,check_species) + checkSpeciesId = getID(nil, check_species) return bodySpecies == checkSpeciesId end @@ -172,14 +173,14 @@ class Pokemon return isSpecies?(check_species) end headSpecies = getHeadID(species) - checkSpeciesId = getID(nil,check_species) + checkSpeciesId = getID(nil, check_species) return headSpecies == checkSpeciesId end def shiny=(value) - @shiny=value + @shiny = value if value && Settings::SHINY_POKEMON_CHANCE != S_CHANCE_VALIDATOR - @debug_shiny=true + @debug_shiny = true end end @@ -480,8 +481,6 @@ class Pokemon return [:AlwaysMale, :AlwaysFemale, :Genderless].include?(gender_ratio) end - - #============================================================================= # Shininess #============================================================================= @@ -496,13 +495,13 @@ class Pokemon is_shiny = d < Settings::SHINY_POKEMON_CHANCE if is_shiny @shiny = true - @natural_shiny=true + @natural_shiny = true end end if @shiny && Settings::SHINY_POKEMON_CHANCE != S_CHANCE_VALIDATOR - @debug_shiny=true - @natural_shiny=false + @debug_shiny = true + @natural_shiny = false end return @shiny end @@ -789,9 +788,9 @@ class Pokemon body_species_id = getBasePokemonID(species) head_species = GameData::Species.get(head_species_id) body_species = GameData::Species.get(body_species_id) - return move_data && (pokemon_can_learn_move(head_species,move_data) || pokemon_can_learn_move(body_species,move_data)) + return move_data && (pokemon_can_learn_move(head_species, move_data) || pokemon_can_learn_move(body_species, move_data)) else - return move_data && pokemon_can_learn_move(species_data,move_data) + return move_data && pokemon_can_learn_move(species_data, move_data) end end @@ -1262,7 +1261,7 @@ class Pokemon @ivMaxed = {} @ev = {} @hiddenPowerType = nil - @glitter=nil + @glitter = nil GameData::Stat.each_main do |s| @iv[s.id] = rand(IV_STAT_LIMIT + 1) @ev[s.id] = 0 diff --git a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb index f12303c53..b1c5de525 100644 --- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb +++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb @@ -38,18 +38,22 @@ class Player < Trainer self.refresh_accessible_dexes end - def initStandardDexArray() + def initStandardDexArray(resync=false) dex_array = [] (0..NB_POKEMON).each { |poke| if poke == 0 dex_array << nil end - dex_array << false + if resync && @seen_standard[poke] + dex_array << @seen_standard[poke] + else + dex_array << false + end } return dex_array end - def initFusionDexArray() + def initFusionDexArray(resync=false) head_array = [] (0..NB_POKEMON).each { |head| body_array = [] @@ -60,7 +64,11 @@ class Player < Trainer if body == 0 body_array << nil end - body_array << false + if resync && @seen_fusion[body] + body_array << @seen_fusion[body] + else + body_array << false + end } head_array << body_array } @@ -79,17 +87,22 @@ class Player < Trainer return num > Settings::NB_POKEMON && !isTripleFusion(num) end - def set_seen_fusion(species) - initFusionDexArray() if @seen_fusion.length < NB_POKEMON+2 + def resyncPokedexIfNumberOfPokemonChanged() + if @seen_standard.length < NB_POKEMON || @seen_fusion.length < NB_POKEMON + @seen_fusion = initFusionDexArray(true) + @seen_standard=initStandardDexArray(true ) + end + end + def set_seen_fusion(species) + resyncPokedexIfNumberOfPokemonChanged() bodyId = getBodyID(species) headId = getHeadID(species, bodyId) @seen_fusion[headId][bodyId] = true end def set_seen_normalDex(species) - initStandardDexArray() if @seen_standard.length < NB_POKEMON - + resyncPokedexIfNumberOfPokemonChanged() dex_num = getDexNumberForSpecies(species) @seen_standard[dex_num] = true end diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb index e83b901ff..ef8096907 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb @@ -607,6 +607,10 @@ class PokemonEvolutionScene # Check for consumed item and check if Pokémon should be duplicated pbEvolutionMethodAfterEvolution if !reversing + + @pokemon + @pokemon.ability + oldAbility = @pokemon.ability.id newSpecies = GameData::Species.get(@newspecies) diff --git a/Data/Scripts/048_Fusion/FusedSpecies.rb b/Data/Scripts/048_Fusion/FusedSpecies.rb index 8ea9e0f35..ed3670950 100644 --- a/Data/Scripts/048_Fusion/FusedSpecies.rb +++ b/Data/Scripts/048_Fusion/FusedSpecies.rb @@ -38,13 +38,16 @@ module GameData @gender_ratio = calculate_gender() #todo @catch_rate = calculate_catch_rate() @happiness = calculate_base_happiness() + + #Moves @moves = calculate_moveset() + @tutor_moves =calculate_tutor_moves() # hash[:tutor_moves] || [] + @egg_moves = calculate_egg_moves() # hash[:egg_moves] || [] #todo : all below - @tutor_moves = [] # hash[:tutor_moves] || [] - @egg_moves = [] # hash[:egg_moves] || [] - @abilities = [] # hash[:abilities] || [] - @hidden_abilities = [] # hash[:hidden_abilities] || [] + + @abilities = calculate_abilities(@body_pokemon,@head_pokemon) # hash[:abilities] || [] + @hidden_abilities = calculate_hidden_abilities(@body_pokemon,@head_pokemon) # hash[:hidden_abilities] || [] @wild_item_common = [] # hash[:wild_item_common] @wild_item_uncommon = [] # hash[:wild_item_uncommon] @wild_item_rare = [] # hash[:wild_item_rare] @@ -130,6 +133,40 @@ module GameData return combine_arrays(@body_pokemon.moves, @head_pokemon.moves) end + def calculate_egg_moves + return combine_arrays(@body_pokemon.egg_moves, @head_pokemon.egg_moves) + end + + def calculate_tutor_moves + return combine_arrays(@body_pokemon.tutor_moves, @head_pokemon.tutor_moves) + end + + def calculate_abilities(pokemon1,pokemon2) + abilities_hash = [] + + ability1 = pokemon1.abilities[0] + ability2 = pokemon2.abilities[1] + if !ability2 + ability2 = pokemon2.abilities[0] + end + abilities_hash << ability1 + abilities_hash << ability2 + return abilities_hash + end + + def calculate_hidden_abilities(pokemon1,pokemon2) + #First two spots are the other abilities of the two pokemon + abilities_hash = calculate_abilities(pokemon2,pokemon1) + #add the hidden ability for the two base pokemon + abilities_hash << @body_pokemon.hidden_abilities[0] + abilities_hash << @head_pokemon.hidden_abilities[0] + return abilities_hash + end + + + #TODO + # ################## UNFINISHED #################### + #todo def calculate_name() return @body_pokemon.name + "/" + @head_pokemon.name @@ -155,7 +192,7 @@ module GameData return :Genderless end - #UTILS + ############################# UTIL METHODS ############################### # def calculate_fused_stats(dominantStat, otherStat) return ((2 * dominantStat) / 3) + (otherStat / 3).floor diff --git a/Data/Scripts/050_AddOns/DoubleAbilities.rb b/Data/Scripts/050_AddOns/DoubleAbilities.rb index 3d9b28838..77c575156 100644 --- a/Data/Scripts/050_AddOns/DoubleAbilities.rb +++ b/Data/Scripts/050_AddOns/DoubleAbilities.rb @@ -216,13 +216,16 @@ class PokemonFusionScene def pbChooseAbility(poke, hidden1 = false, hidden2 = false) abilityList = poke.getAbilityList - if $game_switches[SWITCH_DOUBLE_ABILITIES] abID1 = @pokemon1.ability abID2 = @pokemon2.ability else - abID1 = hidden1 ? abilityList[4][0] : abilityList[0][0] - abID2 = hidden2 ? abilityList[5][0] : abilityList[1][0] + abID1 = hidden1 ? abilityList[-2][0] : abilityList[0][0] + + p abilityList + p abilityList[5] + p abilityList[1] + abID2 = hidden2 ? abilityList[-1][0] : abilityList[1][0] end availableNatures = [] availableNatures << @pokemon1.nature diff --git a/Data/Scripts/050_AddOns/Gen 2.rb b/Data/Scripts/050_AddOns/Gen 2.rb index 32e306f64..bce13f4b8 100644 --- a/Data/Scripts/050_AddOns/Gen 2.rb +++ b/Data/Scripts/050_AddOns/Gen 2.rb @@ -14,7 +14,7 @@ # PokemonFusion # -NB_POKEMON = 809#420 #351 #aussi CONST_NB_POKE +NB_POKEMON = Settings::NB_POKEMON#809#420 #351 #aussi CONST_NB_POKE CONST_NB_POKE = NB_POKEMON def pbPokemonBitmapFile(species) # Used by the Pokédex diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index e44336444..dd8e915b5 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index f52e6f43e..6d74b21a8 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/PBS/Gen 7/pokemon_g7.txt b/PBS/Gen 7/pokemon_g7.txt index f6a17bb2f..8453d0d50 100644 --- a/PBS/Gen 7/pokemon_g7.txt +++ b/PBS/Gen 7/pokemon_g7.txt @@ -1877,7 +1877,7 @@ Abilities = VITALSPIRIT,ANGERPOINT HiddenAbility = DEFIANT Moves = 1,COVET,1,SCRATCH,1,LOWKICK,1,LEER,1,FOCUSENERGY,5,FURYSWIPES,8,KARATECHOP,12,PURSUIT,15,SEISMICTOSS,19,SWAGGER,22,CROSSCHOP,26,ASSURANCE,29,PUNISHMENT,33,THRASH,36,CLOSECOMBAT,40,SCREECH,43,STOMPINGTANTRUM,47,OUTRAGE,50,FINALGAMBIT TutorMoves = ACROBATICS,AERIALACE,ATTRACT,BRICKBREAK,BULKUP,BULLDOZE,CONFIDE,COVET,DOUBLETEAM,DUALCHOP,EARTHQUAKE,ENDEAVOR,FACADE,FIREPUNCH,FLING,FOCUSBLAST,FOCUSPUNCH,FRUSTRATION,GUNKSHOT,HELPINGHAND,HIDDENPOWER,ICEPUNCH,IRONTAIL,LOWKICK,LOWSWEEP,OUTRAGE,OVERHEAT,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SEEDBOMB,SLEEPTALK,SMACKDOWN,SNORE,SPITE,STOMPINGTANTRUM,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERPUNCH,TOXIC,UPROAR,UTURN,WORKUP -EggMoves = BEATUP,CLOSECOMBAT,COUNTER,ENCORE,FOCUSPUNCH,FORESIGHT,MEDITATE,NIGHTSLASH,POWERTRIP,REVENGE,REVERSAL,SLEEPTALK,SMELLINGSALTS +EggMoves = BEATUP,CLOSECOMBAT,COUNTER,ENCORE,FOCUSPUNCH,FORESIGHT,MEDITATE,NIGHTSLASH,POWERTRIP,REVENGE,REVERSAL,SLEEPTALK,SMELLINGSALT Compatibility = Field StepsToHatch = 5120 Height = 0.5 @@ -2213,7 +2213,7 @@ Abilities = GUTS,NOGUARD HiddenAbility = STEADFAST Moves = 1,LOWKICK,1,LEER,3,FOCUSENERGY,7,KARATECHOP,9,FORESIGHT,13,LOWSWEEP,15,SEISMICTOSS,19,REVENGE,21,KNOCKOFF,25,VITALTHROW,27,WAKEUPSLAP,31,DUALCHOP,33,SUBMISSION,37,BULKUP,39,CROSSCHOP,43,SCARYFACE,45,DYNAMICPUNCH TutorMoves = ATTRACT,BRICKBREAK,BULKUP,BULLDOZE,CONFIDE,DOUBLETEAM,DUALCHOP,EARTHQUAKE,FACADE,FIREBLAST,FIREPUNCH,FLAMETHROWER,FLING,FOCUSBLAST,FOCUSPUNCH,FRUSTRATION,HELPINGHAND,HIDDENPOWER,ICEPUNCH,KNOCKOFF,LIGHTSCREEN,LOWKICK,LOWSWEEP,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SLEEPTALK,SMACKDOWN,SNORE,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERPOWER,SWAGGER,THIEF,THUNDERPUNCH,TOXIC,WORKUP -EggMoves = BULLETPUNCH,CLOSECOMBAT,COUNTER,ENCORE,FIREPUNCH,HEAVYSLAM,ICEPUNCH,KNOCKOFF,MEDITATE,POWERTRICK,QUICKGUARD,ROLLINGKICK,SMELLINGSALTS,THUNDERPUNCH,TICKLE +EggMoves = BULLETPUNCH,CLOSECOMBAT,COUNTER,ENCORE,FIREPUNCH,HEAVYSLAM,ICEPUNCH,KNOCKOFF,MEDITATE,POWERTRICK,QUICKGUARD,ROLLINGKICK,SMELLINGSALT,THUNDERPUNCH,TICKLE Compatibility = Humanlike StepsToHatch = 5120 Height = 0.8 @@ -3641,7 +3641,7 @@ Abilities = OWNTEMPO,OBLIVIOUS HiddenAbility = CLOUDNINE Moves = 1,LICK,5,SUPERSONIC,9,DEFENSECURL,13,KNOCKOFF,17,WRAP,21,STOMP,25,DISABLE,29,SLAM,33,ROLLOUT,37,CHIPAWAY,41,MEFIRST,45,REFRESH,49,SCREECH,53,POWERWHIP,57,WRINGOUT TutorMoves = AQUATAIL,ATTRACT,BIND,BLIZZARD,BRICKBREAK,BRUTALSWING,BULLDOZE,CONFIDE,CUT,DOUBLETEAM,DRAGONTAIL,DREAMEATER,EARTHQUAKE,FACADE,FIREBLAST,FIREPUNCH,FLAMETHROWER,FLING,FOCUSPUNCH,FRUSTRATION,GIGAIMPACT,HIDDENPOWER,HYPERBEAM,ICEBEAM,ICEPUNCH,ICYWIND,IRONTAIL,KNOCKOFF,POWERUPPUNCH,PROTECT,PSYCHUP,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SANDSTORM,SHADOWBALL,SHOCKWAVE,SLEEPTALK,SNORE,SOLARBEAM,STOMPINGTANTRUM,STRENGTH,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,THIEF,THUNDER,THUNDERBOLT,THUNDERPUNCH,TOXIC,WATERPULSE,WORKUP,ZENHEADBUTT -EggMoves = AMNESIA,BELCH,BELLYDRUM,BODYSLAM,CURSE,HAMMERARM,MAGNITUDE,MUDDYWATER,SLEEPTALK,SMELLINGSALTS,SNORE,THRASH,ZENHEADBUTT +EggMoves = AMNESIA,BELCH,BELLYDRUM,BODYSLAM,CURSE,HAMMERARM,MAGNITUDE,MUDDYWATER,SLEEPTALK,SMELLINGSALT,SNORE,THRASH,ZENHEADBUTT Compatibility = Monster StepsToHatch = 5120 Height = 1.2 @@ -7043,7 +7043,7 @@ Abilities = INTIMIDATE,RUNAWAY HiddenAbility = RATTLED Moves = 1,ICEFANG,1,FIREFANG,1,THUNDERFANG,1,TACKLE,1,SCARYFACE,1,TAILWHIP,1,CHARM,7,BITE,13,LICK,19,HEADBUTT,25,ROAR,31,RAGE,37,PLAYROUGH,43,PAYBACK,49,CRUNCH TutorMoves = ATTRACT,BRICKBREAK,BULKUP,BULLDOZE,CONFIDE,COVET,DAZZLINGGLEAM,DOUBLETEAM,EARTHQUAKE,FACADE,FIREBLAST,FIREPUNCH,FLAMETHROWER,FLING,FOCUSPUNCH,FRUSTRATION,HEALBELL,HIDDENPOWER,HYPERVOICE,ICEPUNCH,LASTRESORT,LOWKICK,OVERHEAT,PAYBACK,POWERUPPUNCH,PROTECT,RAINDANCE,REFLECT,REST,RETURN,ROAR,ROCKSMASH,ROUND,SHADOWBALL,SHOCKWAVE,SLEEPTALK,SLUDGEBOMB,SNARL,SNORE,SOLARBEAM,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERFANG,SUPERPOWER,SWAGGER,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERPUNCH,THUNDERWAVE,TORMENT,TOXIC,WATERPULSE,WILDCHARGE,WORKUP -EggMoves = CLOSECOMBAT,CRUNCH,DOUBLEEDGE,FAKETEARS,FEINTATTACK,FIREFANG,FOCUSPUNCH,HEALBELL,ICEFANG,METRONOME,MIMIC,PRESENT,SMELLINGSALTS,SNORE,THUNDERFANG +EggMoves = CLOSECOMBAT,CRUNCH,DOUBLEEDGE,FAKETEARS,FEINTATTACK,FIREFANG,FOCUSPUNCH,HEALBELL,ICEFANG,METRONOME,MIMIC,PRESENT,SMELLINGSALT,SNORE,THUNDERFANG Compatibility = Field,Fairy StepsToHatch = 5120 Height = 0.6 @@ -8597,7 +8597,7 @@ Abilities = BLAZE HiddenAbility = SPEEDBOOST Moves = 1,SCRATCH,1,GROWL,5,EMBER,10,SANDATTACK,14,PECK,19,FIRESPIN,23,QUICKATTACK,28,FLAMEBURST,32,FOCUSENERGY,37,SLASH,41,MIRRORMOVE,46,FLAMETHROWER TutorMoves = AERIALACE,ATTRACT,BOUNCE,CONFIDE,CUT,DEFOG,DOUBLETEAM,ECHOEDVOICE,FACADE,FIREBLAST,FIREPLEDGE,FLAMECHARGE,FLAMETHROWER,FRUSTRATION,HEATWAVE,HELPINGHAND,HIDDENPOWER,LASTRESORT,LOWKICK,OVERHEAT,PROTECT,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SHADOWCLAW,SLEEPTALK,SNORE,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,SWORDSDANCE,TOXIC,WILLOWISP,WORKUP -EggMoves = AGILITY,BATONPASS,COUNTER,CRUSHCLAW,CURSE,ENDURE,FEATHERDANCE,FEINT,FLAMEBURST,LASTRESORT,LOWKICK,NIGHTSLASH,REVERSAL,SMELLINGSALTS +EggMoves = AGILITY,BATONPASS,COUNTER,CRUSHCLAW,CURSE,ENDURE,FEATHERDANCE,FEINT,FLAMEBURST,LASTRESORT,LOWKICK,NIGHTSLASH,REVERSAL,SMELLINGSALT Compatibility = Field StepsToHatch = 5120 Height = 0.4 @@ -9889,7 +9889,7 @@ Abilities = SOUNDPROOF HiddenAbility = RATTLED Moves = 1,POUND,4,ECHOEDVOICE,8,ASTONISH,11,HOWL,15,SCREECH,18,SUPERSONIC,22,STOMP,25,UPROAR,29,ROAR,32,REST,36,SLEEPTALK,39,HYPERVOICE,43,SYNCHRONOISE TutorMoves = ATTRACT,BLIZZARD,CONFIDE,DOUBLETEAM,ECHOEDVOICE,ENDEAVOR,FACADE,FIREBLAST,FIREPUNCH,FLAMETHROWER,FLING,FRUSTRATION,HIDDENPOWER,HYPERVOICE,ICEBEAM,ICEPUNCH,ICYWIND,PROTECT,RAINDANCE,REST,RETURN,ROAR,ROUND,SHADOWBALL,SHOCKWAVE,SLEEPTALK,SNORE,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SWAGGER,THUNDERPUNCH,TOXIC,UPROAR,WATERPULSE,WORKUP,ZENHEADBUTT -EggMoves = CIRCLETHROW,DISARMINGVOICE,ENDEAVOR,EXTRASENSORY,FAKETEARS,HAMMERARM,SMELLINGSALTS,SMOKESCREEN,SNORE,TAKEDOWN,WHIRLWIND +EggMoves = CIRCLETHROW,DISARMINGVOICE,ENDEAVOR,EXTRASENSORY,FAKETEARS,HAMMERARM,SMELLINGSALT,SMOKESCREEN,SNORE,TAKEDOWN,WHIRLWIND Compatibility = Monster,Field StepsToHatch = 5120 Height = 0.6 @@ -9986,7 +9986,7 @@ Rareness = 180 Happiness = 70 Abilities = THICKFAT,GUTS HiddenAbility = SHEERFORCE -Moves = 1,TACKLE,1,FOCUSENERGY,4,SANDATTACK,7,ARMTHRUST,10,FAKEOUT,13,FORCEPALM,16,WHIRLWIND,19,KNOCKOFF,22,VITALTHROW,25,BELLYDRUM,28,SMELLINGSALTS,31,SEISMICTOSS,34,WAKEUPSLAP,37,ENDURE,40,CLOSECOMBAT,43,REVERSAL,46,HEAVYSLAM +Moves = 1,TACKLE,1,FOCUSENERGY,4,SANDATTACK,7,ARMTHRUST,10,FAKEOUT,13,FORCEPALM,16,WHIRLWIND,19,KNOCKOFF,22,VITALTHROW,25,BELLYDRUM,28,SMELLINGSALT,31,SEISMICTOSS,34,WAKEUPSLAP,37,ENDURE,40,CLOSECOMBAT,43,REVERSAL,46,HEAVYSLAM TutorMoves = ATTRACT,BRICKBREAK,BULKUP,BULLDOZE,CONFIDE,DOUBLETEAM,EARTHQUAKE,FACADE,FIREPUNCH,FLING,FOCUSBLAST,FOCUSPUNCH,FRUSTRATION,HELPINGHAND,HIDDENPOWER,ICEPUNCH,KNOCKOFF,LOWKICK,LOWSWEEP,POISONJAB,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SLEEPTALK,SMACKDOWN,SNORE,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERPOWER,SURF,SWAGGER,THUNDERPUNCH,TOXIC,WORKUP EggMoves = BULLETPUNCH,CHIPAWAY,COUNTER,CROSSCHOP,DETECT,DYNAMICPUNCH,FEINT,FEINTATTACK,FOCUSPUNCH,FORESIGHT,HELPINGHAND,REVENGE,WAKEUPSLAP,WIDEGUARD Compatibility = Humanlike @@ -10021,7 +10021,7 @@ Rareness = 200 Happiness = 70 Abilities = THICKFAT,GUTS HiddenAbility = SHEERFORCE -Moves = 1,BRINE,1,TACKLE,1,FOCUSENERGY,1,SANDATTACK,1,ARMTHRUST,4,SANDATTACK,7,ARMTHRUST,10,FAKEOUT,13,FORCEPALM,16,WHIRLWIND,19,KNOCKOFF,22,VITALTHROW,26,BELLYDRUM,30,SMELLINGSALTS,34,SEISMICTOSS,38,WAKEUPSLAP,42,ENDURE,46,CLOSECOMBAT,50,REVERSAL,54,HEAVYSLAM +Moves = 1,BRINE,1,TACKLE,1,FOCUSENERGY,1,SANDATTACK,1,ARMTHRUST,4,SANDATTACK,7,ARMTHRUST,10,FAKEOUT,13,FORCEPALM,16,WHIRLWIND,19,KNOCKOFF,22,VITALTHROW,26,BELLYDRUM,30,SMELLINGSALT,34,SEISMICTOSS,38,WAKEUPSLAP,42,ENDURE,46,CLOSECOMBAT,50,REVERSAL,54,HEAVYSLAM TutorMoves = ATTRACT,BRICKBREAK,BULKUP,BULLDOZE,CONFIDE,DOUBLETEAM,EARTHQUAKE,FACADE,FIREPUNCH,FLING,FOCUSBLAST,FOCUSPUNCH,FRUSTRATION,GIGAIMPACT,HELPINGHAND,HIDDENPOWER,HYPERBEAM,ICEPUNCH,IRONHEAD,KNOCKOFF,LOWKICK,LOWSWEEP,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SLEEPTALK,SMACKDOWN,SNORE,STOMPINGTANTRUM,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERPOWER,SURF,SWAGGER,THROATCHOP,THUNDERPUNCH,TOXIC,WORKUP Compatibility = Humanlike StepsToHatch = 5120 @@ -10264,7 +10264,7 @@ Abilities = STURDY,ROCKHEAD HiddenAbility = HEAVYMETAL Moves = 1,TACKLE,1,HARDEN,4,MUDSLAP,7,HEADBUTT,10,METALCLAW,13,ROCKTOMB,16,PROTECT,19,ROAR,22,IRONHEAD,25,ROCKSLIDE,28,TAKEDOWN,31,METALSOUND,34,IRONTAIL,37,IRONDEFENSE,40,DOUBLEEDGE,43,AUTOTOMIZE,46,HEAVYSLAM,49,METALBURST TutorMoves = AERIALACE,ATTRACT,BULLDOZE,CONFIDE,CUT,DOUBLETEAM,EARTHPOWER,EARTHQUAKE,ENDEAVOR,FACADE,FRUSTRATION,HIDDENPOWER,IRONDEFENSE,IRONHEAD,IRONTAIL,MAGNETRISE,PROTECT,RAINDANCE,REST,RETURN,ROAR,ROCKPOLISH,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SANDSTORM,SHADOWCLAW,SHOCKWAVE,SLEEPTALK,SNORE,SPITE,STEALTHROCK,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERPOWER,SWAGGER,TOXIC,UPROAR,WATERPULSE -EggMoves = BODYSLAM,CURSE,DRAGONRUSH,ENDEAVOR,HEADSMASH,IRONHEAD,REVERSAL,SCREECH,SMELLINGSALTS,STEALTHROCK,STOMP,SUPERPOWER +EggMoves = BODYSLAM,CURSE,DRAGONRUSH,ENDEAVOR,HEADSMASH,IRONHEAD,REVERSAL,SCREECH,SMELLINGSALT,STEALTHROCK,STOMP,SUPERPOWER Compatibility = Monster StepsToHatch = 8960 Height = 0.4 @@ -11048,7 +11048,7 @@ Abilities = OWNTEMPO,TANGLEDFEET HiddenAbility = CONTRARY Moves = 1,TACKLE,5,COPYCAT,10,FEINTATTACK,14,PSYBEAM,19,HYPNOSIS,23,DIZZYPUNCH,28,SUCKERPUNCH,32,TEETERDANCE,37,UPROAR,41,PSYCHUP,46,DOUBLEEDGE,50,FLAIL,55,THRASH TutorMoves = ATTRACT,BRICKBREAK,CALMMIND,CONFIDE,COVET,DOUBLETEAM,DRAINPUNCH,DREAMEATER,FACADE,FIREPUNCH,FLING,FOCUSPUNCH,FRUSTRATION,HELPINGHAND,HIDDENPOWER,HYPERVOICE,ICEPUNCH,ICYWIND,LASTRESORT,LOWKICK,POWERUPPUNCH,PROTECT,PSYCHIC,PSYCHUP,RAINDANCE,RECYCLE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SAFEGUARD,SHADOWBALL,SHOCKWAVE,SKILLSWAP,SLEEPTALK,SNATCH,SNORE,STOMPINGTANTRUM,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,THIEF,THUNDERPUNCH,TOXIC,TRICK,TRICKROOM,UPROAR,WATERPULSE,WILDCHARGE,WORKUP,ZENHEADBUTT -EggMoves = ASSIST,BATONPASS,DISABLE,ENCORE,FAKEOUT,FAKETEARS,GUARDSPLIT,ICYWIND,PSYCHOCUT,PSYCHOSHIFT,RAPIDSPIN,ROLEPLAY,SMELLINGSALTS,SPOTLIGHT,TRICK,WATERPULSE,WISH +EggMoves = ASSIST,BATONPASS,DISABLE,ENCORE,FAKEOUT,FAKETEARS,GUARDSPLIT,ICYWIND,PSYCHOCUT,PSYCHOSHIFT,RAPIDSPIN,ROLEPLAY,SMELLINGSALT,SPOTLIGHT,TRICK,WATERPULSE,WISH Compatibility = Field,Humanlike StepsToHatch = 3840 Height = 1.1 @@ -11181,7 +11181,7 @@ Abilities = SANDVEIL HiddenAbility = WATERABSORB Moves = 1,POISONSTING,1,LEER,4,ABSORB,7,GROWTH,10,LEECHSEED,13,SANDATTACK,16,NEEDLEARM,19,FEINTATTACK,22,INGRAIN,26,PAYBACK,30,SPIKES,34,SUCKERPUNCH,38,PINMISSILE,42,ENERGYBALL,46,COTTONSPORE,50,SANDSTORM,54,DESTINYBOND TutorMoves = ATTRACT,BLOCK,BRICKBREAK,CONFIDE,CUT,DARKPULSE,DOUBLETEAM,DRAINPUNCH,ENERGYBALL,FACADE,FLING,FOCUSPUNCH,FRUSTRATION,GIGADRAIN,GRASSKNOT,HIDDENPOWER,LOWKICK,NATUREPOWER,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,REST,RETURN,ROLEPLAY,ROUND,SANDSTORM,SEEDBOMB,SLEEPTALK,SNORE,SOLARBEAM,SPITE,SUBSTITUTE,SUNNYDAY,SWAGGER,SWORDSDANCE,SYNTHESIS,THUNDERPUNCH,TOXIC,VENOSHOCK,WORRYSEED -EggMoves = ACID,BELCH,BLOCK,COUNTER,DISABLE,DYNAMICPUNCH,FELLSTINGER,GRASSWHISTLE,LOWKICK,MAGICALLEAF,NASTYPLOT,POWERUPPUNCH,ROTOTILLER,SEEDBOMB,SMELLINGSALTS,SWITCHEROO,TEETERDANCE,WORRYSEED +EggMoves = ACID,BELCH,BLOCK,COUNTER,DISABLE,DYNAMICPUNCH,FELLSTINGER,GRASSWHISTLE,LOWKICK,MAGICALLEAF,NASTYPLOT,POWERUPPUNCH,ROTOTILLER,SEEDBOMB,SMELLINGSALT,SWITCHEROO,TEETERDANCE,WORRYSEED Compatibility = Grass,Humanlike StepsToHatch = 5120 Height = 0.4 @@ -15238,7 +15238,7 @@ Abilities = ANTICIPATION,DRYSKIN HiddenAbility = POISONTOUCH Moves = 1,ASTONISH,3,MUDSLAP,8,POISONSTING,10,TAUNT,15,PURSUIT,17,FEINTATTACK,22,REVENGE,24,SWAGGER,29,MUDBOMB,31,SUCKERPUNCH,36,VENOSHOCK,38,NASTYPLOT,43,POISONJAB,45,SLUDGEBOMB,47,BELCH,50,FLATTER TutorMoves = ATTRACT,BOUNCE,BRICKBREAK,BULKUP,BULLDOZE,CONFIDE,DARKPULSE,DOUBLETEAM,DRAINPUNCH,DUALCHOP,EARTHQUAKE,EMBARGO,FACADE,FLING,FOCUSBLAST,FOCUSPUNCH,FOULPLAY,FRUSTRATION,GUNKSHOT,HELPINGHAND,HIDDENPOWER,ICEPUNCH,ICYWIND,KNOCKOFF,LOWKICK,LOWSWEEP,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SHADOWBALL,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,SNATCH,SNORE,SPITE,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERFANG,SWAGGER,TAUNT,THIEF,THUNDERPUNCH,TORMENT,TOXIC,VENOSHOCK,WORKUP,XSCISSOR -EggMoves = ACUPRESSURE,BULLETPUNCH,COUNTER,CROSSCHOP,DRAINPUNCH,DYNAMICPUNCH,FAKEOUT,FEINT,HEADBUTT,MEFIRST,MEDITATE,QUICKGUARD,SMELLINGSALTS,VACUUMWAVE,WAKEUPSLAP +EggMoves = ACUPRESSURE,BULLETPUNCH,COUNTER,CROSSCHOP,DRAINPUNCH,DYNAMICPUNCH,FAKEOUT,FEINT,HEADBUTT,MEFIRST,MEDITATE,QUICKGUARD,SMELLINGSALT,VACUUMWAVE,WAKEUPSLAP Compatibility = Humanlike StepsToHatch = 2560 Height = 0.7 @@ -17761,7 +17761,7 @@ Abilities = GUTS,SHEERFORCE HiddenAbility = IRONFIST Moves = 1,POUND,1,LEER,4,FOCUSENERGY,8,BIDE,12,LOWKICK,16,ROCKTHROW,20,WAKEUPSLAP,24,CHIPAWAY,28,BULKUP,31,ROCKSLIDE,34,DYNAMICPUNCH,37,SCARYFACE,40,HAMMERARM,43,STONEEDGE,46,FOCUSPUNCH,49,SUPERPOWER TutorMoves = ATTRACT,BLOCK,BRICKBREAK,BRUTALSWING,BULKUP,CONFIDE,DOUBLETEAM,DRAINPUNCH,FACADE,FIREPUNCH,FLING,FOCUSBLAST,FOCUSPUNCH,FRUSTRATION,GRASSKNOT,HELPINGHAND,HIDDENPOWER,ICEPUNCH,KNOCKOFF,LOWKICK,LOWSWEEP,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SLEEPTALK,SMACKDOWN,SNORE,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERPOWER,SWAGGER,TAUNT,THUNDERPUNCH,TOXIC,WORKUP -EggMoves = COMETPUNCH,COUNTER,DETECT,DRAINPUNCH,ENDURE,FORCEPALM,FORESIGHT,MACHPUNCH,POWERUPPUNCH,REVERSAL,SMELLINGSALTS,WIDEGUARD +EggMoves = COMETPUNCH,COUNTER,DETECT,DRAINPUNCH,ENDURE,FORCEPALM,FORESIGHT,MACHPUNCH,POWERUPPUNCH,REVERSAL,SMELLINGSALT,WIDEGUARD Compatibility = Humanlike StepsToHatch = 5120 Height = 0.6 @@ -20610,7 +20610,7 @@ Abilities = INNERFOCUS,REGENERATOR HiddenAbility = RECKLESS Moves = 1,POUND,5,MEDITATE,9,DETECT,13,FAKEOUT,17,DOUBLESLAP,21,SWIFT,25,CALMMIND,29,FORCEPALM,33,DRAINPUNCH,37,JUMPKICK,41,UTURN,45,QUICKGUARD,49,BOUNCE,50,HIGHJUMPKICK,57,REVERSAL,61,AURASPHERE TutorMoves = ACROBATICS,AERIALACE,ALLYSWITCH,ATTRACT,BOUNCE,BRICKBREAK,BULKUP,CALMMIND,CONFIDE,DOUBLETEAM,DRAINPUNCH,DUALCHOP,FACADE,FLING,FOCUSBLAST,FOCUSPUNCH,FRUSTRATION,GRASSKNOT,HELPINGHAND,HIDDENPOWER,KNOCKOFF,LOWKICK,LOWSWEEP,PAYBACK,POISONJAB,POWERUPPUNCH,PROTECT,PSYCHUP,RAINDANCE,REFLECT,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SLEEPTALK,SNORE,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,SWORDSDANCE,TAUNT,TOXIC,UTURN,WORKUP -EggMoves = ALLYSWITCH,BATONPASS,ENDURE,FEINT,KNOCKOFF,LOWKICK,MEFIRST,SMELLINGSALTS,VITALTHROW +EggMoves = ALLYSWITCH,BATONPASS,ENDURE,FEINT,KNOCKOFF,LOWKICK,MEFIRST,SMELLINGSALT,VITALTHROW Compatibility = Field,Humanlike StepsToHatch = 6400 Height = 0.9