Eduardo Quezada 021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon/species_info/gen_1_families.h # src/data/pokemon/species_info/gen_2_families.h # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h		2024-05-28 14:28:33 -04:00
..
battle_terrain.h
berries.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
berry_fix.h	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
decorations.h
intro_scene.h
items.h	Add Stellar Tera Shard sprite (#4595)	2024-05-18 22:20:47 +02:00
mail.h
pokeballs.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
pokemon.h	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-05-28 14:28:33 -04:00
rayquaza_scene.h
slot_machine.h
trainers.h	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-02-13 20:35:05 -03:00