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 | |
| parent | d8cd991b35d45ef75b06a89b0626381132b34806 (diff) | |
Move some gfx files around, also clock reset fn
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 14 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/battle/core.asm b/battle/core.asm index 25025feb7..f57940db6 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3922,7 +3922,7 @@ TryToRunAwayFromBattle: ; 3d8b3 ld a, [BattleMonItem] ld [wd265], a ld b, a - callab GetItem + callab GetItemHeldEffect ld a, b cp HELD_ESCAPE pop de @@ -4576,9 +4576,9 @@ UseOpponentItem: call RefreshBattleHuds callab GetOpponentItem ld a, [hl] - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetItemName - callab Function27192 + callab ConsumeHeldItem ld hl, RecoveredUsingText jp StdBattleTextBox ; 3ddc8 @@ -4741,7 +4741,7 @@ HandleStatBoostingHeldItems: ; 3de97 push bc ld a, [bc] ld b, a - callab GetItem + callab GetItemHeldEffect ld hl, .StatUpItems .loop ld a, [hli] @@ -5595,7 +5595,7 @@ BattleMenu_Run: ; 3e489 CheckAmuletCoin: ; 3e4a8 ld a, [BattleMonItem] ld b, a - callab GetItem + callab GetItemHeldEffect ld a, b cp HELD_AMULET_COIN ret nz @@ -7247,12 +7247,12 @@ BoostStat: ; 3ed7c Function3ed9f: ; 3ed9f - callab Functionfb4f2 + callab LoadBattleFontsHPBar ret ; 3eda6 Function3eda6: ; 3eda6 - callab Functionfb50d + callab LoadHPBar ret ; 3edad 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 |