summaryrefslogtreecommitdiff
path: root/arm9
diff options
context:
space:
mode:
authorRevo <projectrevotpp@hotmail.com>2020-05-30 20:50:50 -0400
committerGitHub <noreply@github.com>2020-05-30 20:50:50 -0400
commitf704e7373c873e6721d46108db3f2e111b266ea6 (patch)
tree9b69d3e32aebe8cfff1b70e3002df0e4b027b325 /arm9
parentb45ab57b275ffbd0a46852c62f824e6cff73e116 (diff)
parentfb0e6a02ee019d53d9b96ffafa1c89457874e91c (diff)
Merge pull request #132 from PikalaxALT/pikalax_work
Name ARM7 symbols; makebanner; preliminary makerom
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 b61bc889..ebd74715 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