diff options
Diffstat (limited to 'data/battle/ai')
| -rw-r--r-- | data/battle/ai/constant_damage_effects.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/encore_moves.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/rain_dance_moves.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/reckless_moves.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/residual_moves.asm | 1 | ||||
| -rw-r--r-- | data/battle/ai/risky_effects.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/stall_moves.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/status_only_effects.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/sunny_day_moves.asm | 3 | ||||
| -rw-r--r-- | data/battle/ai/useful_moves.asm | 3 |
10 files changed, 9 insertions, 19 deletions
diff --git a/data/battle/ai/constant_damage_effects.asm b/data/battle/ai/constant_damage_effects.asm index 0ce67c191..cd812d415 100644 --- a/data/battle/ai/constant_damage_effects.asm +++ b/data/battle/ai/constant_damage_effects.asm @@ -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 diff --git a/data/battle/ai/encore_moves.asm b/data/battle/ai/encore_moves.asm index b18f2419d..03e028bd1 100644 --- a/data/battle/ai/encore_moves.asm +++ b/data/battle/ai/encore_moves.asm @@ -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 diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm index 05cf68670..c00e0b60a 100644 --- a/data/battle/ai/rain_dance_moves.asm +++ b/data/battle/ai/rain_dance_moves.asm @@ -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 diff --git a/data/battle/ai/reckless_moves.asm b/data/battle/ai/reckless_moves.asm index 40bc070d8..67252979b 100644 --- a/data/battle/ai/reckless_moves.asm +++ b/data/battle/ai/reckless_moves.asm @@ -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 diff --git a/data/battle/ai/residual_moves.asm b/data/battle/ai/residual_moves.asm index 99407e238..c99ac0f5e 100644 --- a/data/battle/ai/residual_moves.asm +++ b/data/battle/ai/residual_moves.asm @@ -14,4 +14,3 @@ ResidualMoves: db SUBSTITUTE db SPIKES db -1 ; end -; 39453 diff --git a/data/battle/ai/risky_effects.asm b/data/battle/ai/risky_effects.asm index 2ca0bc655..529436c48 100644 --- a/data/battle/ai/risky_effects.asm +++ b/data/battle/ai/risky_effects.asm @@ -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 diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm index 5a017dadf..65838e0f0 100644 --- a/data/battle/ai/stall_moves.asm +++ b/data/battle/ai/stall_moves.asm @@ -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 diff --git a/data/battle/ai/status_only_effects.asm b/data/battle/ai/status_only_effects.asm index daeadb46c..8748d93b3 100644 --- a/data/battle/ai/status_only_effects.asm +++ b/data/battle/ai/status_only_effects.asm @@ -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 diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm index 0ec59bc9e..38d6a8ee7 100644 --- a/data/battle/ai/sunny_day_moves.asm +++ b/data/battle/ai/sunny_day_moves.asm @@ -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 diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm index 3bab9e598..456bda2da 100644 --- a/data/battle/ai/useful_moves.asm +++ b/data/battle/ai/useful_moves.asm @@ -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 |