1 files changed, 11 insertions, 44 deletions

diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 45f0a16deb..860aa41828 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -333,49 +333,25 @@ void initSprites() {
 void saveGameBackBuffer() {
 #ifdef DISABLE_SCUMM
 	if (savedBuffer == NULL) savedBuffer = new u8[gameWidth * gameHeight];
-	if(isCpuScalerEnabled())
-	{
-		memcpy(savedBuffer, get8BitBackBuffer(), gameWidth * gameHeight);
-	}
-	else
-	{
-		for (int r = 0; r < gameHeight; r++) {
-			memcpy(savedBuffer + (r * gameWidth), ((u8 *) (get8BitBackBuffer())) + (r * 512), gameWidth);
-		}
-	}	
+    for (int r = 0; r < gameHeight; r++) {
+		memcpy(savedBuffer + (r * gameWidth), ((u8 *) (get8BitBackBuffer())) + (r * 512), gameWidth);
 #endif
 }
 
 void restoreGameBackBuffer() {
 #ifdef DISABLE_SCUMM
 	if (savedBuffer) {
-		if(isCpuScalerEnabled())
-		{
-			memcpy(get8BitBackBuffer(), savedBuffer, gameWidth * gameHeight);
-			// TODO Synchronize with framebuffer if necessary
-		}		
-		else
-		{
-			for (int r = 0; r < gameHeight; r++) {
-				memcpy(((u8 *) (BG_GFX_SUB)) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
-				memcpy(((u8 *) (get8BitBackBuffer())) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
-			}
-		}		
+        for (int r = 0; r < gameHeight; r++) {
+            memcpy(((u8 *) (BG_GFX_SUB)) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
+            memcpy(((u8 *) (get8BitBackBuffer())) + (r * 512), savedBuffer + (r * gameWidth), gameWidth);
+        }
 		
 		delete savedBuffer;
 		savedBuffer = NULL;
 	}
 #else
-	if(isCpuScalerEnabled())
-	{
-		memset(get8BitBackBuffer(), 0, 320 * 200);
-		// TODO Synchronize with framebuffer if necessary
-	}
-	else
-	{
-		memset(get8BitBackBuffer(), 0, 512 * 256);
-		memset(BG_GFX_SUB, 0, 512 * 256);
-	}
+    memset(get8BitBackBuffer(), 0, 512 * 256);
+    memset(BG_GFX_SUB, 0, 512 * 256);
 	if (Scumm::g_scumm) {
 		Scumm::g_scumm->markRectAsDirty(Scumm::kMainVirtScreen, 0, gameWidth - 1, 0, gameHeight - 1, 1);
 		Scumm::g_scumm->markRectAsDirty(Scumm::kTextVirtScreen, 0, gameWidth - 1, 0, gameHeight - 1, 1);
@@ -1019,18 +995,9 @@ void setKeyboardEnable(bool en) {
 			// the same.
 			u16* buffer = get8BitBackBuffer();
             
-            if(isCpuScalerEnabled())
-            {
-                for (int y = 0; y < gameHeight; ++y)
-                    for (int x = 0; x < gameWidth / 2; ++x)
-                        BG_GFX_SUB[y*256 + x] = buffer[y*gameWidth/2 + x];
-            }
-            else
-            {
-                for (int r = 0; r < (512 * 256) >> 1; r++) {
-                    BG_GFX_SUB[r] = buffer[r];
-                }
-            }			
+            for (int r = 0; r < (512 * 256) >> 1; r++)
+                BG_GFX_SUB[r] = buffer[r];
+                
 			SUB_DISPLAY_CR &= ~DISPLAY_BG1_ACTIVE;	// Turn off keyboard layer
 			SUB_DISPLAY_CR |= DISPLAY_BG3_ACTIVE;	// Turn on game layer
 		} else {