pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

callba/callab → farcall/callfar

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-24 12:47:30 -05:00
parent d787c66374
commit c66d195089
170 changed files with 1751 additions and 1751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
battle/ai/items.asm
View File

@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000
and a and a
ret nz ret nz
callba CheckEnemyLockedIn farcall CheckEnemyLockedIn
ret nz ret nz
ld a, [PlayerSubStatus5] ld a, [PlayerSubStatus5]
@ -44,7 +44,7 @@ DontSwitch: ; 38041
; 38045 ; 38045
SwitchOften: ; 38045 SwitchOften: ; 38045
callab CheckAbleToSwitch callfar CheckAbleToSwitch
ld a, [wEnemySwitchMonParam] ld a, [wEnemySwitchMonParam]
and $f0 and $f0
jp z, DontSwitch jp z, DontSwitch
@ -80,7 +80,7 @@ SwitchOften: ; 38045
; 38083 ; 38083
SwitchRarely: ; 38083 SwitchRarely: ; 38083
callab CheckAbleToSwitch callfar CheckAbleToSwitch
ld a, [wEnemySwitchMonParam] ld a, [wEnemySwitchMonParam]
and $f0 and $f0
jp z, DontSwitch jp z, DontSwitch
@ -115,7 +115,7 @@ SwitchRarely: ; 38083
; 380c1 ; 380c1
SwitchSometimes: ; 380c1 SwitchSometimes: ; 380c1
callab CheckAbleToSwitch callfar CheckAbleToSwitch
ld a, [wEnemySwitchMonParam] ld a, [wEnemySwitchMonParam]
and $f0 and $f0
jp z, DontSwitch jp z, DontSwitch
@ -358,12 +358,12 @@ AI_Items: ; 39196
ld a, [bc] ld a, [bc]
bit CONTEXT_USE_F, a bit CONTEXT_USE_F, a
jr nz, .CheckHalfOrQuarterHP jr nz, .CheckHalfOrQuarterHP
callab AICheckEnemyHalfHP callfar AICheckEnemyHalfHP
jp c, .DontUse jp c, .DontUse
ld a, [bc] ld a, [bc]
bit UNKNOWN_USE_F, a bit UNKNOWN_USE_F, a
jp nz, .CheckQuarterHP jp nz, .CheckQuarterHP
callab AICheckEnemyQuarterHP callfar AICheckEnemyQuarterHP
jp nc, .UseHealItem jp nc, .UseHealItem
call Random call Random
cp 1 + 50 percent cp 1 + 50 percent
@ -371,7 +371,7 @@ AI_Items: ; 39196
jp .DontUse jp .DontUse
.CheckQuarterHP: ; 38254 (e:4254) .CheckQuarterHP: ; 38254 (e:4254)
callab AICheckEnemyQuarterHP callfar AICheckEnemyQuarterHP
jp c, .DontUse jp c, .DontUse
call Random call Random
cp -1 + 20 percent cp -1 + 20 percent
@ -379,9 +379,9 @@ AI_Items: ; 39196
jr .UseHealItem jr .UseHealItem
.CheckHalfOrQuarterHP: ; 38267 (e:4267) .CheckHalfOrQuarterHP: ; 38267 (e:4267)
callab AICheckEnemyHalfHP callfar AICheckEnemyHalfHP
jp c, .DontUse jp c, .DontUse
callab AICheckEnemyQuarterHP callfar AICheckEnemyQuarterHP
jp nc, .UseHealItem jp nc, .UseHealItem
call Random call Random
cp -1 + 20 percent cp -1 + 20 percent
@ -416,7 +416,7 @@ AI_Items: ; 39196
; 382ae ; 382ae
.asm_382ae ; This appears to be unused .asm_382ae ; This appears to be unused
callab AICheckEnemyMaxHP callfar AICheckEnemyMaxHP
jr c, .dont_use jr c, .dont_use
push bc push bc
ld de, EnemyMonMaxHP + 1 ld de, EnemyMonMaxHP + 1
@ -433,7 +433,7 @@ AI_Items: ; 39196
ld a, c ld a, c
cp b cp b
jp c, .check_50_percent jp c, .check_50_percent
callab AICheckEnemyQuarterHP callfar AICheckEnemyQuarterHP
jr c, .check_40_percent jr c, .check_40_percent
.check_50_percent .check_50_percent
@ -545,7 +545,7 @@ AI_Items: ; 39196
AIUpdateHUD: ; 38387 AIUpdateHUD: ; 38387
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
callba UpdateEnemyHUD farcall UpdateEnemyHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld hl, wEnemyItemState ld hl, wEnemyItemState
@ -705,7 +705,7 @@ AI_Switch: ; 3846c
res SUBSTATUS_RAGE, [hl] res SUBSTATUS_RAGE, [hl]
xor a xor a
ld [hBattleTurn], a ld [hBattleTurn], a
callab PursuitSwitch callfar PursuitSwitch
push af push af
ld a, [CurOTMon] ld a, [CurOTMon]
@ -726,12 +726,12 @@ AI_Switch: ; 3846c
.skiptext .skiptext
ld a, 1 ld a, 1
ld [wBattleHasJustStarted], a ld [wBattleHasJustStarted], a
callab NewEnemyMonStatus callfar NewEnemyMonStatus
callab ResetEnemyStatLevels callfar ResetEnemyStatLevels
ld hl, PlayerSubStatus1 ld hl, PlayerSubStatus1
res SUBSTATUS_IN_LOVE, [hl] res SUBSTATUS_IN_LOVE, [hl]
callba EnemySwitch farcall EnemySwitch
callba ResetBattleParticipants farcall ResetBattleParticipants
xor a xor a
ld [wBattleHasJustStarted], a ld [wBattleHasJustStarted], a
ld a, [wLinkMode] ld a, [wLinkMode]
@ -851,7 +851,7 @@ EnemyUsedXItem:
push bc push bc
call PrintText_UsedItemOn call PrintText_UsedItemOn
pop bc pop bc
callba CheckIfStatCanBeRaised farcall CheckIfStatCanBeRaised
jp AIUpdateHUD jp AIUpdateHUD
; 38568 ; 38568

2
battle/ai/move.asm
View File

@ -12,7 +12,7 @@ AIChooseMove: ; 440ce
ret nz ret nz
; No use picking a move if there's no choice. ; No use picking a move if there's no choice.
callba CheckEnemyLockedIn farcall CheckEnemyLockedIn
ret nz ret nz

4
battle/ai/redundant.asm
View File

@ -141,7 +141,7 @@ AI_Redundant: ; 2c41a
jr .NotRedundant jr .NotRedundant
.Attract: ; 2c4fe .Attract: ; 2c4fe
callba CheckOppositeGender farcall CheckOppositeGender
jr c, .Redundant jr c, .Redundant
ld a, [PlayerSubStatus1] ld a, [PlayerSubStatus1]
bit SUBSTATUS_IN_LOVE, a bit SUBSTATUS_IN_LOVE, a
@ -184,7 +184,7 @@ AI_Redundant: ; 2c41a
.MorningSun: .MorningSun:
.Synthesis: .Synthesis:
.Moonlight: ; 2c539 .Moonlight: ; 2c539
callba AICheckEnemyMaxHP farcall AICheckEnemyMaxHP
jr nc, .NotRedundant jr nc, .NotRedundant
.Teleport: .Teleport:

46
battle/ai/scoring.asm
View File

@ -29,7 +29,7 @@ AI_Basic: ; 38591
push hl push hl
push de push de
push bc push bc
callba AI_Redundant farcall AI_Redundant
pop bc pop bc
pop de pop de
pop hl pop hl
@ -176,7 +176,7 @@ AI_Types: ; 38635
push de push de
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
callab BattleCheckTypeMatchup callfar BattleCheckTypeMatchup
pop de pop de
pop bc pop bc
pop hl pop hl
@ -429,7 +429,7 @@ AI_Smart_LeechHit: ; 387f7
push hl push hl
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
callab BattleCheckTypeMatchup callfar BattleCheckTypeMatchup
pop hl pop hl
; 60% chance to discourage this move if not very effective. ; 60% chance to discourage this move if not very effective.
@ -510,7 +510,7 @@ AI_Smart_LockOn: ; 3881d
push hl push hl
push bc push bc
callba BattleCheckTypeMatchup farcall BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp $a cp $a
pop bc pop bc
@ -572,7 +572,7 @@ AI_Smart_Selfdestruct: ; 388a6
; Unless this is the enemy's last Pokemon... ; Unless this is the enemy's last Pokemon...
push hl push hl
callba FindAliveEnemyMons farcall FindAliveEnemyMons
pop hl pop hl
jr nc, .asm_388b7 jr nc, .asm_388b7
@ -970,7 +970,7 @@ AI_Smart_ForceSwitch: ; 38a2a
; Consider player's type(s) if its moves are unknown. ; Consider player's type(s) if its moves are unknown.
push hl push hl
callab CheckPlayerMoveTypeMatchups callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore] ld a, [wEnemyAISwitchScore]
cp 10 ; neutral cp 10 ; neutral
pop hl pop hl
@ -1368,7 +1368,7 @@ AI_Smart_Mimic: ; 38ba8
ld a, $1 ld a, $1
ld [hBattleTurn], a ld [hBattleTurn], a
callab BattleCheckTypeMatchup callfar BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp $a cp $a
@ -1763,9 +1763,9 @@ AI_Smart_PriorityHit: ; 38d5a
ld a, $1 ld a, $1
ld [hBattleTurn], a ld [hBattleTurn], a
push hl push hl
callab EnemyAttackDamage callfar EnemyAttackDamage
callab BattleCommand_DamageCalc callfar BattleCommand_DamageCalc
callab BattleCommand_Stab callfar BattleCommand_Stab
pop hl pop hl
ld a, [CurDamage + 1] ld a, [CurDamage + 1]
ld c, a ld c, a
@ -1811,7 +1811,7 @@ AI_Smart_Conversion2: ; 38d98
xor a xor a
ld [hBattleTurn], a ld [hBattleTurn], a
callab BattleCheckTypeMatchup callfar BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp $a cp $a
@ -1890,7 +1890,7 @@ AI_Smart_MeanLook: ; 38dfb
; Otherwise, discourage this move unless the player only has not very effective moves against the enemy. ; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
push hl push hl
callab CheckPlayerMoveTypeMatchups callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore] ld a, [wEnemyAISwitchScore]
cp $b ; not very effective cp $b ; not very effective
pop hl pop hl
@ -2008,7 +2008,7 @@ AI_Smart_Curse: ; 38e5c
jp nz, AIDiscourageMove jp nz, AIDiscourageMove
push hl push hl
callba FindAliveEnemyMons farcall FindAliveEnemyMons
pop hl pop hl
jr nc, .asm_38eb0 jr nc, .asm_38eb0
@ -2137,7 +2137,7 @@ AI_Smart_Foresight: ; 38f1d
AI_Smart_PerishSong: ; 38f4a AI_Smart_PerishSong: ; 38f4a
push hl push hl
callab FindAliveEnemyMons callfar FindAliveEnemyMons
pop hl pop hl
jr c, .no jr c, .no
@ -2146,7 +2146,7 @@ AI_Smart_PerishSong: ; 38f4a
jr nz, .yes jr nz, .yes
push hl push hl
callab CheckPlayerMoveTypeMatchups callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore] ld a, [wEnemyAISwitchScore]
cp 10 ; 1.0 cp 10 ; 1.0
pop hl pop hl
@ -2404,7 +2404,7 @@ AI_Smart_BatonPass: ; 39062
; Consider player's type(s) if its moves are unknown. ; Consider player's type(s) if its moves are unknown.
push hl push hl
callab CheckPlayerMoveTypeMatchups callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore] ld a, [wEnemyAISwitchScore]
cp 10 ; neutral cp 10 ; neutral
pop hl pop hl
@ -2466,8 +2466,8 @@ AI_Smart_HiddenPower: ; 3909e
ld [hBattleTurn], a ld [hBattleTurn], a
; Calculate Hidden Power's type and base power based on enemy's DVs. ; Calculate Hidden Power's type and base power based on enemy's DVs.
callab HiddenPowerDamage callfar HiddenPowerDamage
callab BattleCheckTypeMatchup callfar BattleCheckTypeMatchup
pop hl pop hl
; Discourage Hidden Power if not very effective. ; Discourage Hidden Power if not very effective.
@ -3336,13 +3336,13 @@ AIDamageCalc: ; 393e7
ld hl, .ConstantDamageEffects ld hl, .ConstantDamageEffects
call IsInArray call IsInArray
jr nc, .asm_39400 jr nc, .asm_39400
callab BattleCommand_ConstantDamage callfar BattleCommand_ConstantDamage
ret ret
.asm_39400 .asm_39400
callab EnemyAttackDamage callfar EnemyAttackDamage
callab BattleCommand_DamageCalc callfar BattleCommand_DamageCalc
callab BattleCommand_Stab callfar BattleCommand_Stab
ret ret
.ConstantDamageEffects: .ConstantDamageEffects:
@ -3459,7 +3459,7 @@ AI_Status: ; 39453
push de push de
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
callab BattleCheckTypeMatchup callfar BattleCheckTypeMatchup
pop de pop de
pop bc pop bc
pop hl pop hl

14
battle/anim_commands.asm
View File

@ -61,7 +61,7 @@ BattleAnimRunScript: ; cc11c
and a and a
jr nz, .hi_byte jr nz, .hi_byte
callba CheckBattleScene farcall CheckBattleScene
jr c, .disabled jr c, .disabled
call BattleAnimClearHud call BattleAnimClearHud
@ -169,7 +169,7 @@ BattleAnimRestoreHuds: ; cc1bb
ld hl, UpdateBattleHuds ld hl, UpdateBattleHuds
ld a, BANK(UpdatePlayerHUD) ld a, BANK(UpdatePlayerHUD)
rst FarCall ; Why the heck is this a callab? rst FarCall ; Why not "call UpdateBattleHuds"?
pop af pop af
ld [rSVBK], a ld [rSVBK], a
@ -907,7 +907,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
ret ret
BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0) BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0)
callab GetPokeBallWobble callfar GetPokeBallWobble
ld a, c ld a, c
ld [BattleAnimVar], a ld [BattleAnimVar], a
ret ret
@ -1128,11 +1128,11 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750)
and a and a
jr z, .player jr z, .player
callab DropEnemySub callfar DropEnemySub
jr .done jr .done
.player .player
callab DropPlayerSub callfar DropPlayerSub
.done .done
pop af pop af
@ -1221,7 +1221,7 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
call GetBattleAnimByte call GetBattleAnimByte
ld e, a ld e, a
ld d, 0 ld d, 0
callab PlayStereoSFX callfar PlayStereoSFX
ret ret
; cc7f8 (33:47f8) ; cc7f8 (33:47f8)
@ -1311,7 +1311,7 @@ endr
ld a, 1 ld a, 1
ld [wStereoPanningMask], a ld [wStereoPanningMask], a
callab _PlayCryHeader callfar _PlayCryHeader
.done .done
pop af pop af

6
battle/bg_effects.asm
View File

@ -550,7 +550,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
ret ret
_QueueBattleAnimation: ; c82ee (32:42ee) _QueueBattleAnimation: ; c82ee (32:42ee)
callab QueueBattleAnimation callfar QueueBattleAnimation
ret ret
BattleBGEffect_27: ; c82f5 (32:42f5) BattleBGEffect_27: ; c82f5 (32:42f5)
@ -2944,13 +2944,13 @@ BattleBGEffects_CheckSGB: ; c9059 (32:5059)
BattleBGEffects_Sine: ; c905d (32:505d) BattleBGEffects_Sine: ; c905d (32:505d)
ld e, a ld e, a
callab BattleAnim_Sine_e callfar BattleAnim_Sine_e
ld a, e ld a, e
ret ret
BattleBGEffects_Cosine: ; c9066 (32:5066) BattleBGEffects_Cosine: ; c9066 (32:5066)
ld e, a ld e, a
callab BattleAnim_Cosine_e callfar BattleAnim_Cosine_e
ld a, e ld a, e
ret ret

246
battle/core.asm
View File

File diff suppressed because it is too large Load Diff

70
battle/effect_commands.asm
View File

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

4
battle/effects/attract.asm
View File

@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5
xor a xor a
ld [MonType], a ld [MonType], a
callba GetGender farcall GetGender
jr c, .genderless_samegender jr c, .genderless_samegender
ld b, 1 ld b, 1
@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, 3 ld a, 3
ld [MonType], a ld [MonType], a
callba GetGender farcall GetGender
pop bc pop bc
jr c, .genderless_samegender jr c, .genderless_samegender

4
battle/effects/thief.asm
View File

@ -23,7 +23,7 @@ BattleCommand_Thief: ; 37492
ld [wd265], a ld [wd265], a
ld d, a ld d, a
callba ItemIsMail farcall ItemIsMail
ret c ret c
ld a, [EffectFailed] ld a, [EffectFailed]
@ -71,7 +71,7 @@ BattleCommand_Thief: ; 37492
ld [wd265], a ld [wd265], a
ld d, a ld d, a
callba ItemIsMail farcall ItemIsMail
ret c ret c
ld a, [EffectFailed] ld a, [EffectFailed]

2
battle/hidden_power.asm
View File

@ -104,7 +104,7 @@ HiddenPowerDamage: ; fbced
; based on the new type, but keep base power. ; based on the new type, but keep base power.
ld a, d ld a, d
push af push af
callba BattleCommand_DamageStats ; damagestats farcall BattleCommand_DamageStats ; damagestats
pop af pop af
ld d, a ld d, a
ret ret

2
battle/link_result.asm
View File

@ -1,5 +1,5 @@
DetermineLinkBattleResult: ; 2b930 DetermineLinkBattleResult: ; 2b930
callba UpdateEnemyMonInParty farcall UpdateEnemyMonInParty
ld hl, PartyMon1HP ld hl, PartyMon1HP
call .CountMonsRemaining call .CountMonsRemaining
push bc push bc

4
battle/misc.asm
View File

@ -13,11 +13,11 @@ _DisappearUser: ; fbd54
jr FinishAppearDisappearUser jr FinishAppearDisappearUser
_AppearUserRaiseSub: ; fbd69 (3e:7d69) _AppearUserRaiseSub: ; fbd69 (3e:7d69)
callba BattleCommand_RaiseSubNoAnim farcall BattleCommand_RaiseSubNoAnim
jr AppearUser jr AppearUser
_AppearUserLowerSub: ; fbd71 (3e:7d71) _AppearUserLowerSub: ; fbd71 (3e:7d71)
callba BattleCommand_LowerSubNoAnim farcall BattleCommand_LowerSubNoAnim
AppearUser: ; fbd77 (3e:7d77) AppearUser: ; fbd77 (3e:7d77)
xor a xor a

4
battle/objects/engine.asm
View File

@ -302,13 +302,13 @@ GetBattleAnimTileOffset: ; ccb31 (33:4b31)
ret ret
_ExecuteBGEffects: ; ccb48 _ExecuteBGEffects: ; ccb48
callab ExecuteBGEffects callfar ExecuteBGEffects
ret ret
; ccb4f ; ccb4f
_QueueBGEffect: ; ccb4f (33:4b4f) _QueueBGEffect: ; ccb4f (33:4b4f)
callab QueueBGEffect callfar QueueBGEffect
ret ret
; ccb56 (33:4b56) ; ccb56 (33:4b56)

2
battle/trainer_huds.asm
View File

@ -259,7 +259,7 @@ _ShowLinkBattleParticipants: ; 2c1b2
ld a, "<BOLD_V>" ld a, "<BOLD_V>"
ld [hli], a ld [hli], a
ld [hl], "<BOLD_S>" ld [hl], "<BOLD_S>"
callba LinkBattle_TrainerHuds ; no need to callba farcall LinkBattle_TrainerHuds ; no need to farcall
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes

2
battle/used_move_text.asm
View File

@ -32,7 +32,7 @@ UsedMoveText: ; 105db9
ld [wd265], a ld [wd265], a
push hl push hl
callba CheckUserIsCharging farcall CheckUserIsCharging
pop hl pop hl
jr nz, .grammar jr nz, .grammar

2
data/items/item_descriptions.asm
View File

@ -7,7 +7,7 @@ PrintItemDescription: ; 0x1c8955
ld [CurItem], a ld [CurItem], a
push de push de
callba GetTMHMItemMove farcall GetTMHMItemMove
pop hl pop hl
ld a, [wd265] ld a, [wd265]
ld [CurSpecies], a ld [CurSpecies], a

2
engine/anim_hp_bar.asm
View File

@ -293,7 +293,7 @@ HPBarAnim_PaletteUpdate: ; d7b4
call SetHPPal call SetHPPal
ld a, [wCurHPAnimPal] ld a, [wCurHPAnimPal]
ld c, a ld c, a
callba ApplyHPBarPals farcall ApplyHPBarPals
ret ret
; d7c9 ; d7c9

10
engine/battle_transition.asm
View File

@ -56,7 +56,7 @@ Predef_StartBattle: ; 8c20f
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
jr z, .mobile jr z, .mobile
callba ReanchorBGMap_NoOAMUpdate farcall ReanchorBGMap_NoOAMUpdate
call UpdateSprites call UpdateSprites
call DelayFrame call DelayFrame
call .NonMobile_LoadPokeballTiles call .NonMobile_LoadPokeballTiles
@ -297,7 +297,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
; 8c3e8 ; 8c3e8
StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8) StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
callba Function5602 farcall Function5602
ld a, $5 ; BANK(LYOverrides) ld a, $5 ; BANK(LYOverrides)
ld [rSVBK], a ld [rSVBK], a
@ -355,7 +355,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
ret ret
StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d) StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
callba Function5602 farcall Function5602
ld a, $5 ; BANK(LYOverrides) ld a, $5 ; BANK(LYOverrides)
ld [rSVBK], a ld [rSVBK], a
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
@ -497,7 +497,7 @@ ENDM
; 8c578 ; 8c578
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578) StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
callba Function5602 farcall Function5602
ld a, $5 ; BANK(LYOverrides) ld a, $5 ; BANK(LYOverrides)
ld [rSVBK], a ld [rSVBK], a
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
@ -797,7 +797,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
; 8c768 ; 8c768
StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
callba Function5602 farcall Function5602
ld de, .boxes ld de, .boxes
.loop .loop

42
engine/billspc.asm
View File

@ -208,7 +208,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
ld [CurPartyMon], a ld [CurPartyMon], a
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
call ReleasePKMN_ByePKMN call ReleasePKMN_ByePKMN
ld a, $0 ld a, $0
ld [wJumptableIndex], a ld [wJumptableIndex], a
@ -472,7 +472,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
ld [CurPartyMon], a ld [CurPartyMon], a
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
call ReleasePKMN_ByePKMN call ReleasePKMN_ByePKMN
ld a, $0 ld a, $0
ld [wJumptableIndex], a ld [wJumptableIndex], a
@ -1125,7 +1125,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
callba GetGender farcall GetGender
jr c, .skip_gender jr c, .skip_gender
ld a, "♂" ld a, "♂"
jr nz, .printgender jr nz, .printgender
@ -1140,7 +1140,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ret z ret z
ld d, a ld d, a
callab ItemIsMail callfar ItemIsMail
jr c, .mail jr c, .mail
ld a, $5d ; item icon ld a, $5d ; item icon
jr .printitem jr .printitem
@ -1656,7 +1656,7 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18)
ld hl, wBillsPC_ScrollPosition ld hl, wBillsPC_ScrollPosition
add [hl] add [hl]
ld [CurPartyMon], a ld [CurPartyMon], a
callba CheckCurPartyMonFainted farcall CheckCurPartyMonFainted
jr c, .AllOthersFainted jr c, .AllOthersFainted
ld a, [wBillsPC_MonHasMail] ld a, [wBillsPC_MonHasMail]
and a and a
@ -1773,7 +1773,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
callba CalcwBufferMonStats farcall CalcwBufferMonStats
ret ret
.party .party
@ -1816,7 +1816,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call CopyMonToTemp call CopyMonToTemp
call CloseSRAM call CloseSRAM
callba CalcwBufferMonStats farcall CalcwBufferMonStats
ret ret
DepositPokemon: ; e307c (38:707c) DepositPokemon: ; e307c (38:707c)
@ -1833,7 +1833,7 @@ DepositPokemon: ; e307c (38:707c)
jr c, .asm_boxisfull jr c, .asm_boxisfull
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayCry
hlcoord 0, 0 hlcoord 0, 0
@ -1888,7 +1888,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
jr c, .PartyFull jr c, .PartyFull
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayCry
hlcoord 0, 0 hlcoord 0, 0
@ -2020,7 +2020,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
.dw_return ; e322a .dw_return ; e322a
pop af pop af
ld e, a ld e, a
callba MovePkmnWOMail_InsertMon_SaveGame farcall MovePkmnWOMail_InsertMon_SaveGame
ret ret
; e3233 ; e3233
@ -2056,7 +2056,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
call .CopyFromParty call .CopyFromParty
ld a, $1 ld a, $1
ld [wGameLogicPaused], a ld [wGameLogicPaused], a
callba SaveGameData farcall SaveGameData
xor a xor a
ld [wGameLogicPaused], a ld [wGameLogicPaused], a
call .CopyToBox call .CopyToBox
@ -2106,7 +2106,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld a, [wBillsPC_BackupLoadedBox] ld a, [wBillsPC_BackupLoadedBox]
dec a dec a
ld e, a ld e, a
callba MovePkmnWOMail_SaveGame farcall MovePkmnWOMail_SaveGame
ld a, [wBillsPC_BackupCursorPosition] ld a, [wBillsPC_BackupCursorPosition]
ld hl, wBillsPC_BackupScrollPosition ld hl, wBillsPC_BackupScrollPosition
add [hl] add [hl]
@ -2123,10 +2123,10 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call CopyMonToTemp call CopyMonToTemp
call CloseSRAM call CloseSRAM
callba CalcwBufferMonStats farcall CalcwBufferMonStats
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
ret ret
; e32fa ; e32fa
@ -2134,12 +2134,12 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld a, [wBillsPC_LoadedBox] ld a, [wBillsPC_LoadedBox]
dec a dec a
ld e, a ld e, a
callba MovePkmnWOMail_SaveGame farcall MovePkmnWOMail_SaveGame
ld a, [wBillsPC_CursorPosition] ld a, [wBillsPC_CursorPosition]
ld hl, wBillsPC_ScrollPosition ld hl, wBillsPC_ScrollPosition
add [hl] add [hl]
ld [CurPartyMon], a ld [CurPartyMon], a
callba InsertPokemonIntoBox farcall InsertPokemonIntoBox
ret ret
; e3316 ; e3316
@ -2159,7 +2159,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
call CopyMonToTemp call CopyMonToTemp
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
ret ret
; e3346 ; e3346
@ -2168,7 +2168,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld hl, wBillsPC_ScrollPosition ld hl, wBillsPC_ScrollPosition
add [hl] add [hl]
ld [CurPartyMon], a ld [CurPartyMon], a
callba InsertPokemonIntoParty farcall InsertPokemonIntoParty
ret ret
; e3357 ; e3357
@ -2523,7 +2523,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
ld a, [MenuSelection] ld a, [MenuSelection]
dec a dec a
ld c, a ld c, a
callba PrintPCBox farcall PrintPCBox
call BillsPC_ClearTilemap call BillsPC_ClearTilemap
and a and a
ret ret
@ -2540,13 +2540,13 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
ld a, [wCurBox] ld a, [wCurBox]
cp e cp e
ret z ret z
callba ChangeBoxSaveGame farcall ChangeBoxSaveGame
ret ret
.Name: .Name:
ld b, $4 ; box ld b, $4 ; box
ld de, wd002 ld de, wd002
callba NamingScreen farcall NamingScreen
call ClearTileMap call ClearTileMap
call LoadStandardFont call LoadStandardFont
call LoadFontsBattleExtra call LoadFontsBattleExtra

Some files were not shown because too many files have changed in this diff Show More