diff options
Diffstat (limited to 'battle/effects')
-rwxr-xr-x | battle/effects/attract.asm | 4 | ||||
-rw-r--r-- | battle/effects/thief.asm | 4 | ||||
-rwxr-xr-x | battle/effects/transform.asm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/battle/effects/attract.asm b/battle/effects/attract.asm index f1bc590eb..0a6d7c975 100755 --- a/battle/effects/attract.asm +++ b/battle/effects/attract.asm @@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5 xor a ld [MonType], a - callba GetGender + farcall GetGender jr c, .genderless_samegender ld b, 1 @@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5 ld [TempMonDVs + 1], a ld a, 3 ld [MonType], a - callba GetGender + farcall GetGender pop bc jr c, .genderless_samegender diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index f344edef9..6d32d68d4 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -23,7 +23,7 @@ BattleCommand_Thief: ; 37492 ld [wd265], a ld d, a - callba ItemIsMail + farcall ItemIsMail ret c ld a, [EffectFailed] @@ -71,7 +71,7 @@ BattleCommand_Thief: ; 37492 ld [wd265], a ld d, a - callba ItemIsMail + farcall ItemIsMail ret c ld a, [EffectFailed] diff --git a/battle/effects/transform.asm b/battle/effects/transform.asm index eb80aea8a..65c3f3e60 100755 --- a/battle/effects/transform.asm +++ b/battle/effects/transform.asm @@ -11,7 +11,7 @@ BattleCommand_Transform: ; 371cd jp nz, BattleEffect_ButItFailed xor a ld [wNumHits], a - ld [FXAnimIDHi], a + ld [FXAnimID + 1], a ld a, $1 ld [wKickCounter], a ld a, BATTLE_VARS_SUBSTATUS4 @@ -129,7 +129,7 @@ BattleCommand_Transform: ; 371cd .after_anim xor a ld [wNumHits], a - ld [FXAnimIDHi], a + ld [FXAnimID + 1], a ld a, $2 ld [wKickCounter], a pop af |