summaryrefslogtreecommitdiff
path: root/arm9
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-05-30 15:06:13 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-05-30 15:06:13 -0400
commit1d92bac012170fda7ec543433eb9572f75f9b710 (patch)
tree712281cce1a3619b3e73d5cde5ed99bc37408027 /arm9
parent6bc6ec1ccc052f03a9c1a5b91b1cf022277c7ab6 (diff)
filesystem.mk; arm7 global symbol names
Diffstat (limited to 'arm9')
-rw-r--r--arm9/Makefile2
-rw-r--r--arm9/config.mk2
2 files changed, 1 insertions, 3 deletions
diff --git a/arm9/Makefile b/arm9/Makefile
index b15d1b51..17da8ea8 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -1,6 +1,6 @@
# Makefile to build Pokemon Diamond image
-include config.mk
+include ../config.mk
.PHONY: clean tidy all default patch_mwasmarm
diff --git a/arm9/config.mk b/arm9/config.mk
deleted file mode 100644
index b112c988..00000000
--- a/arm9/config.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-GAME_VERSION := DIAMOND
-GAME_LANGUAGE := ENGLISH