diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-20 13:22:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 13:22:32 -0400 |
| commit | 3e554e1d5206f0ede60f7e99e68637b7f13bc683 (patch) | |
| tree | c5a21b6e4d24ad3e98c3c98982afc65a866e650d /data/moves | |
| parent | Merge pull request #279 from Rangi42/master (diff) | |
| parent | Add comments associating constants with data, and identify some more data (diff) | |
| download | pokeyellow-3e554e1d5206f0ede60f7e99e68637b7f13bc683.tar.gz pokeyellow-3e554e1d5206f0ede60f7e99e68637b7f13bc683.tar.xz pokeyellow-3e554e1d5206f0ede60f7e99e68637b7f13bc683.zip | |
Merge pull request #281 from Rangi42/master
Add comments associating constants with data, and identify some more data
Diffstat (limited to 'data/moves')
| -rw-r--r-- | data/moves/effects_pointers.asm | 1 | ||||
| -rw-r--r-- | data/moves/field_move_names.asm | 10 | ||||
| -rw-r--r-- | data/moves/field_moves.asm | 14 |
3 files changed, 25 insertions, 0 deletions
diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm index 9858e82e..a5e3d852 100644 --- a/data/moves/effects_pointers.asm +++ b/data/moves/effects_pointers.asm @@ -1,4 +1,5 @@ MoveEffectPointerTable: +; entries correspond to *_EFFECT constants dw SleepEffect ; EFFECT_01 dw PoisonEffect ; POISON_SIDE_EFFECT1 dw DrainHPEffect ; DRAIN_HP_EFFECT diff --git a/data/moves/field_move_names.asm b/data/moves/field_move_names.asm new file mode 100644 index 00000000..b68ed828 --- /dev/null +++ b/data/moves/field_move_names.asm @@ -0,0 +1,10 @@ +FieldMoveNames: + db "CUT@" + db "FLY@" + db "@" + db "SURF@" + db "STRENGTH@" + db "FLASH@" + db "DIG@" + db "TELEPORT@" + db "SOFTBOILED@" diff --git a/data/moves/field_moves.asm b/data/moves/field_moves.asm new file mode 100644 index 00000000..d7e9219b --- /dev/null +++ b/data/moves/field_moves.asm @@ -0,0 +1,14 @@ +FieldMoveDisplayData: + ; move id, FieldMoveNames index, leftmost tile + ; (leftmost tile = -1 + tile column in which the first + ; letter of the move's name should be displayed) + db CUT, 1, $0C + db FLY, 2, $0C + db ANIM_B4, 3, $0C ; unused + db SURF, 4, $0C + db STRENGTH, 5, $0A + db FLASH, 6, $0C + db DIG, 7, $0C + db TELEPORT, 8, $0A + db SOFTBOILED, 9, $08 + db -1 ; end |