Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-11 15:07:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fixes

Browse source
This commit is contained in:
Kurt 2014-11-27 20:47:50 -08:00
parent beba97e62d
commit 972a518367
46 changed files with 65 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKX/f1-Main.cs
View file

@ -3989,7 +3989,8 @@ namespace PKHeX
};
for (int i = 0; i < cba.Length; i++)
{
if (cba[i].BackColor != System.Drawing.SystemColors.Control && cba[i].BackColor != Color.Empty)
int back = cba[i].BackColor.ToArgb();
if (back != System.Drawing.SystemColors.Control.ToArgb() && back != 0 && back != -1)
{
if (i < 6) // Main Tab
tabMain.SelectedIndex = 0;

25
PKX/f3-MemoryAmie.cs
View file

@ -505,9 +505,10 @@ namespace PKHeX
private void getLangStrings()
{
// Memory Chooser
string[] memories = new string[64];
int[] allowed = new int[64];
for (int i = 0; i < 64; i++)
int memorycount = Form1.memories.Length - 39;
string[] memories = new string[memorycount];
int[] allowed = new int[memorycount];
for (int i = 0; i < memorycount; i++)
{
memories[i] = Form1.memories[39 + i];
allowed[i] = i+1;
@ -551,11 +552,11 @@ namespace PKHeX
#region General Locations
// add general locations
int[] allowed = { };
allowed = new int[62];
for (int i = 0; i < 62; i++)
{
allowed[i] = i;
}
allowed = new int[Form1.genloc.Length];
for (int i = 0; i < Form1.genloc.Length; i++)
allowed[i] = i; // Allow everything.
List<cbItem> genloc = getComboBoxItems(Form1.genloc, allowed);
#endregion
#region Items
@ -583,8 +584,10 @@ namespace PKHeX
// Met Locations for Pokecenters healing
allowed = new int[] {
2,6,8,10,12,14,16,17,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,166,168,
};
2,6,8,10,12,14,16,17,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,166,168,
// ORAS
170,172,174,176,178,180,182,184,186,188,190,192,194,196,198,200,202,204,206,208,210,212,214,216,218,220,222,224,226,228,230,232,234,236,238,240,242,244,246,248,250,252,254,256,258,260,262,264,266,268,270,272,274,276,278,280,282,284,286,288,290,292,294,296,298,300,302,304,306,308,310,312,314,316,318,320,322,324,326,328,330,332,334,336,338,340,342,344,346,348,350,352,354,
}; // Be sure the legal list matches the one in the main form for Location Selection
List<cbItem> locationXY = getComboBoxItems(Form1.metXY_00000, allowed);
#region Moves
@ -803,7 +806,7 @@ namespace PKHeX
case 62: getMemoryArguments("NONE", m); break;
case 63: getMemoryArguments("NONE", m); break;
case 64: getMemoryArguments("NONE", m); break;
default: m.SelectedIndex = 0; break;
default: getMemoryArguments("NONE", m); break;
};
}

5
Resources/text/changelog.txt
View file

@ -349,4 +349,7 @@ http://projectpokemon.org/forums/showthread.php?36986
- Added: Basic ORAS Support
11/22/14 - New Update:
- Improved ORAS support
- Improved ORAS support
11/26/14 - New Update
- Improved ORAS support with more features.

2
Resources/text/de/text_ItemPouch_de.txt
View file

@ -2,4 +2,4 @@ Items
Medizin
TM & VM
Beeren
Basis-Items
Basis-Items

2
Resources/text/de/text_Puff_de.txt
View file

@ -23,4 +23,4 @@ Ehrungsdeko-Pofflé
Frühlingsdeko-Pofflé
Sommerdeko-Pofflé
Herbstdeko-Pofflé
Winterdeko-Pofflé
Winterdeko-Pofflé

2
Resources/text/de/text_TrainingBag_de.txt
View file

@ -24,4 +24,4 @@ Expander-Sack
Dopplungs-Sack
Flare-Sack
Tabula Ra-Sack
Relax-Sack
Relax-Sack

2
Resources/text/de/text_xy_00000_de.txt
View file

@ -352,4 +352,4 @@ Geheime Küste
Geheime Blumenwiese
Geheimbasis
Geheimbasis

2
Resources/text/de/text_xy_30000_de.txt
View file

@ -8,4 +8,4 @@ Entferntes Land
－－－－－－－－－－
Einall-Region
Kalos-Region
Pokémon-Link
Pokémon-Link

2
Resources/text/de/text_xy_40000_de.txt
View file

@ -76,4 +76,4 @@ VGC 2014
VGC 2015
VGC 2016
VGC 2017
VGC 2018
VGC 2018

2
Resources/text/en/text_ItemPouch_en.txt
View file

@ -2,4 +2,4 @@ ITEMS
MEDICINE
TMs & HMs
BERRIES
KEY ITEMS
KEY ITEMS

2
Resources/text/en/text_Puff_en.txt
View file

@ -23,4 +23,4 @@ Supreme Honor Poké Puff
Supreme Spring Poké Puff
Supreme Summer Poké Puff
Supreme Autumn Poké Puff
Supreme Winter Poké Puff
Supreme Winter Poké Puff

2
Resources/text/en/text_TrainingBag_en.txt
View file

@ -24,4 +24,4 @@ Big-Shot Bag
Double-Up Bag
Team Flare Bag
Reset Bag
Soothing Bag
Soothing Bag

2
Resources/text/en/text_xy_00000_en.txt
View file

@ -352,4 +352,4 @@ Secret Shore
Secret Meadow
Secret Base
Secret Base

2
Resources/text/en/text_xy_30000_en.txt
View file

@ -8,4 +8,4 @@ a distant land
----------
the Unova region
the Kalos region
Pokémon Link
Pokémon Link

2
Resources/text/en/text_xy_40000_en.txt
View file

@ -76,4 +76,4 @@ the VGC 2014
the VGC 2015
the VGC 2016
the VGC 2017
the VGC 2018
the VGC 2018

2
Resources/text/es/text_ItemPouch_es.txt
View file

@ -2,4 +2,4 @@ Objetos
Botiquín
MT/MO
Bayas
Objetos Clave
Objetos Clave

2
Resources/text/es/text_Puff_es.txt
View file

@ -23,4 +23,4 @@ Pokélito de Celebración
Pokélito Primaveral
Pokélito Estival
Pokélito Otoñal
Pokélito Invernal
Pokélito Invernal

2
Resources/text/es/text_TrainingBag_es.txt
View file

@ -24,4 +24,4 @@ Saco Tamaño ↑
Saco Mejora x2
Saco Team Flare
Saco Reinicio
Saco Relax
Saco Relax

2
Resources/text/es/text_xy_00000_es.txt
View file

@ -352,4 +352,4 @@ Costa Secreta
Prado Secreto
Base Secreta
Base Secreta

2
Resources/text/es/text_xy_30000_es.txt
View file

@ -8,4 +8,4 @@ Tierra lejana
－－－－－－－－－－
Teselia
Kalos
Nexo Pokémon
Nexo Pokémon

2
Resources/text/es/text_xy_40000_es.txt
View file

@ -76,4 +76,4 @@ Camp. de Videojuegos 2014
Camp. de Videojuegos 2015
Camp. de Videojuegos 2016
Camp. de Videojuegos 2017
Camp. de Videojuegos 2018
Camp. de Videojuegos 2018

2
Resources/text/fr/text_ItemPouch_fr.txt
View file

@ -2,4 +2,4 @@ OBJETS
PV/PP
CT & CS
BAIES
OBJETS RARES
OBJETS RARES

2
Resources/text/fr/text_Puff_fr.txt
View file

@ -23,4 +23,4 @@ Pofiterole Célébration
Pofiterole Printemps
Pofiterole Été
Pofiterole Automne
Pofiterole Hiver
Pofiterole Hiver

2
Resources/text/fr/text_TrainingBag_fr.txt
View file

@ -24,4 +24,4 @@ Sac Taille↑
Sac Gain↑
Sac Team Flare
Sac Renouveau
Sac Relax
Sac Relax

2
Resources/text/fr/text_xy_00000_fr.txt
View file

@ -352,4 +352,4 @@ Plage Secrète
Champ Fleuri Secret
Base Secrète
Base Secrète

2
Resources/text/fr/text_xy_30000_fr.txt
View file

@ -8,4 +8,4 @@ Pays lointain
－－－－－－－－－－
Unys
Kalos
Poké Lien
Poké Lien

2
Resources/text/fr/text_xy_40000_fr.txt
View file

@ -76,4 +76,4 @@ Championnat de JV 2014
Championnat de JV 2015
Championnat de JV 2016
Championnat de JV 2017
Championnat de JV 2018
Championnat de JV 2018

2
Resources/text/it/text_ItemPouch_it.txt
View file

@ -2,4 +2,4 @@ Strumenti
Rimedi
MT e MN
Bacche
Strumenti Base
Strumenti Base

2
Resources/text/it/text_Puff_it.txt
View file

@ -23,4 +23,4 @@ Pokébignè celebrativo
Pokébignè primavera
Pokébignè estate
Pokébignè autunno
Pokébignè inverno
Pokébignè inverno

2
Resources/text/it/text_TrainingBag_it.txt
View file

@ -24,4 +24,4 @@ Sacco Calibro↑
Sacco Raddoppio
Sacco Team Flare
Sacco Ripristino
Sacco Relax
Sacco Relax

2
Resources/text/it/text_xy_00000_it.txt
View file

@ -352,4 +352,4 @@ Baia Segreta
Valle Segreta
Base Segreta
Base Segreta

2
Resources/text/it/text_xy_30000_it.txt
View file

@ -8,4 +8,4 @@ Terra Lontana
----------
Unima
Kalos
Pokémon Link
Pokémon Link

2
Resources/text/it/text_xy_40000_it.txt
View file

@ -76,4 +76,4 @@ Campionati 2014
Campionati 2015
Campionati 2016
Campionati 2017
Campionati 2018
Campionati 2018

2
Resources/text/ja/text_ItemPouch_ja.txt
View file

@ -2,4 +2,4 @@
かいふく
わざマシン
きのみ
たいせつなもの
たいせつなもの

2
Resources/text/ja/text_Puff_ja.txt
View file

@ -23,4 +23,4 @@
フルデコはるポフレ
フルデコなつポフレ
フルデコあきポフレ
フルデコふゆポフレ
フルデコふゆポフレ

2
Resources/text/ja/text_TrainingBag_ja.txt
View file

@ -24,4 +24,4 @@ HPバッグL
ダブルUPバッグ
フレアだんバッグ
まっさらバッグ
リラックスバッグ
リラックスバッグ

2
Resources/text/ja/text_xy_00000_ja.txt
View file

@ -352,4 +352,4 @@
ひみつのはなばたけ
ひみつきち
ひみつきち

2
Resources/text/ja/text_xy_30000_ja.txt
View file

@ -8,4 +8,4 @@
－－－－－－－－－－
イッシュちほう
カロスちほう
ポケモンリンク
ポケモンリンク

2
Resources/text/ja/text_xy_40000_ja.txt
View file

@ -76,4 +76,4 @@ VGC２０１４
VGC２０１５
VGC２０１６
VGC２０１７
VGC２０１８
VGC２０１８

2
Resources/text/ko/text_ItemPouch_ko.txt
View file

@ -2,4 +2,4 @@
회복
기술머신
나무열매
중요한 물건
중요한 물건

2
Resources/text/ko/text_Puff_ko.txt
View file

@ -23,4 +23,4 @@
풀데코봄포플레
풀데코여름포플레
풀데코가을포플레
풀데코겨울포플레
풀데코겨울포플레

2
Resources/text/ko/text_TrainingBag_ko.txt
View file

@ -24,4 +24,4 @@ HP백L
더블UP백
플레어단백
신품백
릴랙스백
릴랙스백

2
Resources/text/ko/text_xy_00000_ko.txt
View file

@ -352,4 +352,4 @@
비밀의 꽃밭
비밀기지
비밀기지

2
Resources/text/ko/text_xy_30000_ko.txt
View file

@ -8,4 +8,4 @@
－－－－－－－－－－
하나지방
칼로스지방
포켓몬링크
포켓몬링크

2
Resources/text/ko/text_xy_40000_ko.txt
View file

@ -76,4 +76,4 @@ VGC2014
VGC2015
VGC2016
VGC2017
VGC2018
VGC2018

6
SAV/SAV_Pokepuff.cs
View file

@ -90,12 +90,12 @@ namespace PKHeX
}
private void B_All_Click(object sender, EventArgs e)
{
int basepuff = 21;
int basepuff = 20;
int basemod = 6;
if (ModifierKeys == Keys.Control)
{
basepuff = 16;
basemod = 5;
basepuff = 1;
basemod = 0x19;
}
byte[] newpuffs = new Byte[100];
for (int i = 0; i < 100; i++)