git.y1.nz

commit bd31258725ff587f56536c6b31e9fa128e2f38ef
parent b40ba73533af80e61a3d386475cbd67730eac857
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Sat, 13 Apr 2024 00:23:18 +0300

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

Diffstat:
M
BootROMs/sgb_boot.asm
2
+-
M
Makefile
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/BootROMs/sgb_boot.asm b/BootROMs/sgb_boot.asm
@@ -126,7 +126,7 @@ Start:
     xor a
 .waitLoop
     ldh [rIF], a
-    halt
+    db $76 ; halt, compatible with rgbds 0.5-0.8
     nop
     dec e
     jr nz, .waitLoop
diff --git a/Makefile b/Makefile
@@ -629,7 +629,7 @@ $(BIN)/BootROMs/sgb2_boot: BootROMs/sgb_boot.asm
 
 $(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/SameBoyLogo.pb12
 	-@$(MKDIR) -p $(dir $@)
-	$(RGBASM) -H -i $(OBJ)/BootROMs/ -i BootROMs/ -o $@.tmp $<
+	$(RGBASM) -i $(OBJ)/BootROMs/ -i BootROMs/ -o $@.tmp $<
 	$(RGBLINK) -o $@.tmp2 $@.tmp
 	dd if=$@.tmp2 of=$@ count=1 bs=$(if $(findstring cgb,$@)$(findstring agb,$@),2304,256) 2> $(NULL)
 	@rm $@.tmp $@.tmp2

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.