diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-01-10 21:41:36 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-10 21:41:36 -0600 |
| commit | 078de8c3c8925235e49b3a17d1fc9a89dd80d0cf (patch) | |
| tree | 24300e9bb6767761904e98c2d9bbb7ff0c6ed5ea /constants.asm | |
| parent | 5e1aaba09b5a57abe5b125474513ed178e7bd347 (diff) | |
| parent | 376810b3bec52c82e82d3fd458584e4f30fd3985 (diff) | |
Merge.
hg-commit-id: a16a040fd67a
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index e8c01320..8e445e87 100644 --- a/constants.asm +++ b/constants.asm @@ -80,6 +80,8 @@ TX_FAR: MACRO ; wram locations W_AICOUNT EQU $CCDF ; number of times remaining that AI action can occur +W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select + W_OPPONENTHP EQU $CFE6 ; active opponent's hp (16 bits) W_OPPONENTNUMBER EQU $CFE8 ; active opponent's position in team (0 to 5) W_OPPONENTSTATUS EQU $CFE9 ; active opponent's status condition |