diff options
| author | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
| commit | eb47bda8ee5c1f002236200df36012de9e243a97 (patch) | |
| tree | fc69fc5435582efebd36fc54414673dd8ac7f646 /data/battle | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Verify data table and name list sizes with assertion macros (diff) | |
| download | pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.gz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.xz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/battle')
| -rw-r--r-- | data/battle/stat_mod_names.asm | 17 | ||||
| -rw-r--r-- | data/battle/stat_names.asm | 17 |
2 files changed, 27 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 |