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

LIJI32 · Jun 9, 2024 · e578843 · e578843
2 parents 8600f96 + cb7cc44
commit e578843
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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: