From 78632822c35c5c8f6f9fb03547bb608ec5e5d223 Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Tue, 5 Oct 2021 20:09:53 -0400 Subject: Added move data JSON (#60) * Added move data JSON * Fixed typo * Fixed name of placeholder move --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cd4cb7f..80625a8 100755 --- a/Makefile +++ b/Makefile @@ -166,6 +166,7 @@ include dungeon_pokemon.mk include dungeon_floor.mk include data_pokemon.mk include data_item.mk +include data_move.mk $(TOOLDIRS): @$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX) @@ -190,7 +191,7 @@ $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c $$(C_DEP) @echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s $(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s -$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(ASM_DEP) dungeon_pokemon dungeon_floor data_pokemon data_item +$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(ASM_DEP) dungeon_pokemon dungeon_floor data_pokemon data_item data_move $(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(ASM_DEP) -- cgit v1.2.3