Eduardo Quezada 749225ace1 Matching merge from upstream pret ...

# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c

2023-01-20 12:31:54 -03:00

..

egg_moves.h

Generations of Pokémon can now be disabled individually

2022-08-30 12:50:59 -04:00

evolution.h

Generations of Pokémon can now be disabled individually

2022-08-30 12:50:59 -04:00

experience_tables.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

form_change_table_pointers.h

Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig

2022-09-18 18:25:05 -03:00

form_change_tables.h

Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig

2022-09-18 18:25:05 -03:00

form_species_table_pointers.h

Revert "Removed Unown hack"

2023-01-07 11:39:56 -03:00

form_species_tables.h

Revert "Removed Unown hack"

2023-01-07 11:39:56 -03:00

item_effects.h

Merge pull request #2142 from AgustinGDLV/exp_candy

2022-08-25 23:03:24 -04:00

level_up_learnset_pointers.h

Revert "Removed Unown hack"

2023-01-07 11:39:56 -03:00

level_up_learnsets.h

Uncommented level up moves

2022-11-11 01:31:22 -03:00

pokedex_entries.h

Generations of Pokémon can now be disabled individually

2022-08-30 12:50:59 -04:00

pokedex_orders.h

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

pokedex_text.h

Generations of Pokémon can now be disabled individually

2022-08-30 12:50:59 -04:00

species_info.h

Matching merge from upstream pret

2023-01-20 12:31:54 -03:00

teachable_learnset_pointers.h

Revert "Removed Unown hack"

2023-01-07 11:39:56 -03:00

teachable_learnsets.h

Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig

2022-10-07 14:05:45 -03:00

trainer_class_lookups.h

Document remaining symbols in pokemon.c

2021-10-02 23:48:12 -04:00