diff options
Diffstat (limited to 'data/trainers')
-rw-r--r-- | data/trainers/ai_pointers.asm | 2 | ||||
-rw-r--r-- | data/trainers/move_choices.asm | 3 | ||||
-rw-r--r-- | data/trainers/parties.asm | 2 | ||||
-rw-r--r-- | data/trainers/pic_pointers_money.asm | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm index a3c7a657..a2c6975b 100644 --- a/data/trainers/ai_pointers.asm +++ b/data/trainers/ai_pointers.asm @@ -1,4 +1,5 @@ TrainerAIPointers: + table_width 3, TrainerAIPointers ; 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 @@ -50,3 +51,4 @@ TrainerAIPointers: dbw 3, GenericAI dbw 2, AgathaAI ; agatha dbw 1, LanceAI ; lance + assert_table_length NUM_TRAINERS diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 6e6df63c..d4900c9f 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -4,10 +4,12 @@ REPT _NARG shift ENDR db 0 ; end +list_index = list_index + 1 ENDM ; move choice modification methods that are applied for each trainer class TrainerClassMoveChoiceModifications: + list_start TrainerClassMoveChoiceModifications move_choices ; YOUNGSTER move_choices 1 ; BUG CATCHER move_choices 1 ; LASS @@ -55,3 +57,4 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; CHANNELER move_choices 1 ; AGATHA move_choices 1, 3 ; LANCE + assert_list_length NUM_TRAINERS diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 005cb1dd..dddcf653 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -269,7 +269,7 @@ BikerData: ; Route 17 ; From https://www.smogon.com/smog/issue27/glitch: ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. - ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; + ; BaseStats + (BASE_DATA_SIZE) * (000 - 1) = $5FC2; ; that's the formula from GetMonHeader for the base stats of mon #000. ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm index d4007394..3143095c 100644 --- a/data/trainers/pic_pointers_money.asm +++ b/data/trainers/pic_pointers_money.asm @@ -4,6 +4,7 @@ pic_money: MACRO ENDM TrainerPicAndMoneyPointers:: + table_width 5, TrainerPicAndMoneyPointers ; pic pointer, base reward money ; money received after battle = base money × level of highest-level enemy mon pic_money YoungsterPic, 1500 @@ -53,3 +54,4 @@ TrainerPicAndMoneyPointers:: pic_money ChannelerPic, 3000 pic_money AgathaPic, 9900 pic_money LancePic, 9900 + assert_table_length NUM_TRAINERS |