pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant comments referencing labels (#921)

Browse Source
This commit is contained in:
vulcandth 2022-06-06 16:34:54 -05:00 committed by GitHub
parent 3648afda16
commit 73c020074e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 3 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
engine/battle/effect_commands.asm
View File

@ -109,8 +109,6 @@ DoMove:
CheckTurn: CheckTurn:
BattleCommand_CheckTurn: BattleCommand_CheckTurn:
; checkturn
; Repurposed as hardcoded turn handling. Useless as a command. ; Repurposed as hardcoded turn handling. Useless as a command.
; Move $ff immediately ends the turn. ; Move $ff immediately ends the turn.
@ -631,8 +629,6 @@ HitConfusion:
jp BattleCommand_RaiseSub jp BattleCommand_RaiseSub
BattleCommand_CheckObedience: BattleCommand_CheckObedience:
; checkobedience
; Enemy can't disobey ; Enemy can't disobey
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -942,7 +938,6 @@ IgnoreSleepOnly:
ret ret
BattleCommand_UsedMoveText: BattleCommand_UsedMoveText:
; usedmovetext
farcall DisplayUsedMoveText farcall DisplayUsedMoveText
ret ret
@ -1123,8 +1118,6 @@ CheckMimicUsed:
ret ret
BattleCommand_Critical: BattleCommand_Critical:
; critical
; Determine whether this attack's hit will be critical. ; Determine whether this attack's hit will be critical.
xor a xor a
@ -1505,8 +1498,6 @@ INCLUDE "engine/battle/ai/switch.asm"
INCLUDE "data/types/type_matchups.asm" INCLUDE "data/types/type_matchups.asm"
BattleCommand_DamageVariation: BattleCommand_DamageVariation:
; damagevariation
; Modify the damage spread between 85% and 100%. ; Modify the damage spread between 85% and 100%.
; Because of the method of division the probability distribution ; Because of the method of division the probability distribution
@ -1557,8 +1548,6 @@ BattleCommand_DamageVariation:
ret ret
BattleCommand_CheckHit: BattleCommand_CheckHit:
; checkhit
call .DreamEater call .DreamEater
jp z, .Miss jp z, .Miss
@ -1864,8 +1853,6 @@ BattleCommand_CheckHit:
INCLUDE "data/battle/accuracy_multipliers.asm" INCLUDE "data/battle/accuracy_multipliers.asm"
BattleCommand_EffectChance: BattleCommand_EffectChance:
; effectchance
xor a xor a
ld [wEffectFailed], a ld [wEffectFailed], a
call CheckSubstituteOpp call CheckSubstituteOpp
@ -1893,8 +1880,6 @@ BattleCommand_EffectChance:
ret ret
BattleCommand_LowerSub: BattleCommand_LowerSub:
; lowersub
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVar call GetBattleVar
bit SUBSTATUS_SUBSTITUTE, a bit SUBSTATUS_SUBSTITUTE, a
@ -1961,7 +1946,6 @@ BattleCommand_LowerSub:
ret ret
BattleCommand_MoveAnim: BattleCommand_MoveAnim:
; moveanim
call BattleCommand_LowerSub call BattleCommand_LowerSub
call BattleCommand_MoveAnimNoSub call BattleCommand_MoveAnimNoSub
jp BattleCommand_RaiseSub jp BattleCommand_RaiseSub
@ -2062,16 +2046,12 @@ BattleCommand_StatUpDownAnim:
jp PlayFXAnimID jp PlayFXAnimID
BattleCommand_SwitchTurn: BattleCommand_SwitchTurn:
; switchturn
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
xor 1 xor 1
ldh [hBattleTurn], a ldh [hBattleTurn], a
ret ret
BattleCommand_RaiseSub: BattleCommand_RaiseSub:
; raisesub
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVar call GetBattleVar
bit SUBSTATUS_SUBSTITUTE, a bit SUBSTATUS_SUBSTITUTE, a
@ -2089,7 +2069,6 @@ BattleCommand_RaiseSub:
jp LoadAnim jp LoadAnim
BattleCommand_FailureText: BattleCommand_FailureText:
; failuretext
; If the move missed or failed, load the appropriate ; If the move missed or failed, load the appropriate
; text, and end the effects of multi-turn or multi- ; text, and end the effects of multi-turn or multi-
; hit moves. ; hit moves.
@ -2131,8 +2110,6 @@ BattleCommand_FailureText:
jp EndMoveEffect jp EndMoveEffect
BattleCommand_ApplyDamage: BattleCommand_ApplyDamage:
; applydamage
ld a, BATTLE_VARS_SUBSTATUS1_OPP ld a, BATTLE_VARS_SUBSTATUS1_OPP
call GetBattleVar call GetBattleVar
bit SUBSTATUS_ENDURE, a bit SUBSTATUS_ENDURE, a
@ -2301,7 +2278,6 @@ BattleCommand_BideFailText:
jp PrintButItFailed jp PrintButItFailed
BattleCommand_CriticalText: BattleCommand_CriticalText:
; criticaltext
; Prints the message for critical hits or one-hit KOs. ; Prints the message for critical hits or one-hit KOs.
; If there is no message to be printed, wait 20 frames. ; If there is no message to be printed, wait 20 frames.
@ -2332,8 +2308,6 @@ BattleCommand_CriticalText:
dw OneHitKOText dw OneHitKOText
BattleCommand_StartLoop: BattleCommand_StartLoop:
; startloop
ld hl, wPlayerRolloutCount ld hl, wPlayerRolloutCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -2345,8 +2319,6 @@ BattleCommand_StartLoop:
ret ret
BattleCommand_SuperEffectiveLoopText: BattleCommand_SuperEffectiveLoopText:
; supereffectivelooptext
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr call GetBattleVarAddr
bit SUBSTATUS_IN_LOOP, a bit SUBSTATUS_IN_LOOP, a
@ -2355,8 +2327,6 @@ BattleCommand_SuperEffectiveLoopText:
; fallthrough ; fallthrough
BattleCommand_SuperEffectiveText: BattleCommand_SuperEffectiveText:
; supereffectivetext
ld a, [wTypeModifier] ld a, [wTypeModifier]
and $7f and $7f
cp EFFECTIVE cp EFFECTIVE
@ -2368,8 +2338,6 @@ BattleCommand_SuperEffectiveText:
jp StdBattleTextbox jp StdBattleTextbox
BattleCommand_CheckFaint: BattleCommand_CheckFaint:
; checkfaint
; Faint the opponent if its HP reached zero ; Faint the opponent if its HP reached zero
; and faint the user along with it if it used Destiny Bond. ; and faint the user along with it if it used Destiny Bond.
; Ends the move effect if the opponent faints. ; Ends the move effect if the opponent faints.
@ -2457,8 +2425,6 @@ BattleCommand_CheckFaint:
jp EndMoveEffect jp EndMoveEffect
BattleCommand_BuildOpponentRage: BattleCommand_BuildOpponentRage:
; buildopponentrage
jp .start jp .start
.start .start
@ -2488,8 +2454,6 @@ BattleCommand_BuildOpponentRage:
jp BattleCommand_SwitchTurn jp BattleCommand_SwitchTurn
BattleCommand_RageDamage: BattleCommand_RageDamage:
; ragedamage
ld a, [wCurDamage] ld a, [wCurDamage]
ld h, a ld h, a
ld b, a ld b, a
@ -2563,8 +2527,6 @@ DittoMetalPowder:
ret ret
BattleCommand_DamageStats: BattleCommand_DamageStats:
; damagestats
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jp nz, EnemyAttackDamage jp nz, EnemyAttackDamage
@ -2895,7 +2857,6 @@ EnemyAttackDamage:
INCLUDE "engine/battle/move_effects/beat_up.asm" INCLUDE "engine/battle/move_effects/beat_up.asm"
BattleCommand_ClearMissDamage: BattleCommand_ClearMissDamage:
; clearmissdamage
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
ret z ret z
@ -2939,8 +2900,6 @@ HitSelfInConfusion:
ret ret
BattleCommand_DamageCalc: BattleCommand_DamageCalc:
; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b. ; Return a damage value for move power d, player level e, enemy defense c and player attack b.
; Return 1 if successful, else 0. ; Return 1 if successful, else 0.
@ -3175,8 +3134,6 @@ DEF DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
INCLUDE "data/types/type_boost_items.asm" INCLUDE "data/types/type_boost_items.asm"
BattleCommand_ConstantDamage: BattleCommand_ConstantDamage:
; constantdamage
ld hl, wBattleMonLevel ld hl, wBattleMonLevel
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -3349,7 +3306,6 @@ INCLUDE "engine/battle/move_effects/lock_on.asm"
INCLUDE "engine/battle/move_effects/sketch.asm" INCLUDE "engine/battle/move_effects/sketch.asm"
BattleCommand_DefrostOpponent: BattleCommand_DefrostOpponent:
; defrostopponent
; Thaw the opponent if frozen, and ; Thaw the opponent if frozen, and
; raise the user's Attack one stage. ; raise the user's Attack one stage.
@ -3616,8 +3572,6 @@ UpdateMoveData:
jp CopyName1 jp CopyName1
BattleCommand_SleepTarget: BattleCommand_SleepTarget:
; sleeptarget
call GetOpponentItem call GetOpponentItem
ld a, b ld a, b
cp HELD_PREVENT_SLEEP cp HELD_PREVENT_SLEEP
@ -3715,8 +3669,6 @@ BattleCommand_SleepTarget:
ret ret
BattleCommand_PoisonTarget: BattleCommand_PoisonTarget:
; poisontarget
call CheckSubstituteOpp call CheckSubstituteOpp
ret nz ret nz
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
@ -3750,8 +3702,6 @@ BattleCommand_PoisonTarget:
ret ret
BattleCommand_Poison: BattleCommand_Poison:
; poison
ld hl, DoesntAffectText ld hl, DoesntAffectText
ld a, [wTypeModifier] ld a, [wTypeModifier]
and $7f and $7f
@ -3878,13 +3828,11 @@ PoisonOpponent:
jp UpdateOpponentInParty jp UpdateOpponentInParty
BattleCommand_DrainTarget: BattleCommand_DrainTarget:
; draintarget
call SapHealth call SapHealth
ld hl, SuckedHealthText ld hl, SuckedHealthText
jp StdBattleTextbox jp StdBattleTextbox
BattleCommand_EatDream: BattleCommand_EatDream:
; eatdream
call SapHealth call SapHealth
ld hl, DreamEatenText ld hl, DreamEatenText
jp StdBattleTextbox jp StdBattleTextbox
@ -3983,8 +3931,6 @@ SapHealth:
jp UpdateBattleMonInParty jp UpdateBattleMonInParty
BattleCommand_BurnTarget: BattleCommand_BurnTarget:
; burntarget
xor a xor a
ld [wNumHits], a ld [wNumHits], a
call CheckSubstituteOpp call CheckSubstituteOpp
@ -4049,8 +3995,6 @@ Defrost:
jp StdBattleTextbox jp StdBattleTextbox
BattleCommand_FreezeTarget: BattleCommand_FreezeTarget:
; freezetarget
xor a xor a
ld [wNumHits], a ld [wNumHits], a
call CheckSubstituteOpp call CheckSubstituteOpp
@ -4102,8 +4046,6 @@ BattleCommand_FreezeTarget:
ret ret
BattleCommand_ParalyzeTarget: BattleCommand_ParalyzeTarget:
; paralyzetarget
xor a xor a
ld [wNumHits], a ld [wNumHits], a
call CheckSubstituteOpp call CheckSubstituteOpp
@ -4138,77 +4080,62 @@ BattleCommand_ParalyzeTarget:
jp CallBattleCore jp CallBattleCore
BattleCommand_AttackUp: BattleCommand_AttackUp:
; attackup
ld b, ATTACK ld b, ATTACK
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_DefenseUp: BattleCommand_DefenseUp:
; defenseup
ld b, DEFENSE ld b, DEFENSE
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_SpeedUp: BattleCommand_SpeedUp:
; speedup
ld b, SPEED ld b, SPEED
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_SpecialAttackUp: BattleCommand_SpecialAttackUp:
; specialattackup
ld b, SP_ATTACK ld b, SP_ATTACK
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_SpecialDefenseUp: BattleCommand_SpecialDefenseUp:
; specialdefenseup
ld b, SP_DEFENSE ld b, SP_DEFENSE
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_AccuracyUp: BattleCommand_AccuracyUp:
; accuracyup
ld b, ACCURACY ld b, ACCURACY
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_EvasionUp: BattleCommand_EvasionUp:
; evasionup
ld b, EVASION ld b, EVASION
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_AttackUp2: BattleCommand_AttackUp2:
; attackup2
ld b, $10 | ATTACK ld b, $10 | ATTACK
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_DefenseUp2: BattleCommand_DefenseUp2:
; defenseup2
ld b, $10 | DEFENSE ld b, $10 | DEFENSE
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_SpeedUp2: BattleCommand_SpeedUp2:
; speedup2
ld b, $10 | SPEED ld b, $10 | SPEED
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_SpecialAttackUp2: BattleCommand_SpecialAttackUp2:
; specialattackup2
ld b, $10 | SP_ATTACK ld b, $10 | SP_ATTACK
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_SpecialDefenseUp2: BattleCommand_SpecialDefenseUp2:
; specialdefenseup2
ld b, $10 | SP_DEFENSE ld b, $10 | SP_DEFENSE
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_AccuracyUp2: BattleCommand_AccuracyUp2:
; accuracyup2
ld b, $10 | ACCURACY ld b, $10 | ACCURACY
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_EvasionUp2: BattleCommand_EvasionUp2:
; evasionup2
ld b, $10 | EVASION ld b, $10 | EVASION
jr BattleCommand_StatUp jr BattleCommand_StatUp
BattleCommand_StatUp: BattleCommand_StatUp:
; statup
call RaiseStat call RaiseStat
ld a, [wFailedMessage] ld a, [wFailedMessage]
and a and a
@ -4339,77 +4266,61 @@ MinimizeDropSub:
jp BattleCommand_MoveDelay jp BattleCommand_MoveDelay
BattleCommand_AttackDown: BattleCommand_AttackDown:
; attackdown
ld a, ATTACK ld a, ATTACK
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_DefenseDown: BattleCommand_DefenseDown:
; defensedown
ld a, DEFENSE ld a, DEFENSE
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_SpeedDown: BattleCommand_SpeedDown:
; speeddown
ld a, SPEED ld a, SPEED
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_SpecialAttackDown: BattleCommand_SpecialAttackDown:
; specialattackdown
ld a, SP_ATTACK ld a, SP_ATTACK
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_SpecialDefenseDown: BattleCommand_SpecialDefenseDown:
; specialdefensedown
ld a, SP_DEFENSE ld a, SP_DEFENSE
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_AccuracyDown: BattleCommand_AccuracyDown:
; accuracydown
ld a, ACCURACY ld a, ACCURACY
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_EvasionDown: BattleCommand_EvasionDown:
; evasiondown
ld a, EVASION ld a, EVASION
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_AttackDown2: BattleCommand_AttackDown2:
; attackdown2
ld a, $10 | ATTACK ld a, $10 | ATTACK
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_DefenseDown2: BattleCommand_DefenseDown2:
; defensedown2
ld a, $10 | DEFENSE ld a, $10 | DEFENSE
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_SpeedDown2: BattleCommand_SpeedDown2:
; speeddown2
ld a, $10 | SPEED ld a, $10 | SPEED
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_SpecialAttackDown2: BattleCommand_SpecialAttackDown2:
; specialattackdown2
ld a, $10 | SP_ATTACK ld a, $10 | SP_ATTACK
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_SpecialDefenseDown2: BattleCommand_SpecialDefenseDown2:
; specialdefensedown2
ld a, $10 | SP_DEFENSE ld a, $10 | SP_DEFENSE
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_AccuracyDown2: BattleCommand_AccuracyDown2:
; accuracydown2
ld a, $10 | ACCURACY ld a, $10 | ACCURACY
jr BattleCommand_StatDown jr BattleCommand_StatDown
BattleCommand_EvasionDown2: BattleCommand_EvasionDown2:
; evasiondown2
ld a, $10 | EVASION ld a, $10 | EVASION
BattleCommand_StatDown: BattleCommand_StatDown:
; statdown
ld [wLoweredStat], a ld [wLoweredStat], a
call CheckMist call CheckMist
@ -4659,7 +4570,6 @@ TryLowerStat:
ret ret
BattleCommand_StatUpFailText: BattleCommand_StatUpFailText:
; statupfailtext
ld a, [wFailedMessage] ld a, [wFailedMessage]
and a and a
ret z ret z
@ -4677,7 +4587,6 @@ BattleCommand_StatUpFailText:
jp StdBattleTextbox jp StdBattleTextbox
BattleCommand_StatDownFailText: BattleCommand_StatDownFailText:
; statdownfailtext
ld a, [wFailedMessage] ld a, [wFailedMessage]
and a and a
ret z ret z
@ -4719,8 +4628,6 @@ INCLUDE "data/battle/stat_names.asm"
INCLUDE "data/battle/stat_multipliers.asm" INCLUDE "data/battle/stat_multipliers.asm"
BattleCommand_AllStatsUp: BattleCommand_AllStatsUp:
; allstatsup
; Attack ; Attack
call ResetMiss call ResetMiss
call BattleCommand_AttackUp call BattleCommand_AttackUp
@ -4823,8 +4730,6 @@ LowerStat:
ret ret
BattleCommand_TriStatusChance: BattleCommand_TriStatusChance:
; tristatuschance
call BattleCommand_EffectChance call BattleCommand_EffectChance
.loop .loop
; 1/3 chance of each status ; 1/3 chance of each status
@ -4843,7 +4748,6 @@ BattleCommand_TriStatusChance:
dw BattleCommand_BurnTarget ; burn dw BattleCommand_BurnTarget ; burn
BattleCommand_Curl: BattleCommand_Curl:
; curl
ld a, BATTLE_VARS_SUBSTATUS2 ld a, BATTLE_VARS_SUBSTATUS2
call GetBattleVarAddr call GetBattleVarAddr
set SUBSTATUS_CURLED, [hl] set SUBSTATUS_CURLED, [hl]
@ -4984,8 +4888,6 @@ CalcBattleStats:
INCLUDE "engine/battle/move_effects/bide.asm" INCLUDE "engine/battle/move_effects/bide.asm"
BattleCommand_CheckRampage: BattleCommand_CheckRampage:
; checkrampage
ld de, wPlayerRolloutCount ld de, wPlayerRolloutCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -5021,8 +4923,6 @@ BattleCommand_CheckRampage:
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_Rampage: BattleCommand_Rampage:
; rampage
; No rampage during Sleep Talk. ; No rampage during Sleep Talk.
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVar call GetBattleVar
@ -5057,8 +4957,6 @@ SetBattleDraw:
ret ret
BattleCommand_ForceSwitch: BattleCommand_ForceSwitch:
; forceswitch
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_SHINY cp BATTLETYPE_SHINY
jp z, .fail jp z, .fail
@ -5305,8 +5203,6 @@ CheckPlayerHasMonToSwitchTo:
ret ret
BattleCommand_EndLoop: BattleCommand_EndLoop:
; endloop
; Loop back to 'critical'. ; Loop back to 'critical'.
ld de, wPlayerRolloutCount ld de, wPlayerRolloutCount
@ -5523,8 +5419,6 @@ BattleCommand_HeldFlinch:
ret ret
BattleCommand_OHKO: BattleCommand_OHKO:
; ohko
call ResetDamage call ResetDamage
ld a, [wTypeModifier] ld a, [wTypeModifier]
and $7f and $7f
@ -5569,8 +5463,6 @@ BattleCommand_OHKO:
ret ret
BattleCommand_CheckCharge: BattleCommand_CheckCharge:
; checkcharge
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr call GetBattleVarAddr
bit SUBSTATUS_CHARGED, [hl] bit SUBSTATUS_CHARGED, [hl]
@ -5582,8 +5474,6 @@ BattleCommand_CheckCharge:
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_Charge: BattleCommand_Charge:
; charge
call BattleCommand_ClearText call BattleCommand_ClearText
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVar call GetBattleVar
@ -5721,8 +5611,6 @@ BattleCommand_Unused3C:
ret ret
BattleCommand_TrapTarget: BattleCommand_TrapTarget:
; traptarget
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
ret nz ret nz
@ -5781,8 +5669,6 @@ INCLUDE "engine/battle/move_effects/mist.asm"
INCLUDE "engine/battle/move_effects/focus_energy.asm" INCLUDE "engine/battle/move_effects/focus_energy.asm"
BattleCommand_Recoil: BattleCommand_Recoil:
; recoil
ld hl, wBattleMonMaxHP ld hl, wBattleMonMaxHP
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -5845,8 +5731,6 @@ BattleCommand_Recoil:
jp StdBattleTextbox jp StdBattleTextbox
BattleCommand_ConfuseTarget: BattleCommand_ConfuseTarget:
; confusetarget
call GetOpponentItem call GetOpponentItem
ld a, b ld a, b
cp HELD_PREVENT_CONFUSE cp HELD_PREVENT_CONFUSE
@ -5865,8 +5749,6 @@ BattleCommand_ConfuseTarget:
jr BattleCommand_FinishConfusingTarget jr BattleCommand_FinishConfusingTarget
BattleCommand_Confuse: BattleCommand_Confuse:
; confuse
call GetOpponentItem call GetOpponentItem
ld a, b ld a, b
cp HELD_PREVENT_CONFUSE cp HELD_PREVENT_CONFUSE
@ -5948,8 +5830,6 @@ BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit:
jp PrintDidntAffect2 jp PrintDidntAffect2
BattleCommand_Paralyze: BattleCommand_Paralyze:
; paralyze
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar call GetBattleVar
bit PAR, a bit PAR, a
@ -6065,7 +5945,6 @@ CheckMoveTypeMatchesTarget:
INCLUDE "engine/battle/move_effects/substitute.asm" INCLUDE "engine/battle/move_effects/substitute.asm"
BattleCommand_RechargeNextTurn: BattleCommand_RechargeNextTurn:
; rechargenextturn
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr call GetBattleVarAddr
set SUBSTATUS_RECHARGE, [hl] set SUBSTATUS_RECHARGE, [hl]
@ -6082,7 +5961,6 @@ EndRechargeOpp:
INCLUDE "engine/battle/move_effects/rage.asm" INCLUDE "engine/battle/move_effects/rage.asm"
BattleCommand_DoubleFlyingDamage: BattleCommand_DoubleFlyingDamage:
; doubleflyingdamage
ld a, BATTLE_VARS_SUBSTATUS3_OPP ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar call GetBattleVar
bit SUBSTATUS_FLYING, a bit SUBSTATUS_FLYING, a
@ -6090,7 +5968,6 @@ BattleCommand_DoubleFlyingDamage:
jr DoubleDamage jr DoubleDamage
BattleCommand_DoubleUndergroundDamage: BattleCommand_DoubleUndergroundDamage:
; doubleundergrounddamage
ld a, BATTLE_VARS_SUBSTATUS3_OPP ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a bit SUBSTATUS_UNDERGROUND, a
@ -6124,8 +6001,6 @@ INCLUDE "engine/battle/move_effects/pay_day.asm"
INCLUDE "engine/battle/move_effects/conversion.asm" INCLUDE "engine/battle/move_effects/conversion.asm"
BattleCommand_ResetStats: BattleCommand_ResetStats:
; resetstats
ld a, BASE_STAT_LEVEL ld a, BASE_STAT_LEVEL
ld hl, wPlayerStatLevels ld hl, wPlayerStatLevels
call .Fill call .Fill
@ -6157,8 +6032,6 @@ BattleCommand_ResetStats:
ret ret
BattleCommand_Heal: BattleCommand_Heal:
; heal
ld de, wBattleMonHP ld de, wBattleMonHP
ld hl, wBattleMonMaxHP ld hl, wBattleMonMaxHP
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
@ -6273,8 +6146,6 @@ ResetActorDisable:
ret ret
BattleCommand_Screen: BattleCommand_Screen:
; screen
ld hl, wPlayerScreens ld hl, wPlayerScreens
ld bc, wPlayerLightScreenCount ld bc, wPlayerLightScreenCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
@ -6318,12 +6189,10 @@ BattleCommand_Screen:
jp PrintButItFailed jp PrintButItFailed
PrintDoesntAffect: PrintDoesntAffect:
; 'it doesn't affect'
ld hl, DoesntAffectText ld hl, DoesntAffectText
jp StdBattleTextbox jp StdBattleTextbox
PrintNothingHappened: PrintNothingHappened:
; 'but nothing happened!'
ld hl, NothingHappenedText ld hl, NothingHappenedText
jp StdBattleTextbox jp StdBattleTextbox
@ -6335,7 +6204,6 @@ TryPrintButItFailed:
; fallthrough ; fallthrough
PrintButItFailed: PrintButItFailed:
; 'but it failed!'
ld hl, ButItFailedText ld hl, ButItFailedText
jp StdBattleTextbox jp StdBattleTextbox
@ -6349,7 +6217,6 @@ FailMimic:
jp FailText_CheckOpponentProtect jp FailText_CheckOpponentProtect
PrintDidntAffect: PrintDidntAffect:
; 'it didn't affect'
ld hl, DidntAffect1Text ld hl, DidntAffect1Text
jp StdBattleTextbox jp StdBattleTextbox
@ -6417,8 +6284,6 @@ ResetTurn:
INCLUDE "engine/battle/move_effects/thief.asm" INCLUDE "engine/battle/move_effects/thief.asm"
BattleCommand_ArenaTrap: BattleCommand_ArenaTrap:
; arenatrap
; Doesn't work on an absent opponent. ; Doesn't work on an absent opponent.
call CheckHiddenOpponent call CheckHiddenOpponent
@ -6445,8 +6310,6 @@ BattleCommand_ArenaTrap:
INCLUDE "engine/battle/move_effects/nightmare.asm" INCLUDE "engine/battle/move_effects/nightmare.asm"
BattleCommand_Defrost: BattleCommand_Defrost:
; defrost
; Thaw the user. ; Thaw the user.
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
@ -6521,7 +6384,6 @@ SafeCheckSafeguard:
ret ret
BattleCommand_CheckSafeguard: BattleCommand_CheckSafeguard:
; checksafeguard
ld hl, wEnemyScreens ld hl, wEnemyScreens
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -6546,17 +6408,14 @@ INCLUDE "engine/battle/move_effects/pursuit.asm"
INCLUDE "engine/battle/move_effects/rapid_spin.asm" INCLUDE "engine/battle/move_effects/rapid_spin.asm"
BattleCommand_HealMorn: BattleCommand_HealMorn:
; healmorn
ld b, MORN_F ld b, MORN_F
jr BattleCommand_TimeBasedHealContinue jr BattleCommand_TimeBasedHealContinue
BattleCommand_HealDay: BattleCommand_HealDay:
; healday
ld b, DAY_F ld b, DAY_F
jr BattleCommand_TimeBasedHealContinue jr BattleCommand_TimeBasedHealContinue
BattleCommand_HealNite: BattleCommand_HealNite:
; healnite
ld b, NITE_F ld b, NITE_F
; fallthrough ; fallthrough
@ -6655,8 +6514,6 @@ INCLUDE "engine/battle/move_effects/psych_up.asm"
INCLUDE "engine/battle/move_effects/mirror_coat.asm" INCLUDE "engine/battle/move_effects/mirror_coat.asm"
BattleCommand_DoubleMinimizeDamage: BattleCommand_DoubleMinimizeDamage:
; doubleminimizedamage
ld hl, wEnemyMinimized ld hl, wEnemyMinimized
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -6850,14 +6707,11 @@ AnimateFailedMove:
jp BattleCommand_RaiseSub jp BattleCommand_RaiseSub
BattleCommand_MoveDelay: BattleCommand_MoveDelay:
; movedelay
; Wait 40 frames. ; Wait 40 frames.
ld c, 40 ld c, 40
jp DelayFrames jp DelayFrames
BattleCommand_ClearText: BattleCommand_ClearText:
; cleartext
; Used in multi-hit moves. ; Used in multi-hit moves.
ld hl, .text ld hl, .text
jp BattleTextbox jp BattleTextbox

1
engine/battle/move_effects/attract.asm
View File

@ -1,5 +1,4 @@
BattleCommand_Attract: BattleCommand_Attract:
; attract
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed

2
engine/battle/move_effects/baton_pass.asm
View File

@ -1,6 +1,4 @@
BattleCommand_BatonPass: BattleCommand_BatonPass:
; batonpass
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jp nz, .Enemy jp nz, .Enemy

4
engine/battle/move_effects/beat_up.asm
View File

@ -1,6 +1,4 @@
BattleCommand_BeatUp: BattleCommand_BeatUp:
; beatup
call ResetDamage call ResetDamage
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -198,8 +196,6 @@ BattleCommand_BeatUp:
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_BeatUpFailText: BattleCommand_BeatUpFailText:
; beatupfailtext
ld a, [wBeatUpHitAtLeastOnce] ld a, [wBeatUpHitAtLeastOnce]
and a and a
ret nz ret nz

1
engine/battle/move_effects/belly_drum.asm
View File

@ -1,5 +1,4 @@
BattleCommand_BellyDrum: BattleCommand_BellyDrum:
; bellydrum
; This command is buggy because it raises the user's attack ; This command is buggy because it raises the user's attack
; before checking that it has enough HP to use the move. ; before checking that it has enough HP to use the move.
; Swap the order of these two blocks to fix. ; Swap the order of these two blocks to fix.

4
engine/battle/move_effects/bide.asm
View File

@ -1,6 +1,4 @@
BattleCommand_StoreEnergy: BattleCommand_StoreEnergy:
; storeenergy
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar call GetBattleVar
bit SUBSTATUS_BIDE, a bit SUBSTATUS_BIDE, a
@ -70,8 +68,6 @@ BattleCommand_StoreEnergy:
jp EndMoveEffect jp EndMoveEffect
BattleCommand_UnleashEnergy: BattleCommand_UnleashEnergy:
; unleashenergy
ld de, wPlayerDamageTaken ld de, wPlayerDamageTaken
ld bc, wPlayerRolloutCount ld bc, wPlayerRolloutCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/conversion.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Conversion: BattleCommand_Conversion:
; conversion
ld hl, wBattleMonMoves ld hl, wBattleMonMoves
ld de, wBattleMonType1 ld de, wBattleMonType1
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/conversion2.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Conversion2: BattleCommand_Conversion2:
; conversion2
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed

2
engine/battle/move_effects/counter.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Counter: BattleCommand_Counter:
; counter
ld a, 1 ld a, 1
ld [wAttackMissed], a ld [wAttackMissed], a
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP

2
engine/battle/move_effects/curse.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Curse: BattleCommand_Curse:
; curse
ld de, wBattleMonType1 ld de, wBattleMonType1
ld bc, wPlayerStatLevels ld bc, wPlayerStatLevels
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/destiny_bond.asm
View File

@ -1,6 +1,4 @@
BattleCommand_DestinyBond: BattleCommand_DestinyBond:
; destinybond
ld a, BATTLE_VARS_SUBSTATUS5 ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr call GetBattleVarAddr
set SUBSTATUS_DESTINY_BOND, [hl] set SUBSTATUS_DESTINY_BOND, [hl]

2
engine/battle/move_effects/disable.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Disable: BattleCommand_Disable:
; disable
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed

2
engine/battle/move_effects/encore.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Encore: BattleCommand_Encore:
; encore
ld hl, wEnemyMonMoves ld hl, wEnemyMonMoves
ld de, wEnemyEncoreCount ld de, wEnemyEncoreCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/endure.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Endure: BattleCommand_Endure:
; endure
; Endure shares code with Protect. See protect.asm. ; Endure shares code with Protect. See protect.asm.
call ProtectChance call ProtectChance

2
engine/battle/move_effects/false_swipe.asm
View File

@ -1,6 +1,4 @@
BattleCommand_FalseSwipe: BattleCommand_FalseSwipe:
; falseswipe
; Makes sure wCurDamage < MonHP ; Makes sure wCurDamage < MonHP
ld hl, wEnemyMonHP ld hl, wEnemyMonHP

2
engine/battle/move_effects/focus_energy.asm
View File

@ -1,6 +1,4 @@
BattleCommand_FocusEnergy: BattleCommand_FocusEnergy:
; focusenergy
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr call GetBattleVarAddr
bit SUBSTATUS_FOCUS_ENERGY, [hl] bit SUBSTATUS_FOCUS_ENERGY, [hl]

2
engine/battle/move_effects/foresight.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Foresight: BattleCommand_Foresight:
; foresight
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed

1
engine/battle/move_effects/frustration.asm
View File

@ -1,5 +1,4 @@
BattleCommand_FrustrationPower: BattleCommand_FrustrationPower:
; frustrationpower
push bc push bc
ld hl, wBattleMonHappiness ld hl, wBattleMonHappiness
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/fury_cutter.asm
View File

@ -1,6 +1,4 @@
BattleCommand_FuryCutter: BattleCommand_FuryCutter:
; furycutter
ld hl, wPlayerFuryCutterCount ld hl, wPlayerFuryCutterCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a

4
engine/battle/move_effects/future_sight.asm
View File

@ -1,6 +1,4 @@
BattleCommand_CheckFutureSight: BattleCommand_CheckFutureSight:
; checkfuturesight
ld hl, wPlayerFutureSightCount ld hl, wPlayerFutureSightCount
ld de, wPlayerFutureSightDamage ld de, wPlayerFutureSightDamage
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
@ -26,8 +24,6 @@ BattleCommand_CheckFutureSight:
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_FutureSight: BattleCommand_FutureSight:
; futuresight
call CheckUserIsCharging call CheckUserIsCharging
jr nz, .AlreadyChargingFutureSight jr nz, .AlreadyChargingFutureSight
ld a, BATTLE_VARS_MOVE_ANIM ld a, BATTLE_VARS_MOVE_ANIM

2
engine/battle/move_effects/heal_bell.asm
View File

@ -1,6 +1,4 @@
BattleCommand_HealBell: BattleCommand_HealBell:
; healbell
ld a, BATTLE_VARS_SUBSTATUS1 ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr call GetBattleVarAddr
res SUBSTATUS_NIGHTMARE, [hl] res SUBSTATUS_NIGHTMARE, [hl]

2
engine/battle/move_effects/hidden_power.asm
View File

@ -1,6 +1,4 @@
BattleCommand_HiddenPower: BattleCommand_HiddenPower:
; hiddenpower
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
ret nz ret nz

1
engine/battle/move_effects/leech_seed.asm
View File

@ -1,5 +1,4 @@
BattleCommand_LeechSeed: BattleCommand_LeechSeed:
; leechseed
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .evaded jr nz, .evaded

2
engine/battle/move_effects/lock_on.asm
View File

@ -1,6 +1,4 @@
BattleCommand_LockOn: BattleCommand_LockOn:
; lockon
call CheckSubstituteOpp call CheckSubstituteOpp
jr nz, .fail jr nz, .fail

2
engine/battle/move_effects/magnitude.asm
View File

@ -1,6 +1,4 @@
BattleCommand_GetMagnitude: BattleCommand_GetMagnitude:
; getmagnitude
push bc push bc
call BattleRandom call BattleRandom
ld b, a ld b, a

2
engine/battle/move_effects/metronome.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Metronome: BattleCommand_Metronome:
; metronome
call ClearLastMove call ClearLastMove
call CheckUserIsCharging call CheckUserIsCharging
jr nz, .charging jr nz, .charging

2
engine/battle/move_effects/mimic.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Mimic: BattleCommand_Mimic:
; mimic
call ClearLastMove call ClearLastMove
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld a, [wAttackMissed] ld a, [wAttackMissed]

2
engine/battle/move_effects/mirror_coat.asm
View File

@ -1,6 +1,4 @@
BattleCommand_MirrorCoat: BattleCommand_MirrorCoat:
; mirrorcoat
ld a, 1 ld a, 1
ld [wAttackMissed], a ld [wAttackMissed], a

2
engine/battle/move_effects/mirror_move.asm
View File

@ -1,6 +1,4 @@
BattleCommand_MirrorMove: BattleCommand_MirrorMove:
; mirrormove
call ClearLastMove call ClearLastMove
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE

2
engine/battle/move_effects/mist.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Mist: BattleCommand_Mist:
; mist
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr call GetBattleVarAddr
bit SUBSTATUS_MIST, [hl] bit SUBSTATUS_MIST, [hl]

2
engine/battle/move_effects/nightmare.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Nightmare: BattleCommand_Nightmare:
; nightmare
; Can't hit an absent opponent. ; Can't hit an absent opponent.
call CheckHiddenOpponent call CheckHiddenOpponent

2
engine/battle/move_effects/pain_split.asm
View File

@ -1,6 +1,4 @@
BattleCommand_PainSplit: BattleCommand_PainSplit:
; painsplit
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, .ButItFailed jp nz, .ButItFailed

2
engine/battle/move_effects/pay_day.asm
View File

@ -1,6 +1,4 @@
BattleCommand_PayDay: BattleCommand_PayDay:
; payday
xor a xor a
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld [hli], a ld [hli], a

2
engine/battle/move_effects/perish_song.asm
View File

@ -1,6 +1,4 @@
BattleCommand_PerishSong: BattleCommand_PerishSong:
; perishsong
ld hl, wPlayerSubStatus1 ld hl, wPlayerSubStatus1
ld de, wEnemySubStatus1 ld de, wEnemySubStatus1
bit SUBSTATUS_PERISH, [hl] bit SUBSTATUS_PERISH, [hl]

2
engine/battle/move_effects/present.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Present: BattleCommand_Present:
; present
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_COLOSSEUM cp LINK_COLOSSEUM
jr z, .colosseum_skippush jr z, .colosseum_skippush

1
engine/battle/move_effects/protect.asm
View File

@ -1,5 +1,4 @@
BattleCommand_Protect: BattleCommand_Protect:
; protect
call ProtectChance call ProtectChance
ret c ret c

2
engine/battle/move_effects/psych_up.asm
View File

@ -1,6 +1,4 @@
BattleCommand_PsychUp: BattleCommand_PsychUp:
; psychup
ld hl, wEnemyStatLevels ld hl, wEnemyStatLevels
ld de, wPlayerStatLevels ld de, wPlayerStatLevels
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

1
engine/battle/move_effects/pursuit.asm
View File

@ -1,5 +1,4 @@
BattleCommand_Pursuit: BattleCommand_Pursuit:
; pursuit
; Double damage if the opponent is switching. ; Double damage if the opponent is switching.
ld hl, wEnemyIsSwitching ld hl, wEnemyIsSwitching

1
engine/battle/move_effects/rage.asm
View File

@ -1,5 +1,4 @@
BattleCommand_Rage: BattleCommand_Rage:
; rage
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr call GetBattleVarAddr
set SUBSTATUS_RAGE, [hl] set SUBSTATUS_RAGE, [hl]

1
engine/battle/move_effects/rain_dance.asm
View File

@ -1,5 +1,4 @@
BattleCommand_StartRain: BattleCommand_StartRain:
; startrain
ld a, WEATHER_RAIN ld a, WEATHER_RAIN
ld [wBattleWeather], a ld [wBattleWeather], a
ld a, 5 ld a, 5

2
engine/battle/move_effects/rapid_spin.asm
View File

@ -1,6 +1,4 @@
BattleCommand_ClearHazards: BattleCommand_ClearHazards:
; clearhazards
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr call GetBattleVarAddr
bit SUBSTATUS_LEECH_SEED, [hl] bit SUBSTATUS_LEECH_SEED, [hl]

1
engine/battle/move_effects/return.asm
View File

@ -1,5 +1,4 @@
BattleCommand_HappinessPower: BattleCommand_HappinessPower:
; happinesspower
push bc push bc
ld hl, wBattleMonHappiness ld hl, wBattleMonHappiness
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

4
engine/battle/move_effects/rollout.asm
View File

@ -1,8 +1,6 @@
DEF MAX_ROLLOUT_COUNT EQU 5 DEF MAX_ROLLOUT_COUNT EQU 5
BattleCommand_CheckCurl: BattleCommand_CheckCurl:
; checkcurl
ld de, wPlayerRolloutCount ld de, wPlayerRolloutCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -23,8 +21,6 @@ BattleCommand_CheckCurl:
ret ret
BattleCommand_RolloutPower: BattleCommand_RolloutPower:
; rolloutpower
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVar call GetBattleVar
and SLP and SLP

2
engine/battle/move_effects/safeguard.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Safeguard: BattleCommand_Safeguard:
; safeguard
ld hl, wPlayerScreens ld hl, wPlayerScreens
ld de, wPlayerSafeguardCount ld de, wPlayerSafeguardCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/sandstorm.asm
View File

@ -1,6 +1,4 @@
BattleCommand_StartSandstorm: BattleCommand_StartSandstorm:
; startsandstorm
ld a, [wBattleWeather] ld a, [wBattleWeather]
cp WEATHER_SANDSTORM cp WEATHER_SANDSTORM
jr z, .failed jr z, .failed

2
engine/battle/move_effects/sketch.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Sketch: BattleCommand_Sketch:
; sketch
call ClearLastMove call ClearLastMove
; Don't sketch during a link battle ; Don't sketch during a link battle
ld a, [wLinkMode] ld a, [wLinkMode]

2
engine/battle/move_effects/sleep_talk.asm
View File

@ -1,6 +1,4 @@
BattleCommand_SleepTalk: BattleCommand_SleepTalk:
; sleeptalk
call ClearLastMove call ClearLastMove
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a

1
engine/battle/move_effects/snore.asm
View File

@ -1,5 +1,4 @@
BattleCommand_Snore: BattleCommand_Snore:
; snore
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVar call GetBattleVar
and SLP and SLP

2
engine/battle/move_effects/spikes.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Spikes: BattleCommand_Spikes:
; spikes
ld hl, wEnemyScreens ld hl, wEnemyScreens
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a

2
engine/battle/move_effects/spite.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Spite: BattleCommand_Spite:
; spite
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, .failed jp nz, .failed

2
engine/battle/move_effects/substitute.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Substitute: BattleCommand_Substitute:
; substitute
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, wBattleMonMaxHP ld hl, wBattleMonMaxHP
ld de, wPlayerSubstituteHP ld de, wPlayerSubstituteHP

1
engine/battle/move_effects/sunny_day.asm
View File

@ -1,5 +1,4 @@
BattleCommand_StartSun: BattleCommand_StartSun:
; startsun
ld a, WEATHER_SUN ld a, WEATHER_SUN
ld [wBattleWeather], a ld [wBattleWeather], a
ld a, 5 ld a, 5

2
engine/battle/move_effects/teleport.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Teleport: BattleCommand_Teleport:
; teleport
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_SHINY cp BATTLETYPE_SHINY
jr z, .failed jr z, .failed

2
engine/battle/move_effects/thief.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Thief: BattleCommand_Thief:
; thief
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jr nz, .enemy jr nz, .enemy

2
engine/battle/move_effects/thunder.asm
View File

@ -1,6 +1,4 @@
BattleCommand_ThunderAccuracy: BattleCommand_ThunderAccuracy:
; thunderaccuracy
ld a, BATTLE_VARS_MOVE_TYPE ld a, BATTLE_VARS_MOVE_TYPE
call GetBattleVarAddr call GetBattleVarAddr
inc hl inc hl

2
engine/battle/move_effects/transform.asm
View File

@ -1,6 +1,4 @@
BattleCommand_Transform: BattleCommand_Transform:
; transform
call ClearLastMove call ClearLastMove
ld a, BATTLE_VARS_SUBSTATUS5_OPP ld a, BATTLE_VARS_SUBSTATUS5_OPP
call GetBattleVarAddr call GetBattleVarAddr

4
engine/battle/move_effects/triple_kick.asm
View File

@ -1,6 +1,4 @@
BattleCommand_TripleKick: BattleCommand_TripleKick:
; triplekick
ld a, [wBattleAnimParam] ld a, [wBattleAnimParam]
ld b, a ld b, a
inc b inc b
@ -27,8 +25,6 @@ BattleCommand_TripleKick:
ret ret
BattleCommand_KickCounter: BattleCommand_KickCounter:
; kickcounter
ld hl, wBattleAnimParam ld hl, wBattleAnimParam
inc [hl] inc [hl]
ret ret

4
engine/events/overworld.asm
View File

@ -278,7 +278,6 @@ FlashFunction:
ret ret
.CheckUseFlash: .CheckUseFlash:
; Flash
ld de, ENGINE_ZEPHYRBADGE ld de, ENGINE_ZEPHYRBADGE
farcall CheckBadge farcall CheckBadge
jr c, .nozephyrbadge jr c, .nozephyrbadge
@ -557,7 +556,6 @@ FlyFunction:
dw .FailFly dw .FailFly
.TryFly: .TryFly:
; Fly
ld de, ENGINE_STORMBADGE ld de, ENGINE_STORMBADGE
call CheckBadge call CheckBadge
jr c, .nostormbadge jr c, .nostormbadge
@ -637,7 +635,6 @@ WaterfallFunction:
ret ret
.TryWaterfall: .TryWaterfall:
; Waterfall
ld de, ENGINE_RISINGBADGE ld de, ENGINE_RISINGBADGE
farcall CheckBadge farcall CheckBadge
ld a, $80 ld a, $80
@ -963,7 +960,6 @@ StrengthFunction:
ret ret
.TryStrength: .TryStrength:
; Strength
ld de, ENGINE_PLAINBADGE ld de, ENGINE_PLAINBADGE
call CheckBadge call CheckBadge
jr c, .Failed jr c, .Failed

6
mobile/mobile_41.asm
View File

@ -391,17 +391,17 @@ StubbedTrainerRankings_Unused3: ; unreferenced
ld hl, sTrainerRankingUnused3 ld hl, sTrainerRankingUnused3
jr StubbedTrainerRankings_Increment3Byte jr StubbedTrainerRankings_Increment3Byte
StubbedTrainerRankings_ColosseumWins: ; win StubbedTrainerRankings_ColosseumWins:
ret ret
ld hl, sTrainerRankingColosseumWins ld hl, sTrainerRankingColosseumWins
jr StubbedTrainerRankings_Increment3Byte jr StubbedTrainerRankings_Increment3Byte
StubbedTrainerRankings_ColosseumLosses: ; lose StubbedTrainerRankings_ColosseumLosses:
ret ret
ld hl, sTrainerRankingColosseumLosses ld hl, sTrainerRankingColosseumLosses
jr StubbedTrainerRankings_Increment3Byte jr StubbedTrainerRankings_Increment3Byte
StubbedTrainerRankings_ColosseumDraws: ; draw StubbedTrainerRankings_ColosseumDraws:
ret ret
ld hl, sTrainerRankingColosseumDraws ld hl, sTrainerRankingColosseumDraws
jr StubbedTrainerRankings_Increment3Byte jr StubbedTrainerRankings_Increment3Byte