Tidied up, removed unused code

This commit is contained in:
Maruno17
2021-01-17 21:26:20 +00:00
parent cb684094be
commit 7f254c6434
17 changed files with 26 additions and 567 deletions

View File

@@ -71,7 +71,7 @@ module Compiler
def write_connections
conndata = load_data("Data/map_connections.dat") rescue nil
return if !conndata
mapinfos = pbLoadRxData("Data/MapInfos")
mapinfos = load_data("Data/MapInfos.rxdata")
File.open("PBS/connections.txt","wb") { |f|
add_PBS_header_to_file(f)
f.write("\#-------------------------------\r\n")
@@ -509,7 +509,7 @@ module Compiler
def write_encounters
encdata = pbLoadEncountersData
return if !encdata
mapinfos = pbLoadRxData("Data/MapInfos")
mapinfos = load_data("Data/MapInfos.rxdata")
File.open("PBS/encounters.txt","wb") { |f|
add_PBS_header_to_file(f)
sortedkeys = encdata.keys.sort
@@ -729,7 +729,7 @@ module Compiler
f.write("\r\n")
end
# Write map metadata
map_infos = pbLoadRxData("Data/MapInfos")
map_infos = load_data("Data/MapInfos.rxdata")
schema = GameData::MapMetadata::SCHEMA
keys = schema.keys.sort {|a, b| schema[a][0] <=> schema[b][0] }
GameData::MapMetadata.each do |map_data|

View File

@@ -14,7 +14,7 @@ module Compiler
mapfiles[$1.to_i(10)] = true if map[/map(\d+)\.rxdata/i]
end
}
mapinfos = pbLoadRxData("Data/MapInfos")
mapinfos = load_data("Data/MapInfos.rxdata")
maxOrder = 0
# Exclude maps found in mapinfos
for id in mapinfos.keys
@@ -239,9 +239,9 @@ module Compiler
attr_reader :mapinfos
def initialize
@mapinfos = pbLoadRxData("Data/MapInfos")
@system = pbLoadRxData("Data/System")
@tilesets = pbLoadRxData("Data/Tilesets")
@mapinfos = load_data("Data/MapInfos.rxdata")
@system = load_data("Data/System.rxdata")
@tilesets = load_data("Data/Tilesets.rxdata")
@mapxy = []
@mapWidths = []
@mapHeights = []
@@ -1400,7 +1400,7 @@ module Compiler
end
changed = false
Graphics.update
commonEvents = pbLoadRxData("Data/CommonEvents")
commonEvents = load_data("Data/CommonEvents.rxdata")
pbSetWindowText(_INTL("Processing common events"))
for key in 0...commonEvents.length
newevent = fix_event_use(commonEvents[key],0,mapData)