From d0f86d6a9b7cc7b0faafde18a4376c2857e1b0c3 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Tue, 13 Jan 2004 23:27:04 +0000
Subject: [PATCH] Finally figured out ZSNES, no more two vars for base cart
 paths.

---
 zsnes/src/init.asm | 10 ----------
 zsnes/src/initc.c  | 10 ++++++----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 3743c24f..6b60ffac 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -126,8 +126,6 @@ EXTSYM SplittedROM
 EXTSYM addOnStart
 EXTSYM addOnSize
 
-EXTSYM STPath, ST_Path, GNextPath, GNext_Path, SGPath, SG_Path
-
 EXTSYM SetaCmdEnable,setaramdata
 EXTSYM setaaccessbankr8,setaaccessbankw8,setaaccessbankr8a,setaaccessbankw8a
 EXTSYM setaaccessbankr16,setaaccessbankw16,setaaccessbankr16a,setaaccessbankw16a
@@ -3409,14 +3407,6 @@ NEWSYM loadfileGUI
     mov edx,fname+1
     mov dword[ZOpenFileName],edx
 
-    ;This is to get the C stuff to see these variables
-    mov ebx,STPath
-    mov [ST_Path],ebx
-    mov ebx,GNextPath
-    mov [GNext_Path],ebx
-    mov ebx,SGPath
-    mov [SG_Path],ebx
-
     pushad
     call loadROM
     popad
diff --git a/zsnes/src/initc.c b/zsnes/src/initc.c
index d5b4e9c2..f1205955 100755
--- a/zsnes/src/initc.c
+++ b/zsnes/src/initc.c
@@ -668,7 +668,9 @@ void SplitSetup(char *basepath, char *basefile, unsigned int MirrorSystem)
   SplittedROM = true;
 }
 
-char *ST_Path, *GNext_Path, *SG_Path;
+extern char STPath;
+extern char GNextPath;
+extern char SGPath;
 void SplitSupport()
 {
   unsigned char *ROM = (unsigned char *)romdata;
@@ -680,7 +682,7 @@ void SplitSupport()
   {
     addOnStart = 0x200000;
     addOnSize = 0x80000;
-    SplitSetup(SG_Path, "SAMEGAME.ZIP", 1);
+    SplitSetup(&SGPath, "SAMEGAME.ZIP", 1);
   }          
 
   //SD Gundam G-Next add on  
@@ -689,7 +691,7 @@ void SplitSupport()
   {
     addOnStart = 0x400000;
     addOnSize = 0x80000;
-    SplitSetup(GNext_Path, "G-NEXT.ZIP", 2);
+    SplitSetup(&GNextPath, "G-NEXT.ZIP", 2);
     addOnStart = 0x200000;
   }          
 
@@ -698,7 +700,7 @@ void SplitSupport()
   {
     addOnStart = 0x100000;
     addOnSize = curromspace;
-    SplitSetup(ST_Path, "STBIOS.ZIP", 3);
+    SplitSetup(&STPath, "STBIOS.ZIP", 3);
   }          
 }