tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Frillish & Jellicent & Spiky-Eared Pichu 

and others
This commit is contained in:
JappaWakka 2023-01-18 20:54:17 +01:00
parent b8ffdb73c3
commit ed20fd14e8
17 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
P3D/Content/Pokemon/Overworld/Normal/668_female.png → P3D/Content/Pokemon/Overworld/Normal/668_f.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
P3D/Content/Pokemon/Overworld/Normal/668_male.png → P3D/Content/Pokemon/Overworld/Normal/668_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
P3D/Content/Pokemon/Overworld/Normal/678_female.png → P3D/Content/Pokemon/Overworld/Normal/678_f.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
P3D/Content/Pokemon/Overworld/Normal/678_male.png → P3D/Content/Pokemon/Overworld/Normal/678_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
P3D/Content/Pokemon/Overworld/Shiny/668_female.png → P3D/Content/Pokemon/Overworld/Shiny/668_f.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
P3D/Content/Pokemon/Overworld/Shiny/668_male.png → P3D/Content/Pokemon/Overworld/Shiny/668_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
P3D/Content/Pokemon/Overworld/Shiny/678_female.png → P3D/Content/Pokemon/Overworld/Shiny/678_f.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
P3D/Content/Pokemon/Overworld/Shiny/678_male.png → P3D/Content/Pokemon/Overworld/Shiny/678_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
P3D/Content/Pokemon/Sprites/592_f.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

0
P3D/Content/Pokemon/Sprites/592.png → P3D/Content/Pokemon/Sprites/592_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
P3D/Content/Pokemon/Sprites/593_f.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

0
P3D/Content/Pokemon/Sprites/593.png → P3D/Content/Pokemon/Sprites/593_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

0
P3D/Content/Pokemon/Sprites/668f.png → P3D/Content/Pokemon/Sprites/668_f.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

0
P3D/Content/Pokemon/Sprites/668m.png → P3D/Content/Pokemon/Sprites/668_m.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

73
P3D/P3D.vbproj
View File

@ -13607,6 +13607,18 @@
<Content Include="Content\Pokemon\Overworld\Normal\646_white.png"> <Content Include="Content\Pokemon\Overworld\Normal\646_white.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Normal\668_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\668_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\678_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\678_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\723.png"> <Content Include="Content\Pokemon\Overworld\Normal\723.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -13812,10 +13824,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\303_mega.png"> <Content Include="Content\Pokemon\Overworld\Shiny\303_mega.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\319_mega.png"> <Content Include="Content\Pokemon\Overworld\Shiny\319_mega.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\37_alola.png"> <Content Include="Content\Pokemon\Overworld\Shiny\37_alola.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -13853,13 +13865,27 @@
<Content Include="Content\Pokemon\Overworld\Shiny\53_alola.png"> <Content Include="Content\Pokemon\Overworld\Shiny\53_alola.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\646.png" /> <Content Include="Content\Pokemon\Overworld\Shiny\646.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\646_black.png"> <Content Include="Content\Pokemon\Overworld\Shiny\646_black.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\646_white.png"> <Content Include="Content\Pokemon\Overworld\Shiny\646_white.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\668_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\668_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\678_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\678_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\719_mega.png"> <Content Include="Content\Pokemon\Overworld\Shiny\719_mega.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -14322,6 +14348,9 @@
<Content Include="Content\Pokemon\Sprites\172.png"> <Content Include="Content\Pokemon\Sprites\172.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\172_spiky-eared.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Sprites\173.png"> <Content Include="Content\Pokemon\Sprites\173.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -16092,10 +16121,16 @@
<Content Include="Content\Pokemon\Sprites\591.png"> <Content Include="Content\Pokemon\Sprites\591.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\592.png"> <Content Include="Content\Pokemon\Sprites\592_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\593.png"> <Content Include="Content\Pokemon\Sprites\592_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Sprites\593_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Sprites\593_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\594.png"> <Content Include="Content\Pokemon\Sprites\594.png">
@ -16440,10 +16475,10 @@
<Content Include="Content\Pokemon\Sprites\667.png"> <Content Include="Content\Pokemon\Sprites\667.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\668f.png"> <Content Include="Content\Pokemon\Sprites\668_f.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\668m.png"> <Content Include="Content\Pokemon\Sprites\668_m.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Sprites\669.png"> <Content Include="Content\Pokemon\Sprites\669.png">
@ -21693,12 +21728,6 @@
<Content Include="Content\Pokemon\Overworld\Normal\667.png"> <Content Include="Content\Pokemon\Overworld\Normal\667.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Normal\668_female.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\668_male.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\669_blue.png"> <Content Include="Content\Pokemon\Overworld\Normal\669_blue.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -21795,12 +21824,6 @@
<Content Include="Content\Pokemon\Overworld\Normal\677.png"> <Content Include="Content\Pokemon\Overworld\Normal\677.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Normal\678_female.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\678_male.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Normal\679.PNG"> <Content Include="Content\Pokemon\Overworld\Normal\679.PNG">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -24363,12 +24386,6 @@
<Content Include="Content\Pokemon\Overworld\Shiny\667.png"> <Content Include="Content\Pokemon\Overworld\Shiny\667.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\668_female.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\668_male.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\669_blue.png"> <Content Include="Content\Pokemon\Overworld\Shiny\669_blue.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -24465,12 +24482,6 @@
<Content Include="Content\Pokemon\Overworld\Shiny\677.png"> <Content Include="Content\Pokemon\Overworld\Shiny\677.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Pokemon\Overworld\Shiny\678_female.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\678_male.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Pokemon\Overworld\Shiny\679.PNG"> <Content Include="Content\Pokemon\Overworld\Shiny\679.PNG">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

2
P3D/Pokemon/Monster/Pokemon.vb
View File

@ -2513,7 +2513,7 @@ Public Class Pokemon
Private Function GetTexture(ByVal index As Integer) As Texture2D Private Function GetTexture(ByVal index As Integer) As Texture2D
Dim TextureNumberSuffix As String = "" Dim TextureNumberSuffix As String = ""
If Me.AnimationName.Contains("_") Then If Me.AnimationName.Contains("_") Then
TextureNumberSuffix = AnimationName.Remove(0, GetName.Length) TextureNumberSuffix = AnimationName.Remove(0, OriginalName.Length)
End If End If
If Textures(index) Is Nothing Then If Textures(index) Is Nothing Then
Select Case index Select Case index

8
P3D/Pokemon/Monster/Resource/PokemonForms.vb
View File

@ -2812,18 +2812,18 @@ Public Class PokemonForms
Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
Select Case P.Gender Select Case P.Gender
Case Pokemon.Genders.Male Case Pokemon.Genders.Male
Return P.OriginalName & "_male" Return P.OriginalName & "_m"
Case Else Case Else
Return P.OriginalName & "_female" Return P.OriginalName & "_f"
End Select End Select
End Function End Function
Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
Select Case P.Gender Select Case P.Gender
Case Pokemon.Genders.Male Case Pokemon.Genders.Male
Return "_male" Return "_m"
Case Else Case Else
Return "_female" Return "_f"
End Select End Select
End Function End Function
End Class End Class