diff --git a/P3D/Content/Data/Scripts/dragonsden/clairtmget.dat b/P3D/Content/Data/Scripts/dragonsden/clairtmget.dat index 1e920993e..1e1a6d5d2 100644 Binary files a/P3D/Content/Data/Scripts/dragonsden/clairtmget.dat and b/P3D/Content/Data/Scripts/dragonsden/clairtmget.dat differ diff --git a/P3D/Content/Data/Scripts/dragonsden/questions.dat b/P3D/Content/Data/Scripts/dragonsden/questions.dat index 2e9ed9224..bc3ede5e9 100644 Binary files a/P3D/Content/Data/Scripts/dragonsden/questions.dat and b/P3D/Content/Data/Scripts/dragonsden/questions.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 f48624cf6..4835639ad 100644 Binary files a/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/azalea_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat index 91c227da0..cf67410b8 100644 Binary files a/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/blackthorn_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.trainer b/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.trainer index 82ed7b59e..d3551cc3d 100644 Binary files a/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.trainer and b/P3D/Content/Data/Scripts/trainer/cerulean_gym/leader.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat index 17ee77c3c..329cf9689 100644 Binary files a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.trainer b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.trainer index 70ee7922b..0cdc94bbc 100644 Binary files a/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.trainer and b/P3D/Content/Data/Scripts/trainer/cianwood_gym/leader.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/Leader.trainer b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/Leader.trainer index 990ab9552..58b73535c 100644 Binary files a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/Leader.trainer and b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/Leader.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat index cabc0f37c..0c363bbc5 100644 Binary files a/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/ecruteak_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat index 080fffcf9..9c0d8b28e 100644 --- a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat +++ b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat @@ -1,5 +1,5 @@ version=2 -@text.show(Stay back, kid!*I was asked not to let~anyone enter this crucial~spot for our future~operations.*...) +@text.show(Stay back, kid!*I was asked not to let~anyone enter this cave.*It's home to Pokémon from~different locations and~we're investigating that.*...) @battle.starttrainer(fortune\north\006) @text.show(My Pokémon...*Gah!~Who even cares~about those stupid islands~and their weird Pokémon~anyway?*I'll go back to the~Unova branch...) @screen.fadeout @@ -9,7 +9,6 @@ version=2 @level.update @level.wait(15) @screen.fadein -@text.show(He left something behind.*It's a sea map!) -@item.give(592,1) -@item.messagegive(592,1) +@text.show(He left something behind.*It's a boat pass!) +@item.messagegive(500,1) :end \ No newline at end of file diff --git a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat index afad074bb..5407ebc5d 100644 Binary files a/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/goldenrod_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.trainer b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.trainer index ef3e2cac9..17647d175 100644 Binary files a/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.trainer and b/P3D/Content/Data/Scripts/trainer/mahogany_gym/leader.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat index 1062ea9f3..12b457710 100644 Binary files a/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/olivine_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.trainer b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.trainer index 1c8197a7e..ea04b24c9 100644 Binary files a/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.trainer and b/P3D/Content/Data/Scripts/trainer/pewter_gym/leader.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat index 6116f4c3e..5085ea2ed 100644 Binary files a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat and b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.trainer b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.trainer index 32ddce19d..dfafc078c 100644 Binary files a/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.trainer and b/P3D/Content/Data/Scripts/trainer/vermilion_gym/leader.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat index c4ac2b511..90b1f34d1 100644 Binary files a/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat and b/P3D/Content/Data/Scripts/trainer/violet_gym/003.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/violetgymleader.trainer b/P3D/Content/Data/Scripts/trainer/violetgymleader.trainer index 82140fcc1..442ea8d7b 100644 Binary files a/P3D/Content/Data/Scripts/trainer/violetgymleader.trainer and b/P3D/Content/Data/Scripts/trainer/violetgymleader.trainer differ diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index cfd2517fb..3465740ec 100644 Binary files a/P3D/Content/Localization/Tokens_en.dat and b/P3D/Content/Localization/Tokens_en.dat differ diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb index e9053ab3f..e48cd1366 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb @@ -185,7 +185,7 @@ Core.Player.Badges.Add(int(argument)) SoundManager.PlaySound("badge_acquired", True) Screen.TextBox.TextColor = TextBox.PlayerColor - Screen.TextBox.Show(Core.Player.Name & " received the~" & Badge.GetBadgeName(int(argument)) & "badge.", {}, False, False) + Screen.TextBox.Show(Core.Player.Name & " received the~" & Badge.GetBadgeName(int(argument)) & " Badge.", {}, False, False) Core.Player.AddPoints(10, "Got a badge.") End If