Eduardo Quezada 39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	include/data.h
#	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_3_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_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h

2024-03-17 23:41:23 -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

Correct berry fix graphics colors, more PLTT constant use (#1892)

2023-08-09 12:49:21 -04: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

PLA aux item sprites (#4160)

2024-02-10 18:08:09 +01: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

Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-03-17 23:41:23 -03: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

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-02-13 20:35:05 -03:00