diff --git a/Data/Scripts/004_Game classes/007_Game_Character.rb b/Data/Scripts/004_Game classes/007_Game_Character.rb
index 196c05fa8..b7ddc4772 100644
--- a/Data/Scripts/004_Game classes/007_Game_Character.rb	
+++ b/Data/Scripts/004_Game classes/007_Game_Character.rb	
@@ -363,6 +363,7 @@ class Game_Character
     @real_x = @x * Game_Map::REAL_RES_X
     @real_y = @y * Game_Map::REAL_RES_Y
     @prelock_direction = 0
+    calculate_bush_depth
     triggerLeaveTile
   end
 
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 07d92983c..34f49826c 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -672,7 +672,7 @@ class Pokemon
     return false if egg? || shadowPokemon?
     this_level = self.level
     getMoveList.each { |m| return true if m[0] <= this_level && !hasMove?(m[1]) }
-    @first_moves.each { |m| return true if !pkmn.hasMove?(m) }
+    @first_moves.each { |m| return true if !hasMove?(m) }
     return false
   end
 
diff --git a/Data/Scripts/020_Debug/003_Editor_Listers.rb b/Data/Scripts/020_Debug/003_Editor_Listers.rb
index 06d9f4790..420f19dfe 100644
--- a/Data/Scripts/020_Debug/003_Editor_Listers.rb
+++ b/Data/Scripts/020_Debug/003_Editor_Listers.rb
@@ -481,7 +481,11 @@ class TrainerTypeLister
     @sprite.bitmap.dispose if @sprite.bitmap
     return if index < 0
     begin
-      @sprite.setBitmap(GameData::TrainerType.front_sprite_filename(@ids[index]), 0)
+      if @ids[index].is_a?(Symbol)
+        @sprite.setBitmap(GameData::TrainerType.front_sprite_filename(@ids[index]), 0)
+      else
+        @sprite.setBitmap(nil)
+      end
     rescue
       @sprite.setBitmap(nil)
     end