From 3869d5a30f22635637fa83775a50e117ba47ccf2 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sun, 22 Apr 2012 20:33:42 -0500
Subject: [PATCH] split up insertion and dumping in Asm

---
 extras/crystal.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extras/crystal.py b/extras/crystal.py
index 81e996ff4..6d7d96a2f 100644
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -4621,7 +4621,8 @@ class Asm:
                 incbins[index] = new_object
                 #insert these incbins into self.parts
                 gindex = self.parts.index(object)
-                self.parts = self.parts[:gindex] + incbins + self.parts[gindex+1:]
+                self.parts = self.parts[:gindex] + incbins + self.parts[gindex:]
+                self.parts.remove(object)
                 found = True
                 break
             #insert before the current object
@@ -4656,6 +4657,8 @@ class Asm:
             count += 1
     def insert_and_dump(self, limit=100, filename="output.txt"):
         self.insert_all(limit=limit)
+        self.dump(filename=filename)
+    def dump(self, filename="output.txt"):
         fh = open(filename, "w")
         newlines_before_next_obj_requested = 0
         newlines_before_next_obj_given     = 0