Eduardo Quezada 7c7396c1be Merge branch 'RHH/master' into RHH/upcoming ...

# Conflicts:
#	src/battle_ai_main.c

2023-10-05 13:31:22 -03:00

..

ability

Fix Intimidate Contrary in double battles

2023-10-01 19:06:43 +02:00

form_change

Fixed Ultra Burst + Mega Evolution test

2023-08-31 22:33:20 -04:00

hold_effect

Fix Red Card not getting consumed after Sticky Web activation (#3364)

2023-10-01 10:35:12 -03:00

item_effect

Fix Battle/Shell Armor + crit chance Tests (#3377)

2023-10-04 16:46:42 +02:00

move_effect

Roost suppresses the user's Flying-type rather than remove and re-add it. Added tests for EFFECT_ROOST. (#3258)

2023-10-05 09:19:29 +02:00

move_flags

Missing master merge organization

2023-08-13 19:01:03 -04:00

status1

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

terrain

Organized tests into subfolders (#2822)

2023-08-12 20:00:15 +01:00

type

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

weather

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

ai.c

AI battle tests + AI logic fixes (#3361)

2023-10-04 18:53:29 +01:00

crit_chance.c

Fix Battle/Shell Armor + crit chance Tests (#3377)

2023-10-04 16:46:42 +02:00

damage_formula.c

Missing master merge organization

2023-08-13 19:01:03 -04:00

exp.c

Wild battle tests + tests for exp points (#3342)

2023-09-27 08:35:05 +01:00

move.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

trainer_control.c

Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367)

2023-10-02 18:33:47 -03:00