diff --git a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer
new file mode 100644
index 000000000..3e39984cf
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer differ
diff --git a/P3D/Content/Data/maps/ilexforest.dat b/P3D/Content/Data/maps/ilexforest.dat
index ea416f99e..7586b7fec 100644
Binary files a/P3D/Content/Data/maps/ilexforest.dat and b/P3D/Content/Data/maps/ilexforest.dat differ
diff --git a/P3D/Content/Data/maps/routes/route22.dat b/P3D/Content/Data/maps/routes/route22.dat
index c9be19e5a..5bff457d6 100644
Binary files a/P3D/Content/Data/maps/routes/route22.dat and b/P3D/Content/Data/maps/routes/route22.dat differ
diff --git a/P3D/Content/Data/maps/tohjofalls/hideout.dat b/P3D/Content/Data/maps/tohjofalls/hideout.dat
index 0767dce96..7ba0fc437 100644
Binary files a/P3D/Content/Data/maps/tohjofalls/hideout.dat and b/P3D/Content/Data/maps/tohjofalls/hideout.dat differ
diff --git a/P3D/Content/Textures/NPC/Giovanni.png b/P3D/Content/Textures/NPC/Giovanni.png
new file mode 100644
index 000000000..ee38abfc0
Binary files /dev/null and b/P3D/Content/Textures/NPC/Giovanni.png differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 6e15f5ce7..4ea7108b6 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -25909,6 +25909,12 @@
     <Content Include="Content\Data\Scripts\ilex\shrine.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\NPC\Giovanni.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\Scripts\trainer\tohjo\Giovanni.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Pokemon3D.ico" />
     <Content Include="credits.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/lib/build/Content/Fonts/BMP/miniFont.xnb b/lib/build/Content/Fonts/BMP/miniFont.xnb
index 3c123710c..bcfb21f81 100644
Binary files a/lib/build/Content/Fonts/BMP/miniFont.xnb and b/lib/build/Content/Fonts/BMP/miniFont.xnb differ
diff --git a/lib/build/GameDevCommon.dll b/lib/build/GameDevCommon.dll
index 06b5257b8..644d56f61 100644
Binary files a/lib/build/GameDevCommon.dll and b/lib/build/GameDevCommon.dll differ