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
..
ai.h
battle.h	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
caps.h
debug.h
dexnav.h
follower_npc.h
general.h
item.h
overworld.h
pokedex_plus_hgss.h
pokemon.h
save.h
species_enabled.h
summary_screen.h
test.h	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00