pokeemerald/src/data/pokemon
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
..
level_up_learnsets
species_info Merge branch 'master' into master-upcoming 2025-05-12 18:21:35 +02:00
egg_moves.h Added Egg Moves for Basculin White Striped (#6769) 2025-05-04 11:43:57 +02:00
experience_tables.h
form_change_table_pointers.h
form_change_tables.h
form_species_tables.h
item_effects.h
pokedex_orders.h
species_info.h
teachable_learnsets.h
trainer_class_lookups.h