Release 1.0

pk-hack · May 29, 2012 · 90a1477 · 90a1477
1 parent 454b8a4
commit 90a1477
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/CoilSnakeGUI.py b/CoilSnakeGUI.py
@@ -17,8 +17,8 @@
 from modules.Fun import getTitle
 from tools import EbRomExpander
 
-_version = "0.1"
-_releaseDate = "?/?/??"
+_version = "1.0"
+_releaseDate = "5/28/12"
 
 class CoilSnakeFrontend:
     PREFS_FNAME = "prefs.yml"
@@ -53,7 +53,7 @@ def aboutMenu(self):
                 + "Created by MrTenda.\n\n"
                 + "With help from\n"
                 + "  Penguin, Mr. Accident, Goplat,\n"
-                + "  AnyoneEB, Captain Bozo,\n"
+                + "  AnyoneEB, Reg, Captain Bozo,\n"
                 + "  and the rest of the PK Hack community.",
                 anchor="w",justify="left",bg="white",borderwidth=5,
                 relief=GROOVE).pack(

diff --git a/modulelist.txt b/modulelist.txt
@@ -1,12 +1,11 @@
 eb.CccInterfaceModule
 eb.SkipNamingModule
-eb.TilesetModule
 eb.MapSpriteModule
 eb.DoorModule
+eb.SpriteGroupModule
 eb.MiscTablesModule
 #eb.ExpTablesModule
 eb.MapModule
-eb.SpriteGroupModule
 eb.MapEnemyModule
 eb.MapMusicModule
 eb.MapEventModule
@@ -15,3 +14,4 @@ eb.WindowGraphicsModule
 eb.BattleBgModule
 eb.CompressedGraphicsModule
 eb.EnemyModule
+eb.TilesetModule
diff --git a/modules/eb/SpriteGroupModule.py b/modules/eb/SpriteGroupModule.py
@@ -256,17 +256,19 @@ def readFromProject(self, resourceOpener):
             pal = [ ]
 
             # Read the palette from the image
-            for i in range(1, 16):
-                pal.append((palData[i*3], palData[i*3+1], palData[i*3+2]))
+            for j in range(1, 16):
+                pal.append((palData[j*3], palData[j*3+1], palData[j*3+2]))
             # Assign the palette number to the sprite
-            for i in range(8):
-                if pal == self._grPalTbl[i,0].val()[1:]:
-                    g.setPalette(i)
+            for j in range(8):
+                if pal == self._grPalTbl[j,0].val()[1:]:
+                    g.setPalette(j)
                     break
             else:
                 # Error, this image uses an invalid palette
-                raise RuntimeError("Sprite Group #" + i
-                        + "uses an invalid palette.")
+                for j in range(8):
+                    print j, ":", self._grPalTbl[j,0].val()[1:]
+                raise RuntimeError("Sprite Group #" + str(i)
+                        + " uses an invalid palette: " + str(pal))
             updateProgress(pct)
 
     def writeToRom(self, rom):