summaryrefslogtreecommitdiff
path: root/src/braille_puzzles.c
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-20 20:41:33 -0400
committerGitHub <noreply@github.com>2017-06-20 20:41:33 -0400
commit4ba573ed1eba7c37160ce6107d95447f42902385 (patch)
tree5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/braille_puzzles.c
parent13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff)
parentb22e5219ba01c70da9a03397430bff10d0b99060 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'src/braille_puzzles.c')
-rw-r--r--src/braille_puzzles.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 2ee4f91bb..4de945b9c 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,10 +1,11 @@
#include "global.h"
#include "braille_puzzles.h"
-#include "asm.h"
#include "event_data.h"
#include "field_camera.h"
#include "field_effect.h"
+#include "fieldmap.h"
#include "flags.h"
+#include "main.h"
#include "map_obj_lock.h"
#include "menu.h"
#include "rom6.h"