Eduardo Quezada c8b0545d20 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # include/battle.h		2023-11-25 00:51:33 -03:00
..
absorb.c
accuracy_down.c
after_you.c
assist.c
attack_down.c
attack_up.c
attack_up_user_ally.c
aurora_veil.c
axe_kick.c
barb_barrage.c
beak_blast.c
bide.c
brick_break.c
bug_bite.c
burn_hit.c
burn_up.c
collision_course.c
corrosive_gas.c
court_change.c
defense_down.c
defense_up.c
defog.c
dire_claw.c
double_shock.c
dream_eater.c
embargo.c
encore.c
evasion_up.c
explosion.c
flinch_hit.c
flinch_status.c
fling.c
focus_punch.c
freeze_hit.c
glaive_rush.c
haze.c
healing_wish.c
hex.c
hit_escape.c
hit_set_entry_hazardss.c
hit_set_remove_terrain.c
hit_switch_target.c
hurricane.c
hydro_steam.c
infernal_parade.c
ivy_cudgel.c
knock_off.c
last_resort.c
leech_seed.c
make_it_rain.c
matcha_gotcha.c
metronome.c
mind_blown.c
mirror_move.c
moonlight.c
morning_sun.c
mortal_spin.c
multi_hit.c
octolock.c
ohko.c
paralyze_hit.c
plasma_fists.c
pledge.c
poison_hit.c
population_bomb.c
protect.c
rampage.c
recoil_if_miss.c
reflect.c
reflect_type.c
relic_song.c
revival_blessing.c
roar.c
roost.c
salt_cure.c
shell_trap.c
sleep.c
solar_beam.c
special_attack_down.c
special_attack_up_3.c
spikes.c
spin_out.c
stealth_rock.c
sticky_web.c
stockpile.c
strength_sap.c
synthesis.c
syrup_bomb.c
tailwind.c
take_heart.c
teatime.c
teleport.c
thunder.c
torment.c
toxic.c
toxic_spikes.c
tri_attack.c
triple_arrows.c
triple_kick.c
venoshock.c
weather_ball.c