Cached MapInfos.rxdata and map_connections.dat, reduced usage of load_data

Data/Scripts/022_Compiler/002_Compiler_CompilePBS.rb

@@ -69,12 +69,10 @@ module Compiler
       record.push(csvInt!(thisline,lineno))
       record.push(csvEnumFieldOrInt!(thisline,hashenum,"",sprintf("(line %d)",lineno)))
       record.push(csvInt!(thisline,lineno))
-      if !pbRgssExists?(sprintf("Data/Map%03d.rxdata",record[0])) &&
-         !pbRgssExists?(sprintf("Data/Map%03d.rvdata",record[0]))
+      if !pbRgssExists?(sprintf("Data/Map%03d.rxdata",record[0]))
         print _INTL("Warning: Map {1}, as mentioned in the map connection data, was not found.\r\n{2}",record[0],FileLineData.linereport)
       end
-      if !pbRgssExists?(sprintf("Data/Map%03d.rxdata",record[3])) &&
-         !pbRgssExists?(sprintf("Data/Map%03d.rvdata",record[3]))
+      if !pbRgssExists?(sprintf("Data/Map%03d.rxdata",record[3]))
         print _INTL("Warning: Map {1}, as mentioned in the map connection data, was not found.\r\n{2}",record[3],FileLineData.linereport)
       end
       case record[1]
@@ -1530,6 +1528,7 @@ module Compiler
     rescue
       pbanims = PBAnimations.new
     end
+    changed = false
     move2anim = [[],[]]
 =begin
     anims = load_data("Data/Animations.rxdata")
@@ -1550,16 +1549,20 @@ module Compiler
       if pbanims[i].name[/^OppMove\:\s*(.*)$/]
         if GameData::Move.exists?($~[1])
           moveid = GameData::Move.get($~[1]).id_number
+          changed = true if !move2anim[0][moveid] || move2anim[1][moveid] != i
           move2anim[1][moveid] = i
         end
       elsif pbanims[i].name[/^Move\:\s*(.*)$/]
         if GameData::Move.exists?($~[1])
           moveid = GameData::Move.get($~[1]).id_number
+          changed = true if !move2anim[0][moveid] || move2anim[0][moveid] != i
           move2anim[0][moveid] = i
         end
       end
     end
-    save_data(move2anim,"Data/move2anim.dat")
-    save_data(pbanims,"Data/PkmnAnimations.rxdata")
+    if changed
+      save_data(move2anim,"Data/move2anim.dat")
+      save_data(pbanims,"Data/PkmnAnimations.rxdata")
+    end
   end
 end

Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb

@@ -69,9 +69,9 @@ module Compiler
   end
 
   def write_connections
-    conndata = load_data("Data/map_connections.dat") rescue nil
+    conndata = pbLoadMapConnections
     return if !conndata
-    mapinfos = load_data("Data/MapInfos.rxdata")
+    mapinfos = pbLoadMapInfos
     File.open("PBS/connections.txt","wb") { |f|
       add_PBS_header_to_file(f)
       f.write("\#-------------------------------\r\n")
@@ -518,7 +518,7 @@ module Compiler
   # Save wild encounter data to PBS file
   #=============================================================================
   def write_encounters
-    map_infos = load_data("Data/MapInfos.rxdata")
+    map_infos = pbLoadMapInfos
     File.open("PBS/encounters.txt", "wb") { |f|
       add_PBS_header_to_file(f)
       GameData::Encounter.each do |encounter_data|
@@ -735,7 +735,7 @@ module Compiler
         f.write("\r\n")
       end
       # Write map metadata
-      map_infos = load_data("Data/MapInfos.rxdata")
+      map_infos = pbLoadMapInfos
       schema = GameData::MapMetadata::SCHEMA
       keys = schema.keys.sort {|a, b| schema[a][0] <=> schema[b][0] }
       GameData::MapMetadata.each do |map_data|

Data/Scripts/022_Compiler/004_Compiler_MapsAndEvents.rb

@@ -14,7 +14,7 @@ module Compiler
         mapfiles[$1.to_i(10)] = true if map[/map(\d+)\.rxdata/i]
       end
     }
-    mapinfos = load_data("Data/MapInfos.rxdata")
+    mapinfos = pbLoadMapInfos
     maxOrder = 0
     # Exclude maps found in mapinfos
     for id in mapinfos.keys
@@ -38,6 +38,7 @@ module Compiler
     end
     if imported
       save_data(mapinfos,"Data/MapInfos.rxdata")
+      $PokemonTemp.mapInfos = nil
       pbMessage(_INTL("{1} new map(s) copied to the Data folder were successfully imported.",count))
     end
     return imported
@@ -239,7 +240,7 @@ module Compiler
     attr_reader :mapinfos
 
     def initialize
-      @mapinfos = load_data("Data/MapInfos.rxdata")
+      @mapinfos = pbLoadMapInfos
       @system   = load_data("Data/System.rxdata")
       @tilesets = load_data("Data/Tilesets.rxdata")
       @mapxy      = []