Eduardo Quezada d076193b9f Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # include/constants/battle.h # include/constants/battle_script_commands.h # src/battle_script_commands.c # src/data/battle_moves.h		2023-12-03 16:39:32 -03:00
..
ability	Merge branch 'RHH/master' into RHH/upcoming	2023-12-03 16:39:32 -03:00
form_change	Add species defines for base forms with names (#3248)	2023-10-23 12:59:15 +01:00
hold_effect	Merge branch 'RHH/master' into RHH/upcoming	2023-12-03 16:39:32 -03:00
item_effect	Fix Battle/Shell Armor + crit chance Tests (#3377)	2023-10-04 16:46:42 +02:00
move_effect	Merge branch 'RHH/master' into RHH/upcoming	2023-12-03 16:39:32 -03:00
move_flags	Add new move flags and update all flags for every move (#3425)	2023-10-19 20:16:37 -03:00
status1	Test improvements (#3408)	2023-10-12 12:14:07 +02:00
terrain	fix psychic terrain blocking moves it shouldnt block (#3521)	2023-11-03 21:01:02 +01:00
weather	Remove all trailing whitespace (upcoming) (#3473)	2023-10-27 13:54:55 -03:00
ai.c	Extend AI_FLAG_SMART_SWITCHING for Encore / hazards / lowered attacking stats (#3557)	2023-11-30 12:37:19 +01:00
ai_check_viability.c	Increase score of secondary effects only at 100% chance (#3583)	2023-11-21 11:30:20 +01:00
ai_trytofaint.c	Remove function GetMoveDamageResult (#3536)	2023-11-09 20:53:14 +01:00
crit_chance.c	Fix Battle/Shell Armor + crit chance Tests (#3377)	2023-10-04 16:46:42 +02:00
damage_formula.c	Adds combined pledge move effects (#3336)	2023-11-21 16:23:22 +01:00
exp.c	Fix Wall Werrors on modern (#3412)	2023-10-13 18:39:35 +02:00
move.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
trainer_control.c	fix -Wmaybe-uninitialized for ModifyPersonalityForNature test	2023-10-24 01:02:02 +02:00