diff --git a/Data/Scripts/003_Game classes/011_MapFactory.rb b/Data/Scripts/003_Game classes/011_MapFactory.rb index e4864bb3e..0d17becdc 100644 --- a/Data/Scripts/003_Game classes/011_MapFactory.rb +++ b/Data/Scripts/003_Game classes/011_MapFactory.rb @@ -416,7 +416,7 @@ module MapFactoryHelper def self.getMapConnections if !@@MapConnections @@MapConnections = [] - conns = pbLoadMapConnections + conns = load_data("Data/map_connections.dat") for i in 0...conns.length conn = conns[i] v = getMapEdge(conn[0],conn[1]) diff --git a/Data/Scripts/011_Data/001_Data_Cache.rb b/Data/Scripts/011_Data/001_Data_Cache.rb index 073c0bc16..3783d21d7 100644 --- a/Data/Scripts/011_Data/001_Data_Cache.rb +++ b/Data/Scripts/011_Data/001_Data_Cache.rb @@ -9,7 +9,6 @@ class PokemonTemp attr_accessor :moveToAnim attr_accessor :battleAnims attr_accessor :mapInfos - attr_accessor :mapConnections end def pbClearData @@ -21,7 +20,6 @@ def pbClearData $PokemonTemp.moveToAnim = nil $PokemonTemp.battleAnims = nil $PokemonTemp.mapInfos = nil - $PokemonTemp.mapConnections = nil end MapFactoryHelper.clear $PokemonEncounters.setup($game_map.map_id) if $game_map && $PokemonEncounters @@ -97,17 +95,6 @@ def pbLoadBattleAnimations return $PokemonTemp.battleAnims end -#=============================================================================== -# Method relating to map connections data. -#=============================================================================== -def pbLoadMapConnections - $PokemonTemp = PokemonTemp.new if !$PokemonTemp - if !$PokemonTemp.mapConnections - $PokemonTemp.mapConnections = load_data("Data/map_connections.dat") || [] - end - return $PokemonTemp.mapConnections -end - #=============================================================================== # Method relating to map infos data. #=============================================================================== diff --git a/Data/Scripts/021_Debug/011_Editor_MapConnections.rb b/Data/Scripts/021_Debug/011_Editor_MapConnections.rb index cd983cb17..8cae82a80 100644 --- a/Data/Scripts/021_Debug/011_Editor_MapConnections.rb +++ b/Data/Scripts/021_Debug/011_Editor_MapConnections.rb @@ -285,7 +285,6 @@ class MapScreenScene def serializeConnectionData conndata=generateConnectionData() save_data(conndata, "Data/map_connections.dat") - $PokemonTemp.mapConnections = nil Compiler.write_connections @mapconns=conndata end diff --git a/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb b/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb index 247fbcba4..61e37a57b 100644 --- a/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb +++ b/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb @@ -69,7 +69,7 @@ module Compiler end def write_connections - conndata = pbLoadMapConnections + conndata = load_data("Data/map_connections.dat") return if !conndata mapinfos = pbLoadMapInfos File.open("PBS/connections.txt","wb") { |f|