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

..

calcrom

Sync calcrom fixes

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

ISSUE_TEMPLATE

Merge branch 'master' into master-upcoming-2025-04-30

2025-04-30 15:22:37 +02:00

workflows

Changed github CI to use arm-none-eabi-gcc (#6829)

2025-05-12 16:38:03 +01:00

pull_request_template.md

Add CONTRIBUTING.md and STYLEGUIDE.md (#6340)

2025-04-01 15:38:59 +02:00