shithub: pokered

Download patch

ref: 20ebfd079f1331af5cc4f0edea35163b5b35612d
parent: 53805947c3bc30c491b4f2a820c27e152dfa4b89
author: vulcandth <vulcandth@gmail.com>
date: Wed Dec 28 16:47:27 EST 2022

Add table assertion to `TrainerDataPointers` (#403)

* Add table assertion to `TrainerDataPointers`

* Add table assertion to `TrainerNamePointers`

--- a/data/trainers/name_pointers.asm
+++ b/data/trainers/name_pointers.asm
@@ -2,6 +2,7 @@
 ; 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 @@
 	dw wTrainerName
 	dw wTrainerName
 	dw wTrainerName
+	assert_table_length NUM_TRAINERS
 
 .YoungsterName:     db "YOUNGSTER@"
 .BugCatcherName:    db "BUG CATCHER@"
--- 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 @@
 	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)