summaryrefslogtreecommitdiff
path: root/engine/oak_speech2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/oak_speech2.asm')
-rwxr-xr-xengine/oak_speech2.asm54
1 files changed, 27 insertions, 27 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 1258c59b..462d26b5 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -15,7 +15,7 @@ ChoosePlayerName:
xor a ; NAME_PLAYER_SCREEN
ld [wNamingScreenType], a
call DisplayNamingScreen
- ld a, [wcf4b]
+ ld a, [wcf50]
cp "@"
jr z, .customName
call ClearScreen
@@ -48,7 +48,7 @@ ChooseRivalName:
ld a, NAME_RIVAL_SCREEN
ld [wNamingScreenType], a
call DisplayNamingScreen
- ld a, [wcf4b]
+ ld a, [wcf50]
cp "@"
jr z, .customName
call ClearScreen
@@ -185,37 +185,37 @@ DisplayIntroNameTextBox:
jp HandleMenuInput
.namestring
- db "NAME@"
+ db "─NOM@"
IF DEF(_RED)
DefaultNamesPlayer:
- db "NEW NAME"
+ db "NOM:"
next "RED"
- next "ASH"
- next "JACK"
+ next "SACHA"
+ next "PAUL"
db "@"
DefaultNamesRival:
- db "NEW NAME"
+ db "NOM:"
next "BLUE"
- next "GARY"
- next "JOHN"
+ next "REGIS"
+ next "JEAN"
db "@"
ENDC
IF DEF(_BLUE)
DefaultNamesPlayer:
- db "NEW NAME"
+ db "NOM:"
next "BLUE"
- next "GARY"
- next "JOHN"
+ next "REGIS"
+ next "JEAN"
db "@"
DefaultNamesRival:
- db "NEW NAME"
+ db "NOM:"
next "RED"
- next "ASH"
- next "JACK"
+ next "SACHA"
+ next "PAUL"
db "@"
ENDC
@@ -245,27 +245,27 @@ GetDefaultName:
IF DEF(_RED)
DefaultNamesPlayerList:
- db "NEW NAME@"
+ db "NOM:@"
db "RED@"
- db "ASH@"
- db "JACK@"
+ db "SACHA@"
+ db "PAUL@"
DefaultNamesRivalList:
- db "NEW NAME@"
+ db "NOM:@"
db "BLUE@"
- db "GARY@"
- db "JOHN@"
+ db "REGIS@"
+ db "JEAN@"
ENDC
IF DEF(_BLUE)
DefaultNamesPlayerList:
- db "NEW NAME@"
+ db "NOM:@"
db "BLUE@"
- db "GARY@"
- db "JOHN@"
+ db "REGIS@"
+ db "JEAN@"
DefaultNamesRivalList:
- db "NEW NAME@"
+ db "NOM:@"
db "RED@"
- db "ASH@"
- db "JACK@"
+ db "SACHA@"
+ db "PAUL@"
ENDC
TextTerminator_6b20: