diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 065a7e253..d940ad63a 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 7edd44774..9a54898fc 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata
index 71ccb7e77..0ab842111 100644
Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ
diff --git a/Data/Map114.rxdata b/Data/Map114.rxdata
index 1d6f42c20..686ebecfa 100644
Binary files a/Data/Map114.rxdata and b/Data/Map114.rxdata differ
diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata
index a3db95ba4..b5b57dcb8 100644
Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ
diff --git a/Data/Map285.rxdata b/Data/Map285.rxdata
index 8dc284b67..c268a3859 100644
Binary files a/Data/Map285.rxdata and b/Data/Map285.rxdata differ
diff --git a/Data/Map365.rxdata b/Data/Map365.rxdata
index 5b4b5efb7..febfb5835 100644
Binary files a/Data/Map365.rxdata and b/Data/Map365.rxdata differ
diff --git a/Data/Map405.rxdata b/Data/Map405.rxdata
index 315ab2c19..66d7f6751 100644
Binary files a/Data/Map405.rxdata and b/Data/Map405.rxdata differ
diff --git a/Data/Map428.rxdata b/Data/Map428.rxdata
index 3bd8324b2..4c2dd7053 100644
Binary files a/Data/Map428.rxdata and b/Data/Map428.rxdata differ
diff --git a/Data/Map451.rxdata b/Data/Map451.rxdata
index cc1a75768..7755ef87e 100644
Binary files a/Data/Map451.rxdata and b/Data/Map451.rxdata differ
diff --git a/Data/Map506.rxdata b/Data/Map506.rxdata
index 7a1202a89..f5f91c78c 100644
Binary files a/Data/Map506.rxdata and b/Data/Map506.rxdata differ
diff --git a/Data/Map545.rxdata b/Data/Map545.rxdata
index 50bd2c73e..5844d06b4 100644
Binary files a/Data/Map545.rxdata and b/Data/Map545.rxdata differ
diff --git a/Data/Map683.rxdata b/Data/Map683.rxdata
index 63832151c..677ca9d3c 100644
Binary files a/Data/Map683.rxdata and b/Data/Map683.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index ee7785df8..dc26ac35c 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata
index 7018246d6..8c540d5ef 100644
Binary files a/Data/Scripts.rxdata and b/Data/Scripts.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index f3d876a9e..5d1fb96b7 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "5.0 - beta"
+  GAME_VERSION_NUMBER = "5.0.9 - beta"
 
   #
   FUSION_ICON_SPRITE_OFFSET = 10
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index fa9a7b395..b5fa4a10b 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -139,6 +139,10 @@ class Pokemon
       @species == GameData::Species.get(check_species).species)
   end
 
+  def dexNum
+    return species_data.id_number
+  end
+
   def isFusion?
     return species_data.id_number > NB_POKEMON
   end
@@ -1061,9 +1065,9 @@ class Pokemon
     end
     hpDiff = @totalhp - @hp
     #@totalhp = stats[:HP]
-    @totalhp= self.ability == :WONDERGUARD ? 1 : stats[:HP]
+    @totalhp = self.ability == :WONDERGUARD ? 1 : stats[:HP]
     calculated_hp = @totalhp - hpDiff
-    @hp = calculated_hp > 0 ?  calculated_hp: 0
+    @hp = calculated_hp > 0 ? calculated_hp : 0
     @attack = stats[:ATTACK]
     @defense = stats[:DEFENSE]
     @spatk = stats[:SPECIAL_ATTACK]
diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
index 448322018..dc5632d82 100644
--- a/Data/Scripts/050_AddOns/GeneralUtils.rb
+++ b/Data/Scripts/050_AddOns/GeneralUtils.rb
@@ -100,6 +100,11 @@ def getDexNumberForSpecies(species)
   return dexNum
 end
 
+#shortcut for using in game events because of script characters limit
+def dexNum(species)
+  return getDexNumberForSpecies(species)
+end
+
 def getRandomCustomFusion(returnRandomPokemonIfNoneFound=true,customPokeList=[],maxPoke=-1,recursionLimit=3)
   if customPokeList.length==0
     customPokeList = getCustomSpeciesList()
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index bd17541c7..10b271bc0 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 838a3a9d6..e3795ef66 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ