From fa82b7841dfa9599a541870ede2d62575d208057 Mon Sep 17 00:00:00 2001
From: slack <slack@codemaniacs.com>
Date: Sat, 19 Jul 2008 14:55:43 +0200
Subject: [PATCH] Added "display wmap" and "display smap". Also changed sprite
drawing.
---
GBVideo.cc | 90 ++++++++++++++++++++++++++++++++++++++++++++++
GBVideo.h | 1 +
tests/test_core.cc | 5 +++
3 files changed, 96 insertions(+)
diff --git a/GBVideo.cc b/GBVideo.cc
index 4bf2f2e..a316b20 100644
--- a/GBVideo.cc
+++ b/GBVideo.cc
@@ -394,6 +394,18 @@ void GBVideo::draw()
int sprite_x = screen_x - (v[i].x-8);
int sprite_y = LY - v[i].y;
int current_tile_index = v[i].tile;
+ if (sprite_height == 16)
+ {
+ if (sprite_y < 8)
+ {
+ current_tile_index &= 0xFE;
+ }
+ else
+ {
+ current_tile_index |= 1;
+ sprite_y -= 8;
+ }
+ }
int pal_num = (v[i].flags & Sprite::NON_CGB_PAL_NUMBER) >> 4;
for (int x=sprite_x; x < 8; x++)
{
@@ -465,6 +477,84 @@ void GBVideo::draw()
}
}
}
+ else if (display_mode == WINDOW_MAP)
+ {
+ if (LY==0)
+ {
+ u32 *pixels = static_cast<u32*>(display->pixels);
+ int BGP = core->memory.high[GBMemory::I_BGP];
+ int pallette[4];
+ pallette[0] = BGP & 3;
+ pallette[1] = (BGP>>2) & 3;
+ pallette[2] = (BGP>>4) & 3;
+ pallette[3] = (BGP>>6) & 3;
+ u16 tile_map_addr = check_bit(LCDC,6) ? 0x1C00 : 0x1800;
+ u16 tile_data_addr = check_bit(LCDC,4) ? 0x0000 : 0x0800;
+ int tile_data_base = (tile_data_addr == 0x0800) ? -128 : 0;
+ for (int row=0; row < 32; row++)
+ {
+ logger.trace("bgmap row=", row);
+ for (int col=0; col < 32; col++)
+ {
+ int ty = row*8;
+ int tx = col*8;
+ for (int y=0; y<8; y++)
+ {
+ for (int x=0; x<8; x++)
+ {
+ u8 tile_x = 7-x;
+ u8 current_tile_index = VRAM[tile_map_addr+32*row + col] + tile_data_base;
+ u16 current_tile_addr = tile_data_addr + 16*current_tile_index;
+ u8 current_row_low = VRAM[current_tile_addr+2*y];
+ u8 current_row_high = VRAM[current_tile_addr+2*y+1];
+ u32 color = colors[pallette[((current_row_high >> tile_x)&1) << 1 |
+ ((current_row_low >> tile_x)&1)]];
+ pixels[320*(ty+y)+(tx+x)] = color;
+ }
+ }
+ }
+ }
+ }
+ }
+ else if (display_mode == SPRITE_MAP)
+ {
+ if (LY==0)
+ {
+ u32 *pixels = static_cast<u32*>(display->pixels);
+ int BGP = core->memory.high[GBMemory::I_BGP];
+ int pallette[4];
+ pallette[0] = BGP & 3;
+ pallette[1] = (BGP>>2) & 3;
+ pallette[2] = (BGP>>4) & 3;
+ pallette[3] = (BGP>>6) & 3;
+ u16 tile_map_addr = check_bit(LCDC,6) ? 0x1C00 : 0x1800;
+ u16 tile_data_addr = 0x0000;
+ int tile_data_base = (tile_data_addr == 0x0800) ? -128 : 0;
+ for (int row=0; row < 32; row++)
+ {
+ logger.trace("bgmap row=", row);
+ for (int col=0; col < 32; col++)
+ {
+ int ty = row*8;
+ int tx = col*8;
+ for (int y=0; y<8; y++)
+ {
+ for (int x=0; x<8; x++)
+ {
+ u8 tile_x = 7-x;
+ u8 current_tile_index = VRAM[tile_map_addr+32*row + col] + tile_data_base;
+ u16 current_tile_addr = tile_data_addr + 16*current_tile_index;
+ u8 current_row_low = VRAM[current_tile_addr+2*y];
+ u8 current_row_high = VRAM[current_tile_addr+2*y+1];
+ u32 color = colors[pallette[((current_row_high >> tile_x)&1) << 1 |
+ ((current_row_low >> tile_x)&1)]];
+ pixels[320*(ty+y)+(tx+x)] = color;
+ }
+ }
+ }
+ }
+ }
+ }
}
int GBVideo::poll_event(SDL_Event *ev)
diff --git a/GBVideo.h b/GBVideo.h
index b1aa618..3230833 100644
--- a/GBVideo.h
+++ b/GBVideo.h
@@ -55,6 +55,7 @@ class GBVideo
NORMAL = 0,
BG_MAP,
WINDOW_MAP,
+ SPRITE_MAP,
};
private:
diff --git a/tests/test_core.cc b/tests/test_core.cc
index 9ba7593..e4c9c85 100644
--- a/tests/test_core.cc
+++ b/tests/test_core.cc
@@ -84,6 +84,7 @@ int main(int argc, char **argv)
else
{
cout << "(wenboi) ";
+ cout.flush();
std::getline(cin, line, '\n');
if (!cin.good()) break; // if stdin is closed, exit main loop
if (line == "") command = last_command;
@@ -234,6 +235,10 @@ int main(int argc, char **argv)
{
if (arguments[0] == "bgmap")
gb.video.set_display_mode(GBVideo::BG_MAP);
+ else if (arguments[0] == "wmap")
+ gb.video.set_display_mode(GBVideo::WINDOW_MAP);
+ else if (arguments[0] == "smap")
+ gb.video.set_display_mode(GBVideo::SPRITE_MAP);
else
gb.video.set_display_mode(GBVideo::NORMAL);
}
--
2.34.1