diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /constants/move_constants.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'constants/move_constants.asm')
| -rw-r--r-- | constants/move_constants.asm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 524e7814..9fdb1ce7 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -1,3 +1,5 @@ +NUM_MOVES EQU $A4 + POUND EQU $01 KARATE_CHOP EQU $02 DOUBLESLAP EQU $03 @@ -163,6 +165,7 @@ SUPER_FANG EQU $A2 SLASH EQU $A3 SUBSTITUTE EQU $A4 STRUGGLE EQU $A5 + ; these do double duty as animation identifiers SHOWPIC_ANIM EQU $A6 ; redraw monster pic STATUS_AFFECTED_ANIM EQU $A7 ; effect when monster receives a status aliment @@ -178,4 +181,4 @@ GREATTOSS_ANIM EQU $C5 ; toss Great Ball ULTRATOSS_ANIM EQU $C6 ; toss Ultra Ball or Master Ball HIDEPIC_ANIM EQU $C8 ; monster disappears ROCK_ANIM EQU $C9 ; throw rock -BAIT_ANIM EQU $CA ; throw bait
\ No newline at end of file +BAIT_ANIM EQU $CA ; throw bait |