Eduardo Quezada D'Ottone 02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb ...

# Conflicts:
#	include/graphics.h
#	src/data/graphics/items.h
#	src/data/item_icon_table.h
#	src/data/items.h
#	src/data/text/item_descriptions.h

2022-01-16 18:44:03 -03:00

..

battle_terrain.h

Fix LZ compressed data alignment

2018-10-21 12:05:34 -05:00

berries.h

Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.

2021-12-15 19:33:35 -08: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

interface_pokeballs.h

Rearranged Poke Ball item ids.

2021-06-18 21:46:20 -07: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

pokemon.h

Label remaining symbols in graphics.c

2021-10-27 13:47:18 -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

Rename graphics files for COOLTRAINER to match define

2020-11-26 11:05:02 -08:00