diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 20:29:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 20:29:55 -0500 |
| commit | c2a7216d9b8689591ede817015bf96f263396bb8 (patch) | |
| tree | 008635aac62c3fdbb446453d308c2255fb0554d9 /engine/item_effects.asm | |
| parent | 0b8b6f9259bedacad55bb4667de5b2bbe6eafda7 (diff) | |
| parent | c6b12b07b302b82765181b2521e1e0f2ca5f7725 (diff) | |
Merge pull request #424 from roukaour/master
Rename a routine and some maps; remove all code from main.asm
Diffstat (limited to 'engine/item_effects.asm')
| -rw-r--r-- | engine/item_effects.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engine/item_effects.asm b/engine/item_effects.asm index 2d7aa4c69..4db1f3b7d 100644 --- a/engine/item_effects.asm +++ b/engine/item_effects.asm @@ -2147,8 +2147,8 @@ GetHealingItemAmount: ; f395 (3:7395) dbw HYPER_POTION, 200 dbw SUPER_POTION, 50 dbw POTION, 20 - dbw MAX_POTION, 999 - dbw FULL_RESTORE, 999 + dbw MAX_POTION, MAX_STAT_VALUE + dbw FULL_RESTORE, MAX_STAT_VALUE dbw MOOMOO_MILK, 100 dbw BERRY, 10 dbw GOLD_BERRY, 30 @@ -3314,5 +3314,3 @@ GetMthMoveOfCurrentMon: ; f969 add hl, bc ret ; f971 - -INCLUDE "engine/pokeball_wobble.asm" |