mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 21:43:04 +02:00
Code Issues Projects Releases Wiki Activity

Make review changes

Browse Source
This commit is contained in:
Rangi42
2024-06-20 18:15:07 -04:00
parent 9588cf44aa
commit 77b7f861f3
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BootROMs/cgb_boot.asm
View File

@@ -896,7 +896,7 @@ ENDC
ld e, c ld e, c
ld l, $0D ld l, $0D
ld a, [CgbFlag] ld a, [CGBFlag]
bit 7, a bit 7, a
call z, EmulateDMG call z, EmulateDMG
bit 7, a bit 7, a

4
BootROMs/dmg_boot.asm
View File

@@ -120,9 +120,9 @@ Start:
; Set registers to match the original DMG boot ; Set registers to match the original DMG boot
IF DEF(MGB) IF DEF(MGB)
ld hl, (BOOTUP_A_MGB << 8) | $B0 lb hl, BOOTUP_A_MGB, %10110000
ELSE ELSE
ld hl, (BOOTUP_A_DMG << 8) | $B0 lb hl, BOOTUP_A_DMG, %10110000
ENDC ENDC
push hl push hl
pop af pop af

8
BootROMs/sameboot.inc
View File

@@ -25,12 +25,12 @@ ENDM
header_section NintendoLogoEnd, $0134 header_section NintendoLogoEnd, $0134
header_section Title, $0134 header_section Title, $0134
header_section ManufacturerCode, $013F header_section ManufacturerCode, $013F
header_section CgbFlag, $0143 header_section CGBFlag, $0143
header_section NewLicenseeCode, $0144 header_section NewLicenseeCode, $0144
header_section SgbFlag, $0146 header_section SGBFlag, $0146
header_section CartridgeType, $0147 header_section CartridgeType, $0147
header_section RomSize, $0148 header_section ROMSize, $0148
header_section RamSize, $0149 header_section RAMSize, $0149
header_section DestinationCode, $014A header_section DestinationCode, $014A
header_section OldLicenseeCode, $014B header_section OldLicenseeCode, $014B
header_section MaskRomVersion, $014C header_section MaskRomVersion, $014C

8
Makefile
View File

@@ -151,6 +151,10 @@ RGBASM := $(RGBDS)rgbasm
RGBLINK := $(RGBDS)rgblink RGBLINK := $(RGBDS)rgblink
RGBGFX := $(RGBDS)rgbgfx RGBGFX := $(RGBDS)rgbgfx
# RGBASM 0.7+ deprecate and remove `-h`
RGBASM_FLAGS = $(if $(filter $(shell echo 'println __RGBDS_MAJOR__ || (!__RGBDS_MAJOR__ && __RGBDS_MINOR__ > 6)' | $(RGBASM) -), $$0), -h,) --include $(OBJ)/BootROMs/ --include BootROMs/
# RGBGFX 0.6+ replace `-h` with `-Z`, and need `-c embedded`
RGBGFX_FLAGS = $(if $(filter $(shell echo 'println __RGBDS_MAJOR__ || (!__RGBDS_MAJOR__ && __RGBDS_MINOR__ > 5)' | $(RGBASM) -), $$0), -h -u, -Z -u -c embedded)
# Set compilation and linkage flags based on target, platform and configuration # Set compilation and linkage flags based on target, platform and configuration
@@ -620,7 +624,7 @@ $(BIN)/SDL/Palettes: Misc/Palettes
$(OBJ)/%.2bpp: %.png $(OBJ)/%.2bpp: %.png
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
$(RGBGFX) $(if $(filter $(shell echo 'println __RGBDS_MAJOR__ || (!__RGBDS_MAJOR__ && __RGBDS_MINOR__ > 5)' | $(RGBASM) -), $$0), -h -u, -Z -u -c embedded) -o $@ $< $(RGBGFX) $(RGBGFX_FLAGS) -o $@ $<
$(OBJ)/BootROMs/SameBoyLogo.pb12: $(OBJ)/BootROMs/SameBoyLogo.2bpp $(PB12_COMPRESS) $(OBJ)/BootROMs/SameBoyLogo.pb12: $(OBJ)/BootROMs/SameBoyLogo.2bpp $(PB12_COMPRESS)
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
@@ -637,7 +641,7 @@ $(BIN)/BootROMs/sgb2_boot.bin: 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) $(if $(filter $(shell echo 'println __RGBDS_MAJOR__ || (!__RGBDS_MAJOR__ && __RGBDS_MINOR__ > 6)' | $(RGBASM) -), $$0), -h,) --include $(OBJ)/BootROMs/ --include BootROMs/ -o $@.tmp $< $(RGBASM) $(RGBASM_FLAGS) -o $@.tmp $<
$(RGBLINK) -x -o $@ $@.tmp $(RGBLINK) -x -o $@ $@.tmp
@rm $@.tmp @rm $@.tmp