Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually do what the previous commit claimed to do

Browse Source
This commit is contained in:
Lior Halphon 2021-07-28 00:47:19 +03:00
parent b454ee28db
commit 0ff882f3bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BootROMs/cgb_boot.asm
View File

@ -475,7 +475,7 @@ ENDM
palette_comb 17, 4, 13 palette_comb 17, 4, 13
raw_palette_comb 28 * 4 - 1, 0 * 4, 14 * 4 raw_palette_comb 28 * 4 - 1, 0 * 4, 14 * 4
raw_palette_comb 28 * 4 - 1, 4 * 4, 15 * 4 raw_palette_comb 28 * 4 - 1, 4 * 4, 15 * 4
palette_comb 19, 22, 9 raw_palette_comb 19 * 4, 23 * 4 - 1, 9 * 4
palette_comb 16, 28, 10 palette_comb 16, 28, 10
palette_comb 4, 23, 28 palette_comb 4, 23, 28
palette_comb 17, 22, 2 palette_comb 17, 22, 2
@ -918,9 +918,11 @@ EmulateDMG:
call GetPaletteIndex call GetPaletteIndex
bit 7, a bit 7, a
call nz, LoadDMGTilemap call nz, LoadDMGTilemap
res 7, a
ld b, a ld b, a
add b add b
add b add b
ld b, a
ldh a, [InputPalette] ldh a, [InputPalette]
and a and a
jr z, .nothingDown jr z, .nothingDown
@ -979,7 +981,7 @@ GetPaletteIndex:
; We might have a match, Do duplicate/4th letter check ; We might have a match, Do duplicate/4th letter check
ld a, l ld a, l
sub FirstChecksumWithDuplicate - TitleChecksums sub FirstChecksumWithDuplicate - TitleChecksums + 1
jr c, .match ; Does not have a duplicate, must be a match! jr c, .match ; Does not have a duplicate, must be a match!
; Has a duplicate; check 4th letter ; Has a duplicate; check 4th letter
push hl push hl