Merge pull request #587 from Rangi42/master

Remove dependency on 'extras' submodule

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "extras"]
-	path = extras
-	url = git://github.com/pret/pokemon-reverse-engineering-tools.git

Makefile

@@ -1,15 +1,3 @@
-ifeq (,$(shell which sha1sum))
-SHA1 := shasum
-else
-SHA1 := sha1sum
-endif
-
-RGBDS ?= 
-RGBASM ?= $(RGBDS)rgbasm
-RGBFIX ?= $(RGBDS)rgbfix
-RGBGFX ?= $(RGBDS)rgbgfx
-RGBLINK ?= $(RGBDS)rgblink
-
 roms := pokecrystal.gbc pokecrystal11.gbc
 
 crystal_obj := \
@@ -31,10 +19,25 @@ lib/mobile/main.o
 crystal11_obj := $(crystal_obj:.o=11.o)
 
 
+### Build tools
+
+ifeq (,$(shell which sha1sum))
+SHA1 := shasum
+else
+SHA1 := sha1sum
+endif
+
+RGBDS ?=
+RGBASM  ?= $(RGBDS)rgbasm
+RGBFIX  ?= $(RGBDS)rgbfix
+RGBGFX  ?= $(RGBDS)rgbgfx
+RGBLINK ?= $(RGBDS)rgblink
+
+
 ### Build targets
 
 .SUFFIXES:
-.PHONY: all crystal crystal11 clean compare tools tidy
+.PHONY: all crystal crystal11 clean tidy compare tools
 .SECONDEXPANSION:
 .PRECIOUS:
 .SECONDARY:

tools/gfx.py

@@ -3,7 +3,7 @@
 import os
 import argparse
 
-from extras.pokemontools import gfx, lz
+from pokemontools import gfx, lz
 
 
 # Graphics with inverted tilemaps that aren't covered by filepath_rules.
@@ -146,7 +146,7 @@ def filepath_rules(filepath):
 
     pokemon_name = ''
 
-    if 'gfx/pics/' in filedir:
+    if 'gfx/pokemon/' in filedir:
         pokemon_name = filedir.split('/')[-1]
         if pokemon_name.startswith('unown_'):
             index = filedir.find(pokemon_name)

tools/pokemontools/__init__.py

@@ -0,0 +1 @@
+# A subset of https://github.com/pret/pokemon-reverse-engineering-tools