aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2013-12-15 16:18:14 -0600
committerMarcus Huderle <huderlem@gmail.com>2013-12-15 16:18:14 -0600
commit549fe35420c2cd114cafa5997633297fa3ff9290 (patch)
tree454f88103f1a3616612afd73bc532adbdf036459 /.gitignore
parentNicknaming screen loads the 'ED' symbol separately. (diff)
parentincbin killing part 2 (diff)
downloadpokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.gz
pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.xz
pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.zip
Merged and fixed incbin conflicts with Danny.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore18
1 files changed, 11 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index aaab40fa..527dfdd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# global label defs are generated
+globals.asm
+
# precompiled python
*.pyc
@@ -9,6 +12,11 @@
# roms
*.gbc
+*.gb
+
+# rgbds extras
+*.map
+*.sym
# generated
*.tx
@@ -20,13 +28,9 @@
*.json
# for any of the poor souls with save game files in their working directory
-baserom.sgm
-baserom.sav
-pokered.sgm
-pokered.sav
-
-baserom.sys
-pokered.sys
+*.sgm
+*.sav
+*.sys
# for vim configuration
# url: http://www.vim.org/scripts/script.php?script_id=441