aboutsummaryrefslogtreecommitdiffstats
path: root/constants/move_constants.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /constants/move_constants.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'constants/move_constants.asm')
-rw-r--r--constants/move_constants.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index dfbb500e..5dd06a41 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -1,5 +1,5 @@
-const_value = 1
-
+ const_def
+ const NO_MOVE ; 00
const POUND ; 01
const KARATE_CHOP ; 02
const DOUBLESLAP ; 03
@@ -165,9 +165,9 @@ const_value = 1
const SLASH ; a3
const SUBSTITUTE ; a4
-NUM_ATTACKS EQU const_value + -1
+NUM_ATTACKS EQU const_value - 1
- const STRUGGLE
+ const STRUGGLE ; a5
; Moves do double duty as animation identifiers.