Hedara 1abfa7acfa Merge branch 'master' into master-upcoming ... Conflicts: include/battle.h include/constants/battle_string_ids.h src/battle_ai_util.c src/battle_main.c src/battle_util.c test/battle/ai/ai.c		2025-05-12 18:21:35 +02:00
..
hail.c	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
rain.c	Encapsulate move data (#5852)	2025-01-01 20:34:33 +01:00
sandstorm.c	A lot of tests (#6734)	2025-05-07 16:50:12 +02:00
snow.c	Changed Tackle for Scratch in tests (#6730)	2025-04-30 17:18:52 -04:00
sunlight.c	Encapsulate move data (#5852)	2025-01-01 20:34:33 +01:00