summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2018-07-29 19:56:54 -0400
committerGitHub <noreply@github.com>2018-07-29 19:56:54 -0400
commit98e670f3637b5f845a91423ee2d624d2f1e331a6 (patch)
tree20bacd2c3cd766eedddd636de59a99af1d662866 /constants
parent2ec900d96c3b6020be0816151b9ad606c04114b5 (diff)
parente346cc7b4152578106f7708363b41d076a3e8d52 (diff)
Merge pull request #548 from Rangi42/master
Add meaningful aliases for wd265
Diffstat (limited to 'constants')
-rw-r--r--constants/battle_constants.asm10
-rw-r--r--constants/icon_constants.asm10
2 files changed, 18 insertions, 2 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 781f27d21..e426b615e 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -63,8 +63,8 @@ MOVE_LENGTH EQU const_value
const STAT_SATK
NUM_EXP_STATS EQU const_value + -1
const STAT_SDEF
-NUM_STATS EQU const_value +- 1
-STAT_SPC EQU STAT_SATK
+NUM_STATS EQU const_value + -1
+NUM_BATTLE_STATS EQU NUM_STATS + -1 ; don't count HP
; stat formula constants
STAT_MIN_NORMAL EQU 5
@@ -244,6 +244,12 @@ SUBSTATUS_CURLED EQU 0
const BATTLEACTION_E
const BATTLEACTION_FORFEIT
+; wBattlePlayerAction
+ const_def
+ const BATTLEPLAYERACTION_USEMOVE
+ const BATTLEPLAYERACTION_USEITEM
+ const BATTLEPLAYERACTION_SWITCH
+
; wBattleResult
const_def
const WIN
diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm
index 2b0456c1d..870175f45 100644
--- a/constants/icon_constants.asm
+++ b/constants/icon_constants.asm
@@ -39,3 +39,13 @@
const ICON_SLOWPOKE
const ICON_SUDOWOODO
const ICON_BIGMON
+
+; LoadMenuMonIcon.Jumptable indexes (see engine/gfx/mon_icons.asm)
+ const_def
+ const MONICON_PARTYMENU
+ const MONICON_NAMINGSCREEN
+ const MONICON_MOVES
+ const MONICON_TRADE
+ const MONICON_MOBILE1
+ const MONICON_MOBILE2
+ const MONICON_UNUSED