Clean up makefile, submodules, root dir; Python 3 compatibility.

1 files changed, 21 insertions, 13 deletions

diff --git a/.gitattributes b/.gitattributes
index 56c86288..3cf462d9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,24 +3,32 @@
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
+
+# files part of the build
 *.asm text
 *.pal text
-
-# Non-source files
-*.sh text
-*.py text
 *.link text
+*.txt text
+
+# extra files
+*.awk text
 *.c text
 *.h text
-*.awk text
 *.md text
+*.py text
+*.sh text
+*.sha1 text
 
 # Denote all files that are truly binary and should not be modified.
-*.png binary
-*.lz binary
-*.2bpp binary
-*.1bpp binary
-*.blk binary
-*.bin binary
-*.tilemap binary
-*.rle binary
\ No newline at end of file
+*.png binary diff=hex
+*.lz.* binary diff=hex
+*.bin binary diff=hex
+*.blk binary diff=hex
+*.rle binary diff=hex
+*.attrmap binary diff=hex
+*.tilemap binary diff=hex
+
+# these are generated but just in case
+*.lz binary   diff=hex
+*.2bpp binary diff=hex
+*.1bpp binary diff=hex