diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2024-12-27 12:52:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-27 12:52:30 -0500 |
| commit | f8a7ac34b90acb71122d71c89aa8e95b4346cf20 (patch) | |
| tree | edffd155c9eb0adcea7517c2303f1c2d50021774 /data/moves | |
| parent | Remove `-Wnumeric-string=2` (diff) | |
| download | pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.tar.gz pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.tar.xz pokeyellow-f8a7ac34b90acb71122d71c89aa8e95b4346cf20.zip | |
Don't pass redundant label names to `table_width` and `list_start` (#125)
Diffstat (limited to 'data/moves')
| -rw-r--r-- | data/moves/animations.asm | 2 | ||||
| -rw-r--r-- | data/moves/effects_pointers.asm | 2 | ||||
| -rw-r--r-- | data/moves/moves.asm | 2 | ||||
| -rw-r--r-- | data/moves/names.asm | 2 | ||||
| -rw-r--r-- | data/moves/sfx.asm | 2 | ||||
| -rw-r--r-- | data/moves/tmhm_moves.asm | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 950ec075..984d6b80 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -1,5 +1,5 @@ AttackAnimationPointers: - table_width 2, AttackAnimationPointers + table_width 2 dw PoundAnim dw KarateChopAnim dw DoubleSlapAnim diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm index 63350efc..fc7c08c5 100644 --- a/data/moves/effects_pointers.asm +++ b/data/moves/effects_pointers.asm @@ -1,6 +1,6 @@ MoveEffectPointerTable: ; entries correspond to *_EFFECT constants - table_width 2, MoveEffectPointerTable + table_width 2 dw SleepEffect ; EFFECT_01 dw PoisonEffect ; POISON_SIDE_EFFECT1 dw DrainHPEffect ; DRAIN_HP_EFFECT diff --git a/data/moves/moves.asm b/data/moves/moves.asm index e59ed007..f435ab6b 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -10,7 +10,7 @@ ENDM Moves: ; Characteristics of each move. - table_width MOVE_LENGTH, Moves + table_width MOVE_LENGTH move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 diff --git a/data/moves/names.asm b/data/moves/names.asm index e9591619..025172d5 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -1,5 +1,5 @@ MoveNames:: - list_start MoveNames + list_start li "POUND" li "KARATE CHOP" li "DOUBLESLAP" diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index c3f01f4e..f1466ac1 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -1,5 +1,5 @@ MoveSoundTable: - table_width 3, MoveSoundTable + table_width 3 ; ID, pitch mod, tempo mod db SFX_POUND, $00, $80 ; POUND db SFX_BATTLE_0C, $10, $80 ; KARATE_CHOP diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 0e4a79af..faafc923 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -2,7 +2,7 @@ ; define constants for the item IDs and for the corresponding move values. TechnicalMachines: - table_width 1, TechnicalMachines + table_width 1 FOR n, 1, NUM_TMS + 1 db TM{02d:n}_MOVE |