Eduardo Quezada D'Ottone 681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h		2022-09-18 18:25:05 -03:00
..
abilities.h	popup and flower gift description fixes	2022-05-22 13:10:51 +03:00
gift_ribbon_descriptions.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
item_descriptions.h	Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION	2022-08-02 00:15:55 -05:00
match_call_messages.h	Start misc battle documentation	2021-10-08 16:39:46 -04:00
move_descriptions.h	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
move_names.h	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
nature_names.h	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 21:23:54 -08:00
ribbon_descriptions.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
species_names.h	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
trainer_class_names.h	Document remaining symbols in pokemon.c	2021-10-02 23:48:12 -04:00