From a59249a9d8679e09c48fb81048312f128d8d9a64 Mon Sep 17 00:00:00 2001 From: jeffman Date: Sat, 18 Mar 2017 13:47:25 -0400 Subject: [PATCH] Added ASM ref for recovering HP --- ScriptTool/ScriptTool/M12TextTables.cs | 2 ++ ScriptTool/ScriptTool/Program.cs | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ScriptTool/ScriptTool/M12TextTables.cs b/ScriptTool/ScriptTool/M12TextTables.cs index c7ce264..7d5750c 100644 --- a/ScriptTool/ScriptTool/M12TextTables.cs +++ b/ScriptTool/ScriptTool/M12TextTables.cs @@ -560,6 +560,8 @@ namespace ScriptTool AddAsmRef(rom, refs, index++, 0x1F514); // 0x846FB (related to using a battle item outside) AddAsmRef(rom, refs, index++, 0xB9C94); // 0x846FB (related to using a battle item outside) + AddAsmRef(rom, refs, index++, 0xEA978); // 0x60801 (related to recovering HP) + return refs.ToArray(); } diff --git a/ScriptTool/ScriptTool/Program.cs b/ScriptTool/ScriptTool/Program.cs index a367283..66f8d7e 100644 --- a/ScriptTool/ScriptTool/Program.cs +++ b/ScriptTool/ScriptTool/Program.cs @@ -241,14 +241,18 @@ namespace ScriptTool m12Decompiler.ScanRange(m12Rom, 0x3697F, 0x8C4B0); strings.Add(m12Decompiler.DecompileRange(m12Rom, 0x3697F, 0x8C4B0, true)); - // Update labels for all refs and write to JSON + // Update labels for all refs foreach (var refList in allRefs) { foreach (var stringRef in refList.Item2) stringRef.Label = m12Decompiler.LabelMap.Labels[stringRef.OldPointer]; + } + // Write to JSON + foreach (var refList in allRefs) + { File.WriteAllText(Path.Combine(options.WorkingDirectory, refList.Item1 + ".json"), - JsonConvert.SerializeObject(refList.Item2, Formatting.Indented)); + JsonConvert.SerializeObject(refList.Item2, Formatting.Indented)); } // Write the strings