various fixes

This commit is contained in:
infinitefusion
2022-10-29 17:27:55 -04:00
parent 49f7edb06a
commit cd906e7f1c
52 changed files with 40802 additions and 39072 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
1,REPEL,Repel,Repels,1,300,"An item that prevents weak wild Pokémon from appearing for 100 steps after its use.",2,0,0,
1,REPEL,Repel,Repels,1,300,"An item that prevents weak wild Pokémon from appearing for 100 steps after its use.",2,0,0,
2,SUPERREPEL,Super Repel,Super Repels,1,500,"An item that prevents weak wild Pokémon from appearing for 200 steps after its use.",2,0,0,
3,MAXREPEL,Max Repel,Max Repels,1,700,"An item that prevents weak wild Pokémon from appearing for 250 steps after its use.",2,0,0,
4,BLACKFLUTE,Black Flute,Black Flutes,1,400,"A black flute made from blown glass. Its melody makes wild Pokémon less likely to appear.",2,0,0,
@@ -102,12 +102,12 @@
102,METRONOME,Metronome,Metronomes,1,4000,"A Pokémon held item that boosts a move used consecutively. Its effect is reset if another move is used.",0,0,0,
103,MUSCLEBAND,Muscle Band,Muscle Bands,1,4000,"An item to be held by a Pokémon. It is a headband that slightly boosts the power of physical moves.",0,0,0,
104,WISEGLASSES,Wise Glasses,Wise Glasses,1,4000,"An item to be held by a Pokémon. It is a thick pair of glasses that slightly boosts the power of special moves.",0,0,0,
105,RAZORCLAW,Razor Claw,Razor Claws,1,5000,"An item to be held by a Pokémon. It is a sharply hooked claw that ups the holder's critical-hit ratio.",0,0,0,
105,RAZORCLAW,Razor Claw,Razor Claws,1,5000,"An item to be held by a Pokémon. It is a sharply hooked claw that ups the holder's critical-hit ratio.",1,0,7,
106,SCOPELENS,Scope Lens,Scope Lenses,1,4000,"An item to be held by a Pokémon. It is a lens that boosts the holder's critical-hit ratio.",0,0,0,
107,WIDELENS,Wide Lens,Wide Lenses,1,4000,"An item to be held by a Pokémon. It is a magnifying lens that slightly boosts the accuracy of moves.",0,0,0,
108,ZOOMLENS,Zoom Lens,Zoom Lenses,1,4000,"An item to be held by a Pokémon. If the holder moves after its target, its accuracy will be boosted.",0,0,0,
109,KINGSROCK,King's Rock,King's Rocks,1,5000,"An item to be held by a Pokémon. When the holder inflicts damage, the target may flinch.",0,0,0,
110,RAZORFANG,Razor Fang,Razor Fangs,1,5000,"An item to be held by a Pokémon. It may make foes and allies flinch when the holder inflicts damage.",0,0,0,
109,KINGSROCK,King's Rock,King's Rocks,1,5000,"An item to be held by a Pokémon. When the holder inflicts damage, the target may flinch.",1,0,7,
110,RAZORFANG,Razor Fang,Razor Fangs,1,5000,"An item to be held by a Pokémon. It may make foes and allies flinch when the holder inflicts damage.",1,0,7,
111,LAGGINGTAIL,Lagging Tail,Lagging Tails,1,4000,"An item to be held by a Pokémon. It is tremendously heavy and makes the holder move slower than usual.",0,0,0,
112,QUICKCLAW,Quick Claw,Quick Claws,1,4000,"An item to be held by a Pokémon. A light, sharp claw that lets the bearer move first occasionally.",0,0,0,
113,FOCUSBAND,Focus Band,Focus Bands,1,4000,"An item to be held by a Pokémon. The holder may endure a potential KO attack, leaving it with just 1 HP.",0,0,0,
@@ -146,9 +146,9 @@
146,SILVERPOWDER,Silver Powder,Silver Powders,1,1000,"An item to be held by a Pokémon. It is a shiny, silver powder that ups the power of Bug-type moves.",0,0,0,
147,HARDSTONE,Hard Stone,Hard Stones,1,1000,"An item to be held by a Pokémon. It is an unbreakable stone that ups the power of Rock-type moves.",0,0,0,
148,SPELLTAG,Spell Tag,Spell Tags,1,1000,"An item to be held by a Pokémon. It is a sinister, eerie tag that boosts the power of Ghost-type moves.",0,0,0,
149,DRAGONFANG,Dragon Fang,Dragon Fangs,1,1000,"An item to be held by a Pokémon. It is a hard and sharp fang that ups the power of Dragon-type moves.",0,0,0,
149,DRAGONFANG,Dragon Fang,Dragon Fangs,1,1000,"An item to be held by a Pokémon. It is a hard and sharp fang that ups the power of Dragon-type moves.",1,0,0,
150,BLACKGLASSES,Black Glasses,Black Glasses,1,1000,"An item to be held by a Pokémon. It is a shady-looking pair of glasses that boosts Dark-type moves.",0,0,0,
151,METALCOAT,Metal Coat,Metal Coats,1,2000,"An item to be held by a Pokémon. It is a special metallic film that ups the power of Steel-type moves.",0,0,0,
151,METALCOAT,Metal Coat,Metal Coats,1,2000,"An item to be held by a Pokémon. It is a special metallic film that ups the power of Steel-type moves.",1,0,7,
152,SILKSCARF,Silk Scarf,Silk Scarves,1,1000,"An item to be held by a Pokémon. It is a sumptuous scarf that boosts the power of Normal-type moves.",0,0,0,
153,FLAMEPLATE,Flame Plate,Flame Plates,1,1000,"An item to be held by a Pokémon. It is a stone tablet that boosts the power of Fire-type moves.",0,0,0,
154,SPLASHPLATE,Splash Plate,Splash Plates,1,1000,"An item to be held by a Pokémon. It is a stone tablet that boosts the power of Water-type moves.",0,0,0,
@@ -200,15 +200,15 @@
200,BURNDRIVE,Burn Drive,Burn Drives,1,1000,"A cassette to be held by Genesect. It changes Techno Blast to a Fire-type move.",0,0,0,
201,CHILLDRIVE,Chill Drive,Chill Drives,1,1000,"A cassette to be held by Genesect. It changes Techno Blast to an Ice-type move.",0,0,0,
202,EVERSTONE,Everstone,Everstones,1,300,"An item to be held by a Pokémon. The Pokémon holding this peculiar stone is prevented from evolving.",0,0,0,
203,DRAGONSCALE,Dragon Scale,Dragon Scales,1,2000,"A thick and tough scale. Dragon-type Pokémon may be holding this item when caught.",0,0,0,
203,DRAGONSCALE,Dragon Scale,Dragon Scales,1,2000,"A thick and tough scale. Dragon-type Pokémon may be holding this item when caught.",1,0,7,
204,UPGRADE,Upgrade,Upgrades,1,2000,"A transparent device filled with all sorts of data. It was produced by Silph Co.",1,0,7,
205,DUBIOUSDISC,Dubious Disc,Dubious Discs,1,2000,"A transparent device overflowing with dubious data. Its producer is unknown.",1,0,7,
206,PROTECTOR,Protector,Protectors,1,2000,"A protective item of some sort. It is extremely stiff and heavy. It is loved by a certain Pokémon.",0,0,0,
207,ELECTIRIZER,Electirizer,Electirizers,1,2000,"A box packed with a tremendous amount of electric energy. It is loved by a certain Pokémon.",0,0,0,
208,MAGMARIZER,Magmarizer,Magmarizers,1,2000,"A box packed with a tremendous amount of magma energy. It is loved by a certain Pokémon.",0,0,0,
209,REAPERCLOTH,Reaper Cloth,Reaper Cloths,1,2000,"A cloth imbued with horrifyingly strong spiritual energy. It is loved by a certain Pokémon.",0,0,0,
210,PRISMSCALE,Prism Scale,Prism Scales,1,2000,"A mysterious scale that evolves certain Pokémon. It shines in rainbow colors.",0,0,0,
211,OVALSTONE,Oval Stone,Oval Stones,1,2000,"A peculiar stone that makes certain species of Pokémon evolve. It is shaped like an egg.",0,0,0,
206,PROTECTOR,Protector,Protectors,1,2000,"A protective item of some sort. It is extremely stiff and heavy. It is loved by a certain Pokémon.",1,0,7,
207,ELECTIRIZER,Electirizer,Electirizers,1,2000,"A box packed with a tremendous amount of electric energy. It is loved by a certain Pokémon.",1,0,7,
208,MAGMARIZER,Magmarizer,Magmarizers,1,2000,"A box packed with a tremendous amount of magma energy. It is loved by a certain Pokémon.",1,0,7,
209,REAPERCLOTH,Reaper Cloth,Reaper Cloths,1,2000,"A cloth imbued with horrifyingly strong spiritual energy. It is loved by a certain Pokémon.",1,0,7,
210,PRISMSCALE,Prism Scale,Prism Scales,1,2000,"A mysterious scale that evolves certain Pokémon. It shines in rainbow colors.",1,0,7,
211,OVALSTONE,Oval Stone,Oval Stones,1,2000,"A peculiar stone that makes certain species of Pokémon evolve. It is shaped like an egg.",1,0,7,
212,REDSCARF,Red Scarf,Red Scarves,1,100,"An item to be held by a Pokémon. It boosts the Cool aspect of the holder in a Contest.",0,0,0,
213,BLUESCARF,Blue Scarf,Blue Scarves,1,100,"An item to be held by a Pokémon. It boosts the Beauty aspect of the holder in a Contest.",0,0,0,
214,PINKSCARF,Pink Scarf,Pink Scarves,1,100,"An item to be held by a Pokémon. It boosts the Cute aspect of the holder in a Contest.",0,0,0,
@@ -665,5 +665,6 @@
657,TM120,TM120,TM120s,4,30000,"The user attacks the target's throat. The target cannot use sound-based moves for two turns.",3,0,0,THROATCHOP
658,TM00,TM00,TM00s,4,0,"A strange TM developped by Team Rocket. It appears to be related to Pokémon fusion.",3,0,0,FUSIONSWAP
659,TM121,TM121,TM121s,4,10000,"The user shoots boiling hot water at its target. It may also leave the target with a burn.",3,0,0,SCALD
660,LINKINGCORD,Linking Cord,Linking Cords,1,6000,"A cable exuding a mysterious energy. Its loved by certain Pokémon.",1,0,7,

View File

@@ -172,7 +172,7 @@ Point=7,16,"Union Cave",,,,,
Point=6,15,"Route 33",,,,,
Point=5,15,"Route 33",,,,,
#sevii islands
#sevii islandsd
Point=22,24,KnotIsland,,526,27,12,
Point=21,27,"Treasure Beach",,,,,
@@ -186,8 +186,10 @@ Point=23,20,"Kindle Road",,,,,
Point=23,19,"Kindle Road",,,,,
Point=23,18,"Kindle Road",,,,,
Point=23,17,"Mt. Ember",,,,,
Point=23,17,"Mt. Ember",,,,,
Point=23,25,"Battle Factory",,559,46,74,
Point=23,21,"Brine Road",,,,,
Point=23,22,"Brine Road",,,,,

View File

@@ -2563,7 +2563,7 @@ Pokemon = B149H269,84 #Togenite,
[CHAMPION,Blue,0]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,59 #Maroeot,
Pokemon = B18H34,59 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2590,7 +2590,7 @@ Pokemon = MEW,64 #Blastizard,
[CHAMPION,Blue,3]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,75 #Maroeot,
Pokemon = B18H34,75 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2617,7 +2617,7 @@ Pokemon = MEW,82 #Blastizard,
[CHAMPION,Blue,6]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,85 #Maroeot,
Pokemon = B18H34,85 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2645,7 +2645,7 @@ Pokemon = MEW,92 #Blastizard,
[CHAMPION,Blue,1]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,59 #Maroeot,
Pokemon = B18H34,59 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2672,7 +2672,7 @@ Pokemon = MEW,64 #Venutoise,
[CHAMPION,Blue,4]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,75 #Maroeot,
Pokemon = B18H34,75 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2699,7 +2699,7 @@ Pokemon = MEW,82 #Venutoise,
[CHAMPION,Blue,7]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,85 #Maroeot,
Pokemon = B18H34,85 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2728,7 +2728,7 @@ Pokemon = MEW,92 #Venutoise,
[CHAMPION,Blue,2]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,59 #Maroeot,
Pokemon = B18H34,59 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2755,7 +2755,7 @@ Pokemon = MEW,64 #Charusaur,
[CHAMPION,Blue,5]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,75 #Maroeot,
Pokemon = B18H34,75 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -2782,7 +2782,7 @@ Pokemon = MEW,82 #Charusaur,
[CHAMPION,Blue,8]
Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE
Pokemon = B18H105,85 #Maroeot,
Pokemon = B18H34,85 #Maroeot,
Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE
AbilityIndex = 1
Item = LAXINCENSE
@@ -3223,21 +3223,21 @@ Pokemon = MEW,5 #bulbmander,
#Blue encounter 2 (Viridian) starter=bulbasaur
[RIVAL1,Blue,3]
Pokemon = PIDGEY,7
Pokemon = B16H32,7
Pokemon = MEW,8 #squirtmander,
#Blue encounter 2 (Viridian) #starter=charmander
[RIVAL1,Blue,4]
Pokemon = PIDGEY,7
Pokemon = B16H32,7 #pidgey nidoranM
Pokemon = MEW,8 #bulbtle,
#Blue encounter 2 (Viridian) #starter=squirtle
[RIVAL1,Blue,5]
Pokemon = PIDGEY,7
Pokemon = B16H32,7
Pokemon = MEW,8 #bulbmander,
######################
@@ -3245,7 +3245,7 @@ Pokemon = MEW,8 #bulbmander,
[RIVAL1,Blue,6]
Items = SUPERPOTION
Pokemon = PIDGEOTTO,18
Pokemon = B17H33,18
Pokemon = ABRA,15
Pokemon = B19H56,16
Pokemon = MEW,19 #squirtmeleon,
@@ -3255,7 +3255,7 @@ Pokemon = MEW,19 #squirtmeleon,
[RIVAL1,Blue,7]
Items = SUPERPOTION
Pokemon = PIDGEOTTO,18
Pokemon = B17H33,18
Pokemon = ABRA,15
Pokemon = B19H56,16
Pokemon = MEW,19 #bulborttle,
@@ -3266,7 +3266,7 @@ Pokemon = MEW,19 #bulborttle,
[RIVAL1,Blue,8]
Items = SUPERPOTION
Pokemon = PIDGEOTTO,18
Pokemon = B17H33,18
Pokemon = ABRA,15
Pokemon = B19H56,16
Pokemon = MEW,19 #CHARYSAUR,
@@ -3277,7 +3277,7 @@ Pokemon = MEW,19 #CHARYSAUR,
[RIVAL1,Blue,9]
Items = SUPERPOTION
Pokemon = PIDGEOTTO,22
Pokemon = B17H33,22
Pokemon = B20H56,20 #Manicate,
Pokemon = B64H120,18 #Starbra,
Pokemon = MEW,22 #Warmeleon,
@@ -3287,7 +3287,7 @@ Pokemon = MEW,22 #Warmeleon,
[RIVAL1,Blue,10]
Items = SUPERPOTION
Pokemon = PIDGEOTTO,22
Pokemon = B17H33,22
Pokemon = B20H56,20 #Manicate,
Pokemon = B64H120,18 #Starbra,
Pokemon = MEW,22 #Ivytortle,
@@ -3297,7 +3297,7 @@ Pokemon = MEW,22 #Ivytortle,
[RIVAL1,Blue,11]
Items = SUPERPOTION
Pokemon = PIDGEOTTO,22
Pokemon = B17H33,22
Pokemon = B20H56,20 #Manicate,
Pokemon = B64H120,18 #Starbra,
Pokemon = MEW,22 #Charysaur,
@@ -3308,7 +3308,7 @@ Pokemon = MEW,22 #Charysaur,
[RIVAL1,Blue,12]
Items = SUPERPOTION,SUPERPOTION
Pokemon = B17H104,25 #Cueotto,
Pokemon = B17H34,25 #pidgeooto nidoking,
Pokemon = GYARADOS,23
Pokemon = B64H120,22 #Starbra,
Pokemon = MEW,25 #Warmeleon,
@@ -3317,7 +3317,7 @@ Pokemon = MEW,25 #Warmeleon,
[RIVAL1,Blue,13]
Items = SUPERPOTION,SUPERPOTION
Pokemon = B17H104,25 #Cueotto,
Pokemon = B17H34,25 #pidgeooto nidoking,
Pokemon = GYARADOS,23
Pokemon = B64H120,22 #Starbra,
Pokemon = MEW,25 #Ivytortle,
@@ -3336,7 +3336,7 @@ Pokemon = MEW,25 #Charysaur,
[RIVAL1,Blue,15]
Items = SUPERPOTION,SUPERPOTION
Pokemon = B18H104,36 #Cueot,
Pokemon = B18H34,36 #Cueot,
Pokemon = TAUROS,39 #Taucute,
Pokemon = B130H125,37 #Electados,
Pokemon = B65H121,36 #Starkazam,
@@ -3346,7 +3346,7 @@ Pokemon = MEW,41 #Warizard,
[RIVAL1,Blue,16]
Items = SUPERPOTION,SUPERPOTION
Pokemon = B18H104,36 #Cueot,
Pokemon = B18H34,36 #Cueot,
Pokemon = TAUROS,39 #Taucute,
Pokemon = B130H125,37 #Electados,
Pokemon = B65H121,36 #Starkazam,
@@ -3356,7 +3356,7 @@ Pokemon = MEW,41 #Warizard,
[RIVAL1,Blue,17]
Items = SUPERPOTION,SUPERPOTION
Pokemon = B18H104,36 #Cueot,
Pokemon = B18H34,36 #Cueot,
Pokemon = TAUROS,39 #Taucute,
Pokemon = B130H125,37 #Electados,
Pokemon = B65H121,36 #Starkazam,
@@ -3366,7 +3366,7 @@ Pokemon = MEW,41 #Warizard,
#starter=bulbasaur
[RIVAL1,Blue,18]
Pokemon = B18H104,44 #Cueot,
Pokemon = B18H34,44 #Cueot,
Pokemon = TAUROS,45 #Taucute,
Pokemon = B130H125,42 #Electados,
Pokemon = B64H121,42 #Starkazam,
@@ -3375,7 +3375,7 @@ Pokemon = MEW,45 #Warizard,
#starter=charmander
[RIVAL1,Blue,19]
Pokemon = B18H104,44 #Cueot,
Pokemon = B18H34,44 #Cueot,
Pokemon = TAUROS,45 #Taucute,
Pokemon = B130H125,42 #Electados,
Pokemon = B65H120,42 #Starkazam,
@@ -3385,7 +3385,7 @@ Pokemon = MEW,45 #Ivytoise,
#starter=squirtle
[RIVAL1,Blue,20]
Pokemon = B18H104,44 #Cueot,
Pokemon = B18H34,44 #Cueot,
Pokemon = TAUROS,45 #Taucute,
Pokemon = B130H125,42 #Electados,
Pokemon = B65H120,42 #Starkazam,
@@ -3395,7 +3395,7 @@ Pokemon = MEW,45 #Charusaur,
#starter=bulbasaur
[RIVAL1,Blue,21]
Pokemon = B18H105,47 #Maroeot,
Pokemon = B18H34,47 #Maroeot,
Pokemon = B102H128,45 #Taucute,
Pokemon = B111H126,45 #Maghorn,
Pokemon = B130H125,47 #Electados,
@@ -3405,7 +3405,7 @@ Pokemon = MEW,53 #Blastizard,
#starter=charmander
[RIVAL1,Blue,22]
Pokemon = B18H105,47 #Maroeot,
Pokemon = B18H34,47 #Maroeot,
Pokemon = B102H128,45 #Taucute,
Pokemon = B111H126,45 #Maghorn,
Pokemon = B130H125,47 #Electados,
@@ -3415,7 +3415,7 @@ Pokemon = MEW,53 #Venutoise,
#starter=squirtle
[RIVAL1,Blue,23]
Pokemon = B18H105,47 #Maroeot,
Pokemon = B18H34,47 #Maroeot,
Pokemon = B102H128,45 #Taucute,
Pokemon = B111H126,45 #Maghorn,
Pokemon = B130H125,47 #Electados,