diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
| commit | 04f7f7f506a1dbb877e4678601261e8157fd0e57 (patch) | |
| tree | bfe62d3872c5f031ee40df9488910bd58b0e1b15 /constants/item_constants.asm | |
| parent | Extend tools/pcm.c to allow decoding .pcm to .wav (diff) | |
| parent | Fix some map text constants (diff) | |
| download | pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.gz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.xz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants/item_constants.asm')
| -rw-r--r-- | constants/item_constants.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index b6f0e7c9..e55ee89c 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -28,9 +28,9 @@ const SUPER_POTION ; $13 const POTION ; $14 const BOULDERBADGE ; $15 +DEF SAFARI_BAIT EQU BOULDERBADGE ; overload const CASCADEBADGE ; $16 -DEF SAFARI_BAIT EQU $15 ; overload -DEF SAFARI_ROCK EQU $16 ; overload +DEF SAFARI_ROCK EQU CASCADEBADGE ; overload const THUNDERBADGE ; $17 const RAINBOWBADGE ; $18 const SOULBADGE ; $19 @@ -52,13 +52,13 @@ DEF SAFARI_ROCK EQU $16 ; overload const DOME_FOSSIL ; $29 const HELIX_FOSSIL ; $2A const SECRET_KEY ; $2B - const UNUSED_ITEM ; $2C "?????" + const ITEM_2C ; $2C const BIKE_VOUCHER ; $2D const X_ACCURACY ; $2E const LEAF_STONE ; $2F const CARD_KEY ; $30 const NUGGET ; $31 - const PP_UP_2 ; $32 + const ITEM_32 ; $32 const POKE_DOLL ; $33 const FULL_HEAL ; $34 const REVIVE ; $35 |