aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-04-16 07:54:36 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-04-16 07:54:36 -0400
commit803aa1f574260333ad1f78e645302b131d7dbd48 (patch)
tree025db6180c0238d1c0458c47ccfe5e0c900bf7f8 /.gitignore
parentReplace item constants (diff)
parenthotfix: Bump pokemontools so gfx.py doesn't look for a baserom. (diff)
downloadpokeyellow-803aa1f574260333ad1f78e645302b131d7dbd48.tar.gz
pokeyellow-803aa1f574260333ad1f78e645302b131d7dbd48.tar.xz
pokeyellow-803aa1f574260333ad1f78e645302b131d7dbd48.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 527dfdd0..d60a2fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-# global label defs are generated
-globals.asm
-
# precompiled python
*.pyc
@@ -21,6 +18,11 @@ globals.asm
# generated
*.tx
+# converted image data
+*.2bpp
+*.1bpp
+*.pic
+
# swap files for vim
.*.swp