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
..
bard_music
battle_frontier	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-10 00:17:03 -04:00
decoration
easy_chat
field_effects	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
graphics	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
object_events	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-10 00:17:03 -04:00
pokemon	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
pokemon_graphics	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
region_map
text	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
trainer_graphics
.gitignore
battle_anim.h	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
battle_moves.h	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
contest_moves.h	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
contest_opponents.h
contest_text_tables.h
credits.h
heal_locations.h
item_icon_table.h
items.h	Fix Lure prices	2022-09-11 18:06:05 +02:00
lilycove_lady.h
map_group_count.h	Automated creation of MAP_GROUP_COUNT for the debug menu	2022-09-09 23:34:05 -04:00
party_menu.h
pointillism_points.h
pokedex_area_glow.h
script_menu.h
trade.h
trainer_parties.h
trainers.h
union_room.h	Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-11 12:41:56 -04:00
wallpapers.h
wild_encounters.json
wild_encounters.json.txt