diff options
| author | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-21 20:21:14 -0500 |
|---|---|---|
| committer | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-21 20:21:14 -0500 |
| commit | 13079730acb01df16724d9cc11d9592bc4a10958 (patch) | |
| tree | c301a9ec9e7a1c1d9ef738fc6e8005dbe3b4cc49 | |
| parent | Use some more constants in place of raw numbers (diff) | |
| download | pokeyellow-13079730acb01df16724d9cc11d9592bc4a10958.tar.gz pokeyellow-13079730acb01df16724d9cc11d9592bc4a10958.tar.xz pokeyellow-13079730acb01df16724d9cc11d9592bc4a10958.zip | |
Rename two unused items as `ITEM_XX` like pokecrystal
| -rw-r--r-- | constants/item_constants.asm | 8 | ||||
| -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 |
4 files changed, 11 insertions, 11 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index e25aadba..a7132670 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 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 |