Restored HGSS action commands list

This commit is contained in:
AdAstra-LD
2021-10-03 18:55:48 +02:00
parent ee24bb5af1
commit fda9b97576
3 changed files with 9 additions and 5 deletions

View File

@@ -10286,7 +10286,7 @@
this.MainMenuStrip = this.menuStrip1;
this.MaximizeBox = false;
this.Name = "MainProgram";
this.Text = "DS Pokémon Rom Editor 1.3.2 (Nømura, AdAstra/LD3005)";
this.Text = "DS Pokémon Rom Editor 1.3.3 (Nømura, AdAstra/LD3005)";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainProgram_FormClosing);
this.mainTabControl.ResumeLayout(false);
this.headerEditorTabPage.ResumeLayout(false);

View File

@@ -479,7 +479,7 @@ namespace DSPRE {
Update();
}
private void aboutToolStripMenuItem_Click(object sender, EventArgs e) {
string message = "DS Pokémon ROM Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.3.2" + Environment.NewLine
string message = "DS Pokémon ROM Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.3.3" + Environment.NewLine
+ Environment.NewLine + "This tool was largely inspired by Markitus95's \"Spiky's DS Map Editor\" (SDSME), from which certain assets were also recycled. " +
"Credits go to Markitus, Ark, Zark, Florian, and everyone else who deserves credit for SDSME." + Environment.NewLine
+ Environment.NewLine + "Special thanks to Trifindo, Mikelan98, JackHack96, Pleonex and BagBoy."

View File

@@ -228,9 +228,13 @@ namespace DSPRE {
case gFamEnum.Plat:
return ScriptDatabase.movementsDictIDName;
default:
var commonDictionaryParams = ScriptDatabase.movementsDictIDName;
var customDictionaryParams = ScriptDatabase.customMovementsDictIDName;
return commonDictionaryParams.Concat(customDictionaryParams).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, g => g.First());
#if false
var commonDictionaryParams = ScriptDatabase.movementsDictIDName;
var customDictionaryParams = ScriptDatabase.customMovementsDictIDName;
return commonDictionaryParams.Concat(customDictionaryParams).ToLookup(x => x.Key, x => x.Value).ToDictionary(x => x.Key, g => g.First());
#else
return ScriptDatabase.movementsDictIDName;
#endif
}
}
public static Dictionary<ushort, string> BuildComparisonOperatorsDatabase(gFamEnum gameFam) {