From 5131ae2800794f7ebfeebf00880c267ff3dffd62 Mon Sep 17 00:00:00 2001 From: Jorge Gorbe Moya Date: Mon, 16 Jun 2008 14:26:37 +0200 Subject: [PATCH] VRAM/OAM read/write implemented --- GBVideo.cc | 4 ++++ GBVideo.h | 6 +++++- gbcore.cc | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/GBVideo.cc b/GBVideo.cc index 8c2c4be..96aa2b7 100644 --- a/GBVideo.cc +++ b/GBVideo.cc @@ -2,18 +2,22 @@ u8 GBVideo::read_VRAM (int addr) const { + return VRAM[addr-VRAM_BASE]; } u8 GBVideo::read_OAM (int addr) const { + return OAM[addr-OAM_BASE]; } void GBVideo::write_VRAM(int addr, u8 value) { + VRAM[addr-VRAM_BASE] = value; } void GBVideo::write_OAM (int addr, u8 value) { + OAM[addr-OAM_BASE] = value; } diff --git a/GBVideo.h b/GBVideo.h index 4b32b85..660ef94 100644 --- a/GBVideo.h +++ b/GBVideo.h @@ -5,9 +5,13 @@ class GBVideo GameBoy *core; u8 VRAM[8192]; - u8 OAM[]; + u8 OAM[160]; public: + static const u16 VRAM_BASE = 0x8000; + static const u16 OAM_BASE = 0xFE00; + + GBVideo(GameBoy *core):core(core) {} u8 read_VRAM (int addr) const; diff --git a/gbcore.cc b/gbcore.cc index 392afcc..0168f86 100644 --- a/gbcore.cc +++ b/gbcore.cc @@ -11,7 +11,7 @@ GameBoy::GameBoy(std::string rom_name, GameBoyType type): gameboy_type(type), memory(this), - video(), + video(this), rom(0), regs(), IME(1), -- 2.34.1