From 831d1a2900a52eda71d8052c049b3d15dc67b1e4 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 11 Jun 2015 12:49:39 -0700 Subject: [PATCH] Branch OR/AS move GARC handling ORAS uses a GARC->packed archive->files XY uses a GARC->files Solution provided by mg1189. --- pk3DS/Subforms/Moves.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pk3DS/Subforms/Moves.cs b/pk3DS/Subforms/Moves.cs index 4e8d35d..27f3a5a 100644 --- a/pk3DS/Subforms/Moves.cs +++ b/pk3DS/Subforms/Moves.cs @@ -8,7 +8,8 @@ public partial class Moves : Form { public Moves() { - ARC.unpackMini(Directory.GetFiles("move")[0], "WD"); + if (Main.oras) + ARC.unpackMini(Directory.GetFiles("move")[0], "WD"); movelist[0] = ""; sortedmoves = (string[])movelist.Clone(); @@ -162,7 +163,9 @@ private void setEntry() private void formClosing(object sender, FormClosingEventArgs e) { setEntry(); - ARC.packMini("move", "WD", "0", ".bin"); + + if (Main.oras) + ARC.packMini("move", "WD", "0", ".bin"); } private void B_RandAll_Click(object sender, EventArgs e) @@ -186,12 +189,16 @@ private void B_RandAll_Click(object sender, EventArgs e) } internal static int[] getTypes() { - ARC.unpackMini(Directory.GetFiles("move")[0], "WD"); + if (Main.oras) + ARC.unpackMini(Directory.GetFiles("move")[0], "WD"); string[] f2 = Directory.GetFiles("move"); int[] moveTypes = new int[f2.Length]; for (int i = 0; i < f2.Length; i++) moveTypes[i] = File.ReadAllBytes(f2[i])[0]; - ARC.packMini("move", "WD", "0", ".bin"); + + if (Main.oras) + ARC.packMini("move", "WD", "0", ".bin"); + return moveTypes; } }