Revert bad merge.

"Merge pull request #317 from yenatch/pngs-kind-of"

This reverts commit 25025d1b6c, reversing
changes made to 0d17d4a758.

INSTALL.md

@@ -13,7 +13,6 @@ cd ..
 
 git clone --recursive https://github.com/pret/pokecrystal
 cd pokecrystal
-make init
 ```
 
 To build **pokecrystal.gbc**:
@@ -38,7 +37,6 @@ cd ..
 
 git clone --recursive https://github.com/pret/pokecrystal
 cd pokecrystal
-make init
 ```
 
 To build **pokecrystal.gbc**:
@@ -66,7 +64,6 @@ pip install pypng
 
 git clone --recursive https://github.com/pret/pokecrystal
 cd pokecrystal
-make init
 ```
 
 To build **pokecrystal.gbc**:
@@ -91,7 +88,7 @@ mkdir vagrantbox
 cd vagrantbox
 vagrant init pokecrystal
 vagrant up
-vagrant ssh -c "cd /vagrant && git clone --recursive https://github.com/pret/pokecrystal && cd pokecrystal && make init"
+vagrant ssh -c "cd /vagrant && git clone --recursive https://github.com/pret/pokecrystal"
 vagrant ssh
 ```
 

Makefile

@@ -79,11 +79,6 @@ pngs:
 	find . -iname "*.[12]bpp" -exec touch {} \;
 	find . -iname "*.lz"      -exec touch {} \;
 
-init:
-	find . -iname "*.[12]bpp" -exec touch {} \;
-	find . -iname "*.lz"      -exec touch {} \;
-
-
 %.2bpp: %.png ; $(gfx) 2bpp $<
 %.1bpp: %.png ; $(gfx) 1bpp $<
 %.lz:   %     ; $(gfx) lz $<

gfx.py

@@ -12,17 +12,12 @@ pics = [
 	'gfx/shrink2',
 ]
 
-cache = {}
+base_stats = None
-def get_cache(filename):
-	global cache
-	cached = cache.get(filename)
-	if cached == None:
-		cached = open(filename).read()
-		cache[filename] = cached
-	return cached
-
 def get_base_stats():
-	return get_cache('data/base_stats.asm')
+	global base_stats
+	if not base_stats:
+		base_stats = open('data/base_stats.asm').read()
+	return base_stats
 
 def get_pokemon_dimensions(name):
 	if name == 'egg':
@@ -47,7 +42,7 @@ def filepath_rules(filepath):
 	pokemon_name = ''
 
 	if 'gfx/pics/' in filedir:
-		pokemon_name = filedir.split('/')[-1]
+		pokemon_name = filedir.split('/')[3]
 		if pokemon_name.startswith('unown_'):
 			index = filedir.find(pokemon_name)
 			if index != -1:

gfx/overworld/001.2bpp

@@ -0,0 +1,2 @@
+3?<?PBààðøˆøÌü<üþ
+þB?2>9OO3>

üL|œþòþòü|Høðp€€0?;<_OààðøøüÜ<þúþò??;7\t?<

üüÜìþ:.þü<Øèðp€€8???ààðøì>ÂŒüüüø˜?<?3S¼ÿÿ»|D88ðøhüìþò_ýÿÝ>"?(?!ððøüÄüæþþÿÿ!?9?<OO?>

þ&>ÎþòþòÌ|øx@À€€?/?'ððøüüþîÿýÿù5;?.>?

þþîöÿÿþøøXè°° ? ?p?)?)ÀÀ àð8Ø|„øøøð0? ?<?3Sÿ¿þ»uM88à ðÐüÜþâÿÝ?ýúæ

gfx/overworld/002.2bpp

@@ -0,0 +1 @@
+?7S@oRְְננרררר<D7A8>ל‏ֺ‏צJ?3

<0E>ּp°ר¨ר(נ0ָרˆרpp????_Oo_אאננרר<D7A8><D7A8><EFBFBD><EFBFBD>‏ת‏עצת;7</?+<0E>ל<פ<>װרננטרˆרpp???9ְְננרררר<D7A8><D7A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|<7C>

רָp°ר¨ר(נ0ָרˆרpp

gfx/overworld/008.2bpp

@@ -0,0 +1,7 @@
+

(7P@oR€€à`0Ðøìþ
+þöJ?0/9M~^??9???üôœ²~zþüüøœüüü

/0PP@€€à`0Ðøôþ
+þ
+þ?0_xW~Os?39?>>üúê~òÎüÌ8øœü||>!? ? ?(ÀÀà p<>øüüüdü? üxè¸øäœäüüøðð

(7P@oR€€à`0Ðøìþ
+þöJ?0Oy_~??üòžú~üüøø8ø0ðÀÀ

/0P@oP€€à`0Ðøôþ
+þö
+?0_x_~Os?3üúú~òÎüÌ8ø0ðÀÀ	#<}B@@P€€À@à ðøøøÈø(@>1=#ø(ðÐpð àp<C3A0>ð<EFBFBD>pðàà

gfx/overworld/016.2bpp

@@ -0,0 +1 @@
+"?"?*?O_yְְ0נר<04>$<24>4<EFBFBD>r‏ת<E2808F>/??'>'	פ<>ר<18>ה|הָרpנ<70>נ`` ? ? ?@Dְְ0נר<04><04><04>‏"‏$??/?/	$<24>Xר<58>פ<EFBFBD>פ˜רpנ<70>נ`` ?DI.?ְְ0נרר<04><04><04>ר
<03>נאאאאא`א`ְְ@ְְְ

gfx/overworld/026.2bpp

@@ -0,0 +1,2 @@
+?"='?(HJ<7F><4A><EFBFBD>0<EFBFBD><08>D<EFBFBD><44><EFBFBD><14><12>R?*?$C?%	<06>T<EFBFBD>$<24><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>А<EFBFBD>``? ? ? @@<40><><EFBFBD>0<EFBFBD><08><04><04><04><02>? ?!C?'	<06><04><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>А<EFBFBD>``<15><><EFBFBD>0<EFBFBD><08><04><04><><EFBFBD><EFBFBD><EFBFBD>
+<03><02><><EFBFBD><04><02>,<2C><>@<40><><EFBFBD>

gfx/overworld/045.2bpp

@@ -0,0 +1 @@
+;>?8ΰΰππψψθψά|όψHψH	?/?(?<p<>ππψθότόό<ψ8ψψ;?=?ΰΰpπΈψΨψάόΌόxψψθ?/_X~πψψότώϊώώ~ψΈψψ>?=3ΐΐΰψθόμώμώμώπόόόψxπpΰΰπππ<CF80>ψψψψππ;>?8ΰΰππψψθψά|όψHψH	?/?(?<p<>ππψθότόό<ψ8ΰΰ;?=?ΰΰpπΈψΨψάόΌόxψψθ?/_X~πψθότόόψψxπ°ΰΰ>?=3ΐΐΰψθόμώμώμώπόόό	
ψxπpΰΰππό<CF80>ό|ό|ππ