From 94e3698ba9aa06efd806f9633357bf00f6c8ef31 Mon Sep 17 00:00:00 2001
From: mudlord <mudlord@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Thu, 1 Nov 2007 06:31:21 +0000
Subject: [PATCH] Fixed opcode error when implementing Dwedit's fix.

---
 src/gb/GB.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/gb/GB.cpp b/src/gb/GB.cpp
index ff0ba9a0..6d177894 100644
--- a/src/gb/GB.cpp
+++ b/src/gb/GB.cpp
@@ -674,7 +674,7 @@ void  gbWriteMemory(register u16 address, register u8 value)
     return;
   }
   
-  if (address<0xE000)
+ if (address<0xE000)
 	{
 		gbMemoryMap[address>>12][address & 0x0fff] = value;
 		return;
@@ -1226,11 +1226,12 @@ u8 gbReadOpcode(register u16 address)
       }
     }
     break;
+if (address>=0xE000 && address<0xFE00)
+	{
+		return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
+	}
   }
- if (address>=0xE000 && address<0xFE00)
-{
-  return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
-  }
+  return gbMemoryMap[address>>12][address & 0x0fff];
 }
 
 u8 gbReadMemory(register u16 address)
@@ -1394,11 +1395,12 @@ u8 gbReadMemory(register u16 address)
     case 0xff:
       return register_IE;
     }
-  }
-if (address>=0xE000 && address<0xFE00)
+	if (address>=0xE000 && address<0xFE00)
 	{
 		return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
 	}
+  }
+  return gbMemoryMap[address>>12][address & 0x0fff];
 }
 
 void gbVblank_interrupt()