diff --git a/Data/Scripts/001_Technical/006_RPG_Sprite.rb b/Data/Scripts/001_Technical/006_RPG_Sprite.rb
index 981fe1f64..e4b99f4dd 100644
--- a/Data/Scripts/001_Technical/006_RPG_Sprite.rb
+++ b/Data/Scripts/001_Technical/006_RPG_Sprite.rb
@@ -204,7 +204,7 @@ class SpriteAnimation
       sprite.src_rect.set(pattern % 5 * 192, pattern / 5 * 192, 192, 192)
       case @_animation_height
       when 0 then sprite.z = 1
-      when 1 then sprite.z = sprite.y + 32 + 15
+      when 1 then sprite.z = sprite.y + 32 + 17
       when 2 then sprite.z = sprite.y + 32 + 32 + 17
       else        sprite.z = 2000
       end
diff --git a/Data/Scripts/004_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb
index 6d2022972..c5d6388ae 100644
--- a/Data/Scripts/004_Game classes/009_Game_Player.rb	
+++ b/Data/Scripts/004_Game classes/009_Game_Player.rb	
@@ -27,6 +27,10 @@ class Game_Player < Game_Character
     return $game_map
   end
 
+  def map_id
+    return $game_map.map_id
+  end
+
   def screen_z(height = 0)
     ret = super
     return ret + 1
diff --git a/Data/Scripts/004_Game classes/011_Game_Follower.rb b/Data/Scripts/004_Game classes/011_Game_Follower.rb
index e2f779270..873b15f82 100644
--- a/Data/Scripts/004_Game classes/011_Game_Follower.rb	
+++ b/Data/Scripts/004_Game classes/011_Game_Follower.rb	
@@ -151,7 +151,8 @@ class Game_Follower < Game_Event
     was_jumping = jumping?
     super
     if was_jumping && !jumping?
-      $scene.spriteset.addUserAnimation(Settings::DUST_ANIMATION_ID, self.x, self.y, true, 1)
+      spriteset = $scene.spriteset(map_id)
+      spriteset&.addUserAnimation(Settings::DUST_ANIMATION_ID, self.x, self.y, true, 1)
     end
   end
 
diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb
index e3732bb93..db265985c 100644
--- a/Data/Scripts/012_Overworld/001_Overworld.rb
+++ b/Data/Scripts/012_Overworld/001_Overworld.rb
@@ -151,8 +151,9 @@ EventHandlers.add(:on_step_taken, :grass_rustling,
   proc { |event|
     next if !$scene.is_a?(Scene_Map)
     event.each_occupied_tile do |x, y|
-      next if !$map_factory.getTerrainTag(event.map.map_id, x, y, true).shows_grass_rustle
-      $scene.spriteset.addUserAnimation(Settings::GRASS_ANIMATION_ID, x, y, true, 1)
+      next if !$map_factory.getTerrainTagFromCoords(event.map.map_id, x, y, true).shows_grass_rustle
+      spriteset = $scene.spriteset(event.map_id)
+      spriteset&.addUserAnimation(Settings::GRASS_ANIMATION_ID, x, y, true, 1)
     end
   }
 )
diff --git a/Data/Scripts/019_Utilities/001_Utilities.rb b/Data/Scripts/019_Utilities/001_Utilities.rb
index f026e7453..ed24ad40f 100644
--- a/Data/Scripts/019_Utilities/001_Utilities.rb
+++ b/Data/Scripts/019_Utilities/001_Utilities.rb
@@ -172,13 +172,14 @@ def pbExclaim(event, id = Settings::EXCLAMATION_ANIMATION_ID, tinting = false)
     sprite = nil
     done = []
     event.each do |i|
-      if !done.include?(i.id)
-        sprite = $scene.spriteset.addUserAnimation(id, i.x, i.y, tinting, 2)
-        done.push(i.id)
-      end
+      next if done.include?(i.id)
+      spriteset = $scene.spriteset(i.map_id)
+      sprite ||= spriteset&.addUserAnimation(id, i.x, i.y, tinting, 2)
+      done.push(i.id)
     end
   else
-    sprite = $scene.spriteset.addUserAnimation(id, event.x, event.y, tinting, 2)
+    spriteset = $scene.spriteset(event.map_id)
+    sprite = spriteset&.addUserAnimation(id, event.x, event.y, tinting, 2)
   end
   until sprite.disposed?
     Graphics.update