diff --git a/desmume/src/windows/mapView.cpp b/desmume/src/windows/mapView.cpp
index 3f0756f39..14db85f2f 100644
--- a/desmume/src/windows/mapView.cpp
+++ b/desmume/src/windows/mapView.cpp
@@ -50,7 +50,7 @@ struct mapview_struct
 		//forgive the gyrations, some of this junk in here is to remind us of gyrations we might have to go
 		//through to avoid breaking the gpu struct
 
-		gpu.debug = true;
+		gpu.SetDebugState(true);
 		int temp = gpu.GetFinalColorBckFuncID();
 		gpu.SetFinalColorBckFuncID(0); //hax... why arent we copying gpu now?? i cant remember
 
@@ -58,12 +58,10 @@ struct mapview_struct
 
 		for(u32 i = 0; i < gpu.BGSize[layerID][1]; ++i)
 		{
-			gpu.currDst = bitmap + i*gpu.BGSize[layerID][0];
-			gpu.currLine = i;
-			gpu.ModeRenderDebug(layerID);
+			gpu.ModeRenderDebug(i, layerID, bitmap + i*gpu.BGSize[layerID][0]);
 		}
 
-		gpu.debug = false;
+		gpu.SetDebugState(false);
 		gpu.SetFinalColorBckFuncID(temp);
 	}
 };
diff --git a/desmume/src/windows/oamView.cpp b/desmume/src/windows/oamView.cpp
index d36684b73..997d65d80 100644
--- a/desmume/src/windows/oamView.cpp
+++ b/desmume/src/windows/oamView.cpp
@@ -223,8 +223,7 @@ LRESULT OamView_OnPaint(HWND hwnd, oamview_struct *win, WPARAM wParam, LPARAM lP
 		GPUEngineBase copy = *win->gpu;
         for(i = 0; i < 192; ++i)
         {
-			copy.currLine = i;
-             copy.SpriteRender((u16*)(bitmap + i*256), bitmap_alpha + i*256, type + i*256, prio + i*256);
+             copy.SpriteRenderDebug(i, (u16*)(bitmap + i*256), bitmap_alpha + i*256, type + i*256, prio + i*256);
         }
 
 		u32 width = dimm_int[(oam->attr1>>14)][(oam->attr0>>14)][0];