pokeemmo

History

Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2

# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c

2022-07-15 12:58:46 -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

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

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

battle_frontier_trainer_mons.h

Removed trailing spaces in the most relevant files