From 2d526249868cd2228d43ab7217b25188402424ce Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Wed, 20 Jul 2022 16:10:28 -0400 Subject: [PATCH] pbs fixes --- PBS/moves.txt | 6 +++--- PBS/trainers.txt | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PBS/moves.txt b/PBS/moves.txt index e366a437e..f67221fcf 100644 --- a/PBS/moves.txt +++ b/PBS/moves.txt @@ -197,7 +197,7 @@ 189,BLAZEKICK,Blaze Kick,00A,85,FIRE,Physical,90,10,10,NearOther,0,abefh,"The user launches a kick with a high critical-hit ratio. It may also leave the target with a burn." 190,FIERYDANCE,Fiery Dance,020,80,FIRE,Special,100,10,50,NearOther,0,befo,"Cloaked in flames, the user dances and flaps its wings. It may also raise the user's Sp. Atk stat." 191,FIRELASH,Fire Lash,043,80,FIRE,Physical,100,15,100,NearOther,0,abef,"The user strikes the target with a burning lash. This also lowers the target's Defense stat." -192,FIREPLEDGE,Fire Pledge,107,80,FIRE,Special,100,10,0,NearOther,0,bef,"A column of fire hits opposing Pokémon. When used with its Grass equivalent, it makes a sea of fire." +192,FIREPLEDGE,Fire Pledge,107,50,FIRE,Special,100,10,0,NearOther,0,bef,"A column of fire hits opposing Pokémon. When used with its Grass equivalent, it makes a sea of fire." 193,LAVAPLUME,Lava Plume,00A,80,FIRE,Special,100,15,30,AllNearOthers,0,bef,"An inferno of scarlet flames torches everything around the user. It may leave targets with a burn." 194,FIREPUNCH,Fire Punch,00A,75,FIRE,Physical,100,15,10,NearOther,0,abefj,"The target is punched with a fiery fist. It may leave the target with a burn." 195,MYSTICALFIRE,Mystical Fire,045,75,FIRE,Special,100,10,100,NearOther,0,bef,"The user attacks by breathing a special, hot fire. This also lowers the target's Sp. Atk stat." @@ -272,7 +272,7 @@ 261,ENERGYBALL,Energy Ball,046,90,GRASS,Special,100,10,10,NearOther,0,befn,"The user draws power from nature and fires it at the target. It may also lower the target's Sp. Def." 262,LEAFBLADE,Leaf Blade,000,90,GRASS,Physical,100,15,0,NearOther,0,abefh,"The user handles a sharp leaf like a sword and attacks by slashing. It has a high critical-hit ratio." 263,PETALBLIZZARD,Petal Blizzard,000,90,GRASS,Physical,100,15,0,AllNearOthers,0,bef,"The user stirs up a violent petal blizzard and attacks everything around it." -264,GRASSPLEDGE,Grass Pledge,106,80,GRASS,Special,100,10,0,NearOther,0,bef,"A column of grass hits the foes. When used with its water equivalent, it creates a vast swamp." +264,GRASSPLEDGE,Grass Pledge,106,50,GRASS,Special,100,10,0,NearOther,0,bef,"A column of grass hits the foes. When used with its water equivalent, it creates a vast swamp." 265,SEEDBOMB,Seed Bomb,000,80,GRASS,Physical,100,15,0,NearOther,0,befn,"The user slams a barrage of hard-shelled seeds down on the target from above." 266,GIGADRAIN,Giga Drain,0DD,75,GRASS,Special,100,10,0,NearOther,0,bef,"A nutrient-draining attack. The user's HP is restored by half the damage taken by the target." 267,HORNLEECH,Horn Leech,0DD,75,GRASS,Physical,100,10,0,NearOther,0,abef,"The user drains the foe's energy with its horns. The user's HP is restored by half the damage inflicted." @@ -675,7 +675,7 @@ 656,LIQUIDATION,Liquidation,043,85,WATER,Physical,100,10,20,NearOther,0,abef,"The user slams into the target using a full-force blast of water. May lower the target's Defense." 657,DIVE,Dive,0CB,80,WATER,Physical,100,10,0,NearOther,0,abef,"Diving on the first turn, the user rises and hits on the next turn. It can be used to dive in the ocean." 658,SCALD,Scald,00A,80,WATER,Special,100,15,30,NearOther,0,befg,"The user shoots boiling hot water at its target. It may also leave the target with a burn." -659,WATERPLEDGE,Water Pledge,108,80,WATER,Special,100,10,0,NearOther,0,bef,"A column of water strikes the target. When combined with its fire equivalent, it makes a rainbow." +659,WATERPLEDGE,Water Pledge,108,50,WATER,Special,100,10,0,NearOther,0,bef,"A column of water strikes the target. When combined with its fire equivalent, it makes a rainbow." 660,WATERFALL,Waterfall,00F,80,WATER,Physical,100,15,20,NearOther,0,abe,"The user charges at the target and may make it flinch. It can also be used to climb a waterfall." 661,RAZORSHELL,Razor Shell,043,75,WATER,Physical,95,10,50,NearOther,0,abef,"The user cuts the foe with sharp shells. It may also lower the target's Defense stat." 662,BRINE,Brine,080,65,WATER,Special,100,10,0,NearOther,0,bef,"If the target's HP is down to about half, this attack will hit with double the power." diff --git a/PBS/trainers.txt b/PBS/trainers.txt index c87ceefd9..1647e5009 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -92,7 +92,7 @@ Pokemon = B51H93,34 #Hauntrio, ######################### [HAUNTEDGIRL,???] -Pokemon = B105H93,40 #Hauntwak, +Pokemon = B105H94,40 #Hauntwak, ############################ #### ROUTE 8 ############# @@ -1197,11 +1197,11 @@ Pokemon = B66H61,21 #Polichop, ## Celadon Café ###### ##################### -[HIPSTER,Jerry,0] +[COOLTRAINER_M,Jerry,0] Pokemon = B24H120,25 #Starbok ###################### -[HIPSTER,Jerry,1] +[COOLTRAINER_M,Jerry,1] Pokemon = B24H121,32 #Starbok Pokemon = B91H97,32 #Hypster ################### @@ -1396,8 +1396,8 @@ Pokemon = B23H41,11 #---------------- [TEAMROCKET_M,Francis] -Pokemon = ZUBAT,11 -Pokemon = B41H88,11 +Pokemon = ZUBAT,10 +Pokemon = B14H41,13 #---------------- [TEAMROCKET_F,Samantha]