Define player and rival names once, to be used in two places (#545)

7 files changed, 56 insertions, 60 deletions

diff --git a/constants/player_constants.asm b/constants/player_constants.asm
new file mode 100644
index 00000000..666ccf99
--- /dev/null
+++ b/constants/player_constants.asm
@@ -0,0 +1,21 @@
+DEF NUM_PLAYER_NAMES EQU 3
+
+IF DEF(_RED)
+DEF PLAYERNAME1 EQUS "RED"
+DEF PLAYERNAME2 EQUS "ASH"
+DEF PLAYERNAME3 EQUS "JACK"
+
+DEF RIVALNAME1 EQUS "BLUE"
+DEF RIVALNAME2 EQUS "GARY"
+DEF RIVALNAME3 EQUS "JOHN"
+ENDC
+
+IF DEF(_BLUE)
+DEF PLAYERNAME1 EQUS "BLUE"
+DEF PLAYERNAME2 EQUS "GARY"
+DEF PLAYERNAME3 EQUS "JOHN"
+
+DEF RIVALNAME1 EQUS "RED"
+DEF RIVALNAME2 EQUS "ASH"
+DEF RIVALNAME3 EQUS "JACK"
+ENDC
diff --git a/data/player/names.asm b/data/player/names.asm
new file mode 100644
index 00000000..67f2df36
--- /dev/null
+++ b/data/player/names.asm
@@ -0,0 +1,15 @@
+; see constants/player_constants.asm
+
+DefaultNamesPlayer:
+	db "NEW NAME"
+FOR n, 1, NUM_PLAYER_NAMES + 1
+	next #PLAYERNAME{d:n}
+ENDR
+	db "@"
+
+DefaultNamesRival:
+	db "NEW NAME"
+FOR n, 1, NUM_PLAYER_NAMES + 1
+	next #RIVALNAME{d:n}
+ENDR
+	db "@"
diff --git a/data/player/names_list.asm b/data/player/names_list.asm
new file mode 100644
index 00000000..786c1229
--- /dev/null
+++ b/data/player/names_list.asm
@@ -0,0 +1,17 @@
+; see constants/player_constants.asm
+
+DefaultNamesPlayerList:
+	db "NEW NAME@"
+	list_start
+FOR n, 1, NUM_PLAYER_NAMES + 1
+	li #PLAYERNAME{d:n}
+ENDR
+	assert_list_length NUM_PLAYER_NAMES
+
+DefaultNamesRivalList:
+	db "NEW NAME@"
+	list_start
+FOR n, 1, NUM_PLAYER_NAMES + 1
+	li #RIVALNAME{d:n}
+ENDR
+	assert_list_length NUM_PLAYER_NAMES
diff --git a/data/player_names.asm b/data/player_names.asm
deleted file mode 100644
index f57c9877..00000000
--- a/data/player_names.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-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
diff --git a/data/player_names_list.asm b/data/player_names_list.asm
deleted file mode 100644
index 56075df0..00000000
--- a/data/player_names_list.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-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
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index df05091a..bff12f62 100644
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -187,7 +187,7 @@ DisplayIntroNameTextBox:
 .namestring
 	db "NAME@"
 
-INCLUDE "data/player_names.asm"
+INCLUDE "data/player/names.asm"
 
 GetDefaultName:
 ; a = name index
@@ -213,7 +213,7 @@ GetDefaultName:
 	ld bc, NAME_BUFFER_LENGTH
 	jp CopyData
 
-INCLUDE "data/player_names_list.asm"
+INCLUDE "data/player/names_list.asm"
 
 LinkMenuEmptyText:
 	text_end
diff --git a/includes.asm b/includes.asm
index 5087809c..781bb0b1 100644
--- a/includes.asm
+++ b/includes.asm
@@ -31,6 +31,7 @@ INCLUDE "constants/item_constants.asm"
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/pokedex_constants.asm"
 INCLUDE "constants/pokemon_data_constants.asm"
+INCLUDE "constants/player_constants.asm"
 INCLUDE "constants/trainer_constants.asm"
 INCLUDE "constants/icon_constants.asm"
 INCLUDE "constants/sprite_constants.asm"