Eduardo Quezada f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ...

# Conflicts:
#	src/rom_header_gf.c

2022-11-09 19:54:44 -03:00

..

battle_frontier

Further removed trailing whitespaces

2022-09-13 16:26:36 -03: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

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

battle_script.inc

Merge pull request #2434 from LOuroboros/badDreams

2022-11-08 08:16:07 -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

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

2022-10-30 12:30:38 -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

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03: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