DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes related to the previous commit and Exp Candy effect

Browse Source
This commit is contained in:
Maruno17
2021-07-08 23:38:57 +01:00
parent d5aeeaca7b
commit ae7661edc5
7 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Data/Scripts/013_Items/Gen 8 items.rb
View File

@@ -5,9 +5,11 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYXS, proc { |item, pkmn, scene|
end end
gain_amount = 100 gain_amount = 100
maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil
maximum = [maximum, $PokemonBag.pbQuantity(item)].min
qty = scene.scene.pbChooseNumber( qty = scene.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty = 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$PokemonBag.pbDeleteItem(item, qty - 1) $PokemonBag.pbDeleteItem(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -21,9 +23,11 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYS, proc { |item, pkmn, scene|
end end
gain_amount = 800 gain_amount = 800
maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil
maximum = [maximum, $PokemonBag.pbQuantity(item)].min
qty = scene.scene.pbChooseNumber( qty = scene.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty = 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$PokemonBag.pbDeleteItem(item, qty - 1) $PokemonBag.pbDeleteItem(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -37,9 +41,11 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYM, proc { |item, pkmn, scene|
end end
gain_amount = 3_000 gain_amount = 3_000
maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil
maximum = [maximum, $PokemonBag.pbQuantity(item)].min
qty = scene.scene.pbChooseNumber( qty = scene.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty = 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$PokemonBag.pbDeleteItem(item, qty - 1) $PokemonBag.pbDeleteItem(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -53,9 +59,11 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYL, proc { |item, pkmn, scene|
end end
gain_amount = 10_000 gain_amount = 10_000
maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil
maximum = [maximum, $PokemonBag.pbQuantity(item)].min
qty = scene.scene.pbChooseNumber( qty = scene.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty = 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$PokemonBag.pbDeleteItem(item, qty - 1) $PokemonBag.pbDeleteItem(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -69,9 +77,11 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYXL, proc { |item, pkmn, scene|
end end
gain_amount = 30_000 gain_amount = 30_000
maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil maximum = ((pkmn.growth_rate.maximum_exp - pkmn.exp) / gain_amount.to_f).ceil
maximum = [maximum, $PokemonBag.pbQuantity(item)].min
qty = scene.scene.pbChooseNumber( qty = scene.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty = 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$PokemonBag.pbDeleteItem(item, qty - 1) $PokemonBag.pbDeleteItem(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh

2
Data/Scripts/016_UI/005_UI_Party.rb
View File

@@ -565,7 +565,7 @@ class PokemonParty_Scene
end end
def pbChooseNumber(helptext, maximum, initnum = 1) def pbChooseNumber(helptext, maximum, initnum = 1)
return UIHelper.pbChooseNumber(@sprites["helpwindow"], helptext, maximum, initnum) { pbUpdate } return UIHelper.pbChooseNumber(@sprites["helpwindow"], helptext, maximum, initnum) { update }
end end
def pbSetHelpText(helptext) def pbSetHelpText(helptext)

1
Data/Scripts/016_UI/018_UI_ItemStorage.rb
View File

@@ -295,6 +295,7 @@ module UIHelper
Input.update Input.update
numwindow.update numwindow.update
helpwindow.update helpwindow.update
yield if block_given?
if Input.trigger?(Input::BACK) if Input.trigger?(Input::BACK)
ret = 0 ret = 0
pbPlayCancelSE pbPlayCancelSE

28
PBS/Gen 8/items.txt
View File

@@ -2880,6 +2880,7 @@ Name = Lonely Mint
NamePlural = Lonely Mints NamePlural = Lonely Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[ADAMANTMINT] [ADAMANTMINT]
@@ -2887,6 +2888,7 @@ Name = Adamant Mint
NamePlural = Adamant Mints NamePlural = Adamant Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[NAUGHTYMINT] [NAUGHTYMINT]
@@ -2894,6 +2896,7 @@ Name = Naughty Mint
NamePlural = Naughty Mints NamePlural = Naughty Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[BRAVEMINT] [BRAVEMINT]
@@ -2901,6 +2904,7 @@ Name = Brave Mint
NamePlural = Brave Mints NamePlural = Brave Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[BOLDMINT] [BOLDMINT]
@@ -2908,6 +2912,7 @@ Name = Bold Mint
NamePlural = Bold Mints NamePlural = Bold Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[IMPISHMINT] [IMPISHMINT]
@@ -2915,6 +2920,7 @@ Name = Impish Mint
NamePlural = Impish Mints NamePlural = Impish Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[LAXMINT] [LAXMINT]
@@ -2922,6 +2928,7 @@ Name = Lax Mint
NamePlural = Lax Mints NamePlural = Lax Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[RELAXEDMINT] [RELAXEDMINT]
@@ -2929,6 +2936,7 @@ Name = Relaxed Mint
NamePlural = Relaxed Mints NamePlural = Relaxed Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[MODESTMINT] [MODESTMINT]
@@ -2936,6 +2944,7 @@ Name = Modest Mint
NamePlural = Modest Mints NamePlural = Modest Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[MILDMINT] [MILDMINT]
@@ -2943,6 +2952,7 @@ Name = Mild Mint
NamePlural = Mild Mints NamePlural = Mild Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[RASHMINT] [RASHMINT]
@@ -2950,6 +2960,7 @@ Name = Rash Mint
NamePlural = Rash Mints NamePlural = Rash Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[QUIETMINT] [QUIETMINT]
@@ -2957,6 +2968,7 @@ Name = Quiet Mint
NamePlural = Quiet Mints NamePlural = Quiet Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[CALMMINT] [CALMMINT]
@@ -2964,6 +2976,7 @@ Name = Calm Mint
NamePlural = Calm Mints NamePlural = Calm Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[GENTLEMINT] [GENTLEMINT]
@@ -2971,6 +2984,7 @@ Name = Gentle Mint
NamePlural = Gentle Mints NamePlural = Gentle Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[CAREFULMINT] [CAREFULMINT]
@@ -2978,6 +2992,7 @@ Name = Careful Mint
NamePlural = Careful Mints NamePlural = Careful Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[SASSYMINT] [SASSYMINT]
@@ -2985,6 +3000,7 @@ Name = Sassy Mint
NamePlural = Sassy Mints NamePlural = Sassy Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[TIMIDMINT] [TIMIDMINT]
@@ -2992,6 +3008,7 @@ Name = Timid Mint
NamePlural = Timid Mints NamePlural = Timid Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[HASTYMINT] [HASTYMINT]
@@ -2999,6 +3016,7 @@ Name = Hasty Mint
NamePlural = Hasty Mints NamePlural = Hasty Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[JOLLYMINT] [JOLLYMINT]
@@ -3006,6 +3024,7 @@ Name = Jolly Mint
NamePlural = Jolly Mints NamePlural = Jolly Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[NAIVEMINT] [NAIVEMINT]
@@ -3013,6 +3032,7 @@ Name = Naive Mint
NamePlural = Naive Mints NamePlural = Naive Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[SERIOUSMINT] [SERIOUSMINT]
@@ -3020,6 +3040,7 @@ Name = Serious Mint
NamePlural = Serious Mints NamePlural = Serious Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, all of its stats will grow at an equal rate. Description = When a Pokémon smells this mint, all of its stats will grow at an equal rate.
#------------------------------- #-------------------------------
[ABILITYCAPSULE] [ABILITYCAPSULE]
@@ -3043,6 +3064,7 @@ Name = Exp. Candy XS
NamePlural = Exp. Candy XSs NamePlural = Exp. Candy XSs
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very small amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very small amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYS] [EXPCANDYS]
@@ -3050,6 +3072,7 @@ Name = Exp. Candy S
NamePlural = Exp. Candy Ss NamePlural = Exp. Candy Ss
Pocket = 2 Pocket = 2
Price = 240 Price = 240
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a small amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a small amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYM] [EXPCANDYM]
@@ -3057,6 +3080,7 @@ Name = Exp. Candy M
NamePlural = Exp. Candy Ms NamePlural = Exp. Candy Ms
Pocket = 2 Pocket = 2
Price = 1000 Price = 1000
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a moderate amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a moderate amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYL] [EXPCANDYL]
@@ -3064,6 +3088,7 @@ Name = Exp. Candy L
NamePlural = Exp. Candy Ls NamePlural = Exp. Candy Ls
Pocket = 2 Pocket = 2
Price = 3000 Price = 3000
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a large amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a large amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYXL] [EXPCANDYXL]
@@ -3071,6 +3096,7 @@ Name = Exp. Candy XL
NamePlural = Exp. Candy XLs NamePlural = Exp. Candy XLs
Pocket = 2 Pocket = 2
Price = 10000 Price = 10000
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very large amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very large amount of Exp. Points.
#------------------------------- #-------------------------------
[RARECANDY] [RARECANDY]
@@ -6303,7 +6329,7 @@ Description = A bottle believed to have been used to seal away the power of a ce
[ROTOMCATALOG] [ROTOMCATALOG]
Name = Rotom Catalog Name = Rotom Catalog
NamePlural = Rotom Catalogs NamePlural = Rotom Catalogs
Pocket = 1 Pocket = 8
Price = 0 Price = 0
FieldUse = OnPokemon FieldUse = OnPokemon
Description = A catalog of devices that Rotom like. Use the catalog to have Rotom hop in and out of the various devices listed within. Description = A catalog of devices that Rotom like. Use the catalog to have Rotom hop in and out of the various devices listed within.

4
PBS/Gen 8/pokemon.txt
View File

@@ -9115,7 +9115,7 @@ Habitat = Sea
Category = Seagull Category = Seagull
Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts. Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
Generation = 3 Generation = 3
WildItemCommon = PRETTYWING WildItemCommon = PRETTYFEATHER
BattlerPlayerX = 2 BattlerPlayerX = 2
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -9149,7 +9149,7 @@ Habitat = Sea
Category = Water Bird Category = Water Bird
Pokedex = It skims the tops of waves as it flies. When it spots prey, it uses its large beak to scoop up the victim with water. It protects its eggs in its beak. Pokedex = It skims the tops of waves as it flies. When it spots prey, it uses its large beak to scoop up the victim with water. It protects its eggs in its beak.
Generation = 3 Generation = 3
WildItemCommon = PRETTYWING WildItemCommon = PRETTYFEATHER
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0

28
PBS/items.txt
View File

@@ -2880,6 +2880,7 @@ Name = Lonely Mint
NamePlural = Lonely Mints NamePlural = Lonely Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[ADAMANTMINT] [ADAMANTMINT]
@@ -2887,6 +2888,7 @@ Name = Adamant Mint
NamePlural = Adamant Mints NamePlural = Adamant Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[NAUGHTYMINT] [NAUGHTYMINT]
@@ -2894,6 +2896,7 @@ Name = Naughty Mint
NamePlural = Naughty Mints NamePlural = Naughty Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[BRAVEMINT] [BRAVEMINT]
@@ -2901,6 +2904,7 @@ Name = Brave Mint
NamePlural = Brave Mints NamePlural = Brave Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Attack will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[BOLDMINT] [BOLDMINT]
@@ -2908,6 +2912,7 @@ Name = Bold Mint
NamePlural = Bold Mints NamePlural = Bold Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[IMPISHMINT] [IMPISHMINT]
@@ -2915,6 +2920,7 @@ Name = Impish Mint
NamePlural = Impish Mints NamePlural = Impish Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[LAXMINT] [LAXMINT]
@@ -2922,6 +2928,7 @@ Name = Lax Mint
NamePlural = Lax Mints NamePlural = Lax Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[RELAXEDMINT] [RELAXEDMINT]
@@ -2929,6 +2936,7 @@ Name = Relaxed Mint
NamePlural = Relaxed Mints NamePlural = Relaxed Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Defense will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[MODESTMINT] [MODESTMINT]
@@ -2936,6 +2944,7 @@ Name = Modest Mint
NamePlural = Modest Mints NamePlural = Modest Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[MILDMINT] [MILDMINT]
@@ -2943,6 +2952,7 @@ Name = Mild Mint
NamePlural = Mild Mints NamePlural = Mild Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[RASHMINT] [RASHMINT]
@@ -2950,6 +2960,7 @@ Name = Rash Mint
NamePlural = Rash Mints NamePlural = Rash Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[QUIETMINT] [QUIETMINT]
@@ -2957,6 +2968,7 @@ Name = Quiet Mint
NamePlural = Quiet Mints NamePlural = Quiet Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Atk will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[CALMMINT] [CALMMINT]
@@ -2964,6 +2976,7 @@ Name = Calm Mint
NamePlural = Calm Mints NamePlural = Calm Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[GENTLEMINT] [GENTLEMINT]
@@ -2971,6 +2984,7 @@ Name = Gentle Mint
NamePlural = Gentle Mints NamePlural = Gentle Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[CAREFULMINT] [CAREFULMINT]
@@ -2978,6 +2992,7 @@ Name = Careful Mint
NamePlural = Careful Mints NamePlural = Careful Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[SASSYMINT] [SASSYMINT]
@@ -2985,6 +3000,7 @@ Name = Sassy Mint
NamePlural = Sassy Mints NamePlural = Sassy Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Speed will grow more slowly. Description = When a Pokémon smells this mint, its Sp. Def will grow more easily, but its Speed will grow more slowly.
#------------------------------- #-------------------------------
[TIMIDMINT] [TIMIDMINT]
@@ -2992,6 +3008,7 @@ Name = Timid Mint
NamePlural = Timid Mints NamePlural = Timid Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Attack will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Attack will grow more slowly.
#------------------------------- #-------------------------------
[HASTYMINT] [HASTYMINT]
@@ -2999,6 +3016,7 @@ Name = Hasty Mint
NamePlural = Hasty Mints NamePlural = Hasty Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Defense will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Defense will grow more slowly.
#------------------------------- #-------------------------------
[JOLLYMINT] [JOLLYMINT]
@@ -3006,6 +3024,7 @@ Name = Jolly Mint
NamePlural = Jolly Mints NamePlural = Jolly Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Atk will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Atk will grow more slowly.
#------------------------------- #-------------------------------
[NAIVEMINT] [NAIVEMINT]
@@ -3013,6 +3032,7 @@ Name = Naive Mint
NamePlural = Naive Mints NamePlural = Naive Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Def will grow more slowly. Description = When a Pokémon smells this mint, its Speed will grow more easily, but its Sp. Def will grow more slowly.
#------------------------------- #-------------------------------
[SERIOUSMINT] [SERIOUSMINT]
@@ -3020,6 +3040,7 @@ Name = Serious Mint
NamePlural = Serious Mints NamePlural = Serious Mints
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = When a Pokémon smells this mint, all of its stats will grow at an equal rate. Description = When a Pokémon smells this mint, all of its stats will grow at an equal rate.
#------------------------------- #-------------------------------
[ABILITYCAPSULE] [ABILITYCAPSULE]
@@ -3043,6 +3064,7 @@ Name = Exp. Candy XS
NamePlural = Exp. Candy XSs NamePlural = Exp. Candy XSs
Pocket = 2 Pocket = 2
Price = 20 Price = 20
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very small amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very small amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYS] [EXPCANDYS]
@@ -3050,6 +3072,7 @@ Name = Exp. Candy S
NamePlural = Exp. Candy Ss NamePlural = Exp. Candy Ss
Pocket = 2 Pocket = 2
Price = 240 Price = 240
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a small amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a small amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYM] [EXPCANDYM]
@@ -3057,6 +3080,7 @@ Name = Exp. Candy M
NamePlural = Exp. Candy Ms NamePlural = Exp. Candy Ms
Pocket = 2 Pocket = 2
Price = 1000 Price = 1000
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a moderate amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a moderate amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYL] [EXPCANDYL]
@@ -3064,6 +3088,7 @@ Name = Exp. Candy L
NamePlural = Exp. Candy Ls NamePlural = Exp. Candy Ls
Pocket = 2 Pocket = 2
Price = 3000 Price = 3000
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a large amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a large amount of Exp. Points.
#------------------------------- #-------------------------------
[EXPCANDYXL] [EXPCANDYXL]
@@ -3071,6 +3096,7 @@ Name = Exp. Candy XL
NamePlural = Exp. Candy XLs NamePlural = Exp. Candy XLs
Pocket = 2 Pocket = 2
Price = 10000 Price = 10000
FieldUse = OnPokemon
Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very large amount of Exp. Points. Description = A candy that is packed with energy. When consumed, it will grant a single Pokémon a very large amount of Exp. Points.
#------------------------------- #-------------------------------
[RARECANDY] [RARECANDY]
@@ -6303,7 +6329,7 @@ Description = A bottle believed to have been used to seal away the power of a ce
[ROTOMCATALOG] [ROTOMCATALOG]
Name = Rotom Catalog Name = Rotom Catalog
NamePlural = Rotom Catalogs NamePlural = Rotom Catalogs
Pocket = 1 Pocket = 8
Price = 0 Price = 0
FieldUse = OnPokemon FieldUse = OnPokemon
Description = A catalog of devices that Rotom like. Use the catalog to have Rotom hop in and out of the various devices listed within. Description = A catalog of devices that Rotom like. Use the catalog to have Rotom hop in and out of the various devices listed within.

4
PBS/pokemon.txt
View File

@@ -9115,7 +9115,7 @@ Habitat = Sea
Category = Seagull Category = Seagull
Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts. Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
Generation = 3 Generation = 3
WildItemCommon = PRETTYWING WildItemCommon = PRETTYFEATHER
BattlerPlayerX = 2 BattlerPlayerX = 2
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0
@@ -9149,7 +9149,7 @@ Habitat = Sea
Category = Water Bird Category = Water Bird
Pokedex = It skims the tops of waves as it flies. When it spots prey, it uses its large beak to scoop up the victim with water. It protects its eggs in its beak. Pokedex = It skims the tops of waves as it flies. When it spots prey, it uses its large beak to scoop up the victim with water. It protects its eggs in its beak.
Generation = 3 Generation = 3
WildItemCommon = PRETTYWING WildItemCommon = PRETTYFEATHER
BattlerPlayerX = 0 BattlerPlayerX = 0
BattlerPlayerY = 0 BattlerPlayerY = 0
BattlerEnemyX = 0 BattlerEnemyX = 0