Hedara 51a5577f65 Merge branch 'master' into master-upcoming
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
2025-06-25 14:17:07 +02:00
..
2021-11-07 13:33:05 -05:00
2021-07-20 15:18:31 -04:00
2024-11-03 10:11:05 -05:00
2024-01-22 19:12:52 -03:00
2024-05-30 13:56:14 -04:00
2025-01-17 17:54:38 +00:00
2025-04-27 14:56:18 +02:00
2023-08-04 14:17:28 -04:00
2023-11-23 21:31:33 +01:00
2022-09-11 14:14:49 -04:00
2025-05-31 09:03:12 +02:00
2021-07-20 15:18:31 -04:00
2025-02-12 14:31:42 +01:00
2025-05-31 09:03:12 +02:00
2021-07-20 15:18:31 -04:00