Previous 15994 Revisions Next

r6315 Friday 6th November, 2009 at 16:52:29 UTC by Wilbert Pol
[GBCOLOR]
- Fixed multisession error. [Carlos]
- Improved handling of palette writes. Fixes bugs #1699 and #187. [Carlos]
[src/mess/video]gb.c

src/mess/video/gb.c
r6314r6315
12921292
12931293   if (mode == GB_VIDEO_CGB) vram_size = 0x4000;
12941294
1295   /* free regions if already allocated */
1296   if (memory_region(machine, "gfx1"))      memory_region_free(machine, "gfx1");
1297   if (memory_region(machine, "gfx2"))      memory_region_free(machine, "gfx2");
1298
12951299   gb_lcd.gb_vram = memory_region_alloc( machine, "gfx1", vram_size, 0 );
12961300   gb_lcd.gb_oam = memory_region_alloc( machine, "gfx2", 0x100, 0 );
12971301   memset( gb_lcd.gb_vram, 0, vram_size );
r6314r6315
22172221
22182222WRITE8_HANDLER ( gbc_video_w )
22192223{
2220   static UINT16 BP = 0, OP = 0;
2221
22222224   switch( offset )
22232225   {
22242226   case 0x00:      /* LCDC - LCD Control */
r6314r6315
23612363      }
23622364      break;
23632365   case 0x28:      /* BCPS - Background palette specification */
2366      GBCBCPS = data;
2367      if (data & 0x01)
2368         GBCBCPD = gb_lcd.cgb_bpal[( data >> 1 ) & 0x1F] >> 8;
2369      else
2370         GBCBCPD = gb_lcd.cgb_bpal[( data >> 1 ) & 0x1F] & 0xFF;
23642371      break;
23652372   case 0x29:      /* BCPD - background palette data */
23662373      if ( gb_lcd.pal_locked == LOCKED )
23672374      {
23682375         return;
23692376      }
2370      if( GBCBCPS & 0x1 )
2371      {
2372         gb_lcd.cgb_bpal[ ( GBCBCPS >> 1 ) & 0x1F ] = ( ( data & 0x7F ) << 8 ) | BP;
2373      }
2377      GBCBCPD = data;
2378      if (GBCBCPS & 0x01)
2379         gb_lcd.cgb_bpal[( GBCBCPS >> 1 ) & 0x1F] = ((data << 8) | (gb_lcd.cgb_bpal[( GBCBCPS >> 1 ) & 0x1F] & 0xFF)) & 0x7FFF;
23742380      else
2375         BP = data;
2381         gb_lcd.cgb_bpal[( GBCBCPS >> 1 ) & 0x1F] = ((gb_lcd.cgb_bpal[( GBCBCPS >> 1 ) & 0x1F] & 0xFF00) | data) & 0x7FFF;
23762382      if( GBCBCPS & 0x80 )
23772383      {
23782384         GBCBCPS++;
r6314r6315
23802386      }
23812387      break;
23822388   case 0x2A:      /* OCPS - Object palette specification */
2389      GBCOCPS = data;
2390      if (data & 0x01)
2391         GBCOCPD = gb_lcd.cgb_spal[( data >> 1 ) & 0x1F] >> 8;
2392      else
2393         GBCOCPD = gb_lcd.cgb_spal[( data >> 1 ) & 0x1F] & 0xFF;
23832394      break;
23842395   case 0x2B:      /* OCPD - Object palette data */
23852396      if ( gb_lcd.pal_locked == LOCKED )
23862397      {
23872398         return;
23882399      }
2389      if( GBCOCPS & 0x1 )
2390      {
2391         gb_lcd.cgb_spal[ ( GBCOCPS >> 1 ) & 0x1F ] = ( ( data & 0x7F ) << 8 ) | OP;
2392      }
2400      GBCOCPD = data;
2401      if (GBCOCPS & 0x01)
2402         gb_lcd.cgb_spal[( GBCOCPS >> 1 ) & 0x1F] = ((data << 8) | (gb_lcd.cgb_spal[( GBCOCPS >> 1 ) & 0x1F] & 0xFF)) & 0x7FFF;
23932403      else
2394         OP = data;
2404         gb_lcd.cgb_spal[( GBCOCPS >> 1 ) & 0x1F] = ((gb_lcd.cgb_spal[( GBCOCPS >> 1 ) & 0x1F] & 0xFF00) | data) & 0x7FFF;
23952405      if( GBCOCPS & 0x80 )
23962406      {
23972407         GBCOCPS++;

Previous 15994 Revisions Next


© 1998-2018 The MESS Team