Eduardo Quezada 5b8be2a144 Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder ... # Conflicts: # data/battle_scripts_1.s # src/data/pokemon/level_up_learnsets.h # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c		2022-11-21 17:52:19 -03:00
..
anim_front.png	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
back.png	Revert "Fix the 'bKGD: invalid index' error"	2021-10-17 07:32:49 -03:00
footprint.png	Revert "Fix the 'bKGD: invalid index' error"	2021-10-17 07:32:49 -03:00
front.png	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
icon.png	Revert "Fix the 'bKGD: invalid index' error"	2021-10-17 07:32:49 -03:00
normal.pal	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
shiny.pal	Add Gen4 mon sprites	2019-04-03 17:39:08 +02:00