Eduardo Quezada 1137d54b61 Merge branch 'RHH/master' into RHH/upcoming ...

# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c

2023-10-23 17:36:42 -03: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-10-23 17:36:42 -03: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

small fixes

2023-08-09 09:34:41 +02: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