diff options
| author | IIMarckus <iimarckus@gmail.com> | 2011-12-27 20:04:33 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2011-12-27 20:04:33 -0700 |
| commit | fa9c66dc639cbbbd8809fcd98f6be6cde731e1f0 (patch) | |
| tree | db69b7507ba846de97664fef87798afafb76cca3 /constants.asm | |
| parent | b87848642c3ca215c5cd2ea3f28a5c977d7b1af6 (diff) | |
Cleanup, and added new RAM variables (and changed some others).
hg-commit-id: 91fe5cdac0f3
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/constants.asm b/constants.asm index df508113..ddd11f8b 100644 --- a/constants.asm +++ b/constants.asm @@ -81,12 +81,17 @@ 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_ISINBATTLE EQU $D057 ; no battle, this is 0 + ; wild battle, this is 1 + ; 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_BATTLETYPE EQU $D05A ; in normal battle, this is 0 + ; in old man battle, this is 1 + ; in safari battle, this is 2 + W_LONEATTACKNO EQU $D05C ; which entry in LoneAttacks to use W_TRAINERNO EQU $D05D ; which instance of [youngster, lass, etc] is this? @@ -106,6 +111,8 @@ W_ISLINKBATTLE EQU $D12B W_PLAYERNAME EQU $D158 ; 11 characters, including null +W_NUMINPARTY EQU $D163 + W_RIVALNAME EQU $D34A ; 11 characters, including null W_CURMAP EQU $D35E @@ -138,6 +145,10 @@ W_ENEMYMON5MOVE3 EQU $D95E W_ENEMYMON6MOVE3 EQU $D98A +W_NUMSAFARIBALLS EQU $DA47 + +W_NUMINBOX EQU $DA80 + H_RAND1 EQU $FFD3 H_RAND2 EQU $FFD4 |