Fix building SameBoot with the lastest RGBDS master, fixes #606

This commit is contained in:
Lior Halphon
2024-04-13 00:23:18 +03:00
parent b40ba73533
commit bd31258725
2 changed files with 2 additions and 2 deletions

View File

@@ -126,7 +126,7 @@ Start:
xor a xor a
.waitLoop .waitLoop
ldh [rIF], a ldh [rIF], a
halt db $76 ; halt, compatible with rgbds 0.5-0.8
nop nop
dec e dec e
jr nz, .waitLoop jr nz, .waitLoop

View File

@@ -629,7 +629,7 @@ $(BIN)/BootROMs/sgb2_boot: BootROMs/sgb_boot.asm
$(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/SameBoyLogo.pb12 $(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/SameBoyLogo.pb12
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
$(RGBASM) -H -i $(OBJ)/BootROMs/ -i BootROMs/ -o $@.tmp $< $(RGBASM) -i $(OBJ)/BootROMs/ -i BootROMs/ -o $@.tmp $<
$(RGBLINK) -o $@.tmp2 $@.tmp $(RGBLINK) -o $@.tmp2 $@.tmp
dd if=$@.tmp2 of=$@ count=1 bs=$(if $(findstring cgb,$@)$(findstring agb,$@),2304,256) 2> $(NULL) dd if=$@.tmp2 of=$@ count=1 bs=$(if $(findstring cgb,$@)$(findstring agb,$@),2304,256) 2> $(NULL)
@rm $@.tmp $@.tmp2 @rm $@.tmp $@.tmp2