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
..
abilities.h
apprentice.h
battle.h
battle_ai.h
battle_anim.h
battle_arena.h
battle_dome.h
battle_factory.h
battle_frontier.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_move_effects.h
battle_palace.h
battle_pike.h
battle_pyramid.h
battle_script_commands.h
battle_setup.h
battle_string_ids.h
battle_tent.h
battle_tent_mons.h
battle_tent_trainers.h
battle_tower.h
berry.h
cable_club.h
coins.h
contest.h
daycare.h
decorations.h
easy_chat.h
event_bg.h
event_object_movement.h
event_objects.h
expansion_branches.h
field_effects.h
field_poison.h
field_specials.h
field_tasks.h
field_weather.h
flags.h
frontier_util.h
game_stat.h
global.h
heal_locations.h
hold_effects.h
item.h
item_config.h
item_effects.h
items.h	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb	2022-01-16 18:44:03 -03:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h
mauville_old_man.h
metatile_behaviors.h
metatile_labels.h
moves.h
mystery_gift.h
opponents.h
party_menu.h
pokemon.h
region_map_sections.h
rgb.h
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h
sound.h
species.h
trade.h
trainer_hill.h
trainer_types.h
trainers.h
tv.h
union_room.h
vars.h
weather.h