1 files changed, 7 insertions, 38 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 1ae06313..122803fa 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -108,6 +108,7 @@ OakSpeechSlidePicCommon:
 .loop
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
+	ld [H_AUTOBGTRANSFERPORTION], a
 	ld a, [hSlideDirection]
 	and a
 	jr nz, .slideLeft
@@ -129,8 +130,8 @@ OakSpeechSlidePicCommon:
 ; If sliding left, we need to zero the last tile in the pic (there is no need
 ; to take a corresponding action when sliding right because hl initially points
 ; to a 0 tile in that case).
-	xor a
 	dec hl
+	xor a
 	ld [hl], a
 .next3
 	ld a, 1
@@ -162,8 +163,7 @@ OakSpeechSlidePicCommon:
 DisplayIntroNameTextBox:
 	push de
 	coord hl, 0, 0
-	ld b, $a
-	ld c, $9
+	lb bc, 10, 9
 	call TextBoxBorder
 	coord hl, 3, 0
 	ld de, .namestring
@@ -184,13 +184,12 @@ DisplayIntroNameTextBox:
 	ld [wMaxMenuItem], a
 	jp HandleMenuInput
 
-.namestring ; 6aa3 (1:6aa3)
+.namestring ; 6822 (1:6822)
 	db "NAME@"
 
-IF DEF(_RED)
 DefaultNamesPlayer:
 	db   "NEW NAME"
-	next "RED"
+	next "YELLOW"
 	next "ASH"
 	next "JACK"
 	db   "@"
@@ -201,23 +200,6 @@ DefaultNamesRival:
 	next "GARY"
 	next "JOHN"
 	db   "@"
-ENDC
-
-IF DEF(_BLUE)
-DefaultNamesPlayer:
-	db   "NEW NAME"
-	next "BLUE"
-	next "GARY"
-	next "JOHN"
-	db   "@"
-
-DefaultNamesRival:
-	db   "NEW NAME"
-	next "RED"
-	next "ASH"
-	next "JACK"
-	db   "@"
-ENDC
 
 GetDefaultName:
 ; a = name index
@@ -243,30 +225,17 @@ GetDefaultName:
 	ld bc, $14
 	jp CopyData
 
-IF DEF(_RED)
 DefaultNamesPlayerList:
 	db "NEW NAME@"
-	db "RED@"
+	db "YELLOW@"
 	db "ASH@"
 	db "JACK@"
+
 DefaultNamesRivalList:
 	db "NEW NAME@"
 	db "BLUE@"
 	db "GARY@"
 	db "JOHN@"
-ENDC
-IF DEF(_BLUE)
-DefaultNamesPlayerList:
-	db "NEW NAME@"
-	db "BLUE@"
-	db "GARY@"
-	db "JOHN@"
-DefaultNamesRivalList:
-	db "NEW NAME@"
-	db "RED@"
-	db "ASH@"
-	db "JACK@"
-ENDC
 
 TextTerminator_6b20:
 	db "@"