diff options
Diffstat (limited to 'engine/items/items.asm')
| -rwxr-xr-x | engine/items/items.asm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index c996ba96..334eea67 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -114,6 +114,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw UnusableItem ; FLOOR_11F dw UnusableItem ; FLOOR_B4F dw ItemUseEvoStone ; ICE_STONE + dw ItemUseEvoStone ; DEVOLVE_STONE ItemUseBall: ; d687 (3:5687) ld a,[W_ISINBATTLE] @@ -643,9 +644,13 @@ ItemUseEvoStone: ; da5b (3:5a5b) ld a,[wWhichPokemon] push af ld a,[wcf91] + cp DEVOLVE_STONE ld [wEvoStoneItemID],a push af + ld a,DEVO_STONE_PARTY_MENU + jr z, .devolveMenu ld a,EVO_STONE_PARTY_MENU +.devolveMenu ld [wPartyMenuTypeOrMessageID],a ld a,$ff ld [wUpdateSpritesEnabled],a @@ -659,7 +664,14 @@ ItemUseEvoStone: ; da5b (3:5a5b) ld a,SFX_HEAL_AILMENT call PlaySoundWaitForCurrent call WaitForSoundToFinish + ld a, [wPartyMenuTypeOrMessageID] + cp DEVO_STONE_PARTY_MENU + jr z, .devolvePokemon callab TryEvolvingMon ; try to evolve pokemon + jr .doneEvolving +.devolvePokemon + callab DevolvePokemon +.doneEvolving ld a,[wEvolutionOccurred] and a jr z,.noEffect |