update 6.7

This commit is contained in:
chardub
2025-09-28 15:53:01 -04:00
parent ef5e023ae0
commit 318ff90d8d
696 changed files with 111759 additions and 198230 deletions

View File

@@ -177,7 +177,7 @@ class SpritePositioner
species_data = GameData::Species.get(@species)
if pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%s_%d", species_data.species, species_data.form)) ||
pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%s", species_data.species))
pbMessage("This species has its own shadow sprite in Graphics/Pokemon/Shadow/. The shadow size metric cannot be edited.")
pbMessage(_INTL("This species has its own shadow sprite in Graphics/Pokemon/Shadow/. The shadow size metric cannot be edited."))
return false
end
oldval = species_data.shadow_size

View File

@@ -100,7 +100,7 @@ def pbAnimName(animation,cmdwin)
Input.update
window.update
if window.changed?(okbutton) || Input.triggerex?(:RETURN)
cmdwin.commands[cmdwin.index]=_INTL("{1} {2}",cmdwin.index,window.controls[0].text)
cmdwin.commands[cmdwin.index]= "#{cmdwin.index} #{window.controls[0].text}"
animation.name=window.controls[0].text
break
end
@@ -117,7 +117,7 @@ def pbAnimList(animations,canvas,animwin)
commands=[]
for i in 0...animations.length
animations[i]=PBAnimation.new if !animations[i]
commands[commands.length]=_INTL("{1} {2}",i,animations[i].name)
commands[commands.length]="#{i} #{animations[i].name}"
end
cmdwin=pbListWindow(commands,320)
cmdwin.height=416
@@ -143,7 +143,7 @@ def pbAnimList(animations,canvas,animwin)
animations.resize(newsize)
commands.clear
for i in 0...animations.length
commands[commands.length]=_INTL("{1} {2}",i,animations[i].name)
commands[commands.length]= "#{i} #{animations[i].name}"
end
cmdwin.commands=commands
cmdwin.index=animations.selected
@@ -166,7 +166,7 @@ def pbAnimList(animations,canvas,animwin)
elsif cmd2==2 # Delete
if pbConfirmMessage(_INTL("Are you sure you want to delete this animation?"))
animations[cmdwin.index]=PBAnimation.new
cmdwin.commands[cmdwin.index]=_INTL("{1} {2}",cmdwin.index,animations[cmdwin.index].name)
cmdwin.commands[cmdwin.index]= "#{cmdwin.index} #{animations[cmdwin.index].name}"
cmdwin.refresh
end
end

View File

@@ -130,7 +130,7 @@ DebugMenuCommands.register("togglewallpapers", {
paperscmds.push(_INTL("Unlock all"))
paperscmds.push(_INTL("Lock all"))
for i in PokemonStorage::BASICWALLPAPERQTY...w.length
paperscmds.push(_INTL("{1} {2}", unlockarray[i] ? "[Y]" : "[ ]", w[i]))
paperscmds.push("#{unlockarray[i] ? '[Y]' : '[ ]'} #{w[i]}")
end
paperscmd = pbShowCommands(nil, paperscmds, -1, paperscmd)
break if paperscmd < 0
@@ -782,7 +782,7 @@ DebugMenuCommands.register("dexlists", {
for i in 0...dex_names.length
name = (dex_names[i].is_a?(Array)) ? dex_names[i][0] : dex_names[i]
unlocked = $Trainer.pokedex.unlocked?(i)
dexescmds.push(_INTL("{1} {2}", unlocked ? "[Y]" : "[ ]", name))
dexescmds.push("#{unlocked ? "[Y]" : '[ ]'} #{name}")
end
dexescmd = pbShowCommands(nil, dexescmds, -1, dexescmd)
break if dexescmd < 0
@@ -822,15 +822,15 @@ DebugMenuCommands.register("setplayer", {
# break
# end
# if limit <= 1
# pbMessage(_INTL("There is only one player defined."))
# pbMessage("There is only one player defined.")
# else
# params = ChooseNumberParams.new
# params.setRange(0, limit - 1)
# params.setDefaultValue($Trainer.character_ID)
# newid = pbMessageChooseNumber(_INTL("Choose the new player character."), params)
# newid = pbMessageChooseNumber("Choose the new player character."), params
# if newid != $Trainer.character_ID
# pbChangePlayer(newid)
# pbMessage(_INTL("The player character was changed."))
# pbMessage("The player character was changed.")
# end
# end
}
@@ -877,6 +877,7 @@ DebugMenuCommands.register("randomid", {
"effect" => proc {
$Trainer.id = rand(2 ** 16) | rand(2 ** 16) << 16
pbMessage(_INTL("The player's ID was changed to {1} (full ID: {2}).", $Trainer.public_ID, $Trainer.id))
$Trainer.secretBase_uuid = nil
}
})

View File

@@ -20,7 +20,7 @@ def pbWarpToMapFly
end
def pbWarpToMap
choice = pbMessage("type", [_INTL("List"),_INTL("Map id"), _INTL("Town map")], 0)
choice = pbMessage(_INTL("type"), [_INTL("List"),_INTL("Map id"), _INTL("Town map")], 0)
if choice == 0
map = pbWarpToMapList
elsif choice == 1

View File

@@ -251,7 +251,7 @@ module SpriteRenamer
end
def convert_files
return if !pbConfirmMessage("Check for Pokémon/item/trainer files in their old folders that need renaming and moving?")
return if !pbConfirmMessage(_INTL("Check for Pokémon/item/trainer files in their old folders that need renaming and moving?"))
any_changed = false
# Rename and move Pokémon sprites/icons
dest_dir = "Graphics/Pokemon/"
@@ -272,7 +272,7 @@ module SpriteRenamer
# Rename trainer sprites
convert_trainer_sprites("Graphics/Trainers/")
pbSetWindowText(nil)
if pbConfirmMessage("Rename all trainer charsets? This will also edit map data to change events' charsets accordingly.")
if pbConfirmMessage(_INTL("Rename all trainer charsets? This will also edit map data to change events' charsets accordingly."))
convert_trainer_sprites("Graphics/Characters/")
convert_player_metadata_charsets
pbSetWindowText(nil)

View File

@@ -900,7 +900,7 @@ PokemonDebugMenuCommands.register("speciesform", {
pbMessage('Body species?')
body_species = pbChooseSpeciesList(old_body_dex,NB_POKEMON)
fused_species_dex = getFusionSpecies(body_species.species,head_species.species)
fused_species_dex = getFusionSpecies(body_species.species, head_species.species)
species = GameData::Species.get(fused_species_dex)
if species && species != pkmn.species
@@ -919,21 +919,21 @@ PokemonDebugMenuCommands.register("speciesform", {
# GameData::Species.each do |sp|
# next if sp.species != pkmn.species
# form_name = sp.form_name
# form_name = _INTL("Unnamed form") if !form_name || form_name.empty?
# form_name = "Unnamed form" if !form_name || form_name.empty?
# form_name = sprintf("%d: %s", sp.form, form_name)
# formcmds[0].push(sp.form)
# formcmds[1].push(form_name)
# cmd2 = sp.form if pkmn.form == sp.form
# end
# if formcmds[0].length <= 1
# screen.pbDisplay(_INTL("Species {1} only has one form.", pkmn.speciesName))
# screen.pbDisplay("Species {1} only has one form.", pkmn.speciesName)
# else
# cmd2 = screen.pbShowCommands(_INTL("Set the Pokémon's form."), formcmds[1], cmd2)
# cmd2 = screen.pbShowCommands("Set the Pokémon's form."), formcmds[1], cmd2
# next if cmd2 < 0
# f = formcmds[0][cmd2]
# if f != pkmn.form
# if MultipleForms.hasFunction?(pkmn, "getForm")
# next if !screen.pbConfirm(_INTL("This species decides its own form. Override?"))
# next if !screen.pbConfirm("This species decides its own form. Override?")
# pkmn.forced_form = f
# end
# pkmn.form = f
@@ -1066,8 +1066,7 @@ PokemonDebugMenuCommands.register("setribbons", {
commands = []
ids = []
GameData::Ribbon.each do |ribbon_data|
commands.push(_INTL("{1} {2}",
(pkmn.hasRibbon?(ribbon_data.id)) ? "[Y]" : "[ ]", ribbon_data.name))
commands.push("#{pkmn.hasRibbon?(ribbon_data.id) ? '[Y]' : '[ ]'} #{ribbon_data.name}")
ids.push(ribbon_data.id)
end
commands.push(_INTL("Give all"))