Eduardo Quezada 9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/base_stats.h		2022-10-07 14:05:45 -03:00
..
battle_terrain.h	Fix LZ compressed data alignment	2018-10-21 12:05:34 -05:00
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	sync fldeff function names with pokeruby	2018-12-09 22:24:54 -05:00
decorations.h	Drop unnecessary decor prefix	2020-04-13 13:04:22 -04:00
intro_scene.h	Standardize intro gfx names	2021-03-29 20:48:48 -04:00
items.h	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb	2022-01-16 18:44:03 -03:00
mail.h	Fix LZ compressed data alignment	2018-10-21 12:05:34 -05:00
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	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
rayquaza_scene.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
slot_machine.h	More slot machine data documentation	2020-07-28 14:29:44 -04:00
trainers.h	Generate trainer pic palettes from image	2022-09-05 16:09:45 -04:00