diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-10-05 20:09:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 17:09:53 -0700 |
| commit | 78632822c35c5c8f6f9fb03547bb608ec5e5d223 (patch) | |
| tree | 5bc11d5e3a4c0f92f09d4144a03b208162372a65 /Makefile | |
| parent | c15bd01b90215610a2f38c4ca2e8e3b0a68b8476 (diff) | |
Added move data JSON (#60)
* Added move data JSON
* Fixed typo
* Fixed name of placeholder move
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) |