From 6812f15cdbdcdd1c4d941f63eacf3f0bc6fb10a8 Mon Sep 17 00:00:00 2001
From: Icedude907 <34080011+Icedude907@users.noreply.github.com>
Date: Fri, 24 Nov 2023 11:55:02 +1300
Subject: [PATCH] PR: Incorporated reviews

---
 make_tools.mk             |  6 +-----
 tools/mapjson/mapjson.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/make_tools.mk b/make_tools.mk
index 00824adda6a3..7adf51031965 100644
--- a/make_tools.mk
+++ b/make_tools.mk
@@ -9,16 +9,12 @@ TOOL_NAMES := aif2pcm bin2c gbafix gbagfx jsonproc mapjson mid2agb preproc ramsc
 
 TOOLDIRS := $(TOOL_NAMES:%=$(TOOLS_DIR)/%)
 
-.PHONY: tools check-tools clean-tools $(TOOLDIRS) $(CHECKTOOLDIRS)
+.PHONY: tools check-tools clean-tools $(TOOLDIRS)
 
 tools: $(TOOLDIRS)
-check-tools: $(CHECKTOOLDIRS)
 
 $(TOOLDIRS):
 	@$(MAKE) -C $@
 
-$(CHECKTOOLDIRS):
-	@$(MAKE) -C $@
-
 clean-tools:
 	@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index 1632b56be62e..1a10c9dab89a 100644
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -374,7 +374,7 @@ void process_map(string map_filepath, string layouts_filepath, string output_dir
 string generate_groups_text(Json groups_data) {
     ostringstream text;
 
-    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from /map_groups.json\n@\n\n";
+    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";
 
     for (auto &key : groups_data["group_order"].array_items()) {
         string group = json_to_string(key);
@@ -415,7 +415,7 @@ string generate_connections_text(Json groups_data, string include_path) {
 
     ostringstream text;
 
-    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from /map_groups.json\n@\n\n";
+    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";
 
     for (Json map_name : map_names)
         text << "\t.include \"" << include_path << "/" <<  json_to_string(map_name) << "/connections.inc\"\n";
@@ -432,7 +432,7 @@ string generate_headers_text(Json groups_data, string include_path) {
 
     ostringstream text;
 
-    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from /map_groups.json\n@\n\n";
+    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";
 
     for (string map_name : map_names)
         text << "\t.include \"" << include_path << "/" << map_name << "/header.inc\"\n";
@@ -465,7 +465,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) {
     text << "#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n"
          << "#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n";
 
-    text << "//\n// DO NOT MODIFY THIS FILE! It is auto-generated from /map_groups.json\n//\n\n";
+    text << "//\n// DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n//\n\n";
 
     int group_num = 0;
 
@@ -530,7 +530,7 @@ void process_groups(string groups_filepath, string output_asm, string output_c)
 string generate_layout_headers_text(Json layouts_data) {
     ostringstream text;
 
-    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from layouts.json\n@\n\n";
+    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json\n@\n\n";
 
     for (auto &layout : layouts_data["layouts"].array_items()) {
         if (layout == Json::object()) continue;