Sync with pokered

1 files changed, 27 insertions, 49 deletions

diff --git a/engine/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 80f1bafc..af31665b 100755
--- a/engine/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -28,8 +28,8 @@ ChoosePlayerName:
 	jp PrintText
 
 YourNameIsText:
-	TX_FAR _YourNameIsText
-	db "@"
+	text_far _YourNameIsText
+	text_end
 
 ChooseRivalName:
 	call OakSpeechSlidePicRight
@@ -61,12 +61,12 @@ ChooseRivalName:
 	jp PrintText
 
 HisNameIsText:
-	TX_FAR _HisNameIsText
-	db "@"
+	text_far _HisNameIsText
+	text_end
 
 OakSpeechSlidePicLeft:
 	push de
-	coord hl, 0, 0
+	hlcoord 0, 0
 	lb bc, 12, 11
 	call ClearScreenArea ; clear the name list text box
 	ld c, 10
@@ -76,13 +76,13 @@ OakSpeechSlidePicLeft:
 	ld bc, NAME_LENGTH
 	call CopyData
 	call Delay3
-	coord hl, 12, 4
+	hlcoord 12, 4
 	lb de, 6, 6 * SCREEN_WIDTH + 5
 	ld a, $ff
 	jr OakSpeechSlidePicCommon
 
 OakSpeechSlidePicRight:
-	coord hl, 5, 4
+	hlcoord 5, 4
 	lb de, 6, 6 * SCREEN_WIDTH + 5
 	xor a
 
@@ -90,13 +90,13 @@ OakSpeechSlidePicCommon:
 	push hl
 	push de
 	push bc
-	ld [hSlideDirection], a
+	ldh [hSlideDirection], a
 	ld a, d
-	ld [hSlideAmount], a
+	ldh [hSlideAmount], a
 	ld a, e
-	ld [hSlidingRegionSize], a
+	ldh [hSlidingRegionSize], a
 	ld c, a
-	ld a, [hSlideDirection]
+	ldh a, [hSlideDirection]
 	and a
 	jr nz, .next
 ; If sliding right, point hl to the end of the pic's tiles.
@@ -107,9 +107,9 @@ OakSpeechSlidePicCommon:
 	ld e, l
 .loop
 	xor a
-	ld [H_AUTOBGTRANSFERENABLED], a
-	ld [H_AUTOBGTRANSFERPORTION], a
-	ld a, [hSlideDirection]
+	ldh [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferPortion], a
+	ldh a, [hSlideDirection]
 	and a
 	jr nz, .slideLeft
 ; sliding right
@@ -124,7 +124,7 @@ OakSpeechSlidePicCommon:
 .next2
 	dec c
 	jr nz, .loop
-	ld a, [hSlideDirection]
+	ldh a, [hSlideDirection]
 	and a
 	jr z, .next3
 ; If sliding left, we need to zero the last tile in the pic (there is no need
@@ -135,13 +135,13 @@ OakSpeechSlidePicCommon:
 	ld [hl], a
 .next3
 	ld a, 1
-	ld [H_AUTOBGTRANSFERENABLED], a
+	ldh [hAutoBGTransferEnabled], a
 	call Delay3
-	ld a, [hSlidingRegionSize]
+	ldh a, [hSlidingRegionSize]
 	ld c, a
 	ld h, d
 	ld l, e
-	ld a, [hSlideDirection]
+	ldh a, [hSlideDirection]
 	and a
 	jr nz, .slideLeft2
 	inc hl
@@ -151,9 +151,9 @@ OakSpeechSlidePicCommon:
 .next4
 	ld d, h
 	ld e, l
-	ld a, [hSlideAmount]
+	ldh a, [hSlideAmount]
 	dec a
-	ld [hSlideAmount], a
+	ldh [hSlideAmount], a
 	jr nz, .loop
 	pop bc
 	pop de
@@ -162,14 +162,14 @@ OakSpeechSlidePicCommon:
 
 DisplayIntroNameTextBox:
 	push de
-	coord hl, 0, 0
+	hlcoord 0, 0
 	lb bc, 10, 9
 	call TextBoxBorder
-	coord hl, 3, 0
+	hlcoord 3, 0
 	ld de, .namestring
 	call PlaceString
 	pop de
-	coord hl, 2, 2
+	hlcoord 2, 2
 	call PlaceString
 	call UpdateSprites
 	xor a
@@ -187,19 +187,7 @@ DisplayIntroNameTextBox:
 .namestring
 	db "NAME@"
 
-DefaultNamesPlayer:
-	db   "NEW NAME"
-	next "YELLOW"
-	next "ASH"
-	next "JACK"
-	db   "@"
-
-DefaultNamesRival:
-	db   "NEW NAME"
-	next "BLUE"
-	next "GARY"
-	next "JOHN"
-	db   "@"
+INCLUDE "data/player_names.asm"
 
 GetDefaultName:
 ; a = name index
@@ -225,17 +213,7 @@ GetDefaultName:
 	ld bc, $14
 	jp CopyData
 
-DefaultNamesPlayerList:
-	db "NEW NAME@"
-	db "YELLOW@"
-	db "ASH@"
-	db "JACK@"
-
-DefaultNamesRivalList:
-	db "NEW NAME@"
-	db "BLUE@"
-	db "GARY@"
-	db "JOHN@"
+INCLUDE "data/player_names_list.asm"
 
-TextTerminator_6b20:
-	db "@"
+LinkMenuEmptyText:
+	text_end