Fixed code assuming map metadata exists, fixed misplaced species data methods, rewrote class PokeBattle_Pokemon

Data/Scripts/011_Data/001_Game data/010_Species.rb

@@ -195,28 +195,28 @@ module GameData
     def pokedex_entry
       return pbGetMessage(MessageTypes::Entries, @id_number)
     end
-  end
 
-  def apply_metrics_to_sprite(sprite, index, shadow = false)
-    if shadow
-      if (index & 1) == 1   # Foe Pokémon
-        sprite.x += @shadow_x * 2
-      end
-    else
-      if (index & 1) == 0   # Player's Pokémon
-        sprite.x += @back_sprite_x * 2
-        sprite.y += @back_sprite_y * 2
-      else                  # Foe Pokémon
-        sprite.x += @front_sprite_x * 2
-        sprite.y += @front_sprite_y * 2
-        sprite.y -= @front_sprite_altitude * 2
+    def apply_metrics_to_sprite(sprite, index, shadow = false)
+      if shadow
+        if (index & 1) == 1   # Foe Pokémon
+          sprite.x += @shadow_x * 2
+        end
+      else
+        if (index & 1) == 0   # Player's Pokémon
+          sprite.x += @back_sprite_x * 2
+          sprite.y += @back_sprite_y * 2
+        else                  # Foe Pokémon
+          sprite.x += @front_sprite_x * 2
+          sprite.y += @front_sprite_y * 2
+          sprite.y -= @front_sprite_altitude * 2
+        end
       end
     end
-  end
 
-  def shows_shadow?
-    return true
-#    return @front_sprite_altitude > 0
+    def shows_shadow?
+      return true
+#      return @front_sprite_altitude > 0
+    end
   end
 end
 

Data/Scripts/011_Data/003_PBMove.rb

@@ -1,43 +0,0 @@
-#===============================================================================
-# Move objects known by Pokémon.
-#===============================================================================
-class PBMove
-  attr_reader   :id     # This move's ID
-  attr_accessor :pp     # The amount of PP remaining for this move
-  attr_accessor :ppup   # The number of PP Ups used on this move
-
-  # Initializes this object to the specified move ID.
-  def initialize(move_id)
-    @id = GameData::Move.get(move_id).id
-    @ppup = 0
-    @pp   = total_pp
-  end
-
-  # Changes this move's ID, and caps the PP amount if it is now greater than the
-  # new move's total PP.
-  def id=(value)
-    old_id = @id
-    @id = GameData::Move.get(value).id
-    @pp = [@pp, total_pp].min
-  end
-
-  # Gets the maximum PP for this move.
-  def total_pp
-    max_pp = GameData::Move.get(@id).total_pp
-    return max_pp + max_pp * @ppup / 5
-  end
-  alias totalpp total_pp
-
-  def function_code; return GameData::Move.get(@id).function_code; end
-  def base_damage;   return GameData::Move.get(@id).base_damage;   end
-  def type;          return GameData::Move.get(@id).type;          end
-  def category;      return GameData::Move.get(@id).category;      end
-  def accuracy;      return GameData::Move.get(@id).accuracy;      end
-  def effect_chance; return GameData::Move.get(@id).effect_chance; end
-  def target;        return GameData::Move.get(@id).target;        end
-  def priority;      return GameData::Move.get(@id).priority;      end
-  def flags;         return GameData::Move.get(@id).flags;         end
-  def name;          return GameData::Move.get(@id).name;          end
-  def description;   return GameData::Move.get(@id).description;   end
-  def hidden_move?;  return GameData::Move.get(@id).hidden_move?;  end
-end