Eduardo Quezada D'Ottone 47a50b3dac

Merge branch 'master' into weather_forms_fixes

2022-09-07 23:07:25 -04:00

..

battle_frontier

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-12-01 20:17:08 -08: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 branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-12-01 20:17:08 -08:00

battle_anim_script.inc

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

2021-12-16 21:44:01 -06:00

battle_script.inc

Merge branch 'master' into weather_forms_fixes

2022-09-07 23:07:25 -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 MergedBranchUltimate

2022-08-22 20:30:45 -04: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

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

2021-12-17 21:23:54 -08:00

trainer_hill.inc

Clean up some trainer hill

2022-03-31 12:54:07 -04:00