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/moves/moves.asm | |
| 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/moves/moves.asm')
| -rw-r--r-- | data/moves/moves.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 85b6dcfc..0e52e01c 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -1,6 +1,3 @@ -Moves: -; Characteristics of each move. - move: MACRO db \1 ; animation (interchangeable with move id) db \2 ; effect @@ -10,8 +7,10 @@ move: MACRO db \6 ; pp ENDM +Moves: +; Characteristics of each move. + table_width MOVE_LENGTH, Moves move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 -MoveEnd: move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 @@ -176,3 +175,4 @@ MoveEnd: move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 + assert_table_length NUM_ATTACKS |