Eduardo Quezada D'Ottone f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h		2022-07-12 17:42:32 -04:00
..
bard_music
battle_frontier	Merge remote-tracking branch 'pret/master' into item_expansion	2022-07-12 17:42:32 -04:00
decoration
easy_chat	Move pokemon and easy chat constants to global, misc clean-up	2021-12-28 18:07:41 -05:00
field_effects	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
graphics	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2022-03-01 15:10:19 -08:00
object_events	Merge branch 'master' of https://github.com/pret/pokeemerald into iePret	2022-04-11 01:22:48 -03:00
pokemon	Merge remote-tracking branch 'pret/master' into item_expansion	2022-07-12 17:42:32 -04:00
pokemon_graphics	Typo fix	2021-11-13 16:56:45 -05:00
region_map
text	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb	2022-01-16 18:44:03 -03:00
trainer_graphics	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
.gitignore
battle_anim.h
battle_moves.h
contest_moves.h
contest_opponents.h
contest_text_tables.h
credits.h
heal_locations.h
item_icon_table.h	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb	2022-01-16 18:44:03 -03:00
items.h	Merge pull request #2133 from Sneed69/cobaberry	2022-05-12 13:39:50 -04:00
lilycove_lady.h	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2022-03-01 15:10:19 -08:00
party_menu.h	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2022-03-01 15:10:19 -08:00
pointillism_points.h
pokedex_area_glow.h	Add glow tile empty	2022-01-06 22:33:00 -05:00
script_menu.h
trade.h	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
trainer_parties.h
trainers.h
union_room.h
wallpapers.h
wild_encounters.json
wild_encounters.json.txt