summaryrefslogtreecommitdiff
path: root/engine/oak_speech2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/oak_speech2.asm')
-rwxr-xr-xengine/oak_speech2.asm57
1 files changed, 2 insertions, 55 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 1258c59b..fdc9ffa3 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -187,37 +187,7 @@ DisplayIntroNameTextBox:
.namestring
db "NAME@"
-IF DEF(_RED)
-DefaultNamesPlayer:
- db "NEW NAME"
- next "RED"
- next "ASH"
- next "JACK"
- db "@"
-
-DefaultNamesRival:
- db "NEW NAME"
- next "BLUE"
- 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
+INCLUDE "text/player_names.asm"
GetDefaultName:
; a = name index
@@ -243,30 +213,7 @@ GetDefaultName:
ld bc, $14
jp CopyData
-IF DEF(_RED)
-DefaultNamesPlayerList:
- db "NEW NAME@"
- db "RED@"
- 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
+INCLUDE "text/player_names_list.asm"
TextTerminator_6b20:
db "@"