6.4 update (minus sprites)

PBS/connections.txt

@@ -36,8 +36,6 @@
 40,West,41,78,East,0
 # Viridian City (79) - Viridian River (40)
 79,East,9,40,West,0
-# Ruins of Abet (41) - Viridian River (40)
-41,South,0,40,North,35
 # Pallet Town (42) - Route 1 (78)
 42,North,0,78,South,0
 # Route 21 (59) - Pallet Town (42)
@@ -68,8 +66,6 @@
 95,East,0,413,West,1
 # Route 16 (438) - Celadon City (95)
 438,East,0,95,West,7
-# Celadon University (428) - Celadon City (95)
-428,South,0,95,North,19
 # Route 29 (311) - New Bark Town (137)
 311,East,0,137,West,16
 # Route 27 (147) - New Bark Town (137)
@@ -98,8 +94,6 @@
 230,South,0,288,North,3
 # Violet City (230) - Route 36 (267)
 230,West,0,267,East,2
-# Route 34 (265) - Goldenrod City (237)
-265,North,0,237,South,17
 # Route 36 (267) - Route 35 (254)
 267,South,0,254,North,11
 # Route 30 (262) - Route 31 (261)
@@ -122,8 +116,42 @@
 444,East,0,440,West,6
 # Fuchsia City (472) - Route 18 (517)
 472,West,9,517,East,0
+# Knot Island (526) - Kindle Road (559)
+526,East,0,559,West,79
+# Treasure Beach (528) - Knot Island (526)
+528,North,2,526,South,0
+# Kindle Road (559) - Mt. Ember (561)
+559,North,0,561,South,10
+# Brine Road (564) - Kindle Road (559)
+564,West,0,559,East,0
+# Boon Island (562) - Kindle Road (559)
+562,South,0,559,North,85
+# Kin Island (563) - Kindle Road (559)
+563,South,0,559,North,150
+# Deep Sea (570) - Kindle Road (559)
+570,West,0,559,East,45
+# Brine Road (564) - Mt. Ember (561)
+564,North,0,561,South,75
+# Boon Island (562) - Brine Road (564)
+562,South,0,564,North,20
+# Kin Island (563) - Boon Island (562)
+563,West,5,562,East,0
+# Kin Island (563) - Brine Road (564)
+563,South,0,564,North,85
+# Bond bridge (600) - Kin Island (563)
+600,South,96,563,North,0
+# Water Labyrinth (594) - Brine Road (564)
+594,North,0,564,South,86
+# Deep Sea (570) - Brine Road (564)
+570,North,0,564,South,0
+# Resort Gorgeous (566) - Water Labyrinth (594)
+566,South,0,594,North,62
+# Deep Sea (570) - Resort Gorgeous (566)
+570,North,148,566,South,0
 # Mahogany Town (631) - Route 42 (580)
 631,West,9,580,East,0
+# Chrono Island (603) - Water Labyrinth (594)
+603,North,0,594,South,56
 # Route 131 (794) - Sky Pillar (596)
 794,North,2,596,South,0
 # Route 44 (692) - Mahogany Town (631)
@@ -134,37 +162,7 @@
 730,West,6,836,East,0
 # Pacifidlog Town (796) - Route 131 (794)
 796,East,0,794,West,6
-# Kindle Road (559) - Mt. Ember (561)
-559,North,0,561,South,10
-# Brine Road (564) - Mt. Ember (561)
-564,North,0,561,South,75
-# Knot Island (526) - Kindle Road (559)
-526,East,0,559,West,79
-# Brine Road (564) - Kindle Road (559)
-564,West,0,559,East,0
-# Boon Island (562) - Kindle Road (559)
-562,South,0,559,North,85
-# Kin Island (563) - Kindle Road (559)
-563,South,0,559,North,150
-# Deep Sea (570) - Kindle Road (559)
-570,West,0,559,East,45
-# Treasure Beach (528) - Knot Island (526)
-528,North,2,526,South,0
-# Boon Island (562) - Brine Road (564)
-562,South,0,564,North,20
-# Kin Island (563) - Brine Road (564)
-563,South,0,564,North,85
-# Water Labyrinth (594) - Brine Road (564)
-594,North,0,564,South,86
-# Deep Sea (570) - Brine Road (564)
-570,North,0,564,South,0
-# Kin Island (563) - Boon Island (562)
-563,West,5,562,East,0
-# Bond bridge (600) - Kin Island (563)
-600,South,96,563,North,0
-# Resort Gorgeous (566) - Water Labyrinth (594)
-566,South,0,594,North,62
-# Chrono Island (603) - Water Labyrinth (594)
-603,North,0,594,South,56
-# Deep Sea (570) - Resort Gorgeous (566)
-570,North,148,566,South,0
+# Route 34 (265) - Goldenrod City (237)
+265,North,0,237,South,17
+# Goldenrod Waterway (41) - Goldenrod City (237)
+41,East,0,237,West,0

PBS/items.txt

@@ -469,29 +469,29 @@
 464,BRICKMAIL,Brick Mail,Brick Mail,6,50,"Stationery featuring a print of a tough-looking brick pattern. Let a Pokémon hold it for delivery.",0,0,2,
 #-------------------------------
 465,XATTACK,X Attack,X Attacks,7,1000,"An item that sharply boosts the Attack stat of a Pokémon while it remains in battle.",0,3,0,
-466,XATTACK2,XX Attack 2,XX Attacks,7,0,"It sharply raises the Attack stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-467,XATTACK3,XXX Attack 3,XXX Attacks,7,0,"It drastically raises the Attack stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-468,XATTACK6,XXXX Attack 6,XXXX Attacks,7,0,"It raises the Attack stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
+466,XATTACK2,XX Attack,XX Attacks,7,0,"It sharply raises the Attack stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+467,XATTACK3,XXX Attack,XXX Attacks,7,0,"It drastically raises the Attack stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+468,XATTACK6,XXXX Attack,XXXX Attacks,7,0,"It raises the Attack stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
 469,XDEFENSE,X Defense,X Defenses,7,2000,"An item that sharply boosts the Defense of a Pokémon while it remains in battle.",0,3,0,
-470,XDEFENSE2,XX Defense 2,XX Defenses,7,0,"It sharply raises the Defense stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-471,XDEFENSE3,XXX Defense 3,XXX Defenses,7,0,"It drastically raises the Defense stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-472,XDEFENSE6,XXXX Defense 6,XXXX Defenses,7,0,"It raises the Defense stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
+470,XDEFENSE2,XX Defense,XX Defenses,7,0,"It sharply raises the Defense stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+471,XDEFENSE3,XXX Defense,XXX Defenses,7,0,"It drastically raises the Defense stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+472,XDEFENSE6,XXXX Defense,XXXX Defenses,7,0,"It raises the Defense stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
 473,XSPATK,X Sp. Atk,X Sp. Atks,7,1000,"An item that sharply boosts the Sp. Atk stat of a Pokémon while it remains in battle.",0,3,0,
-474,XSPATK2,XX Sp. Atk 2,XX Sp. Atks,7,0,"It sharply raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-475,XSPATK3,XXX Sp. Atk 3,XXX Sp. Atks,7,0,"It drastically raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-476,XSPATK6,XXXX Sp. Atk 6,XXXX Sp. Atks,7,0,"It raises the Sp. Atk stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
+474,XSPATK2,XX Sp. Atk,XX Sp. Atks,7,0,"It sharply raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+475,XSPATK3,XXX Sp. Atk,XXX Sp. Atks,7,0,"It drastically raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+476,XSPATK6,XXXX Sp. Atk,XXXX Sp. Atks,7,0,"It raises the Sp. Atk stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
 477,XSPDEF,X Sp. Def,X Sp. Defs,7,2000,"An item that sharply boosts the Sp. Def stat of a Pokémon while it remains in battle.",0,3,0,
-478,XSPDEF2,XX Sp. Def 2,XX Sp. Defs,7,0,"It sharply raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-479,XSPDEF3,XXX Sp. Def 3,XXX Sp. Defs,7,0,"It drastically raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-480,XSPDEF6,XXXX Sp. Def 6,XXXX Sp. Defs,7,0,"It raises the Sp. Def stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
+478,XSPDEF2,XX Sp. Def,XX Sp. Defs,7,0,"It sharply raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+479,XSPDEF3,XXX Sp. Def,XXX Sp. Defs,7,0,"It drastically raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+480,XSPDEF6,XXXX Sp. Def,XXXX Sp. Defs,7,0,"It raises the Sp. Def stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
 481,XSPEED,X Speed,X Speeds,7,1000,"An item that sharply boosts the Speed stat of a Pokémon while it remains in battle.",0,3,0,
-482,XSPEED2,XX Speed 2,XX Speeds,7,0,"It sharply raises the Speed stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-483,XSPEED3,XXX Speed 3,XXX Speeds,7,0,"It drastically raises the Speed stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-484,XSPEED6,XXXX Speed 6,XXXX Speeds,7,0,"It raises the Speed stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
+482,XSPEED2,XX Speed,XX Speeds,7,0,"It sharply raises the Speed stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+483,XSPEED3,XXX Speed,XXX Speeds,7,0,"It drastically raises the Speed stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+484,XSPEED6,XXXX Speed,XXXX Speeds,7,0,"It raises the Speed stat of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
 485,XACCURACY,X Accuracy,X Accuracies,7,1000,"An item that sharply boosts the accuracy of a Pokémon while it remains in battle.",0,3,0,
-486,XACCURACY2,XX Accuracy 2,XX Accuracies,7,0,"It sharply raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-487,XACCURACY3,XXX Accuracy 3,XXX Accuracies,7,0,"It drastically raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
-488,XACCURACY6,XXXX Accuracy 6,XXXX Accuracies,7,0,"It raises the accuracy of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
+486,XACCURACY2,XX Accuracy,XX Accuracies,7,0,"It sharply raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+487,XACCURACY3,XXX Accuracy,XXX Accuracies,7,0,"It drastically raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.",0,3,0,
+488,XACCURACY6,XXXX Accuracy,XXXX Accuracies,7,0,"It raises the accuracy of a Pokémon in battle immensely. It wears off if the Pokémon is withdrawn.",0,3,0,
 489,DIREHIT,Dire Hit,Dire Hits,7,1000,"An item that raises the critical-hit ratio greatly. It wears off if the Pokémon is withdrawn.",0,3,0,
 490,DIREHIT2,Super Dire Hit,Super Dire Hits,7,0,"It sharply raises the critical-hit ratio. It wears off if the Pokémon is withdrawn.",0,3,0,
 491,DIREHIT3,Hyper Dire Hit,Hyper Dire Hits,7,0,"It greatly raises the critical-hit ratio. It wears off if the Pokémon is withdrawn.",0,3,0,
@@ -569,7 +569,7 @@
 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,
-564,OAKSPARCEL,"Oak's Parcel","Oak's Parcels",8,0,"A mysterious parcel for Professor Oak.",0,0,6,
+564,OAKSPARCEL,"Parcel","Parcels",8,0,"A mysterious parcel that is meant to be delivered to someone.",0,0,6,
 565,POWERPLANTKEY,Power Plant Key,Power Plant Keys,8,0,"A key to the abandonned power plant on Route 10.",0,0,6,
 566,DAMAGEUP,unknown_item,unknown_items,2,2,This item has been removed from the game. It can be safely sold or deleted.,1,0,0,
 567,ACCURACYUP,unknown_item,unknown_items,2,2,This item has been removed from the game. It can be safely sold or deleted.1,0,0,
@@ -663,7 +663,7 @@
 655,TM118,TM118,TM118s,4,30000,"The target is hit with wings of steel. It may also raise the user's Defense stat.",3,0,0,STEELWING
 656,TM119,TM119,TM119s,4,30000,"The user attacks driven by frustration. Power increases if the user's previous move failed.",3,0,0,STOMPINGTANTRUM
 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
+658,TM00,TM00,TM00s,4,20000,"It looks just like a regular TM, but it doesn't do anything.",3,0,0,FAKEMOVE
 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. It’s loved by certain Pokémon.",1,0,7,
 661,INVISIBALL,Invisiball,Invisiball,3,200,"A Pokéball that is completely invisble to the human eye. You shouldn't be able to obtain this item",0,4,4,
@@ -674,12 +674,12 @@
 666,SAFETYGOGGLES,Safety Goggles,Safety Goggles,1,4000,"An item to be held by a Pokémon. They protect the holder from weather-related damage and powder.",0,0,0,
 667,PROTECTIVEPADS,Protective Pads,Protective Pads,1,4000,"An item to be held by a Pokémon. They protect the holder from effects caused by making contact.",0,0,0,
 668,TERRAINEXTENDER,Terrain Extender,Terrain Extenders,1,4000,"An item to be held by a Pokémon. It extends the duration of the terrain caused by the holder.",0,0,0,
-669,ELECTRICSEED,Electric Seed,Electric Seeds,1,4000,"An item to be held by a Pokémon. It boosts Defense on Electric Terrain. It can only be used once.",0,0,0,
-670,PSYCHICSEED,Psychic Seed,Psychic Seeds,1,4000,"An item to be held by a Pokémon. It boosts Sp. Def on Psychic Terrain. It can only be used once.",0,0,0,
-671,MISTYSEED,Misty Seed,Misty Seeds,1,4000,"An item to be held by a Pokémon. It boosts Sp. Def on Misty Terrain. It can only be used once.",0,0,0,
-672,GRASSYSEED,Grassy Seed,Grassy Seeds,1,4000,"An item to be held by a Pokémon. It boosts Defense on Grassy Terrain. It can only be used once.",0,0,0,
-673,LUMINOUSMOSS,Luminous Moss,Luminous Mosses,1,4000,"An item to be held by a Pokémon. It boosts Sp. Def if hit by a Water-type attack. It can only be used once.",0,0,0,
-674,SNOWBALL,Snowball,Snowballs,1,4000,"An item to be held by a Pokémon. It boosts Attack if hit by an Ice-type attack. It can only be used once.",0,0,0,
+669,ELECTRICSEED,Electric Seed,Electric Seeds,1,500,"An item to be held by a Pokémon. It boosts Defense on Electric Terrain. It can only be used once.",0,0,0,
+670,PSYCHICSEED,Psychic Seed,Psychic Seeds,1,500,"An item to be held by a Pokémon. It boosts Sp. Def on Psychic Terrain. It can only be used once.",0,0,0,
+671,MISTYSEED,Misty Seed,Misty Seeds,1,500,"An item to be held by a Pokémon. It boosts Sp. Def on Misty Terrain. It can only be used once.",0,0,0,
+672,GRASSYSEED,Grassy Seed,Grassy Seeds,1,500,"An item to be held by a Pokémon. It boosts Defense on Grassy Terrain. It can only be used once.",0,0,0,
+673,LUMINOUSMOSS,Luminous Moss,Luminous Mosses,1,500,"An item to be held by a Pokémon. It boosts Sp. Def if hit by a Water-type attack. It can only be used once.",0,0,0,
+674,SNOWBALL,Snowball,Snowballs,1,500,"An item to be held by a Pokémon. It boosts Attack if hit by an Ice-type attack. It can only be used once.",0,0,0,
 675,WEAKNESSPOLICY,Weakness Policy,Weakness Policies,1,1000,"An item to be held by a Pokémon. The holder's Attack and Sp. Atk sharply increase if hit by a move it's weak to.",0,0,0,
 676,ADRENALINEORB,Adrenaline Orb,Adrenaline Orbs,1,300,"An item to be held by a Pokémon. It boosts Speed when intimidated. It can be used only once.",0,0,0,
 677,DEBUGCANDY,Unknown item,Unknown items,2,0,"This item has been removed from the game. It can safely be sold or deleted.",0,0,8,
@@ -692,7 +692,12 @@
 684,SLEEPINGBAG,Sleeping Bag,Sleeping Bag,8,0,"A handy sleeping bag that can be used to sleep anywhere.",2,0,6,
 685,LUNARFEATHER,Lunar Feather,Lunar Feathers,8,0,"A feather that glows like the moon. It's said to possess the power to dispel nightmares. ",2,0,6,
 686,CORRUPTEDFEATHER,Corrupted Feather,Lunar Feathers,8,0,"A lunar feather that has been corrupted. It's said to possess the power to cause nightmares. ",2,0,6,
-
+687,BEDROOMKEY,Bedroom Key,Bedroom Keys,8,0,"A key that unlocks a secret door in the Lavender Town Pokémon House",0,0,6,
+688,ROCKETUNIFORM,Rocket Uniform,Rocket Uniforms,8,0,"The full uniform that every Team Rocket grunt wears. Putting it on might get you some odd looks...",2,0,6,
+689,WHIPPEDDREAM,Whipped Dream,Whipped Dreams,1,2000,"A soft and sweet treat made of fluffy, puffy and whirled cream. It's loved by a certain Pokémon.",0,0,0,
+690,LIFTKEY,Lift Key,Lift Keys,8,0,"A key that operates the elevator in the Team Rocket Hideout. It bears the Team Rocket logo.",0,0,6,
+691,PINKANBERRY,Pinkan Berry,Pinkan Berries,5,0,"A type of Berry that is only found on Pinkan Island. This berry turns Pokémon that eats it pink.",0,0,5,
+692,EMERGENCYWHISTLE,Emergency Whistle,Emergency Whistle,8,0,"A small whistle that emits a loud, high-pitched noise. It can be used to alert others.",0,0,6,
 
 
 

PBS/metadata.txt

@@ -12,7 +12,7 @@ PlayerC = POKEMONTRAINER_Red,trchar003,girl_bike,girl_surf_offset,girl_run,girl_
 PlayerD = POKEMONTRAINER_Red,trchar004,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset
 PlayerE = POKEMONTRAINER_Red,trchar005,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset
 PlayerF = POKEMONTRAINER_Red,trchar006,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset
-PlayerG = POKEMONTRAINER_Red,trchar007,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset
+PlayerG = POKEMONTRAINER_Red,trchar007,girl_bike,girl_surf_offset,	,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset
 PlayerH = POKEMONTRAINER_Red,trchar008,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset
 #-------------------------------
 [001]
@@ -69,12 +69,12 @@ BattleBack =
 Environment = Grass
 #-------------------------------
 [009]
-# Route 25
+# Route 25	
 Outdoor = true
 ShowArea = true
 Bicycle = true
 HealingSpot = 8,17,11
-Weather = Rain,10
+Weather = Rain,100
 MapPosition = 0,41,3
 Environment = Grass
 #-------------------------------
@@ -83,7 +83,7 @@ Environment = Grass
 Outdoor = true
 ShowArea = true
 Bicycle = true
-Weather = HeavyRain,15
+Weather = Rain,15
 MapPosition = 0,43,3
 Environment = Sand
 #-------------------------------
@@ -251,12 +251,8 @@ MapPosition = 0,39,9
 Environment = MovingWater
 #-------------------------------
 [041]
-# Ruins of Abet
+# Goldenrod Waterway
 Outdoor = true
-ShowArea = true
-BicycleAlways = false
-BicycleAlways = false
-MapSize = 1,111
 #-------------------------------
 [042]
 # Pallet Town
@@ -274,11 +270,9 @@ MapPosition = 0,36,15
 MapSize = 2,11
 #-------------------------------
 [045]
-# Southern Island
-Outdoor = true
-ShowArea = true
-BicycleAlways = false
-Environment = TallGrass
+# Rocket Hideout BF2
+Outdoor = false
+MapPosition = 0,37,9
 #-------------------------------
 [046]
 # Jungle1
@@ -313,10 +307,26 @@ DarkMap = false
 BattleBack = City
 #-------------------------------
 [051]
-# Viridian City Gym
-Bicycle = false
+# Pinkan island
+Outdoor = true
+ShowArea = true
 MapPosition = 0,31,10
 #-------------------------------
+[531]
+# Pinkan forest
+Outdoor = true
+ShowArea = true
+BattleBack = Forest
+MapPosition = 0,31,10
+#-------------------------------
+[46]
+# Pinkan hollow
+ShowArea = true
+BattleBack = Forest
+MapPosition = 0,31,10
+Environment = Cave
+BattleBack = Cave
+#-------------------------------
 [052]
 # Seafoam Islands.old
 Outdoor = false
@@ -1277,7 +1287,7 @@ Environment = Cave
 # Route 9
 Outdoor = true
 ShowArea = true
-MapPosition = 0,12,6
+MapPosition = 0,42,6
 Environment = Rock
 #-------------------------------
 [352]
@@ -1302,17 +1312,10 @@ MapPosition = 1,12,11
 Outdoor = true
 #-------------------------------
 [357]
-# MAP357
-Outdoor = true
+# PokéMart
+Outdoor = false
 ShowArea = true
 #-------------------------------
-[358]
-# MAP358
-Outdoor = true
-ShowArea = true
-BattleBack = Forest
-Environment = Forest
-#-------------------------------
 [359]
 # Ecruteak City
 Outdoor = true
@@ -1703,7 +1706,7 @@ MapPosition = 0,35,5
 Outdoor = true
 ShowArea = true
 Bicycle = true
-MapPosition = 0,42,6
+MapPosition = 0,41,6
 Environment = Rock
 #-------------------------------
 [496]

PBS/moves.txt

@@ -175,7 +175,7 @@
 168,BULKUP,Bulk Up,024,0,FIGHTING,Status,0,20,0,User,0,d,"The user tenses its muscles to bulk up its body, boosting both its Attack and Defense stats."
 169,DETECT,Detect,0AA,0,FIGHTING,Status,0,5,0,User,4,,"It enables the user to evade all attacks. Its chance of failing rises if it is used in succession."
 170,MATBLOCK,Mat Block,149,0,FIGHTING,Status,0,10,0,UserSide,0,d,"Using a pulled-up mat as a shield, the user protects itself and its allies from damaging moves."
-171,QUICKGUARD,Quick Guard,0AB,0,FIGHTING,Status,0,15,0,UserSide,3,d,"The user protects itself and its allies from priority moves. If may fail if used in succession."
+171,QUICKGUARD,Quick Guard,0AB,0,FIGHTING,Status,0,15,0,UserSide,3,d,"The user protects itself and its allies from priority moves. It may fail if used in succession."
 #-------------------------------
 172,VCREATE,V-create,03D,180,FIRE,Physical,95,5,0,NearOther,0,abef,"With a fiery forehead, the user hurls itself at the foe. It lowers the user's Defense, Sp. Def, and Speed."
 173,BLASTBURN,Blast Burn,0C2,150,FIRE,Special,90,5,0,NearOther,0,bef,"The target is razed by a fiery explosion. The user must rest on the next turn, however."
@@ -696,4 +696,4 @@
 677,FAINTATTACK,Feint Attack,0A5,60,DARK,Physical,0,20,0,NearOther,0,abef,"The user draws up to the foe disarmingly, then throws a sucker punch. It hits without fail."
 678,HIDDENPOWER2,Hidden Power,090,60,NORMAL,Special,100,15,0,NearOther,0,bef,"A unique attack that varies in type and intensity depending on the Pokémon using it."
 679,TRIATTACK2,Tri Attack,017,70,NORMAL,Special,100,10,20,NearOther,0,bef,"The user strikes with a simultaneous three-beam attack. May also paralyze, burn, or freeze the target."
-680,FUSIONSWAP,Fusion Beam,091,0,QMARKS,Status,100,5,20,NearOther,0,bef,"A strange move developped by Team Rocket. It temporarily inverts an opposing fused Pokémon."
+680,FAKEMOVE,Counterfeit,001,0,QMARKS,Status,100,5,20,NearOther,0,bef,"A fake move developped by Team Rocket that is used to trick people into buying counterfeit TMs"

PBS/trainers.txt

@@ -198,6 +198,10 @@ Pokemon = B12H61,25 #Polifree,
 ############################
 #### ROUTE 7 #############
 ############################
+[DELIVERYMAN,Phillip]
+Pokemon = PIDGEOTTO,27
+Pokemon = B225H327,32 #delibird honedge
+
 
 [SOCIALITE,Edna]
 Pokemon = B136H44,29 #Glooeon,
@@ -721,7 +725,7 @@ Pokemon = B47H123,36 #SCYSECT
 ##########################
 
 [FARMER,Craig]
-Pokemon = B88H83,54 #FARMER
+Pokemon = B88H83,44 #FARMER
 #########################
 
 [FARMER,Dwight]
@@ -1099,7 +1103,7 @@ Pokemon = B46H74,10 #GEORAS
 
 #-------------------
 
-[LASS,Ali]
+[LASS_blue,Ali]
 Pokemon = ABRA,12 
 Pokemon = B21H16,12 #PIROW
 Pokemon = B43H56,12 #MANISH
@@ -1111,7 +1115,7 @@ Pokemon = EKANS,14
 Pokemon = B27H52,14 #MEOWSHREW
 #-------------------
 
-[LASS,Reli]
+[LASS_blue,Reli]
 Pokemon = RATTATA,14 
 Pokemon = B100H109,14 
 #-------------------
@@ -1131,6 +1135,10 @@ Pokemon = EKANS,15
 Pokemon = B41H109,15 
 	Ball = ROCKETBALL
 
+[FISHERMAN,Jack]
+Pokemon = B52H54,14 #Meowth/Psydeuxk
+[FISHERMAN,Tom]
+Pokemon = B39H61,14 #jigglypuff/poliwhirl
 ###################
 #### S.S. ANNE ####
 ###################
@@ -1164,9 +1172,8 @@ Pokemon = B17H118,18 #Golgeotto,
 Pokemon = B32H66,21 #Maran,
 ####################FLOOR 2#######
 
-[FISHERMAN,Dale]
+[FISHERMAN,Ned]
 Pokemon = GOLDEEN,16 
-Pokemon = B129H118,17 #Golkarp,
 Pokemon = B72H129,17 #Magicool,
 #----------------------------------------
 
@@ -1207,7 +1214,7 @@ Pokemon = B72H100,18 #Voltcool,
 #------------------------------------------
 
 [FISHERMAN,Barny]
-Pokemon = KRABBY,17 #Kakby,<EFBFBD>
+Pokemon = KRABBY,17 #Kakby,
 Pokemon = SHELLDER,17 #Venoder,
 Pokemon = B120H46,17 #Payu,
 #---------------------------------------
@@ -1245,8 +1252,8 @@ Pokemon = B19H19,17
 #----------------
 
 [YOUNGSTER,Dan]
-Pokemon = B79H46,15 
-Pokemon = B21H60,15 
+Pokemon = B35H60,16	#jigglypuff/poliwag
+
 #----------------
 
 [PICNICKER,Kelsey]
@@ -1272,30 +1279,32 @@ Pokemon = B19H1,14
 Pokemon = B23H96,14 
 #------------------
 
-[LASS,Haley]
+[LASS_blue,Haley]
 Pokemon = ODDISH,13 
 Pokemon = PIDGEY,13 
 Pokemon = B46H43,15 #ODDRAS
 
+
+
+
 ##########Fighting Dojo###########
 
 [BLACKBELT,Hitoshi]
-Pokemon = B56H52,34 
-Pokemon = B127H56,34 
-Pokemon = B67H56,34 
+Pokemon = B56H52,37 		#mankey / meowth
 #-------------------
 
 [CRUSHGIRL,Yoshimi]
-Pokemon = B67H81,39 
+Pokemon = B23H57,37			#ekans / primeape 		
+
+
 #-----------------
 
 [BLACKBELT,Hideki]
-Pokemon = B60H68,38 #poliwag/machamp
+Pokemon = B60H68,38 		#poliwag/machamp
 #-----------------
 
 [CRUSHGIRL,Lucy]
-Pokemon = B57H214,35 
-Pokemon = B62H75,38 
+Pokemon = B62H75,38 	#poliwrath / graveler
 #-----------------
 
 [BLACKBELT,Mike]
@@ -1655,7 +1664,7 @@ Pokemon = B105H105,43 #DMAROWAK
 Pokemon = B31H20,43 #RATQUEEN
 
 ##Cerulean CITY
-[COOLTRAINER_F,Jen]
+[LASS_blue,Jen]
 Pokemon = B80H101,20 #Slowbro/Electrode
 
 #################
@@ -1667,7 +1676,7 @@ Pokemon = B98H90,16
 Pokemon = B116H23,16 
 #---------------
 
-[PICNICKER,Diana]
+[LASS_blue,Diana]
 Pokemon = B50H120,19	 #Starlett
 #######################
 # ECRUTEAK GYM  ##
@@ -2255,26 +2264,26 @@ Pokemon = B268H302,71 #CRAMORTAR
 
 [LEADER_Giovanni,Giovanni,0]
 Items = FULLRESTORE,FULLRESTORE,FULLRESTORE
-Pokemon = B131H265,50 #Rhyras,
+Pokemon = B131H265,50 #rhydon + lapras
 	Moves = SURF,BULLDOZE,SANDSTORM,SING
 	AbilityIndex = 1
-	Item = 	SOFTSAND
+	Item = 	SMOOTHROCK
 	Ball = ULTRABALL
 
-Pokemon = B51H125,50 #Electatrio,
+Pokemon = B51H125,50 #electabuzz dugtrio,
 	Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
 	Ball = ULTRABALL
 
-Pokemon = B68H76,52 #GOLCHAMP,
+Pokemon = B68H76,52 #golem machamp,
 	Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
 	Ball = ULTRABALL
 
-Pokemon = B248H273,54 #DNIDOKING,
-	Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB
+Pokemon = B34H57,54 #	#nidking primeape,
+	Moves = EARTHQUAKE,CLOSECOMBAT,MEGAHORN,SWAGGER
 	AbilityIndex = 1
 	Item = 	SOFTSAND
 	Ball = ULTRABALL
@@ -3963,7 +3972,7 @@ Pokemon = B20H162,42 #FURICATE
 	Ball = ROCKETBALL
 ##########################
 
-[ROCKETEXEC_M,Archer]
+[ROCKETEXEC_Archer,Archer]
 Pokemon = B57H228,44 #HOUNDAPE
 	Ball = ROCKETBALL
 Pokemon = B168H110,44 #WEEZDOS
@@ -4740,7 +4749,7 @@ Pokemon = B124H272,61 #glisnx
 	Ball = ROCKETBALL
 ######################
 
-[ROCKETEXEC_F,Ariana]
+[ROCKETEXEC_Ariana,Ariana]
 Items = MAXPOTION
 Pokemon = B45H266,65 #VILEGROWTH
 	Ball = ROCKETBALL
@@ -4769,6 +4778,14 @@ Pokemon = B68H331,67 #BICHAMP
 ###########################
 ##	ICE MOUNTAINS   #######
 ###########################
+[DELIVERYMAN2,Klaus]
+Pokemon = B371H182,50	#klefki bellossom
+Pokemon = B339H234,50	#stantler sylveon
+Pokemon = B278H225,50	#sceptile delibird
+Pokemon = B439H448,50	#regice trevenant (b)
+Pokemon = B336H451,50	#salamence stufful
+
+
 
 [SKIER_F,Roxanne]
 Pokemon = B124H255,56 #MISMAJYNX
@@ -4798,6 +4815,57 @@ Pokemon = B308H221,52 #PILLODON
 Pokemon = B37H225,47 #VULBIRD
 Pokemon = B38H225,54 #NINEBIRD
 
+####################
+## PINKAN ISLAND ###
+####################
+
+[TEAMROCKET_F,Angelina]
+Pokemon = RATTATA,13
+	Ball = ROCKETBALL
+	
+[POLICE,Graham]
+Pokemon = SNUBBULL,13
+	
+[TEAMROCKET_F,Ellen]
+Pokemon = VENONAT,13
+	Ball = ROCKETBALL
+Pokemon = B493H238,14		#Scraggy - Smoochum
+	Ball = ROCKETBALL
+	
+[POLICE,Ripley]
+Pokemon = STUFFUL,13
+Pokemon = B58H491,14		#Growlithe - Swirlix
+	
+[TEAMROCKET_M,Nathan]
+Pokemon = B109H39,17		#Koffing - Jigglypuff
+	Ball = ROCKETBALL
+	
+[POLICE, Adams]
+Pokemon = B220H259,17		#Swinub - Happiny
+	
+[TEAMROCKET_F,Zoe]
+Pokemon = B215H79,20		#Sneasel - Slowpoke
+	Ball = ROCKETBALL
+	
+[POLICE,Rayne]
+Pokemon = B58H108,20		#Growlithe - Lickitung
+	
+[TEAMROCKET_M,Rufus]
+Pokemon = SNUBBULL,17
+	Ball = ROCKETBALL
+Pokemon = B228H222,18		#Houndour - Corsola
+	Ball = ROCKETBALL
+	
+[POLICE,Clifford]
+Pokemon = SNUBBULL,17
+Pokemon = B463H35,18		#Rockruff - Clefairy
+	
+[TEAMROCKET_M,Michael]
+Pokemon = B23H122,21		#Ekans - Mr. Mime
+	Ball = ROCKETBALL
+	
+[POLICE,Jackson]
+Pokemon = B451H432,21		#Stufful - Oricorio Pa'u
 
 ##################
 ###################
@@ -4881,4 +4949,98 @@ Pokemon = B273H352,72 #ROSERADE / GLISCOR
 Pokemon = B299H134,73 #GARCHOMP / VAPOREON
 	Moves = EARTHQUAKE,DRAGONCLAW,AQUATAIL,SWORDSDANCE
 	AbilityIndex = 1	#WATER ABSORB
-	Item = RINDOBERRY
+	Item = RINDOBERRY
+	
+	
+	
+#######################Type experts 	#todo: sprinkle some new pokemon in the teams
+[TYPE_EXPERT_ELECTRIC,Ray]	#power plant
+Pokemon = B46H25,30 	#Paras / PIKACHU
+Pokemon = B81H74,30 	#magnemite / geodude
+Pokemon = B33H100,30 	#Nidorino / Voltorb
+Pokemon = B95H239,30 	#Onix / Elekid
+
+
+[TYPE_EXPERT_BUG,Bea]	#Safari Zone
+Pokemon = B102H193,30 	#exeggcute / yanma
+Pokemon = B26H363,30 	#scyther/ heracross
+Pokemon = B64H212,30 	#scizor/ kadabra
+Pokemon = B95H127,30 	#pinsir/ onix
+
+
+[TYPE_EXPERT_FAIRY,Luna]	#mt moon
+Pokemon = B44H35,30		#gloom / clefairy
+Pokemon = B39H32,30		#jigglypuff / nidoranm
+Pokemon = B209H43,30	#snubull / oddish
+Pokemon = B52H176,30	#meowth / togetic
+
+[TYPE_EXPERT_DRAGON,Draco]	#offshore road (40-45)
+Pokemon = B230H371,30 	#kingdra klefki
+Pokemon = B230H371,30 	#kingdra klefki
+Pokemon = B230H371,30 	#kingdra klefki
+
+[TYPE_EXPERT_FIGHTING,Floyd]	#dojo
+Pokemon = B97H456,30	#hypno / hawlucha
+Pokemon = B67H81,30	#machoke / magnemite
+Pokemon = B113H57,30	#chansey / primeape
+Pokemon = B280H153,30	#combusken / bayleef
+
+[TYPE_EXPERT_GROUND,Pedro]	#rock tunnel (range 20-25)
+Pokemon = B74H213,30		#geodude shuckle
+Pokemon = B58H27,30 		#growlithe sandshrew
+Pokemon = B47H392,30 		#parasect trapinch
+Pokemon = B104H183,30 		#cubone marill
+
+[TYPE_EXPERT_FIRE,Blaze]	#cinnabar mansion (40-45)
+Pokemon = B99H488,30 	#kingler torkoal
+Pokemon = B110H219,30 	#magcargo weezing
+Pokemon = B123H430,30 	#scyther oricorio
+Pokemon = B358H126,30 	#rotom magmar
+[TYPE_EXPERT_GRASS,Ivy]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_ICE,Crystal]	#seafoam islands (40-45)
+Pokemon = B215H165,30 	#sneasel / seadra
+Pokemon = B424H421,30 	#scolipede / piloswine
+Pokemon = B124H97,30 	#jynx / hypno
+Pokemon = B429H492,30 	#froslass / slurpuff
+
+[TYPE_EXPERT_ROCK,Slate]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_WATER,Marina]	#TBD		#route 25 (10-15)
+Pokemon = B100H501,30 	#voltorb / luvdisc
+Pokemon = B37H118,30 	#vulpix goldeen
+Pokemon = B194H134,30 	#vaporeon wooper
+Pokemon = B152H86,30 	#chikorita seel
+
+
+[TYPE_EXPERT_FLYING,Gale]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_DARK,Raven]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_STEEL,Silvia]	#TBD		#crimson city (30-35)
+Pokemon = B301H397,30		#lileep klink
+Pokemon = B26H371,30		#raichu klefki
+Pokemon = B292H396,30		#metang bagon
+Pokemon = B212H131,30		#scizor lapras
+
+[TYPE_EXPERT_PSYCHIC,Carl]	#TBD
+Pokemon = SWINUB,30
+
+[TYPE_EXPERT_GHOST,Evangeline]	#TBD
+Pokemon = SWINUB,30
+
+[TYPE_EXPERT_POISON,Marie]	#			#Sewers	(25-30)
+Pokemon = B84H454,30			#doduo mareanie
+Pokemon = B401H404,30			#roselia shroomish
+Pokemon = B438H434,30			#phantump trubbish
+Pokemon = B49H28,30			#venomoth sandslash
+
+[TYPE_EXPERT_NORMAL,Tim]	#Sewers		#cerulean (hotel) 10-15
+Pokemon = B43H294,30	#oddish bidood
+Pokemon = B167h451,30	#spinarak stufful
+Pokemon = B21h161,30	#spearow sentret
+Pokemon = B258H260,30	#Mime Jr Munchlax

PBS/trainers_classic.txt

@@ -198,6 +198,10 @@ Pokemon = B12H61,25 #Polifree,
 ############################
 #### ROUTE 7 #############
 ############################
+[DELIVERYMAN,Phillip]
+Pokemon = PIDGEOTTO,27
+Pokemon = B225H327,32 #delibird honedge
+
 
 [SOCIALITE,Edna]
 Pokemon = B136H44,29 #Glooeon,
@@ -484,10 +488,9 @@ Pokemon = B110H139,33 #Omazing,
 Pokemon = WIGGLYTUFF,34 
 Pokemon = B17H143,34 #Snoreotto,
 ########################
+[POKEMONBREEDER,Olivia]
+Pokemon = B115H62,34 #kangaskhan/poliwrath,
 
-[BEAUTY,Olivia]
-Pokemon = BULBASAUR,34 #Koffbasaur,
-Pokemon = B2H110,34 #Weeysaur,
 ##########################
 
 [PICNICKER,Kindra]
@@ -722,7 +725,7 @@ Pokemon = B47H123,36 #SCYSECT
 ##########################
 
 [FARMER,Craig]
-Pokemon = B88H83,54 #FARMER
+Pokemon = B88H83,44 #FARMER
 #########################
 
 [FARMER,Dwight]
@@ -739,14 +742,13 @@ Pokemon = B190H108,36 #LICKIPOM
 ##############################
 
 [SWIMMER_M,Richard]
-Pokemon = CHINCHOU,36 #PSYDER
+Pokemon = KRABBY,36 #PSYDER
 Pokemon = B72H90,36 #SHELLCOOL
 ##########################
 
 [SWIMMER_M,Reece]
-Pokemon = GOLDEEN,34 
-Pokemon = HORSEA,34 #WIGGLYSEA
-Pokemon = B222H120,34 #STARSOLA
+Pokemon = GOLDEEN,33 
+Pokemon = B87H118,35 #dewgong / goldeen
 ##########################
 
 [SWIMMER_M,Tony]
@@ -1101,7 +1103,7 @@ Pokemon = B46H74,10 #GEORAS
 
 #-------------------
 
-[LASS,Ali]
+[LASS_blue,Ali]
 Pokemon = ABRA,12 
 Pokemon = B21H16,12 #PIROW
 Pokemon = B43H56,12 #MANISH
@@ -1113,7 +1115,7 @@ Pokemon = EKANS,14
 Pokemon = B27H52,14 #MEOWSHREW
 #-------------------
 
-[LASS,Reli]
+[LASS_blue,Reli]
 Pokemon = RATTATA,14 
 Pokemon = B100H109,14 
 #-------------------
@@ -1133,6 +1135,10 @@ Pokemon = EKANS,15
 Pokemon = B41H109,15 
 	Ball = ROCKETBALL
 
+[FISHERMAN,Jack]
+Pokemon = B52H54,14 #Meowth/Psydeuxk
+[FISHERMAN,Tom]
+Pokemon = B39H61,14 #jigglypuff/poliwhirl
 ###################
 #### S.S. ANNE ####
 ###################
@@ -1166,9 +1172,8 @@ Pokemon = B17H118,18 #Golgeotto,
 Pokemon = B32H66,21 #Maran,
 ####################FLOOR 2#######
 
-[FISHERMAN,Dale]
+[FISHERMAN,Ned]
 Pokemon = GOLDEEN,16 
-Pokemon = B129H118,17 #Golkarp,
 Pokemon = B72H129,17 #Magicool,
 #----------------------------------------
 
@@ -1209,7 +1214,7 @@ Pokemon = B72H100,18 #Voltcool,
 #------------------------------------------
 
 [FISHERMAN,Barny]
-Pokemon = KRABBY,17 #Kakby,<EFBFBD>
+Pokemon = KRABBY,17 #Kakby,
 Pokemon = SHELLDER,17 #Venoder,
 Pokemon = B120H46,17 #Payu,
 #---------------------------------------
@@ -1247,8 +1252,8 @@ Pokemon = B19H19,17
 #----------------
 
 [YOUNGSTER,Dan]
-Pokemon = B79H46,15 
-Pokemon = B21H60,15 
+Pokemon = B35H60,16	#jigglypuff/poliwag
+
 #----------------
 
 [PICNICKER,Kelsey]
@@ -1274,31 +1279,32 @@ Pokemon = B19H1,14
 Pokemon = B23H96,14 
 #------------------
 
-[LASS,Haley]
+[LASS_blue,Haley]
 Pokemon = ODDISH,13 
 Pokemon = PIDGEY,13 
 Pokemon = B46H43,15 #ODDRAS
 
+
+
+
 ##########Fighting Dojo###########
 
 [BLACKBELT,Hitoshi]
-Pokemon = B56H52,34 
-Pokemon = B127H56,34 
-Pokemon = B67H56,34 
+Pokemon = B56H52,37 		#mankey / meowth
 #-------------------
 
 [CRUSHGIRL,Yoshimi]
-Pokemon = B67H81,39 
+Pokemon = B23H57,37			#ekans / primeape 		
+
+
 #-----------------
 
 [BLACKBELT,Hideki]
-Pokemon = B66H83,38 
-Pokemon = B67H111,38 
+Pokemon = B60H68,38 		#poliwag/machamp
 #-----------------
 
 [CRUSHGIRL,Lucy]
-Pokemon = B57H214,35 
-Pokemon = B62H75,38 
+Pokemon = B62H75,38 	#poliwrath / graveler
 #-----------------
 
 [BLACKBELT,Mike]
@@ -1657,6 +1663,10 @@ Pokemon = B111H70,43 #WEEPINHORN
 Pokemon = B105H105,43 #DMAROWAK
 Pokemon = B31H20,43 #RATQUEEN
 
+##Cerulean CITY
+[LASS_blue,Jen]
+Pokemon = B80H101,20 #Slowbro/Electrode
+
 #################
 ###Cerulean Gym###
 ##################
@@ -1666,7 +1676,7 @@ Pokemon = B98H90,16
 Pokemon = B116H23,16 
 #---------------
 
-[PICNICKER,Diana]
+[LASS_blue,Diana]
 Pokemon = B50H120,19	 #Starlett
 #######################
 # ECRUTEAK GYM  ##
@@ -2254,26 +2264,26 @@ Pokemon = B268H302,71 #CRAMORTAR
 
 [LEADER_Giovanni,Giovanni,0]
 Items = FULLRESTORE,FULLRESTORE,FULLRESTORE
-Pokemon = B131H265,50 #Rhyras,
+Pokemon = B131H265,50 #rhydon + lapras
 	Moves = SURF,BULLDOZE,SANDSTORM,SING
 	AbilityIndex = 1
-	Item = 	SOFTSAND
+	Item = 	SMOOTHROCK
 	Ball = ULTRABALL
 
-Pokemon = B51H125,50 #Electatrio,
+Pokemon = B51H125,50 #electabuzz dugtrio,
 	Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
 	Ball = ULTRABALL
 
-Pokemon = B68H76,52 #GOLCHAMP,
+Pokemon = B68H76,52 #golem machamp,
 	Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
 	Ball = ULTRABALL
 
-Pokemon = B248H273,54 #DNIDOKING,
-	Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB
+Pokemon = B34H57,54 #	#nidking primeape,
+	Moves = EARTHQUAKE,CLOSECOMBAT,MEGAHORN,SWAGGER
 	AbilityIndex = 1
 	Item = 	SOFTSAND
 	Ball = ULTRABALL
@@ -3921,7 +3931,7 @@ Pokemon = B205H82,38 #MAGNETRESS
 ##########################
 
 [WORKER,John]
-Pokemon = B137H233,44 #PORYGON
+Pokemon = B95H214,44 #onix/heracross
 ##########################
 
 [WORKER,Felix]
@@ -3962,7 +3972,7 @@ Pokemon = B20H162,42 #FURICATE
 	Ball = ROCKETBALL
 ##########################
 
-[ROCKETEXEC_M,Archer]
+[ROCKETEXEC_Archer,Archer]
 Pokemon = B57H228,44 #HOUNDAPE
 	Ball = ROCKETBALL
 Pokemon = B168H110,44 #WEEZDOS
@@ -4112,9 +4122,9 @@ Pokemon = B40H107,42 #HITMONTUFF
 Pokemon = B242H237,42 #HITMONSSEY
 ###################
 
-[COOLTRAINER_F,Rike]
-Pokemon = SKARMORY,45 
-Pokemon = B53H87,45 #DEWSIAN
+[COOLTRAINER_F,Sofia]
+Pokemon = CHANSEY,42 
+Pokemon = B196H214,45 #espeon /heracross <3
 ##############
 
 [COOLTRAINER_M,Kirill]
@@ -4122,7 +4132,7 @@ Pokemon = B233H230,48 #KINGGON2
 #######################
 
 [COOLTRAINER_M,Ryan]
-Pokemon = B242H71,45 #VICTREESSEY
+Pokemon = B242H71,44 #VICTREESSEY
 ########################
 
 [HIKER,Oscar]
@@ -4230,7 +4240,7 @@ Pokemon = B91H185,41 #SUDOSTER
 #####################################
 
 [PICNICKER,Kim]
-Pokemon = B38H26,39 #RAITALES
+Pokemon = B232H40,39 #RAITALES
 #####################################
 
 [CAMPER,Elliot]
@@ -4593,9 +4603,8 @@ Pokemon = B51H254,55 #AMBITRIO
 #####################
 
 [SWIMMER_F,Abigail]
-Pokemon = PSYDUCK,35 
-Pokemon = PSYDUCK,35 
-Pokemon = B55H24,36 #GOLBOK
+Pokemon = SEEL,35 
+Pokemon = B87H78,36 #dewgong/rapidash
 ####################
 
 [CRUSHGIRL,Celine]
@@ -4670,7 +4679,7 @@ Pokemon = B318H224,54 #OCTITERRA
 [SWIMMER_M,Raphael]
 Pokemon = GRAVELER,49 
 Pokemon = TENTACRUEL,49 
-Pokemon = B176H127,53 #SKARTIC
+Pokemon = B455H213,53 #toxapex shuckle
 ##########################
 
 [SWIMMER_F,Eva]
@@ -4681,7 +4690,7 @@ Pokemon = B119H314,55 #SEALORD
 [FISHERMAN,Tommy]
 Pokemon = GOLDEEN,51 
 Pokemon = GOLDEEN,51 
-Pokemon = B86H298,54 
+Pokemon = B139H453,54 #omastar/dhelmise
 #############################
 ####	BOND Bridge		#
 #############################
@@ -4689,18 +4698,17 @@ Pokemon = B86H298,54
 [POKEMONRANGER_M,Steve]
 Pokemon = B7H316,54 #TURTLE
 Pokemon = B6H301,53 #LIZARD
-Pokemon = B4H336,53 #SALAMANDER
-Pokemon = B158H159,57 #CROCODILE
+
 #############################
 
 [POKEMONRANGER_F,Jane]
 Pokemon = B56H320,54 #MONKEY
 Pokemon = B56H232,54 #DONKEY
-Pokemon = B215H262,54 #WEASEL
 ############################
 
 [POKEMONRANGER_M,Osman]
-Pokemon = B56H316,58 #TURKEY
+Pokemon = B4H336,53 #SALAMANDER
+Pokemon = B158H159,57 #CROCODILE
 ###########################
 
 [POKEMONRANGER_F,Selena]
@@ -4741,7 +4749,7 @@ Pokemon = B124H272,61 #glisnx
 	Ball = ROCKETBALL
 ######################
 
-[ROCKETEXEC_F,Ariana]
+[ROCKETEXEC_Ariana,Ariana]
 Items = MAXPOTION
 Pokemon = B45H266,65 #VILEGROWTH
 	Ball = ROCKETBALL
@@ -4799,6 +4807,57 @@ Pokemon = B308H221,52 #PILLODON
 Pokemon = B37H225,47 #VULBIRD
 Pokemon = B38H225,54 #NINEBIRD
 
+####################
+## PINKAN ISLAND ###
+####################
+
+[TEAMROCKET_F,Angelina]
+Pokemon = RATTATA,13
+	Ball = ROCKETBALL
+	
+[POLICE,Graham]
+Pokemon = SNUBBULL,13
+	
+[TEAMROCKET_F,Ellen]
+Pokemon = VENONAT,13
+	Ball = ROCKETBALL
+Pokemon = B493H238,14		#Scraggy - Smoochum
+	Ball = ROCKETBALL
+	
+[POLICE,Ripley]
+Pokemon = STUFFUL,13
+Pokemon = B58H491,14		#Growlithe - Swirlix
+	
+[TEAMROCKET_M,Nathan]
+Pokemon = B109H39,17		#Koffing - Jigglypuff
+	Ball = ROCKETBALL
+	
+[POLICE, Adams]
+Pokemon = B220H259,17		#Swinub - Happiny
+	
+[TEAMROCKET_F,Zoe]
+Pokemon = B215H79,20		#Sneasel - Slowpoke
+	Ball = ROCKETBALL
+	
+[POLICE,Rayne]
+Pokemon = B58H108,20		#Growlithe - Lickitung
+	
+[TEAMROCKET_M,Rufus]
+Pokemon = SNUBBULL,17
+	Ball = ROCKETBALL
+Pokemon = B228H222,18		#Houndour - Corsola
+	Ball = ROCKETBALL
+	
+[POLICE,Clifford]
+Pokemon = SNUBBULL,17
+Pokemon = B463H35,18		#Rockruff - Clefairy
+	
+[TEAMROCKET_M,Michael]
+Pokemon = B23H122,21		#Ekans - Mr. Mime
+	Ball = ROCKETBALL
+	
+[POLICE,Jackson]
+Pokemon = B451H432,21		#Stufful - Oricorio Pa'u
 
 ##################
 ###################
@@ -4882,4 +4941,75 @@ Pokemon = B273H352,72 #ROSERADE / GLISCOR
 Pokemon = B299H134,73 #GARCHOMP / VAPOREON
 	Moves = EARTHQUAKE,DRAGONCLAW,AQUATAIL,SWORDSDANCE
 	AbilityIndex = 1	#WATER ABSORB
-	Item = RINDOBERRY
+	Item = RINDOBERRY
+	
+	
+	
+#######################Type experts 	#todo: sprinkle some new pokemon in the teams
+[TYPE_EXPERT_ELECTRIC,Ray]	#power plant
+Pokemon = B46H25,30 	#Paras / PIKACHU
+Pokemon = B81H74,30 	#magnemite / geodude
+Pokemon = B33H100,30 	#Nidorino / Voltorb
+Pokemon = B95H239,30 	#Onix / Elekid
+
+
+[TYPE_EXPERT_BUG,Bea]	#Safari Zone
+Pokemon = B102H193,30 	#exeggcute / yanma
+Pokemon = B123H214,30 	#scyther/ heracross
+Pokemon = B64H212,30 	#scizor/ kadabra
+Pokemon = B95H127,30 	#pinsir/ onix
+
+
+[TYPE_EXPERT_FAIRY,Luna]	#TBD
+Pokemon = B44H35,30		#gloom / clefairy
+Pokemon = B39H32,30		#jigglypuff / nidoranm
+Pokemon = B209H43,30	#snubull / oddish
+Pokemon = B52H176,30	#meowth / togetic
+
+[TYPE_EXPERT_DRAGON,Draco]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_FIGHTING,Floyd]	#TBD
+Pokemon = B97H456,30	#hypno / hawlucha
+Pokemon = B67H81,30	#machoke / magnemite
+Pokemon = B113H57,30	#chansey / primeape
+Pokemon = B280H153,30	#combusken / bayleef
+
+[TYPE_EXPERT_GROUND,Pedro]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_FIRE,Blaze]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_GRASS,Ivy]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_ICE,Crystal]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_ROCK,Slate]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_WATER,Marina]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_FLYING,Gale]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_DARK,Raven]	#TBD
+Pokemon = SWINUB,30 
+
+[TYPE_EXPERT_STEEL,Silvia]	#TBD
+Pokemon = SWINUB,30
+
+[TYPE_EXPERT_PSYCHIC,Carl]	#TBD
+Pokemon = SWINUB,30
+
+[TYPE_EXPERT_GHOST,Evangeline]	#TBD
+Pokemon = SWINUB,30
+
+[TYPE_EXPERT_POISON,Marie]	#Sewers
+Pokemon = SWINUB,30
+
+[TYPE_EXPERT_NORMAL,Tim]	#Sewers
+Pokemon = SWINUB,30

PBS/trainertypes.txt

@@ -116,4 +116,27 @@
 113,POLICE,Officer,32,,,,Male,,
 114,SKIER_F,Skier,16,,,,Female,32,
 115,CHAMPION_Sinnoh,Champion,16,,,,Female,100,
-116,SPRITER,Sprite Artist,16,,,,Mixed,100,
+116,SPRITER,Sprite Artist,16,,,,Mixed,100,
+117,TYPE_EXPERT_NORMAL,Type Expert,16,,,,Mixed,100,
+118,TYPE_EXPERT_FIGHTING,Type Expert,16,,,,Mixed,100,
+119,TYPE_EXPERT_FLYING,Type Expert,16,,,,Mixed,100,
+120,TYPE_EXPERT_POISON,Type Expert,16,,,,Mixed,100,
+121,TYPE_EXPERT_GROUND,Type Expert,16,,,,Mixed,100,
+122,TYPE_EXPERT_ROCK,Type Expert,16,,,,Mixed,100,
+123,TYPE_EXPERT_BUG,Type Expert,16,,,,Mixed,100,
+124,TYPE_EXPERT_GHOST,Type Expert,16,,,,Mixed,100,
+125,TYPE_EXPERT_STEEL,Type Expert,16,,,,Mixed,100,	
+126,TYPE_EXPERT_FIRE,Type Expert,16,,,,Mixed,100,
+127,TYPE_EXPERT_WATER,Type Expert,16,,,,Mixed,100,
+128,TYPE_EXPERT_GRASS,Type Expert,16,,,,Mixed,100,
+129,TYPE_EXPERT_ELECTRIC,Type Expert,16,,,,Mixed,100,
+130,TYPE_EXPERT_PSYCHIC,Type Expert,16,,,,Mixed,100,
+131,TYPE_EXPERT_ICE,Type Expert,16,,,,Mixed,100,
+132,TYPE_EXPERT_DRAGON,Type Expert,16,,,,Mixed,100,
+133,TYPE_EXPERT_DARK,Type Expert,16,,,,Mixed,100,
+134,TYPE_EXPERT_FAIRY,Type Expert,16,,,,Mixed,100,
+135,DELIVERYMAN,Delivery Man,32,,,,Male,,
+136,ROCKETEXEC_Ariana,Team Rocket Executive,100,,,,Female,,
+137,ROCKETEXEC_Archer,Team Rocket Executive,100,,,,Male,,
+138,LASS_blue,Lass,16,,,,Female,,
+139,DELIVERYMAN2,Delivery Man,32,,,,Male,,

PBS/types.txt

@@ -151,7 +151,7 @@ Resistances=BUG,ICE,FAIRY,STEEL,FIRE,FLYING
 Name=Water/Ground/Flying
 InternalName=WATERGROUNDFLYING
 IsSpecialType=true
-Weaknesses=GRASS,ICE,ICEFIREELECTRIC
+Weaknesses=GRASS,ICE
 Resistances=STEEL,FIRE,POISON,FIGHTING,BUG
 Immunities=ELECTRIC,GROUND