Eduardo Quezada 11beec62ee Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/data/pokemon/evolution.h # src/field_poison.c		2023-04-14 11:31:02 -04:00
..
battle.h	Update explanation in include/config/battle.h	2023-04-01 14:12:50 -07:00
debug.h	Updated the debug menu	2023-03-08 15:27:22 -03:00
item.h	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-27 10:55:38 -03:00
overworld.h	OW Poison configs	2023-04-06 00:26:52 +02:00
pokemon.h	Config to have Shuckle make Berry Juice from Oran Berries (#2331)	2023-02-19 10:45:59 +01:00