diff --git a/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs b/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs
index aa9b34aa..5ed58ebc 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs
+++ b/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs
@@ -47,7 +47,7 @@ namespace PckStudio.Forms.Editor
this.bulkReplaceExistingTracksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToAddSongsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.whatIsEachCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.whatAreTheCategoriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToEditCreditsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optimizeDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bINKACompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -181,7 +181,7 @@ namespace PckStudio.Forms.Editor
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.howToAddSongsToolStripMenuItem,
- this.whatIsEachCategoryToolStripMenuItem,
+ this.whatAreTheCategoriesToolStripMenuItem,
this.howToEditCreditsToolStripMenuItem,
this.optimizeDataFolderToolStripMenuItem,
this.bINKACompressionToolStripMenuItem});
@@ -195,11 +195,11 @@ namespace PckStudio.Forms.Editor
resources.ApplyResources(this.howToAddSongsToolStripMenuItem, "howToAddSongsToolStripMenuItem");
this.howToAddSongsToolStripMenuItem.Click += new System.EventHandler(this.howToAddSongsToolStripMenuItem_Click);
//
- // whatIsEachCategoryToolStripMenuItem
+ // whatAreTheCategoriesToolStripMenuItem
//
- this.whatIsEachCategoryToolStripMenuItem.Name = "whatIsEachCategoryToolStripMenuItem";
- resources.ApplyResources(this.whatIsEachCategoryToolStripMenuItem, "whatIsEachCategoryToolStripMenuItem");
- this.whatIsEachCategoryToolStripMenuItem.Click += new System.EventHandler(this.whatIsEachCategoryToolStripMenuItem_Click);
+ this.whatAreTheCategoriesToolStripMenuItem.Name = "whatAreTheCategoriesToolStripMenuItem";
+ resources.ApplyResources(this.whatAreTheCategoriesToolStripMenuItem, "whatAreTheCategoriesToolStripMenuItem");
+ this.whatAreTheCategoriesToolStripMenuItem.Click += new System.EventHandler(this.whatAreTheCategoriesToolStripMenuItem_Click);
//
// howToEditCreditsToolStripMenuItem
//
@@ -343,7 +343,7 @@ namespace PckStudio.Forms.Editor
private MetroFramework.Controls.MetroCheckBox playOverworldInCreative;
private System.Windows.Forms.ToolStripMenuItem deleteUnusedBINKAsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem howToAddSongsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem whatIsEachCategoryToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem whatAreTheCategoriesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem howToEditCreditsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optimizeDataFolderToolStripMenuItem;
private System.Windows.Forms.NumericUpDown compressionUpDown;
diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs
index c87d57b3..d651577a 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.cs
+++ b/PCK-Studio/Forms/Editor/AudioEditor.cs
@@ -445,20 +445,20 @@ namespace PckStudio.Forms.Editor
MessageBox.Show("Right click the right window and press \"Add Entry\" or drag and drop a valid WAV file into the editor's right window. You can also drop other BINKA files, either from the main game or using a tool like BinkMan. The editor will automatically put the song in the Data folder for you.", "How to add a song");
}
- private void whatIsEachCategoryToolStripMenuItem_Click(object sender, EventArgs e)
+ private void whatAreTheCategoriesToolStripMenuItem_Click(object sender, EventArgs e)
{
MessageBox.Show("Categories are pretty self explanatory. The game controls when each category should play.\n" +
"\nGAMEPLAY - Plays in the specified dimensions and game modes.\n" +
"-Overworld: Plays in survival mode and in Creative if no songs are set\n" +
- "-Nether: Nothing special to note.\n" +
- "-End: Prioritizes the final track when the dragon is alive.\n" +
+ "-Nether: Plays in the Nether.\n" +
+ "-End: Plays in the End. Prioritizes the final track when the dragon is alive.\n" +
"-Creative: Does not play survival tracks unless they're included.\n" +
"-Menu: Plays on the title screen and only once when the pack is loading. Perfect for intro songs.\n" +
"\nMINI GAMES - Will only play if you change the map grf files to load your pack and set the ThemeID to 0 for Vanilla maps.\n" +
"-Battle: Plays in the Battle Mini Game.\n" +
"-Tumble: Plays in the Tumble Mini Game.\n" +
"-Glide: Plays in the Glide Mini Game.\n",
- "What is each category?");
+ "What are the categories?");
}
private void howToEditCreditsToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/PCK-Studio/Forms/Editor/AudioEditor.resx b/PCK-Studio/Forms/Editor/AudioEditor.resx
index f2b9e874..0f797f69 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.resx
+++ b/PCK-Studio/Forms/Editor/AudioEditor.resx
@@ -125,6 +125,32 @@
127, 8
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
+ DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
+ jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
+
+
+
+ 168, 22
+
+
+ Add Category
+
+
+ 168, 22
+
+
+ Remove Category
+
+
+ 168, 22
+
+
+ Set Category
+
169, 70
@@ -146,7 +172,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADk
- MAAAAk1TRnQBSQFMAgEBCQEAAYgBAAGIAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ MAAAAk1TRnQBSQFMAgEBCQEAAZgBAAGYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABMAMAAQEBAAEgBgABMBIAAzgB/wM1Af8DNQH/AzMB/wMwAf8DLwH/Ay0B/wMtAf8DJAH/AzsB/wM4
Af8DNQH/Ay0B/wMnAf8DNgH/AzIB/8AAAzgB/wN/Af8DeQH/A3kB/wN5Af8DcQH/A3EB/wN5Af8DeQH/
A3EB/wNxAf8DcQH/A3kB/wN5Af8DfwH/AzIB/8AAAzIB/wN2Af8DsAH/A7AB/wOvAf8DrwH/A68B/wOo
@@ -384,68 +410,12 @@
5
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
- DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
- jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
-
-
-
- 168, 22
-
-
- Add Category
-
-
- 168, 22
-
-
- Remove Category
-
-
- 168, 22
-
-
- Set Category
-
19, 8
False
-
- 20, 60
-
-
- 410, 24
-
-
- 11
-
-
- menuStrip1
-
-
- menuStrip
-
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 7
-
-
- 37, 20
-
-
- File
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -457,16 +427,16 @@
- 180, 22
+ 98, 22
Save
-
- 46, 20
+
+ 37, 20
-
- Tools
+
+ File
220, 22
@@ -492,11 +462,11 @@
Bulk Replace Existing Tracks
-
- 44, 20
+
+ 46, 20
-
- Help
+
+ Tools
243, 22
@@ -504,11 +474,11 @@
How to add songs
-
+
243, 22
-
- What is each category?
+
+ What are the categories?
243, 22
@@ -528,6 +498,36 @@
BINKA Compression
+
+ 44, 20
+
+
+ Help
+
+
+ 20, 60
+
+
+ 410, 24
+
+
+ 11
+
+
+ menuStrip1
+
+
+ menuStrip
+
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 7
+
Top, Bottom, Left, Right
@@ -677,6 +677,9 @@
450, 330
+
+ 450, 330
+
450, 330
@@ -761,10 +764,10 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- whatIsEachCategoryToolStripMenuItem
+
+ whatAreTheCategoriesToolStripMenuItem
-
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089