diff options
Diffstat (limited to 'engine/items/items.asm')
-rwxr-xr-x | engine/items/items.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index f37f9f47..31426795 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -477,7 +477,7 @@ ItemUseBall: ; d3ad (3:53ad) jp RemoveItemFromInventory .emptyString db "@" - + ItemUseBallText00: ; d697 (3:5697) ;"It dodged the thrown ball!" ;"This pokemon can't be caught" @@ -731,7 +731,7 @@ Func_d85d: ; d85d (3:585d) ld hl, wcd6d .loop ld a, [hli] - and a + and a jr z, .cannotEvolveWithUsedStone inc hl inc hl @@ -902,7 +902,7 @@ ItemUseMedicine: ; d8ae (3:58ae) pop hl pop af ld [wWhichPokemon], a - + ld a,[wIsInBattle] and a jr z,.compareCurrentHPToMaxHP @@ -1380,7 +1380,7 @@ ItemUseMedicine: ; d8ae (3:58ae) xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation],a predef LearnMoveFromLevelUp ; learn level up move, if any - + xor a ld [wForceEvolution],a callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP @@ -1391,7 +1391,7 @@ ItemUseMedicine: ; d8ae (3:58ae) callab Func_2fd6a ; evolve pokemon, if appropriate pop af ld [wWhichPokemon],a - + callab TryEvolvingMon ld a,$01 ld [wUpdateSpritesEnabled],a @@ -1646,7 +1646,7 @@ ItemUseGuardSpec: ; df11 (3:5f11) ld a,[wIsInBattle] and a jp z,ItemUseNotTime - + ld a, [wWhichPokemon] push af ld a, [wPlayerMonNumber] @@ -1654,7 +1654,7 @@ ItemUseGuardSpec: ; df11 (3:5f11) callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM pop af ld [wWhichPokemon], a - + ld hl,wPlayerBattleStatus2 set ProtectedByMist,[hl] ; Mist bit jp PrintItemUseTextAndRemoveItem @@ -1671,7 +1671,7 @@ ItemUseDireHit: ; df42 (3:5f42) ld a,[wIsInBattle] and a jp z,ItemUseNotTime - + ld a, [wWhichPokemon] push af ld a, [wPlayerMonNumber] @@ -1679,7 +1679,7 @@ ItemUseDireHit: ; df42 (3:5f42) callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM pop af ld [wWhichPokemon], a - + ld hl,wPlayerBattleStatus2 set GettingPumped,[hl] ; Focus Energy bit jp PrintItemUseTextAndRemoveItem @@ -1710,7 +1710,7 @@ ItemUseXStat: ; df69 (3:df69) xor a ld [H_WHOSETURN],a ; set turn to player's turn callba StatModifierUpEffect ; do stat increase move - + ld a, [wWhichPokemon] push af ld a, [wPlayerMonNumber] @@ -1718,7 +1718,7 @@ ItemUseXStat: ; df69 (3:df69) callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM pop af ld [wWhichPokemon], a - + pop hl pop af ld [hld],a ; restore [wPlayerMoveEffect] @@ -1964,10 +1964,10 @@ ItemUseSuperRod: ; e130 (3:6130) xor a ld [wRodResponse], a jr DoNotGenerateFishingEncounter - + RodResponse: ; e15b (3:615b) ld [wRodResponse], a - + dec a ; is there a bite? jr nz, DoNotGenerateFishingEncounter ; if yes, store level and species data @@ -2367,7 +2367,7 @@ ItemUseTMHM: ; e374 (3:6374) ld a,b and a ret z - + ld a,[wWhichPokemon] push af ld a,d @@ -2440,7 +2440,7 @@ Func_e4bf: ; e4bf (3:64bf) ld [wActionResultOrTookBattleTurn], a ld hl, DontHavePokemonText jp PrintText - + ThrowBallAtTrainerMon: ; e4ca (3:64ca) call RunDefaultPaletteCommand call LoadScreenTilesFromBuffer1 ; restore saved screen @@ -2505,7 +2505,7 @@ BoxFullCannotThrowBallText: ; e522 (3:6522) DontHavePokemonText: ; e527 (3:6527) TX_FAR _DontHavePokemonText db "@" - + ItemUseText00: ; e52c (3:652c) TX_FAR _ItemUseText001 db $05 |