diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata
index d0ac3c6d4..826a1930d 100644
Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ
diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata
index 0db874774..a436a7cd8 100644
Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ
diff --git a/Data/Map526.rxdata b/Data/Map526.rxdata
index e34c3c774..439ffa212 100644
Binary files a/Data/Map526.rxdata and b/Data/Map526.rxdata differ
diff --git a/Data/Map670.rxdata b/Data/Map670.rxdata
index 5cc49ce75..d4dd3a2bb 100644
Binary files a/Data/Map670.rxdata and b/Data/Map670.rxdata differ
diff --git a/Data/Map692.rxdata b/Data/Map692.rxdata
index bcddf631d..bf96fc3e8 100644
Binary files a/Data/Map692.rxdata and b/Data/Map692.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 4cfd0c844..ae1225bcc 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/004_Game classes/007_Game_Character.rb b/Data/Scripts/004_Game classes/007_Game_Character.rb
index 6a183f8f6..82222a151 100644
--- a/Data/Scripts/004_Game classes/007_Game_Character.rb	
+++ b/Data/Scripts/004_Game classes/007_Game_Character.rb	
@@ -548,6 +548,7 @@ class Game_Character
   end
 
   def move_upper_left
+    @through=true
     unless @direction_fix
       @direction = (@direction == 6 ? 4 : @direction == 2 ? 8 : @direction)
     end
@@ -556,9 +557,11 @@ class Game_Character
       @y -= 1
       increase_steps
     end
+    @through=false
   end
 
   def move_upper_right
+    @through=true
     unless @direction_fix
       @direction = (@direction == 4 ? 6 : @direction == 2 ? 8 : @direction)
     end
@@ -567,9 +570,11 @@ class Game_Character
       @y -= 1
       increase_steps
     end
+    @through=false
   end
 
   def move_lower_left
+    @through=true
     unless @direction_fix
       @direction = (@direction == 6 ? 4 : @direction == 8 ? 2 : @direction)
     end
@@ -578,9 +583,11 @@ class Game_Character
       @y += 1
       increase_steps
     end
+    @through=false
   end
 
   def move_lower_right
+    @through=true
     unless @direction_fix
       @direction = (@direction == 4 ? 6 : @direction == 8 ? 2 : @direction)
     end
@@ -589,6 +596,7 @@ class Game_Character
       @y += 1
       increase_steps
     end
+    @through=false
   end
 
   def moveLeft90   # anticlockwise
diff --git a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb b/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
index b088b2af5..ed8fe4b83 100644
--- a/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
+++ b/Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
@@ -7,6 +7,7 @@ class PokeBattle_Battle
 
   #=============================================================================
   # Makes sure all Pokémon exist that need to. Alter the type of battle if
+  # Makes sure all Pokémon exist that need to. Alter the type of battle if
   # necessary. Will never try to create battler positions, only delete them
   # (except for wild Pokémon whose number of positions are fixed). Reduces the
   # size of each side by 1 and tries again. If the side sizes are uneven, only
diff --git a/Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb b/Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb
index 006f7c55b..b756e820c 100644
--- a/Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb
+++ b/Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb
@@ -298,7 +298,7 @@ class PokeBattle_Battle
     @scene.pbSendOutBattlers(sendOuts,startBattle)
     sendOuts.each do |b|
       @scene.pbResetMoveIndex(b[0])
-      pbSetSeen(@battlers[b[0]])
+      #pbSetSeen(@battlers[b[0]])
       @usedInBattle[b[0]&1][b[0]/2] = true
     end
   end
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index a389cf201..7213efd76 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -4,7 +4,7 @@
 #===============================================================================
 class Pokemon
   # @return [Symbol] this Pokémon's species
-  attr_reader   :species
+  attr_reader :species
   # If defined, this Pokémon's form will be this value even if a MultipleForms
   # handler tries to say otherwise.
   # @return [Integer, nil] this Pokémon's form
@@ -13,29 +13,29 @@ class Pokemon
   # @return [Integer, nil] the time this Pokémon's form was set
   attr_accessor :time_form_set
   # @return [Integer] the current experience points
-  attr_reader   :exp
+  attr_reader :exp
 
-  attr_accessor   :exp_when_fused_head
-  attr_accessor   :exp_when_fused_body
-  attr_accessor   :exp_gained_since_fused
+  attr_accessor :exp_when_fused_head
+  attr_accessor :exp_when_fused_body
+  attr_accessor :exp_gained_since_fused
 
   # @return [Integer] the number of steps until this Pokémon hatches, 0 if this Pokémon is not an egg
   attr_accessor :steps_to_hatch
   # @return [Integer] the current HP
-  attr_reader   :hp
+  attr_reader :hp
   # @return [Symbol] this Pokémon's current status (see GameData::Status)
-  attr_reader   :status
+  attr_reader :status
   # @return [Integer] sleep count / toxic flag / 0:
   #   sleep (number of rounds before waking up), toxic (0 = regular poison, 1 = toxic)
   attr_accessor :statusCount
   # This Pokémon's shininess (true, false, nil). Is recalculated if made nil.
   # @param value [Boolean, nil] whether this Pokémon is shiny
-  attr_writer   :shiny
+  attr_writer :shiny
   # The index of this Pokémon's ability (0, 1 are natural abilities, 2+ are
   # hidden abilities)as defined for its species/form. An ability may not be
   # defined at this index. Is recalculated (as 0 or 1) if made nil.
   # @param value [Integer, nil] forced ability index (nil if none is set)
-  attr_writer   :ability_index
+  attr_writer :ability_index
   # @return [Array<Pokemon::Move>] the moves known by this Pokémon
   attr_accessor :moves
   # @return [Array<Integer>] the IDs of moves known by this Pokémon when it was obtained
@@ -61,9 +61,9 @@ class Pokemon
   # @return [Hash<Integer>] this Pokémon's effort values
   attr_accessor :ev
   # @return [Integer] calculated stats
-  attr_reader   :totalhp, :attack, :defense, :spatk, :spdef, :speed
+  attr_reader :totalhp, :attack, :defense, :spatk, :spdef, :speed
   # @return [Owner] this Pokémon's owner
-  attr_reader   :owner
+  attr_reader :owner
   # @return [Integer] the manner this Pokémon was obtained:
   #   0 (met), 1 (as egg), 2 (traded), 4 (fateful encounter)
   attr_accessor :obtain_method
@@ -89,13 +89,13 @@ class Pokemon
   # Max total IVs
   IV_STAT_LIMIT = 31
   # Max total EVs
-  EV_LIMIT      = 510
+  EV_LIMIT = 510
   # Max EVs that a single stat can have
   EV_STAT_LIMIT = 252
   # Maximum length a Pokémon's nickname can be
   MAX_NAME_SIZE = 10
   # Maximum number of moves a Pokémon can know at once
-  MAX_MOVES     = 4
+  MAX_MOVES = 4
 
   def self.play_cry(species, form = 0, volume = 90, pitch = 100)
     GameData::Species.play_cry_from_species(species, form, volume, pitch)
@@ -124,11 +124,11 @@ class Pokemon
   def species=(species_id)
     new_species_data = GameData::Species.get(species_id)
     return if @species == new_species_data.species
-    @species     = new_species_data.species
-    @form        = new_species_data.form if new_species_data.form != 0
+    @species = new_species_data.species
+    @form = new_species_data.form if new_species_data.form != 0
     @forced_form = nil
-    @level       = nil   # In case growth rate is different for the new species
-    @ability     = nil
+    @level = nil # In case growth rate is different for the new species
+    @ability = nil
     calc_stats
   end
 
@@ -136,7 +136,7 @@ class Pokemon
   # @return [Boolean] whether this Pokémon is of the specified species
   def isSpecies?(check_species)
     return @species == check_species || (GameData::Species.exists?(check_species) &&
-                                        @species == GameData::Species.get(check_species).species)
+      @species == GameData::Species.get(check_species).species)
   end
 
   def isFusion?
@@ -232,7 +232,7 @@ class Pokemon
     return 0.0 if lvl >= GameData::GrowthRate.max_level
     g_rate = growth_rate
     start_exp = g_rate.minimum_exp_for_level(lvl)
-    end_exp   = g_rate.minimum_exp_for_level(lvl + 1)
+    end_exp = g_rate.minimum_exp_for_level(lvl + 1)
     return (@exp - start_exp).to_f / (end_exp - start_exp)
   end
 
@@ -277,7 +277,7 @@ class Pokemon
   # Heals the status problem of this Pokémon.
   def heal_status
     return if egg?
-    @status      = :NONE
+    @status = :NONE
     @statusCount = 0
   end
 
@@ -341,9 +341,12 @@ class Pokemon
     if !@gender
       gender_ratio = species_data.gender_ratio
       case gender_ratio
-      when :AlwaysMale   then @gender = 0
-      when :AlwaysFemale then @gender = 1
-      when :Genderless   then @gender = 2
+      when :AlwaysMale then
+        @gender = 0
+      when :AlwaysFemale then
+        @gender = 1
+      when :Genderless then
+        @gender = 2
       else
         female_chance = GameData::GenderRatio.get(gender_ratio).female_chance
         @gender = ((@personalID & 0xFF) < female_chance) ? 1 : 0
@@ -360,19 +363,29 @@ class Pokemon
   end
 
   # Makes this Pokémon male.
-  def makeMale; self.gender = 0; end
+  def makeMale
+    self.gender = 0;
+  end
 
   # Makes this Pokémon female.
-  def makeFemale; self.gender = 1; end
+  def makeFemale
+    self.gender = 1;
+  end
 
   # @return [Boolean] whether this Pokémon is male
-  def male?; return self.gender == 0; end
+  def male?
+    return self.gender == 0;
+  end
 
   # @return [Boolean] whether this Pokémon is female
-  def female?; return self.gender == 1; end
+  def female?
+    return self.gender == 1;
+  end
 
   # @return [Boolean] whether this Pokémon is genderless
-  def genderless?; return self.gender == 2; end
+  def genderless?
+    return self.gender == 2;
+  end
 
   # @return [Boolean] whether this Pokémon species is restricted to only ever being one
   #   gender (or genderless)
@@ -417,11 +430,11 @@ class Pokemon
     if !@ability
       sp_data = species_data
       abil_index = ability_index
-      if abil_index >= 2   # Hidden ability
+      if abil_index >= 2 # Hidden ability
         @ability = sp_data.hidden_abilities[abil_index - 2]
         abil_index = (@personalID & 1) if !@ability
       end
-      if !@ability   # Natural ability or no hidden ability defined
+      if !@ability # Natural ability or no hidden ability defined
         @ability = sp_data.abilities[abil_index] || sp_data.abilities[0]
       end
     end
@@ -674,7 +687,15 @@ class Pokemon
   # @return [Boolean] whether the Pokémon is compatible with the given move
   def compatible_with_move?(move_id)
     move_data = GameData::Move.try_get(move_id)
-    return move_data && species_data.tutor_moves.include?(move_data.id)
+    if isFusion?()
+      head_species_id = getBasePokemonID(species, false)
+      body_species_id = getBasePokemonID(species)
+      head_species = GameData::Species.get(head_species_id)
+      body_species = GameData::Species.get(body_species_id)
+      return move_data && (head_species.tutor_moves.include?(move_data.id) || body_species.tutor_moves.include?(move_data.id))
+    else
+      return move_data && species_data.tutor_moves.include?(move_data.id)
+    end
   end
 
   def can_relearn_move?
@@ -771,7 +792,7 @@ class Pokemon
   # Gives this Pokémon Pokérus (either the specified strain or a random one).
   # @param strain [Integer] Pokérus strain to give
   def givePokerus(strain = 0)
-    return if self.pokerusStage == 2   # Can't re-infect a cured Pokémon
+    return if self.pokerusStage == 2 # Can't re-infect a cured Pokémon
     strain = rand(1..16) if strain <= 0 || strain >= 16
     time = 1 + (strain % 4)
     @pokerus = time
@@ -897,7 +918,7 @@ class Pokemon
       gain = [1, 1, 0][happiness_range]
     when "faint"
       gain = -1
-    when "faintbad"   # Fainted against an opponent that is 30+ levels higher
+    when "faintbad" # Fainted against an opponent that is 30+ levels higher
       gain = [-5, -5, -10][happiness_range]
     when "powder"
       gain = [-5, -5, -10][happiness_range]
@@ -952,7 +973,8 @@ class Pokemon
   # required it to have a held item) or duplicate this Pokémon (Shedinja only).
   # @param new_species [Pokemon] the species that this Pokémon evolved into
   def action_after_evolution(new_species)
-    species_data.get_evolutions(true).each do |evo|   # [new_species, method, parameter]
+    species_data.get_evolutions(true).each do |evo|
+      # [new_species, method, parameter]
       break if GameData::Evolution.get(evo[1]).call_after_evolution(self, evo[0], evo[2], new_species)
     end
   end
@@ -965,9 +987,10 @@ class Pokemon
     return nil if egg? || shadowPokemon?
     return nil if hasItem?(:EVERSTONE)
     return nil if hasAbility?(:BATTLEBOND)
-    species_data.get_evolutions(true).each do |evo|   # [new_species, method, parameter, boolean]
-      next if evo[3]   # Prevolution
-      ret = yield self, evo[0], evo[1], evo[2]   # pkmn, new_species, method, parameter
+    species_data.get_evolutions(true).each do |evo|
+      # [new_species, method, parameter, boolean]
+      next if evo[3] # Prevolution
+      ret = yield self, evo[0], evo[1], evo[2] # pkmn, new_species, method, parameter
       return ret if ret
     end
     return nil
@@ -999,7 +1022,7 @@ class Pokemon
 
   # @return [Integer] the maximum HP of this Pokémon
   def calcHP(base, level, iv, ev)
-    return 1 if base == 1   # For Shedinja
+    return 1 if base == 1 # For Shedinja
     return ((base * 2 + iv + (ev / 4)) * level / 100).floor + level + 10
   end
 
@@ -1012,7 +1035,7 @@ class Pokemon
   def calc_stats
     base_stats = self.baseStats
     this_level = self.level
-    this_IV    = self.calcIV
+    this_IV = self.calcIV
     # Format stat multipliers due to nature
     nature_mod = {}
     GameData::Stat.each_main { |s| nature_mod[s.id] = 100 }
@@ -1031,12 +1054,12 @@ class Pokemon
     end
     hpDiff = @totalhp - @hp
     @totalhp = stats[:HP]
-    @hp      = @totalhp - hpDiff
-    @attack  = stats[:ATTACK]
+    @hp = @totalhp - hpDiff
+    @attack = stats[:ATTACK]
     @defense = stats[:DEFENSE]
-    @spatk   = stats[:SPECIAL_ATTACK]
-    @spdef   = stats[:SPECIAL_DEFENSE]
-    @speed   = stats[:SPEED]
+    @spatk = stats[:SPECIAL_ATTACK]
+    @spdef = stats[:SPECIAL_DEFENSE]
+    @speed = stats[:SPEED]
   end
 
   #=============================================================================
@@ -1047,23 +1070,22 @@ class Pokemon
   # @return [Pokemon] a copy of this Pokémon
   def clone
     ret = super
-    ret.iv          = {}
-    ret.ivMaxed     = {}
-    ret.ev          = {}
+    ret.iv = {}
+    ret.ivMaxed = {}
+    ret.ev = {}
     GameData::Stat.each_main do |s|
-      ret.iv[s.id]      = @iv[s.id]
+      ret.iv[s.id] = @iv[s.id]
       ret.ivMaxed[s.id] = @ivMaxed[s.id]
-      ret.ev[s.id]      = @ev[s.id]
+      ret.ev[s.id] = @ev[s.id]
     end
-    ret.moves       = []
+    ret.moves = []
     @moves.each_with_index { |m, i| ret.moves[i] = m.clone }
     ret.first_moves = @first_moves.clone
-    ret.owner       = @owner.clone
-    ret.ribbons     = @ribbons.clone
+    ret.owner = @owner.clone
+    ret.ribbons = @ribbons.clone
     return ret
   end
 
-
   # Creates a new Pokémon object.
   # @param species [Symbol, String, Integer] Pokémon species
   # @param level [Integer] Pokémon level
@@ -1072,42 +1094,42 @@ class Pokemon
   # @param rechech_form [TrueClass, FalseClass] whether to auto-check the form
   def initialize(species, level, owner = $Trainer, withMoves = true, recheck_form = true)
     species_data = GameData::Species.get(species)
-    @species          = species_data.species
-    @form             = species_data.form
-    @forced_form      = nil
-    @time_form_set    = nil
-    self.level        = level
-    @steps_to_hatch   = 0
+    @species = species_data.species
+    @form = species_data.form
+    @forced_form = nil
+    @time_form_set = nil
+    self.level = level
+    @steps_to_hatch = 0
     heal_status
-    @gender           = nil
-    @shiny            = nil
-    @ability_index    = nil
-    @ability          = nil
-    @nature           = nil
+    @gender = nil
+    @shiny = nil
+    @ability_index = nil
+    @ability = nil
+    @nature = nil
     @nature_for_stats = nil
-    @item             = nil
-    @mail             = nil
-    @moves            = []
+    @item = nil
+    @mail = nil
+    @moves = []
     reset_moves if withMoves
-    @first_moves      = []
-    @ribbons          = []
-    @cool             = 0
-    @beauty           = 0
-    @cute             = 0
-    @smart            = 0
-    @tough            = 0
-    @sheen            = 0
-    @pokerus          = 0
-    @name             = nil
-    @happiness        = species_data.happiness
-    @poke_ball        = :POKEBALL
-    @markings         = 0
-    @iv               = {}
-    @ivMaxed          = {}
-    @ev               = {}
+    @first_moves = []
+    @ribbons = []
+    @cool = 0
+    @beauty = 0
+    @cute = 0
+    @smart = 0
+    @tough = 0
+    @sheen = 0
+    @pokerus = 0
+    @name = nil
+    @happiness = species_data.happiness
+    @poke_ball = :POKEBALL
+    @markings = 0
+    @iv = {}
+    @ivMaxed = {}
+    @ev = {}
     GameData::Stat.each_main do |s|
-      @iv[s.id]       = rand(IV_STAT_LIMIT + 1)
-      @ev[s.id]       = 0
+      @iv[s.id] = rand(IV_STAT_LIMIT + 1)
+      @ev[s.id] = 0
     end
     if owner.is_a?(Owner)
       @owner = owner
@@ -1116,18 +1138,18 @@ class Pokemon
     else
       @owner = Owner.new(0, '', 2, 2)
     end
-    @obtain_method    = 0   # Met
-    @obtain_method    = 4 if $game_switches && $game_switches[Settings::FATEFUL_ENCOUNTER_SWITCH]
-    @obtain_map       = ($game_map) ? $game_map.map_id : 0
-    @obtain_text      = nil
-    @obtain_level     = level
-    @hatched_map      = 0
-    @timeReceived     = pbGetTimeNow.to_i
-    @timeEggHatched   = nil
-    @fused            = nil
-    @personalID       = rand(2 ** 16) | rand(2 ** 16) << 16
-    @hp               = 1
-    @totalhp          = 1
+    @obtain_method = 0 # Met
+    @obtain_method = 4 if $game_switches && $game_switches[Settings::FATEFUL_ENCOUNTER_SWITCH]
+    @obtain_map = ($game_map) ? $game_map.map_id : 0
+    @obtain_text = nil
+    @obtain_level = level
+    @hatched_map = 0
+    @timeReceived = pbGetTimeNow.to_i
+    @timeEggHatched = nil
+    @fused = nil
+    @personalID = rand(2 ** 16) | rand(2 ** 16) << 16
+    @hp = 1
+    @totalhp = 1
     calc_stats
     if @form == 0 && recheck_form
       f = MultipleForms.call("getFormOnCreation", self)
diff --git a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb
index 608cde1f2..26d78132b 100644
--- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb	
+++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb	
@@ -165,36 +165,26 @@ class Player < Trainer
     # @param gender [Integer] gender to register (0=male, 1=female, 2=genderless)
     # @param form [Integer] form to register
     def register(species, gender = 0, form = 0, should_refresh_dexes = true)
+      return
       if species.is_a?(Pokemon)
         species_data = species.species_data
-        gender = species.gender
+        #gender = species.gender
       else
-        species_data = GameData::Species.get_species_form(species, form)
+        species_data = GameData::Species.get(species)
       end
       species = species_data.species
-      gender = 0 if gender >= 2
-      form = species_data.form
-      if form != species_data.pokedex_form
-        species_data = GameData::Species.get_species_form(species, species_data.pokedex_form)
-        form = species_data.form
-      end
-      form = 0 if species_data.form_name.nil? || species_data.form_name.empty?
-      # Register as seen
       @seen[species] = true
-      @seen_forms[species] ||= [[], []]
-      @seen_forms[species][gender][form] = true
-      @last_seen_forms[species] ||= []
-      @last_seen_forms[species] = [gender, form] if @last_seen_forms[species] == []
       self.refresh_accessible_dexes if should_refresh_dexes
     end
 
     # @param pkmn [Pokemon] Pokemon to register as most recently seen
     def register_last_seen(pkmn)
-      validate pkmn => Pokemon
-      species_data = pkmn.species_data
-      form = species_data.pokedex_form
-      form = 0 if species_data.form_name.nil? || species_data.form_name.empty?
-      @last_seen_forms[pkmn.species] = [pkmn.gender, form]
+      return
+      # validate pkmn => Pokemon
+      # species_data = pkmn.species_data
+      # form = species_data.pokedex_form
+      # form = 0 if species_data.form_name.nil? || species_data.form_name.empty?
+      # @last_seen_forms[pkmn.species] = [pkmn.gender, form]
     end
 
     #===========================================================================
diff --git a/Data/Scripts/049_Compatibility/EggGroups.rb b/Data/Scripts/049_Compatibility/EggGroups.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/Data/System.rxdata b/Data/System.rxdata
index d28d5f198..a4825b3bc 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/map_metadata.dat b/Data/map_metadata.dat
index cead44821..f88354dca 100644
Binary files a/Data/map_metadata.dat and b/Data/map_metadata.dat differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 54b59d35b..af5d0fe79 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/PBS/pokemon_420.txt b/PBS/pokemon_420.txt
index 559844a1d..48db75be1 100644
--- a/PBS/pokemon_420.txt
+++ b/PBS/pokemon_420.txt
@@ -1,4 +1,4 @@
-# See the documentation on the wiki to learn how to edit this file.
+# See the documentation on the wiki to learn how to edit this file.
 #-------------------------------
 [1]
 Name = Bulbasaur
@@ -252,7 +252,7 @@ Color = Blue
 Shape = Head
 Habitat = WatersEdge
 Kind = Turtle
-Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pokémon's toughness in battle.
+Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pok?mon's toughness in battle.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -550,7 +550,7 @@ Color = Brown
 Shape = Head
 Habitat = Forest
 Kind = Bird
-Pokedex = This Pokémon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
+Pokedex = This Pok?mon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -584,7 +584,7 @@ Color = Brown
 Shape = Head
 Habitat = Forest
 Kind = Bird
-Pokedex = This Pokémon has gorgeous, glossy feathers. Many trainers are so captivated by the beautiful feathers on its head that they choose Pidgeot as their Pokémon.
+Pokedex = This Pok?mon has gorgeous, glossy feathers. Many trainers are so captivated by the beautiful feathers on its head that they choose Pidgeot as their Pok?mon.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -782,7 +782,7 @@ Color = Purple
 Shape = Head
 Habitat = Grassland
 Kind = Cobra
-Pokedex = This Pokémon has a terrifically strong constricting power. It can even flatten steel oil drums. Once it wraps its body around its foe, escaping is impossible.
+Pokedex = This Pok?mon has a terrifically strong constricting power. It can even flatten steel oil drums. Once it wraps its body around its foe, escaping is impossible.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -946,7 +946,7 @@ Color = Blue
 Shape = Head
 Habitat = Grassland
 Kind = Poison Pin
-Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.
+Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pok?mon. When enraged, it releases a horrible toxin from its horn.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -1011,7 +1011,7 @@ Color = Blue
 Shape = Head
 Habitat = Grassland
 Kind = Drill
-Pokedex = It is adept at sending foes flying with harsh tackles using its tough, scaly body. This Pokémon is at its strongest when it is defending its young.
+Pokedex = It is adept at sending foes flying with harsh tackles using its tough, scaly body. This Pok?mon is at its strongest when it is defending its young.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -1043,7 +1043,7 @@ Color = Purple
 Shape = Head
 Habitat = Grassland
 Kind = Poison Pin
-Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pokémon's notice.
+Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pok?mon's notice.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -1379,7 +1379,7 @@ Color = Purple
 Shape = Head
 Habitat = Cave
 Kind = Bat
-Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pokémon. It flits about in darkness and strikes from behind.
+Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pok?mon. It flits about in darkness and strikes from behind.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -1414,7 +1414,7 @@ Color = Blue
 Shape = Head
 Habitat = Grassland
 Kind = Weed
-Pokedex = This Pokémon grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
+Pokedex = This Pok?mon grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
 WildItemCommon = HONEY
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -1719,7 +1719,7 @@ Color = Yellow
 Shape = Head
 Habitat = Urban
 Kind = Scratch Cat
-Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pokémon loves shiny coins that glitter with light.
+Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pok?mon loves shiny coins that glitter with light.
 WildItemUncommon = QUICKCLAW
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -1915,7 +1915,7 @@ Color = Brown
 Shape = Head
 Habitat = Grassland
 Kind = Puppy
-Pokedex = Its superb sense of smell ensures that this Pokémon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
+Pokedex = Its superb sense of smell ensures that this Pok?mon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
 WildItemCommon = RAWSTBERRY
 WildItemUncommon = RAWSTBERRY
 WildItemRare = RAWSTBERRY
@@ -1950,7 +1950,7 @@ Color = Brown
 Shape = Head
 Habitat = Grassland
 Kind = Legendary
-Pokedex = This fleet-footed Pokémon is said to run over 6,200 miles in a single day and night. The fire that blazes wildly within its body is its source of power.
+Pokedex = This fleet-footed Pok?mon is said to run over 6,200 miles in a single day and night. The fire that blazes wildly within its body is its source of power.
 WildItemCommon = RAWSTBERRY
 WildItemUncommon = RAWSTBERRY
 WildItemRare = RAWSTBERRY
@@ -1985,7 +1985,7 @@ Color = Blue
 Shape = Head
 Habitat = WatersEdge
 Kind = Tadpole
-Pokedex = It is possible to see this Pokémon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
+Pokedex = It is possible to see this Pok?mon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -2051,7 +2051,7 @@ Color = Blue
 Shape = Head
 Habitat = WatersEdge
 Kind = Tadpole
-Pokedex = Its highly developed muscles never grow fatigued, however much it exercises. This Pokémon can swim back and forth across the Pacific Ocean without effort.
+Pokedex = Its highly developed muscles never grow fatigued, however much it exercises. This Pok?mon can swim back and forth across the Pacific Ocean without effort.
 WildItemUncommon = KINGSROCK
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -2084,7 +2084,7 @@ Color = Brown
 Shape = Head
 Habitat = Urban
 Kind = Psi
-Pokedex = A Pokémon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
+Pokedex = A Pok?mon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
 WildItemUncommon = TWISTEDSPOON
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -2759,7 +2759,7 @@ Color = Brown
 Shape = Head
 Habitat = Grassland
 Kind = Wild Duck
-Pokedex = It is always seen with a stick from a plant. Apparently, there are good sticks and bad sticks. This Pokémon occasionally fights with others over choice sticks.
+Pokedex = It is always seen with a stick from a plant. Apparently, there are good sticks and bad sticks. This Pok?mon occasionally fights with others over choice sticks.
 WildItemUncommon = STICK
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -2827,7 +2827,7 @@ Color = Brown
 Shape = Head
 Habitat = Grassland
 Kind = Triple Bird
-Pokedex = A peculiar Pokémon species with three heads. It vigorously races across grassy plains even in arid seasons with little rainfall.
+Pokedex = A peculiar Pok?mon species with three heads. It vigorously races across grassy plains even in arid seasons with little rainfall.
 WildItemUncommon = SHARPBEAK
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -2893,7 +2893,7 @@ Color = White
 Shape = Head
 Habitat = Sea
 Kind = Sea Lion
-Pokedex = It loves to snooze on bitterly cold ice. The sight of this Pokémon sleeping on a glacier was mistakenly thought to be a mermaid by a mariner long ago.
+Pokedex = It loves to snooze on bitterly cold ice. The sight of this Pok?mon sleeping on a glacier was mistakenly thought to be a mermaid by a mariner long ago.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -3095,7 +3095,7 @@ Color = Purple
 Shape = Head
 Habitat = Cave
 Kind = Gas
-Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pokémon will try to lick you with its tongue and steal your life away.
+Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pok?mon will try to lick you with its tongue and steal your life away.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -3291,7 +3291,7 @@ Color = Red
 Shape = Head
 Habitat = WatersEdge
 Kind = Pincer
-Pokedex = It waves its huge, oversized claw in the air to communicate with others. But since the claw is so heavy, this Pokémon quickly tires.
+Pokedex = It waves its huge, oversized claw in the air to communicate with others. But since the claw is so heavy, this Pok?mon quickly tires.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -3322,7 +3322,7 @@ Color = Red
 Shape = Head
 Habitat = Urban
 Kind = Ball
-Pokedex = It bears an uncanny and unexplained resemblance to a Poké Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
+Pokedex = It bears an uncanny and unexplained resemblance to a Pok? Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4319,7 +4319,7 @@ Color = Blue
 Shape = Head
 Habitat = WatersEdge
 Kind = Atrocious
-Pokedex = It is an extremely vicious and violent Pokémon. When humans begin to fight, it will appear and burn everything to the ground with intensely hot flames.
+Pokedex = It is an extremely vicious and violent Pok?mon. When humans begin to fight, it will appear and burn everything to the ground with intensely hot flames.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4417,7 +4417,7 @@ Color = Brown
 Shape = Head
 Habitat = Urban
 Kind = Evolution
-Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve.
+Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pok?mon to evolve.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4577,7 +4577,7 @@ Color = Blue
 Shape = Head
 Habitat = Sea
 Kind = Spiral
-Pokedex = One of the ancient and long-since-extinct Pokémon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
+Pokedex = One of the ancient and long-since-extinct Pok?mon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4643,7 +4643,7 @@ Color = Brown
 Shape = Head
 Habitat = Sea
 Kind = Shellfish
-Pokedex = It is a Pokémon that has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
+Pokedex = It is a Pok?mon that has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4709,7 +4709,7 @@ Color = Purple
 Shape = Head
 Habitat = Mountain
 Kind = Fossil
-Pokedex = Aerodactyl is a Pokémon from the age of dinosaurs. It was regenerated from DNA extracted from amber. It is imagined to have been the king of the skies.
+Pokedex = Aerodactyl is a Pok?mon from the age of dinosaurs. It was regenerated from DNA extracted from amber. It is imagined to have been the king of the skies.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4742,7 +4742,7 @@ Color = Black
 Shape = Head
 Habitat = Mountain
 Kind = Sleeping
-Pokedex = Snorlax's typical day consists of nothing more than eating and sleeping. It is such a docile Pokémon that there are children who use its big belly as a place to play.
+Pokedex = Snorlax's typical day consists of nothing more than eating and sleeping. It is such a docile Pok?mon that there are children who use its big belly as a place to play.
 WildItemCommon = LEFTOVERS
 WildItemUncommon = LEFTOVERS
 WildItemRare = LEFTOVERS
@@ -4777,7 +4777,7 @@ Color = Blue
 Shape = Head
 Habitat = Rare
 Kind = Freeze
-Pokedex = Articuno is a legendary bird Pokémon that can control ice. The flapping of its wings chills the air. As a result, it is said that when this Pokémon flies, snow will fall.
+Pokedex = Articuno is a legendary bird Pok?mon that can control ice. The flapping of its wings chills the air. As a result, it is said that when this Pok?mon flies, snow will fall.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4809,7 +4809,7 @@ Color = Yellow
 Shape = Head
 Habitat = Rare
 Kind = Electric
-Pokedex = Zapdos is a legendary bird Pokémon that has the ability to control electricity. It usually lives in thunderclouds. It gains power if it is stricken by lightning bolts.
+Pokedex = Zapdos is a legendary bird Pok?mon that has the ability to control electricity. It usually lives in thunderclouds. It gains power if it is stricken by lightning bolts.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4842,7 +4842,7 @@ Color = Yellow
 Shape = Head
 Habitat = Rare
 Kind = Flame
-Pokedex = Moltres is a legendary bird Pokémon that can control fire. If injured, it is said to dip its body in the molten magma of a volcano to burn and heal itself.
+Pokedex = Moltres is a legendary bird Pok?mon that can control fire. If injured, it is said to dip its body in the molten magma of a volcano to burn and heal itself.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -4941,7 +4941,7 @@ Color = Brown
 Shape = Head
 Habitat = WatersEdge
 Kind = Dragon
-Pokedex = It can circle the globe in just 16 hours. It is a kindhearted Pokémon that leads lost and foundering ships in a storm to the safety of land.
+Pokedex = It can circle the globe in just 16 hours. It is a kindhearted Pok?mon that leads lost and foundering ships in a storm to the safety of land.
 WildItemUncommon = DRAGONSCALE
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -4973,7 +4973,7 @@ Color = Purple
 Shape = Head
 Habitat = Rare
 Kind = Genetic
-Pokedex = A Pokémon that was created by genetic manipulation. However, even though the scientific power of humans made its body, they failed to give it a warm heart.
+Pokedex = A Pok?mon that was created by genetic manipulation. However, even though the scientific power of humans made its body, they failed to give it a warm heart.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -5004,7 +5004,7 @@ Color = Pink
 Shape = Head
 Habitat = Rare
 Kind = New Species
-Pokedex = A Mew is said to possess the genes of all Pokémon. It is capable of making itself invisible at will, so it entirely avoids notice even if it approaches people.
+Pokedex = A Mew is said to possess the genes of all Pok?mon. It is capable of making itself invisible at will, so it entirely avoids notice even if it approaches people.
 WildItemCommon = LUMBERRY
 WildItemUncommon = LUMBERRY
 WildItemRare = LUMBERRY
@@ -5136,7 +5136,7 @@ Color = Yellow
 Shape = Head
 Habitat = Grassland
 Kind = Fire Mouse
-Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pokémon is angry. When it is tired, it sputters with incomplete combustion.
+Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pok?mon is angry. When it is tired, it sputters with incomplete combustion.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -5662,7 +5662,7 @@ Color = Blue
 Shape = Head
 Habitat = Sea
 Kind = Light
-Pokedex = The light-emitting orbs on its back are very bright. They are formed from a part of its dorsal fin. This Pokémon illuminates the inky darkness of deep seas.
+Pokedex = The light-emitting orbs on its back are very bright. They are formed from a part of its dorsal fin. This Pok?mon illuminates the inky darkness of deep seas.
 WildItemUncommon = DEEPSEASCALE
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -5800,7 +5800,7 @@ Color = White
 Shape = Head
 Habitat = Forest
 Kind = Spike Ball
-Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pokémon. It stores up happy feelings in its shell, then shares them out.
+Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pok?mon. It stores up happy feelings in its shell, then shares them out.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -5833,7 +5833,7 @@ Color = White
 Shape = Head
 Habitat = Forest
 Kind = Happiness
-Pokedex = It is said to be a Pokémon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
+Pokedex = It is said to be a Pok?mon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -6192,7 +6192,7 @@ Color = Pink
 Shape = Head
 Habitat = Grassland
 Kind = Cottonweed
-Pokedex = This Pokémon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
+Pokedex = This Pok?mon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -6260,7 +6260,7 @@ Color = Blue
 Shape = Head
 Habitat = Grassland
 Kind = Cottonweed
-Pokedex = Jumpluff ride warm southern winds to cross the sea and fly to foreign lands. This Pokémon lands when it encounters cold air while it is floating.
+Pokedex = Jumpluff ride warm southern winds to cross the sea and fly to foreign lands. This Pok?mon lands when it encounters cold air while it is floating.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -6656,7 +6656,7 @@ Color = Black
 Shape = Head
 Habitat = Rare
 Kind = Symbol
-Pokedex = This Pokémon is shaped like ancient text characters. Although research is ongoing, it is a mystery as to which came first, the ancient writings or the various Unown.
+Pokedex = This Pok?mon is shaped like ancient text characters. Although research is ongoing, it is a mystery as to which came first, the ancient writings or the various Unown.
 BattlerPlayerX = 0
 BattlerPlayerY = 10
 BattlerEnemyX = 0
@@ -6821,7 +6821,7 @@ Color = Yellow
 Shape = Head
 Habitat = Cave
 Kind = Land Snake
-Pokedex = Its drill-tipped tail is used to burrow into the ground backwards. This Pokémon is known to make its nest in complex shapes deep under the ground.
+Pokedex = Its drill-tipped tail is used to burrow into the ground backwards. This Pok?mon is known to make its nest in complex shapes deep under the ground.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -6888,7 +6888,7 @@ Color = Gray
 Shape = Head
 Habitat = Cave
 Kind = Iron Snake
-Pokedex = Steelix live even further underground than Onix. This Pokémon is known to dig toward the earth's core, reaching a depth of over six-tenths of a mile underground.
+Pokedex = Steelix live even further underground than Onix. This Pok?mon is known to dig toward the earth's core, reaching a depth of over six-tenths of a mile underground.
 WildItemUncommon = METALCOAT
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -6921,7 +6921,7 @@ Color = Pink
 Shape = Head
 Habitat = Urban
 Kind = Fairy
-Pokedex = By baring its fangs and making a scary face, it sends smaller Pokémon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
+Pokedex = By baring its fangs and making a scary face, it sends smaller Pok?mon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -7221,7 +7221,7 @@ Color = Red
 Shape = Head
 Habitat = Mountain
 Kind = Lava
-Pokedex = It is a species of Pokémon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
+Pokedex = It is a species of Pok?mon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -7520,7 +7520,7 @@ Color = Gray
 Shape = Head
 Habitat = RoughTerrain
 Kind = Armor Bird
-Pokedex = A Pokémon that has a body and wings of steel. People in the past used feathers fallen from Skarmory to make swords and knives.
+Pokedex = A Pok?mon that has a body and wings of steel. People in the past used feathers fallen from Skarmory to make swords and knives.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -7553,7 +7553,7 @@ Color = Black
 Shape = Head
 Habitat = RoughTerrain
 Kind = Dark
-Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pokémon's remarkable teamwork is simply unparalleled.
+Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pok?mon's remarkable teamwork is simply unparalleled.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -7751,7 +7751,7 @@ Color = Brown
 Shape = Head
 Habitat = Forest
 Kind = Big Horn
-Pokedex = Stantler's magnificent antlers were once traded at high prices as works of art. As a result, this Pokémon was hunted close to extinction.
+Pokedex = Stantler's magnificent antlers were once traded at high prices as works of art. As a result, this Pok?mon was hunted close to extinction.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -7781,7 +7781,7 @@ Color = White
 Shape = Head
 Habitat = Urban
 Kind = Painter
-Pokedex = A Smeargle marks its territory using a fluid that leaks out from the tip of its tail. About 5,000 different marks left by this Pokémon have been found.
+Pokedex = A Smeargle marks its territory using a fluid that leaks out from the tip of its tail. About 5,000 different marks left by this Pok?mon have been found.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -7813,7 +7813,7 @@ Color = Purple
 Shape = Head
 Habitat = Urban
 Kind = Scuffle
-Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pokémon, the trainer must establish a regular training schedule.
+Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pok?mon, the trainer must establish a regular training schedule.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -8312,7 +8312,7 @@ Color = Green
 Shape = Head
 Habitat = Forest
 Kind = Time Travel
-Pokedex = This Pokémon came from the future by crossing over time. It is thought that so long as Celebi appears, a bright and shining future awaits us.
+Pokedex = This Pok?mon came from the future by crossing over time. It is thought that so long as Celebi appears, a bright and shining future awaits us.
 WildItemCommon = LUMBERRY
 WildItemUncommon = LUMBERRY
 WildItemRare = LUMBERRY
@@ -8539,7 +8539,7 @@ Weight = 13.0
 Color = Pink
 Shape = Head
 Kind = Mime
-Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pokémon.
+Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pok?mon.
 WildItemUncommon = LEPPABERRY
 BattlerPlayerX = 0
 BattlerPlayerY = 9
@@ -8641,7 +8641,7 @@ Weight = 65.0
 Color = Blue
 Shape = Head
 Kind = Kite
-Pokedex = A friendly Pokémon that captures the subtle flows of seawater using its two antennae.
+Pokedex = A friendly Pok?mon that captures the subtle flows of seawater using its two antennae.
 BattlerPlayerX = 0
 BattlerPlayerY = 26
 BattlerEnemyX = 0
@@ -9083,7 +9083,7 @@ Weight = 34.0
 Color = Red
 Shape = Head
 Kind = Virtual
-Pokedex = Additional software was installed to make it a better Pokémon. It began acting oddly, however.
+Pokedex = Additional software was installed to make it a better Pok?mon. It began acting oddly, however.
 BattlerPlayerX = 0
 BattlerPlayerY = 6
 BattlerEnemyX = 0
@@ -9148,7 +9148,7 @@ Color = Green
 Shape = Head
 Habitat = Forest
 Kind = Wood Gecko
-Pokedex = Leaves grow out of this Pokémon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
+Pokedex = Leaves grow out of this Pok?mon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
 BattlerPlayerX = 0
 BattlerPlayerY = 22
 BattlerEnemyX = 0
@@ -9181,7 +9181,7 @@ Color = Green
 Shape = Head
 Habitat = Forest
 Kind = Forest
-Pokedex = In the jungle, its power is without equal. This Pokémon carefully grows trees and plants. It regulates its body temperature by basking in sunlight.
+Pokedex = In the jungle, its power is without equal. This Pok?mon carefully grows trees and plants. It regulates its body temperature by basking in sunlight.
 BattlerPlayerX = 0
 BattlerPlayerY = 32
 BattlerEnemyX = 0
@@ -9410,7 +9410,7 @@ Color = White
 Shape = Head
 Habitat = Urban
 Kind = Feeling
-Pokedex = A Ralts has the power to sense the emotions of people and Pokémon with the horns on its head. It takes cover if it senses any hostility.
+Pokedex = A Ralts has the power to sense the emotions of people and Pok?mon with the horns on its head. It takes cover if it senses any hostility.
 BattlerPlayerX = 0
 BattlerPlayerY = 11
 BattlerEnemyX = 0
@@ -9539,7 +9539,7 @@ Color = Brown
 Shape = Head
 Habitat = Forest
 Kind = Shed
-Pokedex = A peculiar Pokémon that floats in air even though its wings remain completely still. The inside of its body is hollow and utterly dark.
+Pokedex = A peculiar Pok?mon that floats in air even though its wings remain completely still. The inside of its body is hollow and utterly dark.
 BattlerPlayerX = 0
 BattlerPlayerY = 16
 BattlerEnemyX = 0
@@ -9572,7 +9572,7 @@ Color = Green
 Shape = Head
 Habitat = Forest
 Kind = Color Swap
-Pokedex = A Pokémon that has the ability to alter its body colors to match its surroundings. A Kecleon reverts to its original colors if it is startled.
+Pokedex = A Pok?mon that has the ability to alter its body colors to match its surroundings. A Kecleon reverts to its original colors if it is startled.
 WildItemUncommon = PERSIMBERRY
 BattlerPlayerX = 0
 BattlerPlayerY = 25
@@ -9605,7 +9605,7 @@ Color = Blue
 Shape = Head
 Habitat = RoughTerrain
 Kind = Iron Ball
-Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pokémon. They communicate with each other using brain waves.
+Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pok?mon. They communicate with each other using brain waves.
 WildItemUncommon = METALCOAT
 BattlerPlayerX = 0
 BattlerPlayerY = 11
@@ -9675,7 +9675,7 @@ Color = Blue
 Shape = Head
 Habitat = RoughTerrain
 Kind = Iron Leg
-Pokedex = Metagross has four brains that are joined by a complex neural network. As a result of integration, this Pokémon is smarter than a supercomputer.
+Pokedex = Metagross has four brains that are joined by a complex neural network. As a result of integration, this Pok?mon is smarter than a supercomputer.
 WildItemUncommon = METALCOAT
 BattlerPlayerX = 0
 BattlerPlayerY = 48
@@ -9740,7 +9740,7 @@ Weight = 108.0
 Color = Purple
 Shape = Head
 Kind = Forbidden
-Pokedex = A Pokémon that was formed by 108 spirits. It is bound to a fissure in an odd keystone.
+Pokedex = A Pok?mon that was formed by 108 spirits. It is bound to a fissure in an odd keystone.
 BattlerPlayerX = 0
 BattlerPlayerY = 20
 BattlerEnemyX = 0
@@ -10133,7 +10133,7 @@ Weight = 57.0
 Color = Gray
 Shape = Head
 Kind = Shield
-Pokedex = A Pokémon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
+Pokedex = A Pok?mon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
 BattlerPlayerX = 0
 BattlerPlayerY = 18
 BattlerEnemyX = 0
@@ -10165,7 +10165,7 @@ Weight = 149.5
 Color = Gray
 Shape = Head
 Kind = Shield
-Pokedex = Any frontal attack is repulsed. It is a docile Pokémon that feeds on grass and berries.
+Pokedex = Any frontal attack is repulsed. It is a docile Pok?mon that feeds on grass and berries.
 BattlerPlayerX = 0
 BattlerPlayerY = 16
 BattlerEnemyX = 0
@@ -10228,7 +10228,7 @@ Color = White
 Shape = Head
 Habitat = Mountain
 Kind = Disaster
-Pokedex = It sharply senses even subtle changes in the sky and the land to predict natural disasters. It is a long-lived Pokémon that has a life-span of 100 years.
+Pokedex = It sharply senses even subtle changes in the sky and the land to predict natural disasters. It is a long-lived Pok?mon that has a life-span of 100 years.
 BattlerPlayerX = 0
 BattlerPlayerY = 3
 BattlerEnemyX = 0
@@ -10260,7 +10260,7 @@ Color = Black
 Shape = Head
 Habitat = Forest
 Kind = Requiem
-Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pokémon that roams about under the cloak of darkness.
+Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pok?mon that roams about under the cloak of darkness.
 WildItemRare = SPELLTAG
 BattlerPlayerX = 0
 BattlerPlayerY = 12
@@ -10387,7 +10387,7 @@ Weight = 320.0
 Color = Gray
 Shape = Head
 Kind = Alpha
-Pokedex = It is described in mythology as the Pokémon that shaped the universe with its 1,000 arms.
+Pokedex = It is described in mythology as the Pok?mon that shaped the universe with its 1,000 arms.
 BattlerPlayerX = 0
 BattlerPlayerY = 13
 BattlerEnemyX = 0
@@ -10481,7 +10481,7 @@ Weight = 310.0
 Color = Green
 Shape = Head
 Kind = Continent
-Pokedex = Small Pokémon occasionally gather on its unmoving back to begin building their nests.
+Pokedex = Small Pok?mon occasionally gather on its unmoving back to begin building their nests.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11023,7 +11023,7 @@ Color = Pink
 Shape = Head
 Habitat = WatersEdge
 Kind = Tender
-Pokedex = It is said to live at the bottom of large lakes. Considered to be the most beautiful of all Pokémon, it has been depicted in paintings and statues.
+Pokedex = It is said to live at the bottom of large lakes. Considered to be the most beautiful of all Pok?mon, it has been depicted in paintings and statues.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11243,7 +11243,7 @@ Color = Green
 Shape = Head
 Habitat = Rare
 Kind = Sky High
-Pokedex = A Pokémon that flies endlessly in the ozone layer. It is said it would descend to the ground if Kyogre and Groudon were to fight.
+Pokedex = A Pok?mon that flies endlessly in the ozone layer. It is said it would descend to the ground if Kyogre and Groudon were to fight.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11337,7 +11337,7 @@ Weight = 750.0
 Color = Black
 Shape = Head
 Kind = Renegade
-Pokedex = A Pokémon that is said to live in a world on the reverse side of ours. It appears in an ancient cemetery.
+Pokedex = A Pok?mon that is said to live in a world on the reverse side of ours. It appears in an ancient cemetery.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11367,7 +11367,7 @@ Weight = 420.0
 Color = White
 Shape = Head
 Kind = Colossal
-Pokedex = There is an enduring legend that states this Pokémon towed continents with ropes.
+Pokedex = There is an enduring legend that states this Pok?mon towed continents with ropes.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11429,7 +11429,7 @@ Weight = 82.5
 Color = Purple
 Shape = Head
 Kind = Paleozoic
-Pokedex = This ancient bug Pokémon was altered by Team Plasma. They upgraded the cannon on its back.
+Pokedex = This ancient bug Pok?mon was altered by Team Plasma. They upgraded the cannon on its back.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11491,7 +11491,7 @@ Weight = 345.0
 Color = Black
 Shape = Head
 Kind = Deep Black
-Pokedex = This Pokémon appears in legends. In its tail, it has a giant generator that creates electricity.
+Pokedex = This Pok?mon appears in legends. In its tail, it has a giant generator that creates electricity.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -11616,7 +11616,7 @@ Weight = 33.3
 Color = Brown
 Shape = Head
 Kind = Rabbit
-Pokedex = An extremely cautious Pokémon. It cloaks its body with its fluffy ear fur when it senses danger.
+Pokedex = An extremely cautious Pok?mon. It cloaks its body with its fluffy ear fur when it senses danger.
 WildItemUncommon = CHOPLEBERRY
 BattlerPlayerX = 0
 BattlerPlayerY = 19
@@ -11714,7 +11714,7 @@ Color = Black
 Shape = Head
 Habitat = Urban
 Kind = Marionette
-Pokedex = An abandoned plush doll became this Pokémon. They are said to live in garbage dumps and wander about in search of the children that threw them away.
+Pokedex = An abandoned plush doll became this Pok?mon. They are said to live in garbage dumps and wander about in search of the children that threw them away.
 WildItemUncommon = SPELLTAG
 BattlerPlayerX = 0
 BattlerPlayerY = 9
@@ -11777,7 +11777,7 @@ Weight = 20.1
 Color = Green
 Shape = Head
 Kind = Multiplying
-Pokedex = These remarkably intelligent Pokémon fight by controlling arms that can grip with rock-crushing power.
+Pokedex = These remarkably intelligent Pok?mon fight by controlling arms that can grip with rock-crushing power.
 BattlerPlayerX = 0
 BattlerPlayerY = 38
 BattlerEnemyX = 0
@@ -11809,7 +11809,7 @@ Weight = 6.6
 Color = Green
 Shape = Head
 Kind = Windveiled
-Pokedex = Riding whirlwinds, they appear. These Pokémon sneak through gaps into houses and cause all sorts of mischief.
+Pokedex = Riding whirlwinds, they appear. These Pok?mon sneak through gaps into houses and cause all sorts of mischief.
 BattlerPlayerX = 0
 BattlerPlayerY = 4
 BattlerEnemyX = 0
@@ -12063,7 +12063,7 @@ Weight = 105.5
 Color = Yellow
 Shape = Head
 Kind = Axe Jaw
-Pokedex = Their sturdy tusks will stay sharp even if used to cut steel beams. These Pokémon are covered in hard armor.
+Pokedex = Their sturdy tusks will stay sharp even if used to cut steel beams. These Pok?mon are covered in hard armor.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -12094,7 +12094,7 @@ Weight = 330.0
 Color = Green
 Shape = Head
 Kind = Automaton
-Pokedex = It is said that Golurk were ordered to protect people and Pokémon by the ancient people who made them.
+Pokedex = It is said that Golurk were ordered to protect people and Pok?mon by the ancient people who made them.
 WildItemUncommon = LIGHTCLAY
 BattlerPlayerX = 0
 BattlerPlayerY = 4
@@ -12228,7 +12228,7 @@ Kind = Disguise
 Pokedex = Its actual appearance is unknown. When a scholar saw what was under its rag, it was overwhelmed by terror and died.
 WildItemUncommon = CHESTOBERRY
 BattlerPlayerX = 0
-BattlerPlayerY = 0
+BattlerPlayerY = 10
 BattlerEnemyX = 0
 BattlerEnemyY = 10
 BattlerShadowX = 0
@@ -12390,7 +12390,7 @@ Color = Red
 Shape = Head
 Habitat = WatersEdge
 Kind = Eon
-Pokedex = They make a small herd of only several members. They rarely make contact with people or other Pokémon. They disappear if they sense enemies.
+Pokedex = They make a small herd of only several members. They rarely make contact with people or other Pok?mon. They disappear if they sense enemies.
 BattlerPlayerX = 0
 BattlerPlayerY = 40
 BattlerEnemyX = 0
@@ -12455,7 +12455,7 @@ Color = Red
 Shape = Head
 Habitat = Rare
 Kind = DNA
-Pokedex = A Pokémon that mutated from an extraterrestrial virus exposed to a laser beam. Its body is configured for superior agility and speed.
+Pokedex = A Pok?mon that mutated from an extraterrestrial virus exposed to a laser beam. Its body is configured for superior agility and speed.
 BattlerPlayerX = 0
 BattlerPlayerY = 10
 BattlerEnemyX = 0
@@ -12687,7 +12687,7 @@ Color = Blue
 Shape = Head
 Habitat = Sea
 Kind = Ball Whale
-Pokedex = While this Pokémon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
+Pokedex = While this Pok?mon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -12784,7 +12784,7 @@ Color = Gray
 Shape = Head
 Habitat = Mountain
 Kind = Iron Armor
-Pokedex = A Pokémon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
+Pokedex = A Pok?mon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
 WildItemUncommon = HARDSTONE
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -12953,7 +12953,7 @@ Color = Blue
 Shape = Head
 Habitat = RoughTerrain
 Kind = Rock Head
-Pokedex = Although it is small, this Pokémon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
+Pokedex = Although it is small, this Pok?mon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
 WildItemUncommon = DRAGONFANG
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -13083,7 +13083,7 @@ Weight = 12.5
 Color = Gray
 Shape = Head
 Kind = Tricky Fox
-Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.
+Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pok?mon.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -13185,7 +13185,7 @@ Weight = 1.2
 Color = Purple
 Shape = Head
 Kind = Balloon
-Pokedex = A Pokémon formed by the spirits of people and Pokémon. It loves damp, humid seasons.
+Pokedex = A Pok?mon formed by the spirits of people and Pok?mon. It loves damp, humid seasons.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -13286,7 +13286,7 @@ Color = Black
 Shape = Head
 Habitat = Urban
 Kind = Puppet
-Pokedex = This Pokémon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
+Pokedex = This Pok?mon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
 WildItemUncommon = SPELLTAG
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -13352,7 +13352,7 @@ Weight = 8.0
 Color = Green
 Shape = Head
 Kind = Mitosis
-Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pokémon exhibit their maximum power.
+Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pok?mon exhibit their maximum power.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -13484,7 +13484,7 @@ Weight = 1.5
 Color = Black
 Shape = Head
 Kind = Spirit
-Pokedex = These Pokémon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
+Pokedex = These Pok?mon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
 WildItemUncommon = SPELLTAG
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -13519,7 +13519,7 @@ Weight = 0.6
 Color = Yellow
 Shape = Head
 Kind = Attaching
-Pokedex = They attach themselves to large-bodied Pokémon and absorb static electricity, which they store in an electric pouch.
+Pokedex = They attach themselves to large-bodied Pok?mon and absorb static electricity, which they store in an electric pouch.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
@@ -13649,7 +13649,7 @@ Weight = 92.0
 Color = Green
 Shape = Head
 Kind = Automaton
-Pokedex = These Pokémon are thought to have been created by the science of an ancient and mysterious civilization.
+Pokedex = These Pok?mon are thought to have been created by the science of an ancient and mysterious civilization.
 WildItemUncommon = LIGHTCLAY
 BattlerPlayerX = 0
 BattlerPlayerY = 0
@@ -13683,7 +13683,7 @@ Weight = 1.7
 Color = Red
 Shape = Head
 Kind = TinyRobin
-Pokedex = These friendly Pokémon send signals to one another with beautiful chirps and tail-feather movements.
+Pokedex = These friendly Pok?mon send signals to one another with beautiful chirps and tail-feather movements.
 BattlerPlayerX = 0
 BattlerPlayerY = 0
 BattlerEnemyX = 0
diff --git a/changelog.txt b/changelog.txt
index 82b42572f..1b7e560d9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -63,6 +63,7 @@ Removed features that will be coming back eventually
 ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 - Randomizer
 - Speed up button
+- Pokedex seen/caught
 - Wild fusions	//TODO: pas oublier de init exp_gained_since_fused=0 && exp_when_fused = self.exp
 - Autosave (except in Pokemon centers)
 - Fusing from PC
@@ -86,5 +87,7 @@ Removed features that probably won't be coming back
 
 
 
-
+############ KNOWN ISSUES ##############
+- Some areas might have abnormal lag (please tell me in the discord if you find one that's unreasonably laggy)
+- Some side-stairs might act strange