diff options
Diffstat (limited to 'engine/oak_speech2.asm')
| -rwxr-xr-x | engine/oak_speech2.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 1258c59b..ffb06477 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 @@ -189,15 +189,15 @@ DisplayIntroNameTextBox: IF DEF(_RED) DefaultNamesPlayer: - db "NEW NAME" - next "RED" + db "NAME" + next "ROT" next "ASH" next "JACK" db "@" DefaultNamesRival: - db "NEW NAME" - next "BLUE" + db "NAME" + next "BLAU" next "GARY" next "JOHN" db "@" @@ -205,15 +205,15 @@ ENDC IF DEF(_BLUE) DefaultNamesPlayer: - db "NEW NAME" - next "BLUE" + db "NAME" + next "BLAU" next "GARY" next "JOHN" db "@" DefaultNamesRival: - db "NEW NAME" - next "RED" + db "NAME" + next "ROT" next "ASH" next "JACK" db "@" @@ -245,25 +245,25 @@ GetDefaultName: IF DEF(_RED) DefaultNamesPlayerList: - db "NEW NAME@" - db "RED@" + db "NAME@" + db "ROT@" db "ASH@" db "JACK@" DefaultNamesRivalList: - db "NEW NAME@" - db "BLUE@" + db "NAME@" + db "BLAU@" db "GARY@" db "JOHN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: - db "NEW NAME@" - db "BLUE@" + db "NAME@" + db "BLAU@" db "GARY@" db "JOHN@" DefaultNamesRivalList: - db "NEW NAME@" - db "RED@" + db "NAME@" + db "ROT@" db "ASH@" db "JACK@" ENDC |