New Emblems (3)

Tao Emblem for post Kyurem
Minor fix for monochrome stones
Heart Gold Emblem for Ho-oh
Soul Silver Emblem for Lugia
Can be achieved after battle on first encounter event
Retroactively achieved by revisiting encounter area
This commit is contained in:
TheOmegaGhost 2020-04-17 21:19:32 -03:00
parent ff8174bd01
commit 11913fb146
20 changed files with 65 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

@ -286,9 +286,9 @@
Public Shared Function GetEmblemFontColor(ByVal emblemName As String) As Color Public Shared Function GetEmblemFontColor(ByVal emblemName As String) As Color
Select Case emblemName.ToLower() Select Case emblemName.ToLower()
Case "alph", "genetics", "legendary", "stars", "champion", "overkill", "cyber", "glowing", "material", "fog", "mineral", "storm", "eggsplosion", "missingno", "thunder", "rainbow", "marsh", "volcano", "earth", "shooting star", "victorious", "mega", "time", "deep sea" Case "alph", "genetics", "legendary", "stars", "champion", "overkill", "cyber", "glowing", "material", "fog", "mineral", "storm", "eggsplosion", "missingno", "thunder", "rainbow", "marsh", "volcano", "earth", "shooting star", "victorious", "mega", "time", "deep sea", "heart gold", "soul silver"
Return Color.White Return Color.White
Case "eevee", "pokedex", "snow", "trainer", "kanto", "glacier", "hive", "plain", "zephyr", "rising", "mailman", "cascade", "boulder", "unodostres", "silver ability", "gold ability", "silver knowledge", "gold knowledge", "johto", "eruption", "ancestor" Case "eevee", "pokedex", "snow", "trainer", "kanto", "glacier", "hive", "plain", "zephyr", "rising", "mailman", "cascade", "boulder", "unodostres", "silver ability", "gold ability", "silver knowledge", "gold knowledge", "johto", "eruption", "ancestor", "tao", "floral"
Return Color.Black Return Color.Black
End Select End Select
Return Color.White Return Color.White
@ -769,6 +769,14 @@
' Return ??? ' Return ???
'Case "mega" 'Case "mega"
' Return ??? ' Return ???
'Case "heart gold"
' Return ???
'Case "soul silver"
' Return ???
'Case "tao"
' Return ???
'Case "floral"
' Return ???
Case Else Case Else
Return 0 Return 0
@ -868,6 +876,14 @@
' Return "time" ' Return "time"
'Case ??? 'Case ???
' Return "mega" ' Return "mega"
'Case "heart gold"
' Return ???
'Case "soul silver"
' Return ???
'Case "tao"
' Return ???
'Case "floral"
' Return ???
Case Else Case Else
Return "fail" Return "fail"
@ -1040,6 +1056,14 @@
Return "Mega" Return "Mega"
Case "beast" Case "beast"
Return "Beast" Return "Beast"
Case "heart gold"
Return "Heart Gold"
Case "soul silver"
Return "Soul Silver"
Case "tao"
Return "Tao"
Case "floral"
Return "Floral"
Case Else Case Else
Return "???" Return "???"
End Select End Select
@ -1137,6 +1161,14 @@
Return "Receive the Mega Bracelet from Professor Oak." Return "Receive the Mega Bracelet from Professor Oak."
Case "beast" Case "beast"
Return "Have Raikou, Entei, and Suicune in your party." Return "Have Raikou, Entei, and Suicune in your party."
Case "heart gold"
Return "Have an encounter with the magnificent Ho-oh."
Case "soul silver"
Return "Have an encounter with the mysterious Lugia."
Case "tao"
Return "Have a heroic encounter."
Case "floral"
Return "Have a mythical encounter."
Case Else Case Else
Return "Unknown emblem." Return "Unknown emblem."
End Select End Select
@ -1148,9 +1180,9 @@
"cascade", "thunder", "rainbow", "marsh", "soul", "volcano", "earth" "cascade", "thunder", "rainbow", "marsh", "soul", "volcano", "earth"
Return "Bronze" Return "Bronze"
Case "johto", "kanto", "legendary", "shooting star", "genetics", "eggsplosion", "mailman", "silver ability", "silver knowledge", Case "johto", "kanto", "legendary", "shooting star", "genetics", "eggsplosion", "mailman", "silver ability", "silver knowledge",
"deep sea", "eruption", "victorious" "deep sea", "eruption", "victorious", "floral"
Return "Silver" Return "Silver"
Case "champion", "snow", "eevee", "stars", "unodostres", "gold ability", "gold knowledge", "time", "ancestor", "beast" Case "champion", "snow", "eevee", "stars", "unodostres", "gold ability", "gold knowledge", "time", "ancestor", "beast", "tao", "heart gold", "soul silver"
Return "Gold" Return "Gold"
Case "overkill", "pokedex" Case "overkill", "pokedex"
Return "Platinum" Return "Platinum"

View File

@ -13931,9 +13931,15 @@
<Content Include="Content\Textures\Emblem\floral.png"> <Content Include="Content\Textures\Emblem\floral.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\heart gold.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\mega.png"> <Content Include="Content\Textures\Emblem\mega.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\soul silver.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\alph.png"> <Content Include="Content\Textures\Emblem\Square\alph.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -13970,6 +13976,9 @@
<Content Include="Content\Textures\Emblem\Square\eruption.png"> <Content Include="Content\Textures\Emblem\Square\eruption.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\floral.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\fog.png"> <Content Include="Content\Textures\Emblem\Square\fog.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -13985,6 +13994,9 @@
<Content Include="Content\Textures\Emblem\Square\gold knowledge.png"> <Content Include="Content\Textures\Emblem\Square\gold knowledge.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\heart gold.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\hive.png"> <Content Include="Content\Textures\Emblem\Square\hive.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -14012,6 +14024,9 @@
<Content Include="Content\Textures\Emblem\Square\mineral.png"> <Content Include="Content\Textures\Emblem\Square\mineral.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\missingno.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\overkill.png"> <Content Include="Content\Textures\Emblem\Square\overkill.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -14039,6 +14054,9 @@
<Content Include="Content\Textures\Emblem\Square\snow.png"> <Content Include="Content\Textures\Emblem\Square\snow.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\soul silver.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\soul.png"> <Content Include="Content\Textures\Emblem\Square\soul.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -14048,12 +14066,18 @@
<Content Include="Content\Textures\Emblem\Square\storm.png"> <Content Include="Content\Textures\Emblem\Square\storm.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\tao.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\thunder.png"> <Content Include="Content\Textures\Emblem\Square\thunder.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\time.png"> <Content Include="Content\Textures\Emblem\Square\time.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\Square\trainer.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\Square\unodostres.png"> <Content Include="Content\Textures\Emblem\Square\unodostres.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@ -14066,6 +14090,9 @@
<Content Include="Content\Textures\Emblem\Square\zephyr.png"> <Content Include="Content\Textures\Emblem\Square\zephyr.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\tao.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\time.png"> <Content Include="Content\Textures\Emblem\time.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -24959,9 +24986,6 @@
<Content Include="Content\Textures\Emblem\glacier.png"> <Content Include="Content\Textures\Emblem\glacier.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\Emblem\glowing.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\gold ability.png"> <Content Include="Content\Textures\Emblem\gold ability.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

View File

@ -1,6 +1,6 @@
Namespace Items.KeyItems Namespace Items.KeyItems
<Item(652, "Dark stone")> <Item(652, "Dark Stone")>
Public Class DarkStone Public Class DarkStone
Inherits KeyItem Inherits KeyItem

View File

@ -1,6 +1,6 @@
Namespace Items.KeyItems Namespace Items.KeyItems
<Item(651, "Light stone")> <Item(651, "Light Stone")>
Public Class LightStone Public Class LightStone
Inherits KeyItem Inherits KeyItem