diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata
index a5cb3e537..0455056a9 100644
Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ
diff --git a/Data/Map160.rxdata b/Data/Map160.rxdata
index ad4792fdd..ad8f27e97 100644
Binary files a/Data/Map160.rxdata and b/Data/Map160.rxdata differ
diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata
index 984182f86..f3d7c6f3e 100644
Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ
diff --git a/Data/Map551.rxdata b/Data/Map551.rxdata
index 1c3c1b8df..7323b4b25 100644
Binary files a/Data/Map551.rxdata and b/Data/Map551.rxdata differ
diff --git a/Data/Map552.rxdata b/Data/Map552.rxdata
index ba1a99871..5d8c85c66 100644
Binary files a/Data/Map552.rxdata and b/Data/Map552.rxdata differ
diff --git a/Data/Map593.rxdata b/Data/Map593.rxdata
index 7c8b76054..fe763e0e8 100644
Binary files a/Data/Map593.rxdata and b/Data/Map593.rxdata differ
diff --git a/Data/Map659.rxdata b/Data/Map659.rxdata
index e7f7f1dbd..66bca09eb 100644
Binary files a/Data/Map659.rxdata and b/Data/Map659.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index a15c4fa6d..4cfd0c844 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb
index d36e424fb..6f0daaea6 100644
--- a/Data/Scripts/003_Game processing/002_Scene_Map.rb	
+++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb	
@@ -209,6 +209,23 @@ class Scene_Map
     end
   end
 
+  def reset_map(fadeout=false)
+    $MapFactory.setup($game_map.map_id)
+    $game_player.moveto($game_player.x, $game_player.y)
+    $game_player.straighten
+    $game_map.update
+    disposeSpritesets
+    GC.start
+    createSpritesets
+    if fadeout
+      $game_temp.transition_processing = false
+      Graphics.transition(20)
+    end
+    $game_map.autoplay
+    Graphics.frame_reset
+    Input.update
+  end
+
   def main
     createSpritesets
     Graphics.transition(20)
diff --git a/Data/Scripts/019_Utilities/001_Utilities.rb b/Data/Scripts/019_Utilities/001_Utilities.rb
index cbd5ae767..fddc4dc01 100644
--- a/Data/Scripts/019_Utilities/001_Utilities.rb
+++ b/Data/Scripts/019_Utilities/001_Utilities.rb
@@ -231,15 +231,15 @@ end
 def pbTrainerName(name = nil, outfit = 0)
   pbChangePlayer(0) if $Trainer.character_ID < 0
   if name.nil?
-    name = pbEnterPlayerName(_INTL("Your name?"), 0, Settings::MAX_PLAYER_NAME_SIZE)
+    name = pbEnterPlayerName(_INTL("Enter your name"), 0, Settings::MAX_PLAYER_NAME_SIZE)
     if name.nil? || name.empty?
-      player_metadata = GameData::Metadata.get_player($Trainer.character_ID)
-      trainer_type = (player_metadata) ? player_metadata[0] : nil
-      gender = pbGetTrainerTypeGender(trainer_type)
-      if(gender == 0)
-        return "Red"
+      # player_metadata = GameData::Metadata.get_player($Trainer.character_ID)
+      # trainer_type = (player_metadata) ? player_metadata[0] : nil
+      #  gender = pbGetTrainerTypeGender(trainer_type)
+      if $game_variables[52] == 0
+        name = "Green"
       else
-        return "Leaf"
+        name = "Red"
       end
     end
   end
diff --git a/Data/Scripts/049_Compatibility/PBMoves.rb b/Data/Scripts/049_Compatibility/PBMoves.rb
new file mode 100644
index 000000000..7eedd9ab0
--- /dev/null
+++ b/Data/Scripts/049_Compatibility/PBMoves.rb
@@ -0,0 +1,684 @@
+module PBMoves
+  MEGAHORN = :MEGAHORN
+  ATTACKORDER = :ATTACKORDER
+  BUGBUZZ = :BUGBUZZ
+  FIRSTIMPRESSION = :FIRSTIMPRESSION
+  POLLENPUFF = :POLLENPUFF
+  LEECHLIFE = :LEECHLIFE
+  LUNGE = :LUNGE
+  XSCISSOR = :XSCISSOR
+  SIGNALBEAM = :SIGNALBEAM
+  UTURN = :UTURN
+  STEAMROLLER = :STEAMROLLER
+  BUGBITE = :BUGBITE
+  SILVERWIND = :SILVERWIND
+  FELLSTINGER = :FELLSTINGER
+  STRUGGLEBUG = :STRUGGLEBUG
+  FURYCUTTER = :FURYCUTTER
+  PINMISSILE = :PINMISSILE
+  TWINEEDLE = :TWINEEDLE
+  INFESTATION = :INFESTATION
+  DEFENDORDER = :DEFENDORDER
+  HEALORDER = :HEALORDER
+  POWDER = :POWDER
+  QUIVERDANCE = :QUIVERDANCE
+  RAGEPOWDER = :RAGEPOWDER
+  SPIDERWEB = :SPIDERWEB
+  STICKYWEB = :STICKYWEB
+  STRINGSHOT = :STRINGSHOT
+  TAILGLOW = :TAILGLOW
+  HYPERSPACEFURY = :HYPERSPACEFURY
+  FOULPLAY = :FOULPLAY
+  DARKESTLARIAT = :DARKESTLARIAT
+  NIGHTDAZE = :NIGHTDAZE
+  CRUNCH = :CRUNCH
+  DARKPULSE = :DARKPULSE
+  THROATCHOP = :THROATCHOP
+  NIGHTSLASH = :NIGHTSLASH
+  SUCKERPUNCH = :SUCKERPUNCH
+  KNOCKOFF = :KNOCKOFF
+  ASSURANCE = :ASSURANCE
+  BITE = :BITE
+  BRUTALSWING = :BRUTALSWING
+  FEINTATTACK = :FEINTATTACK
+  THIEF = :THIEF
+  SNARL = :SNARL
+  PAYBACK = :PAYBACK
+  PURSUIT = :PURSUIT
+  BEATUP = :BEATUP
+  FLING = :FLING
+  POWERTRIP = :POWERTRIP
+  PUNISHMENT = :PUNISHMENT
+  DARKVOID = :DARKVOID
+  EMBARGO = :EMBARGO
+  FAKETEARS = :FAKETEARS
+  FLATTER = :FLATTER
+  HONECLAWS = :HONECLAWS
+  MEMENTO = :MEMENTO
+  NASTYPLOT = :NASTYPLOT
+  PARTINGSHOT = :PARTINGSHOT
+  QUASH = :QUASH
+  SNATCH = :SNATCH
+  SWITCHEROO = :SWITCHEROO
+  TAUNT = :TAUNT
+  TOPSYTURVY = :TOPSYTURVY
+  TORMENT = :TORMENT
+  ROAROFTIME = :ROAROFTIME
+  DRACOMETEOR = :DRACOMETEOR
+  OUTRAGE = :OUTRAGE
+  CLANGINGSCALES = :CLANGINGSCALES
+  COREENFORCER = :COREENFORCER
+  DRAGONRUSH = :DRAGONRUSH
+  SPACIALREND = :SPACIALREND
+  DRAGONHAMMER = :DRAGONHAMMER
+  DRAGONPULSE = :DRAGONPULSE
+  DRAGONCLAW = :DRAGONCLAW
+  DRAGONBREATH = :DRAGONBREATH
+  DRAGONTAIL = :DRAGONTAIL
+  DUALCHOP = :DUALCHOP
+  TWISTER = :TWISTER
+  DRAGONRAGE = :DRAGONRAGE
+  DRAGONDANCE = :DRAGONDANCE
+  BOLTSTRIKE = :BOLTSTRIKE
+  VOLTTACKLE = :VOLTTACKLE
+  ZAPCANNON = :ZAPCANNON
+  THUNDER = :THUNDER
+  FUSIONBOLT = :FUSIONBOLT
+  PLASMAFISTS = :PLASMAFISTS
+  THUNDERBOLT = :THUNDERBOLT
+  WILDCHARGE = :WILDCHARGE
+  DISCHARGE = :DISCHARGE
+  ZINGZAP = :ZINGZAP
+  THUNDERPUNCH = :THUNDERPUNCH
+  VOLTSWITCH = :VOLTSWITCH
+  PARABOLICCHARGE = :PARABOLICCHARGE
+  SPARK = :SPARK
+  THUNDERFANG = :THUNDERFANG
+  SHOCKWAVE = :SHOCKWAVE
+  ELECTROWEB = :ELECTROWEB
+  CHARGEBEAM = :CHARGEBEAM
+  THUNDERSHOCK = :THUNDERSHOCK
+  NUZZLE = :NUZZLE
+  ELECTROBALL = :ELECTROBALL
+  CHARGE = :CHARGE
+  EERIEIMPULSE = :EERIEIMPULSE
+  ELECTRICTERRAIN = :ELECTRICTERRAIN
+  ELECTRIFY = :ELECTRIFY
+  IONDELUGE = :IONDELUGE
+  MAGNETRISE = :MAGNETRISE
+  MAGNETICFLUX = :MAGNETICFLUX
+  THUNDERWAVE = :THUNDERWAVE
+  LIGHTOFRUIN = :LIGHTOFRUIN
+  FLEURCANNON = :FLEURCANNON
+  MOONBLAST = :MOONBLAST
+  PLAYROUGH = :PLAYROUGH
+  DAZZLINGGLEAM = :DAZZLINGGLEAM
+  DRAININGKISS = :DRAININGKISS
+  DISARMINGVOICE = :DISARMINGVOICE
+  FAIRYWIND = :FAIRYWIND
+  NATURESMADNESS = :NATURESMADNESS
+  AROMATICMIST = :AROMATICMIST
+  BABYDOLLEYES = :BABYDOLLEYES
+  CHARM = :CHARM
+  CRAFTYSHIELD = :CRAFTYSHIELD
+  FAIRYLOCK = :FAIRYLOCK
+  FLORALHEALING = :FLORALHEALING
+  FLOWERSHIELD = :FLOWERSHIELD
+  GEOMANCY = :GEOMANCY
+  MISTYTERRAIN = :MISTYTERRAIN
+  MOONLIGHT = :MOONLIGHT
+  SWEETKISS = :SWEETKISS
+  FOCUSPUNCH = :FOCUSPUNCH
+  HIJUMPKICK = :HIJUMPKICK
+  CLOSECOMBAT = :CLOSECOMBAT
+  FOCUSBLAST = :FOCUSBLAST
+  SUPERPOWER = :SUPERPOWER
+  CROSSCHOP = :CROSSCHOP
+  DYNAMICPUNCH = :DYNAMICPUNCH
+  FLYINGPRESS = :FLYINGPRESS
+  HAMMERARM = :HAMMERARM
+  JUMPKICK = :JUMPKICK
+  SACREDSWORD = :SACREDSWORD
+  SECRETSWORD = :SECRETSWORD
+  SKYUPPERCUT = :SKYUPPERCUT
+  AURASPHERE = :AURASPHERE
+  SUBMISSION = :SUBMISSION
+  BRICKBREAK = :BRICKBREAK
+  DRAINPUNCH = :DRAINPUNCH
+  VITALTHROW = :VITALTHROW
+  WAKEUPSLAP = :WAKEUPSLAP
+  LOWSWEEP = :LOWSWEEP
+  CIRCLETHROW = :CIRCLETHROW
+  FORCEPALM = :FORCEPALM
+  REVENGE = :REVENGE
+  ROLLINGKICK = :ROLLINGKICK
+  STORMTHROW = :STORMTHROW
+  KARATECHOP = :KARATECHOP
+  MACHPUNCH = :MACHPUNCH
+  POWERUPPUNCH = :POWERUPPUNCH
+  ROCKSMASH = :ROCKSMASH
+  VACUUMWAVE = :VACUUMWAVE
+  DOUBLEKICK = :DOUBLEKICK
+  ARMTHRUST = :ARMTHRUST
+  TRIPLEKICK = :TRIPLEKICK
+  COUNTER = :COUNTER
+  FINALGAMBIT = :FINALGAMBIT
+  LOWKICK = :LOWKICK
+  REVERSAL = :REVERSAL
+  SEISMICTOSS = :SEISMICTOSS
+  BULKUP = :BULKUP
+  DETECT = :DETECT
+  MATBLOCK = :MATBLOCK
+  QUICKGUARD = :QUICKGUARD
+  VCREATE = :VCREATE
+  BLASTBURN = :BLASTBURN
+  ERUPTION = :ERUPTION
+  MINDBLOWN = :MINDBLOWN
+  SHELLTRAP = :SHELLTRAP
+  BLUEFLARE = :BLUEFLARE
+  BURNUP = :BURNUP
+  OVERHEAT = :OVERHEAT
+  FLAREBLITZ = :FLAREBLITZ
+  FIREBLAST = :FIREBLAST
+  FUSIONFLARE = :FUSIONFLARE
+  INFERNO = :INFERNO
+  MAGMASTORM = :MAGMASTORM
+  SACREDFIRE = :SACREDFIRE
+  SEARINGSHOT = :SEARINGSHOT
+  HEATWAVE = :HEATWAVE
+  FLAMETHROWER = :FLAMETHROWER
+  BLAZEKICK = :BLAZEKICK
+  FIERYDANCE = :FIERYDANCE
+  FIRELASH = :FIRELASH
+  FIREPLEDGE = :FIREPLEDGE
+  LAVAPLUME = :LAVAPLUME
+  FIREPUNCH = :FIREPUNCH
+  MYSTICALFIRE = :MYSTICALFIRE
+  FLAMEBURST = :FLAMEBURST
+  FIREFANG = :FIREFANG
+  FLAMEWHEEL = :FLAMEWHEEL
+  INCINERATE = :INCINERATE
+  FLAMECHARGE = :FLAMECHARGE
+  EMBER = :EMBER
+  FIRESPIN = :FIRESPIN
+  HEATCRASH = :HEATCRASH
+  SUNNYDAY = :SUNNYDAY
+  WILLOWISP = :WILLOWISP
+  SKYATTACK = :SKYATTACK
+  BRAVEBIRD = :BRAVEBIRD
+  DRAGONASCENT = :DRAGONASCENT
+  HURRICANE = :HURRICANE
+  AEROBLAST = :AEROBLAST
+  BEAKBLAST = :BEAKBLAST
+  FLY = :FLY
+  BOUNCE = :BOUNCE
+  DRILLPECK = :DRILLPECK
+  OBLIVIONWING = :OBLIVIONWING
+  AIRSLASH = :AIRSLASH
+  CHATTER = :CHATTER
+  AERIALACE = :AERIALACE
+  AIRCUTTER = :AIRCUTTER
+  PLUCK = :PLUCK
+  SKYDROP = :SKYDROP
+  WINGATTACK = :WINGATTACK
+  ACROBATICS = :ACROBATICS
+  GUST = :GUST
+  PECK = :PECK
+  DEFOG = :DEFOG
+  FEATHERDANCE = :FEATHERDANCE
+  MIRRORMOVE = :MIRRORMOVE
+  ROOST = :ROOST
+  TAILWIND = :TAILWIND
+  SHADOWFORCE = :SHADOWFORCE
+  MOONGEISTBEAM = :MOONGEISTBEAM
+  PHANTOMFORCE = :PHANTOMFORCE
+  SPECTRALTHIEF = :SPECTRALTHIEF
+  SHADOWBONE = :SHADOWBONE
+  SHADOWBALL = :SHADOWBALL
+  SPIRITSHACKLE = :SPIRITSHACKLE
+  SHADOWCLAW = :SHADOWCLAW
+  HEX = :HEX
+  OMINOUSWIND = :OMINOUSWIND
+  SHADOWPUNCH = :SHADOWPUNCH
+  SHADOWSNEAK = :SHADOWSNEAK
+  ASTONISH = :ASTONISH
+  LICK = :LICK
+  NIGHTSHADE = :NIGHTSHADE
+  CONFUSERAY = :CONFUSERAY
+  CURSE = :CURSE
+  DESTINYBOND = :DESTINYBOND
+  GRUDGE = :GRUDGE
+  NIGHTMARE = :NIGHTMARE
+  SPITE = :SPITE
+  TRICKORTREAT = :TRICKORTREAT
+  FRENZYPLANT = :FRENZYPLANT
+  LEAFSTORM = :LEAFSTORM
+  SOLARBLADE = :SOLARBLADE
+  PETALDANCE = :PETALDANCE
+  POWERWHIP = :POWERWHIP
+  SEEDFLARE = :SEEDFLARE
+  SOLARBEAM = :SOLARBEAM
+  WOODHAMMER = :WOODHAMMER
+  ENERGYBALL = :ENERGYBALL
+  LEAFBLADE = :LEAFBLADE
+  PETALBLIZZARD = :PETALBLIZZARD
+  GRASSPLEDGE = :GRASSPLEDGE
+  SEEDBOMB = :SEEDBOMB
+  GIGADRAIN = :GIGADRAIN
+  HORNLEECH = :HORNLEECH
+  TROPKICK = :TROPKICK
+  LEAFTORNADO = :LEAFTORNADO
+  MAGICALLEAF = :MAGICALLEAF
+  NEEDLEARM = :NEEDLEARM
+  RAZORLEAF = :RAZORLEAF
+  VINEWHIP = :VINEWHIP
+  LEAFAGE = :LEAFAGE
+  MEGADRAIN = :MEGADRAIN
+  BULLETSEED = :BULLETSEED
+  ABSORB = :ABSORB
+  GRASSKNOT = :GRASSKNOT
+  AROMATHERAPY = :AROMATHERAPY
+  COTTONGUARD = :COTTONGUARD
+  COTTONSPORE = :COTTONSPORE
+  FORESTSCURSE = :FORESTSCURSE
+  GRASSWHISTLE = :GRASSWHISTLE
+  GRASSYTERRAIN = :GRASSYTERRAIN
+  INGRAIN = :INGRAIN
+  LEECHSEED = :LEECHSEED
+  SLEEPPOWDER = :SLEEPPOWDER
+  SPIKYSHIELD = :SPIKYSHIELD
+  SPORE = :SPORE
+  STRENGTHSAP = :STRENGTHSAP
+  STUNSPORE = :STUNSPORE
+  SYNTHESIS = :SYNTHESIS
+  WORRYSEED = :WORRYSEED
+  PRECIPICEBLADES = :PRECIPICEBLADES
+  EARTHQUAKE = :EARTHQUAKE
+  HIGHHORSEPOWER = :HIGHHORSEPOWER
+  EARTHPOWER = :EARTHPOWER
+  LANDSWRATH = :LANDSWRATH
+  THOUSANDARROWS = :THOUSANDARROWS
+  THOUSANDWAVES = :THOUSANDWAVES
+  DIG = :DIG
+  DRILLRUN = :DRILLRUN
+  STOMPINGTANTRUM = :STOMPINGTANTRUM
+  BONECLUB = :BONECLUB
+  MUDBOMB = :MUDBOMB
+  BULLDOZE = :BULLDOZE
+  MUDSHOT = :MUDSHOT
+  BONEMERANG = :BONEMERANG
+  SANDTOMB = :SANDTOMB
+  BONERUSH = :BONERUSH
+  MUDSLAP = :MUDSLAP
+  FISSURE = :FISSURE
+  MAGNITUDE = :MAGNITUDE
+  MUDSPORT = :MUDSPORT
+  ROTOTILLER = :ROTOTILLER
+  SANDATTACK = :SANDATTACK
+  SHOREUP = :SHOREUP
+  SPIKES = :SPIKES
+  FREEZESHOCK = :FREEZESHOCK
+  ICEBURN = :ICEBURN
+  BLIZZARD = :BLIZZARD
+  ICEHAMMER = :ICEHAMMER
+  ICEBEAM = :ICEBEAM
+  ICICLECRASH = :ICICLECRASH
+  ICEPUNCH = :ICEPUNCH
+  FREEZEDRY = :FREEZEDRY
+  AURORABEAM = :AURORABEAM
+  GLACIATE = :GLACIATE
+  ICEFANG = :ICEFANG
+  AVALANCHE = :AVALANCHE
+  FROSTBREATH = :FROSTBREATH
+  ICYWIND = :ICYWIND
+  ICESHARD = :ICESHARD
+  POWDERSNOW = :POWDERSNOW
+  ICEBALL = :ICEBALL
+  ICICLESPEAR = :ICICLESPEAR
+  SHEERCOLD = :SHEERCOLD
+  AURORAVEIL = :AURORAVEIL
+  HAIL = :HAIL
+  HAZE = :HAZE
+  MIST = :MIST
+  EXPLOSION = :EXPLOSION
+  SELFDESTRUCT = :SELFDESTRUCT
+  GIGAIMPACT = :GIGAIMPACT
+  HYPERBEAM = :HYPERBEAM
+  BOOMBURST = :BOOMBURST
+  LASTRESORT = :LASTRESORT
+  SKULLBASH = :SKULLBASH
+  DOUBLEEDGE = :DOUBLEEDGE
+  HEADCHARGE = :HEADCHARGE
+  MEGAKICK = :MEGAKICK
+  TECHNOBLAST = :TECHNOBLAST
+  THRASH = :THRASH
+  EGGBOMB = :EGGBOMB
+  JUDGMENT = :JUDGMENT
+  HYPERVOICE = :HYPERVOICE
+  MULTIATTACK = :MULTIATTACK
+  REVELATIONDANCE = :REVELATIONDANCE
+  ROCKCLIMB = :ROCKCLIMB
+  TAKEDOWN = :TAKEDOWN
+  UPROAR = :UPROAR
+  BODYSLAM = :BODYSLAM
+  EXTREMESPEED = :EXTREMESPEED
+  HYPERFANG = :HYPERFANG
+  MEGAPUNCH = :MEGAPUNCH
+  RAZORWIND = :RAZORWIND
+  SLAM = :SLAM
+  STRENGTH = :STRENGTH
+  TRIATTACK = :TRIATTACK
+  CRUSHCLAW = :CRUSHCLAW
+  RELICSONG = :RELICSONG
+  CHIPAWAY = :CHIPAWAY
+  DIZZYPUNCH = :DIZZYPUNCH
+  FACADE = :FACADE
+  HEADBUTT = :HEADBUTT
+  RETALIATE = :RETALIATE
+  SECRETPOWER = :SECRETPOWER
+  SLASH = :SLASH
+  SMELLINGSALT = :SMELLINGSALT
+  HORNATTACK = :HORNATTACK
+  STOMP = :STOMP
+  COVET = :COVET
+  HIDDENPOWER = :HIDDENPOWER
+  ROUND = :ROUND
+  SWIFT = :SWIFT
+  VICEGRIP = :VICEGRIP
+  CUT = :CUT
+  SNORE = :SNORE
+  STRUGGLE = :STRUGGLE
+  WEATHERBALL = :WEATHERBALL
+  ECHOEDVOICE = :ECHOEDVOICE
+  FAKEOUT = :FAKEOUT
+  FALSESWIPE = :FALSESWIPE
+  HOLDBACK = :HOLDBACK
+  PAYDAY = :PAYDAY
+  POUND = :POUND
+  QUICKATTACK = :QUICKATTACK
+  SCRATCH = :SCRATCH
+  TACKLE = :TACKLE
+  DOUBLEHIT = :DOUBLEHIT
+  FEINT = :FEINT
+  TAILSLAP = :TAILSLAP
+  RAGE = :RAGE
+  RAPIDSPIN = :RAPIDSPIN
+  SPIKECANNON = :SPIKECANNON
+  COMETPUNCH = :COMETPUNCH
+  FURYSWIPES = :FURYSWIPES
+  BARRAGE = :BARRAGE
+  BIND = :BIND
+  DOUBLESLAP = :DOUBLESLAP
+  FURYATTACK = :FURYATTACK
+  WRAP = :WRAP
+  CONSTRICT = :CONSTRICT
+  BIDE = :BIDE
+  CRUSHGRIP = :CRUSHGRIP
+  ENDEAVOR = :ENDEAVOR
+  FLAIL = :FLAIL
+  FRUSTRATION = :FRUSTRATION
+  GUILLOTINE = :GUILLOTINE
+  HORNDRILL = :HORNDRILL
+  NATURALGIFT = :NATURALGIFT
+  PRESENT = :PRESENT
+  RETURN = :RETURN
+  SONICBOOM = :SONICBOOM
+  SPITUP = :SPITUP
+  SUPERFANG = :SUPERFANG
+  TRUMPCARD = :TRUMPCARD
+  WRINGOUT = :WRINGOUT
+  ACUPRESSURE = :ACUPRESSURE
+  AFTERYOU = :AFTERYOU
+  ASSIST = :ASSIST
+  ATTRACT = :ATTRACT
+  BATONPASS = :BATONPASS
+  BELLYDRUM = :BELLYDRUM
+  BESTOW = :BESTOW
+  BLOCK = :BLOCK
+  CAMOUFLAGE = :CAMOUFLAGE
+  CAPTIVATE = :CAPTIVATE
+  CELEBRATE = :CELEBRATE
+  CONFIDE = :CONFIDE
+  CONVERSION = :CONVERSION
+  CONVERSION2 = :CONVERSION2
+  COPYCAT = :COPYCAT
+  DEFENSECURL = :DEFENSECURL
+  DISABLE = :DISABLE
+  DOUBLETEAM = :DOUBLETEAM
+  ENCORE = :ENCORE
+  ENDURE = :ENDURE
+  ENTRAINMENT = :ENTRAINMENT
+  FLASH = :FLASH
+  FOCUSENERGY = :FOCUSENERGY
+  FOLLOWME = :FOLLOWME
+  FORESIGHT = :FORESIGHT
+  GLARE = :GLARE
+  GROWL = :GROWL
+  GROWTH = :GROWTH
+  HAPPYHOUR = :HAPPYHOUR
+  HARDEN = :HARDEN
+  HEALBELL = :HEALBELL
+  HELPINGHAND = :HELPINGHAND
+  HOLDHANDS = :HOLDHANDS
+  HOWL = :HOWL
+  LASERFOCUS = :LASERFOCUS
+  LEER = :LEER
+  LOCKON = :LOCKON
+  LOVELYKISS = :LOVELYKISS
+  LUCKYCHANT = :LUCKYCHANT
+  MEFIRST = :MEFIRST
+  MEANLOOK = :MEANLOOK
+  METRONOME = :METRONOME
+  MILKDRINK = :MILKDRINK
+  MIMIC = :MIMIC
+  MINDREADER = :MINDREADER
+  MINIMIZE = :MINIMIZE
+  MORNINGSUN = :MORNINGSUN
+  NATUREPOWER = :NATUREPOWER
+  NOBLEROAR = :NOBLEROAR
+  ODORSLEUTH = :ODORSLEUTH
+  PAINSPLIT = :PAINSPLIT
+  PERISHSONG = :PERISHSONG
+  PLAYNICE = :PLAYNICE
+  PROTECT = :PROTECT
+  PSYCHUP = :PSYCHUP
+  RECOVER = :RECOVER
+  RECYCLE = :RECYCLE
+  REFLECTTYPE = :REFLECTTYPE
+  REFRESH = :REFRESH
+  ROAR = :ROAR
+  SAFEGUARD = :SAFEGUARD
+  SCARYFACE = :SCARYFACE
+  SCREECH = :SCREECH
+  SHARPEN = :SHARPEN
+  SHELLSMASH = :SHELLSMASH
+  SIMPLEBEAM = :SIMPLEBEAM
+  SING = :SING
+  SKETCH = :SKETCH
+  SLACKOFF = :SLACKOFF
+  SLEEPTALK = :SLEEPTALK
+  SMOKESCREEN = :SMOKESCREEN
+  SOFTBOILED = :SOFTBOILED
+  SPLASH = :SPLASH
+  SPOTLIGHT = :SPOTLIGHT
+  STOCKPILE = :STOCKPILE
+  SUBSTITUTE = :SUBSTITUTE
+  SUPERSONIC = :SUPERSONIC
+  SWAGGER = :SWAGGER
+  SWALLOW = :SWALLOW
+  SWEETSCENT = :SWEETSCENT
+  SWORDSDANCE = :SWORDSDANCE
+  TAILWHIP = :TAILWHIP
+  TEARFULLOOK = :TEARFULLOOK
+  TEETERDANCE = :TEETERDANCE
+  TICKLE = :TICKLE
+  TRANSFORM = :TRANSFORM
+  WHIRLWIND = :WHIRLWIND
+  WISH = :WISH
+  WORKUP = :WORKUP
+  YAWN = :YAWN
+  BELCH = :BELCH
+  GUNKSHOT = :GUNKSHOT
+  SLUDGEWAVE = :SLUDGEWAVE
+  SLUDGEBOMB = :SLUDGEBOMB
+  POISONJAB = :POISONJAB
+  CROSSPOISON = :CROSSPOISON
+  SLUDGE = :SLUDGE
+  VENOSHOCK = :VENOSHOCK
+  CLEARSMOG = :CLEARSMOG
+  POISONFANG = :POISONFANG
+  POISONTAIL = :POISONTAIL
+  ACID = :ACID
+  ACIDSPRAY = :ACIDSPRAY
+  SMOG = :SMOG
+  POISONSTING = :POISONSTING
+  ACIDARMOR = :ACIDARMOR
+  BANEFULBUNKER = :BANEFULBUNKER
+  COIL = :COIL
+  GASTROACID = :GASTROACID
+  POISONGAS = :POISONGAS
+  POISONPOWDER = :POISONPOWDER
+  PURIFY = :PURIFY
+  TOXIC = :TOXIC
+  TOXICSPIKES = :TOXICSPIKES
+  TOXICTHREAD = :TOXICTHREAD
+  VENOMDRENCH = :VENOMDRENCH
+  PRISMATICLASER = :PRISMATICLASER
+  PSYCHOBOOST = :PSYCHOBOOST
+  FUTURESIGHT = :FUTURESIGHT
+  SYNCHRONOISE = :SYNCHRONOISE
+  DREAMEATER = :DREAMEATER
+  PHOTONGEYSER = :PHOTONGEYSER
+  PSYSTRIKE = :PSYSTRIKE
+  PSYCHIC = :PSYCHIC
+  PSYCHICFANGS = :PSYCHICFANGS
+  EXTRASENSORY = :EXTRASENSORY
+  HYPERSPACEHOLE = :HYPERSPACEHOLE
+  PSYSHOCK = :PSYSHOCK
+  ZENHEADBUTT = :ZENHEADBUTT
+  LUSTERPURGE = :LUSTERPURGE
+  MISTBALL = :MISTBALL
+  PSYCHOCUT = :PSYCHOCUT
+  PSYBEAM = :PSYBEAM
+  HEARTSTAMP = :HEARTSTAMP
+  CONFUSION = :CONFUSION
+  STOREDPOWER = :STOREDPOWER
+  MIRRORCOAT = :MIRRORCOAT
+  PSYWAVE = :PSYWAVE
+  AGILITY = :AGILITY
+  ALLYSWITCH = :ALLYSWITCH
+  AMNESIA = :AMNESIA
+  BARRIER = :BARRIER
+  CALMMIND = :CALMMIND
+  COSMICPOWER = :COSMICPOWER
+  GRAVITY = :GRAVITY
+  GUARDSPLIT = :GUARDSPLIT
+  GUARDSWAP = :GUARDSWAP
+  HEALBLOCK = :HEALBLOCK
+  HEALPULSE = :HEALPULSE
+  HEALINGWISH = :HEALINGWISH
+  HEARTSWAP = :HEARTSWAP
+  HYPNOSIS = :HYPNOSIS
+  IMPRISON = :IMPRISON
+  INSTRUCT = :INSTRUCT
+  KINESIS = :KINESIS
+  LIGHTSCREEN = :LIGHTSCREEN
+  LUNARDANCE = :LUNARDANCE
+  MAGICCOAT = :MAGICCOAT
+  MAGICROOM = :MAGICROOM
+  MEDITATE = :MEDITATE
+  MIRACLEEYE = :MIRACLEEYE
+  POWERSPLIT = :POWERSPLIT
+  POWERSWAP = :POWERSWAP
+  POWERTRICK = :POWERTRICK
+  PSYCHICTERRAIN = :PSYCHICTERRAIN
+  PSYCHOSHIFT = :PSYCHOSHIFT
+  REFLECT = :REFLECT
+  REST = :REST
+  ROLEPLAY = :ROLEPLAY
+  SKILLSWAP = :SKILLSWAP
+  SPEEDSWAP = :SPEEDSWAP
+  TELEKINESIS = :TELEKINESIS
+  TELEPORT = :TELEPORT
+  TRICK = :TRICK
+  TRICKROOM = :TRICKROOM
+  WONDERROOM = :WONDERROOM
+  HEADSMASH = :HEADSMASH
+  ROCKWRECKER = :ROCKWRECKER
+  DIAMONDSTORM = :DIAMONDSTORM
+  STONEEDGE = :STONEEDGE
+  POWERGEM = :POWERGEM
+  ROCKSLIDE = :ROCKSLIDE
+  ANCIENTPOWER = :ANCIENTPOWER
+  ROCKTOMB = :ROCKTOMB
+  ROCKTHROW = :ROCKTHROW
+  SMACKDOWN = :SMACKDOWN
+  ACCELEROCK = :ACCELEROCK
+  ROLLOUT = :ROLLOUT
+  ROCKBLAST = :ROCKBLAST
+  ROCKPOLISH = :ROCKPOLISH
+  SANDSTORM = :SANDSTORM
+  STEALTHROCK = :STEALTHROCK
+  WIDEGUARD = :WIDEGUARD
+  DOOMDESIRE = :DOOMDESIRE
+  IRONTAIL = :IRONTAIL
+  SUNSTEELSTRIKE = :SUNSTEELSTRIKE
+  METEORMASH = :METEORMASH
+  ANCHORSHOT = :ANCHORSHOT
+  FLASHCANNON = :FLASHCANNON
+  IRONHEAD = :IRONHEAD
+  SMARTSTRIKE = :SMARTSTRIKE
+  STEELWING = :STEELWING
+  DOUBLEIRONBASH = :DOUBLEIRONBASH
+  MIRRORSHOT = :MIRRORSHOT
+  MAGNETBOMB = :MAGNETBOMB
+  GEARGRIND = :GEARGRIND
+  METALCLAW = :METALCLAW
+  BULLETPUNCH = :BULLETPUNCH
+  GYROBALL = :GYROBALL
+  HEAVYSLAM = :HEAVYSLAM
+  METALBURST = :METALBURST
+  AUTOTOMIZE = :AUTOTOMIZE
+  GEARUP = :GEARUP
+  IRONDEFENSE = :IRONDEFENSE
+  KINGSSHIELD = :KINGSSHIELD
+  METALSOUND = :METALSOUND
+  SHIFTGEAR = :SHIFTGEAR
+  HYDROCANNON = :HYDROCANNON
+  WATERSPOUT = :WATERSPOUT
+  HYDROPUMP = :HYDROPUMP
+  ORIGINPULSE = :ORIGINPULSE
+  STEAMERUPTION = :STEAMERUPTION
+  CRABHAMMER = :CRABHAMMER
+  AQUATAIL = :AQUATAIL
+  MUDDYWATER = :MUDDYWATER
+  SPARKLINGARIA = :SPARKLINGARIA
+  SURF = :SURF
+  LIQUIDATION = :LIQUIDATION
+  DIVE = :DIVE
+  SCALD = :SCALD
+  WATERPLEDGE = :WATERPLEDGE
+  WATERFALL = :WATERFALL
+  RAZORSHELL = :RAZORSHELL
+  BRINE = :BRINE
+  BUBBLEBEAM = :BUBBLEBEAM
+  OCTAZOOKA = :OCTAZOOKA
+  WATERPULSE = :WATERPULSE
+  AQUAJET = :AQUAJET
+  BUBBLE = :BUBBLE
+  WATERGUN = :WATERGUN
+  CLAMP = :CLAMP
+  WHIRLPOOL = :WHIRLPOOL
+  WATERSHURIKEN = :WATERSHURIKEN
+  AQUARING = :AQUARING
+  RAINDANCE = :RAINDANCE
+  SOAK = :SOAK
+  WATERSPORT = :WATERSPORT
+  WITHDRAW = :WITHDRAW
+  FAINTATTACK = :FAINTATTACK
+  HIDDENPOWER2 = :HIDDENPOWER2
+  TRIATTACK2 = :TRIATTACK2
+
+end
+
+
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 947245756..d28d5f198 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ