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

Fixed script editor expanding functions even when there's no need to

Browse Source 
(UseScript_#X)
This commit is contained in:
AdAstra-LD
2021-02-05 16:55:29 +01:00
parent a7880588ff
commit da4d8a5d92
4 changed files with 96 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DS_Map/Main Window.cs
View File

@@ -5140,14 +5140,19 @@ namespace DSPRE {
i++; //Skip all empty lines
/* Read function commands */
List<ScriptCommand> cmdList = new List<ScriptCommand>();
if (functionTextBox.Lines[i].Contains("UseScript")) {
int scriptNumber = Int16.Parse(functionTextBox.Lines[i].Substring(1 + functionTextBox.Lines[i].IndexOf('#')));
scrFile.functions.Add(new Script(useScript: scriptNumber));
} else {
List<ScriptCommand> cmdList = new List<ScriptCommand>();
while (functionTextBox.Lines[i] != "End" && !functionTextBox.Lines[i].Contains("Return") && !functionTextBox.Lines[i].Contains("Jump F")) {
cmdList.Add(new ScriptCommand(functionTextBox.Lines[i]));
i++;
while (functionTextBox.Lines[i] != "End" && !functionTextBox.Lines[i].Contains("Return") && !functionTextBox.Lines[i].Contains("Jump F")) {
cmdList.Add(new ScriptCommand(functionTextBox.Lines[i]));
i++;
}
cmdList.Add(new ScriptCommand(functionTextBox.Lines[i])); // Add end command
scrFile.functions.Add(new Script(commandList: cmdList));
}
cmdList.Add(new ScriptCommand(functionTextBox.Lines[i])); // Add end command
scrFile.functions.Add(new Script(commandList: cmdList));
}
}
}
@@ -5332,7 +5337,7 @@ namespace DSPRE {
buffer += Environment.NewLine;
/* If current script is identical to another, print UseScript instead of commands */
if (currentScript.useScript == -1) {
if (currentScript.useScript < 0) {
for (int j = 0; j < currentScript.commands.Count; j++)
buffer += currentScript.commands[j].cmdName + Environment.NewLine;
} else {
@@ -5346,11 +5351,19 @@ namespace DSPRE {
for (int i = 0; i < currentScriptFile.functions.Count; i++) {
Script currentFunction = currentScriptFile.functions[i];
/* Write Heaader */
string funcHeader = "----- " + "@Function_#" + (i + 1) + " -----" + Environment.NewLine;
buffer += funcHeader;
buffer += Environment.NewLine;
for (int j = 0; j < currentFunction.commands.Count; j++)
buffer += currentFunction.commands[j].cmdName + Environment.NewLine;
/* If current function is identical to a script, print UseScript instead of commands */
if (currentFunction.useScript < 0) {
for (int j = 0; j < currentFunction.commands.Count; j++)
buffer += currentFunction.commands[j].cmdName + Environment.NewLine;
} else {
buffer += ("UseScript_#" + currentFunction.useScript + Environment.NewLine);
}
}
functionTextBox.AppendText(buffer + Environment.NewLine, Color.Blue);
buffer = "";

120
DS_Map/ROMFiles/ScriptFile.cs
View File

@@ -14,6 +14,8 @@ namespace DSPRE.ROMFiles {
public List<Script> functions = new List<Script>();
public List<Script> movements = new List<Script>();
public bool isLevelScript = new bool();
private readonly bool debug = true;
#endregion
#region<EFBFBD>Constructors<EFBFBD>(1)
@@ -54,11 +56,11 @@ namespace DSPRE.ROMFiles {
}
/* Read scripts */
for (int i = 0; i < scriptOffsets.Count; i++) {
int duplicateIndex = scriptOffsets.FindIndex(offset => offset == scriptOffsets[i]); // Check for UseScript_#
for (int current = 0; current < scriptOffsets.Count; current++) {
int index = scriptOffsets.FindIndex(x => x == scriptOffsets[current]); // Check for UseScript
if (duplicateIndex == i) {
scrReader.BaseStream.Position = scriptOffsets[i];
if (index == current) {
scrReader.BaseStream.Position = scriptOffsets[current];
List<ScriptCommand> commandsList = new List<ScriptCommand>();
bool endScript = new bool();
@@ -75,27 +77,31 @@ namespace DSPRE.ROMFiles {
}
scripts.Add(new Script(commandList: commandsList));
} else {
scripts.Add(new Script(useScript: duplicateIndex));
scripts.Add(new Script(useScript: index+1));
}
}
/* Read functions */
for (int i = 0; i < functionOffsets.Count; i++) {
scrReader.BaseStream.Position = functionOffsets[i];
int posInList = scriptOffsets.IndexOf(functionOffsets[i]); // Check for UseScript_#
List<ScriptCommand> cmdList = new List<ScriptCommand>();
bool endFunction = new bool();
while (!endFunction) {
ScriptCommand command = ReadCommand(scrReader, ref functionOffsets, ref movementOffsets);
if (command.parameterList == null)
return;
if (posInList == -1) {
List<ScriptCommand> cmdList = new List<ScriptCommand>();
bool endFunction = new bool();
while (!endFunction) {
ScriptCommand command = ReadCommand(scrReader, ref functionOffsets, ref movementOffsets);
if (command.parameterList == null)
return;
cmdList.Add(command);
if (endCodes.Contains(command.id))
endFunction = true;
cmdList.Add(command);
if (endCodes.Contains(command.id))
endFunction = true;
}
functions.Add(new Script(commandList: cmdList));
} else {
functions.Add(new Script(useScript: posInList+1));
}
this.functions.Add(new Script(commandList: cmdList));
}
/* Read movements */
@@ -416,7 +422,6 @@ namespace DSPRE.ROMFiles {
List<uint> movementOffsets = new List<uint>();
List<(int, int, bool)> references = new List<(int, int, bool)>(); // Format: [address, function/movement #, isApplyMovement]
int[] commandsWithRelativeJump = new int[] { 0x16, 0x1A, 0x1C, 0x1D, 0x5E };
/* Allocate enough space for script pointers, which we do not know yet */
writer.BaseStream.Position += scripts.Count * 0x4;
@@ -430,61 +435,51 @@ namespace DSPRE.ROMFiles {
for (int j = 0; j < scripts[i].commands.Count; j++) {
ushort commandID = scripts[i].commands[j].id;
writer.Write(commandID);
System.Diagnostics.Debug.Write(BitConverter.ToString(BitConverter.GetBytes(commandID)) + " ");
/* Get command parameters */
List<byte[]> parameterList = scripts[i].commands[j].parameterList;
for (int k = 0; k < parameterList.Count; k++)
for (int k = 0; k < parameterList.Count; k++) {
writer.Write(parameterList[k]);
Console.Write("\nCommand added: " + scripts[i].commands[j]);
System.Diagnostics.Debug.WriteLine(BitConverter.ToString(parameterList[k]) + " ");
}
/* If command calls a function/movement, store reference position */
if (commandsWithRelativeJump.Contains(commandID)) {
int positionOfJumpAddress;
if (commandID == 0x16 || commandID == 0x1A)
positionOfJumpAddress = 0; // Jump, Call
else
positionOfJumpAddress = 1;
int referenceID = BitConverter.ToInt32(parameterList[positionOfJumpAddress], 0) - 1;
references.Add(( (int)(writer.BaseStream.Position - 4), referenceID, commandID == 0x5E ));
}
AddReference(ref references, commandID, parameterList, (int)writer.BaseStream.Position);
}
} else {
scriptOffsets.Add(scriptOffsets[scripts[i].useScript]); // If script has UseScript, copy offset
scriptOffsets.Add(scriptOffsets[scripts[i].useScript - 1]); // If script has UseScript, copy offset
}
}
/* Write functions */
for (int i = 0; i < functions.Count; i++) {
functionOffsets.Add((uint)writer.BaseStream.Position);
if (functions[i].useScript == -1) {
functionOffsets.Add((uint)writer.BaseStream.Position);
for (int j = 0; j < functions[i].commands.Count; j++) {
ushort commandID = functions[i].commands[j].id;
writer.Write(commandID);
for (int j = 0; j < functions[i].commands.Count; j++) {
ushort commandID = functions[i].commands[j].id;
writer.Write(commandID);
System.Diagnostics.Debug.Write(BitConverter.ToString(BitConverter.GetBytes(commandID)) + " ");
/* Write command parameters */
List<byte[]> parameterList = functions[i].commands[j].parameterList;
for (int k = 0; k < parameterList.Count; k++)
writer.Write(parameterList[k]);
/* Write command parameters */
List<byte[]> parameterList = functions[i].commands[j].parameterList;
for (int k = 0; k < parameterList.Count; k++) {
writer.Write(parameterList[k]);
System.Diagnostics.Debug.Write(BitConverter.ToString(parameterList[k]) + " ");
}
/* If command calls a function/movement, store reference position */
if (commandsWithRelativeJump.Contains(commandID)) {
int index;
if (commandID == 0x16 || commandID == 0x1A)
index = 0;
else
index = 1;
int referenceID = BitConverter.ToInt32(parameterList[index], 0) - 1;
references.Add(((int)(writer.BaseStream.Position - 4), referenceID, commandID == 0x5E));
/* If command calls a function/movement, store reference position */
AddReference(ref references, commandID, parameterList, (int)writer.BaseStream.Position);
}
} else {
functionOffsets.Add(scriptOffsets[functions[i].useScript - 1]);
}
}
// Movements must be halfword-aligned
if (writer.BaseStream.Position % 2 == 1) { //Check if the writer's head is on an odd byte
writer.Write((byte)0); //Add padding
writer.Write((byte)0x00); //Add padding
}
/* Write movements */
@@ -493,8 +488,7 @@ namespace DSPRE.ROMFiles {
for (int j = 0; j < movements[i].commands.Count; j++) {
/* Write movement command id */
ushort id = movements[i].commands[j].id;
writer.Write(id);
writer.Write(movements[i].commands[j].id);
/* Write movement command parameters */
List<byte[]> parameterLists = movements[i].commands[j].parameterList;
@@ -512,17 +506,17 @@ namespace DSPRE.ROMFiles {
List<int> undeclaredFuncs = new List<int>();
List<int> undeclaredMovs = new List<int>();
for (int i = 0; i < references.Count; i++) {
writer.BaseStream.Position = references[i].Item1;
writer.BaseStream.Position = references[i].Item1; //go to parameter that must store the jump address
if (references[i].Item3 == true) { //isApplyMovement
try {
writer.Write((UInt32)(movementOffsets[references[i].Item2] - references[i].Item1 - 4));
writer.Write((uint)(movementOffsets[references[i].Item2 - 1] - references[i].Item1 - 4));
} catch (ArgumentOutOfRangeException) {
undeclaredMovs.Add(1 + references[i].Item2);
}
} else {
try {
writer.Write((UInt32)(functionOffsets[references[i].Item2] - references[i].Item1 - 4));
writer.Write((uint)(functionOffsets[references[i].Item2 - 1] - references[i].Item1 - 4)); //
} catch ( ArgumentOutOfRangeException) {
undeclaredFuncs.Add(1 + references[i].Item2);
}
@@ -543,6 +537,22 @@ namespace DSPRE.ROMFiles {
return newData.ToArray();
}
private void AddReference(ref List<(int, int, bool)> references, ushort commandID, List<byte[]> parameterList, int pos) {
try {
if (Resources.PokeDatabase.ScriptEditor.commandsWithRelativeJump[commandID] == true) {
byte[] parameterWithReferenceID;
if (commandID == 0x16 || commandID == 0x1A)
parameterWithReferenceID = parameterList[0]; // Jump, Call
else
parameterWithReferenceID = parameterList[1];
int referenceID = BitConverter.ToInt32(parameterWithReferenceID, 0);
references.Add((pos - 4, referenceID, commandID == 0x5E));
}
} catch (KeyNotFoundException) { }
}
private void SaveToFile(string path) {
using (BinaryWriter writer = new BinaryWriter(new FileStream(path, FileMode.Create)))
writer.Write(this.ToByteArray());

2
DS_Map/ROMToolboxDialog.cs
View File

@@ -473,7 +473,7 @@ namespace DSPRE {
}
#endregion
#region Utilities
private byte[] HexStringtoByteArray(string hexString) {
public static byte[] HexStringtoByteArray(string hexString) {
//FC B5 05 48 C0 46 41 21
//09 22 02 4D A8 47 00 20
//03 21 FC BD F1 64 00 02

8
DS_Map/Resources/PokeDatabase.cs
View File

@@ -668,6 +668,14 @@ namespace DSPRE.Resources {
[0xFF] = "TRUEUP"
};
public static Dictionary<ushort, bool> commandsWithRelativeJump = new Dictionary<ushort, bool>() {
[0x0016] = true,
[0x001A] = true,
[0x001C] = true,
[0x001D] = true,
[0x005E] = true
};
public static Dictionary<ushort, string> DPPtScrCmdNames = new Dictionary<ushort, string>() {
[0x0000] = "Nop",
[0x0001] = "Dummy",