diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-09-28 12:50:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 09:50:36 -0700 |
| commit | 12aec1bb718eb7b04d4a5506030154b0cce454a0 (patch) | |
| tree | cc460ac2d94ec83522565fd11127df0fa172d5a4 /Makefile | |
| parent | 0d3b11e81a215875fc533db17895613c47a4da73 (diff) | |
Created species/item data JSONs (#57)
* Created species data JSON
* Added item data JSON
* Removed address field from JSONs
-Moved constants/item.h import to item.h.
* Used default values for some JSON fields
-Use item ID macros for item evolutions.
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -164,6 +164,8 @@ tools: $(TOOLDIRS) include dungeon_pokemon.mk include dungeon_floor.mk +include data_pokemon.mk +include data_item.mk $(TOOLDIRS): @$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX) @@ -188,7 +190,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_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(ASM_DEP) dungeon_pokemon dungeon_floor data_pokemon data_item $(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(ASM_DEP) |