diff --git a/P3D/Content/Data/Scripts/goldenrod/mapscript.dat b/P3D/Content/Data/Scripts/goldenrod/mapscript.dat
new file mode 100644
index 000000000..aa0aacf62
Binary files /dev/null and b/P3D/Content/Data/Scripts/goldenrod/mapscript.dat differ
diff --git a/P3D/Content/Data/Scripts/goldenrod/mart/sunmap.dat b/P3D/Content/Data/Scripts/goldenrod/mart/sunmap.dat
index 60e017f7d..f12de1c42 100644
Binary files a/P3D/Content/Data/Scripts/goldenrod/mart/sunmap.dat and b/P3D/Content/Data/Scripts/goldenrod/mart/sunmap.dat differ
diff --git a/P3D/Content/Data/Scripts/marts/goldenrodbargain.dat b/P3D/Content/Data/Scripts/marts/goldenrodbargain.dat
new file mode 100644
index 000000000..68b060fd8
Binary files /dev/null and b/P3D/Content/Data/Scripts/marts/goldenrodbargain.dat differ
diff --git a/P3D/Content/Data/Scripts/phone/010.dat b/P3D/Content/Data/Scripts/phone/010.dat
index 26d1b314b..f9d6aa90f 100644
Binary files a/P3D/Content/Data/Scripts/phone/010.dat and b/P3D/Content/Data/Scripts/phone/010.dat differ
diff --git a/P3D/Content/Data/Scripts/route34/daycare_pokemon.dat b/P3D/Content/Data/Scripts/route34/daycare_pokemon.dat
index 39eba5a63..9bb0b5d01 100644
Binary files a/P3D/Content/Data/Scripts/route34/daycare_pokemon.dat and b/P3D/Content/Data/Scripts/route34/daycare_pokemon.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route34/005.dat b/P3D/Content/Data/Scripts/trainer/route34/005.dat
index 313fe45b0..f7e7bd144 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route34/005.dat and b/P3D/Content/Data/Scripts/trainer/route34/005.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route34/005_3.trainer b/P3D/Content/Data/Scripts/trainer/route34/005_3.trainer
index b05bd9973..124cf34a4 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route34/005_3.trainer and b/P3D/Content/Data/Scripts/trainer/route34/005_3.trainer differ
diff --git a/P3D/Content/Data/maps/goldenrod.dat b/P3D/Content/Data/maps/goldenrod.dat
index 1780d1539..4eba921f7 100644
--- a/P3D/Content/Data/maps/goldenrod.dat
+++ b/P3D/Content/Data/maps/goldenrod.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Goldenrod City]}}{"MusicLoop"{str[Goldenrod]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"MapScript"{str[goldenrod\mapscript]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Brick:
 {"Floor"{ENT[{"Size"{intArr[4,36]}}{"Position"{intArr[18,0,0]}}{"TexturePath"{str[Goldenrod]}}{"Texture"{rec[0,0,16,16]}}]}}
@@ -649,6 +649,7 @@ Signs:
 
 NPCs:
 {"NPC"{NPC[{"Position"{sngArr[25,6,25]}}{"TextureID"{str[49]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[Do you listen to~Lucky Channel?*If you want to~win, trade Pokémon*with as many people as~possible to get~different ID numbers.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[23,5,24]}}{"TextureID"{str[12]}}{"ID"{int[20]}}{"Name"{str[bargain]}}{"Action"{int[1]}}{"AdditionalValue"{str[marts\goldenrodbargain]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 
 {"NPC"{NPC[{"Position"{sngArr[20,0,26]}}{"TextureID"{str[10]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[The Radio Tower in~Goldenrod City is~a landmark.*They're running a~promotional campaign right now.*They'll modify~your Pokégear,*so it can also~serve as a radio.]}}{"Rotation"{int[1]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[[18,26,4,2]]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[19,0,16]}}{"TextureID"{str[14]}}{"ID"{int[2]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[E-he-he-he...*I got in trouble~for playing in the*basement of the~Dept. Store.]}}{"Rotation"{int[2]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index a64f13b37..442bb966f 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -29403,6 +29403,9 @@
     <Content Include="Content\Data\Scripts\frontier\shops\mints.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Data\Scripts\goldenrod\mapscript.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\kin\berryforestitems\2051.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -29724,6 +29727,9 @@
     <None Include="Content\Data\Scripts\kolben\AlexCorruptor.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Content Include="Content\Data\Scripts\marts\goldenrodbargain.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\mtmortar\bf1map.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>