fixed screen entries being set incorrectly

1 files changed, 9 insertions, 9 deletions

diff --git a/source/main.cpp b/source/main.cpp
index ec6be22..21d1c26 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -2,8 +2,6 @@
 #include "util.hpp"
 #include "input.hpp"
 
-ScreenEntry *bg0_map = screenblock_mem[28];
-
 void bad_vsync() {
 	while (*REG_VCOUNT >= 160);
 	while (*REG_VCOUNT < 160);
@@ -12,7 +10,7 @@ void bad_vsync() {
 int main() {
 	auto bg_flags = BGControlFlags()
 		.set_charblock_base(0)
-		.set_screenblock_base(0)
+		.set_screenblock_base(28)
 		.set_size(BGControlSize::Regular_64x64);
 
 	set_bg_control(0, bg_flags);
@@ -26,15 +24,17 @@ int main() {
 	set_tile(0, 0, tiles[0]);
 	set_tile(0, 1, tiles[1]);
 
-	set_bg_palette(0, 1, Color::from_rgb(31,  0,  0));
-	set_bg_palette(1, 1, Color::from_rgb(31,  0,  0));
-	set_bg_palette(2, 1, Color::from_rgb(31,  0,  0));
-	set_bg_palette(3, 1, Color::from_rgb(31,  0,  0));
+	set_bg_palette(0, 1, Color::from_rgb(31,   0,   0));
+	set_bg_palette(1, 1, Color::from_rgb( 0,  31,   0));
+	set_bg_palette(2, 1, Color::from_rgb( 0,   0,  31));
+	set_bg_palette(3, 1, Color::from_rgb(16,  16,  16));
 
-	ScreenEntry *screen_entry_ptr = bg0_map;
 	for (int i = 0; i < 4; i++) {
 		for (int j = 0; j < 32*32; j++) {
-			*screen_entry_ptr++ = ScreenEntry().set_palette_bank(i);
+			auto screen_entry = ScreenEntry()
+				.set_tile_index(i % 2)
+				.set_palette_bank(i);
+			set_screen_entry(28+i, j, screen_entry);
 		}
 	}