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 /data/items | |
| 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 'data/items')
| -rw-r--r-- | data/items/key_items.asm | 4 | ||||
| -rw-r--r-- | data/items/names.asm | 6 | ||||
| -rw-r--r-- | data/items/prices.asm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/items/key_items.asm b/data/items/key_items.asm index b0c4b1ad..97f5f093 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -43,13 +43,13 @@ KeyItemFlags: dbit TRUE ; DOME_FOSSIL dbit TRUE ; HELIX_FOSSIL dbit TRUE ; SECRET_KEY - dbit TRUE ; UNUSED_ITEM + dbit TRUE ; ITEM_2C dbit TRUE ; BIKE_VOUCHER dbit FALSE ; X_ACCURACY dbit FALSE ; LEAF_STONE dbit TRUE ; CARD_KEY dbit FALSE ; NUGGET - dbit FALSE ; PP_UP_2 + dbit FALSE ; ITEM_32 dbit FALSE ; POKE_DOLL dbit FALSE ; FULL_HEAL dbit FALSE ; REVIVE diff --git a/data/items/names.asm b/data/items/names.asm index af51446b..44a21c38 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -6,7 +6,7 @@ ItemNames:: li "POKé BALL" li "TOWN MAP" li "BICYCLE" - li "?????" + li "?????" ; SURFBOARD li "SAFARI BALL" li "POKéDEX" li "MOON STONE" @@ -43,13 +43,13 @@ ItemNames:: li "DOME FOSSIL" li "HELIX FOSSIL" li "SECRET KEY" - li "?????" + li "?????" ; ITEM_2C li "BIKE VOUCHER" li "X ACCURACY" li "LEAF STONE" li "CARD KEY" li "NUGGET" - li "PP UP" + li "PP UP" ; ITEM_32 li "POKé DOLL" li "FULL HEAL" li "REVIVE" diff --git a/data/items/prices.asm b/data/items/prices.asm index 6c1c2891..d01c0b7e 100644 --- a/data/items/prices.asm +++ b/data/items/prices.asm @@ -43,13 +43,13 @@ ItemPrices:: bcd3 0 ; DOME_FOSSIL bcd3 0 ; HELIX_FOSSIL bcd3 0 ; SECRET_KEY - bcd3 0 ; XXX + bcd3 0 ; ITEM_2C bcd3 0 ; BIKE_VOUCHER bcd3 950 ; X_ACCURACY bcd3 2100 ; LEAF_STONE bcd3 0 ; CARD_KEY bcd3 10000 ; NUGGET - bcd3 9800 ; XXX PP_UP + bcd3 9800 ; ITEM_32 bcd3 1000 ; POKE_DOLL bcd3 600 ; FULL_HEAL bcd3 1500 ; REVIVE |