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
..
macros	Merge branch 'master' into master-upcoming	2025-06-25 14:17:07 +02:00
macros.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00