Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
master
pokeemerald-expansion/test/battle/starting_status
History
Hedara 78124e88d7 Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming 
Conflicts:
	src/battle_main.c
	test/battle/ability/beads_of_ruin.c
	test/battle/ability/commander.c
	test/battle/ability/desolate_land.c
	test/battle/ability/primordial_sea.c
	test/battle/ability/supreme_overlord.c
	test/battle/ability/sword_of_ruin.c
	test/battle/ability/tablets_of_ruin.c
	test/battle/ability/vessel_of_ruin.c
	test/battle/ai/ai.c
	test/battle/ai/ai_multi.c
	test/battle/ai/ai_switching.c
	test/battle/gimmick/dynamax.c
	test/battle/move_effect/counter.c
	test/battle/move_effect/fling.c
	test/battle/move_effect/mirror_coat.c
	test/battle/move_effect/misty_explosion.c
	test/battle/move_effect/protect.c
	test/battle/move_effect/psychic_terrain.c
	test/battle/move_effect/sticky_web.c
	test/battle/trainer_slides.c
2026-01-04 11:28:59 +01:00
..
hazards.c fix: reviewer comments 2025-12-14 15:33:28 +01:00
terrain.c Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming 2026-01-04 11:28:59 +01:00