diff --git a/P3D/Content/Data/Scripts/goldenrod/clubmap.dat b/P3D/Content/Data/Scripts/goldenrod/clubmap.dat index 49a1ab696..8e759ea6b 100644 --- a/P3D/Content/Data/Scripts/goldenrod/clubmap.dat +++ b/P3D/Content/Data/Scripts/goldenrod/clubmap.dat @@ -47,9 +47,9 @@ version=2 :if:=Sunday :if:<4 >0 :if:=true - @npc.warp(30,~,3.2,~) - @npc.warp(31,~,3.2,~) - @npc.warp(32,~,3.2,~) + @npc.warp(20,~,3.2,~) + @npc.warp(21,~,3.2,~) + @npc.warp(22,~,3.2,~) :endif :endif :if:<12 >5 diff --git a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat index 1281e78aa..61952f34e 100644 --- a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(Hey ,~hear this.*Last season I was able to~catch a whole bunch of bug~Pokémon that migrated from~Kanto.*I am itching to test them~out in battle.*Rumor is that Goldenrod has~opened a new battle bar~in the city center.*I will make sure to be there~a few mornings if you are~interested in a rematch.) @register.register(BugsyRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat index 334e07f33..2716bdc0f 100644 --- a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(Ah, here is our~new champion.*So you made it huh?*Well don't get too cocky,~you just got lucky last time.*Huh? A battle bar?*Sounds like the perfect~opportunity to have my~revenge!*If you are up to it,~I will be present some~evenings.*You'd better be~ready ,~I won't stand for another~loss!) @register.register(ClairRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/celadon_gym/leader.dat index d197d1c16..0286266fd 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 ee380f592..56dc425f8 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 d6f9f755f..9a67a3711 100644 --- a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(Yo ,~good to see you!*I'd love to battle you again~but I am currently in the~middle of my training session.*Hah!~Here's an idea,~I recently heard of a place~in Goldenrod called the~battle bar.*If you would like to witness~my new skills I can be there~some mornings.*If you're up to the challenge~that is, Yahaha!) @register.register(ChuckRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cinnabar_gym/leader.dat index e95db87e7..39bf1144e 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 8d00b00dd..7a4cf82b4 100644 --- a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(Hello ,~it's been a while.*To be honest not many really~strong trainers have passed~through here after you,~but that doesn't mean I~haven't been training!*What's that?*The new battle bar?*My ghosts prefer battling in~a quieter place but this~sounds like the ideal place~to improve my skills.*If we were to have another~battle we'd need to do~it when I'm free.*Usually around midnight~will work out.) @register.register(MortyRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/fuchsia_gym/leader.dat index 4e78fd213..09b30a75f 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 0ae4fbb30..e5ad25851 100644 --- a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(Hi there!~So good to see you again!*I've been so bored lately,~we should totally have a~rematch!*Um, have you heard about~this new Battle bar?*It's supposed to be like the~coolest place in town!*If you want I could be~there in the evenings.*Don't be late!) @register.register(WhitneyRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.dat index e917eafee..9779a0277 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 b88e225ec..f7ae5c773 100644 --- a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(...Um*hello .*I would like to thank you~again for helping me back~then at the lighthouse.*Ampharos has been completely~healthy, all thanks to you...*Um...*a battle bar?*I don't usually leave the city~too much but I could start~showing up there.*How do a few afternoons sound?*Um...*I'll see you there then, ok?) @register.register(JasmineRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.dat index 83adf43e5..38cb80a10 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 77016f26f..b493a99ba 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 557457528..240726ec0 100644 --- a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat +++ b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat @@ -1,6 +1,6 @@ version=2 :if:=true =true =false - @text.show(Hello, .*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.) + @text.show(Well look who it is!*What brings you~back here kid?*The battle bar?*Sounds like the perfect~place for some training!*How do a few afternoons~sound?*You'd better be there too~kiddo, that's a veterans~promise!) @register.register(SurgeRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat index 92f10d6e1..4fe13fca1 100644 --- a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat +++ b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat @@ -1,6 +1,6 @@ version=2 :if:=true =false - @text.show(Hello, .*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.) + @text.show(Hello ,~how are you doing?*Me and my birds have honed~our abilities and soared to~new heights in battling!*I'd show you but we are~currently renovating the~Gym's scaffolding.*What?~A battle bar?*That sounds like the perfect~place for a rematch!*I can visit in the mornings.) @register.register(FalknerRematchTalk) @register.change(clubregisters,+1) :end diff --git a/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/viridian_gym/leader.dat index cee2b1dd4..ed3365c8e 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