Eduardo Quezada 44754f8ca7 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/constants/pokemon_config.h # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c		2022-10-07 15:27:16 -03:00
..
back_pic_coordinates.h	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
back_pic_table.h	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2	2022-10-07 15:27:16 -03:00
enemy_mon_elevation.h	Separated P_NEW_POKEMON into sections by generation.	2022-08-30 12:50:59 -04:00
footprint_table.h	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
front_pic_anims.h	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
front_pic_coordinates.h	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
front_pic_table.h	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2	2022-10-07 15:27:16 -03:00
palette_table.h	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2	2022-10-07 15:27:16 -03:00
shiny_palette_table.h	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2	2022-10-07 15:27:16 -03:00