From 650127e8577541136a4a72774c78253cbfc4b2ef Mon Sep 17 00:00:00 2001 From: Raymond Dodge Date: Sun, 9 Jun 2024 11:16:32 -0400 Subject: [PATCH] clean and generate src/data/map_group_count.h (#4727) `src/data/map_group_count.h` is currently in `.gitignore`. However, git does not ignore a file if that file is already in the index. To actually ignore the file, the file must be deleted and that deletion must be committed. In addition, the Makefile did not previously clean `src/data/map_group_count.h`, nor know how to generate `src/data/map_group_count.h`. It did generate the file as a side-effect of a different rule, but if asked to generate, it did not know how to. --- Makefile | 2 +- map_data_rules.mk | 1 + src/data/map_group_count.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/data/map_group_count.h diff --git a/Makefile b/Makefile index cf11e3a255..74e6449236 100644 --- a/Makefile +++ b/Makefile @@ -296,7 +296,7 @@ mostlyclean: tidynonmodern tidymodern tidycheck rm -f $(MID_SUBDIR)/*.s find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc - rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc + rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc $(DATA_SRC_SUBDIR)/map_group_count.h find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + rm -f $(AUTO_GEN_TARGETS) @$(MAKE) clean -C libagbsyscall diff --git a/map_data_rules.mk b/map_data_rules.mk index 626cd47240..a045d1d420 100755 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -23,6 +23,7 @@ $(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json $(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; $(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; $(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; +$(DATA_SRC_SUBDIR)/map_group_count.h: $(MAPS_DIR)/headers.inc ; include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; $(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json diff --git a/src/data/map_group_count.h b/src/data/map_group_count.h deleted file mode 100644 index 4fe8a21b3b..0000000000 --- a/src/data/map_group_count.h +++ /dev/null @@ -1 +0,0 @@ -static const u8 MAP_GROUP_COUNT[] = {57, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};