diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-04-21 15:57:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 15:57:22 +0300 |
| commit | aeb4e938f5f48c8484419f5333a5b0e6caee7a21 (patch) | |
| tree | c8d156131f95390672c1a1803560a85b445322d6 /Makefile | |
| parent | a0749839f45525a0a64113f18688392da241cb7d (diff) | |
| parent | aa2cb11a71a85faf0f84a8d07376a303792e3703 (diff) | |
Merge pull request #17 from PikalaxALT/pikalax_work
Redump files
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -45,7 +45,7 @@ LD_SCRIPT := pokediamond.lcf # Directories containing source files SRC_DIRS := src -ASM_DIRS := asm +ASM_DIRS := asm data files C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) @@ -79,7 +79,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o ASFLAGS = -proc arm5te -CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c99 -Cpp_exceptions off -i nitro +CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c99 -Cpp_exceptions off -i include LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m Entry ####################### Other Tools ######################### @@ -168,7 +168,7 @@ DUMMY != mkdir -p $(ALL_DIRS) %.png: ; %.pal: ; -$(BUILD_DIR)/asm/icon.o: graphics/icon.4bpp graphics/icon.gbapal +$(BUILD_DIR)/data/icon.o: graphics/icon.4bpp graphics/icon.gbapal ### Debug Print ### |