shithub: pokecrystal

Download patch

ref: 65614f40c912862fa5fa3765c330bcd37ab4ca0a
parent: 81f2a4b7b53213cb4703ef73a62edcafcb8fd79b
parent: 7613a0e601b6c65229745bb4b72d78584cd52e36
author: Bryan Bishop <[email protected]>
date: Wed Jan 2 04:39:10 EST 2013 

Merge pull request #53 from yenatch/master

Compressed graphics and gfx.py updates.


--- a/extras/gfx.py
+++ b/extras/gfx.py
@@ -593,6 +593,10 @@
 		
 		self.decompress()
 		
+		debug = False
+		# print tuple containing start and end address
+		if debug: print '(' + hex(self.start) + ', ' + hex(self.start + self.address+1) + '),'
+		
 		# only transpose pic
 		self.pic = []
 		self.animtiles = []
@@ -1152,7 +1156,7 @@
 		to_file(filename, gfx.output)
 
 
-def decompress_all():
+def decompress_all(debug = False):
 	"""decompress all known compressed data in baserom"""
 	#mkdir_p('../gfx/')
 	#mkdir_p('../gfx/frontpics/')
@@ -1164,31 +1168,33 @@
 	#mkdir_p('../gfx/intro/')
 	#mkdir_p('../gfx/title/')
 	
+	if debug: print 'fronts'
 	decompress_monsters(front)
+	if debug: print 'backs'
 	decompress_monsters(back)
+	if debug: print 'unown fronts'
 	decompress_unowns(front)
+	if debug: print 'unown backs'
 	decompress_unowns(back)
 	
+	if debug: print 'trainers'
 	decompress_trainers()
 	
+	if debug: print 'fx'
 	decompress_fx()
 	
+	if debug: print 'intro'
 	decompress_intro()
+	if debug: print 'title'
 	decompress_title()
 	
 	return
 
 
-def export_decompressed(address, mode='horiz', filename = 'de.2bpp', size = None, debug = True):
+def decompress_from_address(address, mode='horiz', filename = 'de.2bpp', size = None):
 	"""write decompressed data from an address to a 2bpp file"""
-	
-	if debug: print 'decompressing ' + hex(address)
 	image = Decompressed(rom, mode, size, address)
-	
-	if debug: print 'export to ' + filename + '\n'
 	to_file(filename, image.pic)
-	
-	return image.pic
 
 
 def decompress_file(filein, fileout, mode = 'horiz', size = None):
@@ -1225,21 +1231,38 @@
 	
 	cpr = Compressed(image, mode, 5)
 	
-	to_file('old.2bpp', cpr.output)
+	out = '../gfx/frontpics/cpr/' + str(id).zfill(3) + '.cpr'
+	
+	to_file(out, cpr.output)
 
 
 
-
-parser = argparse.ArgumentParser()
-parser.add_argument('cmd', nargs='?', metavar='cmd', type=str)
-parser.add_argument('addr', nargs='?', metavar='addr', type=str)
-parser.add_argument('mode', nargs='?', metavar='mode', type=str)
-parser.add_argument('fname', nargs='?', metavar='fname', type=str)
-args = parser.parse_args()
-
-if args.cmd == 'de':
-	# python gfx.py de [addr] [fname] [mode]
-	print hex_dump(export_decompressed(int(args.addr,16), args.mode, args.fname))
-else:
-	decompress_all()
-	print 'decompressed known gfx to ../gfx/!'
+if __name__ == "__main__":
+	parser = argparse.ArgumentParser()
+	parser.add_argument('cmd', nargs='?', metavar='cmd', type=str)
+	parser.add_argument('arg1', nargs='?', metavar='arg1', type=str)
+	parser.add_argument('arg2', nargs='?', metavar='arg2', type=str)
+	parser.add_argument('arg3', nargs='?', metavar='arg3', type=str)
+	args = parser.parse_args()
+	
+	debug = True
+	
+	if args.cmd == 'de':
+		# python gfx.py de [addr] [fileout] [mode]
+		addr = int(args.arg1,16)
+		fileout = args.arg2
+		mode = args.arg3
+		decompress_from_address(addr, fileout, mode)
+		if debug: print 'decompressed to ' + args.arg2 + ' from ' + hex(int(args.arg1,16)) + '!'
+		
+	elif args.cmd == 'cpr':
+		# python gfx.py cpr [filein] [fileout] [mode]
+		filein = args.arg1
+		fileout = args.arg2
+		mode = args.arg3
+		compress_file(filein, fileout, mode)
+		if debug: print 'compressed ' + filein + ' to ' + fileout + '!'
+		
+	else:
+		decompress_all()
+		if debug: print 'decompressed known gfx to ../gfx/!'
binary files /dev/null b/gfx/backpics/cpr/001.cpr differ
binary files /dev/null b/gfx/backpics/cpr/002.cpr differ
binary files /dev/null b/gfx/backpics/cpr/003.cpr differ
binary files /dev/null b/gfx/backpics/cpr/004.cpr differ
binary files /dev/null b/gfx/backpics/cpr/005.cpr differ
binary files /dev/null b/gfx/backpics/cpr/006.cpr differ
binary files /dev/null b/gfx/backpics/cpr/007.cpr differ
binary files /dev/null b/gfx/backpics/cpr/008.cpr differ
binary files /dev/null b/gfx/backpics/cpr/009.cpr differ
binary files /dev/null b/gfx/backpics/cpr/010.cpr differ
binary files /dev/null b/gfx/backpics/cpr/011.cpr differ
binary files /dev/null b/gfx/backpics/cpr/012.cpr differ
binary files /dev/null b/gfx/backpics/cpr/013.cpr differ
binary files /dev/null b/gfx/backpics/cpr/014.cpr differ
binary files /dev/null b/gfx/backpics/cpr/015.cpr differ
binary files /dev/null b/gfx/backpics/cpr/016.cpr differ
binary files /dev/null b/gfx/backpics/cpr/017.cpr differ
binary files /dev/null b/gfx/backpics/cpr/018.cpr differ
binary files /dev/null b/gfx/backpics/cpr/019.cpr differ
binary files /dev/null b/gfx/backpics/cpr/020.cpr differ
binary files /dev/null b/gfx/backpics/cpr/021.cpr differ
binary files /dev/null b/gfx/backpics/cpr/022.cpr differ
binary files /dev/null b/gfx/backpics/cpr/023.cpr differ
binary files /dev/null b/gfx/backpics/cpr/024.cpr differ
binary files /dev/null b/gfx/backpics/cpr/025.cpr differ
binary files /dev/null b/gfx/backpics/cpr/026.cpr differ
binary files /dev/null b/gfx/backpics/cpr/027.cpr differ
binary files /dev/null b/gfx/backpics/cpr/028.cpr differ
binary files /dev/null b/gfx/backpics/cpr/029.cpr differ
binary files /dev/null b/gfx/backpics/cpr/030.cpr differ
binary files /dev/null b/gfx/backpics/cpr/031.cpr differ
binary files /dev/null b/gfx/backpics/cpr/032.cpr differ
binary files /dev/null b/gfx/backpics/cpr/033.cpr differ
binary files /dev/null b/gfx/backpics/cpr/034.cpr differ
binary files /dev/null b/gfx/backpics/cpr/035.cpr differ
binary files /dev/null b/gfx/backpics/cpr/036.cpr differ
binary files /dev/null b/gfx/backpics/cpr/037.cpr differ
binary files /dev/null b/gfx/backpics/cpr/038.cpr differ
binary files /dev/null b/gfx/backpics/cpr/039.cpr differ
binary files /dev/null b/gfx/backpics/cpr/040.cpr differ
binary files /dev/null b/gfx/backpics/cpr/041.cpr differ
binary files /dev/null b/gfx/backpics/cpr/042.cpr differ
binary files /dev/null b/gfx/backpics/cpr/043.cpr differ
binary files /dev/null b/gfx/backpics/cpr/044.cpr differ
binary files /dev/null b/gfx/backpics/cpr/045.cpr differ
binary files /dev/null b/gfx/backpics/cpr/046.cpr differ
binary files /dev/null b/gfx/backpics/cpr/047.cpr differ
binary files /dev/null b/gfx/backpics/cpr/048.cpr differ
binary files /dev/null b/gfx/backpics/cpr/049.cpr differ
binary files /dev/null b/gfx/backpics/cpr/050.cpr differ
binary files /dev/null b/gfx/backpics/cpr/051.cpr differ
binary files /dev/null b/gfx/backpics/cpr/052.cpr differ
binary files /dev/null b/gfx/backpics/cpr/053.cpr differ
binary files /dev/null b/gfx/backpics/cpr/054.cpr differ
binary files /dev/null b/gfx/backpics/cpr/055.cpr differ
binary files /dev/null b/gfx/backpics/cpr/056.cpr differ
binary files /dev/null b/gfx/backpics/cpr/057.cpr differ
binary files /dev/null b/gfx/backpics/cpr/058.cpr differ
binary files /dev/null b/gfx/backpics/cpr/059.cpr differ
binary files /dev/null b/gfx/backpics/cpr/060.cpr differ
binary files /dev/null b/gfx/backpics/cpr/061.cpr differ
binary files /dev/null b/gfx/backpics/cpr/062.cpr differ
binary files /dev/null b/gfx/backpics/cpr/063.cpr differ
binary files /dev/null b/gfx/backpics/cpr/064.cpr differ
binary files /dev/null b/gfx/backpics/cpr/065.cpr differ
binary files /dev/null b/gfx/backpics/cpr/066.cpr differ
binary files /dev/null b/gfx/backpics/cpr/067.cpr differ
binary files /dev/null b/gfx/backpics/cpr/068.cpr differ
binary files /dev/null b/gfx/backpics/cpr/069.cpr differ
binary files /dev/null b/gfx/backpics/cpr/070.cpr differ
binary files /dev/null b/gfx/backpics/cpr/071.cpr differ
binary files /dev/null b/gfx/backpics/cpr/072.cpr differ
binary files /dev/null b/gfx/backpics/cpr/073.cpr differ
binary files /dev/null b/gfx/backpics/cpr/074.cpr differ
binary files /dev/null b/gfx/backpics/cpr/075.cpr differ
binary files /dev/null b/gfx/backpics/cpr/076.cpr differ
binary files /dev/null b/gfx/backpics/cpr/077.cpr differ
binary files /dev/null b/gfx/backpics/cpr/078.cpr differ
binary files /dev/null b/gfx/backpics/cpr/079.cpr differ
binary files /dev/null b/gfx/backpics/cpr/080.cpr differ
binary files /dev/null b/gfx/backpics/cpr/081.cpr differ
binary files /dev/null b/gfx/backpics/cpr/082.cpr differ
binary files /dev/null b/gfx/backpics/cpr/083.cpr differ
binary files /dev/null b/gfx/backpics/cpr/084.cpr differ
binary files /dev/null b/gfx/backpics/cpr/085.cpr differ
binary files /dev/null b/gfx/backpics/cpr/086.cpr differ
binary files /dev/null b/gfx/backpics/cpr/087.cpr differ
binary files /dev/null b/gfx/backpics/cpr/088.cpr differ
binary files /dev/null b/gfx/backpics/cpr/089.cpr differ
binary files /dev/null b/gfx/backpics/cpr/090.cpr differ
binary files /dev/null b/gfx/backpics/cpr/091.cpr differ
binary files /dev/null b/gfx/backpics/cpr/092.cpr differ
binary files /dev/null b/gfx/backpics/cpr/093.cpr differ
binary files /dev/null b/gfx/backpics/cpr/094.cpr differ
binary files /dev/null b/gfx/backpics/cpr/095.cpr differ
binary files /dev/null b/gfx/backpics/cpr/096.cpr differ
binary files /dev/null b/gfx/backpics/cpr/097.cpr differ
binary files /dev/null b/gfx/backpics/cpr/098.cpr differ
binary files /dev/null b/gfx/backpics/cpr/099.cpr differ
binary files /dev/null b/gfx/backpics/cpr/100.cpr differ
binary files /dev/null b/gfx/backpics/cpr/101.cpr differ
binary files /dev/null b/gfx/backpics/cpr/102.cpr differ
binary files /dev/null b/gfx/backpics/cpr/103.cpr differ
binary files /dev/null b/gfx/backpics/cpr/104.cpr differ
binary files /dev/null b/gfx/backpics/cpr/105.cpr differ
binary files /dev/null b/gfx/backpics/cpr/106.cpr differ
binary files /dev/null b/gfx/backpics/cpr/107.cpr differ
binary files /dev/null b/gfx/backpics/cpr/108.cpr differ
binary files /dev/null b/gfx/backpics/cpr/109.cpr differ
binary files /dev/null b/gfx/backpics/cpr/110.cpr differ
binary files /dev/null b/gfx/backpics/cpr/111.cpr differ
binary files /dev/null b/gfx/backpics/cpr/112.cpr differ
binary files /dev/null b/gfx/backpics/cpr/113.cpr differ
binary files /dev/null b/gfx/backpics/cpr/114.cpr differ
binary files /dev/null b/gfx/backpics/cpr/115.cpr differ
binary files /dev/null b/gfx/backpics/cpr/116.cpr differ
binary files /dev/null b/gfx/backpics/cpr/117.cpr differ
binary files /dev/null b/gfx/backpics/cpr/118.cpr differ
binary files /dev/null b/gfx/backpics/cpr/119.cpr differ
binary files /dev/null b/gfx/backpics/cpr/120.cpr differ
binary files /dev/null b/gfx/backpics/cpr/121.cpr differ
binary files /dev/null b/gfx/backpics/cpr/122.cpr differ
binary files /dev/null b/gfx/backpics/cpr/123.cpr differ
binary files /dev/null b/gfx/backpics/cpr/124.cpr differ
binary files /dev/null b/gfx/backpics/cpr/125.cpr differ
binary files /dev/null b/gfx/backpics/cpr/126.cpr differ
binary files /dev/null b/gfx/backpics/cpr/127.cpr differ
binary files /dev/null b/gfx/backpics/cpr/128.cpr differ
binary files /dev/null b/gfx/backpics/cpr/129.cpr differ
binary files /dev/null b/gfx/backpics/cpr/130.cpr differ
binary files /dev/null b/gfx/backpics/cpr/131.cpr differ
binary files /dev/null b/gfx/backpics/cpr/132.cpr differ
binary files /dev/null b/gfx/backpics/cpr/133.cpr differ
binary files /dev/null b/gfx/backpics/cpr/134.cpr differ
binary files /dev/null b/gfx/backpics/cpr/135.cpr differ
binary files /dev/null b/gfx/backpics/cpr/136.cpr differ
binary files /dev/null b/gfx/backpics/cpr/137.cpr differ
binary files /dev/null b/gfx/backpics/cpr/138.cpr differ
binary files /dev/null b/gfx/backpics/cpr/139.cpr differ
binary files /dev/null b/gfx/backpics/cpr/140.cpr differ
binary files /dev/null b/gfx/backpics/cpr/141.cpr differ
binary files /dev/null b/gfx/backpics/cpr/142.cpr differ
binary files /dev/null b/gfx/backpics/cpr/143.cpr differ
binary files /dev/null b/gfx/backpics/cpr/144.cpr differ
binary files /dev/null b/gfx/backpics/cpr/145.cpr differ
binary files /dev/null b/gfx/backpics/cpr/146.cpr differ
binary files /dev/null b/gfx/backpics/cpr/147.cpr differ
binary files /dev/null b/gfx/backpics/cpr/148.cpr differ
binary files /dev/null b/gfx/backpics/cpr/149.cpr differ
binary files /dev/null b/gfx/backpics/cpr/150.cpr differ
binary files /dev/null b/gfx/backpics/cpr/151.cpr differ
binary files /dev/null b/gfx/backpics/cpr/152.cpr differ
binary files /dev/null b/gfx/backpics/cpr/153.cpr differ
binary files /dev/null b/gfx/backpics/cpr/154.cpr differ
binary files /dev/null b/gfx/backpics/cpr/155.cpr differ
binary files /dev/null b/gfx/backpics/cpr/156.cpr differ
binary files /dev/null b/gfx/backpics/cpr/157.cpr differ
binary files /dev/null b/gfx/backpics/cpr/158.cpr differ
binary files /dev/null b/gfx/backpics/cpr/159.cpr differ
binary files /dev/null b/gfx/backpics/cpr/160.cpr differ
binary files /dev/null b/gfx/backpics/cpr/161.cpr differ
binary files /dev/null b/gfx/backpics/cpr/162.cpr differ
binary files /dev/null b/gfx/backpics/cpr/163.cpr differ
binary files /dev/null b/gfx/backpics/cpr/164.cpr differ
binary files /dev/null b/gfx/backpics/cpr/165.cpr differ
binary files /dev/null b/gfx/backpics/cpr/166.cpr differ
binary files /dev/null b/gfx/backpics/cpr/167.cpr differ
binary files /dev/null b/gfx/backpics/cpr/168.cpr differ
binary files /dev/null b/gfx/backpics/cpr/169.cpr differ
binary files /dev/null b/gfx/backpics/cpr/170.cpr differ
binary files /dev/null b/gfx/backpics/cpr/171.cpr differ
binary files /dev/null b/gfx/backpics/cpr/172.cpr differ
binary files /dev/null b/gfx/backpics/cpr/173.cpr differ
binary files /dev/null b/gfx/backpics/cpr/174.cpr differ
binary files /dev/null b/gfx/backpics/cpr/175.cpr differ
binary files /dev/null b/gfx/backpics/cpr/176.cpr differ
binary files /dev/null b/gfx/backpics/cpr/177.cpr differ
binary files /dev/null b/gfx/backpics/cpr/178.cpr differ
binary files /dev/null b/gfx/backpics/cpr/179.cpr differ
binary files /dev/null b/gfx/backpics/cpr/180.cpr differ
binary files /dev/null b/gfx/backpics/cpr/181.cpr differ
binary files /dev/null b/gfx/backpics/cpr/182.cpr differ
binary files /dev/null b/gfx/backpics/cpr/183.cpr differ
binary files /dev/null b/gfx/backpics/cpr/184.cpr differ
binary files /dev/null b/gfx/backpics/cpr/185.cpr differ
binary files /dev/null b/gfx/backpics/cpr/186.cpr differ
binary files /dev/null b/gfx/backpics/cpr/187.cpr differ
binary files /dev/null b/gfx/backpics/cpr/188.cpr differ
binary files /dev/null b/gfx/backpics/cpr/189.cpr differ
binary files /dev/null b/gfx/backpics/cpr/190.cpr differ
binary files /dev/null b/gfx/backpics/cpr/191.cpr differ
binary files /dev/null b/gfx/backpics/cpr/192.cpr differ
binary files /dev/null b/gfx/backpics/cpr/193.cpr differ
binary files /dev/null b/gfx/backpics/cpr/194.cpr differ
binary files /dev/null b/gfx/backpics/cpr/195.cpr differ
binary files /dev/null b/gfx/backpics/cpr/196.cpr differ
binary files /dev/null b/gfx/backpics/cpr/197.cpr differ
binary files /dev/null b/gfx/backpics/cpr/198.cpr differ
binary files /dev/null b/gfx/backpics/cpr/199.cpr differ
binary files /dev/null b/gfx/backpics/cpr/200.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201a.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201b.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201c.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201d.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201e.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201f.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201g.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201h.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201i.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201j.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201k.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201l.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201m.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201n.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201o.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201p.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201q.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201r.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201s.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201t.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201u.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201v.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201w.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201x.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201y.cpr differ
binary files /dev/null b/gfx/backpics/cpr/201z.cpr differ
binary files /dev/null b/gfx/backpics/cpr/202.cpr differ
binary files /dev/null b/gfx/backpics/cpr/203.cpr differ
binary files /dev/null b/gfx/backpics/cpr/204.cpr differ
binary files /dev/null b/gfx/backpics/cpr/205.cpr differ
binary files /dev/null b/gfx/backpics/cpr/206.cpr differ
binary files /dev/null b/gfx/backpics/cpr/207.cpr differ
binary files /dev/null b/gfx/backpics/cpr/208.cpr differ
binary files /dev/null b/gfx/backpics/cpr/209.cpr differ
binary files /dev/null b/gfx/backpics/cpr/210.cpr differ
binary files /dev/null b/gfx/backpics/cpr/211.cpr differ
binary files /dev/null b/gfx/backpics/cpr/212.cpr differ
binary files /dev/null b/gfx/backpics/cpr/213.cpr differ
binary files /dev/null b/gfx/backpics/cpr/214.cpr differ
binary files /dev/null b/gfx/backpics/cpr/215.cpr differ
binary files /dev/null b/gfx/backpics/cpr/216.cpr differ
binary files /dev/null b/gfx/backpics/cpr/217.cpr differ
binary files /dev/null b/gfx/backpics/cpr/218.cpr differ
binary files /dev/null b/gfx/backpics/cpr/219.cpr differ
binary files /dev/null b/gfx/backpics/cpr/220.cpr differ
binary files /dev/null b/gfx/backpics/cpr/221.cpr differ
binary files /dev/null b/gfx/backpics/cpr/222.cpr differ
binary files /dev/null b/gfx/backpics/cpr/223.cpr differ
binary files /dev/null b/gfx/backpics/cpr/224.cpr differ
binary files /dev/null b/gfx/backpics/cpr/225.cpr differ
binary files /dev/null b/gfx/backpics/cpr/226.cpr differ
binary files /dev/null b/gfx/backpics/cpr/227.cpr differ
binary files /dev/null b/gfx/backpics/cpr/228.cpr differ
binary files /dev/null b/gfx/backpics/cpr/229.cpr differ
binary files /dev/null b/gfx/backpics/cpr/230.cpr differ
binary files /dev/null b/gfx/backpics/cpr/231.cpr differ
binary files /dev/null b/gfx/backpics/cpr/232.cpr differ
binary files /dev/null b/gfx/backpics/cpr/233.cpr differ
binary files /dev/null b/gfx/backpics/cpr/234.cpr differ
binary files /dev/null b/gfx/backpics/cpr/235.cpr differ
binary files /dev/null b/gfx/backpics/cpr/236.cpr differ
binary files /dev/null b/gfx/backpics/cpr/237.cpr differ
binary files /dev/null b/gfx/backpics/cpr/238.cpr differ
binary files /dev/null b/gfx/backpics/cpr/239.cpr differ
binary files /dev/null b/gfx/backpics/cpr/240.cpr differ
binary files /dev/null b/gfx/backpics/cpr/241.cpr differ
binary files /dev/null b/gfx/backpics/cpr/242.cpr differ
binary files /dev/null b/gfx/backpics/cpr/243.cpr differ
binary files /dev/null b/gfx/backpics/cpr/244.cpr differ
binary files /dev/null b/gfx/backpics/cpr/245.cpr differ
binary files /dev/null b/gfx/backpics/cpr/246.cpr differ
binary files /dev/null b/gfx/backpics/cpr/247.cpr differ
binary files /dev/null b/gfx/backpics/cpr/248.cpr differ
binary files /dev/null b/gfx/backpics/cpr/249.cpr differ
binary files /dev/null b/gfx/backpics/cpr/250.cpr differ
binary files /dev/null b/gfx/backpics/cpr/251.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/001.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/002.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/003.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/004.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/005.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/006.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/007.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/008.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/009.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/010.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/011.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/012.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/013.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/014.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/015.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/016.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/017.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/018.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/019.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/020.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/021.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/022.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/023.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/024.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/025.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/026.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/027.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/028.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/029.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/030.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/031.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/032.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/033.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/034.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/035.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/036.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/037.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/038.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/039.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/040.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/041.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/042.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/043.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/044.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/045.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/046.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/047.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/048.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/049.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/050.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/051.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/052.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/053.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/054.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/055.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/056.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/057.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/058.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/059.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/060.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/061.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/062.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/063.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/064.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/065.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/066.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/067.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/068.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/069.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/070.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/071.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/072.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/073.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/074.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/075.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/076.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/077.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/078.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/079.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/080.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/081.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/082.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/083.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/084.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/085.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/086.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/087.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/088.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/089.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/090.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/091.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/092.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/093.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/094.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/095.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/096.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/097.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/098.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/099.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/100.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/101.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/102.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/103.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/104.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/105.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/106.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/107.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/108.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/109.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/110.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/111.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/112.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/113.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/114.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/115.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/116.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/117.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/118.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/119.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/120.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/121.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/122.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/123.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/124.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/125.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/126.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/127.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/128.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/129.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/130.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/131.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/132.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/133.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/134.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/135.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/136.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/137.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/138.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/139.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/140.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/141.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/142.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/143.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/144.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/145.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/146.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/147.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/148.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/149.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/150.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/151.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/152.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/153.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/154.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/155.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/156.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/157.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/158.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/159.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/160.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/161.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/162.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/163.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/164.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/165.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/166.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/167.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/168.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/169.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/170.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/171.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/172.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/173.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/174.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/175.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/176.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/177.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/178.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/179.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/180.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/181.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/182.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/183.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/184.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/185.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/186.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/187.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/188.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/189.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/190.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/191.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/192.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/193.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/194.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/195.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/196.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/197.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/198.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/199.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/200.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201a.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201b.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201c.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201d.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201e.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201f.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201g.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201h.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201i.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201j.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201k.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201l.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201m.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201n.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201o.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201p.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201q.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201r.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201s.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201t.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201u.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201v.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201w.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201x.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201y.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/201z.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/202.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/203.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/204.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/205.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/206.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/207.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/208.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/209.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/210.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/211.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/212.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/213.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/214.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/215.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/216.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/217.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/218.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/219.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/220.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/221.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/222.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/223.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/224.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/225.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/226.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/227.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/228.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/229.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/230.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/231.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/232.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/233.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/234.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/235.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/236.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/237.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/238.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/239.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/240.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/241.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/242.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/243.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/244.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/245.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/246.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/247.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/248.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/249.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/250.cpr differ
binary files /dev/null b/gfx/frontpics/cpr/251.cpr differ
binary files /dev/null b/gfx/fx/cpr/000.cpr differ
binary files /dev/null b/gfx/fx/cpr/001.cpr differ
binary files /dev/null b/gfx/fx/cpr/002.cpr differ
binary files /dev/null b/gfx/fx/cpr/003.cpr differ
binary files /dev/null b/gfx/fx/cpr/004.cpr differ
binary files /dev/null b/gfx/fx/cpr/005.cpr differ
--- /dev/null
+++ b/gfx/fx/cpr/006.cpr
@@ -1,0 +1,3 @@
+a<<~B��ߡ>�����
+<$xx��c	>2��88i��~Bø}c}CC��➆�xx<$|D~B^b3=a��C	e00PpC��
+=%}EC_c�����<�>��c����_aOq'83<e
79Nr����
)���`�@I@�  00<,.2/1'9a��
,4\d����	������
\ No newline at end of file
binary files /dev/null b/gfx/fx/cpr/007.cpr differ
binary files /dev/null b/gfx/fx/cpr/008.cpr differ
binary files /dev/null b/gfx/fx/cpr/009.cpr differ
binary files /dev/null b/gfx/fx/cpr/010.cpr differ
binary files /dev/null b/gfx/fx/cpr/011.cpr differ
binary files /dev/null b/gfx/fx/cpr/012.cpr differ
binary files /dev/null b/gfx/fx/cpr/013.cpr differ
binary files /dev/null b/gfx/fx/cpr/014.cpr differ
--- /dev/null
+++ b/gfx/fx/cpr/015.cpr
@@ -1,0 +1,1 @@
+@@��GEa8(@@��EG��Î
\ No newline at end of file
binary files /dev/null b/gfx/fx/cpr/016.cpr differ
binary files /dev/null b/gfx/fx/cpr/017.cpr differ
binary files /dev/null b/gfx/fx/cpr/018.cpr differ
binary files /dev/null b/gfx/fx/cpr/019.cpr differ
binary files /dev/null b/gfx/fx/cpr/020.cpr differ
binary files /dev/null b/gfx/fx/cpr/021.cpr differ
binary files /dev/null b/gfx/fx/cpr/022.cpr differ
binary files /dev/null b/gfx/fx/cpr/023.cpr differ
binary files /dev/null b/gfx/fx/cpr/024.cpr differ
binary files /dev/null b/gfx/fx/cpr/025.cpr differ
binary files /dev/null b/gfx/fx/cpr/026.cpr differ
binary files /dev/null b/gfx/fx/cpr/027.cpr differ
binary files /dev/null b/gfx/fx/cpr/028.cpr differ
binary files /dev/null b/gfx/fx/cpr/029.cpr differ
binary files /dev/null b/gfx/fx/cpr/030.cpr differ
binary files /dev/null b/gfx/fx/cpr/031.cpr differ
binary files /dev/null b/gfx/fx/cpr/032.cpr differ
binary files /dev/null b/gfx/fx/cpr/033.cpr differ
binary files /dev/null b/gfx/fx/cpr/034.cpr differ
binary files /dev/null b/gfx/fx/cpr/035.cpr differ
binary files /dev/null b/gfx/fx/cpr/036.cpr differ
binary files /dev/null b/gfx/fx/cpr/037.cpr differ
binary files /dev/null b/gfx/fx/cpr/038.cpr differ
binary files /dev/null b/gfx/fx/cpr/039.cpr differ
--- /dev/null
+++ b/gfx/intro/cpr/001.cpr
@@ -1,0 +1,1 @@
+s%�ŀ����
\ No newline at end of file
binary files /dev/null b/gfx/intro/cpr/002.cpr differ
--- /dev/null
+++ b/gfx/intro/cpr/003.cpr
@@ -1,0 +1,1 @@
+��_��_���
\ No newline at end of file
binary files /dev/null b/gfx/intro/cpr/004.cpr differ
binary files /dev/null b/gfx/intro/cpr/005.cpr differ
binary files /dev/null b/gfx/intro/cpr/006.cpr differ
binary files /dev/null b/gfx/intro/cpr/007.cpr differ
binary files /dev/null b/gfx/intro/cpr/008.cpr differ
--- /dev/null
+++ b/gfx/intro/cpr/009.cpr
@@ -1,0 +1,1 @@
+��#πˀ�ߟ�U
\ No newline at end of file
--- /dev/null
+++ b/gfx/intro/cpr/010.cpr
@@ -1,0 +1,1 @@
+��ww !"#$%&'w01234567w@ABCDEFGwPQRSTUVWw`abcdefgwpqrstuvw�m
\ No newline at end of file
binary files /dev/null b/gfx/intro/cpr/011.cpr differ
binary files /dev/null b/gfx/intro/cpr/012.cpr differ
binary files /dev/null b/gfx/intro/cpr/013.cpr differ
binary files /dev/null b/gfx/intro/cpr/014.cpr differ
binary files /dev/null b/gfx/intro/cpr/015.cpr differ
binary files /dev/null b/gfx/intro/cpr/017.cpr differ
binary files /dev/null b/gfx/intro/cpr/background.cpr differ
binary files /dev/null b/gfx/intro/cpr/crystal_unowns.cpr differ
binary files /dev/null b/gfx/intro/cpr/logo.cpr differ
binary files /dev/null b/gfx/intro/cpr/pichu_wooper.cpr differ
binary files /dev/null b/gfx/intro/cpr/pulse.cpr differ
binary files /dev/null b/gfx/intro/cpr/suicune_back.cpr differ
binary files /dev/null b/gfx/intro/cpr/suicune_close.cpr differ
binary files /dev/null b/gfx/intro/cpr/suicune_jump.cpr differ
binary files /dev/null b/gfx/intro/cpr/suicune_run.cpr differ
binary files /dev/null b/gfx/intro/cpr/unown_back.cpr differ
binary files /dev/null b/gfx/intro/cpr/unowns.cpr differ
binary files /dev/null b/gfx/title/cpr/crystal.cpr differ
binary files /dev/null b/gfx/title/cpr/logo.cpr differ
binary files /dev/null b/gfx/title/cpr/suicune.cpr differ
binary files /dev/null b/gfx/trainers/cpr/000.cpr differ
binary files /dev/null b/gfx/trainers/cpr/001.cpr differ
binary files /dev/null b/gfx/trainers/cpr/002.cpr differ
binary files /dev/null b/gfx/trainers/cpr/003.cpr differ
binary files /dev/null b/gfx/trainers/cpr/004.cpr differ
binary files /dev/null b/gfx/trainers/cpr/005.cpr differ
binary files /dev/null b/gfx/trainers/cpr/006.cpr differ
binary files /dev/null b/gfx/trainers/cpr/007.cpr differ
binary files /dev/null b/gfx/trainers/cpr/008.cpr differ
binary files /dev/null b/gfx/trainers/cpr/009.cpr differ
binary files /dev/null b/gfx/trainers/cpr/010.cpr differ
binary files /dev/null b/gfx/trainers/cpr/011.cpr differ
binary files /dev/null b/gfx/trainers/cpr/012.cpr differ
binary files /dev/null b/gfx/trainers/cpr/013.cpr differ
binary files /dev/null b/gfx/trainers/cpr/014.cpr differ
binary files /dev/null b/gfx/trainers/cpr/015.cpr differ
binary files /dev/null b/gfx/trainers/cpr/016.cpr differ
binary files /dev/null b/gfx/trainers/cpr/017.cpr differ
binary files /dev/null b/gfx/trainers/cpr/018.cpr differ
binary files /dev/null b/gfx/trainers/cpr/019.cpr differ
binary files /dev/null b/gfx/trainers/cpr/020.cpr differ
binary files /dev/null b/gfx/trainers/cpr/021.cpr differ
binary files /dev/null b/gfx/trainers/cpr/022.cpr differ
binary files /dev/null b/gfx/trainers/cpr/023.cpr differ
binary files /dev/null b/gfx/trainers/cpr/024.cpr differ
binary files /dev/null b/gfx/trainers/cpr/025.cpr differ
binary files /dev/null b/gfx/trainers/cpr/026.cpr differ
binary files /dev/null b/gfx/trainers/cpr/027.cpr differ
binary files /dev/null b/gfx/trainers/cpr/028.cpr differ
binary files /dev/null b/gfx/trainers/cpr/029.cpr differ
binary files /dev/null b/gfx/trainers/cpr/030.cpr differ
binary files /dev/null b/gfx/trainers/cpr/031.cpr differ
binary files /dev/null b/gfx/trainers/cpr/032.cpr differ
binary files /dev/null b/gfx/trainers/cpr/033.cpr differ
binary files /dev/null b/gfx/trainers/cpr/034.cpr differ
binary files /dev/null b/gfx/trainers/cpr/035.cpr differ
binary files /dev/null b/gfx/trainers/cpr/036.cpr differ
binary files /dev/null b/gfx/trainers/cpr/037.cpr differ
binary files /dev/null b/gfx/trainers/cpr/038.cpr differ
binary files /dev/null b/gfx/trainers/cpr/039.cpr differ
binary files /dev/null b/gfx/trainers/cpr/040.cpr differ
binary files /dev/null b/gfx/trainers/cpr/041.cpr differ
binary files /dev/null b/gfx/trainers/cpr/042.cpr differ
binary files /dev/null b/gfx/trainers/cpr/043.cpr differ
binary files /dev/null b/gfx/trainers/cpr/044.cpr differ
binary files /dev/null b/gfx/trainers/cpr/045.cpr differ
binary files /dev/null b/gfx/trainers/cpr/046.cpr differ
binary files /dev/null b/gfx/trainers/cpr/047.cpr differ
binary files /dev/null b/gfx/trainers/cpr/048.cpr differ
binary files /dev/null b/gfx/trainers/cpr/049.cpr differ
binary files /dev/null b/gfx/trainers/cpr/050.cpr differ
binary files /dev/null b/gfx/trainers/cpr/051.cpr differ
binary files /dev/null b/gfx/trainers/cpr/052.cpr differ
binary files /dev/null b/gfx/trainers/cpr/053.cpr differ
binary files /dev/null b/gfx/trainers/cpr/054.cpr differ
binary files /dev/null b/gfx/trainers/cpr/055.cpr differ
binary files /dev/null b/gfx/trainers/cpr/056.cpr differ
binary files /dev/null b/gfx/trainers/cpr/057.cpr differ
binary files /dev/null b/gfx/trainers/cpr/058.cpr differ
binary files /dev/null b/gfx/trainers/cpr/059.cpr differ
binary files /dev/null b/gfx/trainers/cpr/060.cpr differ
binary files /dev/null b/gfx/trainers/cpr/061.cpr differ
binary files /dev/null b/gfx/trainers/cpr/062.cpr differ
binary files /dev/null b/gfx/trainers/cpr/063.cpr differ
binary files /dev/null b/gfx/trainers/cpr/064.cpr differ
binary files /dev/null b/gfx/trainers/cpr/065.cpr differ
binary files /dev/null b/gfx/trainers/cpr/066.cpr differ
--- a/main.asm
+++ b/main.asm
@@ -86366,7 +86366,109 @@
 	ret
 ; e8ca6
 
-INCBIN "baserom.gbc", $e8ca6, $e8d1b - $e8ca6
+
+PlaySFX: ; e8ca6
+; play sfx de
+
+	call MusicOff
+	
+; standard procedure if stereo's off
+	ld a, [Options]
+	bit 5, a
+	jp z, LoadSFX
+	
+; else, let's go ahead with this
+	ld hl, MusicID
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	
+; get sfx ptr
+	ld hl, SFX
+	add hl, de
+	add hl, de
+	add hl, de
+	
+; bank
+	ld a, [hli]
+	ld [MusicBank], a
+; address
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	
+; bit 2-3
+	call FarLoadMusicByte
+	rlca
+	rlca
+	and 3 ; ch1-4
+	inc a
+	
+.loop
+	push af
+	call LoadChannel
+	
+	ld hl, Channel1Flags - Channel1
+	add hl, bc
+	set 3, [hl]
+	
+	push de
+	; get tracks for this channel
+	ld a, [CurChannel]
+	and 3 ; ch1-4
+	ld e, a
+	ld d, $0
+	call GetLRTracks
+	add hl, de
+	ld a, [hl]
+	ld hl, $c2bc
+	and [hl]
+	
+	ld hl, Channel1Tracks - Channel1
+	add hl, bc
+	ld [hl], a
+	
+	ld hl, $0030 ; $c131 - Channel1
+	add hl, bc
+	ld [hl], a
+	
+	ld a, [CryTracks]
+	cp 2 ; ch 1-2
+	jr c, .asm_e8d0c
+	
+; ch3-4
+	ld a, [$c2be]
+	
+	ld hl, $002e ; $c12f - Channel1
+	add hl, bc
+	ld [hl], a
+	
+	ld hl, $002f ; $c130 - Channel1
+	add hl, bc
+	ld [hl], a
+	
+	ld hl, Channel1Flags2 - Channel1
+	add hl, bc
+	set 7, [hl]
+	
+.asm_e8d0c
+	pop de
+	
+; turn channel on
+	ld hl, Channel1Flags - Channel1
+	add hl, bc
+	set 0, [hl] ; on
+	
+; done?
+	pop af
+	dec a
+	jr nz, .loop
+	
+; we're done
+	call MusicOn
+	ret
+; e8d1b
+
 
 LoadChannel: ; e8d1b
 ; prep channel for use
--- a/wram.asm
+++ b/wram.asm
@@ -271,7 +271,7 @@
 ; if nonzero, turn off music when playing sfx
 	ds 1
 	ds 6
-CryTracks ; c2bd
+CryTracks: ; c2bd
 ; plays only in left or right track depending on what side the monster is on
 ; both tracks active outside of battle
 	ds 1
@@ -934,28 +934,16 @@
 ; 3 darkness
 	ds 1
 
-SECTION "OtherTrainerParty",BSS[$d280]
+SECTION "OTParty",BSS[$d280]
 
-OTPartyMonHeader: ; d280
-TotalBeltMons: ; d280
-	ds 1
+OTPartyCount: ; d280
+	ds 1 ; number of Pokémon in party
+OTPartySpecies: ; d281
+	ds 6 ; species of each Pokémon in party
+; d287
+	ds 1 ; any empty slots including the 7th must be FF
+	     ; or the routine will keep going
 
-OTPartyMonSpecies: ; d281
-OTPartyMon1Species: ; d281
-	ds 1
-OTPartyMon2Species: ; d282
-	ds 1
-OTPartyMon3Species: ; d283
-	ds 1
-OTPartyMon4Species: ; d284
-	ds 1
-OTPartyMon5Species: ; d285
-	ds 1
-OTPartyMon6Species: ; d286
-	ds 1
-OTPartyMonsEnd: ; d287
-	ds 1
-
 OTPartyMon1:
 OTPartyMon1Species2: ; d288
 	ds 1
@@ -1037,405 +1025,17 @@
 	ds 2
 
 OTPartyMon2: ; d2b8
-OTPartyMon2Species2: ; d2b8
-	ds 1
-OTPartyMon2Item: ; d2b9
-	ds 1
-
-OTPartyMon2Moves: ; d2ba
-OTPartyMon2Move1: ; d2ba
-	ds 1
-OTPartyMon2Move2: ; d2bb
-	ds 1
-OTPartyMon2Move3: ; d2bc
-	ds 1
-OTPartyMon2Move4: ; d2bd
-	ds 1
-	
-OTPartyMon2ID: ; d2be
-	ds 2
-OTPartyMon2Exp: ; d2c0
-	ds 3
-OTPartyMon2HPExp: ; d2c3
-	ds 2
-OTPartyMon2AtkExp: ; d2c5
-	ds 2
-OTPartyMon2DefExp: ; d2c7
-	ds 2
-OTPartyMon2SpdExp: ; d2c9
-	ds 2
-OTPartyMon2SpclExp: ; d2cb
-	ds 2
-
-OTPartyMon2DVs: ; d2cd
-OTPartyMon2AtkDefDV: ; d2cd
-	ds 1
-OTPartyMon2SpdSpclDV: ; d2ce
-	ds 1
-
-OTPartyMon2PP: ; d2cf
-OTPartyMon2PPMove1: ; d2cf
-	ds 1
-OTPartyMon2PPMove2: ; d2d0
-	ds 1
-OTPartyMon2PPMove3: ; d2d1
-	ds 1
-OTPartyMon2PPMove4: ; d2d2
-	ds 1
-
-OTPartyMon2Happiness: ; d2d3
-	ds 1
-OTPartyMon2PokerusStatus: ; d2d4
-	ds 1
-
-OTPartyMon2CaughtData: ; d2d5
-OTPartyMon2CaughtGender: ; d2d5
-OTPartyMon2CaughtLocation: ; d2d5
-	ds 1
-OTPartyMon2CaughtTime: ; d2d6
-	ds 1
-OTPartyMon2Level: ; d2d7
-	ds 1
-	
-OTPartyMon2Status: ; d2d8
-	ds 1
-OTPartyMon2Unused: ; d2d9
-	ds 1
-OTPartyMon2CurHP: ; d2da
-	ds 2
-OTPartyMon2MaxHP: ; d2dc
-	ds 2
-OTPartyMon2Atk: ; d2de
-	ds 2
-OTPartyMon2Def: ; d2e0
-	ds 2
-OTPartyMon2Spd: ; d2e2
-	ds 2
-OTPartyMon2SpclAtk: ; d2e4
-	ds 2
-OTPartyMon2SpclDef: ; d2e6
-	ds 2
-
+	ds 48
 OTPartyMon3: ; d2e8
-OTPartyMon3Species2: ; d2e8
-	ds 1
-OTPartyMon3Item: ; d2e9
-	ds 1
-
-OTPartyMon3Moves: ; d2ea
-OTPartyMon3Move1: ; d2ea
-	ds 1
-OTPartyMon3Move2: ; d2eb
-	ds 1
-OTPartyMon3Move3: ; d2ec
-	ds 1
-OTPartyMon3Move4: ; d2ed
-	ds 1
-	
-OTPartyMon3ID: ; d2ee
-	ds 2
-OTPartyMon3Exp: ; d2f0
-	ds 3
-OTPartyMon3HPExp: ; d2f3
-	ds 2
-OTPartyMon3AtkExp: ; d2f5
-	ds 2
-OTPartyMon3DefExp: ; d2f7
-	ds 2
-OTPartyMon3SpdExp: ; d2f9
-	ds 2
-OTPartyMon3SpclExp: ; d2fb
-	ds 2
-
-OTPartyMon3DVs: ; d2fd
-OTPartyMon3AtkDefDV: ; d2fd
-	ds 1
-OTPartyMon3SpdSpclDV: ; d2fe
-	ds 1
-
-OTPartyMon3PP: ; d2ff
-OTPartyMon3PPMove1: ; d2ff
-	ds 1
-OTPartyMon3PPMove2: ; d300
-	ds 1
-OTPartyMon3PPMove3: ; d301
-	ds 1
-OTPartyMon3PPMove4: ; d302
-	ds 1
-
-OTPartyMon3Happiness: ; d303
-	ds 1
-OTPartyMon3PokerusStatus: ; d304
-	ds 1
-
-OTPartyMon3CaughtData: ; d305
-OTPartyMon3CaughtGender: ; d305
-OTPartyMon3CaughtLocation: ; d305
-	ds 1
-OTPartyMon3CaughtTime: ; d306
-	ds 1
-OTPartyMon3Level: ; d307
-	ds 1
-	
-OTPartyMon3Status: ; d308
-	ds 1
-OTPartyMon3Unused: ; d309
-	ds 1
-OTPartyMon3CurHP: ; d30a
-	ds 2
-OTPartyMon3MaxHP: ; d30c
-	ds 2
-OTPartyMon3Atk: ; d30e
-	ds 2
-OTPartyMon3Def: ; d310
-	ds 2
-OTPartyMon3Spd: ; d312
-	ds 2
-OTPartyMon3SpclAtk: ; d314
-	ds 2
-OTPartyMon3SpclDef: ; d316
-	ds 2
-
+	ds 48
 OTPartyMon4: ; d318
-OTPartyMon4Species2: ; d318
-	ds 1
-OTPartyMon4Item: ; d319
-	ds 1
-
-OTPartyMon4Moves: ; d31a
-OTPartyMon4Move1: ; d31a
-	ds 1
-OTPartyMon4Move2: ; d31b
-	ds 1
-OTPartyMon4Move3: ; d31c
-	ds 1
-OTPartyMon4Move4: ; d31d
-	ds 1
-	
-OTPartyMon4ID: ; d31e
-	ds 2
-OTPartyMon4Exp: ; d320
-	ds 3
-OTPartyMon4HPExp: ; d323
-	ds 2
-OTPartyMon4AtkExp: ; d325
-	ds 2
-OTPartyMon4DefExp: ; d327
-	ds 2
-OTPartyMon4SpdExp: ; d329
-	ds 2
-OTPartyMon4SpclExp: ; d32b
-	ds 2
-
-OTPartyMon4DVs: ; d32d
-OTPartyMon4AtkDefDV: ; d32d
-	ds 1
-OTPartyMon4SpdSpclDV: ; d32e
-	ds 1
-
-OTPartyMon4PP: ; d32f
-OTPartyMon4PPMove1: ; d32f
-	ds 1
-OTPartyMon4PPMove2: ; d330
-	ds 1
-OTPartyMon4PPMove3: ; d331
-	ds 1
-OTPartyMon4PPMove4: ; d332
-	ds 1
-
-OTPartyMon4Happiness: ; d333
-	ds 1
-OTPartyMon4PokerusStatus: ; d334
-	ds 1
-
-OTPartyMon4CaughtData: ; d335
-OTPartyMon4CaughtGender: ; d335
-OTPartyMon4CaughtLocation: ; d335
-	ds 1
-OTPartyMon4CaughtTime: ; d336
-	ds 1
-OTPartyMon4Level: ; d337
-	ds 1
-	
-OTPartyMon4Status: ; d338
-	ds 1
-OTPartyMon4Unused: ; d339
-	ds 1
-OTPartyMon4CurHP: ; d33a
-	ds 2
-OTPartyMon4MaxHP: ; d33c
-	ds 2
-OTPartyMon4Atk: ; d33e
-	ds 2
-OTPartyMon4Def: ; d340
-	ds 2
-OTPartyMon4Spd: ; d342
-	ds 2
-OTPartyMon4SpclAtk: ; d344
-	ds 2
-OTPartyMon4SpclDef: ; d346
-	ds 2
-
+	ds 48
 OTPartyMon5: ; d348
-OTPartyMon5Species2: ; d348
-	ds 1
-OTPartyMon5Item: ; d349
-	ds 1
-
-OTPartyMon5Moves: ; d34a
-OTPartyMon5Move1: ; d34a
-	ds 1
-OTPartyMon5Move2: ; d34b
-	ds 1
-OTPartyMon5Move3: ; d34c
-	ds 1
-OTPartyMon5Move4: ; d34d
-	ds 1
-	
-OTPartyMon5ID: ; d34e
-	ds 2
-OTPartyMon5Exp: ; d350
-	ds 3
-OTPartyMon5HPExp: ; d353
-	ds 2
-OTPartyMon5AtkExp: ; d355
-	ds 2
-OTPartyMon5DefExp: ; d357
-	ds 2
-OTPartyMon5SpdExp: ; d359
-	ds 2
-OTPartyMon5SpclExp: ; d35b
-	ds 2
-
-OTPartyMon5DVs: ; d35d
-OTPartyMon5AtkDefDV: ; d35d
-	ds 1
-OTPartyMon5SpdSpclDV: ; d35e
-	ds 1
-
-OTPartyMon5PP: ; d35f
-OTPartyMon5PPMove1: ; d35f
-	ds 1
-OTPartyMon5PPMove2: ; d360
-	ds 1
-OTPartyMon5PPMove3: ; d361
-	ds 1
-OTPartyMon5PPMove4: ; d362
-	ds 1
-
-OTPartyMon5Happiness: ; d363
-	ds 1
-OTPartyMon5PokerusStatus: ; d364
-	ds 1
-
-OTPartyMon5CaughtData: ; d365
-OTPartyMon5CaughtGender: ; d365
-OTPartyMon5CaughtLocation: ; d365
-	ds 1
-OTPartyMon5CaughtTime: ; d366
-	ds 1
-OTPartyMon5Level: ; d367
-	ds 1
-	
-OTPartyMon5Status: ; d368
-	ds 1
-OTPartyMon5Unused: ; d369
-	ds 1
-OTPartyMon5CurHP: ; d36a
-	ds 2
-OTPartyMon5MaxHP: ; d36c
-	ds 2
-OTPartyMon5Atk: ; d36e
-	ds 2
-OTPartyMon5Def: ; d370
-	ds 2
-OTPartyMon5Spd: ; d372
-	ds 2
-OTPartyMon5SpclAtk: ; d374
-	ds 2
-OTPartyMon5SpclDef: ; d376
-	ds 2
-
+	ds 48
 OTPartyMon6: ; d378
-OTPartyMon6Species2: ; d378
-	ds 1
-OTPartyMon6Item: ; d379
-	ds 1
+	ds 48
 
-OTPartyMon6Moves: ; d37a
-OTPartyMon6Move1: ; d37a
-	ds 1
-OTPartyMon6Move2: ; d37b
-	ds 1
-OTPartyMon6Move3: ; d37c
-	ds 1
-OTPartyMon6Move4: ; d37d
-	ds 1
-	
-OTPartyMon6ID: ; d37e
-	ds 2
-OTPartyMon6Exp: ; d380
-	ds 3
-OTPartyMon6HPExp: ; d383
-	ds 2
-OTPartyMon6AtkExp: ; d385
-	ds 2
-OTPartyMon6DefExp: ; d387
-	ds 2
-OTPartyMon6SpdExp: ; d389
-	ds 2
-OTPartyMon6SpclExp: ; d38b
-	ds 2
 
-OTPartyMon6DVs: ; d38d
-OTPartyMon6AtkDefDV: ; d38d
-	ds 1
-OTPartyMon6SpdSpclDV: ; d38e
-	ds 1
-
-OTPartyMon6PP: ; d38f
-OTPartyMon6PPMove1: ; d38f
-	ds 1
-OTPartyMon6PPMove2: ; d390
-	ds 1
-OTPartyMon6PPMove3: ; d391
-	ds 1
-OTPartyMon6PPMove4: ; d392
-	ds 1
-
-OTPartyMon6Happiness: ; d393
-	ds 1
-OTPartyMon6PokerusStatus: ; d394
-	ds 1
-
-OTPartyMon6CaughtData: ; d395
-OTPartyMon6CaughtGender: ; d395
-OTPartyMon6CaughtLocation: ; d395
-	ds 1
-OTPartyMon6CaughtTime: ; d396
-	ds 1
-OTPartyMon6Level: ; d397
-	ds 1
-	
-OTPartyMon6Status: ; d398
-	ds 1
-OTPartyMon6Unused: ; d399
-	ds 1
-OTPartyMon6CurHP: ; d39a
-	ds 2
-OTPartyMon6MaxHP: ; d39c
-	ds 2
-OTPartyMon6Atk: ; d39e
-	ds 2
-OTPartyMon6Def: ; d3a0
-	ds 2
-OTPartyMon6Spd: ; d3a2
-	ds 2
-OTPartyMon6SpclAtk: ; d3a4
-	ds 2
-OTPartyMon6SpclDef: ; d3a6
-	ds 2
-
 OTPartyMonOT:
 OTPartyMon1OT: ; d3a8
 	ds 11
@@ -1676,6 +1276,7 @@
 	ds 2
 PartyMon1Exp: ; dce7
 	ds 3
+
 PartyMon1HPExp: ; dcea
 	ds 2
 PartyMon1AtkExp: ; dcec
@@ -1686,8 +1287,11 @@
 	ds 2
 PartyMon1SpclExp: ; dcf2
 	ds 2
+
 PartyMon1DVs: ; dcf4
-	ds 2 ; Atk/Def/Spd/Spcl, HP is the high bits of these four nybbles
+; hp = %1000 for each dv
+	ds 1 ; atk/def
+	ds 1 ; spd/spc
 PartyMon1PP: ; dcf6
 	ds 4
 PartyMon1Happiness: ; dcfa
@@ -1723,337 +1327,18 @@
 	ds 2
 
 
-
 PartyMon2: ; dd0f
-PartyMon2Species: ; dd0f
-	ds 1
-PartyMon2Item: ; dd10
-	ds 1
-PartyMon2Moves: ; dd11
-PartyMon2Move1: ; dd11
-	ds 1
-PartyMon2Move2: ; dd12
-	ds 1
-PartyMon2Move3: ; dd13
-	ds 1
-PartyMon2Move4: ; dd14
-	ds 1
-PartyMon2ID: ; dd15
-	ds 2
-PartyMon2Exp: ; dd17
-	ds 3
-PartyMon2HPExp: ; dd1a
-	ds 2
-PartyMon2AtkExp: ; dd1c
-	ds 2
-PartyMon2DefExp: ; dd1e
-	ds 2
-PartyMon2SpdExp: ; dd20
-	ds 2
-PartyMon2SpclExp: ; dd22
-	ds 2
-PartyMon2DVs: ; dd24
-	ds 2 ; Atk/Def/Spd/Spcl, HP is the high bits of these four nybbles
-PartyMon2PP: ; dd26
-	ds 4
-PartyMon2Happiness: ; dd2a
-	ds 1
-PartyMon2PokerusStatus: ; dd2b
-	ds 1
-PartyMon2CaughtData: ; dd2c
-PartyMon2CaughtTime: ; dd2c
-PartyMon2CaughtLevel ; dd2c
-	ds 1
-PartyMon2CaughtGender: ; dd2d
-PartyMon2CaughtLocation: ; dd2d
-	ds 1
-PartyMon2Level: ; dd2e
-	ds 1
-PartyMon2Status: ; dd2f
-	ds 1
-; dd30 unused
-	ds 1
-PartyMon2CurHP: ; dd31
-	ds 2
-PartyMon2MaxHP: ; dd33
-	ds 2
-PartyMon2Atk: ; dd35
-	ds 2
-PartyMon2Def: ; dd37
-	ds 2
-PartyMon2Spd: ; dd39
-	ds 2
-PartyMon2SpclAtk: ; dd3b
-	ds 2
-PartyMon2SpclDef: ; dd3d
-	ds 2
-
-
-
+	ds 48
 PartyMon3: ; dd3f
-PartyMon3Species: ; dd3f
-	ds 1
-PartyMon3Item: ; dd40
-	ds 1
-PartyMon3Moves: ; dd41
-PartyMon3Move1: ; dd41
-	ds 1
-PartyMon3Move2: ; dd42
-	ds 1
-PartyMon3Move3: ; dd43
-	ds 1
-PartyMon3Move4: ; dd44
-	ds 1
-PartyMon3ID: ; dd45
-	ds 2
-PartyMon3Exp: ; dd47
-	ds 3
-PartyMon3HPExp: ; dd4a
-	ds 2
-PartyMon3AtkExp: ; dd4c
-	ds 2
-PartyMon3DefExp: ; dd4e
-	ds 2
-PartyMon3SpdExp: ; dd50
-	ds 2
-PartyMon3SpclExp: ; dd52
-	ds 2
-PartyMon3DVs: ; dd54
-	ds 2 ; Atk/Def/Spd/Spcl, HP is the high bits of these four nybbles
-PartyMon3PP: ; dd56
-	ds 4
-PartyMon3Happiness: ; dd5a
-	ds 1
-PartyMon3PokerusStatus: ; dd5b
-	ds 1
-PartyMon3CaughtData: ; dd5c
-PartyMon3CaughtTime: ; dd5c
-PartyMon3CaughtLevel ; dd5c
-	ds 1
-PartyMon3CaughtGender: ; dd5d
-PartyMon3CaughtLocation: ; dd5d
-	ds 1
-PartyMon3Level: ; dd5e
-	ds 1
-PartyMon3Status: ; dd5f
-	ds 1
-; dd60 unused
-	ds 1
-PartyMon3CurHP: ; dd61
-	ds 2
-PartyMon3MaxHP: ; dd63
-	ds 2
-PartyMon3Atk: ; dd65
-	ds 2
-PartyMon3Def: ; dd67
-	ds 2
-PartyMon3Spd: ; dd69
-	ds 2
-PartyMon3SpclAtk: ; dd6b
-	ds 2
-PartyMon3SpclDef: ; dd6d
-	ds 2
-
-
-
+	ds 48
 PartyMon4: ; dd6f
-PartyMon4Species: ; dd6f
-	ds 1
-PartyMon4Item: ; dd70
-	ds 1
-PartyMon4Moves: ; dd71
-PartyMon4Move1: ; dd71
-	ds 1
-PartyMon4Move2: ; dd72
-	ds 1
-PartyMon4Move3: ; dd73
-	ds 1
-PartyMon4Move4: ; dd74
-	ds 1
-PartyMon4ID: ; dd75
-	ds 2
-PartyMon4Exp: ; dd77
-	ds 3
-PartyMon4HPExp: ; dd7a
-	ds 2
-PartyMon4AtkExp: ; dd7c
-	ds 2
-PartyMon4DefExp: ; dd7e
-	ds 2
-PartyMon4SpdExp: ; dd80
-	ds 2
-PartyMon4SpclExp: ; dd82
-	ds 2
-PartyMon4DVs: ; dd84
-	ds 2 ; Atk/Def/Spd/Spcl, HP is the high bits of these four nybbles
-PartyMon4PP: ; dd86
-	ds 4
-PartyMon4Happiness: ; dd8a
-	ds 1
-PartyMon4PokerusStatus: ; dd8b
-	ds 1
-PartyMon4CaughtData: ; dd8c
-PartyMon4CaughtTime: ; dd8c
-PartyMon4CaughtLevel ; dd8c
-	ds 1
-PartyMon4CaughtGender: ; dd8d
-PartyMon4CaughtLocation: ; dd8d
-	ds 1
-PartyMon4Level: ; dd8e
-	ds 1
-PartyMon4Status: ; dd8f
-	ds 1
-; dd90 unused
-	ds 1
-PartyMon4CurHP: ; dd91
-	ds 2
-PartyMon4MaxHP: ; dd93
-	ds 2
-PartyMon4Atk: ; dd95
-	ds 2
-PartyMon4Def: ; dd97
-	ds 2
-PartyMon4Spd: ; dd99
-	ds 2
-PartyMon4SpclAtk: ; dd9b
-	ds 2
-PartyMon4SpclDef: ; dd9d
-	ds 2
-
-
-
+	ds 48
 PartyMon5: ; dd9f
-PartyMon5Species: ; dd9f
-	ds 1
-PartyMon5Item: ; dda0
-	ds 1
-PartyMon5Moves: ; dda1
-PartyMon5Move1: ; dda1
-	ds 1
-PartyMon5Move2: ; dda2
-	ds 1
-PartyMon5Move3: ; dda3
-	ds 1
-PartyMon5Move4: ; dda4
-	ds 1
-PartyMon5ID: ; dda5
-	ds 2
-PartyMon5Exp: ; dda7
-	ds 3
-PartyMon5HPExp: ; ddaa
-	ds 2
-PartyMon5AtkExp: ; ddac
-	ds 2
-PartyMon5DefExp: ; ddae
-	ds 2
-PartyMon5SpdExp: ; ddb0
-	ds 2
-PartyMon5SpclExp: ; ddb2
-	ds 2
-PartyMon5DVs: ; ddb4
-	ds 2 ; Atk/Def/Spd/Spcl, HP is the high bits of these four nybbles
-PartyMon5PP: ; ddb6
-	ds 4
-PartyMon5Happiness: ; ddba
-	ds 1
-PartyMon5PokerusStatus: ; ddbb
-	ds 1
-PartyMon5CaughtData: ; ddbc
-PartyMon5CaughtTime: ; ddbc
-PartyMon5CaughtLevel ; ddbc
-	ds 1
-PartyMon5CaughtGender: ; ddbd
-PartyMon5CaughtLocation: ; ddbd
-	ds 1
-PartyMon5Level: ; ddbe
-	ds 1
-PartyMon5Status: ; ddbf
-	ds 1
-; ddc0 unused
-	ds 1
-PartyMon5CurHP: ; ddc1
-	ds 2
-PartyMon5MaxHP: ; ddc3
-	ds 2
-PartyMon5Atk: ; ddc5
-	ds 2
-PartyMon5Def: ; ddc7
-	ds 2
-PartyMon5Spd: ; ddc9
-	ds 2
-PartyMon5SpclAtk: ; ddcb
-	ds 2
-PartyMon5SpclDef: ; ddcd
-	ds 2
-
-
-
+	ds 48
 PartyMon6: ; ddcf
-PartyMon6Species: ; ddcf
-	ds 1
-PartyMon6Item: ; ddd0
-	ds 1
-PartyMon6Moves: ; ddd1
-PartyMon6Move1: ; ddd1
-	ds 1
-PartyMon6Move2: ; ddd2
-	ds 1
-PartyMon6Move3: ; ddd3
-	ds 1
-PartyMon6Move4: ; ddd4
-	ds 1
-PartyMon6ID: ; ddd5
-	ds 2
-PartyMon6Exp: ; ddd7
-	ds 3
-PartyMon6HPExp: ; ddda
-	ds 2
-PartyMon6AtkExp: ; dddc
-	ds 2
-PartyMon6DefExp: ; ddde
-	ds 2
-PartyMon6SpdExp: ; dde0
-	ds 2
-PartyMon6SpclExp: ; dde2
-	ds 2
-PartyMon6DVs: ; dde4
-	ds 2 ; Atk/Def/Spd/Spcl, HP is the high bits of these four nybbles
-PartyMon6PP: ; dde6
-	ds 4
-PartyMon6Happiness: ; ddea
-	ds 1
-PartyMon6PokerusStatus: ; ddeb
-	ds 1
-PartyMon6CaughtData: ; ddec
-PartyMon6CaughtTime: ; ddec
-PartyMon6CaughtLevel ; ddec
-	ds 1
-PartyMon6CaughtGender: ; dded
-PartyMon6CaughtLocation: ; dded
-	ds 1
-PartyMon6Level: ; ddee
-	ds 1
-PartyMon6Status: ; ddef
-	ds 1
-; ddf0 unused
-	ds 1
-PartyMon6CurHP: ; ddf1
-	ds 2
-PartyMon6MaxHP: ; ddf3
-	ds 2
-PartyMon6Atk: ; ddf5
-	ds 2
-PartyMon6Def: ; ddf7
-	ds 2
-PartyMon6Spd: ; ddf9
-	ds 2
-PartyMon6SpclAtk: ; ddfb
-	ds 2
-PartyMon6SpclDef: ; ddfd
-	ds 2
-	
+	ds 48
 
-
+PartyMonOT:
 PartyMon1OT: ; ddff
 	ds 11
 PartyMon2OT: ; de0a