git.y1.nz

commit e5788437459b1518eb855cf452fca6a215d1ee87
parent 8600f96fa235b995056fc7f86902a78307cf825f
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Sun,  9 Jun 2024 17:58:34 +0300

Merge branch 'master' of github.com:LIJI32/SameBoy

Diffstat:
M
BootROMs/cgb_boot.asm
1
+
M
Makefile
5
++---

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/BootROMs/cgb_boot.asm b/BootROMs/cgb_boot.asm
@@ -1238,6 +1238,7 @@ BootEnd:
 IF BootEnd > $900
     FAIL "BootROM overflowed: {BootEnd}"
 ENDC
+    ds $100 + $800 - @ ; Ensure that the ROM is padded up to standard size.
 
 SECTION "HRAM", HRAM[$FF80]
 TitleChecksum:
diff --git a/Makefile b/Makefile
@@ -638,9 +638,8 @@ $(BIN)/BootROMs/sgb2_boot: BootROMs/sgb_boot.asm
 $(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/SameBoyLogo.pb12
 	-@$(MKDIR) -p $(dir $@)
 	$(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
+	$(RGBLINK) -x -o $@ $@.tmp
+	@rm $@.tmp
 
 # Libretro Core (uses its own build system)
 libretro:

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