ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1320 from amiosi/item_expansion

Browse Source 
update item effects, prices, names & descriptions
This commit is contained in:
ExpoSeed 2021-01-28 12:15:11 -06:00 committed by GitHub
commit 857fc9ce95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 706 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

641
src/data/items.h
View File

File diff suppressed because it is too large Load Diff

14
src/data/pokemon/item_effects.h
View File

@ -36,12 +36,12 @@ const u8 gItemEffect_MaxPotion[7] = {
const u8 gItemEffect_HyperPotion[7] = { const u8 gItemEffect_HyperPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 200, [6] = 120,
}; };
const u8 gItemEffect_SuperPotion[7] = { const u8 gItemEffect_SuperPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 50, [6] = 60,
}; };
const u8 gItemEffect_FullHeal[6] = { const u8 gItemEffect_FullHeal[6] = {
@ -60,17 +60,17 @@ const u8 gItemEffect_MaxRevive[7] = {
const u8 gItemEffect_FreshWater[7] = { const u8 gItemEffect_FreshWater[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 50, [6] = 30,
}; };
const u8 gItemEffect_SodaPop[7] = { const u8 gItemEffect_SodaPop[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 60, [6] = 50,
}; };
const u8 gItemEffect_Lemonade[7] = { const u8 gItemEffect_Lemonade[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 80, [6] = 70,
}; };
const u8 gItemEffect_MoomooMilk[7] = { const u8 gItemEffect_MoomooMilk[7] = {
@ -81,7 +81,7 @@ const u8 gItemEffect_MoomooMilk[7] = {
const u8 gItemEffect_EnergyPowder[10] = { const u8 gItemEffect_EnergyPowder[10] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 50, [6] = 60,
[7] = -5, [7] = -5,
[8] = -5, [8] = -5,
[9] = -10, [9] = -10,
@ -90,7 +90,7 @@ const u8 gItemEffect_EnergyPowder[10] = {
const u8 gItemEffect_EnergyRoot[10] = { const u8 gItemEffect_EnergyRoot[10] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 200, [6] = 120,
[7] = -10, [7] = -10,
[8] = -10, [8] = -10,
[9] = -15, [9] = -15,

750
src/data/text/item_descriptions.h
View File

File diff suppressed because it is too large Load Diff