diff --git a/BootROMs/cgb0_boot.asm b/BootROMs/cgb0_boot.asm
new file mode 100644
index 0000000..d49166d
--- /dev/null
+++ b/BootROMs/cgb0_boot.asm
@@ -0,0 +1,2 @@
+CGB0 EQU 1
+include "cgb_boot.asm"
\ No newline at end of file
diff --git a/BootROMs/cgb_boot.asm b/BootROMs/cgb_boot.asm
index 0bc2b17..ca3b57f 100644
--- a/BootROMs/cgb_boot.asm
+++ b/BootROMs/cgb_boot.asm
@@ -23,6 +23,7 @@ Start:
dec c
jr nz, .clearOAMLoop
+IF !DEF(CGB0)
; Init waveform
ld c, $10
ld hl, $FF30
@@ -31,6 +32,7 @@ Start:
cpl
dec c
jr nz, .waveformLoop
+ENDC
; Clear chosen input palette
ldh [InputPalette], a
diff --git a/Cocoa/Document.m b/Cocoa/Document.m
index 74fc98e..2a77259 100644
--- a/Cocoa/Document.m
+++ b/Cocoa/Document.m
@@ -576,12 +576,12 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency)
- (void) loadBootROM: (GB_boot_rom_t)type
{
static NSString *const names[] = {
- [GB_BOOT_ROM_DMG0] = @"dmg0_boot",
+ [GB_BOOT_ROM_DMG_0] = @"dmg0_boot",
[GB_BOOT_ROM_DMG] = @"dmg_boot",
[GB_BOOT_ROM_MGB] = @"mgb_boot",
[GB_BOOT_ROM_SGB] = @"sgb_boot",
[GB_BOOT_ROM_SGB2] = @"sgb2_boot",
- [GB_BOOT_ROM_CGB0] = @"cgb0_boot",
+ [GB_BOOT_ROM_CGB_0] = @"cgb0_boot",
[GB_BOOT_ROM_CGB] = @"cgb_boot",
[GB_BOOT_ROM_AGB] = @"agb_boot",
};
diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib
index 5cb44ae..67e57b1 100644
--- a/Cocoa/Preferences.xib
+++ b/Cocoa/Preferences.xib
@@ -397,7 +397,7 @@