Eduardo Quezada b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ...

# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c

2023-02-15 14:11:03 -03:00

..

apprentice.h

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-11-21 10:40:26 -08:00

battle_frontier_exchange_corner.h

Clean up shop.c

2022-09-22 15:08:17 -04:00

battle_frontier_mons.h

Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync

2021-12-17 23:51:29 -08:00

battle_frontier_trainer_mons.h

Aligned FRONTIER_MONS trainer macros with the rest for consistency

2022-09-06 17:05:56 -04:00

battle_frontier_trainers.h

Document easy chat

2021-02-24 11:03:45 -05:00

battle_pyramid_level_50_wild_mons.h

Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.

2020-12-31 18:57:36 -05:00

battle_pyramid_open_level_wild_mons.h

Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214

2023-02-15 14:11:03 -03:00

battle_tent.h

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-11-21 10:40:26 -08:00

trainer_hill.h

Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine

2022-05-13 03:17:31 -03:00