diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-25 16:33:05 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-25 16:44:41 -0400 |
| commit | 95ec2cf039f0efdc6dadfb6fe766ace231a1b6b1 (patch) | |
| tree | 5a7b79846bd7f07e40310da46b21873774a08ef7 /data/battle | |
| parent | Remove unused _GREEN TitleMons data (diff) | |
| download | pokeyellow-95ec2cf039f0efdc6dadfb6fe766ace231a1b6b1.tar.gz pokeyellow-95ec2cf039f0efdc6dadfb6fe766ace231a1b6b1.tar.xz pokeyellow-95ec2cf039f0efdc6dadfb6fe766ace231a1b6b1.zip | |
Verify data table and name list sizes with assertion macros
Fixes #312
Diffstat (limited to '')
| -rw-r--r-- | data/battle/stat_mod_names.asm | 17 | ||||
| -rw-r--r-- | data/battle/stat_names.asm | 17 | ||||
| -rw-r--r-- | data/battle_anims/base_coords.asm | 2 | ||||
| -rw-r--r-- | data/battle_anims/frame_blocks.asm | 2 | ||||
| -rw-r--r-- | data/battle_anims/subanimations.asm | 2 |
5 files changed, 33 insertions, 7 deletions
diff --git a/data/battle/stat_mod_names.asm b/data/battle/stat_mod_names.asm new file mode 100644 index 00000000..287e87e3 --- /dev/null +++ b/data/battle/stat_mod_names.asm @@ -0,0 +1,17 @@ +; Stats that move effects can raise or lower +; The relevant move effect IDs correspond to the stats + +StatModTextStrings: + list_start StatModTextStrings + li "ATTACK" + li "DEFENSE" + li "SPEED" + li "SPECIAL" + assert_list_length SPECIAL_DOWN_SIDE_EFFECT - ATTACK_DOWN_SIDE_EFFECT + 1 + li "ACCURACY" + li "EVADE" + assert_list_length NUM_STAT_MODS - 2 ; two bytes are unused + assert_list_length EVASION_UP1_EFFECT - ATTACK_UP1_EFFECT + 1 + assert_list_length EVASION_DOWN1_EFFECT - ATTACK_DOWN1_EFFECT + 1 + assert_list_length EVASION_UP2_EFFECT - ATTACK_UP2_EFFECT + 1 + assert_list_length EVASION_DOWN2_EFFECT - ATTACK_DOWN2_EFFECT + 1 diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm index 854780c6..413ab991 100644 --- a/data/battle/stat_names.asm +++ b/data/battle/stat_names.asm @@ -1,7 +1,10 @@ -StatsTextStrings: - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" - db "ACCURACY@" - db "EVADE@" +; Stats that vitamins can raise or lower + +VitaminStats: + list_start VitaminStats + li "HEALTH" + li "ATTACK" + li "DEFENSE" + li "SPEED" + li "SPECIAL" + assert_list_length NUM_STATS diff --git a/data/battle_anims/base_coords.asm b/data/battle_anims/base_coords.asm index ad67baff..109a06e8 100644 --- a/data/battle_anims/base_coords.asm +++ b/data/battle_anims/base_coords.asm @@ -1,4 +1,5 @@ FrameBlockBaseCoords: + table_width 2, FrameBlockBaseCoords db $10, $68 ; BASECOORD_00 db $10, $70 ; BASECOORD_01 db $10, $78 ; BASECOORD_02 @@ -176,3 +177,4 @@ FrameBlockBaseCoords: db $18, $4C ; BASECOORD_AE db $1C, $48 ; BASECOORD_AF db $48, $28 ; BASECOORD_B0 + assert_table_length NUM_BASECOORDS diff --git a/data/battle_anims/frame_blocks.asm b/data/battle_anims/frame_blocks.asm index 8b9b0919..549c1c3c 100644 --- a/data/battle_anims/frame_blocks.asm +++ b/data/battle_anims/frame_blocks.asm @@ -1,4 +1,5 @@ FrameBlockPointers: + table_width 2, FrameBlockPointers dw FrameBlock00 dw FrameBlock01 dw FrameBlock02 @@ -121,6 +122,7 @@ FrameBlockPointers: dw FrameBlock77 dw FrameBlock78 dw FrameBlock79 + assert_table_length NUM_FRAMEBLOCKS FrameBlock01: db 9 ; # diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm index bbdc45c0..530192f6 100644 --- a/data/battle_anims/subanimations.asm +++ b/data/battle_anims/subanimations.asm @@ -1,4 +1,5 @@ SubanimationPointers: + table_width 2, SubanimationPointers dw Subanimation00 dw Subanimation01 dw Subanimation02 @@ -85,6 +86,7 @@ SubanimationPointers: dw Subanimation53 dw Subanimation54 dw Subanimation55 + assert_table_length NUM_SUBANIMS ; format: ; subanim type, count |