Leahnaya/pokeemerald

mirror of https://github.com/pret/pokeemerald.git synced 2026-04-18 13:17:28 -05:00

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

3.5 KiB

Raw Blame History

Summary