Merge https://github.com/kanzure/pokecrystal

.gitignore

@@ -17,6 +17,9 @@
 # swap files for vim
 .*.swp
 
+# swap files for gedit
+*~
+
 # no data from extras/
 extras/*.json
 

INSTALL.md

@@ -5,6 +5,7 @@ sudo apt-get install make gcc bison git python python-setuptools
 
 # unittest2 is required if using python2.6
 sudo easy_install unittest2
+sudo easy_install pip
 
 # download rgbds source code
 git clone git://github.com/bentley/rgbds.git
@@ -18,9 +19,12 @@ sudo make install
 which rgbasm
 
 # download pokecrystal
-git clone https://github.com/kanzure/pokecrystal.git
+git clone git://github.com/kanzure/pokecrystal.git
 cd pokecrystal
 
+# install python requirements
+pip install -r requirements.txt
+
 make clean && make
 ```
 
@@ -128,7 +132,7 @@ Now you should be able to build `pokecrystal` for the first time:
 
 ```bash
 cd ~
-git clone https://github.com/kanzure/pokecrystal.git
+git clone git://github.com/kanzure/pokecrystal.git
 cd pokecrystal
 ```
 

Makefile

@@ -1,14 +1,34 @@
-.SUFFIXES: .asm .tx .o .gbc
+.SUFFIXES: .asm .tx .o .gbc .png .2bpp .lz
 
 TEXTFILES =	text/sweethoney.tx \
 		text/phone/bill.tx \
 		text/phone/elm.tx \
 		text/phone/mom.tx \
 		text/phone/trainers1.tx \
+		text/common.tx \
+		text/common_2.tx \
+		text/common_3.tx \
 		main.tx
 
+VERTGFX =	gfx/pics/%.png \
+		gfx/trainers/%.png
+
+HORIZGFX =	$(filter-out gfx/%.png, $(VERTGFX))
+
+
+# uncomment this build target to enable png import:
+
+#all: lzs
+
+# the recompressed graphics may be larger than the originals,
+# so take care to reorganize accordingly
+
 all: pokecrystal.gbc
 
+clean:
+	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
+
+
 pokecrystal.o: pokecrystal.asm constants.asm wram.asm ${TEXTFILES}
 	rgbasm -o pokecrystal.o pokecrystal.asm
 	
@@ -20,5 +40,19 @@ pokecrystal.gbc: pokecrystal.o
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 	cmp baserom.gbc $@
 
-clean:
-	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
+
+lzs: ${VERTGFX} ${HORIZGFX}
+
+pngs:
+	cd extras; python gfx.py mass-decompress; python gfx.py dump-pngs
+
+
+front.png: tiles.png
+	cd extras; python gfx.py png-to-lz --front $@ $(OBJECT_DIRECTORY)/tiles.2bpp
+tiles.png:
+	cd extras; python gfx.py png-to-2bpp $@
+.png: ${VERTGFX}
+	cd extras; python gfx.py png-to-lz --vert $@
+.png: ${HORIZGFX}
+	cd extras; python gfx.py png-to-lz $@
+

README.md

@@ -23,6 +23,7 @@ sudo apt-get install make gcc bison git python python-setuptools
 
 # unittest2 is required if using python2.6
 sudo easy_install unittest2
+sudo easy_install pip
 
 # download rgbds source code
 git clone git://github.com/bentley/rgbds.git
@@ -39,6 +40,8 @@ which rgbasm
 git clone https://github.com/kanzure/pokecrystal.git
 cd pokecrystal
 
+pip install -r requirements.txt
+
 make clean && make
 ```
 

audio/cry_pointers.asm

@@ -0,0 +1,70 @@
+; e91b0
+	dbw $3c, $747d
+	dbw $3c, $7486
+	dbw $3c, $748f
+	dbw $3c, $7498
+	dbw $3c, $74a1
+	dbw $3c, $74aa
+	dbw $3c, $74b3
+	dbw $3c, $74bc
+	dbw $3c, $74c5
+	dbw $3c, $74ce
+	dbw $3c, $74d7
+	dbw $3c, $74e0
+	dbw $3c, $74e9
+	dbw $3c, $74f2
+	dbw $3c, $74fb
+	dbw $3c, $7504
+	dbw $3c, $750d
+	dbw $3c, $7516
+	dbw $3c, $751f
+	dbw $3c, $7528
+	dbw $3c, $7531
+	dbw $3c, $753a
+	dbw $3c, $7543
+	dbw $3c, $754c
+	dbw $3c, $7555
+	dbw $3c, $755e
+	dbw $3c, $7567
+	dbw $3c, $7570
+	dbw $3c, $7579
+	dbw $3c, $7582
+	dbw $3c, $758b
+	dbw $3c, $7594
+	dbw $3c, $759d
+	dbw $3c, $75a6
+	dbw $3c, $75af
+	dbw $3c, $75b8
+	dbw $3c, $75c1
+	dbw $3c, $75ca
+	dbw $3c, $6d81
+	dbw $3c, $6d96
+	dbw $3c, $6d8a
+	dbw $3c, $6dde
+	dbw $3c, $6d9f
+	dbw $3c, $6dc0
+	dbw $3c, $6d90
+	dbw $3c, $6da8
+	dbw $3c, $6db1
+	dbw $3c, $6db7
+	dbw $3c, $6dc6
+	dbw $3c, $6dcf
+	dbw $3c, $6e35
+	dbw $3c, $6dd8
+	dbw $3c, $6e3e
+	dbw $3c, $6de7
+	dbw $3c, $6ded
+	dbw $3c, $6e6b
+	dbw $3c, $6df6
+	dbw $3c, $6e74
+	dbw $3c, $6e08
+	dbw $3c, $6e11
+	dbw $3c, $6e1a
+	dbw $3c, $6e23
+	dbw $3c, $6e2c
+	dbw $3c, $6e62
+	dbw $3c, $6e47
+	dbw $3c, $6e50
+	dbw $3c, $6e59
+	dbw $3c, $6dff
+; e927c