diff options
Diffstat (limited to 'engine/battle')
-rwxr-xr-x | engine/battle/misc.asm (renamed from engine/battle/bank_e_misc.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/conversion.asm (renamed from engine/battle/moveEffects/conversion_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/drain_hp.asm (renamed from engine/battle/moveEffects/drain_hp_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/focus_energy.asm (renamed from engine/battle/moveEffects/focus_energy_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/haze.asm (renamed from engine/battle/moveEffects/haze_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/heal.asm (renamed from engine/battle/moveEffects/heal_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/leech_seed.asm (renamed from engine/battle/moveEffects/leech_seed_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/mist.asm (renamed from engine/battle/moveEffects/mist_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/one_hit_ko.asm (renamed from engine/battle/moveEffects/one_hit_ko_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/paralyze.asm (renamed from engine/battle/moveEffects/paralyze_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/pay_day.asm (renamed from engine/battle/moveEffects/pay_day_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/recoil.asm (renamed from engine/battle/moveEffects/recoil_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/reflect_light_screen.asm (renamed from engine/battle/moveEffects/reflect_light_screen_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/substitute.asm (renamed from engine/battle/moveEffects/substitute_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/move_effects/transform.asm (renamed from engine/battle/moveEffects/transform_effect.asm) | 0 | ||||
-rw-r--r-- | engine/battle/trainer_ai.asm | 2 |
16 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/misc.asm index 33af6f6f..33af6f6f 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/misc.asm diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/move_effects/conversion.asm index f23c3d70..f23c3d70 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/move_effects/conversion.asm diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/move_effects/drain_hp.asm index e5f4681a..e5f4681a 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/move_effects/drain_hp.asm diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/move_effects/focus_energy.asm index 16dad7bb..16dad7bb 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/move_effects/focus_energy.asm diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/move_effects/haze.asm index 47723ba2..47723ba2 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/move_effects/haze.asm diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/move_effects/heal.asm index 2e68acc0..2e68acc0 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/move_effects/heal.asm diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/move_effects/leech_seed.asm index f4d3ee9c..f4d3ee9c 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/move_effects/leech_seed.asm diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/move_effects/mist.asm index 65070a3e..65070a3e 100644 --- a/engine/battle/moveEffects/mist_effect.asm +++ b/engine/battle/move_effects/mist.asm diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/move_effects/one_hit_ko.asm index 827e2197..827e2197 100644 --- a/engine/battle/moveEffects/one_hit_ko_effect.asm +++ b/engine/battle/move_effects/one_hit_ko.asm diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/move_effects/paralyze.asm index 95979ae6..95979ae6 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/move_effects/paralyze.asm diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/move_effects/pay_day.asm index e5daf014..e5daf014 100644 --- a/engine/battle/moveEffects/pay_day_effect.asm +++ b/engine/battle/move_effects/pay_day.asm diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/move_effects/recoil.asm index 0f2f087b..0f2f087b 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/move_effects/recoil.asm diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/move_effects/reflect_light_screen.asm index 2805a969..2805a969 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/move_effects/reflect_light_screen.asm diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/move_effects/substitute.asm index 1bb6c887..1bb6c887 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/move_effects/substitute.asm diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/move_effects/transform.asm index 9a5de9cc..9a5de9cc 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/move_effects/transform.asm diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 7755b50f..2850b9c2 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -279,7 +279,7 @@ INCLUDE "data/trainer_pic_money_pointers.asm" INCLUDE "text/trainer_names.asm" -INCLUDE "engine/battle/bank_e_misc.asm" +INCLUDE "engine/battle/misc.asm" INCLUDE "engine/battle/read_trainer_party.asm" |