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<7F><42><10><08><><EFBFBD><EFBFBD><EFBFBD><<3C><>
+<EFBFBD>B?2>9OO3>

<01>L|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|H<><48>p<EFBFBD><70>0?;<_O<7F><4F><10><08><08><0C><><<3C><><EFBFBD><EFBFBD>??;7\t?<

<01><><EFBFBD><EFBFBD><EFBFBD>:.<2E><><<3C><><EFBFBD>p<EFBFBD><70>8???<14><><10><08><1C>>Œ<><C28C><EFBFBD><EFBFBD><EFBFBD>?<?3S<7F><53><EFBFBD><EFBFBD>|D88<38><10>h<EFBFBD><68><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>>"?(?!<21><><08><04><><EFBFBD><EFBFBD><EFBFBD><1E><><05>!?9?<OO?>

<01>&><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|<7C>x@<40><><EFBFBD>?/?'<27><><08><04><04><06><><1E><><EFBFBD><EFBFBD>5;?.>?

<01><><EFBFBD><EFBFBD><EFBFBD><17><><1E><>X谰 ? ?p?)?)<29><> <20><10>8<EFBFBD>|<7C><18><><EFBFBD><EFBFBD>0? ?<?3S<7F><53><EFBFBD><EFBFBD>uM88<38> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?<3F><><EFBFBD>

gfx/overworld/002.2bpp

@@ -0,0 +1 @@
+?7S@oR<6F><52><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><02>J?3

gfx/overworld/008.2bpp

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

(7P@oR<6F><52><EFBFBD>`0<><30><14><>
+<EFBFBD><02>J?0/9M~^??9???<3F><0C><><EFBFBD>~z<><7A><EFBFBD><08><><EFBFBD><EFBFBD><EFBFBD>

/0PP@<40><><EFBFBD>`0<><30><08><0C>
+<EFBFBD>
+<EFBFBD>?0_xW~Os?39?>><3E><0C><1E>~<7E><><EFBFBD><EFBFBD>8<EFBFBD><38><EFBFBD>||>!? ? ?(<28><><EFBFBD> p<><70><08><04><04>d<EFBFBD>? <07>x<><78><EFBFBD><1C><><EFBFBD><EFBFBD><EFBFBD><08><><EFBFBD>

(7P@oR<6F><52><EFBFBD>`0<><30><14><>
+<EFBFBD><02>J?0Oy_~??<0F><0C><><EFBFBD>~<7E><><EFBFBD><EFBFBD>8<EFBFBD>0<EFBFBD><30><EFBFBD>

/0P@oP<6F><50><EFBFBD>`0<><30><08><0C>
+<EFBFBD><02>
+?0_x_~Os?3<0F><0C><1E>~<7E><><EFBFBD><EFBFBD>8<EFBFBD>0<EFBFBD><30><EFBFBD>	#<}B@@P<7F><50><EFBFBD>@<40> <20><10><08><08><><EFBFBD>(@>1=#<0F>(<28><>p<EFBFBD> <20>p<EFBFBD><70><EFBFBD>p<EFBFBD><70><EFBFBD>