diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
commit | 96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch) | |
tree | 969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /Makefile | |
parent | 277726fd5e8c6da021206deeecb163f40073ff3c (diff) | |
parent | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff) |
Merge branch 'master' into pokemon
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -244,10 +244,10 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) cd $(OBJ_DIR) && ../../$(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) + $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent $(ROM): $(ELF) - $(OBJCOPY) -O binary $< $@ - $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent + $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ berry_fix/berry_fix.gba: @$(MAKE) -C berry_fix |