diff --git a/2.5DHero/2.5DHero/2.5DHero.vbproj b/2.5DHero/2.5DHero/2.5DHero.vbproj index af153ea8c..19327682f 100644 --- a/2.5DHero/2.5DHero/2.5DHero.vbproj +++ b/2.5DHero/2.5DHero/2.5DHero.vbproj @@ -42,6 +42,9 @@ + + PreserveNewest + $(MSBuildProgramFiles32)\MonoGame\v3.0\Assemblies\DesktopGL\OpenTK.dll diff --git a/2.5DHero/2.5DHero/Scripts/lavender/fuji.dat b/2.5DHero/2.5DHero/Scripts/lavender/fuji.dat new file mode 100644 index 000000000..f5d304821 Binary files /dev/null and b/2.5DHero/2.5DHero/Scripts/lavender/fuji.dat differ diff --git a/2.5DHero/2.5DHero/Scripts/lighthouse/ampharos.dat b/2.5DHero/2.5DHero/Scripts/lighthouse/ampharos.dat index bda4ee002..f3779994d 100644 Binary files a/2.5DHero/2.5DHero/Scripts/lighthouse/ampharos.dat and b/2.5DHero/2.5DHero/Scripts/lighthouse/ampharos.dat differ diff --git a/2.5DHero/2.5DHero/maps/lavender/cemetary.dat b/2.5DHero/2.5DHero/maps/lavender/cemetary.dat index 0dac5e7cd..6422c0abc 100644 Binary files a/2.5DHero/2.5DHero/maps/lavender/cemetary.dat and b/2.5DHero/2.5DHero/maps/lavender/cemetary.dat differ diff --git a/2.5DHero/2.5DHeroContent/Content.mgcb b/2.5DHero/2.5DHeroContent/Content.mgcb index df03f63d3..bc890c687 100644 --- a/2.5DHero/2.5DHeroContent/Content.mgcb +++ b/2.5DHero/2.5DHeroContent/Content.mgcb @@ -42840,3 +42840,27 @@ /processorParam:TextureFormat=Color /build:Pokemon/Overworld/Shiny/6_mega_x.png +#begin Pokemon/Sprites/Swampert_mega.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Pokemon/Sprites/Swampert_mega.png + +#begin Pokemon/Sprites/Pidgeot_mega.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Pokemon/Sprites/Pidgeot_mega.png + diff --git a/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Camerupt_mega.png b/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Camerupt_mega.png new file mode 100644 index 000000000..e5de2edbb Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Camerupt_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Pidgeot_mega.png b/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Pidgeot_mega.png new file mode 100644 index 000000000..3455137a5 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Pidgeot_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Swampert_mega.png b/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Swampert_mega.png new file mode 100644 index 000000000..47fa53ce9 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Pokemon/Sprites/Swampert_mega.png differ