diff --git a/Data/Map028.rxdata b/Data/Map028.rxdata index 2331f246f..ed1d81fe8 100644 Binary files a/Data/Map028.rxdata and b/Data/Map028.rxdata differ diff --git a/Data/Map034.rxdata b/Data/Map034.rxdata index 69444653f..a54a76154 100644 Binary files a/Data/Map034.rxdata and b/Data/Map034.rxdata differ diff --git a/Data/Map057.rxdata b/Data/Map057.rxdata index 58ea931ff..ca628de49 100644 Binary files a/Data/Map057.rxdata and b/Data/Map057.rxdata differ diff --git a/Data/Map099.rxdata b/Data/Map099.rxdata index cefc95360..6f8ee1e7f 100644 Binary files a/Data/Map099.rxdata and b/Data/Map099.rxdata differ diff --git a/Data/Map114.rxdata b/Data/Map114.rxdata index 686ebecfa..8ccac716f 100644 Binary files a/Data/Map114.rxdata and b/Data/Map114.rxdata differ diff --git a/Data/Map144.rxdata b/Data/Map144.rxdata index 6531d8f3e..0907920d3 100644 Binary files a/Data/Map144.rxdata and b/Data/Map144.rxdata differ diff --git a/Data/Map267.rxdata b/Data/Map267.rxdata index 035777cad..d44a385ed 100644 Binary files a/Data/Map267.rxdata and b/Data/Map267.rxdata differ diff --git a/Data/Map287.rxdata b/Data/Map287.rxdata index 27b812456..9c5053ecc 100644 Binary files a/Data/Map287.rxdata and b/Data/Map287.rxdata differ diff --git a/Data/Map354.rxdata b/Data/Map354.rxdata index e47674147..1e2d4a60a 100644 Binary files a/Data/Map354.rxdata and b/Data/Map354.rxdata differ diff --git a/Data/Map381.rxdata b/Data/Map381.rxdata index 3b6ee0a07..e9e13cc1b 100644 Binary files a/Data/Map381.rxdata and b/Data/Map381.rxdata differ diff --git a/Data/Map395.rxdata b/Data/Map395.rxdata index a509a5b0a..961c9f449 100644 Binary files a/Data/Map395.rxdata and b/Data/Map395.rxdata differ diff --git a/Data/Map466.rxdata b/Data/Map466.rxdata index 9205e45d8..0a7e34b15 100644 Binary files a/Data/Map466.rxdata and b/Data/Map466.rxdata differ diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata index fd9ef4c93..733f8d552 100644 Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ diff --git a/Data/Map539.rxdata b/Data/Map539.rxdata index 9c242e1cf..dbc1d1a61 100644 Binary files a/Data/Map539.rxdata and b/Data/Map539.rxdata differ diff --git a/Data/Map728.rxdata b/Data/Map728.rxdata index f5221d313..0f7aef7ef 100644 Binary files a/Data/Map728.rxdata and b/Data/Map728.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 44c1cf574..19684b2e8 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 293f587c9..333a997cc 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -272,16 +272,32 @@ module Settings # A list of maps used by roaming Pokémon. Each map has an array of other maps # it can lead to. ROAMING_AREAS = { - 5 => [21, 28, 31, 39, 41, 44, 47, 66, 69], - 21 => [5, 28, 31, 39, 41, 44, 47, 66, 69], - 28 => [5, 21, 31, 39, 41, 44, 47, 66, 69], - 31 => [5, 21, 28, 39, 41, 44, 47, 66, 69], - 39 => [5, 21, 28, 31, 41, 44, 47, 66, 69], - 41 => [5, 21, 28, 31, 39, 44, 47, 66, 69], - 44 => [5, 21, 28, 31, 39, 41, 47, 66, 69], - 47 => [5, 21, 28, 31, 39, 41, 44, 66, 69], - 66 => [5, 21, 28, 31, 39, 41, 44, 47, 69], - 69 => [5, 21, 28, 31, 39, 41, 44, 47, 66] + 262 => [261,311], + 311 => [262,312], + 312 => [311], + 261 => [262,288,267], + 288 => [261,267,285], + 267 => [261,288,300,254], + 284 => [288,266,285], + 300 => [267,254], + 254 => [300,265], + 266 => [284,265], + 265 => [266,254], + 285 => [284,288]} + + SEVII_ROAMING = { + 528 => [526], #Treasure beach + 526 => [528,559], #Knot Island + 559 => [526,561,564], #Kindle Road + 561 => [559], #Mt. Ember + 564 => [559,562,563,594], #brine road + 562 => [564], #boon island + 563 => [564,600] , #kin island + 594 => [564,566,603], #water labyrinth + 600 => [563,619], #bond bridge + 619 => [600] , #Berry forest + 566 => [594,603], #Resort gorgeous + 603 => [566,594], #Chrono Island } # A set of arrays, each containing the details of a roaming Pokémon. The # information within each array is as follows: @@ -293,15 +309,11 @@ module Settings # * Name of BGM to play for that encounter (optional). # * Roaming areas specifically for this Pokémon (optional). ROAMING_SPECIES = [ - [:LATIAS, 30, 53, 0, "Battle roaming"], - [:LATIOS, 30, 53, 0, "Battle roaming"], - [:KYOGRE, 40, 54, 2, nil, { - 2 => [21, 31], - 21 => [2, 31, 69], - 31 => [2, 21, 69], - 69 => [21, 31] - }], - [:ENTEI, 40, 55, 1, nil] + [:ENTEI, 50, 350, 1, "Legendary Birds"], + [:B245H243, 50, 341, 1, "Legendary Birds"], + [:LATIOS, 50, 602, 0, "Legendary Birds",SEVII_ROAMING], + [:LATIAS, 50, 602, 0, "Legendary Birds",SEVII_ROAMING], + [:FEEBAS, 15, 4, 3, "Pokemon HeartGold and SoulSilver - Wild Pokemon Battle (Kanto)",SEVII_ROAMING] ] #============================================================================= diff --git a/Data/Scripts/011_Battle/005_BallHandlers_PokeBallEffects.rb b/Data/Scripts/011_Battle/005_BallHandlers_PokeBallEffects.rb index 8aef52a92..c832e167f 100644 --- a/Data/Scripts/011_Battle/005_BallHandlers_PokeBallEffects.rb +++ b/Data/Scripts/011_Battle/005_BallHandlers_PokeBallEffects.rb @@ -1,30 +1,45 @@ -$BallTypes = { - 0 => :POKEBALL, - 1 => :GREATBALL, - 2 => :SAFARIBALL, - 3 => :ULTRABALL, - 4 => :MASTERBALL, - 5 => :NETBALL, - 6 => :DIVEBALL, - 7 => :NESTBALL, - 8 => :REPEATBALL, - 9 => :TIMERBALL, - 10 => :LUXURYBALL, - 11 => :PREMIERBALL, - 12 => :DUSKBALL, - 13 => :HEALBALL, - 14 => :QUICKBALL, - 15 => :CHERISHBALL, - 16 => :FASTBALL, - 17 => :LEVELBALL, - 18 => :LUREBALL, - 19 => :HEAVYBALL, - 20 => :LOVEBALL, - 21 => :FRIENDBALL, - 22 => :MOONBALL, - 23 => :SPORTBALL, - 24 => :DREAMBALL, - 25 => :BEASTBALL +$BallTypes={ + 0=>:POKEBALL, + 1=>:GREATBALL, + 2=>:SAFARIBALL, + 3=>:ULTRABALL, + 4=>:MASTERBALL, + 5=>:NETBALL, + 6=>:DIVEBALL, + 7=>:NESTBALL, + 8=>:REPEATBALL, + 9=>:TIMERBALL, + 10=>:LUXURYBALL, + 11=>:PREMIERBALL, + 12=>:DUSKBALL, + 13=>:HEALBALL, + 14=>:QUICKBALL, + 15=>:CHERISHBALL, + 16=>:FASTBALL, + 17=>:LEVELBALL, + 18=>:LUREBALL, + 19=>:HEAVYBALL, + 20=>:LOVEBALL, + 21=>:FRIENDBALL, + 22=>:MOONBALL, + 23=>:SPORTBALL, + 24=>:GENDERBALL, + 25=>:TRADEBALL, + 26=>:ABILITYBALL, + 27=>:VIRUSBALL, + 28=>:SHINYBALL, + 29=>:PERFECTBALL, + 30=>:DREAMBALL, + 31=>:TOXICBALL, + 32=>:SPARKBALL, + 33=>:SCORCHBALL, + 34=>:FROSTBALL, + 35=>:PUREBALL, + 36=>:STATUSBALL, + 37=>:CANDYBALL, + 38=>:FIRECRACKER, + 39=>:ROCKETBALL, + 40=>:FUSIONBALL } def pbBallTypeToItem(ball_type) diff --git a/Data/Scripts/050_AddOns/BattleLounge.rb b/Data/Scripts/050_AddOns/BattleLounge.rb index 92ddb2bc4..e69c7e270 100644 --- a/Data/Scripts/050_AddOns/BattleLounge.rb +++ b/Data/Scripts/050_AddOns/BattleLounge.rb @@ -160,7 +160,7 @@ def generateSameEggGroupFusionsTeam(eggGroup_id) while !foundFusionPartner species2 = rand(Settings::NB_POKEMON) + 1 if getPokemonEggGroups(species2).include?(eggGroup) - generatedTeam << getFusionSpecies(species1, specieres2) + generatedTeam << getFusionSpecies(species1, species2) foundFusionPartner = true end end diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index afa1235b7..dba8aeff4 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/Data/Scripts/050_AddOns/GeneralUtils.rb @@ -371,3 +371,9 @@ def reverseFusionSpecies(species) return getPokemon(newspecies) end +def Kernel.getRoamingMap(roamingArrayPos) + curmap=$PokemonGlobal.roamPosition[roamingArrayPos] + mapinfos=$RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata") + text= mapinfos[curmap].name#,(curmap==$game_map.map_id) ? _INTL("(this map)") : "") + return text +end \ No newline at end of file diff --git a/Data/Scripts/050_AddOns/New Balls.rb b/Data/Scripts/050_AddOns/New Balls.rb index 4fe6d86e4..78811475d 100644 --- a/Data/Scripts/050_AddOns/New Balls.rb +++ b/Data/Scripts/050_AddOns/New Balls.rb @@ -12,31 +12,30 @@ elsif pokemon.gender == 1 end }) - #BOOST BALL 25 - rend le pokemon traded #catch rate: 80% pokeball BallHandlers::ModifyCatchRate.add(:TRADEBALL,proc{|ball,catchRate,battle,pokemon| - catchRate=(catchRate*0.8).floor + catchRate=(catchRate*0.8).floor(1) next catchRate }) BallHandlers::OnCatch.add(:TRADEBALL,proc{|ball,battle,pokemon| - pokemon.obtainMode = 2 + pokemon.obtain_method = 2 }) #ABILITY BALL 26 - change l'ability #catch rate: 60% pokeball BallHandlers::ModifyCatchRate.add(:ABILITYBALL,proc{|ball,catchRate,battle,pokemon| - catchRate=(catchRate*0.6).floor + catchRate=(catchRate*0.6).floor(1) next catchRate }) BallHandlers::OnCatch.add(:ABILITYBALL,proc{|ball,battle,pokemon| - pokemon.setAbility(2) + #pokemon.ability=2 }) #VIRUS BALL 27 - give pokerus #catch rate: 40% pokeball BallHandlers::ModifyCatchRate.add(:VIRUSBALL,proc{|ball,catchRate,battle,pokemon| - catchRate=(catchRate*0.4).floor + catchRate=(catchRate*0.4).floor(1) next catchRate }) BallHandlers::OnCatch.add(:VIRUSBALL,proc{|ball,battle,pokemon| @@ -46,7 +45,7 @@ BallHandlers::OnCatch.add(:VIRUSBALL,proc{|ball,battle,pokemon| #SHINY BALL 28 - rend shiny #catchrate: 20% pokeball BallHandlers::ModifyCatchRate.add(:SHINYBALL,proc{|ball,catchRate,battle,pokemon| - catchRate=(catchRate*0.2).floor + catchRate=(catchRate*0.2).floor(1) next catchRate }) BallHandlers::OnCatch.add(:SHINYBALL,proc{|ball,battle,pokemon| @@ -56,7 +55,7 @@ BallHandlers::OnCatch.add(:SHINYBALL,proc{|ball,battle,pokemon| #PERFECTBALL 29 #catch rate: 10% pokeball BallHandlers::ModifyCatchRate.add(:PERFECTBALL,proc{|ball,catchRate,battle,pokemon| - catchRate=(catchRate*0.1).floor + catchRate=(catchRate*0.1).floor(1) next catchRate }) BallHandlers::OnCatch.add(:PERFECTBALL,proc{|ball,battle,pokemon| @@ -70,27 +69,32 @@ BallHandlers::OnCatch.add(:PERFECTBALL,proc{|ball,battle,pokemon| #DREAMBALL - endormi BallHandlers::ModifyCatchRate.add(:DREAMBALL,proc{|ball,catchRate,battle,battler| - battler.status = PBStatuses::SLEEP + battler.status = :SLEEP + catchRate = 1 next catchRate }) #TOXICBALL - empoisonné BallHandlers::ModifyCatchRate.add(:TOXICBALL,proc{|ball,catchRate,battle,battler| - battler.status = PBStatuses::POISON + battler.status = :POISON + catchRate = 1 next catchRate }) #SCORCHBALL - brulé BallHandlers::ModifyCatchRate.add(:SCORCHBALL,proc{|ball,catchRate,battle,battler| - battler.status = PBStatuses::BURN + battler.status = :BURN + catchRate = 1 next catchRate }) #FROSTBALL - frozen BallHandlers::ModifyCatchRate.add(:FROSTBALL,proc{|ball,catchRate,battle,battler| - battler.status = PBStatuses::FROZEN + battler.status = :FROZEN + catchRate = 1 next catchRate }) #SPARKBALL - paralizé BallHandlers::ModifyCatchRate.add(:SPARKBALL,proc{|ball,catchRate,battle,battler| - battler.status = PBStatuses::PARALYSIS + battler.status = :PARALYSIS + catchRate = 1 next catchRate }) #PUREBALL - marche mieux quand pas de status @@ -104,9 +108,9 @@ BallHandlers::ModifyCatchRate.add(:STATUSBALL,proc{|ball,catchRate,battle,battle next catchRate }) -#FUSIONBALL - marche mieux quand fused +#FUSIONBALL - marche mieux quand fusedr BallHandlers::ModifyCatchRate.add(:FUSIONBALL,proc{|ball,catchRate,battle,battler| - catchRate*=3 if battler.species > NB_POKEMON + catchRate*=3 if GameData::Species.get(battler.species).id_number > Settings::NB_POKEMON next catchRate }) diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 59f9ce592..fee167acd 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -930,13 +930,13 @@ ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, pokemon, scene| #TRACKER (for roaming legendaries) ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item| - if RoamingSpecies.length == 0 + if Settings::ROAMING_SPECIES.length == 0 Kernel.pbMessage(_INTL("No roaming Pokémon defined.")) else text = "\\l[8]" min = $game_switches[350] ? 0 : 1 - for i in min...RoamingSpecies.length - poke = RoamingSpecies[i] + for i in min...Settings::ROAMING_SPECIES.length + poke = Settings::ROAMING_SPECIES[i] next if poke == PBSPecies::FEEBAS if $game_switches[poke[2]] status = $PokemonGlobal.roamPokemon[i] @@ -970,7 +970,7 @@ ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item| #text+=_INTL("{1} does not appear to be roaming.", # PBSpecies.getName(getID(PBSpecies,poke[0])),poke[1],poke[2]) end - text += "\n" if i < RoamingSpecies.length - 1 + text += "\n" if i < Settings::ROAMING_SPECIES.length - 1 end Kernel.pbMessage(text) end @@ -1638,14 +1638,21 @@ ItemHandlers::UseInField.add(:DEVONSCOPE, proc { |item| #TRACKER (for roaming legendaries) ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item| + track_pokemon() +}) +ItemHandlers::UseFromBag.add(:REVEALGLASS, proc { |item| + track_pokemon() +}) + +def track_pokemon() nbRoaming = 0 - if RoamingSpecies.length == 0 + if Settings::ROAMING_SPECIES.length == 0 Kernel.pbMessage(_INTL("No roaming Pokémon defined.")) else text = "\\l[8]" min = $game_switches[350] ? 0 : 1 - for i in min...RoamingSpecies.length - poke = RoamingSpecies[i] + for i in min...Settings::ROAMING_SPECIES.length + poke = Settings::ROAMING_SPECIES[i] next if poke[0] == :FEEBAS if $game_switches[poke[2]] status = $PokemonGlobal.roamPokemon[i] @@ -1680,14 +1687,14 @@ ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item| #text+=_INTL("{1} does not appear to be roaming.", # PBSpecies.getName(getID(PBSpecies,poke[0])),poke[1],poke[2]) end - text += "\n" if i < RoamingSpecies.length - 1 + #text += "\n" if i < Settings::ROAMING_SPECIES.length - 1 end if nbRoaming == 0 text = "No Pokémon appears to be roaming at this moment." end Kernel.pbMessage(text) end -}) +end ####EXP. ALL #Methodes relative a l'exp sont pas encore la et pas compatibles diff --git a/Data/System.rxdata b/Data/System.rxdata index 92baedea6..4789b14f6 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/items.dat b/Data/items.dat index 53c30c495..a2495755b 100644 Binary files a/Data/items.dat and b/Data/items.dat differ diff --git a/Data/messages.dat b/Data/messages.dat index 1caa05dee..0c85f7a3f 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Data/trainer_types.dat b/Data/trainer_types.dat index bb3a0610d..4d0b0c8fa 100644 Binary files a/Data/trainer_types.dat and b/Data/trainer_types.dat differ diff --git a/Data/trainers.dat b/Data/trainers.dat index c2d31554c..2d02ad5a7 100644 Binary files a/Data/trainers.dat and b/Data/trainers.dat differ diff --git a/PBS/items.txt b/PBS/items.txt index 8aba8ef6f..5972c08c9 100644 --- a/PBS/items.txt +++ b/PBS/items.txt @@ -527,7 +527,7 @@ 520,AURORATICKET,Navel Ticket,Navel Tickets,8,0,A ticket required to board a ship to a faraway island. It glows beautifully.,0,0,6, 521,OLDSEAMAP,Old Sea Map,Old Sea Maps,8,0,A faded sea chart that shows the way to a certain island.,0,0,6, 522,DNASPLICERS,DNA Splicers,DNA Splicers,1,300,A splicer that fuses the DNA of any two Pokemon into a single entirely new Pokemon.,1,0,0, -523,REVEALGLASS,Tracker,Trackers,8,0,"It's a device that can track a Pokémon's location with a GPS chip.",5,0,6, +523,REVEALGLASS,Tracker,Trackers,8,0,"It's a device that can track a Pokémon's location with a GPS chip.",2,0,6, 524,OVALCHARM,Oval Charm,Oval Charms,8,0,An oval charm said to increase the chance of Eggs being found at the Day Care.,0,0,6, 525,SHINYCHARM,Shiny Charm,Shiny Charms,8,0,A shiny charm said to increase the chance of finding a Shiny Pokémon.,0,0,6, #------------------------------- @@ -560,12 +560,12 @@ 552,CARDKEY,Card Key,Card Keys,8,0,"A card-type key that unlocks doors in Silph Co.'s Head Office in Saffron City.",0,0,6, 553,PIZZA,Pizza,Pizzas,2,800,A freshly baked pizza. It could probably be sold for some money.,1,1,0, 554,CAPTAINSKEY,"Captain's Key","Captain's Keys",8,0,"A key to open the captain's room on the S.S. Anne.",0,0,6, -555,GENDERBALL,Gender Ball,Gender Balls,3,400,"A peculiar low capture rate Ball that switches the caught Pokémon gender. It won't work on genderless Pokémon.",0,2,4, -556,TRADEBALL,Boost Ball,Boost Balls,3,500,"A peculiar low capture rate Ball that makes the caught Pokémon gain boosted exp as if it were traded.",0,2,4, -557,ABILITYBALL,Ability Ball,Ability Balls,3,600,"A peculiar very low capture rate Ball that unlocks the caught Pokémon's hidden ability.",0,2,4, -558,VIRUSBALL,Virus Ball,Virus Balls,3,800,"A peculiar very low capture rate Ball that infects the caught Pokémon with Pokérus.",0,2,4, -559,SHINYBALL,Glitter Ball,Glitter Balls,3,1000,"A peculiar low capture rate Ball that makes the caught Pokémon sparkle when sent out.",0,2,4, -560,PERFECTBALL,Perfect Ball,Perfect Balls,3,1200,"A peculiar extremely low capture rate Ball that makes the caught Pokémon as strong as possible in a few stats.",0,2,4, +555,GENDERBALL,Gender Ball,Gender Balls,3,400,"A peculiar low capture rate Ball that switches the caught Pokémon gender. It won't work on genderless Pokémon.",0,4,4, +556,TRADEBALL,Boost Ball,Boost Balls,3,500,"A peculiar low capture rate Ball that makes the caught Pokémon gain boosted exp as if it were traded.",0,4,4, +557,ABILITYBALL,Ability Ball,Ability Balls,3,600,"A peculiar very low capture rate Ball that unlocks the caught Pokémon's hidden ability.",0,4,4, +558,VIRUSBALL,Virus Ball,Virus Balls,3,800,"A peculiar very low capture rate Ball that infects the caught Pokémon with Pokérus.",0,4,4, +559,SHINYBALL,Glitter Ball,Glitter Balls,3,1000,"A peculiar low capture rate Ball that makes the caught Pokémon sparkle when sent out.",0,4,4, +560,PERFECTBALL,Perfect Ball,Perfect Balls,3,1200,"A peculiar extremely low capture rate Ball that makes the caught Pokémon as strong as possible in a few stats.",0,4,4, 561,OLDBOOT,Old Boot,Old Boots,1,100,"An old, worn-out leather boot. It's trash, but someone might like it...",1,1,0, 562,INFINITESPLICERS,Infinite Splicers,Infinite Splicers,8,0,"Fuses the DNA of two Pokémon to create a new species. Can be reused as many times as you like.",5,0,6, 563,EXPALL,Exp. All,Exp. Alls,8,0,"An item that can be used to share experience gained with every party member.",2,0,6, @@ -578,14 +578,14 @@ 570,TRANSGENDERSTONE,Gender Stone,Gender Stones,1,2100,A peculiar stone that turns a Pokémon into the opposite gender.,1,0,0, 571,WHITEFLAG,White Flag,White Flags,1,200,"A flag that allows you to forfeit a trainer battle once.",0,0,0, 572,FAIRYGEM,Fairy Gem,Fairy Gems,1,200,"A gem with an essence of fairies. When held, it strengthens the power of a Fairy-type move only once.",0,0,0, -573,DREAMBALL,Dream Ball,Dream Balls,3,4000,"A somewhat different Poké Ball that makes a wild Pokémon fall asleep.",0,2,4, -574,TOXICBALL,Toxic Ball,Toxic Balls,3,4000,"A somewhat different Poké Ball that poisons a wild Pokémon.",0,2,4, -575,SPARKBALL,Spark Ball,Spark Balls,3,4000,"A somewhat different Poké Ball that paralyzes a wild Pokémon.",0,2,4, -576,SCORCHBALL,Scorch Ball,Scorch Balls,3,4000,"A somewhat different Poké Ball that burns a wild Pokémon.",0,2,4, -577,FROSTBALL,Frost Ball,Frost Balls,3,4000,"A somewhat different Poké Ball that freezes a wild Pokémon.",0,2,4, -578,PUREBALL,Pure Ball,Pure Balls,3,1000,"A somewhat different Poké Ball that works better on a Pokémon with no status ailment",0,2,4, -579,STATUSBALL,Status Ball,Status Balls,3,1000,"A somewhat different Poké Ball that works better on a Pokémon with a status ailment",0,2,4, -580,CANDYBALL,Candy Ball,Candy Balls,3,4000,"A Poké Ball that makes the caught Pokémon gain 5 levels upon capture.",0,2,4, +573,DREAMBALL,Dream Ball,Dream Balls,3,4000,"A somewhat different Poké Ball that makes a wild Pokémon fall asleep.",0,4,4, +574,TOXICBALL,Toxic Ball,Toxic Balls,3,4000,"A somewhat different Poké Ball that poisons a wild Pokémon.",0,4,4, +575,SPARKBALL,Spark Ball,Spark Balls,3,4000,"A somewhat different Poké Ball that paralyzes a wild Pokémon.",0,4,4, +576,SCORCHBALL,Scorch Ball,Scorch Balls,3,4000,"A somewhat different Poké Ball that burns a wild Pokémon.",0,4,4, +577,FROSTBALL,Frost Ball,Frost Balls,3,4000,"A somewhat different Poké Ball that freezes a wild Pokémon.",0,4,4, +578,PUREBALL,Pure Ball,Pure Balls,3,1000,"A somewhat different Poké Ball that works better on a Pokémon with no status ailment",0,4,4, +579,STATUSBALL,Status Ball,Status Balls,3,1000,"A somewhat different Poké Ball that works better on a Pokémon with a status ailment",0,4,4, +580,CANDYBALL,Candy Ball,Candy Balls,3,4000,"A Poké Ball that makes the caught Pokémon gain 5 levels upon capture.",0,4,4, 581,DNAREVERSER,DNA Reverser,DNA Reversers,1,300,A splicer that reverses the DNA of a fused Pokémon to create the inverse fusion.,1,0,0, 582,ROCKETMEAL,Rocket Meal,Rocket Meals,2,500,"A full meal given to Team Rocket employees. It's surprisingly tasty!",1,1,0, 583,FANCYMEAL,Fancy Meal,Fancy Meals,2,1200,"A full meal from a fancy restaurant. It tastes fantastic.",1,1,0, @@ -628,8 +628,8 @@ 620,TM104,TM104,TM104s,4,30000,"Restoring its own cells, the user restores its own HP by half of its max HP.",3,0,0,RECOVER 621,TM105,TM105,TM105s,4,30000,"The user lunges at the target at a speed that makes it almost invisible. It is sure to strike first.",3,0,0,AQUAJET 622,TM108,TM108,TM108s,4,30000,"A second-turn attack move where critical hits land more easily. It may also make the target flinch.",3,0,0,SKYATTACK -623,ROCKETBALL,Rocket Ball,Rocket Balls,3,300,"Like a Pokéball, but black.",0,2,4, -624,FUSIONBALL,Fusion Ball,Fusion Balls,3,400,"A somewhat different Poké Ball that works better on fused Pokémon.",0,2,4, +623,ROCKETBALL,Rocket Ball,Rocket Balls,3,300,"Like a Pokéball, but black.",0,4,4, +624,FUSIONBALL,Fusion Ball,Fusion Balls,3,400,"A somewhat different Poké Ball that works better on fused Pokémon.",0,4,4, 625,TM106,TM106,TM106s,4,10000,"The user steals the target's HP with a kiss. The user's HP is restored by over half of the damage taken by the target.",3,0,0,DRAININGKISS 626,TM107,TM107,TM107s,4,40000,"The user plays rough with the target and attacks it.",3,0,0,PLAYROUGH 627,RUBY,Ruby,Rubys,8,0,"An exquisite, red-glowing gem that symbolizes passion.",2,0,6, diff --git a/PBS/trainers.txt b/PBS/trainers.txt index 9470e8ad2..d2d34a7f3 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -4658,7 +4658,7 @@ Pokemon = B65H255,69 #Mismakazam, Item = WISEGLASSES Pokemon = B18H169,68 #Crogeot Moves = WHIRLWIND,CROSSPOISON,UTURN,AIRSLASH - AbilityIndex = 10 Item = WISEGLASSES + AbilityIndex = 1 Item=RAZORFANG Pokemon = MEW,72 #Starter Item = LEFTOVERS