Leahnaya/DS-Pokemon-Rom-Editor
1
0
Fork 0
mirror of https://github.com/AdAstra-LD/DS-Pokemon-Rom-Editor.git synced 2026-05-12 06:54:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some bugs with the advanced search and script editor (Pt)

Browse Source 
also added some new commands/fixed names
This commit is contained in:
AdAstra-LD 2021-02-03 03:30:32 +01:00
parent 94a2d80e56
commit fd270f90f8
10 changed files with 125 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DS_Map/DS Map.csproj
View File

@ -178,9 +178,9 @@
<Compile Include="Header.cs" />
<Compile Include="RichTextBoxExt.cs" />
<Compile Include="Resources\MovementNames.Designer.cs" />
<Compile Include="Resources\ScriptNamesDP.Designer.cs" />
<Compile Include="Resources\ScriptNamesPt.Designer.cs" />
<Compile Include="Resources\ScriptNamesHGSS.Designer.cs" />
<Compile Include="Resources\ScriptParametersDP.Designer.cs" />
<Compile Include="Resources\ScriptParametersPt.Designer.cs" />
<Compile Include="Resources\ScriptParametersHGSS.Designer.cs" />
<Compile Include="ScriptFile.cs" />
<Compile Include="Matrix.cs" />
@ -311,11 +311,11 @@
</EmbeddedResource>
<EmbeddedResource Include="Resources\MovementNames.resx" />
<EmbeddedResource Include="Resources\ReadText.resx" />
<EmbeddedResource Include="Resources\ScriptNamesDP.resx">
<EmbeddedResource Include="Resources\ScriptNamesPt.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\ScriptNamesHGSS.resx" />
<EmbeddedResource Include="Resources\ScriptParametersDP.resx" />
<EmbeddedResource Include="Resources\ScriptParametersPt.resx" />
<EmbeddedResource Include="Resources\ScriptParametersHGSS.resx" />
<EmbeddedResource Include="Resources\writeText.resx" />
<EmbeddedResource Include="SPK.resx">

1
DS_Map/HeaderSearch.Designer.cs generated
View File

@ -78,6 +78,7 @@
this.value1TextBox.Name = "value1TextBox";
this.value1TextBox.Size = new System.Drawing.Size(190, 22);
this.value1TextBox.TabIndex = 9;
this.value1TextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.value1TextBox_KeyDown);
//
// startSearchButton
//

18
DS_Map/HeaderSearch.cs
View File

@ -89,22 +89,23 @@ namespace DSPRE {
switch (fieldToSearch) {
case "Internal Name":
for (short i = startID; i < finalID; i++) {
if (oper.Equals("Is Exactly"))
if (oper.Equals("Is Exactly")) {
if (intNames[i].Equals(valToSearch)) {
result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]);
}
if (oper.Equals("Is Not"))
} else if (oper.Equals("Is Not")) {
if (!intNames[i].Equals(valToSearch)) {
result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]);
}
if (oper.Equals("Contains"))
if (intNames[i].Contains(valToSearch)) {
} else if (oper.Equals("Contains")) {
if (intNames[i].IndexOf(valToSearch, StringComparison.InvariantCultureIgnoreCase) >= 0) {
result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]);
}
if (oper.Equals("Does not contain"))
if (!intNames[i].Contains(valToSearch)) {
} else if (oper.Equals("Does not contain")) {
if (intNames[i].IndexOf(valToSearch, StringComparison.InvariantCultureIgnoreCase) < 0) {
result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]);
}
}
}
break;
case "Music Day (Name)":
@ -196,6 +197,11 @@ namespace DSPRE {
}
Update();
}
private void value1TextBox_KeyDown(object sender, KeyEventArgs e) {
if (e.KeyCode == Keys.Enter) {
startSearchButton_Click(null, null);
}
}
private void headerSearchResetButton_Click(object sender, EventArgs e) {
HeaderSearchReset(headerListBox, intNames);
statusLabel.Text = "Ready";

98
DS_Map/Main Window.cs
View File

@ -888,7 +888,6 @@ namespace DSPRE {
//DeleteTempFolders();
RepackRom(saveRom.FileName);
if (RomInfo.gameVersion != "D" && RomInfo.gameVersion != "P" && RomInfo.gameVersion != "Plat")
if (eventEditorIsReady)
DSUtils.DecompressOverlay(1, true);
@ -2090,27 +2089,65 @@ namespace DSPRE {
mapFilesGridView.Columns.RemoveAt(currentMatrix.width - 1 - i);
} else {
/* Add columns */
headersGridView.Columns.Add(" ", (currentMatrix.width + i).ToString());
heightsGridView.Columns.Add(" ", (currentMatrix.width + i).ToString());
mapFilesGridView.Columns.Add(" ", (currentMatrix.width + i).ToString());
int index = currentMatrix.width + i;
headersGridView.Columns.Add(" ", (index).ToString());
heightsGridView.Columns.Add(" ", (index).ToString());
mapFilesGridView.Columns.Add(" ", (index).ToString());
/* Adjust column width */
headersGridView.Columns[currentMatrix.width + i].Width = 34;
heightsGridView.Columns[currentMatrix.width + i].Width = 22;
mapFilesGridView.Columns[currentMatrix.width + i].Width = 34;
headersGridView.Columns[index].Width = 34;
heightsGridView.Columns[index].Width = 22;
mapFilesGridView.Columns[index].Width = 34;
/* Fill new rows */
for (int j = 0; j < currentMatrix.height; j++) {
headersGridView.Rows[j].Cells[currentMatrix.width + i].Value = 0;
heightsGridView.Rows[j].Cells[currentMatrix.width + i].Value = 0;
mapFilesGridView.Rows[j].Cells[currentMatrix.width + i].Value = Matrix.EMPTY;
headersGridView.Rows[j].Cells[index].Value = 0;
heightsGridView.Rows[j].Cells[index].Value = 0;
mapFilesGridView.Rows[j].Cells[index].Value = Matrix.EMPTY;
}
}
}
/* Modify matrix object */
currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value);
disableHandlers = false;
}
private void heightUpDown_ValueChanged(object sender, EventArgs e) {
if (disableHandlers)
return;
disableHandlers = true;
/* Add or remove rows in DataGridView control */
int delta = (int)heightUpDown.Value - currentMatrix.height;
for (int i = 0; i < Math.Abs(delta); i++) {
if (delta < 0) // Remove rows
{
headersGridView.Rows.RemoveAt(currentMatrix.height - 1 - i);
heightsGridView.Rows.RemoveAt(currentMatrix.height - 1 - i);
mapFilesGridView.Rows.RemoveAt(currentMatrix.height - 1 - i);
} else {
/* Add row in DataGridView */
headersGridView.Rows.Add();
heightsGridView.Rows.Add();
mapFilesGridView.Rows.Add();
int index = currentMatrix.height + i;
headersGridView.Rows[index].HeaderCell.Value = (index).ToString();
heightsGridView.Rows[index].HeaderCell.Value = (index).ToString();
mapFilesGridView.Rows[index].HeaderCell.Value = (index).ToString();
/* Fill new rows */
for (int j = 0; j < currentMatrix.width; j++) {
headersGridView.Rows[index].Cells[j].Value = 0;
heightsGridView.Rows[index].Cells[j].Value = 0;
mapFilesGridView.Rows[index].Cells[j].Value = Matrix.EMPTY;
}
}
}
/* Modify matrix object */
currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value);
disableHandlers = false;
}
private void heightsGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) {
@ -2133,7 +2170,6 @@ namespace DSPRE {
e.Value = 0;
disableHandlers = false;
}
private void importMatrixButton_Click(object sender, EventArgs e) {
/* Prompt user to select .mtx file */
@ -2164,45 +2200,7 @@ namespace DSPRE {
widthUpDown.Value = currentMatrix.width;
heightUpDown.Value = currentMatrix.height;
disableHandlers = false;
}
private void heightUpDown_ValueChanged(object sender, EventArgs e) {
if (disableHandlers)
return;
disableHandlers = true;
/* Add or remove rows in DataGridView control */
int delta = (int)heightUpDown.Value - currentMatrix.height;
for (int i = 0; i < Math.Abs(delta); i++) {
if (delta < 0) // Remove rows
{
headersGridView.Rows.RemoveAt(currentMatrix.height - 1 - i);
heightsGridView.Rows.RemoveAt(currentMatrix.height - 1 - i);
mapFilesGridView.Rows.RemoveAt(currentMatrix.height - 1 - i);
} else {
/* Add row in DataGridView */
headersGridView.Rows.Add();
heightsGridView.Rows.Add();
mapFilesGridView.Rows.Add();
/* Add row header */
headersGridView.Rows[currentMatrix.height + i].HeaderCell.Value = (currentMatrix.height + i + 1).ToString();
heightsGridView.Rows[currentMatrix.height + i].HeaderCell.Value = (currentMatrix.height + i + 1).ToString();
mapFilesGridView.Rows[currentMatrix.height + i].HeaderCell.Value = (currentMatrix.height + i + 1).ToString();
/* Fill new rows */
for (int j = 0; j < currentMatrix.width; j++) {
headersGridView.Rows[currentMatrix.height + i].Cells[j].Value = 0;
heightsGridView.Rows[currentMatrix.height + i].Cells[j].Value = 0;
mapFilesGridView.Rows[currentMatrix.height + i].Cells[j].Value = Matrix.EMPTY;
}
}
}
/* Modify matrix object */
currentMatrix.ResizeMatrix((int)heightUpDown.Value, (int)widthUpDown.Value);
disableHandlers = false;
}
}
private void mapFilesGridView_CellMouseDoubleClick(object sender, DataGridViewCellEventArgs e) {
if (!mapEditorIsReady) {
SetupMapEditor();

29
DS_Map/Resources/ScriptNamesHGSS.resx
View File

@ -424,10 +424,10 @@
<value>GivePokemonNickname</value>
</data>
<data name="00AE" xml:space="preserve">
<value>FadeScreen</value>
<value>SetFadeScreen</value>
</data>
<data name="00AF" xml:space="preserve">
<value>ResetScreen</value>
<value>WaitFadeScreen</value>
</data>
<data name="00B0" xml:space="preserve">
<value>Warp</value>
@ -438,6 +438,9 @@
<data name="00B3" xml:space="preserve">
<value>WFC1</value>
</data>
<data name="00BA" xml:space="preserve">
<value>CyclingRoadMode</value>
</data>
<data name="00BE" xml:space="preserve">
<value>SetVariableHero</value>
</data>
@ -523,19 +526,19 @@
<value>DisableBadge</value>
</data>
<data name="0133" xml:space="preserve">
<value>PrepareDoorAnimation</value>
<value>DoorAnimation</value>
</data>
<data name="0134" xml:space="preserve">
<value>CloseDoor</value>
<value>WaitDoor</value>
</data>
<data name="0135" xml:space="preserve">
<value>MoveDoor</value>
<value>FreeDoor</value>
</data>
<data name="0136" xml:space="preserve">
<value>OpenDoor</value>
</data>
<data name="0137" xml:space="preserve">
<value>WaitDoor</value>
<value>CloseDoor</value>
</data>
<data name="0141" xml:space="preserve">
<value>VermillionGymAnimation</value>
@ -550,7 +553,7 @@
<value>AzaleaGym2</value>
</data>
<data name="014C" xml:space="preserve">
<value>CheckPartyNumber</value>
<value>GetPartyCount</value>
</data>
<data name="0153" xml:space="preserve">
<value>SetOverworldPosition</value>
@ -573,12 +576,21 @@
<data name="0170" xml:space="preserve">
<value>CheckHiroMoneyNumber</value>
</data>
<data name="0176" xml:space="preserve">
<value>OverworldUnvanish</value>
</data>
<data name="0177" xml:space="preserve">
<value>OverworldVanish</value>
</data>
<data name="0178" xml:space="preserve">
<value>OpenMail</value>
</data>
<data name="0179" xml:space="preserve">
<value>CheckMail</value>
</data>
<data name="0182" xml:space="preserve">
<value>GetPlayerDirection</value>
</data>
<data name="0188" xml:space="preserve">
<value>ComparePokemonHeight</value>
</data>
@ -600,6 +612,9 @@
<data name="018F" xml:space="preserve">
<value>SetVariableMoveDelete</value>
</data>
<data name="0190" xml:space="preserve">
<value>Strength</value>
</data>
<data name="0194" xml:space="preserve">
<value>GiveItemStored</value>
</data>

0
DS_Map/Resources/ScriptNamesDP.Designer.cs → DS_Map/Resources/ScriptNamesPt.Designer.cs generated
View File

47
DS_Map/Resources/ScriptNamesDP.resx → DS_Map/Resources/ScriptNamesPt.resx
View File

@ -187,7 +187,7 @@
<value>Message</value>
</data>
<data name="002D" xml:space="preserve">
<value>Message2</value>
<value>MessageSp</value>
</data>
<data name="002F" xml:space="preserve">
<value>Message3</value>
@ -367,13 +367,22 @@
<value>TakeCoins</value>
</data>
<data name="007B" xml:space="preserve">
<value>TakeItem</value>
<value>GiveItem</value>
</data>
<data name="007C" xml:space="preserve">
<value>CheckStoreItem</value>
<value>TakeItem</value>
</data>
<data name="007D" xml:space="preserve">
<value>CheckItem</value>
<value>GiveItemPrecheck</value>
</data>
<data name="007E" xml:space="preserve">
<value>CheckPlayerHasItem</value>
</data>
<data name="007F" xml:space="preserve">
<value>CheckItemIsMachine</value>
</data>
<data name="0080" xml:space="preserve">
<value>GetItemPocket</value>
</data>
<data name="0085" xml:space="preserve">
<value>CheckUndergroundPcStatus</value>
@ -399,6 +408,15 @@
<data name="009A" xml:space="preserve">
<value>CheckPlaceStored</value>
</data>
<data name="009C" xml:space="preserve">
<value>SetWeather</value>
</data>
<data name="009D" xml:space="preserve">
<value>InitWeather</value>
</data>
<data name="009E" xml:space="preserve">
<value>UpdateWeather</value>
</data>
<data name="00A1" xml:space="preserve">
<value>CallEnd</value>
</data>
@ -457,10 +475,10 @@
<value>ChoosePokémonName</value>
</data>
<data name="00BC" xml:space="preserve">
<value>FadeScreen</value>
<value>SetFadeScreen</value>
</data>
<data name="00BD" xml:space="preserve">
<value>ResetScreen</value>
<value>WaitFadeScreen</value>
</data>
<data name="00BE" xml:space="preserve">
<value>Warp</value>
@ -655,22 +673,22 @@
<value>DisableBadge</value>
</data>
<data name="0168" xml:space="preserve">
<value>PrepareDoorAnimation</value>
<value>DoorAnimation</value>
</data>
<data name="0169" xml:space="preserve">
<value>DoorWait</value>
<value>WaitDoor</value>
</data>
<data name="016A" xml:space="preserve">
<value>DoorFree</value>
<value>FreeDoor</value>
</data>
<data name="016B" xml:space="preserve">
<value>DoorOpen</value>
<value>OpenDoor</value>
</data>
<data name="016C" xml:space="preserve">
<value>DoorOpen</value>
<value>CloseDoor</value>
</data>
<data name="0177" xml:space="preserve">
<value>PartyCountCheck</value>
<value>GetPartyCount</value>
</data>
<data name="0178" xml:space="preserve">
<value>OpenBerryPouch</value>
@ -724,7 +742,7 @@
<value>RecordList</value>
</data>
<data name="01B9" xml:space="preserve">
<value>CheckHappiness</value>
<value>GetPokemonHappiness</value>
</data>
<data name="01BD" xml:space="preserve">
<value>CheckPosition</value>
@ -750,6 +768,9 @@
<data name="01C7" xml:space="preserve">
<value>StoreMove</value>
</data>
<data name="01C8" xml:space="preserve">
<value>CheckMoveCount</value>
</data>
<data name="01C9" xml:space="preserve">
<value>DeleteMove</value>
</data>

0
DS_Map/Resources/ScriptParametersDP.Designer.cs → DS_Map/Resources/ScriptParametersPt.Designer.cs generated
View File

4
DS_Map/Resources/ScriptParametersDP.resx → DS_Map/Resources/ScriptParametersPt.resx
View File

@ -973,7 +973,7 @@
<value>1 2</value>
</data>
<data name="011D" xml:space="preserve">
<value>2 2 2</value>
<value>4 1 1 2 2</value>
</data>
<data name="011E" xml:space="preserve">
<value>1 2</value>
@ -2635,6 +2635,6 @@
<value>1 1</value>
</data>
<data name="0347" xml:space="preserve">
<value>1 2</value>
<value>2 1 1</value>
</data>
</root>

4
DS_Map/RomInfo.cs
View File

@ -275,8 +275,8 @@ namespace DSPRE {
case "D":
case "P":
case "Plat":
scriptCommandNamesDatabase = new ResourceManager("DSPRE.Resources.ScriptNamesDP", Assembly.GetExecutingAssembly());
scriptParametersDatabase = new ResourceManager("DSPRE.Resources.ScriptParametersDP", Assembly.GetExecutingAssembly());
scriptCommandNamesDatabase = new ResourceManager("DSPRE.Resources.ScriptNamesPt", Assembly.GetExecutingAssembly());
scriptParametersDatabase = new ResourceManager("DSPRE.Resources.ScriptParametersPt", Assembly.GetExecutingAssembly());
break;
default:
scriptCommandNamesDatabase = new ResourceManager("DSPRE.Resources.ScriptNamesHGSS", Assembly.GetExecutingAssembly());