Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ...

Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c

2025-05-28 14:26:15 +02:00

..

calcrom

Sync calcrom fixes

2022-11-27 17:33:09 -05:00

ISSUE_TEMPLATE

Merge branch 'master' into master-to-upcoming

2025-05-28 14:26:15 +02:00

workflows

Added type: documentation to required labels for the label check (#6957)

2025-05-22 00:45:25 -07:00

pull_request_template.md

Add CREDITS.md & FEATURES.md, rewrite README.md & INSTALL.md (#6700)

2025-05-17 19:33:22 +02:00