mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed being able to bypass a caught mon being forced into the party, fixed Rotom Catalog, fixed incorrect writing of some enums to PBS files, fixed Jukebox's awareness of audio files, fixed bug when battle default weather is primordial, disabled path cache to add speed
This commit is contained in:
@@ -1250,7 +1250,7 @@ ItemHandlers::UseOnPokemon.add(:ROTOMCATALOG, proc { |item, qty, pkmn, scene|
|
||||
if new_form == pkmn.form
|
||||
scene.pbDisplay(_INTL("It won't have any effect."))
|
||||
next false
|
||||
elsif new_form > 0 && new_form < choices.length - 1
|
||||
elsif new_form >= 0 && new_form < choices.length - 1
|
||||
pkmn.setForm(new_form) do
|
||||
scene.pbRefresh
|
||||
scene.pbDisplay(_INTL("{1} transformed!", pkmn.name))
|
||||
|
||||
@@ -179,7 +179,7 @@ class Phone
|
||||
else
|
||||
contact = $PokemonGlobal.phone.get(false, args[1])
|
||||
end
|
||||
pbMessage(_INTL("\\me[Register phone]Registered {1} in the Pokégear!", contact.display_name) + "\\wtnp[60]")
|
||||
pbMessage("\\me[Register phone]" + _INTL("Registered {1} in the Pokégear!", contact.display_name) + "\\wtnp[60]")
|
||||
end
|
||||
return ret
|
||||
end
|
||||
@@ -408,7 +408,7 @@ class Phone
|
||||
end
|
||||
|
||||
def start_message(contact = nil)
|
||||
pbMessage(_INTL("......\\wt[5] ......") + "\1")
|
||||
pbMessage("......\\wt[5] ......\1")
|
||||
end
|
||||
|
||||
def play(dialogue, contact)
|
||||
@@ -439,7 +439,7 @@ class Phone
|
||||
end
|
||||
|
||||
def end_message(contact = nil)
|
||||
pbMessage(_INTL("Click!\\wt[10]\n......\\wt[5] ......") + "\1")
|
||||
pbMessage(_INTL("Click!") + "\\wt[10]\n......\\wt[5] ......\1")
|
||||
end
|
||||
|
||||
#===========================================================================
|
||||
|
||||
Reference in New Issue
Block a user