diff options
| author | IIMarckus <iimarckus@gmail.com> | 2013-05-13 01:07:13 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2013-05-13 01:07:13 -0600 |
| commit | 7d458509d3571de65472dedf4fc308bd2e387dc0 (patch) | |
| tree | ce220e0c4c10dee63d8994682bc12d3fe7a953c9 /constants.asm | |
| parent | f6288266153705759fccc7cc3aaee99a76a9300b (diff) | |
| parent | 23f5f8c4ef70c5bcad827ac93b4d8983f49149a6 (diff) | |
Merge https://bitbucket.org/sanky/pokered
Conflicts:
main.asm
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 648f955d..1e03b219 100644 --- a/constants.asm +++ b/constants.asm @@ -203,6 +203,7 @@ W_RLEBYTECOUNTER EQU $CCD2 W_PLAYERSUBSITUTEHP EQU $CCD7 W_ENEMYSUBSITUTEHP EQU $CCD8 +W_MOVEMENUTYPE EQU $CCDB ; 0=regular, 1=mimic, 2=above message box (relearn, heal pp..) W_PLAYERSELECTEDMOVE EQU $CCDC W_ENEMYSELECTEDMOVE EQU $CCDD @@ -356,6 +357,7 @@ W_BATTLETYPE EQU $D05A ; in normal battle, this is 0 ; in safari battle, this is 2 W_LONEATTACKNO EQU $D05C ; which entry in LoneAttacks to use +W_GYMLEADERNO EQU $D05C ; it's actually the same thing as ^ W_TRAINERNO EQU $D05D ; which instance of [youngster, lass, etc] is this? W_MOVEMISSED EQU $D05F |