Fix for messages not being reloaded after the game is compiled

This commit is contained in:
Maruno17
2021-06-12 19:05:22 +01:00
parent 8dec89bb50
commit 128a002324
3 changed files with 56 additions and 58 deletions

View File

@@ -676,63 +676,60 @@ module Compiler
# Compile all data # Compile all data
#============================================================================= #=============================================================================
def compile_all(mustCompile) def compile_all(mustCompile)
return if !mustCompile
FileLineData.clear FileLineData.clear
if (!$INEDITOR || Settings::LANGUAGES.length < 2) && safeExists?("Data/messages.dat") echoln _INTL("*** Starting full compile ***")
MessageTypes.loadMessageFile("Data/messages.dat") echoln ""
end yield(_INTL("Compiling town map data"))
if mustCompile compile_town_map # No dependencies
echoln _INTL("*** Starting full compile ***") yield(_INTL("Compiling map connection data"))
echoln "" compile_connections # No dependencies
yield(_INTL("Compiling town map data")) yield(_INTL("Compiling phone data"))
compile_town_map # No dependencies compile_phone # No dependencies
yield(_INTL("Compiling map connection data")) yield(_INTL("Compiling type data"))
compile_connections # No dependencies compile_types # No dependencies
yield(_INTL("Compiling phone data")) yield(_INTL("Compiling ability data"))
compile_phone compile_abilities # No dependencies
yield(_INTL("Compiling type data")) yield(_INTL("Compiling move data"))
compile_types # No dependencies compile_moves # Depends on Type
yield(_INTL("Compiling ability data")) yield(_INTL("Compiling item data"))
compile_abilities # No dependencies compile_items # Depends on Move
yield(_INTL("Compiling move data")) yield(_INTL("Compiling berry plant data"))
compile_moves # Depends on Type compile_berry_plants # Depends on Item
yield(_INTL("Compiling item data")) yield(_INTL("Compiling Pokémon data"))
compile_items # Depends on Move compile_pokemon # Depends on Move, Item, Type, Ability
yield(_INTL("Compiling berry plant data")) yield(_INTL("Compiling Pokémon forms data"))
compile_berry_plants # Depends on Item compile_pokemon_forms # Depends on Species, Move, Item, Type, Ability
yield(_INTL("Compiling Pokémon data")) yield(_INTL("Compiling machine data"))
compile_pokemon # Depends on Move, Item, Type, Ability compile_move_compatibilities # Depends on Species, Move
yield(_INTL("Compiling Pokémon forms data")) yield(_INTL("Compiling shadow moveset data"))
compile_pokemon_forms # Depends on Species, Move, Item, Type, Ability compile_shadow_movesets # Depends on Species, Move
yield(_INTL("Compiling machine data")) yield(_INTL("Compiling Regional Dexes"))
compile_move_compatibilities # Depends on Species, Move compile_regional_dexes # Depends on Species
yield(_INTL("Compiling shadow moveset data")) yield(_INTL("Compiling ribbon data"))
compile_shadow_movesets # Depends on Species, Move compile_ribbons # No dependencies
yield(_INTL("Compiling Regional Dexes")) yield(_INTL("Compiling encounter data"))
compile_regional_dexes # Depends on Species compile_encounters # Depends on Species
yield(_INTL("Compiling ribbon data")) yield(_INTL("Compiling Trainer type data"))
compile_ribbons # No dependencies compile_trainer_types # No dependencies
yield(_INTL("Compiling encounter data")) yield(_INTL("Compiling Trainer data"))
compile_encounters # Depends on Species compile_trainers # Depends on Species, Item, Move
yield(_INTL("Compiling Trainer type data")) yield(_INTL("Compiling battle Trainer data"))
compile_trainer_types # No dependencies compile_trainer_lists # Depends on TrainerType
yield(_INTL("Compiling Trainer data")) yield(_INTL("Compiling metadata"))
compile_trainers # Depends on Species, Item, Move compile_metadata # Depends on TrainerType
yield(_INTL("Compiling battle Trainer data")) yield(_INTL("Compiling animations"))
compile_trainer_lists # Depends on TrainerType compile_animations
yield(_INTL("Compiling metadata")) yield(_INTL("Converting events"))
compile_metadata # Depends on TrainerType compile_trainer_events(mustCompile)
yield(_INTL("Compiling animations")) yield(_INTL("Saving messages"))
compile_animations pbSetTextMessages
yield(_INTL("Converting events")) MessageTypes.saveMessages
compile_trainer_events(mustCompile) MessageTypes.loadMessageFile("Data/messages.dat") if safeExists?("Data/messages.dat")
yield(_INTL("Saving messages")) System.reload_cache
pbSetTextMessages echoln ""
MessageTypes.saveMessages echoln _INTL("*** Finished full compile ***")
echoln "" echoln ""
echoln _INTL("*** Finished full compile ***")
echoln ""
System.reload_cache
end
pbSetWindowText(nil) pbSetWindowText(nil)
end end

View File

@@ -512,7 +512,7 @@ module Compiler
end end
return nil if battles.length<=0 return nil if battles.length<=0
# Run trainer check now, except in editor # Run trainer check now, except in editor
trainerChecker.pbTrainerBattleCheck(trtype,trname,battleid) if !$INEDITOR trainerChecker.pbTrainerBattleCheck(trtype,trname,battleid)
# Set the event's charset to one depending on the trainer type if the event # Set the event's charset to one depending on the trainer type if the event
# doesn't have a charset # doesn't have a charset
if firstpage.graphic.character_name=="" && GameData::TrainerType.exists?(trtype) if firstpage.graphic.character_name=="" && GameData::TrainerType.exists?(trtype)
@@ -570,7 +570,7 @@ module Compiler
# Write rematch and last pages # Write rematch and last pages
for i in 1...battles.length for i in 1...battles.length
# Run trainer check now, except in editor # Run trainer check now, except in editor
trainerChecker.pbTrainerBattleCheck(trtype,trname,battleid+i) if !$INEDITOR trainerChecker.pbTrainerBattleCheck(trtype,trname,battleid+i)
if i==battles.length-1 if i==battles.length-1
push_branch(rematchpage.list,sprintf("pbPhoneBattleCount(%s)>=%d",safetrcombo,i)) push_branch(rematchpage.list,sprintf("pbPhoneBattleCount(%s)>=%d",safetrcombo,i))
push_branch(lastpage.list,sprintf("pbPhoneBattleCount(%s)>%d",safetrcombo,i)) push_branch(lastpage.list,sprintf("pbPhoneBattleCount(%s)>%d",safetrcombo,i))

View File

@@ -24,6 +24,7 @@ end
def mainFunctionDebug def mainFunctionDebug
begin begin
MessageTypes.loadMessageFile("Data/messages.dat") if safeExists?("Data/messages.dat")
PluginManager.runPlugins PluginManager.runPlugins
Compiler.main Compiler.main
Game.initialize Game.initialize