From 335bf36311e24f9b652a3970ab07413a03bba056 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <alan.rj.huang@gmail.com>
Date: Sun, 1 Nov 2015 15:42:29 -0500
Subject: oak_speech2.asm

Also replace W_RIVALNAME with wRivalName
---
 yellow/main.asm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'yellow')

diff --git a/yellow/main.asm b/yellow/main.asm
index ecd0b5d9..7c752a69 100755
--- a/yellow/main.asm
+++ b/yellow/main.asm
@@ -718,10 +718,9 @@ EmptyFunc: ; 64ea (1:64ea)
 	ret
 
 INCLUDE "engine/menu/naming_screen.asm"
-ChoosePlayerName: ; 66db (1:66db)
-	dr $66db,$6722
-ChooseRivalName: ; 6722 (1:6722)
-	dr $6722,$68a6
+
+INCLUDE "engine/oak_speech2.asm"
+
 SubtractAmountPaidFromMoney_: ; 68a6 (1:68a6)
 	dr $68a6,$68c9
 HandleItemListSwapping: ; 68c9 (1:68c9)
-- 
cgit v1.3.1-sl0p