Merge pull request #23 from SoujiSeta/master

Fixed issue in which Blue, Red and Yellow flute was removed from Medicine pouch in ORAS
This commit is contained in:
Kaphotics
2015-01-03 11:25:03 -08:00
2 changed files with 10 additions and 2 deletions

View File

@@ -80,7 +80,7 @@ class Legal
};
internal static readonly ushort[] Pouch_Items_ORAS = {
000,001,002,003,004,005,006,007,008,009,010,011,012,013,014,015,016,055,056,
057,058,059,060,061,062,063,064,065,066,067,068,069,070,071,072,073,074,075,
057,058,059,060,061,062,063,064,068,069,070,071,072,073,074,075,
076,077,078,079,080,081,082,083,084,085,086,087,088,089,090,091,092,093,094,
099,100,101,102,103,104,105,106,107,108,109,110,112,116,117,118,119,135,136,
213,214,215,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,
@@ -154,6 +154,14 @@ class Legal
034,035,036,037,038,039,040,041,042,043,044,045,046,047,048,049,050,051,
052,053,054,134,504,565,566,567,568,569,570,571,591,645,708,709,
};
internal static readonly ushort[] Pouch_Medicine_ORAS = {
000,017,018,019,020,021,022,023,024,025,026,027,028,029,030,031,032,033,
034,035,036,037,038,039,040,041,042,043,044,045,046,047,048,049,050,051,
052,053,054,134,504,565,566,567,568,569,570,571,591,645,708,709,
//ORAS
065,066,067
};
internal static readonly ushort[] Pouch_Berry_XY = {
0,149,150,151,152,153,154,155,156,157,158,159,160,161,162,
163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,

View File

@@ -93,7 +93,7 @@ private void getListTMHM()
}
private void getListMedicine()
{
ushort[] itemlist = Legal.Pouch_Medicine_XY;
ushort[] itemlist = (m_parent.savegame_oras) ? Legal.Pouch_Medicine_ORAS : Legal.Pouch_Medicine_XY;
medicine_val = new string[itemlist.Length];
for (int i = 0; i < itemlist.Length; i++)
medicine_val[i] = Form1.itemlist[itemlist[i]];