Eduardo Quezada D'Ottone 02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb ... # Conflicts: # include/graphics.h # src/data/graphics/items.h # src/data/item_icon_table.h # src/data/items.h # src/data/text/item_descriptions.h		2022-01-16 18:44:03 -03:00
..
abilities.h	Use normal apostrophes like adults	2018-12-07 10:41:08 -05:00
gift_ribbon_descriptions.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
item_descriptions.h	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb	2022-01-16 18:44:03 -03:00
match_call_messages.h	Start misc battle documentation	2021-10-08 16:39:46 -04:00
move_descriptions.h	Merge remote-tracking branch 'upstream/master'	2018-12-08 12:13:15 +08:00
move_names.h	Move move descriptions to C	2018-08-12 00:03:19 +02:00
nature_names.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
ribbon_descriptions.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
species_names.h	Use normal apostrophes like adults	2018-12-07 10:41:08 -05:00
trainer_class_names.h	Document remaining symbols in pokemon.c	2021-10-02 23:48:12 -04:00