Eduardo Quezada D'Ottone fe63dafcc1 Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c		2022-07-20 08:50:30 -04:00
..
bard_music
battle_frontier	Merge tag 'pretmaster' into BE_pretmerge2	2022-07-15 12:58:46 -04:00
decoration
easy_chat	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
field_effects	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
graphics	Move balls, shop, link, map popups, and bag out of interface	2022-01-11 13:53:23 -05:00
object_events	Name unknown_16.png	2022-03-14 15:54:47 -04:00
pokemon	Merge tag 'pretmaster' into BE_pretmerge2	2022-07-15 12:58:46 -04:00
pokemon_graphics	Typo fix	2021-11-13 16:56:45 -05:00
region_map
text	merge w be	2022-07-17 12:40:43 -04:00
trainer_graphics	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
.gitignore
battle_anim.h	add potlergeist animation	2022-05-23 08:53:08 -04:00
battle_moves.h	merge w be	2022-07-17 12:40:43 -04:00
contest_moves.h	Fixed Steam Roller's define	2021-11-01 22:07:54 -03:00
contest_opponents.h	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
contest_text_tables.h
credits.h
heal_locations.h
item_icon_table.h
items.h	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
lilycove_lady.h	Move pokemon and easy chat constants to global, misc clean-up	2021-12-28 18:07:41 -05:00
party_menu.h	Generalize name of party slot without HP	2022-02-15 16:24:19 -05: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	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
union_room.h
wallpapers.h
wild_encounters.json
wild_encounters.json.txt