diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-12-15 15:16:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-15 15:16:40 -0500 |
| commit | d79c578abd993f7eee4e85462a8cd5b7c4e14646 (patch) | |
| tree | dd89e07a471a12cd6eb731bf559d73940c07b444 /data/trainers | |
| parent | Comment more unreferenced local labels (#550) (diff) | |
| download | pokeyellow-d79c578abd993f7eee4e85462a8cd5b7c4e14646.tar.gz pokeyellow-d79c578abd993f7eee4e85462a8cd5b7c4e14646.tar.xz pokeyellow-d79c578abd993f7eee4e85462a8cd5b7c4e14646.zip | |
Specify a max item length for `list_start` (#552)
Diffstat (limited to 'data/trainers')
| -rw-r--r-- | data/trainers/move_choices.asm | 8 | ||||
| -rw-r--r-- | data/trainers/names.asm | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 1624b326..98c068a1 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -1,14 +1,15 @@ +DEF __move_choices__ = 0 + MACRO move_choices IF _NARG db \# ; all args ENDC db 0 ; end - DEF list_index += 1 + DEF __move_choices__ += 1 ENDM ; move choice modification methods that are applied for each trainer class TrainerClassMoveChoiceModifications: - list_start move_choices ; YOUNGSTER move_choices 1 ; BUG CATCHER move_choices 1 ; LASS @@ -56,4 +57,5 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; CHANNELER move_choices 1 ; AGATHA move_choices 1, 3 ; LANCE - assert_list_length NUM_TRAINERS + assert __move_choices__ == NUM_TRAINERS, \ + "TrainerClassMoveChoiceModifications: expected {d:NUM_TRAINERS} entries, got {d:__move_choices__}" diff --git a/data/trainers/names.asm b/data/trainers/names.asm index d7c5677c..1b6f2382 100644 --- a/data/trainers/names.asm +++ b/data/trainers/names.asm @@ -1,5 +1,5 @@ TrainerNames:: - list_start + list_start TRAINER_NAME_LENGTH - 1 li "YOUNGSTER" li "BUG CATCHER" li "LASS" |