summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2022-01-15 13:03:36 -0500
committerGriffinR <griffin.g.richards@gmail.com>2022-01-15 13:03:36 -0500
commitcf41c783708b5b029b1d5fcb3dd9f06ee79fa532 (patch)
treecc9e9fc2aa2a0e3070e73e61a8f5ebc2d5fd397d /Makefile
parentf8ab09b4b42b4a28a36a7cae3b545a812db4133d (diff)
Remove berry fix
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 0f73d7bfc..73dd47f7c 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
ALL_BUILDS := firered firered_rev1 leafgreen leafgreen_rev1
ALL_BUILDS += $(ALL_BUILDS:%=%_modern)
-.PHONY: all rom tools clean-tools mostlyclean clean compare tidy berry_fix syms $(TOOLDIRS) $(ALL_BUILDS) $(ALL_BUILDS:%=compare_%) modern
+.PHONY: all rom tools clean-tools mostlyclean clean compare tidy syms $(TOOLDIRS) $(ALL_BUILDS) $(ALL_BUILDS:%=compare_%) modern
MAKEFLAGS += --no-print-directory
@@ -185,7 +185,6 @@ mostlyclean: tidy
$(RM) $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
$(RM) $(AUTO_GEN_TARGETS)
- @$(MAKE) -C berry_fix clean
clean-tools:
@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
@@ -195,7 +194,6 @@ clean: mostlyclean clean-tools
tidy:
$(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map})
$(RM) -r build
- @$(MAKE) -C berry_fix tidy
include graphics_file_rules.mk
include tileset_rules.mk
@@ -276,11 +274,6 @@ else
$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I . $(DATA_ASM_SUBDIR)/$*.s)
endif
-berry_fix:
- @$(MAKE) -C berry_fix COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN)
-
-berry_fix/berry_fix.gba: berry_fix
-
ifeq ($(NODEP),1)
$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s
$(AS) $(ASFLAGS) -o $@ $<