diff --git a/P3D/Content/Data/Scripts/barktown/momdoor.dat b/P3D/Content/Data/Scripts/barktown/momdoor.dat index c60422553..45f1a7d7b 100644 Binary files a/P3D/Content/Data/Scripts/barktown/momdoor.dat and b/P3D/Content/Data/Scripts/barktown/momdoor.dat differ diff --git a/P3D/Content/Data/Scripts/newgame/intro.dat b/P3D/Content/Data/Scripts/newgame/intro.dat index 94984656c..474ceb846 100644 --- a/P3D/Content/Data/Scripts/newgame/intro.dat +++ b/P3D/Content/Data/Scripts/newgame/intro.dat @@ -127,7 +127,7 @@ @text.show(There are still~many mysteries to solve.*That's why I study~Pokémon every day.) @text.show(But let's get~back to you.) -@screen.skinselection(Ethan,Lyra,Hilbert,Hilda,Nate,Rosa) +@screen.skinselection() @player.wearskin() @npc.wearskin(1,) diff --git a/P3D/Content/Songs/Mom.ogg b/P3D/Content/Songs/Mom.ogg new file mode 100644 index 000000000..0d5e212ea Binary files /dev/null and b/P3D/Content/Songs/Mom.ogg differ diff --git a/P3D/Content/Songs/PVP_Intro.ogg b/P3D/Content/Songs/PVP_Intro.ogg new file mode 100644 index 000000000..f8ceb2429 Binary files /dev/null and b/P3D/Content/Songs/PVP_Intro.ogg differ diff --git a/P3D/Content/Songs/intro/pvp.ogg b/P3D/Content/Songs/intro/pvp.ogg index 7e355655b..3de777369 100644 Binary files a/P3D/Content/Songs/intro/pvp.ogg and b/P3D/Content/Songs/intro/pvp.ogg differ diff --git a/P3D/Content/Songs/pvp.ogg b/P3D/Content/Songs/pvp.ogg index c38e4fdff..13031adcf 100644 Binary files a/P3D/Content/Songs/pvp.ogg and b/P3D/Content/Songs/pvp.ogg differ diff --git a/P3D/Content/Songs/title.ogg b/P3D/Content/Songs/title.ogg index 2198ea262..7b95a4e98 100644 Binary files a/P3D/Content/Songs/title.ogg and b/P3D/Content/Songs/title.ogg differ diff --git a/P3D/Content/Sounds/Receive_HM.wav b/P3D/Content/Sounds/Receive_HM.wav new file mode 100644 index 000000000..081f3068b Binary files /dev/null and b/P3D/Content/Sounds/Receive_HM.wav differ diff --git a/P3D/Content/Sounds/Receive_PhoneNumber.wav b/P3D/Content/Sounds/Receive_PhoneNumber.wav index 162aefed4..b717f1017 100644 Binary files a/P3D/Content/Sounds/Receive_PhoneNumber.wav and b/P3D/Content/Sounds/Receive_PhoneNumber.wav differ diff --git a/P3D/Entites/Enviroment/ItemObject.vb b/P3D/Entites/Enviroment/ItemObject.vb index 414b8a9a4..80b9bb211 100644 --- a/P3D/Entites/Enviroment/ItemObject.vb +++ b/P3D/Entites/Enviroment/ItemObject.vb @@ -140,7 +140,11 @@ Public Overrides Sub ClickFunction() If CanInteractWith Then RemoveItem(Me) - SoundManager.PlaySound("Receive_Item", True) + If Me.Item.Name.Contains("HM") Then + SoundManager.PlaySound("Receive_HM", True) + Else + SoundManager.PlaySound("Receive_Item", True) + End If Screen.TextBox.TextColor = TextBox.PlayerColor Screen.TextBox.Show(Core.Player.Name & " found~" & Me.Item.Name & "!*" & Core.Player.Inventory.GetMessageReceive(Item, 1), {Me}) Core.Player.Inventory.AddItem(Me.Item.ID, 1) diff --git a/P3D/Network/Servers/PVPLobbyScreen.vb b/P3D/Network/Servers/PVPLobbyScreen.vb index 8b432bf7f..19d83f00f 100644 --- a/P3D/Network/Servers/PVPLobbyScreen.vb +++ b/P3D/Network/Servers/PVPLobbyScreen.vb @@ -628,7 +628,7 @@ b.PVPGameJoltID = tempPlayer.GameJoltId End If - Core.SetScreen(New BattleIntroScreen(Core.CurrentScreen, b, t, t.GetIniMusicName(), t.IntroType)) + Core.SetScreen(New BattleIntroScreen(Core.CurrentScreen, b, t, "PVP_Intro", t.IntroType)) PlayerStatistics.Track("PVP battles", 1) End Sub diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb index be3139577..6e3a1180b 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb @@ -12,12 +12,6 @@ Select Case command.ToLower() Case "play" - MusicManager.Play(argument, True, 0.0F) - - If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then - Screen.Level.MusicLoop = argument - End If - Case "playfade" MusicManager.Play(argument, True) If Core.CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then