diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer
index 782c6a1e0..4011e6af5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/agatha.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/agatha.trainer
index 682ee737d..9893b6e35 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/agatha.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/agatha.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer
index 5f2c48618..a296a8bbf 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer
index f7598f174..f543e2e37 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/brock.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/brock.trainer
index 0fe5835ef..9247eaf45 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/brock.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/brock.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/bugsy.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/bugsy.dat
index bc935e2ae..b57f6c5e1 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/bugsy.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/bugsyfalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/bugsyfalse.trainer
index 8c7c0b48b..4cab65b9f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/bugsyfalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/bugsyfalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/bugsytrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/bugsytrue.trainer
index ff0bbc19d..1f442da04 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/bugsytrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/bugsytrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/chuck.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/chuck.dat
index c30a6f370..773cd5d25 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/chuck.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/chuckfalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/chuckfalse.trainer
index 064e39eba..e5b03a2bc 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/chuckfalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/chuckfalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/chucktrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/chucktrue.trainer
index 3905937b8..7eaca1c3a 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/chucktrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/chucktrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/clair.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/clair.dat
index 127aab677..a09f9e23e 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/clair.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/clairfalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/clairfalse.trainer
index 91dfe75b9..4488b2d32 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/clairfalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/clairfalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/clairtrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/clairtrue.trainer
index 3f1ea5193..c88493482 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/clairtrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/clairtrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/elderli.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/elderli.trainer
index fab116b58..5df9a16b6 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/elderli.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/elderli.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer
index d9a225375..234dd725f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/eusine.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/eusine.trainer
index de3566a74..e6cd7e9cc 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/eusine.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/eusine.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat
index 964ca321e..14b80435e 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/falknerfalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/falknerfalse.trainer
index 43dc6f2cb..80f45d2c8 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/falknerfalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/falknerfalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/falknertrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/falknertrue.trainer
index cd25929c7..b692daca0 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/falknertrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/falknertrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/james.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/james.trainer
index 45400ee80..75279ee1e 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/james.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/james.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/janine.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/janine.trainer
index 7e2c8a1a0..1df8972b2 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/janine.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/janine.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/jasmine.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/jasmine.dat
index 62b84a833..5c267e80d 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/jasmine.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/jasminefalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/jasminefalse.trainer
index af050f42d..d57142704 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/jasminefalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/jasminefalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/jessie.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/jessie.trainer
index 7c5550d84..bf0ffb0e0 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/jessie.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/jessie.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/kiyo.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/kiyo.trainer
index 234c74905..0dea7f3c5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/kiyo.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/kiyo.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat
index 2256b1f04..5c18d4a2a 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat
@@ -1,6 +1,5 @@
 version=2
-#0: gym leader
-:if:<register.exists(<storage.get(string,leader)>rematch)>=false
+:if:<register.registered(<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)
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/misty.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/misty.trainer
index 4ac66bd68..1ee857a37 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/misty.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/misty.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/morty.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/morty.dat
index 240681e16..0937d532c 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/morty.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/mortyfalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/mortyfalse.trainer
index f6fd75857..adf8ad87d 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/mortyfalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/mortyfalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/mortytrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/mortytrue.trainer
index c17cbd14c..fc0836700 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/mortytrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/mortytrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/oak.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/oak.trainer
index 024d5573f..7239c2f1a 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/oak.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/oak.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat
index 1de263b70..a0b48a7bc 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/prycefalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/prycefalse.trainer
index 501cd2763..de84a4544 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/prycefalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/prycefalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/prycetrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/prycetrue.trainer
index 15bf5446c..99c3df4fc 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/prycetrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/prycetrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer
index 17577faed..a905b37d5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/surge.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/surge.trainer
index 41cdf9abe..d43e89e5f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/surge.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/surge.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/whitney.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/whitney.dat
index 7edddaad1..09e74505c 100644
--- a/P3D/Content/Data/Scripts/trainer/gymrematch/whitney.dat
+++ b/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
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/whitneyfalse.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/whitneyfalse.trainer
index 38b1f2350..c4d6878ab 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/whitneyfalse.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/whitneyfalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/whitneytrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/whitneytrue.trainer
index 4d495c237..a8cd0f770 100644
Binary files a/P3D/Content/Data/Scripts/trainer/gymrematch/whitneytrue.trainer and b/P3D/Content/Data/Scripts/trainer/gymrematch/whitneytrue.trainer differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/club.dat b/P3D/Content/Data/maps/battle/goldenrod/club.dat
new file mode 100644
index 000000000..51c7e6edc
Binary files /dev/null and b/P3D/Content/Data/maps/battle/goldenrod/club.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/club.dat b/P3D/Content/Data/maps/goldenrod/club.dat
index 1ad9ea145..6ae2b9a28 100644
Binary files a/P3D/Content/Data/maps/goldenrod/club.dat and b/P3D/Content/Data/maps/goldenrod/club.dat differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 2372c5ccb..66ccccf57 100644
--- a/P3D/P3D.vbproj
+++ b/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>