pokeemerald/asm/macros
Eduardo Quezada 0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
2023-08-31 14:28:01 -04:00
..
battle_frontier Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
asm.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
battle_ai_script.inc Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 2022-09-13 16:22:42 -03:00
battle_anim_script.inc Replace launchtemplate and launchtask in battle anims (#2640) 2023-05-27 17:32:53 -04:00
battle_script.inc Merge branch 'RHH/master' into RHH/upcoming 2023-08-11 17:50:28 -04:00
battle_tent.inc Removed trailing spaces in the most relevant files 2021-08-24 19:59:32 -03:00
contest_ai_script.inc Document contest AI scripts 2020-08-21 14:57:17 -04:00
event.inc Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 2023-03-03 11:00:50 -03:00
field_effect_script.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
function.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
m4a.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
map.inc Sync clone object macro 2023-02-08 13:11:10 -05:00
movement.inc Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
music_voice.inc Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
trainer_hill.inc Clean up some trainer hill 2022-03-31 12:54:07 -04:00