several rematch bugs because QA

P3D/Content/Data/Scripts/trainer/gymrematch/bugsy.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,bugsy<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,bugsy<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/chuck.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,chuck<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,chuck<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/clair.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,clair<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,clair<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,falkner<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,falkner<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/jasmine.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,jasmine<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,jasmine<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/main.dat

@@ -1,6 +1,5 @@
 version=2
-#0: gym leader
+:if:<register.registered(<storage.get(string,leader)>rematch)>=false
-:if:<register.exists(<storage.get(string,leader)>rematch)>=false
     @text.show(<battle.intromessage(gymrematch\\<storage.get(string,leader)>)>)
     @battle.trainer(gymrematch\\<storage.get(string,leader)>)
     @register.registertime(<storage.get(string,leader)>rematch,12,hours)

P3D/Content/Data/Scripts/trainer/gymrematch/morty.dat

@@ -5,6 +5,6 @@ version=2
 	:end
 :endif
 
-@storage.set(string,leader,morty<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,morty<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,pryce<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,pryce<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/Scripts/trainer/gymrematch/whitney.dat

@@ -1,4 +1,4 @@
 version=2
-@storage.set(string,leader,whitney<register.exists(earthbadge_obtain)>)
+@storage.set(string,leader,whitney<register.registered(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/P3D.vbproj

@@ -25739,6 +25739,9 @@
     <Content Include="Content\Data\maps\dungeon\2\mega.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Content\Data\maps\battle\goldenrod\club.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\maps\battle\kolben\basement.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26114,11 +26117,15 @@
     <None Include="Content\Data\Scripts\trainer\gymrematch\green.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Content\Data\Scripts\trainer\gymrematch\james.dat" />
+    <None Include="Content\Data\Scripts\trainer\gymrematch\james.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\trainer\gymrematch\james.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Content\Data\Scripts\trainer\gymrematch\jessie.dat" />
+    <None Include="Content\Data\Scripts\trainer\gymrematch\jessie.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\trainer\gymrematch\jessie.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26128,7 +26135,9 @@
     <None Include="Content\Data\Scripts\trainer\gymrematch\kiyo.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Content\Data\Scripts\trainer\gymrematch\meowth.dat" />
+    <None Include="Content\Data\Scripts\trainer\gymrematch\meowth.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\trainer\gymrematch\oak.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>