diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-08-16 07:48:39 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-08-16 07:51:39 -0600 |
| commit | 46f02aaee0fa392c1d2219818982a45dfffb348b (patch) | |
| tree | cfbd402ecb6d399a467bf029b4a142eb145aad07 /items | |
| parent | 439f493aa9335759ed9d82b689ba0cd8f38882b2 (diff) | |
Sync many constant/macro files with pokecrystal.
Diffstat (limited to 'items')
| -rwxr-xr-x | items/item_attributes.asm | 4 | ||||
| -rwxr-xr-x | items/item_effects.asm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/items/item_attributes.asm b/items/item_attributes.asm index 7b02c7f5..14ce8e92 100755 --- a/items/item_attributes.asm +++ b/items/item_attributes.asm @@ -16,7 +16,7 @@ Item2Attributes: item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; BRIGHTPOWDER - item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; GREAT BALL item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE @@ -253,7 +253,7 @@ Item2Attributes: item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; KING'S ROCK - item_attribute 100, HELD_TRADE_EVOLVE, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 100, HELD_FLINCH, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BITTER BERRY item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY diff --git a/items/item_effects.asm b/items/item_effects.asm index 84ff853e..225bf541 100755 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -538,7 +538,7 @@ UltraBall: ; e926 dec a ld [wd005], a ld hl, wPartyMon1Nickname - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH call AddNTimes ld d, h ld e, l @@ -590,7 +590,7 @@ UltraBall: ; e926 call OpenSRAM ld hl, wMonOrItemNameBuffer ld de, sBoxMonNicknames - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH call CopyBytes ld hl, sBoxMonNicknames ld de, wStringBuffer1 @@ -601,7 +601,7 @@ UltraBall: ; e926 call OpenSRAM ld hl, sBoxMonNicknames ld de, wMonOrItemNameBuffer - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH call CopyBytes call CloseSRAM ld hl, Text_SentToBillsPC ; $6e3f |