diff options
| author | vulcandth <vulcandth@gmail.com> | 2022-12-28 21:47:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 21:47:27 -0600 |
| commit | 20ebfd079f1331af5cc4f0edea35163b5b35612d (patch) | |
| tree | a1c6dceaea5526f03e6914b0ea848a562d354188 /data/trainers | |
| parent | Use rgbds 0.6.1 (0.6.0 also still works) (diff) | |
| download | pokeyellow-20ebfd079f1331af5cc4f0edea35163b5b35612d.tar.gz pokeyellow-20ebfd079f1331af5cc4f0edea35163b5b35612d.tar.xz pokeyellow-20ebfd079f1331af5cc4f0edea35163b5b35612d.zip | |
Add table assertion to `TrainerDataPointers` (#403)
* Add table assertion to `TrainerDataPointers`
* Add table assertion to `TrainerNamePointers`
Diffstat (limited to 'data/trainers')
| -rw-r--r-- | data/trainers/name_pointers.asm | 2 | ||||
| -rw-r--r-- | data/trainers/parties.asm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm index 6317f54a..914fe9d4 100644 --- a/data/trainers/name_pointers.asm +++ b/data/trainers/name_pointers.asm @@ -2,6 +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 dw .YoungsterName dw .BugCatcherName dw .LassName @@ -49,6 +50,7 @@ TrainerNamePointers: dw wTrainerName dw wTrainerName dw wTrainerName + assert_table_length NUM_TRAINERS .YoungsterName: db "YOUNGSTER@" .BugCatcherName: db "BUG CATCHER@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index dddcf653..b2ad5e08 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1,4 +1,5 @@ TrainerDataPointers: + table_width 2, TrainerDataPointers dw YoungsterData dw BugCatcherData dw LassData @@ -46,6 +47,7 @@ TrainerDataPointers: dw ChannelerData dw AgathaData dw LanceData + assert_table_length NUM_TRAINERS ; if first byte != $FF, then ; first byte is level (of all pokemon on this team) |