diff --git a/Data/Scripts/004_Game classes/012_Game_FollowerFactory.rb b/Data/Scripts/004_Game classes/012_Game_FollowerFactory.rb
index 6669ea3a6..ebd54e344 100644
--- a/Data/Scripts/004_Game classes/012_Game_FollowerFactory.rb	
+++ b/Data/Scripts/004_Game classes/012_Game_FollowerFactory.rb	
@@ -325,7 +325,7 @@ class Game_Temp
 end
 
 #===============================================================================
-# Permanently stores data of dependent events (i.e. in save files).
+# Permanently stores data of follower events (i.e. in save files).
 #===============================================================================
 class PokemonGlobalMetadata
   attr_accessor :dependentEvents   # Deprecated
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
index 73d906168..4bc96b00b 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
@@ -259,8 +259,9 @@ MultipleForms.register(:ROTOM, {
 
 MultipleForms.register(:GIRATINA, {
   "getForm" => proc { |pkmn|
-    maps = [49, 50, 51, 72, 73]   # Map IDs for Origin Forme
-    if pkmn.hasItem?(:GRISEOUSORB) || ($game_map && maps.include?($game_map.map_id))
+    next 1 if pkmn.hasItem?(:GRISEOUSORB)
+    if $game_map &&
+       GameData::MapMetadata.get($game_map.map_id)&.has_flag?("DistortionWorld")
       next 1
     end
     next 0
diff --git a/PBS/map_metadata.txt b/PBS/map_metadata.txt
index cad685dcb..f964306da 100644
--- a/PBS/map_metadata.txt
+++ b/PBS/map_metadata.txt
@@ -240,7 +240,7 @@ Bicycle = true
 MapPosition = 0,16,10
 BattleBack = cave1
 Environment = Cave
-Flags = Magnetic
+Flags = Magnetic,DistortionWorld
 #-------------------------------
 [050]   # Rock Cave B1F
 Name = Route 7
@@ -249,7 +249,7 @@ MapPosition = 0,16,10
 DarkMap = true
 BattleBack = cave3
 Environment = Cave
-Flags = Magnetic
+Flags = Magnetic,DistortionWorld
 #-------------------------------
 [051]   # Dungeon
 Name = Route 7
@@ -258,7 +258,7 @@ MapPosition = 0,16,10
 Dungeon = true
 BattleBack = cave2
 Environment = Cave
-Flags = Magnetic
+Flags = Magnetic,DistortionWorld
 #-------------------------------
 [052]   # Battle Frontier
 Name = Battle Frontier
@@ -375,6 +375,7 @@ ShowArea = true
 Weather = Storm,50
 MapPosition = 0,18,17
 BattleBack = field
+Flags = DistortionWorld
 #-------------------------------
 [073]   # Faraday Island
 Name = Faraday Island
@@ -382,6 +383,7 @@ Outdoor = true
 ShowArea = true
 MapPosition = 0,22,16
 BattleBack = field
+Flags = DistortionWorld
 #-------------------------------
 [074]   # Route 6 Cycling Road gate
 Name = Route 6