Specify a max item length for list_start (#1210)

data/battle/stat_names.asm

@@ -1,6 +1,6 @@
 StatNames:
 ; entries correspond to stat ids
-	list_start
+	list_start STRING_BUFFER_LENGTH - 1
 	li "ATTACK"
 	li "DEFENSE"
 	li "SPEED"

data/decorations/names.asm

@@ -1,6 +1,6 @@
 DecorationNames:
 ; entries correspond to constants/deco_constants.asm
-	list_start
+	list_start TEXTBOX_INNERW - 1
 	li "CANCEL"
 	li "PUT IT AWAY"
 	li "MAGNAPLANT"

data/items/names.asm

@@ -1,5 +1,5 @@
 ItemNames::
-	list_start
+	list_start ITEM_NAME_LENGTH - 1
 	li "MASTER BALL"
 	li "ULTRA BALL"
 	li "BRIGHTPOWDER"

data/mon_menu.asm

@@ -11,7 +11,7 @@ DEF NUM_MONMENUVALUES EQU const_value - 1
 
 MonMenuOptionStrings:
 ; entries correspond to MONMENUVALUE_* constants
-	list_start
+	list_start MOVE_NAME_LENGTH - 2
 	li "STATS"
 	li "SWITCH"
 	li "ITEM"

data/moves/names.asm

@@ -1,5 +1,5 @@
 MoveNames::
-	list_start
+	list_start MOVE_NAME_LENGTH - 1
 	li "POUND"
 	li "KARATE CHOP"
 	li "DOUBLESLAP"

data/trainers/class_names.asm

@@ -1,6 +1,6 @@
 TrainerClassNames::
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
-	list_start
+	list_start TRAINER_CLASS_NAME_LENGTH - 1
 	li "LEADER"
 	li "LEADER"
 	li "LEADER"

macros/asserts.asm

@@ -4,8 +4,8 @@ MACRO? _redef_current_label
 	if DEF(\1)
 		PURGE \1
 	endc
-	if _NARG == 3 + (\3)
-		DEF \1 EQUS "\<_NARG>"
+	if _NARG > 2
+		DEF \1 EQUS "\3"
 	elif STRLEN(#__SCOPE__)
 		if {{__SCOPE__}} - @ == 0
 			DEF \1 EQUS #{__SCOPE__}
@@ -19,7 +19,8 @@ ENDM
 
 MACRO? table_width
 	DEF CURRENT_TABLE_WIDTH = \1
-	_redef_current_label CURRENT_TABLE_START, "._table_width\@", 2, \#
+	shift
+	_redef_current_label CURRENT_TABLE_START, "._table_width\@", \#
 ENDM
 
 MACRO? assert_table_length
@@ -32,11 +33,20 @@ ENDM
 
 MACRO? list_start
 	DEF list_index = 0
-	_redef_current_label CURRENT_LIST_START, "._list_start\@", 1, \#
+	DEF list_item_length = 0
+	if _NARG > 0
+		DEF list_item_length = \1
+		shift
+	endc
+	_redef_current_label CURRENT_LIST_START, "._list_start\@", \#
 ENDM
 
 MACRO? li
 	assert STRFIND(\1, "@") == -1, "String terminator \"@\" in list entry: \1"
+	if list_item_length
+		assert CHARLEN(\1) <= list_item_length, \
+			"List entry longer than {d:list_item_length} characters: \1"
+	endc
 	db \1, "@"
 	DEF list_index += 1
 ENDM