Gym Leader Rematches Round X

Minor text and team changes to the Gym Leaders
introduction

P3D/Content/Data/Scripts/goldenrod/clubmap.dat

@@ -32,6 +32,7 @@ version=2
 :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)
+		@register.registertime(LiNotHere,3,day)
 	:endif
 :endif
 :if:<Register.registered(LiHere)>=true
@@ -40,13 +41,13 @@ version=2
 
 :if:<Environment.day>=Sunday
 	:if:<Environment.hour><4 <and> <Environment.hour>>0
-		:if:<register.registered(TRTPreTalk)>=true
+		:if:<register.registered(TRTPrematchTalk)>=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:<Environment.hour><12 <and> <Environment.hour>>5
         :if:<register.registered(BugsyRematchTalk)>=true
             @npc.warp(10,~,0.2,~)
         :endif
@@ -147,7 +148,7 @@ version=2
         :endif
     :endif
     :if:<Environment.hour><15 <and> <Environment.hour>>9
-        :if:<register.registered(OakRematchTalk)>=true
+        :if:<register.registered(OakPrematchTalk)>=true
             @npc.warp(30,~,3.2,~)
             @npc.warp(31,~,3.2,~)
         :endif
@@ -244,7 +245,7 @@ version=2
     :endif
 :endif
 
-:if:<register.registered(LeafAtClub)>=true
+:if:<register.registered(GreenAtClub)>=true
 	@npc.warp(99,~,3.2,~)
 :endif
 
@@ -257,5 +258,10 @@ version=2
 	    @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)
+	:if:<register.registered(shinycelebi)>=true
+		@npc.register(tohjofalls\hideout.dat|3|position|~,0,~)
+		@npc.register(tohjofalls\hideout.dat|4|position|~,0,~)
+		@npc.register(tohjofalls\hideout.dat|5|position|~,0,~)
+	:endif
 :endif
 :end

P3D/Content/Data/Scripts/ilex/shrine.dat

@@ -317,6 +317,11 @@ version=2
 				@screen.fadeout
 				@sound.play(teleport)
 				@player.warp(ilexforest.dat,10,0.1,26,0)
+				:if:<register.registered(clubextendinvite)>=true
+					@npc.register(tohjofalls\hideout.dat|3|position|~,0,~)
+					@npc.register(tohjofalls\hideout.dat|4|position|~,0,~)
+					@npc.register(tohjofalls\hideout.dat|5|position|~,0,~)
+				:endif
 				@level.update
 				
 				@camera.set(0.8,1.5,3,1.15,-0.5)

P3D/Content/Data/Scripts/pallet/oak.dat

@@ -31,6 +31,13 @@ version=2
 	:endif
 :endif
 
+:if:<register.registered(clubextendinvite)>=true <and> <register.registered(kantostart1)>=true <and> <register.registered(OakPrematchTalk)>=false
+	@text.show( )
+	@register.register(OakPrematchTalk)
+	:end
+
+:endif
+
 #This sets a flag for the evaldist script so that it knows where the call came from:
 @storage.set(str,pallet_oak_scriptcaller,flag)
 @script.start(pallet\evaldist)

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

@@ -3,7 +3,7 @@ version=2
 :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)
+    @register.registertime(<storage.get(string,leader)>rematch,12,hours)
 :endif
 @text.show(<battle.defeatmessage(gymrematch\\<storage.get(string,leader)>)>)
 :end

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

@@ -1,4 +1,10 @@
 version=2
+:if:<register.registered(clubextendinvite)>=true <and> <register.registered(mortytruerematch)>=true <and> <register.registered(EusineRematchTalk)>=false
+	@text.show( )
+	@register.register(EusineRematchTalk)
+	:end
+:endif
+
 @storage.set(string,leader,morty<register.exists(earthbadge_obtain)>)
 @script.start(trainer\gymrematch\main)
 :end

P3D/Content/Data/maps/goldenrod.dat

@@ -254,10 +254,10 @@ TrainBridge:
 {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"EntityID"{str[AllSidesObject]}}{"Position"{sngArr[27,3,12]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[224,0,16,16][208,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
 
 Fences:
-{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,5.65,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
-{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,5.65,23]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
-{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[1,4]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[27,5.65,23]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
-{"EntityField"{ENT[{"Scale"{sngArr[1,0.3,1]}}{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,5.65,27]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[5,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22.5,6,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,5]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22,6,22.5]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[1,5]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[27,6,22.5]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Size"{intArr[5,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[22.5,6,27]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[14,0,11]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[6,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[12,0,14]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}

P3D/P3D.vbproj

@@ -25830,6 +25830,15 @@
     <Content Include="Content\Data\Scripts\ecruteak\gymmap.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Content\Data\maps\structures\goldenrod\chair.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\maps\structures\goldenrod\chandelier.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\maps\structures\goldenrod\table.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\faraway\ancestoremblemcheck.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26007,12 +26016,6 @@
     <Content Include="Content\Data\Scripts\trainer\gymrematch\Jasminetrue.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\trainer\gymrematch\leaf.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Data\Scripts\trainer\gymrematch\leaf.trainer">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\trainer\gymrematch\main.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -26061,6 +26064,57 @@
     <Content Include="Content\Data\Scripts\trainer\gymrematch\whitneytrue.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Content\Data\Scripts\mtmortar\bf1map.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\pallet\labmap.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\tohjofalls\jjm.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\agatha.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\agatha.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\elderli.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\elderli.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\eusine.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\eusine.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\green.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\green.trainer">
+      <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.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\kiyo.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\kiyo.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\oak.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\gymrematch\oak.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\trainer\kolben\Segis.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26154,6 +26208,9 @@
     <Content Include="Content\Data\Scripts\viridian\gymmap.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Content\Data\Scripts\violet\towertopmap.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Pokemon\Data\172_spiky-eared.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>