diff options
| author | IIMarckus <iimarckus@gmail.com> | 2012-01-10 23:05:13 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2012-01-10 23:05:13 -0700 |
| commit | cdfdfb33376678e91815b7a2fe1e7b648190b2b6 (patch) | |
| tree | 959218bc554bfccf0710b565542a033d0719b808 /constants.asm | |
| parent | e4bce7ed15934f991cfc0b2cce0a33bbfd714b6e (diff) | |
| parent | 5137fe402bf32adbf6ec655ec56059ee63664e86 (diff) | |
Merge.
hg-commit-id: d2fa964e97d1
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/constants.asm b/constants.asm index 8e445e87..f3ec0a5c 100644 --- a/constants.asm +++ b/constants.asm @@ -599,7 +599,7 @@ X_ACCURACY EQU $2E LEAF_STONE EQU $2F CARD_KEY EQU $30 NUGGET EQU $31 -PP_UP EQU $32 +;PP_UP EQU $32 POKE_DOLL EQU $33 FULL_HEAL EQU $34 REVIVE EQU $35 @@ -629,7 +629,7 @@ OLD_ROD EQU $4C GOOD_ROD EQU $4D SUPER_ROD EQU $4E ; XXX todo: compare this to $32 -;PP_UP EQU $4F +PP_UP EQU $4F ETHER EQU $50 MAX_ETHER EQU $51 ELIXER EQU $52 |