Moved map_data_rules.mk

Makefile

@@ -204,9 +204,6 @@ C_ASM_OBJS := $(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o,$(C_ASM_SRCS))
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
 ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
 
-# get all the data/*.s files EXCEPT the ones with specific rules
-REGULAR_DATA_ASM_SRCS := $(filter-out $(DATA_ASM_SUBDIR)/maps.s $(DATA_ASM_SUBDIR)/map_events.s, $(wildcard $(DATA_ASM_SUBDIR)/*.s))
-
 DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
 DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
 
@@ -241,11 +238,9 @@ clean-d:
 	find build \( -iname '*.d' \) -exec rm {} +
 
 clean-assets:
-	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 -rf $(BUILD_ASSETS_DIR)
 	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 {} +
-	find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
-
+
 clean-old:
 	rm -f $(MID_SUBDIR)/*.s
 	rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
@@ -369,7 +364,7 @@ $(eval $(call ASM_DEP_PREPROC,$(DATA_ASM_BUILDDIR)/%,$(DATA_ASM_SUBDIR)/%.s))
 else
 $(foreach src, $(ASM_SRCS), $(eval $(call ASM_DEP,$(src:%.s=$(OBJ_DIR)/%),$(src))))
 $(foreach src, $(C_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
-$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
+$(foreach src, $(DATA_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
 endif
 
 $(OBJ_DIR)/sym_bss.ld: sym_bss.txt

data/event_scripts.s

@@ -32,7 +32,7 @@
 #include "constants/item.h"
 #include "constants/items.h"
 #include "constants/heal_locations.h"
-#include "constants/layouts.h"
+#include "generated/constants/layouts.h"
 #include "constants/lilycove_lady.h"
 #include "constants/map_scripts.h"
 #include "constants/maps.h"

data/map_events.s

@@ -17,5 +17,5 @@
 
 	.section .rodata
 
-	.include "data/maps/events.inc"
+	.include "build/assets/data/maps/events.inc"
 

data/maps.s

@@ -1,5 +1,5 @@
 #include "constants/global.h"
-#include "constants/layouts.h"
+#include "generated/constants/layouts.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/weather.h"
@@ -11,8 +11,8 @@
 
 	.section .rodata
 
-	.include "data/layouts/layouts.inc"
-	.include "data/layouts/layouts_table.inc"
-	.include "data/maps/headers.inc"
-	.include "data/maps/groups.inc"
-	.include "data/maps/connections.inc"
+	.include "build/assets/data/layouts/layouts.inc"
+	.include "build/assets/data/layouts/layouts_table.inc"
+	.include "build/assets/data/maps/headers.inc"
+	.include "build/assets/data/maps/groups.inc"
+	.include "build/assets/data/maps/connections.inc"