You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Fix triple newlines left over from removing address comments
This commit is contained in:
@@ -145,13 +145,11 @@ SwitchSometimes:
|
||||
ld [wEnemySwitchMonIndex], a
|
||||
jp AI_TrySwitch
|
||||
|
||||
|
||||
CheckSubstatusCantRun:
|
||||
ld a, [wEnemySubStatus5]
|
||||
bit SUBSTATUS_CANT_RUN, a
|
||||
ret
|
||||
|
||||
|
||||
AI_TryItem:
|
||||
; items are not allowed in the BattleTower
|
||||
ld a, [wInBattleTowerBattle]
|
||||
@@ -238,7 +236,6 @@ AI_TryItem:
|
||||
scf
|
||||
ret
|
||||
|
||||
|
||||
.IsHighestLevel:
|
||||
ld a, [wOTPartyCount]
|
||||
ld d, a
|
||||
@@ -270,7 +267,6 @@ AI_TryItem:
|
||||
scf
|
||||
ret
|
||||
|
||||
|
||||
AI_Items:
|
||||
dbw FULL_RESTORE, .FullRestore
|
||||
dbw MAX_POTION, .MaxPotion
|
||||
@@ -520,7 +516,6 @@ AI_Items:
|
||||
and a
|
||||
ret
|
||||
|
||||
|
||||
AIUpdateHUD:
|
||||
call UpdateEnemyMonInParty
|
||||
farcall UpdateEnemyHUD
|
||||
@@ -538,7 +533,6 @@ AIUsedItemSound:
|
||||
pop de
|
||||
ret
|
||||
|
||||
|
||||
EnemyUsedFullHeal:
|
||||
call AIUsedItemSound
|
||||
call AI_HealStatus
|
||||
@@ -642,7 +636,6 @@ EnemyPotionFinish:
|
||||
predef AnimateHPBar
|
||||
jp AIUpdateHUD
|
||||
|
||||
|
||||
AI_TrySwitch:
|
||||
; Determine whether the AI can switch based on how many Pokemon are still alive.
|
||||
; If it can switch, it will.
|
||||
@@ -805,7 +798,6 @@ EnemyUsedXSpecial:
|
||||
ld b, SP_ATTACK
|
||||
ld a, X_SPECIAL
|
||||
|
||||
|
||||
; Parameter
|
||||
; a = ITEM_CONSTANT
|
||||
; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION)
|
||||
@@ -817,7 +809,6 @@ EnemyUsedXItem:
|
||||
farcall CheckIfStatCanBeRaised
|
||||
jp AIUpdateHUD
|
||||
|
||||
|
||||
; Parameter
|
||||
; a = ITEM_CONSTANT
|
||||
PrintText_UsedItemOn_AND_AIUpdateHUD:
|
||||
|
||||
@@ -15,7 +15,6 @@ AIChooseMove:
|
||||
farcall CheckEnemyLockedIn
|
||||
ret nz
|
||||
|
||||
|
||||
; The default score is 20. Unusable moves are given a score of 80.
|
||||
ld a, 20
|
||||
ld hl, wBuffer1
|
||||
@@ -61,7 +60,6 @@ AIChooseMove:
|
||||
ld [hl], 80
|
||||
jr .CheckMovePP
|
||||
|
||||
|
||||
; Apply AI scoring layers depending on the trainer class.
|
||||
.ApplyLayers:
|
||||
ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
|
||||
@@ -199,7 +197,6 @@ AIChooseMove:
|
||||
ld [wCurEnemyMoveNum], a
|
||||
ret
|
||||
|
||||
|
||||
AIScoringPointers:
|
||||
; entries correspond to AI_* constants
|
||||
dw AI_Basic
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -96,7 +96,6 @@ CheckPlayerMoveTypeMatchups:
|
||||
pop hl
|
||||
ret
|
||||
|
||||
|
||||
.CheckEnemyMoveMatchups:
|
||||
ld de, wEnemyMonMoves
|
||||
ld b, NUM_MOVES + 1
|
||||
@@ -290,7 +289,6 @@ CheckAbleToSwitch:
|
||||
ld [wEnemySwitchMonParam], a
|
||||
ret
|
||||
|
||||
|
||||
FindAliveEnemyMons:
|
||||
ld a, [wOTPartyCount]
|
||||
cp 2
|
||||
@@ -341,7 +339,6 @@ FindAliveEnemyMons:
|
||||
and a
|
||||
ret
|
||||
|
||||
|
||||
FindEnemyMonsImmuneToLastCounterMove:
|
||||
ld hl, wOTPartyMon1
|
||||
ld a, [wOTPartyCount]
|
||||
@@ -408,7 +405,6 @@ FindEnemyMonsImmuneToLastCounterMove:
|
||||
srl c
|
||||
jr .loop
|
||||
|
||||
|
||||
FindAliveEnemyMonsWithASuperEffectiveMove:
|
||||
push bc
|
||||
ld a, [wOTPartyCount]
|
||||
@@ -546,7 +542,6 @@ FindEnemyMonsWithASuperEffectiveMove:
|
||||
pop bc
|
||||
ret
|
||||
|
||||
|
||||
FindEnemyMonsThatResistPlayer:
|
||||
push bc
|
||||
ld hl, wOTPartySpecies
|
||||
@@ -607,7 +602,6 @@ FindEnemyMonsThatResistPlayer:
|
||||
ld c, a
|
||||
ret
|
||||
|
||||
|
||||
FindEnemyMonsWithAtLeastQuarterMaxHP:
|
||||
push bc
|
||||
ld de, wOTPartySpecies
|
||||
|
||||
@@ -146,7 +146,6 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
|
||||
TrainerBattlePokeballTiles:
|
||||
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
|
||||
|
||||
|
||||
BattleTransitionJumptable:
|
||||
jumptable .Jumptable, wJumptableIndex
|
||||
|
||||
@@ -753,7 +752,6 @@ WipeLYOverrides:
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
|
||||
StartTrainerBattle_DrawSineWave:
|
||||
calc_sine_wave
|
||||
|
||||
|
||||
@@ -6486,7 +6486,6 @@ CheckUnownLetter:
|
||||
|
||||
INCLUDE "data/wild/unlocked_unowns.asm"
|
||||
|
||||
|
||||
Unreferenced_SwapBattlerLevels:
|
||||
push bc
|
||||
ld a, [wBattleMonLevel]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,6 @@ HiddenPowerDamage:
|
||||
ld hl, wEnemyMonDVs
|
||||
.got_dvs
|
||||
|
||||
|
||||
; Power:
|
||||
|
||||
; Take the top bit from each stat
|
||||
@@ -62,7 +61,6 @@ HiddenPowerDamage:
|
||||
|
||||
ld d, a
|
||||
|
||||
|
||||
; Type:
|
||||
|
||||
; Def & 3
|
||||
|
||||
@@ -49,7 +49,6 @@ GetPlayerBackpicCoords:
|
||||
lb bc, 6, 6
|
||||
ret
|
||||
|
||||
|
||||
DoWeatherModifiers:
|
||||
|
||||
ld de, WeatherTypeModifiers
|
||||
@@ -76,7 +75,6 @@ DoWeatherModifiers:
|
||||
inc de
|
||||
jr .CheckWeatherType
|
||||
|
||||
|
||||
.done_weather_types
|
||||
ld de, WeatherMoveModifiers
|
||||
|
||||
@@ -147,7 +145,6 @@ DoWeatherModifiers:
|
||||
|
||||
INCLUDE "data/battle/weather_modifiers.asm"
|
||||
|
||||
|
||||
DoBadgeTypeBoosts:
|
||||
ld a, [wLinkMode]
|
||||
and a
|
||||
|
||||
@@ -22,7 +22,6 @@ BattleCommand_Attract:
|
||||
.failed
|
||||
jp FailMove
|
||||
|
||||
|
||||
CheckOppositeGender:
|
||||
ld a, MON_SPECIES
|
||||
call BattlePartyAttr
|
||||
|
||||
@@ -5,7 +5,6 @@ BattleCommand_BatonPass:
|
||||
and a
|
||||
jp nz, .Enemy
|
||||
|
||||
|
||||
; Need something to switch to
|
||||
call CheckAnyOtherAlivePartyMons
|
||||
jp z, FailedBatonPass
|
||||
@@ -45,7 +44,6 @@ BattleCommand_BatonPass:
|
||||
call ResetBatonPassStatus
|
||||
ret
|
||||
|
||||
|
||||
.Enemy:
|
||||
|
||||
; Wildmons don't have anything to switch to
|
||||
@@ -82,7 +80,6 @@ BattleCommand_BatonPass:
|
||||
jr ResetBatonPassStatus
|
||||
|
||||
|
||||
|
||||
BatonPass_LinkPlayerSwitch:
|
||||
ld a, [wLinkMode]
|
||||
and a
|
||||
@@ -101,7 +98,6 @@ BatonPass_LinkPlayerSwitch:
|
||||
ret
|
||||
|
||||
|
||||
|
||||
BatonPass_LinkEnemySwitch:
|
||||
ld a, [wLinkMode]
|
||||
and a
|
||||
@@ -128,13 +124,11 @@ BatonPass_LinkEnemySwitch:
|
||||
jp CloseWindow
|
||||
|
||||
|
||||
|
||||
FailedBatonPass:
|
||||
call AnimateFailedMove
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
|
||||
ResetBatonPassStatus:
|
||||
; Reset status changes that aren't passed by Baton Pass.
|
||||
|
||||
@@ -175,7 +169,6 @@ ResetBatonPassStatus:
|
||||
ret
|
||||
|
||||
|
||||
|
||||
CheckAnyOtherAlivePartyMons:
|
||||
ld hl, wPartyMon1HP
|
||||
ld a, [wPartyCount]
|
||||
@@ -185,7 +178,6 @@ CheckAnyOtherAlivePartyMons:
|
||||
jr CheckAnyOtherAliveMons
|
||||
|
||||
|
||||
|
||||
CheckAnyOtherAliveEnemyMons:
|
||||
ld hl, wOTPartyMon1HP
|
||||
ld a, [wOTPartyCount]
|
||||
|
||||
@@ -194,13 +194,11 @@ BattleCommand_BeatUp:
|
||||
ret
|
||||
|
||||
|
||||
|
||||
.beatup_fail
|
||||
ld b, buildopponentrage_command
|
||||
jp SkipToBattleCommand
|
||||
|
||||
|
||||
|
||||
BattleCommand_BeatUpFailText:
|
||||
; beatupfailtext
|
||||
|
||||
@@ -211,7 +209,6 @@ BattleCommand_BeatUpFailText:
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
|
||||
GetBeatupMonLocation:
|
||||
push bc
|
||||
ld c, a
|
||||
|
||||
@@ -70,7 +70,6 @@ BattleCommand_StoreEnergy:
|
||||
jp EndMoveEffect
|
||||
|
||||
|
||||
|
||||
BattleCommand_UnleashEnergy:
|
||||
; unleashenergy
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ BattleCommand_Curse:
|
||||
cp GHOST
|
||||
jr z, .ghost
|
||||
|
||||
|
||||
; If no stats can be increased, don't.
|
||||
|
||||
; Attack
|
||||
@@ -54,7 +53,6 @@ BattleCommand_Curse:
|
||||
call BattleCommand_DefenseUp
|
||||
jp BattleCommand_StatUpMessage
|
||||
|
||||
|
||||
.ghost
|
||||
|
||||
; Cut HP in half and put a curse on the opponent.
|
||||
@@ -84,7 +82,6 @@ BattleCommand_Curse:
|
||||
call AnimateFailedMove
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
.cantraise
|
||||
|
||||
; Can't raise either stat.
|
||||
|
||||
@@ -39,7 +39,6 @@ BattleCommand_FuryCutter:
|
||||
ret
|
||||
|
||||
|
||||
|
||||
ResetFuryCutterCount:
|
||||
|
||||
push hl
|
||||
|
||||
@@ -25,7 +25,6 @@ BattleCommand_CheckFutureSight:
|
||||
ld b, futuresight_command
|
||||
jp SkipToBattleCommand
|
||||
|
||||
|
||||
BattleCommand_FutureSight:
|
||||
; futuresight
|
||||
|
||||
|
||||
@@ -34,12 +34,10 @@ BattleCommand_Metronome:
|
||||
call CheckUserMove
|
||||
jr z, .GetMove
|
||||
|
||||
|
||||
ld a, BATTLE_VARS_MOVE
|
||||
call GetBattleVarAddr
|
||||
ld [hl], b
|
||||
call UpdateMoveData
|
||||
jp ResetTurn
|
||||
|
||||
|
||||
INCLUDE "data/battle/metronome_exception_moves.asm"
|
||||
|
||||
@@ -89,7 +89,6 @@ BattleCommand_PainSplit:
|
||||
ld [wBuffer6], a
|
||||
ret
|
||||
|
||||
|
||||
.ButItFailed:
|
||||
jp PrintDidntAffect2
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
BattleCommand_PerishSong:
|
||||
; perishsong
|
||||
|
||||
|
||||
ld hl, wPlayerSubStatus1
|
||||
ld de, wEnemySubStatus1
|
||||
bit SUBSTATUS_PERISH, [hl]
|
||||
|
||||
@@ -12,7 +12,6 @@ BattleCommand_Protect:
|
||||
ld hl, ProtectedItselfText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
ProtectChance:
|
||||
|
||||
ld de, wPlayerProtectCount
|
||||
@@ -68,7 +67,6 @@ ProtectChance:
|
||||
and a
|
||||
ret
|
||||
|
||||
|
||||
.failed
|
||||
xor a
|
||||
ld [de], a
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user