You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # engine/items/mart.asm
This commit is contained in:
@@ -2,10 +2,9 @@
|
||||
; to calculate damage for these instead of
|
||||
; BattleCommand_DamageCalc and BattleCommand_Stab.
|
||||
|
||||
ConstantDamageEffects: ; 39413
|
||||
ConstantDamageEffects:
|
||||
db EFFECT_SUPER_FANG
|
||||
db EFFECT_STATIC_DAMAGE
|
||||
db EFFECT_LEVEL_DAMAGE
|
||||
db EFFECT_PSYWAVE
|
||||
db -1 ; end
|
||||
; 39418
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; AI_SMART encourages these moves with Encore.
|
||||
|
||||
EncoreMoves: ; 38c85
|
||||
EncoreMoves:
|
||||
db SWORDS_DANCE
|
||||
db WHIRLWIND
|
||||
db LEER
|
||||
@@ -32,4 +32,3 @@ EncoreMoves: ; 38c85
|
||||
db COTTON_SPORE
|
||||
db POWDER_SNOW
|
||||
db -1 ; end
|
||||
; 38ca4
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; AI_SMART prefers these moves during rain.
|
||||
|
||||
RainDanceMoves: ; 390e7
|
||||
RainDanceMoves:
|
||||
db WATER_GUN
|
||||
db HYDRO_PUMP
|
||||
db SURF
|
||||
@@ -13,4 +13,3 @@ RainDanceMoves: ; 390e7
|
||||
db OCTAZOOKA
|
||||
db WHIRLPOOL
|
||||
db -1 ; end
|
||||
; 390f3
|
||||
|
@@ -1,10 +1,9 @@
|
||||
; AI_AGGRESSIVE does not discourage these moves
|
||||
; even if a stronger one is available.
|
||||
|
||||
RecklessMoves: ; 393e2
|
||||
RecklessMoves:
|
||||
db EFFECT_SELFDESTRUCT
|
||||
db EFFECT_RAMPAGE
|
||||
db EFFECT_MULTI_HIT
|
||||
db EFFECT_DOUBLE_HIT
|
||||
db -1 ; end
|
||||
; 393e7
|
||||
|
@@ -14,4 +14,3 @@ ResidualMoves:
|
||||
db SUBSTITUTE
|
||||
db SPIKES
|
||||
db -1 ; end
|
||||
; 39453
|
||||
|
@@ -1,8 +1,7 @@
|
||||
; AI_RISKY will not use these effects at max HP
|
||||
; even if they would KO the player.
|
||||
|
||||
RiskyEffects: ; 394ff
|
||||
RiskyEffects:
|
||||
db EFFECT_SELFDESTRUCT
|
||||
db EFFECT_OHKO
|
||||
db -1 ; end
|
||||
; 39502
|
||||
|
@@ -1,7 +1,7 @@
|
||||
; AI_OPPORTUNIST discourages these moves
|
||||
; when the player's HP is low.
|
||||
|
||||
StallMoves: ; 39348
|
||||
StallMoves:
|
||||
db SWORDS_DANCE
|
||||
db TAIL_WHIP
|
||||
db LEER
|
||||
@@ -35,4 +35,3 @@ StallMoves: ; 39348
|
||||
db SUBSTITUTE
|
||||
db FLAME_WHEEL
|
||||
db -1 ; end
|
||||
; 39369
|
||||
|
@@ -1,10 +1,9 @@
|
||||
; AI_BASIC discourages these effects if the player
|
||||
; already has a status condition.
|
||||
|
||||
StatusOnlyEffects: ; 385db
|
||||
StatusOnlyEffects:
|
||||
db EFFECT_SLEEP
|
||||
db EFFECT_TOXIC
|
||||
db EFFECT_POISON
|
||||
db EFFECT_PARALYZE
|
||||
db -1 ; end
|
||||
; 385e0
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; AI_SMART prefers these moves during harsh sunlight.
|
||||
|
||||
SunnyDayMoves: ; 39134
|
||||
SunnyDayMoves:
|
||||
db FIRE_PUNCH
|
||||
db EMBER
|
||||
db FLAMETHROWER
|
||||
@@ -10,4 +10,3 @@ SunnyDayMoves: ; 39134
|
||||
db MORNING_SUN
|
||||
db SYNTHESIS
|
||||
db -1 ; end
|
||||
; 3913d
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; AI_SMART knows these moves are usable all-around.
|
||||
|
||||
UsefulMoves: ; 39301
|
||||
UsefulMoves:
|
||||
db DOUBLE_EDGE
|
||||
db SING
|
||||
db FLAMETHROWER
|
||||
@@ -21,4 +21,3 @@ UsefulMoves: ; 39301
|
||||
db SOFTBOILED
|
||||
db SUPER_FANG
|
||||
db -1 ; end
|
||||
; 39315
|
||||
|
@@ -2,181 +2,180 @@
|
||||
|
||||
dw 0 ; padding
|
||||
|
||||
BattleCommandPointers: ; 3fd28
|
||||
BattleCommandPointers:
|
||||
; entries correspond to macros/scripts/battle_commands.asm
|
||||
dw BattleCommand_CheckTurn ; 34084
|
||||
dw BattleCommand_CheckObedience ; 343db
|
||||
dw BattleCommand_UsedMoveText ; 34541
|
||||
dw BattleCommand_DoTurn ; 34555
|
||||
dw BattleCommand_Critical ; 34631
|
||||
dw BattleCommand_DamageStats ; 352dc
|
||||
dw BattleCommand_Stab ; 346d2 - 07
|
||||
dw BattleCommand_DamageVariation ; 34cfd
|
||||
dw BattleCommand_CheckHit ; 34d32
|
||||
dw BattleCommand_LowerSub ; 34eee
|
||||
dw BattleCommand_MoveAnimNoSub ; 34f60
|
||||
dw BattleCommand_RaiseSub ; 35004
|
||||
dw BattleCommand_FailureText ; 35023
|
||||
dw BattleCommand_ApplyDamage ; 3505e
|
||||
dw BattleCommand_CriticalText ; 35175
|
||||
dw BattleCommand_SuperEffectiveText ; 351ad
|
||||
dw BattleCommand_CheckDestinyBond ; 351c0
|
||||
dw BattleCommand_BuildOpponentRage ; 35250
|
||||
dw BattleCommand_PoisonTarget ; 35eee
|
||||
dw BattleCommand_SleepTarget ; 35e5c
|
||||
dw BattleCommand_DrainTarget ; 35fff
|
||||
dw BattleCommand_EatDream ; 36008
|
||||
dw BattleCommand_BurnTarget ; 3608c
|
||||
dw BattleCommand_FreezeTarget ; 36102
|
||||
dw BattleCommand_ParalyzeTarget ; 36165
|
||||
dw BattleCommand_Selfdestruct ; 37380
|
||||
dw BattleCommand_MirrorMove ; 373c9
|
||||
dw BattleCommand_StatUp ; 361e4
|
||||
dw BattleCommand_StatDown ; 362e3
|
||||
dw BattleCommand_PayDay ; 3705c
|
||||
dw BattleCommand_Conversion ; 3707f
|
||||
dw BattleCommand_ResetStats ; 3710e
|
||||
dw BattleCommand_StoreEnergy ; 36671
|
||||
dw BattleCommand_UnleashEnergy ; 366e5
|
||||
dw BattleCommand_ForceSwitch ; 3680f
|
||||
dw BattleCommand_EndLoop ; 369b6
|
||||
dw BattleCommand_FlinchTarget ; 36aa0
|
||||
dw BattleCommand_OHKO ; 36af3
|
||||
dw BattleCommand_Recoil ; 36cb2
|
||||
dw BattleCommand_Mist ; 36c7e
|
||||
dw BattleCommand_FocusEnergy ; 36c98
|
||||
dw BattleCommand_Confuse ; 36d3b
|
||||
dw BattleCommand_ConfuseTarget ; 36d1d
|
||||
dw BattleCommand_Heal ; 3713e
|
||||
dw BattleCommand_Transform ; 371cd
|
||||
dw BattleCommand_Screen ; 372fc
|
||||
dw BattleCommand_Poison ; 35f2c
|
||||
dw BattleCommand_Paralyze ; 36dc7
|
||||
dw BattleCommand_Substitute ; 36e7c
|
||||
dw BattleCommand_RechargeNextTurn ; 36f0b
|
||||
dw BattleCommand_Mimic ; 36f46
|
||||
dw BattleCommand_Metronome ; 37418
|
||||
dw BattleCommand_LeechSeed ; 36f9d
|
||||
dw BattleCommand_Splash ; 36fe1
|
||||
dw BattleCommand_Disable ; 36fed
|
||||
dw BattleCommand_ClearText ; 37e85
|
||||
dw BattleCommand_Charge ; 36b4d
|
||||
dw BattleCommand_CheckCharge ; 36b3a
|
||||
dw BattleCommand_TrapTarget ; 36c2d
|
||||
dw BattleCommand3c ; 36c2c
|
||||
dw BattleCommand_Rampage ; 36751
|
||||
dw BattleCommand_CheckRampage ; 3671a
|
||||
dw BattleCommand_ConstantDamage ; 35726
|
||||
dw BattleCommand_Counter ; 35813
|
||||
dw BattleCommand_Encore ; 35864
|
||||
dw BattleCommand_PainSplit ; 35926
|
||||
dw BattleCommand_Snore ; 359d0
|
||||
dw BattleCommand_Conversion2 ; 359e6
|
||||
dw BattleCommand_LockOn ; 35a53
|
||||
dw BattleCommand_Sketch ; 35a74
|
||||
dw BattleCommand_DefrostOpponent ; 35b16
|
||||
dw BattleCommand_SleepTalk ; 35b33
|
||||
dw BattleCommand_DestinyBond ; 35bff
|
||||
dw BattleCommand_Spite ; 35c0f
|
||||
dw BattleCommand_FalseSwipe ; 35c94
|
||||
dw BattleCommand_HealBell ; 35cc9
|
||||
dw BattleCommand_HeldFlinch ; 36ac9
|
||||
dw BattleCommand_TripleKick ; 346b2
|
||||
dw BattleCommand_KickCounter ; 346cd
|
||||
dw BattleCommand_Thief ; 37492
|
||||
dw BattleCommand_ArenaTrap ; 37517
|
||||
dw BattleCommand_Nightmare ; 37536
|
||||
dw BattleCommand_Defrost ; 37563
|
||||
dw BattleCommand_Curse ; 37588
|
||||
dw BattleCommand_Protect ; 37618
|
||||
dw BattleCommand_Spikes ; 37683
|
||||
dw BattleCommand_Foresight ; 376a0
|
||||
dw BattleCommand_PerishSong ; 376c2
|
||||
dw BattleCommand_StartSandstorm ; 376f8
|
||||
dw BattleCommand_Endure ; 3766f
|
||||
dw BattleCommand_CheckCurl ; 37718
|
||||
dw BattleCommand_RolloutPower ; 37734
|
||||
dw BattleCommand5d ; 37791
|
||||
dw BattleCommand_FuryCutter ; 37792
|
||||
dw BattleCommand_Attract ; 377ce
|
||||
dw BattleCommand_HappinessPower ; 3784b
|
||||
dw BattleCommand_Present ; 37874
|
||||
dw BattleCommand_DamageCalc ; 35612 - 62
|
||||
dw BattleCommand_FrustrationPower ; 3790e
|
||||
dw BattleCommand_Safeguard ; 37939
|
||||
dw BattleCommand_CheckSafeguard ; 37972
|
||||
dw BattleCommand_GetMagnitude ; 37991
|
||||
dw BattleCommand_BatonPass ; 379c9
|
||||
dw BattleCommand_Pursuit ; 37b1d
|
||||
dw BattleCommand_ClearHazards ; 37b39
|
||||
dw BattleCommand_HealMorn ; 37b74
|
||||
dw BattleCommand_HealDay ; 37b78
|
||||
dw BattleCommand_HealNite ; 37b7c
|
||||
dw BattleCommand_HiddenPower ; 37be8
|
||||
dw BattleCommand_StartRain ; 37bf4
|
||||
dw BattleCommand_StartSun ; 37c07
|
||||
dw BattleCommand_AttackUp ; 361ac
|
||||
dw BattleCommand_DefenseUp ; 361b0
|
||||
dw BattleCommand_SpeedUp ; 361b4
|
||||
dw BattleCommand_SpecialAttackUp ; 361b8
|
||||
dw BattleCommand_SpecialDefenseUp ; 361bc
|
||||
dw BattleCommand_AccuracyUp ; 361c0
|
||||
dw BattleCommand_EvasionUp ; 361c4
|
||||
dw BattleCommand_AttackUp2 ; 361c8
|
||||
dw BattleCommand_DefenseUp2 ; 361cc
|
||||
dw BattleCommand_SpeedUp2 ; 361d0
|
||||
dw BattleCommand_SpecialAttackUp2 ; 361d4
|
||||
dw BattleCommand_SpecialDefenseUp2 ; 361d8
|
||||
dw BattleCommand_AccuracyUp2 ; 361dc
|
||||
dw BattleCommand_EvasionUp2 ; 361e0
|
||||
dw BattleCommand_AttackDown ; 362ad
|
||||
dw BattleCommand_DefenseDown ; 362b1
|
||||
dw BattleCommand_SpeedDown ; 362b5
|
||||
dw BattleCommand_SpecialAttackDown ; 362b9
|
||||
dw BattleCommand_SpecialDefenseDown ; 362bd
|
||||
dw BattleCommand_AccuracyDown ; 362c1
|
||||
dw BattleCommand_EvasionDown ; 362c5
|
||||
dw BattleCommand_AttackDown2 ; 362c9
|
||||
dw BattleCommand_DefenseDown2 ; 362cd
|
||||
dw BattleCommand_SpeedDown2 ; 362d1
|
||||
dw BattleCommand_SpecialAttackDown2 ; 362d5
|
||||
dw BattleCommand_SpecialDefenseDown2 ; 362d9
|
||||
dw BattleCommand_AccuracyDown2 ; 362dd
|
||||
dw BattleCommand_EvasionDown2 ; 362e1
|
||||
dw BattleCommand_StatUpMessage ; 363b8
|
||||
dw BattleCommand_StatDownMessage ; 363e9
|
||||
dw BattleCommand_StatUpFailText ; 3644c
|
||||
dw BattleCommand_StatDownFailText ; 3646a
|
||||
dw BattleCommand_EffectChance ; 34ecc
|
||||
dw BattleCommand_StatDownAnim ; 34fdb
|
||||
dw BattleCommand_StatUpAnim ; 34fd1
|
||||
dw BattleCommand_SwitchTurn ; 34ffd - 93
|
||||
dw BattleCommand_FakeOut ; 36a82
|
||||
dw BattleCommand_BellyDrum ; 37c1a
|
||||
dw BattleCommand_PsychUp ; 37c55
|
||||
dw BattleCommand_Rage ; 36f1d
|
||||
dw BattleCommand_DoubleFlyingDamage ; 36f25
|
||||
dw BattleCommand_DoubleUndergroundDamage ; 36f2f
|
||||
dw BattleCommand_MirrorCoat ; 37c95
|
||||
dw BattleCommand_CheckFutureSight ; 37d0d
|
||||
dw BattleCommand_FutureSight ; 37d34
|
||||
dw BattleCommand_DoubleMinimizeDamage ; 37ce6
|
||||
dw BattleCommand_SkipSunCharge ; 37d02
|
||||
dw BattleCommand_ThunderAccuracy ; 37d94
|
||||
dw BattleCommand_Teleport ; 36778
|
||||
dw BattleCommand_BeatUp ; 35461
|
||||
dw BattleCommand_RageDamage ; 3527b
|
||||
dw BattleCommand_ResetTypeMatchup ; 34833
|
||||
dw BattleCommand_AllStatsUp ; 36500
|
||||
dw BattleCommand_BideFailText ; 35165
|
||||
dw BattleCommand_RaiseSubNoAnim ; 365af
|
||||
dw BattleCommand_LowerSubNoAnim ; 365c3
|
||||
dw BattleCommand_BeatUpFailText ; 355b5
|
||||
dw BattleCommand_ClearMissDamage ; 355d5 - a9
|
||||
dw BattleCommand_MoveDelay ; 37e80
|
||||
dw BattleCommand_MoveAnim ; 34f57
|
||||
dw BattleCommand_TriStatusChance ; 3658f
|
||||
dw BattleCommand_SuperEffectiveLoopText ; 351a5
|
||||
dw BattleCommand_StartLoop ; 35197
|
||||
dw BattleCommand_Curl ; 365a7
|
||||
; 3fe86
|
||||
dw BattleCommand_CheckTurn
|
||||
dw BattleCommand_CheckObedience
|
||||
dw BattleCommand_UsedMoveText
|
||||
dw BattleCommand_DoTurn
|
||||
dw BattleCommand_Critical
|
||||
dw BattleCommand_DamageStats
|
||||
dw BattleCommand_Stab
|
||||
dw BattleCommand_DamageVariation
|
||||
dw BattleCommand_CheckHit
|
||||
dw BattleCommand_LowerSub
|
||||
dw BattleCommand_MoveAnimNoSub
|
||||
dw BattleCommand_RaiseSub
|
||||
dw BattleCommand_FailureText
|
||||
dw BattleCommand_ApplyDamage
|
||||
dw BattleCommand_CriticalText
|
||||
dw BattleCommand_SuperEffectiveText
|
||||
dw BattleCommand_CheckDestinyBond
|
||||
dw BattleCommand_BuildOpponentRage
|
||||
dw BattleCommand_PoisonTarget
|
||||
dw BattleCommand_SleepTarget
|
||||
dw BattleCommand_DrainTarget
|
||||
dw BattleCommand_EatDream
|
||||
dw BattleCommand_BurnTarget
|
||||
dw BattleCommand_FreezeTarget
|
||||
dw BattleCommand_ParalyzeTarget
|
||||
dw BattleCommand_Selfdestruct
|
||||
dw BattleCommand_MirrorMove
|
||||
dw BattleCommand_StatUp
|
||||
dw BattleCommand_StatDown
|
||||
dw BattleCommand_PayDay
|
||||
dw BattleCommand_Conversion
|
||||
dw BattleCommand_ResetStats
|
||||
dw BattleCommand_StoreEnergy
|
||||
dw BattleCommand_UnleashEnergy
|
||||
dw BattleCommand_ForceSwitch
|
||||
dw BattleCommand_EndLoop
|
||||
dw BattleCommand_FlinchTarget
|
||||
dw BattleCommand_OHKO
|
||||
dw BattleCommand_Recoil
|
||||
dw BattleCommand_Mist
|
||||
dw BattleCommand_FocusEnergy
|
||||
dw BattleCommand_Confuse
|
||||
dw BattleCommand_ConfuseTarget
|
||||
dw BattleCommand_Heal
|
||||
dw BattleCommand_Transform
|
||||
dw BattleCommand_Screen
|
||||
dw BattleCommand_Poison
|
||||
dw BattleCommand_Paralyze
|
||||
dw BattleCommand_Substitute
|
||||
dw BattleCommand_RechargeNextTurn
|
||||
dw BattleCommand_Mimic
|
||||
dw BattleCommand_Metronome
|
||||
dw BattleCommand_LeechSeed
|
||||
dw BattleCommand_Splash
|
||||
dw BattleCommand_Disable
|
||||
dw BattleCommand_ClearText
|
||||
dw BattleCommand_Charge
|
||||
dw BattleCommand_CheckCharge
|
||||
dw BattleCommand_TrapTarget
|
||||
dw BattleCommand3c
|
||||
dw BattleCommand_Rampage
|
||||
dw BattleCommand_CheckRampage
|
||||
dw BattleCommand_ConstantDamage
|
||||
dw BattleCommand_Counter
|
||||
dw BattleCommand_Encore
|
||||
dw BattleCommand_PainSplit
|
||||
dw BattleCommand_Snore
|
||||
dw BattleCommand_Conversion2
|
||||
dw BattleCommand_LockOn
|
||||
dw BattleCommand_Sketch
|
||||
dw BattleCommand_DefrostOpponent
|
||||
dw BattleCommand_SleepTalk
|
||||
dw BattleCommand_DestinyBond
|
||||
dw BattleCommand_Spite
|
||||
dw BattleCommand_FalseSwipe
|
||||
dw BattleCommand_HealBell
|
||||
dw BattleCommand_HeldFlinch
|
||||
dw BattleCommand_TripleKick
|
||||
dw BattleCommand_KickCounter
|
||||
dw BattleCommand_Thief
|
||||
dw BattleCommand_ArenaTrap
|
||||
dw BattleCommand_Nightmare
|
||||
dw BattleCommand_Defrost
|
||||
dw BattleCommand_Curse
|
||||
dw BattleCommand_Protect
|
||||
dw BattleCommand_Spikes
|
||||
dw BattleCommand_Foresight
|
||||
dw BattleCommand_PerishSong
|
||||
dw BattleCommand_StartSandstorm
|
||||
dw BattleCommand_Endure
|
||||
dw BattleCommand_CheckCurl
|
||||
dw BattleCommand_RolloutPower
|
||||
dw BattleCommand5d
|
||||
dw BattleCommand_FuryCutter
|
||||
dw BattleCommand_Attract
|
||||
dw BattleCommand_HappinessPower
|
||||
dw BattleCommand_Present
|
||||
dw BattleCommand_DamageCalc
|
||||
dw BattleCommand_FrustrationPower
|
||||
dw BattleCommand_Safeguard
|
||||
dw BattleCommand_CheckSafeguard
|
||||
dw BattleCommand_GetMagnitude
|
||||
dw BattleCommand_BatonPass
|
||||
dw BattleCommand_Pursuit
|
||||
dw BattleCommand_ClearHazards
|
||||
dw BattleCommand_HealMorn
|
||||
dw BattleCommand_HealDay
|
||||
dw BattleCommand_HealNite
|
||||
dw BattleCommand_HiddenPower
|
||||
dw BattleCommand_StartRain
|
||||
dw BattleCommand_StartSun
|
||||
dw BattleCommand_AttackUp
|
||||
dw BattleCommand_DefenseUp
|
||||
dw BattleCommand_SpeedUp
|
||||
dw BattleCommand_SpecialAttackUp
|
||||
dw BattleCommand_SpecialDefenseUp
|
||||
dw BattleCommand_AccuracyUp
|
||||
dw BattleCommand_EvasionUp
|
||||
dw BattleCommand_AttackUp2
|
||||
dw BattleCommand_DefenseUp2
|
||||
dw BattleCommand_SpeedUp2
|
||||
dw BattleCommand_SpecialAttackUp2
|
||||
dw BattleCommand_SpecialDefenseUp2
|
||||
dw BattleCommand_AccuracyUp2
|
||||
dw BattleCommand_EvasionUp2
|
||||
dw BattleCommand_AttackDown
|
||||
dw BattleCommand_DefenseDown
|
||||
dw BattleCommand_SpeedDown
|
||||
dw BattleCommand_SpecialAttackDown
|
||||
dw BattleCommand_SpecialDefenseDown
|
||||
dw BattleCommand_AccuracyDown
|
||||
dw BattleCommand_EvasionDown
|
||||
dw BattleCommand_AttackDown2
|
||||
dw BattleCommand_DefenseDown2
|
||||
dw BattleCommand_SpeedDown2
|
||||
dw BattleCommand_SpecialAttackDown2
|
||||
dw BattleCommand_SpecialDefenseDown2
|
||||
dw BattleCommand_AccuracyDown2
|
||||
dw BattleCommand_EvasionDown2
|
||||
dw BattleCommand_StatUpMessage
|
||||
dw BattleCommand_StatDownMessage
|
||||
dw BattleCommand_StatUpFailText
|
||||
dw BattleCommand_StatDownFailText
|
||||
dw BattleCommand_EffectChance
|
||||
dw BattleCommand_StatDownAnim
|
||||
dw BattleCommand_StatUpAnim
|
||||
dw BattleCommand_SwitchTurn
|
||||
dw BattleCommand_FakeOut
|
||||
dw BattleCommand_BellyDrum
|
||||
dw BattleCommand_PsychUp
|
||||
dw BattleCommand_Rage
|
||||
dw BattleCommand_DoubleFlyingDamage
|
||||
dw BattleCommand_DoubleUndergroundDamage
|
||||
dw BattleCommand_MirrorCoat
|
||||
dw BattleCommand_CheckFutureSight
|
||||
dw BattleCommand_FutureSight
|
||||
dw BattleCommand_DoubleMinimizeDamage
|
||||
dw BattleCommand_SkipSunCharge
|
||||
dw BattleCommand_ThunderAccuracy
|
||||
dw BattleCommand_Teleport
|
||||
dw BattleCommand_BeatUp
|
||||
dw BattleCommand_RageDamage
|
||||
dw BattleCommand_ResetTypeMatchup
|
||||
dw BattleCommand_AllStatsUp
|
||||
dw BattleCommand_BideFailText
|
||||
dw BattleCommand_RaiseSubNoAnim
|
||||
dw BattleCommand_LowerSubNoAnim
|
||||
dw BattleCommand_BeatUpFailText
|
||||
dw BattleCommand_ClearMissDamage
|
||||
dw BattleCommand_MoveDelay
|
||||
dw BattleCommand_MoveAnim
|
||||
dw BattleCommand_TriStatusChance
|
||||
dw BattleCommand_SuperEffectiveLoopText
|
||||
dw BattleCommand_StartLoop
|
||||
dw BattleCommand_Curl
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; Held item effects that are consumed on use
|
||||
|
||||
ConsumableEffects: ; 271de
|
||||
ConsumableEffects:
|
||||
db HELD_BERRY
|
||||
db HELD_2
|
||||
db HELD_5
|
||||
@@ -23,4 +23,3 @@ ConsumableEffects: ; 271de
|
||||
db HELD_ESCAPE
|
||||
db HELD_CRITICAL_UP
|
||||
db -1
|
||||
; 271f4
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; See also data/items/heal_status.asm
|
||||
|
||||
HeldStatusHealingEffects: ; 3de44
|
||||
HeldStatusHealingEffects:
|
||||
db HELD_HEAL_POISON, 1 << PSN
|
||||
db HELD_HEAL_FREEZE, 1 << FRZ
|
||||
db HELD_HEAL_BURN, 1 << BRN
|
||||
@@ -8,4 +8,3 @@ HeldStatusHealingEffects: ; 3de44
|
||||
db HELD_HEAL_PARALYZE, 1 << PAR
|
||||
db HELD_HEAL_STATUS, ALL_STATUS
|
||||
db -1 ; end
|
||||
; 3de51
|
||||
|
@@ -7,4 +7,3 @@ HeldStatUpItems:
|
||||
dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp
|
||||
dbw HELD_EVASION_UP, BattleCommand_EvasionUp
|
||||
db -1 ; end
|
||||
; 3df12
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; Metronome cannot turn into these moves.
|
||||
|
||||
MetronomeExcepts: ; 37454
|
||||
MetronomeExcepts:
|
||||
db NO_MOVE
|
||||
db METRONOME
|
||||
db STRUGGLE
|
||||
@@ -15,4 +15,3 @@ MetronomeExcepts: ; 37454
|
||||
db SLEEP_TALK
|
||||
db THIEF
|
||||
db -1
|
||||
; 37462
|
||||
|
@@ -1,6 +1,6 @@
|
||||
; colors of balls thrown in battle
|
||||
|
||||
BallColors: ; cd26c (33:526c)
|
||||
BallColors:
|
||||
db MASTER_BALL, PAL_BATTLE_OB_GREEN
|
||||
db ULTRA_BALL, PAL_BATTLE_OB_YELLOW
|
||||
db GREAT_BALL, PAL_BATTLE_OB_BLUE
|
||||
@@ -13,4 +13,3 @@ BallColors: ; cd26c (33:526c)
|
||||
db MOON_BALL, PAL_BATTLE_OB_GRAY
|
||||
db LOVE_BALL, PAL_BATTLE_OB_RED
|
||||
db -1, PAL_BATTLE_OB_GRAY
|
||||
; cd284
|
||||
|
@@ -1,4 +1,4 @@
|
||||
BattleAnimFrameData: ; ce85e
|
||||
BattleAnimFrameData:
|
||||
; entries correspond to BATTLEANIMFRAMESET_* constants
|
||||
dw .Frameset_00 ; BATTLEANIMFRAMESET_00
|
||||
dw .Frameset_01 ; BATTLEANIMFRAMESET_01
|
||||
@@ -1267,4 +1267,3 @@ BattleAnimFrameData: ; ce85e
|
||||
frame BATTLEANIMOAMSET_D7, 8
|
||||
endanim
|
||||
|
||||
; ceeae
|
||||
|
@@ -1,4 +1,4 @@
|
||||
BattleAnimOAMData: ; ceeae
|
||||
BattleAnimOAMData:
|
||||
; entries correspond to BATTLEANIMOAMSET_* constants
|
||||
; vtile offset, length, pointer
|
||||
dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00
|
||||
@@ -1083,4 +1083,3 @@ BattleAnimOAMData: ; ceeae
|
||||
dsprite -2, 0, 6, 4, $00, $0
|
||||
dsprite -4, 0, 8, 4, $00, $0
|
||||
dsprite -2, 0, 10, 4, $00, $0
|
||||
; cfcf6
|
||||
|
@@ -4,7 +4,7 @@ anim_obj_gfx: MACRO
|
||||
dba \2
|
||||
ENDM
|
||||
|
||||
AnimObjGFX: ; cfcf6
|
||||
AnimObjGFX:
|
||||
; entries correspond to ANIM_GFX_* constants
|
||||
anim_obj_gfx 0, AnimObj00GFX
|
||||
anim_obj_gfx 21, AnimObjHitGFX
|
||||
@@ -48,4 +48,3 @@ AnimObjGFX: ; cfcf6
|
||||
anim_obj_gfx 24, AnimObjAeroblastGFX
|
||||
anim_obj_gfx 1, NULL
|
||||
anim_obj_gfx 1, NULL
|
||||
; cfd9e
|
||||
|
@@ -16,7 +16,7 @@ battleanimobj: MACRO
|
||||
db \6 ; tile offset
|
||||
ENDM
|
||||
|
||||
BattleAnimObjects: ; ccb56
|
||||
BattleAnimObjects:
|
||||
; entries correspond to ANIM_OBJ_* constants
|
||||
battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_00
|
||||
battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_01
|
||||
@@ -206,4 +206,3 @@ BattleAnimObjects: ; ccb56
|
||||
battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYFEETFOLLOW
|
||||
battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_PLAYERHEADFOLLOW
|
||||
battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYHEADFOLLOW
|
||||
; ccfbe
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user