Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 0 insertions, 28 deletions

diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index fe0d6fa3..d58aef83 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -219,22 +219,6 @@ DefaultNamesRival: ; 6abe (1:6abe)
 	db   "@"
 ENDC
 
-IF DEF(_YELLOW)
-DefaultNamesPlayer:
-	db   "NEW NAME"
-	next "YELLOW"
-	next "ASH"
-	next "JACK"
-	db   "@"
-
-DefaultNamesRival:
-	db   "NEW NAME"
-	next "BLUE"
-	next "GARY"
-	next "JOHN"
-	db   "@"
-ENDC
-
 GetDefaultName: ; 6ad6 (1:6ad6)
 ; a = name index
 ; hl = name list
@@ -283,18 +267,6 @@ DefaultNamesRivalList: ; 6b08 (1:6b08)
 	db "ASH@"
 	db "JACK@"
 ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayerList:
-	db "NEW NAME@"
-	db "YELLOW@"
-	db "ASH@"
-	db "JACK@"
-DefaultNamesRivalList:
-	db "NEW NAME@"
-	db "BLUE@"
-	db "GARY@"
-	db "JOHN@"
-ENDC
 
 TextTerminator_6b20: ; 6b20 (1:6b20)
 	db "@"