aboutsummaryrefslogtreecommitdiffstats
path: root/engine/items
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-03-25 17:39:44 -0500
committerdannye <33dannye@gmail.com>2021-03-25 17:39:44 -0500
commiteb47bda8ee5c1f002236200df36012de9e243a97 (patch)
treefc69fc5435582efebd36fc54414673dd8ac7f646 /engine/items
parentMerge remote-tracking branch 'remotes/pokered/master' (diff)
parentVerify data table and name list sizes with assertion macros (diff)
downloadpokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.gz
pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.xz
pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/items')
-rw-r--r--engine/items/item_effects.asm11
1 files changed, 3 insertions, 8 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 9b584e9b..9d6a3c06 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1417,7 +1417,7 @@ ItemUseMedicine:
ld [hl], a
pop hl
call .recalculateStats
- ld hl, VitaminText
+ ld hl, VitaminStats
ld a, [wcf91]
sub HP_UP - 1
ld c, a
@@ -1563,12 +1563,7 @@ VitaminNoEffectText:
text_far _VitaminNoEffectText
text_end
-VitaminText:
- db "HEALTH@"
- db "ATTACK@"
- db "DEFENSE@"
- db "SPEED@"
- db "SPECIAL@"
+INCLUDE "data/battle/stat_names.asm"
ItemUseBait:
ld hl, ThrewBaitText
@@ -2772,7 +2767,7 @@ GetMaxPP:
dec a
push hl
ld hl, Moves
- ld bc, MoveEnd - Moves
+ ld bc, MOVE_LENGTH
call AddNTimes
ld de, wcd6d
ld a, BANK(Moves)