You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Remove redundant comments referencing labels (#921)
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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,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.
|
||||||
|
@ -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]
|
||||||
|
@ -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]
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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]
|
||||||
|
@ -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]
|
||||||
|
@ -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
|
||||||
|
@ -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]
|
||||||
|
@ -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
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
BattleCommand_FalseSwipe:
|
BattleCommand_FalseSwipe:
|
||||||
; falseswipe
|
|
||||||
|
|
||||||
; Makes sure wCurDamage < MonHP
|
; Makes sure wCurDamage < MonHP
|
||||||
|
|
||||||
ld hl, wEnemyMonHP
|
ld hl, wEnemyMonHP
|
||||||
|
@ -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]
|
||||||
|
@ -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,5 +1,4 @@
|
|||||||
BattleCommand_FrustrationPower:
|
BattleCommand_FrustrationPower:
|
||||||
; frustrationpower
|
|
||||||
push bc
|
push bc
|
||||||
ld hl, wBattleMonHappiness
|
ld hl, wBattleMonHappiness
|
||||||
ldh a, [hBattleTurn]
|
ldh a, [hBattleTurn]
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user