diff --git a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb index 32b669285..280e3a2c9 100644 --- a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb +++ b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb @@ -102,15 +102,15 @@ module MessageConfig #----------------------------------------------------------------------------- def self.pbDefaultSystemFontName - return MessageConfig.pbTryFonts(FONT_NAME, "Arial Narrow", "Arial") + return MessageConfig.pbTryFonts(FONT_NAME) end def self.pbDefaultSmallFontName - return MessageConfig.pbTryFonts(SMALL_FONT_NAME, "Arial Narrow", "Arial") + return MessageConfig.pbTryFonts(SMALL_FONT_NAME) end def self.pbDefaultNarrowFontName - return MessageConfig.pbTryFonts(NARROW_FONT_NAME, "Arial Narrow", "Arial") + return MessageConfig.pbTryFonts(NARROW_FONT_NAME) end def self.pbGetSystemFontName diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb index e5945aca6..296ce783e 100644 --- a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb +++ b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb @@ -217,6 +217,7 @@ def pbWildBattleCore(*args) $PokemonGlobal.nextBattleME = nil $PokemonGlobal.nextBattleCaptureME = nil $PokemonGlobal.nextBattleBack = nil + pbMEStop return 1 # Treat it as a win end # Record information about party Pokémon to be used at the end of battle (e.g. @@ -355,6 +356,7 @@ def pbTrainerBattleCore(*args) $PokemonGlobal.nextBattleME = nil $PokemonGlobal.nextBattleCaptureME = nil $PokemonGlobal.nextBattleBack = nil + pbMEStop return ($Trainer.able_pokemon_count == 0) ? 0 : 1 # Treat it as undecided/a win end # Record information about party Pokémon to be used at the end of battle (e.g. diff --git a/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/004_Challenge_Battles.rb b/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/004_Challenge_Battles.rb index 18611a799..5d4ac44d8 100644 --- a/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/004_Challenge_Battles.rb +++ b/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/004_Challenge_Battles.rb @@ -44,6 +44,7 @@ def pbOrganizedBattleEx(opponent, challengedata, endspeech, endspeechwin) pbMessage(_INTL("AFTER WINNING...")) pbMessage(endspeech || "...") $PokemonTemp.lastbattle = nil + pbMEStop return true end $Trainer.heal_party diff --git a/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb b/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb index 105472235..350cd1605 100644 --- a/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb +++ b/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb @@ -256,6 +256,7 @@ def pbEncounterTypeEditor(enc_data, enc_type) help_window = Window_UnformattedTextPokemon.newWithSize(_INTL("Edit encounter slots"), Graphics.width / 2, 0, Graphics.width / 2, 96) help_window.z = 99999 + enc_type_name = "" ret = 0 need_refresh = true loop do @@ -316,7 +317,7 @@ def pbEncounterTypeEditor(enc_data, enc_type) need_refresh = true end when 1 # Copy - enc_data.types[enc_type].insert(ret, enc_data.types[enc_type][ret - 2].clone) + enc_data.types[enc_type].insert(ret - 1, enc_data.types[enc_type][ret - 2].clone) ret += 1 need_refresh = true when 2 # Delete diff --git a/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb b/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb index 28bb48f7f..d2bca5e81 100644 --- a/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb +++ b/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb @@ -43,10 +43,10 @@ module SpriteRenamer def convert_pokemon_filename(full_name, default_prefix = "") name = full_name - extension = nil + extension = ".png" if full_name[/^(.+)\.([^\.]+)$/] # Of the format something.abc name = $~[1] - extension = $~[2] + extension = "." + $~[2] end prefix = default_prefix form = female = shadow = crack = "" @@ -61,12 +61,12 @@ module SpriteRenamer end if name[/000/] species = "000" - else - species_number = name[0, 3].to_i + elsif name[/^(\d+)$/] || name[/^(\d+)\D/] + species_number = $~[1].to_i species_data = GameData::Species.try_get(species_number) raise _INTL("Species {1} is not defined (trying to rename Pokémon graphic {2}).", species_number, full_name) if !species_data species = species_data.id.to_s - form = "_" + $~[1].to_s if name[/_(\d+)/] + form = "_" + $~[1].to_s if name[/_(\d+)$/] || name[/_(\d+)\D/] female = "_female" if name[/f/] shadow = "_shadow" if name[/_shadow/] if name[/egg/] @@ -75,7 +75,7 @@ module SpriteRenamer crack = "_cracks" if name[/eggCracks/] end end - return prefix + species + form + female + shadow + crack + ((extension) ? "." + extension : ".png") + return prefix + species + form + female + shadow + crack + extension) end def convert_pokemon_sprites(src_dir, dest_dir) @@ -94,7 +94,7 @@ module SpriteRenamer when "eggCracks.png" File.move(src_dir + file, dest_dir + "Eggs/000_cracks.png") else - next if !file[/^\d{3}[^\.]*\.[^\.]*$/] + next if !file[/^\d+[^\.]*\.[^\.]*$/] new_filename = convert_pokemon_filename(file) # moves the files into their appropriate folders File.move(src_dir + file, dest_dir + new_filename) @@ -115,7 +115,7 @@ module SpriteRenamer when "iconEgg.png" File.move(src_dir + file, dest_dir + "Eggs/000_egg.png") else - next if !file[/^icon\d{3}[^\.]*\.[^\.]*$/] + next if !file[/^icon\d+[^\.]*\.[^\.]*$/] new_filename = convert_pokemon_filename(file.sub(/^icon/, ''), "Icons/") # moves the files into their appropriate folders File.move(src_dir + file, dest_dir + new_filename) @@ -131,7 +131,7 @@ module SpriteRenamer files.each_with_index do |file, i| Graphics.update if i % 100 == 0 pbSetWindowText(_INTL("Converting footprints {1}/{2}...", i, files.length)) if i % 50 == 0 - next if !file[/^footprint\d{3}[^\.]*\.[^\.]*$/] + next if !file[/^footprint\d+[^\.]*\.[^\.]*$/] new_filename = convert_pokemon_filename(file.sub(/^footprint/, ''), "Footprints/") # moves the files into their appropriate folders File.move(src_dir + file, dest_dir + new_filename) @@ -157,7 +157,7 @@ module SpriteRenamer type = $~[1] extension = $~[2] File.move(src_dir + file, dest_dir + "machine_" + type + "." + extension) - elsif file[/^item(\d{3})[^\.]*\.([^\.]*)$/] + elsif file[/^item(\d+)\.([^\.]*)$/] item_number = $~[1].to_i extension = $~[2] item_data = GameData::Item.try_get(item_number) @@ -178,7 +178,7 @@ module SpriteRenamer files.each_with_index do |file, i| Graphics.update if i % 100 == 0 pbSetWindowText(_INTL("Converting Pokémon cries {1}/{2}...", i, files.length)) if i % 50 == 0 - if file[/^(\d{3})Cry[^\.]*\.([^\.]*)$/] + if file[/^(\d+)Cry[^\.]*\.([^\.]*)$/] species_number = $~[1].to_i extension = $~[2] form = (file[/Cry_(\d+)\./]) ? sprintf("_%s", $~[1]) : "" @@ -203,7 +203,7 @@ module SpriteRenamer Graphics.update if i % 100 == 0 pbSetWindowText(_INTL("Converting trainer sprites {1}/{2}...", i, files.length)) if i % 50 == 0 if src_dir == "Graphics/Characters/" - if file[/^trchar(\d{3})\.([^\.]*)$/] + if file[/^trchar(\d+)\.([^\.]*)$/] tr_type_number = $~[1].to_i extension = $~[2] tr_type_data = GameData::TrainerType.try_get(tr_type_number) @@ -212,14 +212,14 @@ module SpriteRenamer File.move(src_dir + file, src_dir + "trainer_" + tr_type + "." + extension) end else - if file[/^trainer(\d{3})\.([^\.]*)$/] + if file[/^trainer(\d+)\.([^\.]*)$/] tr_type_number = $~[1].to_i extension = $~[2] tr_type_data = GameData::TrainerType.try_get(tr_type_number) raise _INTL("Trainer type {1} is not defined (trying to rename trainer sprite {2}).", tr_type_number, file) if !tr_type_data tr_type = tr_type_data.id.to_s File.move(src_dir + file, src_dir + tr_type + "." + extension) - elsif file[/^trback(\d{3})\.([^\.]*)$/] + elsif file[/^trback(\d+)\.([^\.]*)$/] tr_type_number = $~[1].to_i extension = $~[2] tr_type_data = GameData::TrainerType.try_get(tr_type_number) @@ -236,7 +236,7 @@ module SpriteRenamer for i in 0...8 metadata = GameData::Metadata.get_player(i) next if !metadata - if metadata[1][/^trchar(\d{3})$/] + if metadata[1][/^trchar(\d+)$/] tr_type_number = $~[1].to_i tr_type_data = GameData::TrainerType.try_get(tr_type_number) raise _INTL("Trainer type {1} is not defined (trying to rename player metadata filename {2}).", tr_type_number, metadata[1]) if !tr_type_data