Eduardo Quezada 55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h		2023-01-04 16:19:57 -03:00
..
battle.h	Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg	2023-01-04 09:18:39 -05:00
debug.h	Renamed missing overworld debug configs	2022-11-14 14:07:32 -03:00
item.h	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
overworld.h	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
pokemon.h	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2	2023-01-04 16:19:57 -03:00