summaryrefslogtreecommitdiff
path: root/src/field_specials.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/field_specials.c
parent13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff)
parentb22e5219ba01c70da9a03397430bff10d0b99060 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'src/field_specials.c')
-rw-r--r--src/field_specials.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/field_specials.c b/src/field_specials.c
index 9f5a314e2..2cb2cf795 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1,5 +1,6 @@
#include "global.h"
-#include "asm.h"
+#include "field_specials.h"
+#include "diploma.h"
#include "event_data.h"
#include "field_player_avatar.h"
#include "main.h"