Eduardo Quezada 18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # asm/macros/battle_anim_script.inc # data/battle_anim_scripts.s # include/constants/battle_anim.h # src/battle_anim.c # src/data/battle_anim.h		2024-07-27 16:26:37 -04:00
..
ability	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-27 16:26:37 -04:00
ai	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -04:00
form_change	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -04:00
gimmick	Some tera tests (#5020)	2024-07-22 20:43:17 +02:00
hold_effect	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -04:00
item_effect	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-05 14:25:25 -04:00
move_animations	Fix Smack Down anim + move anim tests (#4774)	2024-06-13 15:30:28 -04:00
move_effect	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-26 09:42:52 -04:00
move_effect_secondary	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -04:00
move_effects_combined	fix tests when B_USE_FROSTBITE is TRUE (#4986)	2024-07-17 23:23:52 +02:00
move_flags	ignoresTargetAbility doesnt ignore the attacker's ability (#4855)	2024-06-22 09:52:25 +02:00
status1	Remove Duplicate ai code from battle_ai_util.c (#4883)	2024-07-03 10:48:31 +02:00
status2	Confusion, cursed body and poison touch trigger chance fixes and tests (#4831)	2024-06-18 20:07:40 +02:00
terrain	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-05 14:25:25 -04:00
weather	Refactors residual damage (#4945)	2024-07-13 12:12:40 +02:00
battle_message.c	Add switching message macros for tests (#4717)	2024-06-03 19:59:28 -04:00
crit_chance.c	Add RandomChance macro and ability trigger chance config (#4829)	2024-06-18 20:13:44 +02:00
damage_formula.c	Enable GF move names by default	2024-04-25 18:40:37 +01:00
exp.c
move.c
test_runner_features.c	Test battlers always have their forced abilities (#4707)	2024-07-21 21:20:39 +02:00
trainer_control.c	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -04:00
trainer_control.h	Updated reference to config location to new location (#5026)	2024-07-23 14:09:32 -04:00
trainer_control.party