diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-10 11:05:26 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-10 11:05:26 -0500 |
| commit | ba05bfeafec51b183986ecaacd22c718ec21f56a (patch) | |
| tree | 671cb0eda5320b23602bca33e8ff0e8a49c2e37e /battle/effect_commands.asm | |
| parent | d8cd991b35d45ef75b06a89b0626381132b34806 (diff) | |
Move some gfx files around, also clock reset fn
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 1c5d117ca..871518331 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -2996,11 +2996,11 @@ SpeciesItemBoost: ; 353d1 pop hl cp b - jr z, .GetItem + jr z, .GetItemHeldEffect cp c ret nz -.GetItem +.GetItemHeldEffect push hl call GetUserItem ld a, [hl] @@ -9679,7 +9679,7 @@ GetUserItem: ; 37db2 ld hl, EnemyMonItem .go ld b, [hl] - jp GetItem + jp GetItemHeldEffect ; 37dc1 @@ -9692,11 +9692,11 @@ GetOpponentItem: ; 37dc1 ld hl, BattleMonItem .go ld b, [hl] - jp GetItem + jp GetItemHeldEffect ; 37dd0 -GetItem: ; 37dd0 +GetItemHeldEffect: ; 37dd0 ; Return the effect of item b in bc. ld a, b and a |