Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-26 19:11:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1962 from LOuroboros/patch-2

Browse Source 
One more merge conflict rejected
This commit is contained in:
ghoulslash
2021-12-02 13:20:14 -05:00
committed by GitHub
parent 14f974c9a9 e7bef25fb1
commit 0434bf22e6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/hold_effects.h
View File

@@ -62,7 +62,7 @@
#define HOLD_EFFECT_FIRE_POWER 58
#define HOLD_EFFECT_DRAGON_POWER 59
#define HOLD_EFFECT_NORMAL_POWER 60
#define HOLD_EFFECT_UPGRADE 61
#define HOLD_EFFECT_UPGRADE 61
#define HOLD_EFFECT_SHELL_BELL 62
#define HOLD_EFFECT_LUCKY_PUNCH 63
#define HOLD_EFFECT_METAL_POWDER 64