summaryrefslogtreecommitdiff
path: root/src/braille_puzzles.c
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-27 15:01:18 -0400
committerscnorton <scnorton@biociphers.org>2017-06-27 15:01:18 -0400
commit00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch)
tree5707f8764920abcd4cffca84c675e5c53c32559d /src/braille_puzzles.c
parent3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff)
parent06b6cada0ddedc62063171703ba6607019751a9a (diff)
Merge branch 'master' into pokemon_data
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"