Eduardo Quezada 566ec93492 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # data/battle_scripts_1.s # include/constants/battle_move_effects.h # include/constants/battle_script_commands.h # include/constants/battle_string_ids.h # src/battle_script_commands.c # src/data/battle_moves.h		2023-09-24 20:32:45 -03:00
..
absorb.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
accuracy_down.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
after_you.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
assist.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
attack_down.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
attack_up_user_ally.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
attack_up.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
axe_kick.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
barb_barrage.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
beak_blast.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
bide.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
bug_bite.c	Bug bite/Fling enigma berry interaction & tests (#3311)	2023-09-14 14:13:11 -03:00
burn_hit.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
burn_up.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
collision_course.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
corrosive_gas.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
court_change.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
defense_down.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
defense_up.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
defog.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
dire_claw.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
double_shock.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
dream_eater.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
encore.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
evasion_up.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
explosion.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
fling.c	Bug bite/Fling enigma berry interaction & tests (#3311)	2023-09-14 14:13:11 -03:00
focus_punch.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
freeze_hit.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
gigaton_hammer.c	Adds Gigaton Hammer and Salt Cure (#3297)	2023-09-15 11:18:47 -03:00
haze.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
healing_wish.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
hex.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
hit_escape.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
hit_set_entry_hazardss.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
hit_set_remove_terrain.c	Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247)	2023-09-24 00:01:18 -03:00
hit_switch_target.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
hydro_steam.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
infernal_parade.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
make_it_rain.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
metronome.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
mind_blown.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
mirror_move.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
mortal_spin.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
multi_hit.c	Fix Scale Shot bug and use Canceller Multihit Moves (#3290)	2023-09-10 11:57:19 -03:00
paralyze_hit.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
poison_hit.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
population_bomb.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
rampage.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
recoil_if_miss.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
reflect.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
revival_blessing.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
roar.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
salt_cure.c	Adds Gigaton Hammer and Salt Cure (#3297)	2023-09-15 11:18:47 -03:00
shell_trap.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
sleep.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
special_attack_down.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
special_attack_up_3.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
spikes.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
spin_out.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
sticky_web.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
stockpile.c	Fix tests breaking on modern (#3319)	2023-09-19 12:15:03 +02:00
tailwind.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
take_heart.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
teatime.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
teleport.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
torment.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
toxic_spikes.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
toxic.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
tri_attack.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
triple_arrows.c	Missing master merge organization	2023-08-13 19:01:03 -04:00
triple_kick.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
venoshock.c	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00