summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2016-12-01 03:51:24 +0100
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-11-30 18:51:24 -0800
commit4258e60771aa9fdabd678930eca534423bd371b8 (patch)
treeecca2ee7641abc0562f39b6c7dd907af2184e102 /include/global.h
parent831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff)
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files * Use `(void)` for functions without arguments. * Move global-included data to seperate headers * Don't import types or global in header * Fix fieldmap imports * Revert in-code changes * Add missing newlines
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h
index b1bfa25ad..7fbf5755b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -95,8 +95,8 @@ struct SecretBaseRecord
};
#include "game_stat.h"
-#include "fieldmap.h"
-#include "berry.h"
+#include "global.fieldmap.h"
+#include "global.berry.h"
#include "pokemon.h"
struct WarpData