From 61fa95986681da074584b167b7497d176d1414bc Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sun, 3 Oct 2021 11:04:11 +0200
Subject: [PATCH] Fixed Rival's texture when renaming Rival

---
 P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb
index 0b770b9ae..ce9282b11 100644
--- a/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb
+++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb
@@ -25,9 +25,8 @@
                     Core.Player.HasPokegear = True
                     IsReady = True
                 Case "renamerival"
-                    Dim RivalTexture As String = Core.Player.RivalSkin
-                    Dim RivalName As String
-                    RivalName = "???"
+                    Dim RivalTexture As String = GameModeManager.ActiveGameMode.ContentPath & "Textures\" & Core.Player.RivalSkin
+                    Dim RivalName As String = Core.Player.RivalName
                     Core.SetScreen(New NameObjectScreen(Core.CurrentScreen, TextureManager.GetTexture(RivalTexture, New Rectangle(0, 64, 32, 32)), False, False, RivalName, "???", AddressOf Script.NameRival))
                     IsReady = True
                     CanContinue = False