ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-30 01:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'battleItemFixes' into battleItemTests

Browse Source
This commit is contained in:
CallmeEchoo 2023-04-24 21:05:58 +02:00
commit e0cae31a13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_2.s
View File

@ -76,7 +76,7 @@ BattleScript_ItemCureStatus::
BattleScript_ItemHealAndCureStatus:: BattleScript_ItemHealAndCureStatus::
call BattleScript_UseItemMessage call BattleScript_UseItemMessage
itemrestorehp itemrestorehp
curestatus BS_ATTACKER itemcurestatus
printstring STRINGID_ITEMRESTOREDSPECIESHEALTH printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT

2
src/data/items.h
View File

@ -526,7 +526,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_PARTY_MENU, .type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_Medicine, .fieldUseFunc = ItemUseOutOfBattle_Medicine,
.battleUsage = EFFECT_ITEM_RESTORE_HP, .battleUsage = EFFECT_ITEM_CURE_STATUS,
.flingPower = 30, .flingPower = 30,
}, },