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

Fixed unknown camera exception and save events button

Browse Source
This commit is contained in:
AdAstra-LD 2021-01-02 02:42:32 +01:00
parent bc56d30615
commit fdf440e885
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS_Map/Main Window.Designer.cs generated
View File

@ -2842,7 +2842,7 @@
//
// saveEventsButton
//
this.saveEventsButton.Enabled = false;
this.saveEventsButton.Enabled = true;
this.saveEventsButton.Location = new System.Drawing.Point(8, 31);
this.saveEventsButton.Name = "saveEventsButton";
this.saveEventsButton.Size = new System.Drawing.Size(117, 22);

54
DS_Map/Main Window.cs
View File

@ -1243,24 +1243,27 @@ namespace DSPRE {
if (disableHandlers) return;
string imageName;
switch (gameVersion)
{
case "Diamond":
case "Pearl":
currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
imageName = "dpcamera" + cameraComboBox.SelectedIndex.ToString();
break;
case "Platinum":
currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
imageName = "ptcamera" + cameraComboBox.SelectedIndex.ToString();
break;
default:
currentHeader.camera = Byte.Parse(cameraComboBox.SelectedItem.ToString().Substring(1, 3));
imageName = "hgsscamera" + currentHeader.camera.ToString("D3");
break;
try {
switch (gameVersion)
{
case "Diamond":
case "Pearl":
currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
imageName = "dpcamera" + cameraComboBox.SelectedIndex.ToString();
break;
case "Platinum":
currentHeader.camera = (byte)cameraComboBox.SelectedIndex;
imageName = "ptcamera" + cameraComboBox.SelectedIndex.ToString();
break;
default:
currentHeader.camera = Byte.Parse(cameraComboBox.SelectedItem.ToString().Substring(1, 3));
imageName = "hgsscamera" + currentHeader.camera.ToString("D3");
break;
}
cameraPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject(imageName);
} catch (NullReferenceException) {
MessageBox.Show("The current header uses an unrecognized camera.\nThis is not a problem. Settings will be saved normally.", "Unknown camera settings", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
cameraPictureBox.Image = (Image)Properties.Resources.ResourceManager.GetObject(imageName);
}
private void eventFileUpDown_ValueChanged(object sender, EventArgs e)
{
@ -1643,7 +1646,8 @@ namespace DSPRE {
}
private void headersGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
{
if (disableHandlers) return;
if (disableHandlers)
return;
if (e.RowIndex > -1 && e.ColumnIndex > -1)
{
/* If input is junk, use 0000 as placeholder value */
@ -1689,7 +1693,8 @@ namespace DSPRE {
}
private void heightsGridView_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
{
if (e.Value == null) return;
if (e.Value == null)
return;
disableHandlers = true;
/* Format table cells corresponding to border maps or void */
@ -3169,8 +3174,7 @@ namespace DSPRE {
if (eventMatrixXUpDown.Value > eventMatrix.width || eventMatrixYUpDown.Value > eventMatrix.height) {
String errorMsg = "This event file contains elements located on an unreachable map, beyond the current matrix.\n" +
"It is strongly advised that you bring every Overworld, Spawnable, Warp and Trigger of this event to a map that belongs to the matrix's range.";
DialogResult d;
d = MessageBox.Show(errorMsg, "Can't load proper map", MessageBoxButtons.OK, MessageBoxIcon.Warning);
MessageBox.Show(errorMsg, "Can't load proper map", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
else {
mapIndex = eventMatrix.maps[(int)(eventMatrixYUpDown.Value), (int)(eventMatrixXUpDown.Value)];
@ -4894,7 +4898,7 @@ namespace DSPRE {
private void addStringButton_Click(object sender, EventArgs e)
{
currentMessageFile.messages.Add("");
textEditorDataGridView.Rows.Add("");
textEditorDataGridView.Rows.Add(textEditorDataGridView.RowCount+1);
}
private void exportTextFileButton_Click(object sender, EventArgs e)
{
@ -5089,8 +5093,10 @@ namespace DSPRE {
}
private void textEditorDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
{
if (disableHandlers) return;
if (e.RowIndex > -1) currentMessageFile.messages[e.RowIndex] = textEditorDataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
if (disableHandlers)
return;
if (e.RowIndex > -1)
currentMessageFile.messages[e.RowIndex] = textEditorDataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
}
#endregion

2
DS_Map/Main Window.resx
View File

@ -416,7 +416,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
DwAAAk1TRnQBSQFMAgEBBwEAAQgBAgEIAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DwAAAk1TRnQBSQFMAgEBBwEAARABAgEQAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA