tileset files in gfx/tilesets/

hg-commit-id: a1dd793bdd7f

21 files changed, 59 insertions, 19 deletions

diff --git a/extras/extract_tilesets.py b/extras/extract_tilesets.py
new file mode 100644
index 00000000..4fa71f8d
--- /dev/null
+++ b/extras/extract_tilesets.py
@@ -0,0 +1,38 @@
+#!/usr/bin/python
+#author: Bryan Bishop <kanzure@gmail.com>
+#date: 2012-01-14
+#throw tilesets into separate files
+import extract_maps
+extract_maps.load_rom()
+
+locations = {
+"Tset00_GFX": [0x64000, 0x645E0, "00"],
+"Tset01_GFX": [0x64DE0, 0x65270, "01"],
+"Tset08_GFX": [0x653A0, 0x65980, "08"],
+"Tset13_GFX": [0x65BB0, 0x66190, "13"],
+"Tset0E_GFX": [0x66610, 0x66BF0, "0e"],
+"Tset10_GFX": [0x66D60, 0x67350, "10"],
+"Tset17_GFX": [0x676F0, 0x67B50, "17"],
+"Tset05_GFX": [0x6807F, 0x6867F, "05"],
+"Tset02_GFX": [0x68DBF, 0x693BF, "02"],
+"Tset09_GFX": [0x6960F, 0x69BFF, "09"],
+"Tset03_GFX": [0x6A3FF, 0x6A9FF, "03"],
+"Tset16_GFX": [0x6B1FF, 0x6B7FF, "16"],
+"Tset0F_GFX": [0x6C000, 0x6C5C0, "0f"],
+"Tset11_GFX": [0x6CCA0, 0x6D0C0, "11"],
+"Tset12_GFX": [0x6D8C0, 0x6DEA0, "12"],
+"Tset0D_GFX": [0x6E390, 0x6E930, "0d"],
+"Tset14_GFX": [0x6ED10, 0x6F2D0, "14"],
+"Tset15_GFX": [0x6F670, 0x6FB20, "15"],
+"Tset0B_GFX": [0x6FD60, 0x6FEF0, "0b"],
+}
+
+for tileset_id in locations.keys():
+    tileset = locations[tileset_id]
+
+    print "writing ../gfx/tilesets/" + tileset[2] + ".2bpp"
+    fh = open("../gfx/tilesets/" + tileset[2] + ".2bpp", "w")
+    fh.write(extract_maps.rom[tileset[0]:tileset[1]])
+    fh.close()
+
+print "Done."
diff --git a/gfx/tilesets/00.2bpp b/gfx/tilesets/00.2bpp
new file mode 100644
index 00000000..6e480769
--- /dev/null
+++ b/gfx/tilesets/00.2bpp
diff --git a/gfx/tilesets/01.2bpp b/gfx/tilesets/01.2bpp
new file mode 100644
index 00000000..1287b9a5
--- /dev/null
+++ b/gfx/tilesets/01.2bpp
diff --git a/gfx/tilesets/02.2bpp b/gfx/tilesets/02.2bpp
new file mode 100644
index 00000000..8f10e418
--- /dev/null
+++ b/gfx/tilesets/02.2bpp
diff --git a/gfx/tilesets/03.2bpp b/gfx/tilesets/03.2bpp
new file mode 100644
index 00000000..06cf7a20
--- /dev/null
+++ b/gfx/tilesets/03.2bpp
diff --git a/gfx/tilesets/05.2bpp b/gfx/tilesets/05.2bpp
new file mode 100644
index 00000000..acca6721
--- /dev/null
+++ b/gfx/tilesets/05.2bpp
diff --git a/gfx/tilesets/08.2bpp b/gfx/tilesets/08.2bpp
new file mode 100644
index 00000000..2c15989c
--- /dev/null
+++ b/gfx/tilesets/08.2bpp
diff --git a/gfx/tilesets/09.2bpp b/gfx/tilesets/09.2bpp
new file mode 100644
index 00000000..68f93945
--- /dev/null
+++ b/gfx/tilesets/09.2bpp
diff --git a/gfx/tilesets/0b.2bpp b/gfx/tilesets/0b.2bpp
new file mode 100644
index 00000000..9c827e13
--- /dev/null
+++ b/gfx/tilesets/0b.2bpp
diff --git a/gfx/tilesets/0d.2bpp b/gfx/tilesets/0d.2bpp
new file mode 100644
index 00000000..7a032775
--- /dev/null
+++ b/gfx/tilesets/0d.2bpp
diff --git a/gfx/tilesets/0e.2bpp b/gfx/tilesets/0e.2bpp
new file mode 100644
index 00000000..06dedfed
--- /dev/null
+++ b/gfx/tilesets/0e.2bpp
diff --git a/gfx/tilesets/0f.2bpp b/gfx/tilesets/0f.2bpp
new file mode 100644
index 00000000..d24c6437
--- /dev/null
+++ b/gfx/tilesets/0f.2bpp
diff --git a/gfx/tilesets/10.2bpp b/gfx/tilesets/10.2bpp
new file mode 100644
index 00000000..cef7ede4
--- /dev/null
+++ b/gfx/tilesets/10.2bpp
diff --git a/gfx/tilesets/11.2bpp b/gfx/tilesets/11.2bpp
new file mode 100644
index 00000000..1f3b5a86
--- /dev/null
+++ b/gfx/tilesets/11.2bpp
diff --git a/gfx/tilesets/12.2bpp b/gfx/tilesets/12.2bpp
new file mode 100644
index 00000000..779ed27f
--- /dev/null
+++ b/gfx/tilesets/12.2bpp
diff --git a/gfx/tilesets/13.2bpp b/gfx/tilesets/13.2bpp
new file mode 100644
index 00000000..c0063628
--- /dev/null
+++ b/gfx/tilesets/13.2bpp
diff --git a/gfx/tilesets/14.2bpp b/gfx/tilesets/14.2bpp
new file mode 100644
index 00000000..65a56f55
--- /dev/null
+++ b/gfx/tilesets/14.2bpp
diff --git a/gfx/tilesets/15.2bpp b/gfx/tilesets/15.2bpp
new file mode 100644
index 00000000..da3072dc
--- /dev/null
+++ b/gfx/tilesets/15.2bpp
diff --git a/gfx/tilesets/16.2bpp b/gfx/tilesets/16.2bpp
new file mode 100644
index 00000000..a06ce48b
--- /dev/null
+++ b/gfx/tilesets/16.2bpp
diff --git a/gfx/tilesets/17.2bpp b/gfx/tilesets/17.2bpp
new file mode 100644
index 00000000..e277c12b
--- /dev/null
+++ b/gfx/tilesets/17.2bpp
diff --git a/pokered.asm b/pokered.asm
index 77cecb49..d0aaa9c0 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -34838,32 +34838,33 @@ SilphCo11Blocks: ; 81
 INCBIN "baserom.gbc",$62419,$1be7
 
 SECTION "bank19",DATA,BANK[$19]
+
 Tset00_GFX:
-	INCBIN "baserom.gbc",$64000,$645E0-$64000
+    INCBIN "gfx/tilesets/00.2bpp"
 Tset00_Block:
 	INCBIN "baserom.gbc",$645E0,$64DE0-$645E0
 Tset01_GFX:
-	INCBIN "baserom.gbc",$64DE0,$65270-$64DE0
+    INCBIN "gfx/tilesets/01.2bpp"
 Tset01_Block:
 	INCBIN "baserom.gbc",$65270,$653A0-$65270
 Tset08_GFX:
-	INCBIN "baserom.gbc",$653A0,$65980-$653A0
+    INCBIN "gfx/tilesets/08.2bpp"
 Tset08_Block:
 	INCBIN "baserom.gbc",$65980,$65BB0-$65980
 Tset13_GFX:
-	INCBIN "baserom.gbc",$65BB0,$66190-$65BB0
+    INCBIN "gfx/tilesets/13.2bpp"
 Tset13_Block:
 	INCBIN "baserom.gbc",$66190,$66610-$66190
 Tset0E_GFX:
-	INCBIN "baserom.gbc",$66610,$66BF0-$66610
+    INCBIN "gfx/tilesets/0e.2bpp"
 Tset0E_Block:
 	INCBIN "baserom.gbc",$66BF0,$66D60-$66BF0
 Tset10_GFX:
-	INCBIN "baserom.gbc",$66D60,$67350-$66D60
+    INCBIN "gfx/tilesets/10.2bpp"
 Tset10_Block:
 	INCBIN "baserom.gbc",$67350,$676F0-$67350
 Tset17_GFX:
-	INCBIN "baserom.gbc",$676F0,$67B50-$676F0
+    INCBIN "gfx/tilesets/17.2bpp"
 Tset17_Block:
 	INCBIN "baserom.gbc",$67B50,$68000-$67B50
 
@@ -34902,53 +34903,54 @@ DecrementPP:
 INCBIN "baserom.gbc",$6802F,$6807F-$6802F
 
 Tset05_GFX:
-	INCBIN "baserom.gbc",$6807F,$6867F-$6807F
+    INCBIN "gfx/tilesets/05.2bpp"
 Tset05_Block:
 	INCBIN "baserom.gbc",$6867F,$68DBF-$6867F
 Tset02_GFX:
-	INCBIN "baserom.gbc",$68DBF,$693BF-$68DBF
+    INCBIN "gfx/tilesets/02.2bpp"
 Tset02_Block:
 	INCBIN "baserom.gbc",$693BF,$6960F-$693BF
 Tset09_GFX:
-	INCBIN "baserom.gbc",$6960F,$69BFF-$6960F
+    INCBIN "gfx/tilesets/09.2bpp"
 Tset09_Block:
 	INCBIN "baserom.gbc",$69BFF,$6A3FF-$69BFF
 Tset03_GFX:
-	INCBIN "baserom.gbc",$6A3FF,$6A9FF-$6A3FF
+    INCBIN "gfx/tilesets/03.2bpp"
 Tset03_Block:
 	INCBIN "baserom.gbc",$6A9FF,$6B1FF-$6A9FF
 Tset16_GFX:
-	INCBIN "baserom.gbc",$6B1FF,$6B7FF-$6B1FF
+    INCBIN "gfx/tilesets/16.2bpp"
 Tset16_Block:
 	INCBIN "baserom.gbc",$6B7FF,$6C000-$6B7FF
 
 SECTION "bank1B",DATA,BANK[$1B]
+
 Tset0F_GFX:
-	INCBIN "baserom.gbc",$6C000,$6C5C0-$6C000
+    INCBIN "gfx/tilesets/0f.2bpp"
 Tset0F_Block:
 	INCBIN "baserom.gbc",$6C5C0,$6CCA0-$6C5C0
 Tset11_GFX:
-	INCBIN "baserom.gbc",$6CCA0,$6D0C0-$6CCA0
+    INCBIN "gfx/tilesets/11.2bpp"
 Tset11_Block:
 	INCBIN "baserom.gbc",$6D0C0,$6D8C0-$6D0C0
 Tset12_GFX:
-	INCBIN "baserom.gbc",$6D8C0,$6DEA0-$6D8C0
+    INCBIN "gfx/tilesets/12.2bpp"
 Tset12_Block:
 	INCBIN "baserom.gbc",$6DEA0,$6E390-$6DEA0
 Tset0D_GFX:
-	INCBIN "baserom.gbc",$6E390,$6E930-$6E390
+    INCBIN "gfx/tilesets/0d.2bpp"
 Tset0D_Block:
 	INCBIN "baserom.gbc",$6E930,$6ED10-$6E930
 Tset14_GFX:
-	INCBIN "baserom.gbc",$6ED10,$6F2D0-$6ED10
+    INCBIN "gfx/tilesets/14.2bpp"
 Tset14_Block:
 	INCBIN "baserom.gbc",$6F2D0,$6F670-$6F2D0
 Tset15_GFX:
-	INCBIN "baserom.gbc",$6F670,$6FB20-$6F670
+    INCBIN "gfx/tilesets/15.2bpp"
 Tset15_Block:
 	INCBIN "baserom.gbc",$6FB20,$6FD60-$6FB20
 Tset0B_GFX:
-	INCBIN "baserom.gbc",$6FD60,$6FEF0-$6FD60
+    INCBIN "gfx/tilesets/0b.2bpp"
 Tset0B_Block:
 	INCBIN "baserom.gbc",$6FEF0,$70000-$6FEF0