diff --git a/Data/Scripts/013_Items/001_Item_Utilities.rb b/Data/Scripts/013_Items/001_Item_Utilities.rb index d005fec80..6bfc67e50 100644 --- a/Data/Scripts/013_Items/001_Item_Utilities.rb +++ b/Data/Scripts/013_Items/001_Item_Utilities.rb @@ -672,7 +672,7 @@ def pbUseItem(bag, item, bagscene = nil) max_at_once = [max_at_once, $bag.quantity(item)].min if max_at_once > 1 qty = screen.scene.pbChooseNumber( - _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), max_at_once + _INTL("How many {1} do you want to use?", GameData::Item.get(item).portion_name_plural), max_at_once ) screen.scene.pbSetHelpText("") if screen.is_a?(PokemonPartyScreen) end @@ -715,7 +715,7 @@ def pbUseItemOnPokemon(item, pkmn, scene) elsif !pkmn.compatible_with_move?(machine) pbMessage(_INTL("{1} can't learn {2}.", pkmn.name, movename)) { scene.pbUpdate } else - pbMessage(_INTL("\\se[PC access]You booted up the {1}.\1", itm.potion_name)) { scene.pbUpdate } + pbMessage(_INTL("\\se[PC access]You booted up the {1}.\1", itm.portion_name)) { scene.pbUpdate } if pbConfirmMessage(_INTL("Do you want to teach {1} to {2}?", movename, pkmn.name)) { scene.pbUpdate } if pbLearnMove(pkmn, machine, false, true) { scene.pbUpdate } $bag.remove(item) if itm.consumed_after_use? @@ -731,7 +731,7 @@ def pbUseItemOnPokemon(item, pkmn, scene) max_at_once = [max_at_once, $bag.quantity(item)].min if max_at_once > 1 qty = scene.scene.pbChooseNumber( - _INTL("How many {1} do you want to use?", itm.potion_name_plural), max_at_once + _INTL("How many {1} do you want to use?", itm.portion_name_plural), max_at_once ) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) end @@ -742,7 +742,7 @@ def pbUseItemOnPokemon(item, pkmn, scene) if ret && itm.consumed_after_use? $bag.remove(item, qty) if !$bag.has?(item) - pbMessage(_INTL("You used your last {1}.", itm.potion_name)) { scene.pbUpdate } + pbMessage(_INTL("You used your last {1}.", itm.portion_name)) { scene.pbUpdate } end end return ret @@ -759,7 +759,7 @@ def pbUseKeyItemInField(item) end def pbUseItemMessage(item) - itemname = GameData::Item.get(item).name + itemname = GameData::Item.get(item).portion_name if itemname.starts_with_vowel? pbMessage(_INTL("You used an {1}.", itemname)) else diff --git a/PBS/Gen 5/items.txt b/PBS/Gen 5/items.txt index 6c3d5d45a..255d5bcc1 100644 --- a/PBS/Gen 5/items.txt +++ b/PBS/Gen 5/items.txt @@ -441,6 +441,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can [RELICCOPPER] Name = Relic Copper NamePlural = Relic Coppers +PortionName = Relic Copper coin +PortionNamePlural = Relic Copper coins Pocket = 1 Price = 2000 Flags = Fling_30 @@ -449,6 +451,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani [RELICSILVER] Name = Relic Silver NamePlural = Relic Silvers +PortionName = Relic Silver coin +PortionNamePlural = Relic Silver coins Pocket = 1 Price = 10000 Flags = Fling_30 @@ -457,6 +461,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani [RELICGOLD] Name = Relic Gold NamePlural = Relic Golds +PortionName = Relic Gold coin +PortionNamePlural = Relic Gold coins Pocket = 1 Price = 20000 Flags = Fling_30 diff --git a/PBS/Gen 6/items.txt b/PBS/Gen 6/items.txt index ba1fde6b4..930512dcc 100644 --- a/PBS/Gen 6/items.txt +++ b/PBS/Gen 6/items.txt @@ -457,6 +457,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can [RELICCOPPER] Name = Relic Copper NamePlural = Relic Coppers +PortionName = Relic Copper coin +PortionNamePlural = Relic Copper coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -465,6 +467,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani [RELICSILVER] Name = Relic Silver NamePlural = Relic Silvers +PortionName = Relic Silver coin +PortionNamePlural = Relic Silver coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -473,6 +477,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani [RELICGOLD] Name = Relic Gold NamePlural = Relic Golds +PortionName = Relic Gold coin +PortionNamePlural = Relic Gold coins Pocket = 1 Price = 0 Flags = Fling_30 diff --git a/PBS/Gen 7/items.txt b/PBS/Gen 7/items.txt index 3c28592b3..245044011 100644 --- a/PBS/Gen 7/items.txt +++ b/PBS/Gen 7/items.txt @@ -467,6 +467,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can [RELICCOPPER] Name = Relic Copper NamePlural = Relic Coppers +PortionName = Relic Copper coin +PortionNamePlural = Relic Copper coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -475,6 +477,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani [RELICSILVER] Name = Relic Silver NamePlural = Relic Silvers +PortionName = Relic Silver coin +PortionNamePlural = Relic Silver coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -483,6 +487,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani [RELICGOLD] Name = Relic Gold NamePlural = Relic Golds +PortionName = Relic Gold coin +PortionNamePlural = Relic Gold coins Pocket = 1 Price = 0 Flags = Fling_30 diff --git a/PBS/Gen 8/items.txt b/PBS/Gen 8/items.txt index c6c1af875..a2e945334 100644 --- a/PBS/Gen 8/items.txt +++ b/PBS/Gen 8/items.txt @@ -552,6 +552,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can [RELICCOPPER] Name = Relic Copper NamePlural = Relic Coppers +PortionName = Relic Copper coin +PortionNamePlural = Relic Copper coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -560,6 +562,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani [RELICSILVER] Name = Relic Silver NamePlural = Relic Silvers +PortionName = Relic Silver coin +PortionNamePlural = Relic Silver coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -568,6 +572,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani [RELICGOLD] Name = Relic Gold NamePlural = Relic Golds +PortionName = Relic Gold coin +PortionNamePlural = Relic Gold coins Pocket = 1 Price = 60000 Flags = Fling_30 diff --git a/PBS/items.txt b/PBS/items.txt index c6c1af875..a2e945334 100644 --- a/PBS/items.txt +++ b/PBS/items.txt @@ -552,6 +552,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can [RELICCOPPER] Name = Relic Copper NamePlural = Relic Coppers +PortionName = Relic Copper coin +PortionNamePlural = Relic Copper coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -560,6 +562,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani [RELICSILVER] Name = Relic Silver NamePlural = Relic Silvers +PortionName = Relic Silver coin +PortionNamePlural = Relic Silver coins Pocket = 1 Price = 0 Flags = Fling_30 @@ -568,6 +572,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani [RELICGOLD] Name = Relic Gold NamePlural = Relic Golds +PortionName = Relic Gold coin +PortionNamePlural = Relic Gold coins Pocket = 1 Price = 60000 Flags = Fling_30