Eduardo Quezada ead108d28e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/graphics/pokemon.h		2024-02-19 13:49:10 -03:00
..
battle.h	Sets neutral nature and ability 0 as default in trainer control (#4172)	2024-02-18 15:02:58 +01:00
debug.h	ai delay timer	2023-09-12 10:35:05 +02:00
decap.h	Reformatted for code review. Moved config to include/config/decap.h.	2024-01-17 01:12:04 -05:00
item.h	Add power item config (#3961)	2024-01-11 09:34:19 +01:00
overworld.h	Moved follower settings to overworld config	2024-02-18 00:16:59 -03:00
pokemon.h	Moved follower settings to overworld config	2024-02-18 00:16:59 -03:00
save.h	Actually multi battles seem to work fine too	2024-02-02 16:52:39 +01:00
species_enabled.h	Add Indigo Disk Pokemon data (#3878)	2024-01-01 01:38:50 +01:00