ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB IO: Use correct lockout register

This commit is contained in:
Vicki Pfau 2017-11-08 01:07:38 -08:00
parent d054be88c7
commit dec7b6902e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/gb/io.h
View File

@ -84,6 +84,7 @@ enum GBIORegisters {
REG_WX = 0x4B, REG_WX = 0x4B,
// CGB // CGB
REG_UNK4C = 0x4C,
REG_KEY1 = 0x4D, REG_KEY1 = 0x4D,
REG_VBK = 0x4F, REG_VBK = 0x4F,
REG_HDMA1 = 0x51, REG_HDMA1 = 0x51,

5
src/gb/io.c
View File

@ -174,6 +174,7 @@ void GBIOReset(struct GB* gb) {
GBIOWrite(gb, REG_WY, 0x00); GBIOWrite(gb, REG_WY, 0x00);
GBIOWrite(gb, REG_WX, 0x00); GBIOWrite(gb, REG_WX, 0x00);
if (gb->model >= GB_MODEL_CGB) { if (gb->model >= GB_MODEL_CGB) {
GBIOWrite(gb, REG_UNK4C, 0);
GBIOWrite(gb, REG_JOYP, 0xFF); GBIOWrite(gb, REG_JOYP, 0xFF);
GBIOWrite(gb, REG_VBK, 0); GBIOWrite(gb, REG_VBK, 0);
GBIOWrite(gb, REG_BCPS, 0); GBIOWrite(gb, REG_BCPS, 0);
@ -424,7 +425,7 @@ void GBIOWrite(struct GB* gb, unsigned address, uint8_t value) {
free(gb->memory.romBase); free(gb->memory.romBase);
gb->memory.romBase = gb->memory.rom; gb->memory.romBase = gb->memory.rom;
} }
if (gb->model >= GB_MODEL_CGB && gb->memory.io[0x6C]) { if (gb->model >= GB_MODEL_CGB && gb->memory.io[REG_UNK4C] < 0x80) {
gb->model = GB_MODEL_DMG; gb->model = GB_MODEL_DMG;
GBVideoDisableCGB(&gb->video); GBVideoDisableCGB(&gb->video);
} }
@ -436,6 +437,8 @@ void GBIOWrite(struct GB* gb, unsigned address, uint8_t value) {
default: default:
if (gb->model >= GB_MODEL_CGB) { if (gb->model >= GB_MODEL_CGB) {
switch (address) { switch (address) {
case REG_UNK4C:
break;
case REG_KEY1: case REG_KEY1:
value &= 0x1; value &= 0x1;
value |= gb->memory.io[address] & 0x80; value |= gb->memory.io[address] & 0x80;