summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-10-06 18:39:43 -0400
committerGitHub <noreply@github.com>2020-10-06 18:39:43 -0400
commit13f37cf974e8f227db9ee68b2ca7987cf1f509a8 (patch)
treee059372dd361e44dd854fa256c6b8ff5c31f2ad9 /src/data
parentba18f4011abd40e530500867b35716ce3d6dc6aa (diff)
parent65a4e067378b53225536d060d10fa306b6f045c2 (diff)
Merge pull request #1223 from GriffinRichards/constants-misc
Add ITEM6_HEAL constants, change move flags to shifts
Diffstat (limited to 'src/data')
-rw-r--r--src/data/pokemon/item_effects.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index 698d97a43..1ed721e44 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -26,12 +26,12 @@ const u8 gItemEffect_ParalyzeHeal[6] = {
const u8 gItemEffect_FullRestore[7] = {
[3] = ITEM3_STATUS_ALL,
[4] = ITEM4_HEAL_HP,
- [6] = -1,
+ [6] = ITEM6_HEAL_FULL,
};
const u8 gItemEffect_MaxPotion[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = -1,
+ [6] = ITEM6_HEAL_FULL,
};
const u8 gItemEffect_HyperPotion[7] = {
@@ -50,12 +50,12 @@ const u8 gItemEffect_FullHeal[6] = {
const u8 gItemEffect_Revive[7] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
- [6] = -2,
+ [6] = ITEM6_HEAL_HALF,
};
const u8 gItemEffect_MaxRevive[7] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
- [6] = -1,
+ [6] = ITEM6_HEAL_FULL,
};
const u8 gItemEffect_FreshWater[7] = {
@@ -107,7 +107,7 @@ const u8 gItemEffect_HealPowder[9] = {
const u8 gItemEffect_RevivalHerb[10] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = -1,
+ [6] = ITEM6_HEAL_FULL,
[7] = -15,
[8] = -15,
[9] = -20,
@@ -157,7 +157,7 @@ const u8 gItemEffect_BerryJuice[7] = {
const u8 gItemEffect_SacredAsh[7] = {
[0] = ITEM0_SACRED_ASH,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
- [6] = -1,
+ [6] = ITEM6_HEAL_FULL,
};
const u8 gItemEffect_HPUp[10] = {
@@ -206,7 +206,7 @@ const u8 gItemEffect_RareCandy[10] = {
[3] = ITEM3_LEVEL_UP,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = 0xFD,
+ [6] = ITEM6_HEAL_LVL_UP,
[7] = 5,
[8] = 3,
[9] = 2,