Skip to content

Commit

Permalink
Made changes to account for new file structure of the original snesre…
Browse files Browse the repository at this point in the history
…v repository.
  • Loading branch information
RadzPrower committed Aug 17, 2023
1 parent 5bcb62b commit e1d4f86
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
18 changes: 9 additions & 9 deletions Zelda 3 Launcher/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void build_Click(object sender, EventArgs e)
}
}

if (!File.Exists(Path.Combine(Program.repoDir, "tables", "zelda3.sfc")))
if (!File.Exists(Path.Combine(Program.repoDir, "zelda3.sfc")))
{
MessageBox.Show("No ROM provided. Process cancelled.", "No ROM", MessageBoxButtons.OK, MessageBoxIcon.Information);
UpdateMainForm();
Expand Down Expand Up @@ -113,9 +113,9 @@ private void build_Click(object sender, EventArgs e)
progressCompile.Visible = true;
labelCompileStatus.Visible = true;

var pythonEXE = @".\tables\python.exe";
var python311 = @".\zelda3\tables\python311._pth";
var python311Old = @".\zelda3\tables\python311._pth.old";
var pythonEXE = @".\assets\python.exe";
var python311 = @".\zelda3\assets\python311._pth";
var python311Old = @".\zelda3\assets\python311._pth.old";

File.AppendAllText(Program.currentDirectory + "\\zelda3.log", "Starting commandline processess...");

Expand All @@ -134,7 +134,7 @@ private void build_Click(object sender, EventArgs e)

// Download pip
labelCompileStatus.Text = "Downloading pip...";
if (runProcess("cmd.exe", "/C " + pythonEXE + @" .\tables\get-pip.py"))
if (runProcess("cmd.exe", "/C " + pythonEXE + @" .\assets\get-pip.py"))
{
MessageBox.Show("Error occurred while downloding pip.\n\nPlease refer to " + Path.Combine(Program.currentDirectory, "zelda3.log") + " for further details.");
return;
Expand All @@ -149,7 +149,7 @@ private void build_Click(object sender, EventArgs e)
}

labelCompileStatus.Text = "Extracting assets...";
if (runProcess("cmd.exe", @"/C cd .\tables && python restool.py --extract-from-rom"))
if (runProcess("cmd.exe", @"/C cd .\assets && python restool.py --extract-from-rom"))
{
MessageBox.Show("Error occurred while extracting resources.\n\nPlease refer to " + Path.Combine(Program.currentDirectory, "zelda3.log") + " for further details.");
return;
Expand All @@ -163,9 +163,9 @@ private void build_Click(object sender, EventArgs e)
{
foreach (var line in File.ReadLines(batOld))
{
if (line == "pause") ;
else if (line == "echo Running...") ;
else if (line == "zelda3.exe") ;
if (line == "pause");
else if (line == "echo Running...");
else if (line == "zelda3.exe");
else pythonFile.WriteLine(line);
}
}
Expand Down
6 changes: 3 additions & 3 deletions Zelda 3 Launcher/Zelda 3 Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<ImplicitUsings>enable</ImplicitUsings>
<PackageIcon>ЯP Flat Blue Small.png</PackageIcon>
<ApplicationIcon>RadzPrower.ico</ApplicationIcon>
<FileVersion>1.3.1.0</FileVersion>
<AssemblyVersion>1.3.1.0</AssemblyVersion>
<Version>1.3.1.0</Version>
<FileVersion>1.3.2.0</FileVersion>
<AssemblyVersion>1.3.2.0</AssemblyVersion>
<Version>1.3.2.0</Version>
<Platforms>AnyCPU;x86;x64</Platforms>
</PropertyGroup>

Expand Down
13 changes: 6 additions & 7 deletions Zelda 3 Launcher/progressForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e1d4f86

Please sign in to comment.