Eduardo Quezada f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h		2022-07-22 22:57:02 -04: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	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03: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	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03: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 tag 'pretmaster' into BE_pretmerge2	2022-07-15 12:58:46 -04: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