diff options
| author | Ajarmar <axel.jarmar@gmail.com> | 2021-03-08 17:15:43 +0100 |
|---|---|---|
| committer | Ajarmar <axel.jarmar@gmail.com> | 2021-03-08 17:15:43 +0100 |
| commit | 601e0d20101b8bab25e40c5e1892991e0ee4a35f (patch) | |
| tree | 7c7f304b667cd1bcb273ef4e4ae966f8e9354132 /src/com/dabomstew/pkrandom/newgui | |
| parent | 894f2d00e4be3f3d00ed3fcae9ec0d33d641c835 (diff) | |
| parent | 3c8f7d6c92b9113a25d23b4caf36e41c36d05d75 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/com/dabomstew/pkrandom/newgui')
| -rw-r--r-- | src/com/dabomstew/pkrandom/newgui/Bundle.properties | 4 | ||||
| -rw-r--r-- | src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/dabomstew/pkrandom/newgui/Bundle.properties b/src/com/dabomstew/pkrandom/newgui/Bundle.properties index b324c05..114f58a 100644 --- a/src/com/dabomstew/pkrandom/newgui/Bundle.properties +++ b/src/com/dabomstew/pkrandom/newgui/Bundle.properties @@ -326,7 +326,7 @@ GUI.miscRandomizePCPotionCheckBox.toolTipText=<html>Selecting this option will r GUI.miscRandomizePCPotionCheckBox.text=Randomize PC Potion GUI.miscAllowPikachuEvolutionCheckBox.toolTipText=<html>Selecting this option will let you evolve Pikachu into Raichu with a ThunderStone like any other game. GUI.miscAllowPikachuEvolutionCheckBox.text=Allow Pikachu Evolution -GUI.miscGiveNationalDexAtCheckBox.toolTipText=<html>If this is checked then the National Dex will be given to the player at the start of the game with the regular Pokedex.<br />This is only necessary for Gen 3 games, where in FRLG National Dex Pokemon can't evolve if you don't have it.<br />It is useful in other games for tracking Pokemon outside of the regional dex when using the Pokedex. +GUI.miscGiveNationalDexAtCheckBox.toolTipText=<html>If this is checked then the National Dex will be given to the player at the start of the game with the regular Pokedex.<br />This is only <i>necessary</i> for FRLG, where certain Pokemon can't evolve if you don't have it.<br />It is useful in other games for tracking Pokemon outside of the regional dex when using the Pokedex. GUI.miscGiveNationalDexAtCheckBox.text=Give National Dex at Start GUI.miscUpdateTypeEffectivenessCheckBox.toolTipText=<html>If this is checked, the type weakness/strengths/immunities will be updated to the current set.<br />For RBY, this means Ghost will be Super Effective against Psychic, among other changes. GUI.miscUpdateTypeEffectivenessCheckBox.text=Update Type Effectiveness @@ -463,7 +463,7 @@ CodeTweaks.pcPotion.toolTipText=<html>Selecting this option will randomize the P CodeTweaks.pcPotion.name=Randomize PC Potion CodeTweaks.pikachuEvo.toolTipText=<html>Selecting this option will let you evolve Pikachu into Raichu with a ThunderStone like any other game. CodeTweaks.pikachuEvo.name=Allow Pikachu Evolution -CodeTweaks.nationalDex.toolTipText=<html>If this is checked then the National Dex will be given to the player at the start of the game with the regular Pokedex.<br />This is only necessary for Gen 3 games, where in FRLG National Dex Pokemon can't evolve if you don't have it.<br />It is useful in other games for tracking Pokemon outside of the regional dex when using the Pokedex. +CodeTweaks.nationalDex.toolTipText=<html>If this is checked then the National Dex will be given to the player at the start of the game with the regular Pokedex.<br />This is only <i>necessary</i> for FRLG, where certain Pokemon can't evolve if you don't have it.<br />It is useful in other games for tracking Pokemon outside of the regional dex when using the Pokedex. CodeTweaks.nationalDex.name=Give National Dex at Start CodeTweaks.typeEffectiveness.toolTipText=<html>If this is checked, the type weakness/strengths/immunities will be updated to the current set.<br />For RBY, this means Ghost will be Super Effective against Psychic, among other changes. CodeTweaks.typeEffectiveness.name=Update Type Effectiveness diff --git a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java index 08ceafa..35cb5d2 100644 --- a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java +++ b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java @@ -1806,6 +1806,7 @@ public class NewRandomizerGUI { ptFollowMegaEvosCheckBox.setVisible(true); ptFollowMegaEvosCheckBox.setEnabled(false); ptFollowMegaEvosCheckBox.setSelected(false); + pokemonAbilitiesPanel.setVisible(true); paUnchangedRadioButton.setVisible(true); paUnchangedRadioButton.setEnabled(false); paUnchangedRadioButton.setSelected(false); |