Merge remote-tracking branch 'kanzure/master' into battle-animations

Conflicts:
	pokemontools/wram.py

1 files changed, 3 insertions, 7 deletions

diff --git a/pokemontools/preprocessor.py b/pokemontools/preprocessor.py
index 5ac7724..e7de46d 100644
--- a/pokemontools/preprocessor.py
+++ b/pokemontools/preprocessor.py
@@ -483,22 +483,18 @@ class Preprocessor(object):
         for l in lines:
             self.read_line(l)
 
-        self.update_globals()
-
     def update_globals(self):
         """
         Add any labels not already in globals.asm.
         """
-        # TODO: pokered needs to be fixed
-        try:
-            globes = open(os.path.join(self.config.path, 'globals.asm'), 'r+')
+        path = os.path.join(self.config.path, 'globals.asm')
+        if os.path.exists(path):
+            globes = open(path, 'r+')
             lines = globes.readlines()
             for globe in self.globes:
                 line = 'GLOBAL ' + globe + '\n'
                 if line not in lines:
                     globes.write(line)
-        except Exception as exception:
-            pass # don't care if it's not there...
 
     def read_line(self, l):
         """