Eduardo Quezada 4b1aca19cb Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_controller_link_opponent.c # src/battle_controller_opponent.c # src/battle_controller_recorded_opponent.c # src/battle_controllers.c # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/pokemon.c		2022-09-10 00:17:03 -04:00
..
bard_music
battle_frontier	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-10 00:17:03 -04:00
decoration	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
easy_chat	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
field_effects	Adding missing externs	2022-09-05 09:49:20 -04:00
graphics	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
object_events	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-10 00:17:03 -04:00
pokemon	Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE	2022-09-09 15:39:48 -03:00
pokemon_graphics	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-10 00:17:03 -04:00
region_map	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
text	Merge pull request #2273 from LOuroboros/zazaForms	2022-09-09 14:15:53 -04:00
trainer_graphics	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
.gitignore
battle_anim.h	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
battle_moves.h	Added Z-Move stats for LA's moves	2022-08-30 20:29:36 -03:00
contest_moves.h	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
contest_opponents.h	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-21 10:41:12 -08:00
contest_text_tables.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
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	Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE	2022-09-09 15:39:48 -03:00
lilycove_lady.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
party_menu.h	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
pointillism_points.h
pokedex_area_glow.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
script_menu.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
trade.h	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
trainer_parties.h
trainers.h	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
union_room.h	Merge branch 'master' into doc-union	2021-10-07 16:10:35 -04:00
wallpapers.h
wild_encounters.json
wild_encounters.json.txt