Some typos fixes

Credits.txt

@@ -207,6 +207,7 @@ audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FR
 		Phyromatical, Gallanty (deviantart)
 
 ### Music ###
+	Saffron City (Team Rocket): mystora				
 	Pokeli 			https://www.youtube.com/channel/UC2ccJMFWSbjklOQESSBP_dw
 				https://www.youtube.com/watch?v=0ohkADYWCYE
 				https://www.youtube.com/watch?v=6EWYYzRSpMM

Data/sprites/BASE_SPRITES

@@ -84,6 +84,7 @@
 104r.png
 104s.png
 104t.png
+104u.png
 105.png
 105a.png
 105b.png
@@ -235,6 +236,7 @@
 112n.png
 112o.png
 112p.png
+112q.png
 113.png
 113a.png
 113b.png
@@ -325,6 +327,7 @@
 118l.png
 118m.png
 118n.png
+118o.png
 119.png
 119a.png
 119b.png
@@ -620,6 +623,7 @@
 133af.png
 133ag.png
 133ah.png
+133ai.png
 133b.png
 133c.png
 133d.png
@@ -654,6 +658,8 @@
 134ae.png
 134af.png
 134ag.png
+134ah.png
+134ai.png
 134b.png
 134c.png
 134d.png
@@ -871,6 +877,7 @@
 143aa.png
 143ab.png
 143ac.png
+143ad.png
 143b.png
 143c.png
 143d.png
@@ -1046,6 +1053,7 @@
 150am.png
 150an.png
 150ao.png
+150ap.png
 150b.png
 150c.png
 150d.png
@@ -1201,6 +1209,7 @@
 155q.png
 155r.png
 155s.png
+155t.png
 156.png
 156a.png
 156b.png
@@ -1492,6 +1501,7 @@
 171m.png
 171n.png
 171o.png
+171p.png
 172.png
 172a.png
 172aa.png
@@ -2084,6 +2094,7 @@
 19u.png
 19v.png
 19w.png
+19x.png
 1a.png
 1aa.png
 1ab.png
@@ -2091,8 +2102,6 @@
 1ad.png
 1ae.png
 1af.png
-1ag.png
-1ah.png
 1b.png
 1c.png
 1d.png
@@ -2117,7 +2126,7 @@
 1w.png
 1x.png
 1y.png
-1z_temp.png
+1z.png
 2.png
 20.png
 200.png
@@ -2451,6 +2460,7 @@
 216r.png
 216s.png
 216t.png
+216u.png
 217.png
 217a.png
 217b.png
@@ -2578,6 +2588,7 @@
 225j.png
 225k.png
 225l.png
+225m.png
 226.png
 226a.png
 226b.png
@@ -3251,6 +3262,7 @@
 259i.png
 259j.png
 259k.png
+259l.png
 25a.png
 25aa.png
 25ab.png
@@ -3841,6 +3853,8 @@
 285r.png
 285s.png
 285t.png
+285u.png
+285v.png
 285z.png
 286.png
 286a.png
@@ -4035,6 +4049,8 @@
 296ad.png
 296ae.png
 296af.png
+296ag.png
+296ah.png
 296b.png
 296c.png
 296d.png
@@ -4146,9 +4162,6 @@
 2t.png
 2u.png
 2v.png
-2w.png
-2x.png
-2y.png
 3.png
 30.png
 300.png
@@ -4255,6 +4268,7 @@
 305t.png
 305u.png
 305v.png
+305w.png
 306.png
 306a.png
 306b.png
@@ -4269,6 +4283,7 @@
 306k.png
 306l.png
 306m.png
+306n.png
 307.png
 307a.png
 307b.png
@@ -4281,6 +4296,7 @@
 307i.png
 307j.png
 307k.png
+307l.png
 308.png
 308a.png
 308b.png
@@ -4412,6 +4428,7 @@
 315h.png
 315i.png
 315j.png
+315k.png
 316.png
 316a.png
 316b.png
@@ -4775,6 +4792,7 @@
 335s.png
 335t.png
 335u.png
+335v.png
 335y.png
 336.png
 336a.png
@@ -4903,6 +4921,7 @@
 341n.png
 341o.png
 341p.png
+341q.png
 342.png
 342a.png
 342b.png
@@ -5116,6 +5135,7 @@
 354.png
 354a.png
 354aa.png
+354ab.png
 354b.png
 354c.png
 354d.png
@@ -5332,8 +5352,6 @@
 365m.png
 365n.png
 365o.png
-365p.png
-365q.png
 366.png
 366a.png
 366b.png
@@ -5466,6 +5484,7 @@
 372q.png
 372r.png
 372s.png
+372t.png
 373.png
 373a.png
 373b.png
@@ -5728,6 +5747,7 @@
 387h.png
 387i.png
 387j.png
+387k.png
 388.png
 388a.png
 388b.png
@@ -5758,6 +5778,7 @@
 389j.png
 389k.png
 389l.png
+389m.png
 38a.png
 38aa.png
 38ab.png
@@ -5767,6 +5788,11 @@
 38af.png
 38ag.png
 38ah.png
+38ai.png
+38aj.png
+38ak.png
+38al.png
+38am.png
 38b.png
 38c.png
 38d.png
@@ -5858,6 +5884,7 @@
 394g.png
 394h.png
 394i.png
+394j.png
 395.png
 395a.png
 395b.png
@@ -5908,6 +5935,7 @@
 399k.png
 399l.png
 399m.png
+399n.png
 39a.png
 39b.png
 39c.png
@@ -5932,7 +5960,6 @@
 39v.png
 39w.png
 3a.png
-3aa.png
 3b.png
 3c.png
 3d.png
@@ -5955,9 +5982,6 @@
 3u.png
 3v.png
 3w.png
-3x.png
-3y.png
-3z.png
 4.png
 40.png
 400.png
@@ -6068,7 +6092,6 @@
 407j.png
 407k.png
 407l.png
-407m.png
 408.png
 408a.png
 408b.png
@@ -6125,6 +6148,7 @@
 410n.png
 410o.png
 410p.png
+410q.png
 411.png
 411a.png
 411b.png
@@ -6273,6 +6297,7 @@
 420g.png
 420h.png
 420i.png
+420j.png
 421.png
 421a.png
 421b.png
@@ -6381,6 +6406,7 @@
 427k.png
 427l.png
 427m.png
+427n.png
 428.png
 428a.png
 428b.png
@@ -6436,7 +6462,6 @@
 42n.png
 42o.png
 42p.png
-42q.png
 43.png
 430.png
 430a.png
@@ -6789,6 +6814,7 @@
 44i.png
 44j.png
 44k.png
+44l.png
 45.png
 450.png
 450a.png
@@ -6893,6 +6919,7 @@
 457n.png
 457o.png
 457p.png
+457q.png
 458.png
 458a.png
 458b.png
@@ -7058,6 +7085,7 @@
 467n.png
 467o.png
 467p.png
+467q.png
 468.png
 468a.png
 468b.png
@@ -7088,8 +7116,6 @@
 469m.png
 469n.png
 469o.png
-469p.png
-469q.png
 46a.png
 46b.png
 46c.png
@@ -7631,9 +7657,6 @@
 49k.png
 49l.png
 4a.png
-4aa.png
-4ab.png
-4ac.png
 4b.png
 4c.png
 4d.png
@@ -7658,7 +7681,6 @@
 4w.png
 4x.png
 4y.png
-4z.png
 5.png
 50.png
 500.png
@@ -7886,6 +7908,7 @@
 514f.png
 514g.png
 514h.png
+514i.png
 515.png
 515a.png
 515b.png
@@ -7931,6 +7954,7 @@
 518j.png
 518k.png
 518l.png
+518m.png
 519.png
 519a.png
 519b.png
@@ -8064,6 +8088,7 @@
 527i.png
 527j.png
 527k.png
+527l.png
 528.png
 528a.png
 528b.png
@@ -8225,6 +8250,7 @@
 536j.png
 536k.png
 536l.png
+536m.png
 537.png
 537a.png
 537b.png
@@ -8321,6 +8347,8 @@
 541r.png
 541s.png
 541t.png
+541u.png
+541v.png
 542.png
 542a.png
 542b.png
@@ -8694,6 +8722,7 @@
 566f.png
 566g.png
 566h.png
+566i.png
 567.png
 567a.png
 567b.png
@@ -8754,6 +8783,7 @@
 570j.png
 570k.png
 570l.png
+570m.png
 571.png
 571a.png
 571b.png
@@ -8762,6 +8792,7 @@
 571e.png
 571f.png
 571g.png
+571h.png
 572.png
 572a.png
 572b.png
@@ -8773,12 +8804,25 @@
 572h.png
 573.png
 573a.png
+573b.png
+573c.png
+573d.png
 574.png
 574a.png
+574b.png
+574c.png
+574d.png
+574e.png
 575.png
 575a.png
+575b.png
+575c.png
 576.png
 576a.png
+576b.png
+576c.png
+576d.png
+576e.png
 57a.png
 57b.png
 57c.png
@@ -8936,6 +8980,7 @@
 63j.png
 63k.png
 63l.png
+63m.png
 64.png
 64a.png
 64b.png
@@ -8952,6 +8997,7 @@
 64m.png
 64n.png
 64o.png
+64p.png
 65.png
 65a.png
 65b.png
@@ -8973,6 +9019,7 @@
 65r.png
 65s.png
 65t.png
+65u.png
 66.png
 66a.png
 66b.png
@@ -8991,6 +9038,7 @@
 66o.png
 66p.png
 66q.png
+66r.png
 67.png
 67a.png
 67b.png
@@ -9047,6 +9095,7 @@
 69f.png
 69g.png
 69h.png
+69i.png
 6a.png
 6aa.png
 6ab.png
@@ -9112,6 +9161,7 @@
 70k.png
 70l.png
 70m.png
+70n.png
 71.png
 71a.png
 71b.png
@@ -9126,6 +9176,7 @@
 71k.png
 71l.png
 71m.png
+71n.png
 72.png
 72a.png
 72b.png
@@ -9147,6 +9198,8 @@
 72r.png
 72s.png
 72t.png
+72u.png
+72v.png
 73.png
 73a.png
 73b.png
@@ -9176,6 +9229,7 @@
 74j.png
 74k.png
 74l.png
+74m.png
 75.png
 75a.png
 75b.png
@@ -9315,6 +9369,7 @@
 81g.png
 81h.png
 81i.png
+81j.png
 82.png
 82a.png
 82b.png
@@ -9378,6 +9433,10 @@
 86i.png
 86j.png
 86k.png
+86l.png
+86m.png
+86n.png
+86o.png
 87.png
 87a.png
 87b.png
@@ -9438,6 +9497,7 @@
 8k.png
 8l.png
 8m.png
+8n.png
 9.png
 90.png
 90a.png

PBS/pokemon.txt

@@ -13150,6 +13150,7 @@ Shape = Bipedal
 Habitat = Grassland
 Kind = Thorn
 Pokedex = A Roselia that drinks nutritionally rich springwater blooms with lovely flowers. The fragrance of its flowers has the effect of making its foes careless.
+WildItemCommon = ROSELIBERRY
 WildItemUncommon = POISONBARB
 BattlerPlayerX = 0
 BattlerPlayerY = 11
@@ -18541,7 +18542,7 @@ BattlerEnemyX = 0
 BattlerEnemyY = 23
 BattlerShadowX = 0
 BattlerShadowSize = 2
-Evolutions = HUNTAIL,TradeItem,DEEPSEATOOTH,GOREBYSS,TradeItem,DEEPSEASCALE
+Evolutions = HUNTAIL,Item,DEEPSEATOOTH,GOREBYSS,Item,DEEPSEASCALE
 #-------------------------------
 [563]
 Name = Huntail
@@ -19466,7 +19467,7 @@ Weight = 6.4
 Color = Green
 Shape = Head
 Habitat = Rare
-Kind = Leaf
+Kind = Triple Starter
 Pokedex = Totoritaquil is a three-way fusion between the first stages of the Johto starters that was created using Team Rocket's fusion machine. Further improvements by Colress has made the fusion stable enough to be use in battles.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -19498,7 +19499,7 @@ Weight = 6.4
 Color = Green
 Shape = Head
 Habitat = Rare
-Kind = Leaf
+Kind = Triple Starter
 Pokedex = Baylavanaw is a three-way fusion between the second stages of the Johto starters that was created using Team Rocket's fusion machine. Further improvements by Colress has made the fusion stable enough to be use in battles.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -20008,3 +20009,99 @@ BattlerEnemyX = 0
 BattlerEnemyY = 3
 BattlerShadowX = 0
 BattlerShadowSize = 2
+#---------------------------------------
+[1000031]
+Name = Solminiatone
+InternalName = TRIPLE_CELESTIAL_M
+Type1 = ROCK
+Type2 = PSYCHICFLYING
+BaseStats = 90,95,100,70,95,100
+GenderRate = Genderless
+GrowthRate = Slow
+BaseEXP = 158
+EffortPoints = 0,2,1,0,2,1
+Rareness = 45
+Happiness = 35
+Abilities = SHIELDSDOWN
+Moves = 1,TACKLE,3,DEFENSECURL,8,ROLLOUT,10,CONFUSERAY,15,SWIFT,17,ANCIENTPOWER,22,SELFDESTRUCT,24,STEALTHROCK,29,TAKEDOWN,31,AUTOTOMIZE,36,COSMICPOWER,38,POWERGEM,43,DOUBLEEDGE,45,SHELLSMASH,50,EXPLOSION,1,POWERGEM,1,PSYSHOCK,1,MOONBLAST,1,TACKLE,1,HARDEN,1,CONFUSION,1,ROCKTHROW,5,HYPNOSIS,9,ROCKPOLISH,13,PSYWAVE,17,EMBARGO,21,ROCKSLIDE,25,COSMICPOWER,29,PSYCHIC,33,HEALBLOCK,37,STONEEDGE,41,FUTURESIGHT,45,EXPLOSION,49,MAGICROOM,1,FLAREBLITZ,1,TACKLE,1,HARDEN,1,CONFUSION,1,ROCKTHROW,5,FIRESPIN,9,ROCKPOLISH,13,PSYWAVE,17,EMBARGO,21,ROCKSLIDE,25,COSMICPOWER,29,PSYCHIC,33,HEALBLOCK,37,STONEEDGE,41,SOLARBEAM,45,EXPLOSION,49,WONDERROOM
+TutorMoves = ACROBATICS,ATTRACT,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,DAZZLINGGLEAM,DOUBLETEAM,EARTHQUAKE,ENDEAVOR,EXPLOSION,FACADE,FRUSTRATION,GIGAIMPACT,GRAVITY,GYROBALL,HIDDENPOWER,HYPERBEAM,IRONHEAD,LASTRESORT,LIGHTSCREEN,MAGNETRISE,PROTECT,PSYCHIC,PSYCHUP,REFLECT,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SLEEPTALK,SNORE,SOLARBEAM,STEALTHROCK,STONEEDGE,SUBSTITUTE,SWAGGER,TELEKINESIS,TOXIC,UTURN,ZENHEADBUTT,SECRETPOWER,ACROBATICS,ALLYSWITCH,BLIZZARD,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,DOUBLETEAM,DREAMEATER,EARTHPOWER,EARTHQUAKE,EMBARGO,EXPLOSION,FACADE,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GRAVITY,GYROBALL,HELPINGHAND,HIDDENPOWER,HYPERBEAM,ICEBEAM,ICYWIND,IRONHEAD,LASERFOCUS,LIGHTSCREEN,MAGICCOAT,MAGICROOM,PAINSPLIT,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SIGNALBEAM,SKILLSWAP,SLEEPTALK,SMACKDOWN,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,TELEKINESIS,TOXIC,TRICKROOM,ZENHEADBUTT,SECRETPOWER,ACROBATICS,ALLYSWITCH,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,DOUBLETEAM,DREAMEATER,EARTHPOWER,EARTHQUAKE,EMBARGO,EXPLOSION,FACADE,FIREBLAST,FLAMETHROWER,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GRAVITY,GYROBALL,HEATWAVE,HELPINGHAND,HIDDENPOWER,HYPERBEAM,IRONDEFENSE,IRONHEAD,LASERFOCUS,LIGHTSCREEN,MAGICCOAT,OVERHEAT,PAINSPLIT,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,RECYCLE,REFLECT,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SIGNALBEAM,SKILLSWAP,SLEEPTALK,SMACKDOWN,SNORE,SOLARBEAM,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SUNNYDAY,SWAGGER,TELEKINESIS,TOXIC,TRICKROOM,WILLOWISP,WONDERROOM,ZENHEADBUTT,SECRETPOWER
+Compatibility = Undiscovered
+StepsToHatch = 6400
+Height = 0.8
+Weight = 120
+Color = Yellow
+Shape = Head
+Habitat = Rare
+Kind = Triple Space Rock
+Pokedex = POKENAME is a three-way fusion between three celestial Pokémon that was created using Team Rocket's fusion machine. Further improvements by Colress has made the fusion stable enough to be use in battles.
+BattlerPlayerX = 0
+BattlerPlayerY = 0
+BattlerEnemyX = 0
+BattlerEnemyY = 6
+BattlerShadowX = 0
+BattlerShadowSize = 5
+#---------------------------------------
+[1000032]
+Name = Solminiatone
+InternalName = TRIPLE_CELESTIAL_C
+Type1 = ROCK
+Type2 = PSYCHICFLYING
+BaseStats = 60,100,60,120,100,60
+GenderRate = Genderless
+GrowthRate = Slow
+BaseEXP = 158
+EffortPoints = 0,2,1,0,2,1
+Rareness = 45
+Happiness = 35
+Abilities = SHIELDSDOWN
+Moves = 1,TACKLE,3,DEFENSECURL,8,ROLLOUT,10,CONFUSERAY,15,SWIFT,17,ANCIENTPOWER,22,SELFDESTRUCT,24,STEALTHROCK,29,TAKEDOWN,31,AUTOTOMIZE,36,COSMICPOWER,38,POWERGEM,43,DOUBLEEDGE,45,SHELLSMASH,50,EXPLOSION,1,POWERGEM,1,PSYSHOCK,1,MOONBLAST,1,TACKLE,1,HARDEN,1,CONFUSION,1,ROCKTHROW,5,HYPNOSIS,9,ROCKPOLISH,13,PSYWAVE,17,EMBARGO,21,ROCKSLIDE,25,COSMICPOWER,29,PSYCHIC,33,HEALBLOCK,37,STONEEDGE,41,FUTURESIGHT,45,EXPLOSION,49,MAGICROOM,1,FLAREBLITZ,1,TACKLE,1,HARDEN,1,CONFUSION,1,ROCKTHROW,5,FIRESPIN,9,ROCKPOLISH,13,PSYWAVE,17,EMBARGO,21,ROCKSLIDE,25,COSMICPOWER,29,PSYCHIC,33,HEALBLOCK,37,STONEEDGE,41,SOLARBEAM,45,EXPLOSION,49,WONDERROOM
+TutorMoves = ACROBATICS,ATTRACT,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,DAZZLINGGLEAM,DOUBLETEAM,EARTHQUAKE,ENDEAVOR,EXPLOSION,FACADE,FRUSTRATION,GIGAIMPACT,GRAVITY,GYROBALL,HIDDENPOWER,HYPERBEAM,IRONHEAD,LASTRESORT,LIGHTSCREEN,MAGNETRISE,PROTECT,PSYCHIC,PSYCHUP,REFLECT,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SLEEPTALK,SNORE,SOLARBEAM,STEALTHROCK,STONEEDGE,SUBSTITUTE,SWAGGER,TELEKINESIS,TOXIC,UTURN,ZENHEADBUTT,SECRETPOWER,ACROBATICS,ALLYSWITCH,BLIZZARD,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,DOUBLETEAM,DREAMEATER,EARTHPOWER,EARTHQUAKE,EMBARGO,EXPLOSION,FACADE,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GRAVITY,GYROBALL,HELPINGHAND,HIDDENPOWER,HYPERBEAM,ICEBEAM,ICYWIND,IRONHEAD,LASERFOCUS,LIGHTSCREEN,MAGICCOAT,MAGICROOM,PAINSPLIT,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SIGNALBEAM,SKILLSWAP,SLEEPTALK,SMACKDOWN,SNORE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SWAGGER,TELEKINESIS,TOXIC,TRICKROOM,ZENHEADBUTT,SECRETPOWER,ACROBATICS,ALLYSWITCH,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,DOUBLETEAM,DREAMEATER,EARTHPOWER,EARTHQUAKE,EMBARGO,EXPLOSION,FACADE,FIREBLAST,FLAMETHROWER,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GRAVITY,GYROBALL,HEATWAVE,HELPINGHAND,HIDDENPOWER,HYPERBEAM,IRONDEFENSE,IRONHEAD,LASERFOCUS,LIGHTSCREEN,MAGICCOAT,OVERHEAT,PAINSPLIT,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,RECYCLE,REFLECT,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SIGNALBEAM,SKILLSWAP,SLEEPTALK,SMACKDOWN,SNORE,SOLARBEAM,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SUNNYDAY,SWAGGER,TELEKINESIS,TOXIC,TRICKROOM,WILLOWISP,WONDERROOM,ZENHEADBUTT,SECRETPOWER
+Compatibility = Undiscovered
+StepsToHatch = 6400
+Height = 0.8
+Weight = 120
+Color = Yellow
+Shape = Head
+Habitat = Rare
+Kind = Triple Space Rock
+Pokedex = POKENAME is a three-way fusion between three celestial Pokémon that was created using Team Rocket's fusion machine. Further improvements by Colress has made the fusion stable enough to be use in battles.
+BattlerPlayerX = 0
+BattlerPlayerY = 0
+BattlerEnemyX = 0
+BattlerEnemyY = 6
+BattlerShadowX = 0
+BattlerShadowSize = 5
+
+#---------------------------------------
+[1000033]
+Name = Luvbrufisk
+InternalName = TRIPLE_FUNNY_FISH
+Type1 = WATER
+Type2 = GROUNDELECTRICPSYCHIC
+BaseStats = 109,105,84,97,81,99
+GenderRate = Genderless
+GrowthRate = Slow
+BaseEXP = 158
+EffortPoints = 2,2,1,1,2,1
+Rareness = 115
+Happiness = 35
+Abilities = STATIC,DAZZLING
+HiddenAbilities = SWIFTSWIM
+Moves = 1,WATERGUN,4,ASTONISH,9,CONFUSION,12,BITE,17,AQUAJET,20,DISABLE,25,PSYWAVE,28,CRUNCH,33,AQUATAIL,36,SCREECH,41,PSYCHICFANGS,44,SYNCHRONOISE,1,FISSURE,1,FLAIL,1,TACKLE,1,WATERGUN,1,MUDSLAP,1,MUDSPORT,5,BIDE,9,THUNDERSHOCK,13,MUDSHOT,17,CAMOUFLAGE,21,MUDBOMB,25,DISCHARGE,30,ENDURE,35,BOUNCE,40,MUDDYWATER,45,THUNDERBOLT,50,REVENGE,55,FLAIL,61,FISSURE
+TutorMoves = AERIALACE,AFTERYOU,ALLYSWITCH,AQUATAIL,ATTRACT,BLIZZARD,BULKUP,CALMMIND,CONFIDE,DOUBLETEAM,DREAMEATER,EMBARGO,FACADE,FLING,FROSTBREATH,FRUSTRATION,GIGAIMPACT,HIDDENPOWER,ICEBEAM,IRONTAIL,LIGHTSCREEN,LIQUIDATION,MAGICCOAT,MAGICROOM,PAINSPLIT,PAYBACK,PROTECT,PSYCHIC,RAINDANCE,REFLECT,REST,RETURN,ROUND,SAFEGUARD,SCALD,SIGNALBEAM,SLEEPTALK,SNATCH,SNORE,SUBSTITUTE,SURF,SWAGGER,SWORDSDANCE,TAUNT,TELEKINESIS,TORMENT,TOXIC,TRICKROOM,UPROAR,VENOSHOCK,WATERFALL,WATERPULSE,WONDERROOM,SECRETPOWER,AQUATAIL,ATTRACT,BOUNCE,BULLDOZE,CONFIDE,DOUBLETEAM,EARTHPOWER,EARTHQUAKE,ELECTROWEB,ENDEAVOR,FACADE,FOULPLAY,FRUSTRATION,HIDDENPOWER,INFESTATION,MAGNETRISE,PAINSPLIT,PAYBACK,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKTOMB,ROUND,SANDSTORM,SCALD,SHOCKWAVE,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,SNORE,SPITE,STEALTHROCK,STOMPINGTANTRUM,STONEEDGE,SUBSTITUTE,SURF,SWAGGER,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,UPROAR,WATERPULSE,DIG,FLASH,SECRETPOWER
+Compatibility = Undiscovered
+StepsToHatch = 6400
+Height = 0.8
+Weight = 120
+Color = Yellow
+Shape = Head
+Habitat = Rare
+Kind = Triple Fish
+Pokedex = POKENAME is a three-way fusion between three fish Pokémon that was created using Team Rocket's fusion machine. Further improvements by Colress has made the fusion stable enough to be use in battles.
+BattlerPlayerX = 0
+BattlerPlayerY = 0
+BattlerEnemyX = 0
+BattlerEnemyY = 6
+BattlerShadowX = 0
+BattlerShadowSize = 5
+

PBS/trainers.txt

@@ -3916,40 +3916,40 @@ Pokemon = B132H52,54 #MEOWTO
 
 ##########################
 
-[WORKER,Angus]
+[ENGINEER,Angus]
 Pokemon = HERACROSS,37 
 Pokemon = B217H202,39 
 ##########################
 
-[WORKER,Silvio]
+[ENGINEER,Silvio]
 Pokemon = DUGTRIO,37 
 Pokemon = B26H180,39 
 ##########################
 
-[WORKER,Hermann]
+[ENGINEER,Hermann]
 Pokemon = MAGNETON,38 
 Pokemon = MAGNETON,38 
 Pokemon = B205H82,38 #MAGNETRESS
 
 ##########################
 
-[WORKER,John]
+[ENGINEER,John]
 Pokemon = B95H214,44 #onix/heracross
 ##########################
 
-[WORKER,Felix]
+[ENGINEER,Felix]
 Pokemon = MACHOP,39 
 Pokemon = MACHOKE,39 
 Pokemon = B67H212,39 #SCICHOKE
 
 ##########################
 
-[WORKER,Kevin]
+[ENGINEER,Kevin]
 Pokemon = ELECTRODE,42 
 Pokemon = B210H82,42 #MAGNEBULL
 ##########################
 
-[WORKER,Mark]
+[ENGINEER,Mark]
 Pokemon = MACHOKE,42 
 Pokemon = B205H106,44 #FORRELEE
 ##########################

PBS/trainers_remix.txt

@@ -4778,14 +4778,14 @@ Pokemon = B199H94,58 #GengarSlowking
 
 ##########################
 
-[WORKER,Angus]
+[ENGINEER,Angus]
 Pokemon = B439H82,44 #MagnetonTrevenant
 Pokemon = B184H396,44 #ShelgonAzumarill
 Pokemon = B134H170,44 #ChinchouVaporeon
 	Moves = CHARGEBEAM,BUBBLEBEAM,QUICKATTACK,BITE
 ##########################
 
-[WORKER,Silvio]
+[ENGINEER,Silvio]
 Pokemon = B33H398,44 #KlangNidorino
 Pokemon = B101H181,44 #AmpharosElectrode
 Pokemon = B464H269,45 #TogekissLycanrocD
@@ -4793,7 +4793,7 @@ Pokemon = B370H101,45 #ElectrodePyukumuku
 	Moves = EXPLOSION
 ##########################
 
-[WORKER,Hermann]
+[ENGINEER,Hermann]
 Pokemon = B131H328,44 #DoubladeLapras
 Pokemon = B110H71,44 #VictreebellWeezing
 Pokemon = B332H367,45 #ChandelureLuxray
@@ -4801,13 +4801,13 @@ Pokemon = B484H363,45 #GalvantulaDelphox
 
 ##########################
 
-[WORKER,John]
+[ENGINEER,John]
 Pokemon = B89H420,44 #StunfiskMuk
 Pokemon = B439H131,45 #LaprasTrevenant
 Pokemon = B281H184,46 #AzumarillBlaziken
 ##########################
 
-[WORKER,Felix]
+[ENGINEER,Felix]
 Pokemon = B265H13,44 #WeedleRhyperior
 Pokemon = B420H6,44 #CharizardStunfisk
 Pokemon = B376H202,44 #WobbuffetZweilous
@@ -4815,14 +4815,14 @@ Pokemon = B9H237,44 #HitmontopBlastoise
 
 ##########################
 
-[WORKER,Kevin]
+[ENGINEER,Kevin]
 Pokemon = B181H392,45 #TrapinchAmpharos
 Pokemon = B141H265,45 #RhyperiorKabutops
 Pokemon = B195H317,44 #GrotleQuagsire
 Pokemon = B67H488,45 #TorkoalMachoke
 ##########################
 
-[WORKER,Mark]
+[ENGINEER,Mark]
 Pokemon = B481H25,44 #PikachuChesnaught
 	Item = LIGHTBALL
 Pokemon = B293H492,45 #SlurpuffMetagross

PBS/types.txt

@@ -194,3 +194,21 @@ InternalName=ICEROCKSTEEL
 Weaknesses=GROUND,FIRE,WATER,ROCK
 Resistances=PSYCHIC,NORMAL,GRASS,PSYCHIC,ICE,DRAGON,FAIRY
 Immunities=POISON
+
+
+[28]
+Name=PSYCHIC/FLYING
+InternalName=PSYCHICFLYING
+IsSpecialType=true
+Weaknesses=GHOST,DARK,ROCK,ELECTRIC,ICE
+Resistances=FIGHTING,PSYCHIC,GRASS
+Immunities=GROUND
+
+
+[29]
+Name=Ground/Electric/Psychic
+InternalName=GROUNDELECTRICPSYCHIC
+Weaknesses=WATER,GRASS,ICE,GROUND,BUG,GHOST,DARK
+Resistances=POISON,ROCK,FLYING,STEEL,FIGHTING,PSYCHIC
+Immunities=ELECTRIC
+