diff options
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index b40055f04..66788bd6a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1016,7 +1016,7 @@ IgnoreSleepOnly: ; 3451f BattleCommand_UsedMoveText: ; 34541 ; usedmovetext - callba DisplayUsedMoveText + farcall DisplayUsedMoveText ret ; 34548 @@ -1385,14 +1385,14 @@ BattleCommand_Stab: ; 346d2 push hl push de push bc - callba DoWeatherModifiers + farcall DoWeatherModifiers pop bc pop de pop hl push de push bc - callba DoBadgeTypeBoosts + farcall DoBadgeTypeBoosts pop bc pop de @@ -3862,7 +3862,7 @@ BattleCommand_Counter: ; 35813 ret z ld b, a - callab GetMoveEffect + callfar GetMoveEffect ld a, b cp EFFECT_COUNTER ret z @@ -4068,7 +4068,7 @@ BattleCommand_PainSplit: ; 35926 call ResetDamage hlcoord 2, 2 predef AnimateHPBar - callba _UpdateBattleHUDs + farcall _UpdateBattleHUDs ld hl, SharedPainText jp StdBattleTextBox @@ -4518,7 +4518,7 @@ BattleCommand_SleepTalk: ; 35b33 push bc ld b, a - callab GetMoveEffect + callfar GetMoveEffect ld a, b pop bc @@ -4747,7 +4747,7 @@ PlayFXAnimID: ; 35d08 ld c, 3 call DelayFrames - callab PlayBattleAnim + callfar PlayBattleAnim ret @@ -5017,7 +5017,7 @@ BattleCommand_SleepTarget: ; 35e5c ld hl, FellAsleepText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem jp z, OpponentCantMove ret @@ -5094,7 +5094,7 @@ BattleCommand_PoisonTarget: ; 35eee ld hl, WasPoisonedText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret ; 35f2c @@ -5179,7 +5179,7 @@ BattleCommand_Poison: ; 35f2c call StdBattleTextBox .finished - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret .failed @@ -5382,7 +5382,7 @@ BattleCommand_BurnTarget: ; 3608c ld hl, WasBurnedText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret ; 360dd @@ -5455,7 +5455,7 @@ BattleCommand_FreezeTarget: ; 36102 ld hl, WasFrozenText call StdBattleTextBox - callba UseHeldStatusHealingItem + farcall UseHeldStatusHealingItem ret nz call OpponentCantMove @@ -6299,11 +6299,11 @@ BattleCommand_Curl: ; 365a7 BattleCommand_RaiseSubNoAnim: ; 365af - ld hl, GetMonBackpic + ld hl, GetBattleMonBackpic ld a, [hBattleTurn] and a jr z, .PlayerTurn - ld hl, GetMonFrontpic + ld hl, GetEnemyMonFrontpic .PlayerTurn: xor a ld [hBGMapMode], a @@ -6816,7 +6816,7 @@ BattleCommand_ForceSwitch: ; 3680f ld a, d inc a ld [wEnemySwitchMonIndex], a - callab ForceEnemySwitch + callfar ForceEnemySwitch ld hl, DraggedOutText call StdBattleTextBox @@ -8081,7 +8081,7 @@ BattleCommand_LeechSeed: ; 36f9d BattleCommand_Splash: ; 36fe1 call AnimateCurrentMove - callba TrainerRankings_Splash + farcall TrainerRankings_Splash jp PrintNothingHappened ; 36fed @@ -8285,7 +8285,7 @@ BattleCommand_Conversion: ; 3707f inc de ld [de], a ld [wNamedObjectIndexBuffer], a - callba GetTypeName + farcall GetTypeName call AnimateCurrentMove ld hl, TransformedTypeText jp StdBattleTextBox @@ -8608,7 +8608,7 @@ CheckSubstituteOpp: ; 37378 BattleCommand_Selfdestruct: ; 37380 - callba TrainerRankings_Selfdestruct + farcall TrainerRankings_Selfdestruct ld a, BATTLEANIM_PLAYER_DAMAGE ld [wNumHits], a ld c, 3 @@ -8632,8 +8632,8 @@ BattleCommand_Selfdestruct: ; 37380 res SUBSTATUS_DESTINY_BOND, [hl] call _CheckBattleScene ret nc - callba DrawPlayerHUD - callba DrawEnemyHUD + farcall DrawPlayerHUD + farcall DrawEnemyHUD call WaitBGMap jp RefreshBattleHuds @@ -9032,13 +9032,13 @@ BattleCommand_BatonPass: ; 379c9 ; Transition into switchmon menu call LoadStandardMenuDataHeader - callba SetUpBattlePartyMenu_NoLoop + farcall SetUpBattlePartyMenu_NoLoop - callba ForcePickSwitchMonInBattle + farcall ForcePickSwitchMonInBattle ; Return to battle scene call ClearPalettes - callba _LoadBattleFontsHPBar + farcall _LoadBattleFontsHPBar call CloseWindow call ClearSprites hlcoord 1, 0 @@ -9050,7 +9050,7 @@ BattleCommand_BatonPass: ; 379c9 call BatonPass_LinkPlayerSwitch ; Mobile link battles handle entrances differently - callba CheckMobileBattleError + farcall CheckMobileBattleError jp c, EndMoveEffect ld hl, PassedBattleMonEntrance @@ -9075,7 +9075,7 @@ BattleCommand_BatonPass: ; 379c9 call BatonPass_LinkEnemySwitch ; Mobile link battles handle entrances differently - callba CheckMobileBattleError + farcall CheckMobileBattleError jp c, EndMoveEffect ; Passed enemy PartyMon entrance @@ -9403,7 +9403,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e call AnimateCurrentMove call BattleCommand_SwitchTurn - callab RestoreHP + callfar RestoreHP call BattleCommand_SwitchTurn call UpdateUserInParty @@ -9433,7 +9433,7 @@ BattleCommand_HiddenPower: ; 37be8 ld a, [AttackMissed] and a ret nz - callba HiddenPowerDamage + farcall HiddenPowerDamage ret ; 37bf4 @@ -9475,14 +9475,14 @@ BattleCommand_BellyDrum: ; 37c1a and a jr nz, .failed - callab GetHalfMaxHP - callab CheckUserHasEnoughHP + callfar GetHalfMaxHP + callfar CheckUserHasEnoughHP jr nc, .failed push bc call AnimateCurrentMove pop bc - callab SubtractHPFromUser + callfar SubtractHPFromUser call UpdateUserInParty ld a, 5 @@ -9568,7 +9568,7 @@ BattleCommand_MirrorCoat: ; 37c95 ret z ld b, a - callab GetMoveEffect + callfar GetMoveEffect ld a, b cp EFFECT_MIRROR_COAT ret z @@ -9914,7 +9914,7 @@ PlayUserBattleAnim: ; 37e47 push hl push de push bc - callab PlayBattleAnim + callfar PlayBattleAnim pop bc pop de pop hl @@ -9936,7 +9936,7 @@ PlayOpponentBattleAnim: ; 37e54 push bc call BattleCommand_SwitchTurn - callab PlayBattleAnim + callfar PlayBattleAnim call BattleCommand_SwitchTurn pop bc @@ -10035,21 +10035,21 @@ GetMoveByte: ; 37ebb DisappearUser: ; 37ec0 - callba _DisappearUser + farcall _DisappearUser ret ; 37ec7 AppearUserLowerSub: ; 37ec7 - callba _AppearUserLowerSub + farcall _AppearUserLowerSub ret ; 37ece AppearUserRaiseSub: ; 37ece - callba _AppearUserRaiseSub + farcall _AppearUserRaiseSub ret ; 37ed5 @@ -10060,7 +10060,7 @@ _CheckBattleScene: ; 37ed5 push hl push de push bc - callba CheckBattleScene + farcall CheckBattleScene pop bc pop de pop hl |