summaryrefslogtreecommitdiff
path: root/filesystem.mk
diff options
context:
space:
mode:
authorRémi Calixte <remicalixte.rmc@gmail.com>2021-08-31 08:30:47 +0200
committerRémi Calixte <remicalixte.rmc@gmail.com>2021-08-31 08:30:47 +0200
commit12bafff5c0ca6bfdcca3553a0717c80f21e27182 (patch)
tree7c07954a140c879b8c71e33a71c603f27076ab56 /filesystem.mk
parent4e4192cd7007d16cefe00facbc7b721353c94f60 (diff)
parent05ded46ab7f556956a2eee2411a8d2968b7e8ad6 (diff)
Merge branch 'master' into unk_02006D98
Diffstat (limited to 'filesystem.mk')
-rw-r--r--filesystem.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/filesystem.mk b/filesystem.mk
index e3f1f318..41bdc0d4 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -3334,14 +3334,7 @@ files/graphic/field_board.narc: \
files/graphic/field_board/narc_0050.NCGR \
files/graphic/field_board/narc_0051.NCGR
-## Trainer names
-files/msgdata/msg/narc_0559.txt: files/poketool/trainer/trdata.json
- (echo " -"; $(GREP) -w '"name":' $< | cut -d'"' -f4) | $(SED) 's/^(.+)$$/{TRNAME}\1\r/g' > $@
-
-CHARMAP = charmap.txt
-
-files/msgdata/msg/%.bin: files/msgdata/msg/%.txt files/msgdata/msg/%.key $(CHARMAP)
- $(MSGENC) $^ $@
+include files/msgdata/msg.mk
.PHONY: filesystem