From f8a7ac34b90acb71122d71c89aa8e95b4346cf20 Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Fri, 27 Dec 2024 12:52:30 -0500
Subject: Don't pass redundant label names to `table_width` and `list_start`
 (#125)

---
 data/trainers/ai_pointers.asm        | 2 +-
 data/trainers/move_choices.asm       | 2 +-
 data/trainers/name_pointers.asm      | 2 +-
 data/trainers/names.asm              | 2 +-
 data/trainers/parties.asm            | 2 +-
 data/trainers/pic_pointers_money.asm | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/trainers')

diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm
index a2c6975b..eaab9a7a 100644
--- a/data/trainers/ai_pointers.asm
+++ b/data/trainers/ai_pointers.asm
@@ -1,5 +1,5 @@
 TrainerAIPointers:
-	table_width 3, TrainerAIPointers
+	table_width 3
 	; one entry per trainer class
 	; first byte, number of times (per Pokémon) it can occur
 	; next two bytes, pointer to AI subroutine for trainer class
diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm
index e02381a8..eef0579d 100644
--- a/data/trainers/move_choices.asm
+++ b/data/trainers/move_choices.asm
@@ -8,7 +8,7 @@ ENDM
 
 ; move choice modification methods that are applied for each trainer class
 TrainerClassMoveChoiceModifications:
-	list_start TrainerClassMoveChoiceModifications
+	list_start
 	move_choices         ; YOUNGSTER
 	move_choices 1       ; BUG CATCHER
 	move_choices 1       ; LASS
diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm
index 914fe9d4..9bcce418 100644
--- a/data/trainers/name_pointers.asm
+++ b/data/trainers/name_pointers.asm
@@ -2,7 +2,7 @@ TrainerNamePointers:
 ; These are only used for trainers' defeat speeches.
 ; They were originally shortened variants of the trainer class names
 ; in the Japanese versions, but are now redundant with TrainerNames.
-	table_width 2, TrainerNamePointers
+	table_width 2
 	dw .YoungsterName
 	dw .BugCatcherName
 	dw .LassName
diff --git a/data/trainers/names.asm b/data/trainers/names.asm
index dc6ded77..d7c5677c 100644
--- a/data/trainers/names.asm
+++ b/data/trainers/names.asm
@@ -1,5 +1,5 @@
 TrainerNames::
-	list_start TrainerNames
+	list_start
 	li "YOUNGSTER"
 	li "BUG CATCHER"
 	li "LASS"
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index e4ff648a..14dbfb3e 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,5 +1,5 @@
 TrainerDataPointers:
-	table_width 2, TrainerDataPointers
+	table_width 2
 	dw YoungsterData
 	dw BugCatcherData
 	dw LassData
diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm
index 4515d880..f300fb29 100644
--- a/data/trainers/pic_pointers_money.asm
+++ b/data/trainers/pic_pointers_money.asm
@@ -4,7 +4,7 @@ MACRO pic_money
 ENDM
 
 TrainerPicAndMoneyPointers::
-	table_width 5, TrainerPicAndMoneyPointers
+	table_width 5
 	; pic pointer, base reward money
 	; money received after battle = base money × level of last enemy mon
 	pic_money YoungsterPic,    1500
-- 
cgit v1.3.1-sl0p