summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2011-12-15 18:05:30 -0700
committerIIMarckus <iimarckus@gmail.com>2011-12-15 18:05:30 -0700
commita8dbea888b33f5889d42b2d1389e20c88ff61dff (patch)
tree35369f6c839c6bd43f3132c8c05eba1f44beb284 /constants.asm
parentc04a77529ad71d190f2add9bf51d1ea40517bbb0 (diff)
Poké Ball animation code cleanup.
hg-commit-id: 812dc01df153
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm13
1 files changed, 10 insertions, 3 deletions
diff --git a/constants.asm b/constants.asm
index 509ed10a..2aafb6c0 100644
--- a/constants.asm
+++ b/constants.asm
@@ -71,11 +71,13 @@ W_OPPONENTSTATUS EQU $CFE9 ; active opponent's status condition
W_TRAINERCLASS EQU $D031
+W_BATTLETYPE EQU $D057 ; in a wild battle, this is 1
+ ; in a trainer battle, this is 2
+
W_CUROPPONENT EQU $D059 ; in a wild battle, this is the species of pokemon
; in a trainer battle, this is the trainer class + $C8
W_LONEATTACKNO EQU $D05C ; which entry in LoneAttacks to use
-W_ISTRAINERBATTLE EQU $D057 ; boolean
W_TRAINERNO EQU $D05D ; which instance of [youngster, lass, etc] is this?
W_CURENEMYLVL EQU $D127
@@ -789,10 +791,15 @@ SLASH EQU $A3
SUBSTITUTE EQU $A4
STRUGGLE EQU $A5
; these do double duty as animation identifiers
+SHOWPIC_ANIM EQU $A6 ; redraw monster pic
SLP_ANIM EQU $BD ; sleeping monster
CONF_ANIM EQU $BF ; confused monster
-TOSS_ANIM EQU $C1 ; try to catch a monster
-SEND_ANIM EQU $C3 ; send out a monster
+TOSS_ANIM EQU $C1 ; toss Poké Ball
+POOF_ANIM EQU $C3 ; puff of smoke
+BLOCKBALL_ANIM EQU $C4 ; trainer knocks away Poké Ball
+GREATTOSS_ANIM EQU $C5 ; toss Great Ball
+ULTRATOSS_ANIM EQU $C6 ; toss Ultra Ball or Master Ball
+HIDEPIC_ANIM EQU $C8 ; monster disappears
; super game boy palettes
PAL_ROUTE EQU $00