diff options
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 548b7c81..58d7d016 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -606,7 +606,7 @@ MoveDisabled: ld a, BATTLE_VARS_MOVE call GetBattleVar - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetMoveName ld hl, DisabledMoveText @@ -2192,7 +2192,7 @@ BattleCommand_ApplyDamage: .focus_band_text call GetOpponentItem ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, HungOnText jp StdBattleTextbox @@ -3585,7 +3585,7 @@ UpdateMoveData: ld a, BATTLE_VARS_MOVE call GetBattleVar ld [wCurSpecies], a - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a dec a call GetMoveData @@ -3601,7 +3601,7 @@ BattleCommand_SleepTarget: jr nz, .not_protected_by_item ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, ProtectedByText jr .fail @@ -3739,7 +3739,7 @@ BattleCommand_Poison: cp HELD_PREVENT_POISON jr nz, .do_poison ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld hl, ProtectedByText jr .failed @@ -4785,7 +4785,6 @@ BattleCommand_TriStatusChance: ; tristatuschance call BattleCommand_EffectChance - .loop ; 1/3 chance of each status call BattleRandom @@ -4793,11 +4792,11 @@ BattleCommand_TriStatusChance: and %11 jr z, .loop dec a - ld hl, .ptrs + ld hl, .StatusCommands rst JumpTable ret -.ptrs +.StatusCommands: dw BattleCommand_ParalyzeTarget ; paralyze dw BattleCommand_FreezeTarget ; freeze dw BattleCommand_BurnTarget ; burn @@ -5827,7 +5826,7 @@ BattleCommand_Confuse: cp HELD_PREVENT_CONFUSE jr nz, .no_item_protection ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName call AnimateFailedMove ld hl, ProtectedByText @@ -5917,7 +5916,7 @@ BattleCommand_Paralyze: cp HELD_PREVENT_PARALYZE jr nz, .no_item_protection ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName call AnimateFailedMove ld hl, ProtectedByText |