From 434d21a5d187be805090b8edf64f89bb43c7ae1d Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Sun, 29 Oct 2017 15:54:31 -0500 Subject: [PATCH] Reverted previous engine side encoding fix, converted the belonging script files to UTF-8. --- 2.5DHero/2.5DHero/Battle/Trainer.vb | 2 +- .../2.5DHero/Scripts/trainer/fortune/pattern/002.trainer | 8 ++++---- .../2.5DHero/Scripts/trainer/fortune/water/003.trainer | 2 +- .../2.5DHero/Scripts/trainer/fortune/water/004.trainer | 2 +- 2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005l.dat | 2 +- 2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.dat | 2 +- .../2.5DHero/Scripts/trainer/fortune/water/005r.trainer | 2 +- .../2.5DHero/Scripts/trainer/fortune/water/006.trainer | 2 +- 2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.5DHero/2.5DHero/Battle/Trainer.vb b/2.5DHero/2.5DHero/Battle/Trainer.vb index 73752914c..3934ed8ab 100644 --- a/2.5DHero/2.5DHero/Battle/Trainer.vb +++ b/2.5DHero/2.5DHero/Battle/Trainer.vb @@ -51,7 +51,7 @@ Public Class Trainer Dim path As String = GameModeManager.GetScriptPath("Trainer\" & TrainerFile & ".trainer") Security.FileValidation.CheckFileValid(path, False, "Trainer.vb") - Dim Data() As String = System.IO.File.ReadAllLines(path, Encoding.GetEncoding("iso-8859-1")) + Dim Data() As String = System.IO.File.ReadAllLines(path) If Data(0) = "[TRAINER FORMAT]" Then LoadTrainer(Data) diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/pattern/002.trainer b/2.5DHero/2.5DHero/Scripts/trainer/fortune/pattern/002.trainer index 633f04eef..3ef730475 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/pattern/002.trainer +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/pattern/002.trainer @@ -1,10 +1,10 @@ [TRAINER FORMAT] Name|Bethany -TrainerClass|Pokémon Breeder +TrainerClass|PokĂ©mon Breeder Money|1540 -IntroMessage|I'm curious, how do you raise~your Pokémon? -OutroMessage|You raise your Pokémon with a whole lot of love! -DefeatMessage|In the same way your mother~raised you full of love,~you should raise your Pokémon. +IntroMessage|I'm curious, how do you raise~your PokĂ©mon? +OutroMessage|You raise your PokĂ©mon with a whole lot of love! +DefeatMessage|In the same way your mother~raised you full of love,~you should raise your PokĂ©mon. TextureID|1 Region|Sevii Islands IniMusic|johto_trainer_intro diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/003.trainer b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/003.trainer index 872db719e..a27d0c2c3 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/003.trainer +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/003.trainer @@ -1,4 +1,4 @@ -[TRAINER FORMAT] +[TRAINER FORMAT] Name|Denise TrainerClass|Swimmer Money|212 diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/004.trainer b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/004.trainer index db1ea5e1b..29fb28ebd 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/004.trainer +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/004.trainer @@ -1,4 +1,4 @@ -[TRAINER FORMAT] +[TRAINER FORMAT] Name|Samir TrainerClass|Swimmer Money|220 diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005l.dat b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005l.dat index 4a749f177..4e6c3800e 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005l.dat +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005l.dat @@ -1,7 +1,7 @@ version=2 :if:=false :then -@text.show(Miu: Hello, Pokémon!~It's time to play!) +@text.show(Miu: Hello, PokĂ©mon!~It's time to play!) :endif @battle.starttrainer(fortune\water\005l) diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.dat b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.dat index 2a128f14d..5621cc7d6 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.dat +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.dat @@ -1,7 +1,7 @@ version=2 :if:=false :then -@text.show(Mia: Hello, Pokémon!~It's time to battle!) +@text.show(Mia: Hello, PokĂ©mon!~It's time to battle!) :endif @battle.starttrainer(fortune\water\005r) diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.trainer b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.trainer index de7315d15..45b7e463e 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.trainer +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/005r.trainer @@ -4,7 +4,7 @@ TrainerClass|Twins, Money|1320 IntroMessage| OutroMessage|Mia: You're mean!~You're bad for winning! -DefeatMessage|Mia: Ohh...~I'm sorry, My Pokémon... +DefeatMessage|Mia: Ohh...~I'm sorry, My PokĂ©mon... TextureID|littlegirl,littlegirl Region|Sevii Islands IniMusic|johto_trainer_intro diff --git a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/006.trainer b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/006.trainer index 83f3c950d..db57c5db5 100644 --- a/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/006.trainer +++ b/2.5DHero/2.5DHero/Scripts/trainer/fortune/water/006.trainer @@ -4,7 +4,7 @@ TrainerClass|Aroma Lady Money|1456 IntroMessage|I let a pleasant breeze lead me~all the way here. OutroMessage|Giggle... You're so cute when you're determined. -DefeatMessage|I want to go to the woods over~there, but...*There are lots of Bug Pokémon.~They scare me a little. +DefeatMessage|I want to go to the woods over~there, but...*There are lots of Bug PokĂ©mon.~They scare me a little. TextureID|PinkShirtGirl Region|Sevii Islands IniMusic|johto_trainer_intro diff --git a/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb b/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb index 096e6951b..040b32949 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/ActionScript.vb @@ -122,7 +122,7 @@ nextScript: Security.FileValidation.CheckFileValid(path, False, "ActionScript.vb") If System.IO.File.Exists(path) = True Then - Dim Data As String = System.IO.File.ReadAllText(path, Encoding.GetEncoding("iso-8859-1")) + Dim Data As String = System.IO.File.ReadAllText(path) Data = Data.Replace(vbNewLine, "^") Dim ScriptData() As String = Data.Split(CChar("^"))