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 826e1e8a6..8e67182ba 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 531ae6477..f3c5ff5c1 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/MapInfos.rxdata b/Data/MapInfos.rxdata
index c8876ad1c..0e70bab8e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_AddOns/New HMs.rb b/Data/Scripts/050_AddOns/New HMs.rb
index b695064f6..60c70c961 100644
--- a/Data/Scripts/050_AddOns/New HMs.rb	
+++ b/Data/Scripts/050_AddOns/New HMs.rb	
@@ -85,7 +85,7 @@ end
 
 ############### MORNING SUN / MOONLIGHT
 HiddenMoveHandlers::CanUseMove.add(:MORNINGSUN,proc{|move,pkmn|
-  mapMetadata = GameData::MapMetadata.get($game_map.map_id)
+  mapMetadata = GameData::MapMetadata.try_get($game_map.map_id)
   if !mapMetadata || !mapMetadata.outdoor_map
     Kernel.pbMessage(_INTL("Can't use that here."))
     next false
@@ -108,7 +108,7 @@ HiddenMoveHandlers::UseMove.add(:MORNINGSUN,proc{|move,pokemon|
 })
 
 HiddenMoveHandlers::CanUseMove.add(:MOONLIGHT,proc{|move,pkmn|
-  mapMetadata = GameData::MapMetadata.get($game_map.map_id)
+  mapMetadata = GameData::MapMetadata.try_get($game_map.map_id)
   if !mapMetadata || !mapMetadata.outdoor_map
     Kernel.pbMessage(_INTL("Can't use that here."))
     next false
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 4fd105452..4a6b13a15 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index b5372acec..0ce401add 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