diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2016-12-27 11:57:05 +1300 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-12-27 11:57:05 +1300 |
| commit | f73893db566c67ee9e1b4b6b309853503351d8ca (patch) | |
| tree | 6b420d9e1ab47f11bf6240b48d237c810f4b6aa1 /engine/items | |
| parent | fde4f79b3ba6a6653b91801e26865155b89a6be0 (diff) | |
Update to latest pokered
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 643fb524..159f3a45 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,7 +1,7 @@ UseItem_: ld a,1 ld [wActionResultOrTookBattleTurn],a ; initialise to success value - ld a,[wcf91] ;contains item_ID + ld a,[wcf91] ;contains item_ID cp a,HM_01 jp nc,ItemUseTMHM ld hl,ItemUsePtrTable @@ -235,7 +235,7 @@ ItemUseBall: ld b,a .skipAilmentValueSubtraction - push bc ; save (Rand1 - Status) + push bc ; save (Rand1 - Status) ; Calculate MaxHP * 255. xor a @@ -990,7 +990,7 @@ ItemUseMedicine: .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm],a ;disable low health alarm - ld [wChannelSoundIDs + CH4],a + ld [wChannelSoundIDs + Ch4],a push hl push de ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1777,7 +1777,7 @@ ItemUsePokeflute: call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + CH6] + ld a,[wChannelSoundIDs + Ch6] and a ; music off? jr nz,.musicWaitLoop .skipMusic @@ -1850,7 +1850,7 @@ PlayedFluteHadEffectText: ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + CH2] + ld a,[wChannelSoundIDs + Ch2] cp a, SFX_POKEFLUE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again |