Changes goldenrod dept store workers to engineers + small other map fixes in goldenrod

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
@@ -20007,4 +20008,100 @@ BattlerPlayerY = 32
 BattlerEnemyX = 0
 BattlerEnemyY = 3
 BattlerShadowX = 0
-BattlerShadowSize = 2
+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

@@ -193,4 +193,22 @@ Name=Ice/Rock/Steel
 InternalName=ICEROCKSTEEL
 Weaknesses=GROUND,FIRE,WATER,ROCK
 Resistances=PSYCHIC,NORMAL,GRASS,PSYCHIC,ICE,DRAGON,FAIRY
-Immunities=POISON
+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
+