Hedara 0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30 ... Conflicts: include/battle.h include/constants/expansion.h include/graphics.h src/battle_bg.c src/battle_util.c src/data/graphics/battle_terrain.h src/data/graphics/pokemon.h src/pokeblock_feed.c src/pokemon_sprite_visualizer.c		2025-04-30 15:22:37 +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	Updated label workflow (#6729)	2025-04-30 14:01:45 +02:00
pull_request_template.md	Add CONTRIBUTING.md and STYLEGUIDE.md (#6340)	2025-04-01 15:38:59 +02:00