diff --git a/P3D/Content/Data/Scripts/azalea/gymmap.dat b/P3D/Content/Data/Scripts/azalea/gymmap.dat
new file mode 100644
index 000000000..daa574072
Binary files /dev/null and b/P3D/Content/Data/Scripts/azalea/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/blackthorn/gym/puzzlerocks.dat b/P3D/Content/Data/Scripts/blackthorn/gym/puzzlerocks.dat
index da36c0e9f..ddbef6974 100644
Binary files a/P3D/Content/Data/Scripts/blackthorn/gym/puzzlerocks.dat and b/P3D/Content/Data/Scripts/blackthorn/gym/puzzlerocks.dat differ
diff --git a/P3D/Content/Data/Scripts/celadon/gymmap.dat b/P3D/Content/Data/Scripts/celadon/gymmap.dat
new file mode 100644
index 000000000..c5ea9db54
Binary files /dev/null and b/P3D/Content/Data/Scripts/celadon/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/cerulean/gymgrunt.dat b/P3D/Content/Data/Scripts/cerulean/gymgrunt.dat
index 81524951d..609ef1b9a 100644
Binary files a/P3D/Content/Data/Scripts/cerulean/gymgrunt.dat and b/P3D/Content/Data/Scripts/cerulean/gymgrunt.dat differ
diff --git a/P3D/Content/Data/Scripts/cianwood/gymmap.dat b/P3D/Content/Data/Scripts/cianwood/gymmap.dat
new file mode 100644
index 000000000..15b0b13ab
Binary files /dev/null and b/P3D/Content/Data/Scripts/cianwood/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/cinnabar/gymmap.dat b/P3D/Content/Data/Scripts/cinnabar/gymmap.dat
new file mode 100644
index 000000000..acfe7aaab
Binary files /dev/null and b/P3D/Content/Data/Scripts/cinnabar/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/ecruteak/gymmap.dat b/P3D/Content/Data/Scripts/ecruteak/gymmap.dat
new file mode 100644
index 000000000..110ce3b70
Binary files /dev/null and b/P3D/Content/Data/Scripts/ecruteak/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/fuchsia/gymskins.dat b/P3D/Content/Data/Scripts/fuchsia/gymskins.dat
index 75ca3fc6a..49a1fa1cb 100644
Binary files a/P3D/Content/Data/Scripts/fuchsia/gymskins.dat and b/P3D/Content/Data/Scripts/fuchsia/gymskins.dat differ
diff --git a/P3D/Content/Data/Scripts/goldenrod/clubmap.dat b/P3D/Content/Data/Scripts/goldenrod/clubmap.dat
new file mode 100644
index 000000000..d2acff686
--- /dev/null
+++ b/P3D/Content/Data/Scripts/goldenrod/clubmap.dat
@@ -0,0 +1,261 @@
+version=2
+:if:<register.registered(First_time_champion)>=false
+    @player.move(0)
+    @player.turnto(1)
+    @text.show(I'm sorry this club~is for members only.*Please leave.)
+    @player.turnto(2)
+    @player.move(1)
+    @player.warp(goldenrod.dat,15,0.1,21,0)
+    @level.update
+    @player.move(1)
+    :end
+:endif
+
+:if:<register.registered(clubintro)>=false
+	@Register.register(clubregisters,int,0)
+    @player.move(0)
+    @player.turnto(1)
+	:if:<player.gender>=0
+	    @text.show(I'm sorry this club is for mem-*Wait.~Are you perhaps~Miss <player.name>?*I am so sorry~for my rudeness.*Any trainer who is good~enough to be champion is~welcome at this club.*This club is intended~to be a place for powerful~trainers to hangout,~relax, and engage in~friendly battles.*Currently all of the~Gym Leaders of Kanto~and Johto are members,~but they rarely come by.*I am sure if a trainer~as strong as you told~them about this club and~asked them to join you~here they would do so.*They might even come~here willing to battle!)
+    :else
+	    @text.show(I'm sorry this club is for mem-*Wait.~Are you perhaps~Mister <player.name>?*I am so sorry~for my rudeness.*Any trainer who is good~enough to be champion is~welcome at this club.*This club is intended~to be a place for powerful~trainers to hangout,~relax, and engage in~friendly battles.*Currently all of the~Gym Leaders of Kanto~and Johto are members,~but they rarely come by.*I am sure if a trainer~as strong as you told~them about this club and~asked them to join you~here they would do so.*They might even come~here willing to battle!)
+	:endif
+	@register.register(clubintro)
+:endif
+
+:if:<Register.registered(EusineHere)>=false <and> <register.registed(EusineRematchTalk)>=True
+	:if:<system.random(7)>=5
+		@register.registertime(EusineHere,20,hour)
+	:endif
+:endif
+
+:if:<Register.registered(LiHere)>=false <and> <Register.registered(LiNotHere)>=false <and> <register.registed(LiRematchTalk)>=True
+	:if:<system.random(10)>=5
+		@register.registertime(LiHere,4,hour)
+	:endif
+:endif
+:if:<Register.registered(LiHere)>=true
+	@npc.warp(19,~,0.2,~)
+:endif
+
+:if:<Environment.day>=Sunday
+	:if:<Environment.hour><4 <and> <Environment.hour>>0
+		:if:<register.registered(TRTPreTalk)>=true
+			@npc.warp(30,~,3.2,~)
+			@npc.warp(31,~,3.2,~)
+			@npc.warp(32,~,3.2,~)
+		:endif
+	:endif
+    :if:<Environment.hour><12 <and> <Environment.hour>>4
+        :if:<register.registered(BugsyRematchTalk)>=true
+            @npc.warp(10,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>6
+        :if:<register.registered(ErikaRematchTalk)>=true
+            @npc.warp(4,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>8
+        :if:<register.registered(BrockRematchTalk)>=true
+            @npc.warp(1,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>14
+        :if:<register.registered(MistyRematchTalk)>=true
+            @npc.warp(2,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+:if:<Environment.day>=Monday
+    :if:<Environment.hour><9 <and> <Environment.hour>>2
+        :if:<register.registered(ChuckRematchTalk)>=true
+            @npc.warp(15,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><12 <and> <Environment.hour>>4
+        :if:<register.registered(BugsyRematchTalk)>=true
+            @npc.warp(10,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>8
+        :if:<register.registered(BrockRematchTalk)>=true
+            @npc.warp(1,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><19 <and> <Environment.hour>>12
+        :if:<register.registered(JasmineRematchTalk)>=true
+            @npc.warp(14,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+:if:<Environment.day>=Tuesday
+    :if:<Environment.hour><11 <and> <Environment.hour>>2
+        :if:<register.registered(BlaineRematchTalk)>=true
+            @npc.warp(7,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><12 <and> <Environment.hour>>4
+        :if:<register.registered(BugsyRematchTalk)>=true
+            @npc.warp(10,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>8
+        :if:<register.registered(BrockRematchTalk)>=true
+            @npc.warp(1,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>14
+        :if:<register.registered(PryceRematchTalk)>=true
+            @npc.warp(15,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+:if:<Environment.day>=Wednesday
+    :if:<Environment.hour><9 <and> <Environment.hour>>2
+        :if:<register.registered(ChuckRematchTalk)>=true
+            @npc.warp(15,~,0.2,~)
+        :endif
+        :if:<register.registered(KiyoRematchTalk)>=true
+            @npc.warp(18,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><22 <and> <Environment.hour>>6
+        :if:<register.registered(BlueRematchTalk)>=true
+            @npc.warp(8,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><19 <and> <Environment.hour>>12
+        :if:<register.registered(JasmineRematchTalk)>=true
+            @npc.warp(14,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+:if:<Environment.day>=Thursday
+    :if:<Environment.hour><11 <and> <Environment.hour>>2
+        :if:<register.registered(BlaineRematchTalk)>=true
+            @npc.warp(7,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>8
+        :if:<register.registered(SurgeRematchTalk)>=true
+            @npc.warp(3,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>9
+        :if:<register.registered(OakRematchTalk)>=true
+            @npc.warp(30,~,3.2,~)
+            @npc.warp(31,~,3.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>14
+        :if:<register.registered(PryceRematchTalk)>=true
+            @npc.warp(15,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>16
+        :if:<register.registered(ClairRematchTalk)>=true
+            @npc.warp(16,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+:if:<Environment.day>=Friday
+    :if:<Environment.hour><9 <and> <Environment.hour>>2
+        :if:<register.registered(ChuckRematchTalk)>=true
+            @npc.warp(15,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>8
+        :if:<register.registered(SurgeRematchTalk)>=true
+            @npc.warp(3,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><19 <and> <Environment.hour>>12
+        :if:<register.registered(JasmineRematchTalk)>=true
+            @npc.warp(14,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>16
+        :if:<register.registered(ClairRematchTalk)>=true
+            @npc.warp(16,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+:if:<Environment.day>=Saturday
+    :if:<Environment.hour><15 <and> <Environment.hour>>6
+        :if:<register.registered(ErikaRematchTalk)>=true
+            @npc.warp(4,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><15 <and> <Environment.hour>>8
+        :if:<register.registered(SurgeRematchTalk)>=true
+            @npc.warp(3,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>14
+        :if:<register.registered(MistyRematchTalk)>=true
+            @npc.warp(2,~,0.2,~)
+        :endif
+    :endif
+    :if:<Environment.hour><23 <and> <Environment.hour>>16
+        :if:<register.registered(ClairRematchTalk)>=true
+            @npc.warp(16,~,0.2,~)
+        :endif
+    :endif
+:endif
+
+#Everyday
+:if:<Environment.hour><4 <and> <Environment.hour>>0
+    :if:<register.registered(JanineRematchTalk)>=true
+        @npc.warp(5,~,0.2,~)
+    :endif
+:endif
+
+:if:<Environment.hour><7 <and> <Environment.hour>>3
+    :if:<register.registered(FalknerRematchTalk)>=true
+        @npc.warp(9,~,0.2,~)
+    :endif
+:endif
+
+:if:<Environment.hour><17 <and> <Environment.hour>>13
+    :if:<register.registered(SabrinaRematchTalk)>=true
+        @npc.warp(6,~,0.2,~)
+    :endif
+:endif
+
+:if:<Environment.hour><22 <and> <Environment.hour>>18
+    :if:<register.registered(WhitneyRematchTalk)>=true
+        @npc.warp(11,~,0.2,~)
+    :endif
+:endif
+
+:if:<Environment.hour>=0 <or> <Environment.hour>=22 <or> <Environment.hour>=23
+    :if:<register.registered(MortyRematchTalk)>=true
+        @npc.warp(12,~,0.2,~)
+    :endif
+    :if:<register.registered(EusineHere)>=true 
+        @npc.warp(17,~,0.2,~)
+    :endif
+:endif
+
+:if:<register.registered(LeafAtClub)>=true
+	@npc.warp(99,~,3.2,~)
+:endif
+
+:if:<register.value(clubregisters)>>15 <and> <register.registered(clubextendinvite)>=false
+	@player.move(0)
+	@player.turnto(1)
+	:if:<player.gender>=0
+	    @text.show(Oh, Miss <player.name>.*It is so good to see you!*I am not sure what you told them, but all of the Gym Leaders from both Johto and Kanto have been frequenting the club!*The battles we have witnessed here have been spectacular!*I suspect our reputation for hosting the strongest trainers has begun to spread.*If you meet a worthy trainer feel free to invite them to visit us!)
+    :else
+	    @text.show(Oh, Mister <player.name>.*It is so good to see you!*I am not sure what you told them, but all of the Gym Leaders from both Johto and Kanto have been frequenting the club!*The battles we have witnessed here have been spectacular!*I suspect our reputation for hosting the strongest trainers has begun to spread.*If you meet a worthy trainer feel free to invite them to visit us!)
+	:endif
+	@register.register(clubextendinvite)
+:endif
+:end
diff --git a/P3D/Content/Data/Scripts/goldenrod/gymmap.dat b/P3D/Content/Data/Scripts/goldenrod/gymmap.dat
new file mode 100644
index 000000000..16f20fe82
Binary files /dev/null and b/P3D/Content/Data/Scripts/goldenrod/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/mahogany/gymmap.dat b/P3D/Content/Data/Scripts/mahogany/gymmap.dat
new file mode 100644
index 000000000..2c346ece7
Binary files /dev/null and b/P3D/Content/Data/Scripts/mahogany/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/mtsilver/red.dat b/P3D/Content/Data/Scripts/mtsilver/red.dat
index 67c6fcbeb..0ecc6793b 100644
Binary files a/P3D/Content/Data/Scripts/mtsilver/red.dat and b/P3D/Content/Data/Scripts/mtsilver/red.dat differ
diff --git a/P3D/Content/Data/Scripts/olivine/gymmap.dat b/P3D/Content/Data/Scripts/olivine/gymmap.dat
new file mode 100644
index 000000000..55bd078b8
Binary files /dev/null and b/P3D/Content/Data/Scripts/olivine/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/pewter/gymmap.dat b/P3D/Content/Data/Scripts/pewter/gymmap.dat
new file mode 100644
index 000000000..41b4ef815
Binary files /dev/null and b/P3D/Content/Data/Scripts/pewter/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/saffron/gymmap.dat b/P3D/Content/Data/Scripts/saffron/gymmap.dat
new file mode 100644
index 000000000..74ce6e861
Binary files /dev/null and b/P3D/Content/Data/Scripts/saffron/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat
index 4835639ad..35a74f7c5 100644
--- a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat
@@ -1,17 +1,23 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(BugsyRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe mornings during~the beginning of the week?*If you visit while~I am there maybe~we could battle.)
+    @register.register(BugsyRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
 @battle.starttrainer(azalea_gym\leader)
 @player.AchieveEmblem(hive)
 :if:<register.registered(hivebadge_obtain)>=False
-	@register.register(hivebadge_obtain)
-	@register.register(trainer_azalea_gym\001)
-	@register.register(trainer_azalea_gym\002)
-	@register.register(trainer_azalea_gym\003)
-	@register.register(trainer_azalea_gym\004)
-	@register.register(trainer_azalea_gym\005)
-	@player.GetBadge(10)
-	@Text.show(Do you know the~benefits of the Hive Badge?*If you have it,~Pokémon up to Level 30 will~obey you.*Pokémon that know~Cut will be able*to use it outside~of battle too.*Here, I also want~you to have this.)
-	@item.give(239,1)
-	@item.messagegive(239,1)
-	@Text.show(TM49 contains~Fury Cutter.*If you don't miss,~it gets stronger~every turn.*The longer your~battle goes, the~better it gets.*Isn't that great?~I discovered it!)
+    @register.register(hivebadge_obtain)
+    @register.register(trainer_azalea_gym\001)
+    @register.register(trainer_azalea_gym\002)
+    @register.register(trainer_azalea_gym\003)
+    @register.register(trainer_azalea_gym\004)
+    @register.register(trainer_azalea_gym\005)
+    @player.GetBadge(10)
+    @Text.show(Do you know the~benefits of Hivebadge?*If you have it,~Pokémon up to Level 30 will~obey you.*Pokémon that know~Cut will be able*to use it outside~of battle too.*Here, I also want~you to have this.)
+    @item.add(239,1)
+    @item.messagegive(239,1)
+    @Text.show(TM49 contains~Fury Cutter.*If you don't miss,~it gets stronger~every turn.*The longer your~battle goes, the~better it gets.*Isn't that great?~I discovered it!)
 :endif
 :end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat
index cf67410b8..334e07f33 100644
--- a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat
@@ -1,23 +1,24 @@
 version=2
-:if:<register.registered(trainer_blackthorn_gym\leader)>=true <and> <register.registered(risingbadge_obtain)>=false
-:then
-@Text.show(What's the matter?*Is it too much to~expect of you?)
-:end
+:if:<register.registered(clubintro)>=true <and> <register.registered(ClairRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe evenings during~the end of the week?*If you visit while~I am there maybe~we could battle.)
+    @register.register(ClairRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
+:if:<register.registered(trainer_blackthorn_gym\leader)>=true <and> <register.registered(risingbadge_obtain)>=false
+    @Text.show(What's the matter?*Is it too much to~expect of you?)
+    :end
 :endif
-
 @battle.starttrainer(blackthorn_gym\leader)
-
 :if:<register.registered(risingbadge_obtain)>=false
-:then
-@entity.warp(1,3,-1,5)
-@entity.remove(0)
-@Register.register(trainer_blackthorn_gym\001)
-@Register.register(trainer_blackthorn_gym\002)
-@Register.register(trainer_blackthorn_gym\003)
-@Register.register(trainer_blackthorn_gym\004)
-@Register.register(trainer_blackthorn_gym\005)
-@npc.unregister(goldenrod\radiotower\2f.dat|7|position|9,0,4)
-@npc.register(blackthorn.dat|5|position|21,0,2)
-@Text.show(I won't admit this.*I may have lost,~but you're still*not ready for the~Pokémon League*I know. You should~take the dragon~user challenge.*Behind this Gym is~a place called~Dragon's Den.*There is a small~shrine at its center.*Go there.*If you can prove~that you've lost*your lazy ideals,~I will recognize*you as a trainer~worthy of a~Gym Badge!)
+    @entity.warp(1,3,-1,5)
+    @entity.remove(0)
+    @register.register(trainer_blackthorn_gym\001)
+    @register.register(trainer_blackthorn_gym\002)
+    @register.register(trainer_blackthorn_gym\003)
+    @register.register(trainer_blackthorn_gym\004)
+    @register.register(trainer_blackthorn_gym\005)
+    @npc.register(blackthorn.dat|5|position|21,0,2)
+    @Text.show(I won't admit this.*I may have lost,~but you're still*not ready for the~Pokémon Leageue*I know. You should~take the dragon~user challenge.*Behind this Gym is~a place called~Dragon's Den.*There is a small~shrine at its center.*Go there.*If you can prove~that you've lost*your lazy ideals,~I will recognize*you as a trainer~worthy of a~Gym Badge!)
 :endif
 :end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat
index cc72d2dd0..56812e543 100644
Binary files a/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat
index 0acd3c5f6..a368977ca 100644
Binary files a/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat
index 329cf9689..268769058 100644
--- a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat
@@ -1,53 +1,56 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(ChuckRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe Monday/Wednesday/~Friday early mornings?*If you visit while~I am there maybe~we could battle.)
+    @register.register(ChuckRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
+
 :if:<register.registered(stormbadge_obtain)>=False
-@Music.play(trainer_encounter)
-@Text.show(WAHAHAHA!*So you've come~this far!*Let me tell you,~I'm tough!~My Pokémon will~crush stones and~shatter bones!~Watch this!)
-@npc.turn(0,3)
-@Level.wait(5)
-@Player.turnto(3)
-@player.move(1)
-@player.turnto(0)
-@text.show(CHUCK: Urggh!~...*Ooooarrgh!)
+	@Music.play(trainer_encounter)
+	@Text.show(WAHAHAHA!*So you've come~this far!*Let me tell you,~I'm tough!~My Pokémon will~crush stones and~shatter bones!~Watch this!)
+	@npc.turn(0,3)
+	@Level.wait(5)
+	@Player.turnto(3)
+	@player.move(1)
+	@player.turnto(0)
+	@text.show(CHUCK: Urggh!~...*Ooooarrgh!)
+	@sound.play(destroy)
 
-@sound.play(destroy)
-:while:<entity.positiony(5)><1
+	:while:<entity.positiony(5)><1
+		@entity.addtoposition(5,0,0.1,0)
+		@level.wait(2)
+		@level.update
+	:endwhile
 
-@entity.addtoposition(5,0,0.1,0)
-@level.wait(2)
-@level.update
+	:while:<entity.positiony(5)>>-0.3
+		@entity.addtoposition(5,0,-0.1,0)
+		@level.wait(2)
+		@level.update
+	:endwhile
 
-:endwhile
-
-:while:<entity.positiony(5)>>-0.3
-
-@entity.addtoposition(5,0,-0.1,0)
-@level.wait(2)
-@level.update
-
-:endwhile
-
-@Level.Update
-@sound.play(destroy)
-@Entity.Move(5,1)
-@Level.wait(10)
-@Player.turnto(1)
-@player.move(1)
-@player.turnto(0)
-@npc.turn(0,2)
-@battle.starttrainer(cianwood_gym\leader)
-@Music.play(gym)
-@register.register(stormbadge_obtain)
-@register.register(trainer_cianwood_gym\001)
-@register.register(trainer_cianwood_gym\002)
-@register.register(trainer_cianwood_gym\003)
-@register.register(trainer_cianwood_gym\004)
-@player.GetBadge(13)
-@player.AchieveEmblem(storm)
-@text.show(The Storm Badge makes~all Pokémon up to*Level 70 obey, even~traded ones.*It also lets your~Pokémon use Fly*when you're not in~a battle.*Here, take this too!)
-@item.give(191,1)
-@item.messagegive(191,1)
-@text.show(That is Dynamicpunch.*It doesn't always~hit, but when it*does, it causes~confusion!)
-:end
+	@Level.Update
+	@sound.play(destroy)
+	@Entity.Move(5,1)
+	@Level.wait(10)
+	@Player.turnto(1)
+	@player.move(1)
+	@player.turnto(0)
+	@npc.turn(0,2)
+	@battle.starttrainer(cianwood_gym\leader)
+	@Music.play(gym)
+	@register.register(stormbadge_obtain)
+	@register.register(trainer_cianwood_gym\001)
+	@register.register(trainer_cianwood_gym\002)
+	@register.register(trainer_cianwood_gym\003)
+	@register.register(trainer_cianwood_gym\004)
+	@player.GetBadge(13)
+	@player.AchieveEmblem(storm)
+	@text.show(The Storm Badge makes~all Pokémon up to*Level 70 obey, even~traded ones.*It also lets your~Pokémon use Fly*when you're not in~a battle.*Here, take this too!)
+	@item.give(191,1)
+	@item.messagegive(191,1)
+	@text.show(That is Dynamicpunch.*It doesn't always~hit, but when it*does, it causes~confusion!)
+	:end
 :endif
 
 @battle.starttrainer(cianwood_gym\leader)
diff --git a/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat
index 24ec31b69..e95db87e7 100644
Binary files a/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat
index 0c363bbc5..dd6de454e 100644
--- a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat
@@ -1,16 +1,22 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(MortyRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe around midnight?*If you visit while~I am there maybe~we could battle.)
+    @register.register(MortyRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
 @battle.starttrainer(ecruteak_gym\leader)
 @player.AchieveEmblem(fog)
 :if:<register.registered(fogbadge_obtain)>=False
-@register.register(fogbadge_obtain)
-@register.register(trainer_ecruteak_gym\001)
-@register.register(trainer_ecruteak_gym\002)
-@register.register(trainer_ecruteak_gym\003)
-@register.register(trainer_ecruteak_gym\004)
-@player.GetBadge(12)
-@Text.show(By having the Fog~Badge, Pokémon up*to Level 50 will obey~you.*Also, Pokémon that~know Surf will be*able to use that~move anytime.*I want you to have~this too)
-@item.give(220,1)
-@item.messagegive(220,1)
-@Text.show(It's Shadow Ball.~It causes damage*and may reduce~Special Defense.*Use it if it~appeals to you.)
+    @register.register(fogbadge_obtain)
+    @register.register(trainer_ecruteak_gym\001)
+    @register.register(trainer_ecruteak_gym\002)
+    @register.register(trainer_ecruteak_gym\003)
+    @register.register(trainer_ecruteak_gym\004)
+    @player.GetBadge(12)
+    @Text.show(By having Fog-~Badge, Pokémon up*to Level 50 will obey~you.*Also, Pokémon that~know Surf will be*able to use that~move anytime.*I want you to have~this too)
+    @item.add(220,1)
+    @item.messagegive(220,1)
+    @Text.show(It's Shadow Ball.~It causes damage*and may reduce~Special Defense.*Use it if it~appeals to you.)
 :endif
 :end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat
index 9d8dde4b2..9a24e9a79 100644
Binary files a/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat
index 5407ebc5d..0ae4fbb30 100644
--- a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat
@@ -1,4 +1,11 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(WhitneyRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe evenings?*If you visit while~I am there maybe~we could battle.)
+    @register.register(WhitneyRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
+
 :if:<register.registered(whitneyTM)>=False <and> <register.registered(plainbadge_obtain)>=True
 	@item.give(235,1)
 	@register.register(whitneyTM)
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer
new file mode 100644
index 000000000..d86f6c488
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/Jasminetrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.dat
new file mode 100644
index 000000000..549bca8b6
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,blaine)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer
new file mode 100644
index 000000000..5fbc8806c
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/blaine.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/blue.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/blue.dat
new file mode 100644
index 000000000..ed45fbcc6
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/blue.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,blue)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer
new file mode 100644
index 000000000..2cc6f823a
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/blue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/brock.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/brock.dat
new file mode 100644
index 000000000..fd535a0f4
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/brock.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,brock)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/brock.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/brock.trainer
new file mode 100644
index 000000000..9555169b0
Binary files /dev/null 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
new file mode 100644
index 000000000..bc935e2ae
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/bugsy.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,bugsy<register.exists(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
new file mode 100644
index 000000000..8c7c0b48b
Binary files /dev/null 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
new file mode 100644
index 000000000..00aa879f6
Binary files /dev/null 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
new file mode 100644
index 000000000..c30a6f370
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/chuck.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,chuck<register.exists(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
new file mode 100644
index 000000000..c2db86b80
Binary files /dev/null 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
new file mode 100644
index 000000000..9473e690b
Binary files /dev/null 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
new file mode 100644
index 000000000..127aab677
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/clair.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,clair<register.exists(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
new file mode 100644
index 000000000..91dfe75b9
Binary files /dev/null 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
new file mode 100644
index 000000000..aca1a8d72
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/clairtrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/erika.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/erika.dat
new file mode 100644
index 000000000..e64345fa2
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/erika.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,erika)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer
new file mode 100644
index 000000000..79dbe4e24
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/erika.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat
new file mode 100644
index 000000000..964ca321e
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/falkner.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,falkner<register.exists(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
new file mode 100644
index 000000000..43dc6f2cb
Binary files /dev/null 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
new file mode 100644
index 000000000..5368fa2da
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/falknertrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/janine.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/janine.dat
new file mode 100644
index 000000000..bff7ca73f
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/janine.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,janine)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/janine.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/janine.trainer
new file mode 100644
index 000000000..f594456c2
Binary files /dev/null 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
new file mode 100644
index 000000000..62b84a833
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/jasmine.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,jasmine<register.exists(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
new file mode 100644
index 000000000..af050f42d
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/jasminefalse.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/leaf.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/leaf.dat
new file mode 100644
index 000000000..a179850a0
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/leaf.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/leaf.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/leaf.trainer
new file mode 100644
index 000000000..997a219b0
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/leaf.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat
new file mode 100644
index 000000000..ff7bc2641
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/main.dat
@@ -0,0 +1,9 @@
+version=2
+#0: gym leader
+: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,1,day)
+:endif
+@text.show(<battle.defeatmessage(gymrematch\\<storage.get(string,leader)>)>)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/misty.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/misty.dat
new file mode 100644
index 000000000..817285c3e
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/misty.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,misty)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/misty.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/misty.trainer
new file mode 100644
index 000000000..346d77bb0
Binary files /dev/null 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
new file mode 100644
index 000000000..75d591dda
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/morty.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,morty<register.exists(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
new file mode 100644
index 000000000..f6fd75857
Binary files /dev/null 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
new file mode 100644
index 000000000..b597e47ce
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/mortytrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat
new file mode 100644
index 000000000..1de263b70
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/pryce.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,pryce<register.exists(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
new file mode 100644
index 000000000..501cd2763
Binary files /dev/null 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
new file mode 100644
index 000000000..bce56593c
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/prycetrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.dat
new file mode 100644
index 000000000..5605d5860
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,sabrina)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer
new file mode 100644
index 000000000..1a20886fc
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/sabrina.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/surge.dat b/P3D/Content/Data/Scripts/trainer/gymrematch/surge.dat
new file mode 100644
index 000000000..5568cb848
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/surge.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,surge)
+@script.start(trainer\gymrematch\main)
+:end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/gymrematch/surge.trainer b/P3D/Content/Data/Scripts/trainer/gymrematch/surge.trainer
new file mode 100644
index 000000000..2da97f92e
Binary files /dev/null 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
new file mode 100644
index 000000000..7edddaad1
--- /dev/null
+++ b/P3D/Content/Data/Scripts/trainer/gymrematch/whitney.dat
@@ -0,0 +1,4 @@
+version=2
+@storage.set(string,leader,whitney<register.exists(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
new file mode 100644
index 000000000..239d7d128
Binary files /dev/null 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
new file mode 100644
index 000000000..99477c272
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/gymrematch/whitneytrue.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat
index 2163aa384..8e019ed85 100644
Binary files a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat
index 12b457710..b67877ea2 100644
--- a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat
@@ -1,13 +1,18 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(JasmineRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe Monday/Wednesday/~Friday early afternoons?*If you visit while~I am there maybe~we could battle.)
+    @register.register(JasmineRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
 @battle.starttrainer(olivine_gym\leader)
 @player.AchieveEmblem(mineral)
 :if:<register.registered(mineralbadge_obtain)>=False
-:then
-@Register.register(mineralbadge_obtain)
-@player.GetBadge(14)
-@Text.show(The Mineral Badge~raises Pokémon's~Defense.*...Um... Please take~this too...)
-@item.give(213,1)
-@item.messagegive(213,1)
-@Text.show(...You could use~that TM to teach~Iron Tail.)
+    @register.register(mineralbadge_obtain)
+    @player.GetBadge(14)
+    @Text.show(Mineralbadge~raises Pokémon's~Defense.*...Um... Please take~this too...)
+    @item.add(213,1)
+    @item.messagegive(213,1)
+    @Text.show(...You could use~that TM to teach~Iron Tail.)
 :endif
 :end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat
index 1f55d56b4..bca2c6af5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat
index 5d1c27099..88f46bd6a 100644
Binary files a/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/saffron_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat
index 5085ea2ed..557457528 100644
--- a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat
+++ b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat
@@ -1,4 +1,10 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(earthbadge_obtain)>=true <and> <register.registered(SurgeRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe afternoons during~the end of the week?*If you visit while~I am there maybe~we could battle.)
+    @register.register(SurgeRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
 @battle.starttrainer(vermilion_gym\leader)
 @player.AchieveEmblem(thunder)
 :if:<register.registered(thunderbadge_obtain)>=False
diff --git a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat
index 90b1f34d1..92f10d6e1 100644
--- a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat
+++ b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat
@@ -1,4 +1,10 @@
 version=2
+:if:<register.registered(clubintro)>=true <and> <register.registered(FalknerRematchTalk)>=false
+    @text.show(Hello, <player.name>.*Battle Bar?*I remember hearing a~little about it.*I might start hanging~out there.*Maybe mornings?*If you visit while~I am there maybe~we could battle.)
+    @register.register(FalknerRematchTalk)
+	@register.change(clubregisters,<register.value(clubregisters)>+1)
+    :end
+:endif
 
 @battle.starttrainer(violetgymleader)
 @player.AchieveEmblem(zephyr)
diff --git a/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat
index 9a7db72c8..cee2b1dd4 100644
Binary files a/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat differ
diff --git a/P3D/Content/Data/Scripts/vermilion/gymtrash/reset.dat b/P3D/Content/Data/Scripts/vermilion/gymtrash/reset.dat
index 978726039..86eb13ee4 100644
Binary files a/P3D/Content/Data/Scripts/vermilion/gymtrash/reset.dat and b/P3D/Content/Data/Scripts/vermilion/gymtrash/reset.dat differ
diff --git a/P3D/Content/Data/Scripts/violet/gymmap.dat b/P3D/Content/Data/Scripts/violet/gymmap.dat
new file mode 100644
index 000000000..626b83ee7
Binary files /dev/null and b/P3D/Content/Data/Scripts/violet/gymmap.dat differ
diff --git a/P3D/Content/Data/Scripts/viridian/gymmap.dat b/P3D/Content/Data/Scripts/viridian/gymmap.dat
new file mode 100644
index 000000000..0ffadc318
Binary files /dev/null and b/P3D/Content/Data/Scripts/viridian/gymmap.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod.dat b/P3D/Content/Data/maps/goldenrod.dat
index e0ec5df99..29d1ef6c5 100644
--- a/P3D/Content/Data/maps/goldenrod.dat
+++ b/P3D/Content/Data/maps/goldenrod.dat
@@ -114,6 +114,40 @@ RadioTower:
 {"EntityField"{ENT[{"Scale"{sngArr[1,1,0.1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[5,11,15.4]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[80,32,16,16][80,32,1,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 {"EntityField"{ENT[{"Scale"{sngArr[1,1,0.1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[7,5,15.4]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[80,32,16,16][80,32,1,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
+club:
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,0,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,0,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,0,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,0,21]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[2,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[16,0,21]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,1,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[80,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,1,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[80,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,1,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[80,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,1,21]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[80,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,2,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,40,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,40,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,2,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,40,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,2,21]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,40,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,3,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,3,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,3,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,3,21]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[64,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+{"EntityField"{ENT[{"Size"{intArr[6,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,4,18]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[48,48,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[15,0,21]}}{"TexturePath"{str[Club]}}{"Textures"{recArr[[32,48,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[goldenrod\club.dat,7,0.1,15,0]}}{"Rotation"{int[0]}}]}}
+
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,0,21.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,-1,-1]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,1,21.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,2,21.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,3,21.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,0.25,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,3.625,21.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+{"Entity"{ENT[{"Scale"{sngArr[1,1,0.25]}}{"EntityID"{str[TurningSign]}}{"Position"{sngArr[17.625,4.25,21.375]}}{"TexturePath"{str[club]}}{"Textures"{recArr[[0,64,17,13][17,64,4,13][0,77,17,4]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,2,2,2,2]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[3]}}{"Rotation"{int[0]}}]}}
+
 Pokecenter:
 {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[14,0,24]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,-1,-1,0,0,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,0,24]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
@@ -138,11 +172,11 @@ Pokecenter:
 {"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2,27]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[64,32,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[5]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
 {"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2,24]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[64,32,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[5]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
-{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[18.375,0,27.625]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,-1,-1]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[18.375,1,27.625]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
-{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[18.375,2,27.625]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,0,27.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,-1,-1]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,1,27.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.25,1,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17.625,2,27.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[20,32,4,16][24,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
-{"Entity"{ENT[{"Scale"{sngArr[1,1,0.25]}}{"EntityID"{str[TurningSign]}}{"Position"{sngArr[18.375,3,27.625]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[0,44,16,12][16,44,4,12][0,56,16,4]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,2,2,2,2]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[1]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[1,1,0.25]}}{"EntityID"{str[TurningSign]}}{"Position"{sngArr[17.625,3,27.375]}}{"TexturePath"{str[violet]}}{"Textures"{recArr[[0,44,16,12][16,44,4,12][0,56,16,4]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,2,2,2,2]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[1]}}{"Rotation"{int[0]}}]}}
 
 Mart:
 {"EntityField"{ENT[{"Size"{intArr[1,6]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,0,22]}}{"TexturePath"{str[Goldenrod]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
diff --git a/P3D/Content/Data/maps/goldenrod/club.dat b/P3D/Content/Data/maps/goldenrod/club.dat
new file mode 100644
index 000000000..41782866b
Binary files /dev/null and b/P3D/Content/Data/maps/goldenrod/club.dat differ
diff --git a/P3D/Content/Textures/NPC/Agatha.png b/P3D/Content/Textures/NPC/Agatha.png
new file mode 100644
index 000000000..a9b5448aa
Binary files /dev/null and b/P3D/Content/Textures/NPC/Agatha.png differ
diff --git a/P3D/Content/Textures/club.png b/P3D/Content/Textures/club.png
new file mode 100644
index 000000000..85f59a0b0
Binary files /dev/null and b/P3D/Content/Textures/club.png differ