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

Merge branch 'master' into sgb

Browse Source
This commit is contained in:
Lior Halphon 2018-12-02 00:15:07 +02:00
commit 241577a7f1
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BootROMs/cgb_boot.asm
View File

@ -429,8 +429,11 @@ Dups4thLetterArray:
PaletteCombinations: PaletteCombinations:
palette_comb: MACRO ; Obj0, Obj1, Bg palette_comb: MACRO ; Obj0, Obj1, Bg
db \1 * 8, \2 * 8, \3 *8 db (\1) * 8, (\2) * 8, (\3) *8
ENDM ENDM
raw_palette_comb: MACRO ; Obj0, Obj1, Bg
db (\1) * 2, (\2) * 2, (\3) * 2
ENDM
palette_comb 4, 4, 29 palette_comb 4, 4, 29
palette_comb 18, 18, 18 palette_comb 18, 18, 18
palette_comb 20, 20, 20 palette_comb 20, 20, 20
@ -453,7 +456,7 @@ palette_comb: MACRO ; Obj0, Obj1, Bg
palette_comb 4, 4, 18 palette_comb 4, 4, 18
palette_comb 4, 4, 20 palette_comb 4, 4, 20
palette_comb 19, 19, 9 palette_comb 19, 19, 9
palette_comb 3, 3, 11 raw_palette_comb 4 * 4 - 1, 4 * 4 - 1, 11 * 4
palette_comb 17, 17, 2 palette_comb 17, 17, 2
palette_comb 4, 4, 2 palette_comb 4, 4, 2
palette_comb 4, 4, 3 palette_comb 4, 4, 3
@ -465,8 +468,8 @@ palette_comb: MACRO ; Obj0, Obj1, Bg
palette_comb 24, 22, 24 palette_comb 24, 22, 24
palette_comb 16, 22, 8 palette_comb 16, 22, 8
palette_comb 17, 4, 13 palette_comb 17, 4, 13
palette_comb 27, 0, 14 raw_palette_comb 28 * 4 - 1, 0 * 4, 14 * 4
palette_comb 27, 4, 15 raw_palette_comb 28 * 4 - 1, 4 * 4, 15 * 4
palette_comb 19, 22, 9 palette_comb 19, 22, 9
palette_comb 16, 28, 10 palette_comb 16, 28, 10
palette_comb 4, 23, 28 palette_comb 4, 23, 28

BIN
Cocoa/AppIcon.icns
View File

Binary file not shown.

1
Cocoa/GBViewGL.m
View File

@ -27,6 +27,7 @@
{ {
[super flip]; [super flip];
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self.internalView setNeedsDisplay:YES];
[self setNeedsDisplay:YES]; [self setNeedsDisplay:YES];
}); });
} }

BIN
Windows/sameboy.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 113 KiB