From 6a57591f2fc0e8d353827173366bed7de8a21a13 Mon Sep 17 00:00:00 2001
From: jbo_85 <>
Date: Sun, 26 Mar 2006 21:55:09 +0000
Subject: [PATCH] Some cleanup.

---
 zsnes/src/chips/obc1emu.c | 11 +++--------
 zsnes/src/initc.c         |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/zsnes/src/chips/obc1emu.c b/zsnes/src/chips/obc1emu.c
index 358e420a..957e4807 100644
--- a/zsnes/src/chips/obc1emu.c
+++ b/zsnes/src/chips/obc1emu.c
@@ -122,8 +122,10 @@ void SetOBC1 ()
 	OBC1_RAM[obc1_address & 0x1fff] = obc1_byte;
 }
 
-void ResetOBC1()
+extern unsigned char *romdata;
+void InitOBC1()
 {
+	OBC1_RAM = romdata+0x400000;
 	if (OBC1_RAM[0x1ff5] & 1)
 		OBC1_BasePtr = 0x1800;
 	else
@@ -132,10 +134,3 @@ void ResetOBC1()
 	OBC1_Address = OBC1_RAM[0x1ff6] & 0x7f;
 	OBC1_Shift = (OBC1_RAM[0x1ff6] & 3) << 1;
 }
-
-extern unsigned char *romdata;
-void InitOBC()
-{
-  OBC1_RAM = romdata+0x400000;
-  ResetOBC1();
-}
diff --git a/zsnes/src/initc.c b/zsnes/src/initc.c
index 7374e945..9dbf17eb 100755
--- a/zsnes/src/initc.c
+++ b/zsnes/src/initc.c
@@ -1943,7 +1943,7 @@ extern unsigned short totlines;
 void SetAddressingModes(), GenerateBank0Table();
 void SetAddressingModesSA1(), GenerateBank0TableSA1();
 void calculate_state_sizes(), InitRewindVars();
-void InitDSP(), InitDSP2(), InitDSP3(), InitDSP4(), InitOBC(), InitFxTables(), initregr(), initregw();
+void InitDSP(), InitDSP2(), InitDSP3(), InitDSP4(), InitOBC1(), InitFxTables(), initregr(), initregw();
 void SPC7110Load(), DOSClearScreen(), dosmakepal();
 
 void CheckROMType()
@@ -2004,7 +2004,7 @@ void CheckROMType()
 
   if (OBCEnable)
   {
-    InitOBC();
+    InitOBC1();
 
     map_mem(0x00, &obc1bank, 0x40);
     map_mem(0x80, &obc1bank, 0x40);